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

List:       kde-commits
Subject:    kdenonbeta/karchiver
From:       Eric Coquelle <eric.coquelle () gmail ! com>
Date:       2006-09-13 14:39:53
Message-ID: 1158158393.135714.4936.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 583803 by coquelle:

Fixed: the "next" button of Wizard page two remained disabled when no 7z compressor could be found


 M  +11 -4     cwizardsfx.cpp  
 M  +2 -0      cwizardsfx.h  


--- trunk/kdenonbeta/karchiver/cwizardsfx.cpp #583802:583803
@@ -33,6 +33,7 @@
 
 CWizardSfx::CWizardSfx(QWidget *parent, const char *name) : KWizard(parent,name)
 {
+  setCaption(i18n("KArchiver's wizard"));
   setupPageOne();
   setupPageTwo();
   setupPageThree();
@@ -47,8 +48,8 @@
 void  CWizardSfx::setupPageOne(){
   
   QWidget* pageone = new QWidget(this);
-  
   QGridLayout* layout=new QGridLayout(pageone, 10, 2, 8);
+  titlepageone=i18n("KArchiver self-extracting archive wizard - step 1");
 
   QLabel* QLabel_1= new QLabel(pageone,"NoName");
   QLabel_1->setPixmap(UserIcon("karchiveur_wizard_large"));
@@ -81,7 +82,7 @@
   radio7zwin->setText(i18n("Windows 7z sfx archive"));
   hbox->addWidget(radio7zwin);
   
-  addPage(pageone, i18n("KArchiver self-extracting archive wizard - step 1"));
+  addPage(pageone, titlepageone);
   setHelpEnabled(pageone, false);
 }
 
@@ -89,6 +90,7 @@
 {
   pagetwo = new QWidget(this);
   QGridLayout* layout=new QGridLayout(pagetwo, 2, 2, 8);
+  titlepagetwo=i18n("KArchiver self-extracting archive wizard - step 2");
 
   QLabel* labelwizard2i= new QLabel(pagetwo,"NoName");
   labelwizard2i->setPixmap(UserIcon("karchiveur_wizard_large"));
@@ -106,7 +108,7 @@
   QLabel_4->setAlignment(Qt::WordBreak);
   layout->addMultiCellWidget(QLabel_4, 2, 2, 1, 2);
 
-  addPage(pagetwo, i18n("KArchiver self-extracting archive wizard - step 2"));
+  addPage(pagetwo, titlepagetwo);
   setHelpEnabled(pagetwo, false);
 }
 
@@ -142,7 +144,7 @@
 /**Check for Page 2 and add a warning message if the Sfx module cannot be found*/
 void CWizardSfx::slotPageChanged(const QString& pagetitle)
 {
-  if(pagetitle==i18n("KArchiver self-extracting archive wizard - step 2"))
+  if(pagetitle==titlepagetwo)
   {
     if(radiouniversal->isChecked())
     {
@@ -168,6 +170,11 @@
       }
     }
   }
+  else if(pagetitle==titlepageone)
+  {
+    setNextEnabled(pagetwo, true);
+    QLabel_4->setText("");
+  }
 }
 
 void CWizardSfx::slotBrowse()
--- trunk/kdenonbeta/karchiver/cwizardsfx.h #583802:583803
@@ -63,6 +63,8 @@
     QPushButton* bpath;
     QLineEdit* lepathsfx;
     QWidget* pagetwo;
+    QString titlepageone;
+    QString titlepagetwo;
 };
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]