[vlc-commits] commit: Synchronise master and 1.1 branch Qt4 EPG (Adrien Maglo )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Adrien Maglo <magsoft at videolan.org> | Sat Jun 12 21:25:20 2010 +0200| [27912412087751c3ced829613db007dccfc9f9c4] | committer: Jean-Baptiste Kempf 

Synchronise master and 1.1 branch Qt4 EPG

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=27912412087751c3ced829613db007dccfc9f9c4
---

 modules/gui/qt4/Modules.am                     |    3 +
 modules/gui/qt4/components/epg/EPGChannels.cpp |   65 ++++++++++++++++++++++++
 modules/gui/qt4/components/epg/EPGChannels.hpp |   48 +++++++++++++++++
 modules/gui/qt4/components/epg/EPGItem.cpp     |   26 ++++-----
 modules/gui/qt4/components/epg/EPGView.cpp     |   60 +++++-----------------
 modules/gui/qt4/components/epg/EPGView.hpp     |    9 +---
 modules/gui/qt4/components/epg/EPGWidget.cpp   |   21 ++++++--
 modules/gui/qt4/components/epg/EPGWidget.hpp   |    2 +
 modules/gui/qt4/dialogs/epg.cpp                |   16 +++---
 modules/gui/qt4/dialogs/epg.hpp                |    4 +-
 10 files changed, 170 insertions(+), 84 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commitdiff;h=27912412087751c3ced829613db007dccfc9f9c4