[vlc-devel] commit: Separate the label and the message in update dialog to fix the confusion created before . (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jul 29 12:56:24 2008 -0700| [8462c96dd88417db77c726c8ed290ef7f745f873]

Separate the label and the message in update dialog to fix the confusion created before.

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

 modules/gui/qt4/dialogs/help.cpp |   45 ++++++++++++++++++++++++++-----------
 modules/gui/qt4/dialogs/help.hpp |    5 +++-
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 16b2e21..99b4eef 100644
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -215,11 +215,24 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
     buttonBox->addButton( updateButton, QDialogButtonBox::ActionRole );
     buttonBox->addButton( closeButton, QDialogButtonBox::AcceptRole );
 
-    updateLabel = new QLabel( qtr( "Checking for an update..." ) );
-    updateLabel->setWordWrap( true );
+    updateLabelTop = new QLabel( qtr( "Checking for an update..." ) );
+    updateLabelTop->setWordWrap( true );
+    updateLabelTop->setMargin( 8 );
 
-    layout->addWidget( updateLabel, 0, 0, Qt::AlignTop );
-    layout->addWidget( buttonBox, 1, 0 );
+    updateLabelDown = new QLabel( qtr( "\nDo you want to download it?\n" ) );
+    updateLabelDown->setWordWrap( true );
+    updateLabelDown->hide();
+
+    updateText = new QTextEdit;
+    updateText->setAcceptRichText(false);
+    updateText->setTextInteractionFlags( Qt::TextSelectableByKeyboard|
+                                         Qt::TextSelectableByMouse);
+    updateText->setEnabled( false );
+
+    layout->addWidget( updateLabelTop, 0, 0 );
+    layout->addWidget( updateText, 1, 0 );
+    layout->addWidget( updateLabelDown, 2, 0 );
+    layout->addWidget( buttonBox, 3, 0 );
 
     BUTTONACT( updateButton, UpdateOrDownload() );
     BUTTONACT( closeButton, close() );
@@ -228,8 +241,10 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
     p_update = update_New( p_intf );
     b_checked = false;
 
-    setMinimumSize( 200, 100 );
-    readSettings( "Update", QSize( 200, 100 ) );
+    setMinimumSize( 300, 100 );
+    setMaximumSize( 400, 300 );
+
+    readSettings( "Update", QSize( 300, 100 ) );
 
     /* Check for updates */
     UpdateOrDownload();
@@ -252,7 +267,7 @@ void UpdateDialog::UpdateOrDownload()
     if( !b_checked )
     {
         updateButton->setEnabled( false );
-        updateLabel->setText( qtr( "Launching an update request..." ) );
+        updateLabelTop->setText( qtr( "Launching an update request..." ) );
         update_Check( p_update, UpdateCallback, this );
     }
     else
@@ -296,30 +311,32 @@ void UpdateDialog::updateNotify( bool b_result )
             update_release_t *p_release = update_GetRelease( p_update );
             assert( p_release );
             b_checked = true;
-            updateButton->setText( "Ok" );
+            updateButton->setText( "Yes" );
             QString message = qtr( "A new version of VLC(" )
                               + QString::number( p_release->i_major ) + "."
                               + QString::number( p_release->i_minor ) + "."
                               + QString::number( p_release->i_revision );
             if( p_release->extra )
                 message += p_release->extra;
-            message += qtr( ") is available.\nDo you want to download it?\n" )
-                    + qfu( p_release->psz_desc );
+            message += qtr( ") is available.");
+            updateLabelTop->setText( message );
+
+            updateText->setText( qfu( p_release->psz_desc ) );
+            updateText->setEnabled( true );
 
-            updateLabel->setText( message );
+            updateLabelDown->show();
 
             /* Force the dialog to be shown */
             this->show();
         }
         else
-            updateLabel->setText(
+            updateLabelTop->setText(
                     qtr( "You have the latest version of VLC media player." ) );
     }
     else
-        updateLabel->setText(
+        updateLabelTop->setText(
                     qtr( "An error occurred while checking for updates..." ) );
 
-    adjustSize();
     updateButton->setEnabled( true );
 }
 
diff --git a/modules/gui/qt4/dialogs/help.hpp b/modules/gui/qt4/dialogs/help.hpp
index d1c1889..10857a0 100644
--- a/modules/gui/qt4/dialogs/help.hpp
+++ b/modules/gui/qt4/dialogs/help.hpp
@@ -37,6 +37,7 @@ class QTextBrowser;
 class QLabel;
 class QEvent;
 class QPushButton;
+class QTextEdit;
 
 class HelpDialog : public QVLCFrame
 {
@@ -110,7 +111,9 @@ private:
 
     update_t *p_update;
     QPushButton *updateButton;
-    QLabel *updateLabel;
+    QLabel *updateLabelTop;
+    QLabel *updateLabelDown;
+    QTextEdit *updateText;
     void customEvent( QEvent * );
     bool b_checked;