[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkde-runtime=5D_knetattach=3A_Set_button_text_when_c?=
From:       Jonathan Riddell <jriddell () ubuntu ! com>
Date:       2011-02-10 11:34:18
Message-ID: 20110210113418.432FDA609B () git ! kde ! org
[Download RAW message or body]

Git commit bbdf883421b9f1d6e7afa9c1d73ba6fe0a238a11 by Jonathan Riddell.
Committed on 10/02/2011 at 12:31.
Pushed by jriddell into branch 'master'.

Set button text when changing page, otherwise it doesn't actually get set
and the label doesn't match the button

M  +6    -1    knetattach/knetattach.cpp     
M  +1    -0    knetattach/knetattach.h     

http://commits.kde.org/kde-runtime/bbdf883421b9f1d6e7afa9c1d73ba6fe0a238a11

diff --git a/knetattach/knetattach.cpp b/knetattach/knetattach.cpp
index 460460e..e20968f 100644
--- a/knetattach/knetattach.cpp
+++ b/knetattach/knetattach.cpp
@@ -48,9 +48,9 @@ KNetAttach::KNetAttach( QWidget* parent )
     connect(_useEncryption, SIGNAL(toggled(bool)), this, SLOT(updatePort(bool)));
     connect(_createIcon, SIGNAL(toggled(bool)), this, SLOT(updateFinishButtonText(bool)));
     connect( this, SIGNAL(helpRequested()), this, SLOT( slotHelpClicked() ) );
+    connect( this, SIGNAL(currentIdChanged(int)), this, SLOT( slotPageChanged(int) ) );
     setWindowIcon(KIcon("knetattach"));
     setOption(HaveHelpButton, true);
-    button(FinishButton)->setText(i18n("Save && C&onnect"));
     //setResizeMode(Fixed); FIXME: make the wizard fixed-geometry
     button(FinishButton)->setEnabled(false);
     KConfig crecent( "krecentconnections", KConfig::NoGlobals  );
@@ -71,6 +71,11 @@ KNetAttach::KNetAttach( QWidget* parent )
     _encoding->setCurrentIndex(codecForLocaleIdx != -1 ? codecForLocaleIdx : 0);
 }
 
+void KNetAttach::slotPageChanged( int )
+{
+    updateFinishButtonText(true);
+}
+
 void KNetAttach::slotHelpClicked()
 {
     KToolInvocation::invokeHelp(QString(), "knetattach" );
diff --git a/knetattach/knetattach.h b/knetattach/knetattach.h
index b73dc29..f29fad3 100644
--- a/knetattach/knetattach.h
+++ b/knetattach/knetattach.h
@@ -44,6 +44,7 @@ private slots:
     void updatePort( bool encryption );
     void updateFinishButtonText( bool save );
     void slotHelpClicked();
+    void slotPageChanged( int );
 };
 
 #endif

[prev in list] [next in list] [prev in thread] [next in thread]