[vlc-devel] commit: EPG: fix QLabel look and saveGeometry (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jan 28 03:29:29 2010 +0100| [6a5e84686d31a9a8a83cb29b434f70c342dae974] | committer: Jean-Baptiste Kempf 

EPG: fix QLabel look and saveGeometry

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6a5e84686d31a9a8a83cb29b434f70c342dae974
---

 modules/gui/qt4/dialogs/epg.cpp |   11 +++++++----
 modules/gui/qt4/dialogs/epg.hpp |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/dialogs/epg.cpp b/modules/gui/qt4/dialogs/epg.cpp
index 10e7b4e..bea56e9 100644
--- a/modules/gui/qt4/dialogs/epg.cpp
+++ b/modules/gui/qt4/dialogs/epg.cpp
@@ -55,6 +55,8 @@ EpgDialog::EpgDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     description = new QLabel( this );
     description->setFrameStyle( QFrame::Sunken | QFrame::StyledPanel );
     description->setAutoFillBackground( true );
+    description->setWordWrap( true );
+    description->setAlignment( Qt::AlignLeft | Qt::AlignTop );
 
     QPalette palette;
     palette.setBrush(QPalette::Active, QPalette::Window, palette.brush( QPalette::Base ) );
@@ -73,18 +75,19 @@ EpgDialog::EpgDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
 
     QPushButton *update = new QPushButton( "Update" ); //Temporary to test
     layout->addWidget( update, 0, Qt::AlignRight );
-    BUTTONACT( update, update() );
+    BUTTONACT( update, updateInfos() );
 
     QPushButton *close = new QPushButton( qtr( "&Close" ) );
     layout->addWidget( close, 0, Qt::AlignRight );
     BUTTONACT( close, close() );
 
-
-    resize( 650, 400 );
+    updateInfos();
+    readSettings( "EPGDialog", QSize( 650, 450 ) );
 }
 
 EpgDialog::~EpgDialog()
 {
+    writeSettings( "EPGDialog" );
 }
 
 void EpgDialog::showEvent( EPGEvent *event )
@@ -98,7 +101,7 @@ void EpgDialog::showEvent( EPGEvent *event )
         description->setText( event->shortDescription );
 }
 
-void EpgDialog::update()
+void EpgDialog::updateInfos()
 {
     if( !THEMIM->getInput() ) return;
 
diff --git a/modules/gui/qt4/dialogs/epg.hpp b/modules/gui/qt4/dialogs/epg.hpp
index fb2993f..d8d24a1 100644
--- a/modules/gui/qt4/dialogs/epg.hpp
+++ b/modules/gui/qt4/dialogs/epg.hpp
@@ -45,7 +45,7 @@ private:
 
 private slots:
     void showEvent( EPGEvent * );
-    void update();
+    void updateInfos();
 };
 
 #endif