Commit 745feeb9 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - Update: clean and message Debug. My fault for the mess...

parent 1e0995cd
...@@ -218,7 +218,7 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) ...@@ -218,7 +218,7 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
BUTTONACT( closeButton, close() ); BUTTONACT( closeButton, close() );
/* Create the update structure */ /* Create the update structure */
initUpdate(); p_update = update_New( p_intf );
b_checked = false; b_checked = false;
/* Check for updates */ /* Check for updates */
...@@ -241,13 +241,15 @@ void UpdateDialog::UpdateOrDownload() ...@@ -241,13 +241,15 @@ void UpdateDialog::UpdateOrDownload()
if( !b_checked ) if( !b_checked )
{ {
updateButton->setEnabled( false ); updateButton->setEnabled( false );
msg_Dbg( p_intf, "Launching an update Request" );
update_Check( p_update, UpdateCallback, this ); update_Check( p_update, UpdateCallback, this );
} }
else else
{ {
updateButton->setEnabled( false ); updateButton->setEnabled( false );
QString dest_dir = QFileDialog::getExistingDirectory( this, qtr( "Select a directory ..." ), QString dest_dir = QFileDialog::getExistingDirectory( this,
qfu( p_update->p_libvlc->psz_homedir ) ); qtr( "Select a directory ..." ),
qfu( p_update->p_libvlc->psz_homedir ) );
if( dest_dir != "" ) if( dest_dir != "" )
{ {
...@@ -278,22 +280,19 @@ void UpdateDialog::updateNotify( bool b_result ) ...@@ -278,22 +280,19 @@ void UpdateDialog::updateNotify( bool b_result )
{ {
b_checked = true; b_checked = true;
updateButton->setText( "Download" ); updateButton->setText( "Download" );
updateLabel->setText( qtr( "There is a new version of vlc :\n" ) + qfu( p_update->release.psz_desc ) ); updateLabel->setText( qtr( "There is a new version of vlc :\n" )
+ qfu( p_update->release.psz_desc ) );
} }
else else
updateLabel->setText( qtr( "You have the latest version of vlc" ) ); updateLabel->setText( qtr( "You have the latest version of vlc" ) );
} }
else else
updateLabel->setText( qtr( "An error occure while checking for updates" ) ); updateLabel->setText(
qtr( "An error occured while checking for updates" ) );
adjustSize(); adjustSize();
updateButton->setEnabled( true ); updateButton->setEnabled( true );
} }
/* Initialise the p_update struct */
void UpdateDialog::initUpdate()
{
p_update = update_New( p_intf );
}
#endif #endif
...@@ -92,7 +92,6 @@ public: ...@@ -92,7 +92,6 @@ public:
} }
virtual ~UpdateDialog(); virtual ~UpdateDialog();
void updateNotify( bool ); void updateNotify( bool );
void initUpdate();
private: private:
UpdateDialog( intf_thread_t * ); UpdateDialog( intf_thread_t * );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment