Various strings change and capitalisation changes to match the guidelines.

[vlc] / modules / gui / qt4 / dialogs / interaction.cpp

diff --git a/modules/gui/qt4/dialogs/interaction.cpp b/modules/gui/qt4/dialogs/interaction.cpp
index 63252b323c11f592c7a70519a6fd31cb5f322724..45e33516fff9020c2605fca84e4af9d101ee9381 100644 (file)
--- a/modules/gui/qt4/dialogs/interaction.cpp
+++ b/modules/gui/qt4/dialogs/interaction.cpp
@@ -20,6 +20,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "dialogs/errors.hpp"
 #include "dialogs/interaction.hpp"
@@ -181,18 +184,20 @@ void InteractionDialog::update()
         assert( progressBar );
         progressBar->setValue( (int)( p_dialog->val.f_float * 10 ) );
         description->setText( qfu( p_dialog->psz_description ) );
-        msg_Dbg( p_intf, "Setting progress to %i", progressBar->value() );
     }
 
     if( ( p_dialog->i_flags & DIALOG_INTF_PROGRESS ) &&
         ( p_dialog->val.f_float >= 100.0 ) )
         progressBar->hide();
+    if( ( p_dialog->i_flags & DIALOG_USER_PROGRESS ) &&
+        ( p_dialog->val.f_float >= 100.0 ) )
+        altButton->setText( qtr( "&Close" ) );
 }
 
 InteractionDialog::~InteractionDialog()
 {
-//    if( panel ) delete panel;
-    if( dialog ) delete dialog;
+//    delete panel;
+    delete dialog;
 }
 
 void InteractionDialog::defaultB()
@@ -210,7 +215,7 @@ void InteractionDialog::otherB()
 
 void InteractionDialog::Finish( int i_ret )
 {
-    vlc_mutex_lock( &p_dialog->p_interaction->object_lock );
+    vlc_object_lock( p_dialog->p_interaction );
 
     if( p_dialog->i_flags & DIALOG_LOGIN_PW_OK_CANCEL )
     {
@@ -230,7 +235,7 @@ void InteractionDialog::Finish( int i_ret )
         p_dialog->b_cancelled = true;
 
     hide();
-    vlc_mutex_unlock( &p_dialog->p_interaction->object_lock );
+    vlc_object_unlock( p_dialog->p_interaction );
     playlist_Signal( THEPL );
 }