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

List:       kde-commits
Subject:    kdeextragear-1/k3b/src/k3bsetup
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2003-07-01 6:54:55
[Download RAW message or body]

CVS commit by trueg: 

probably fixed the "discard all changes" bug
since it never happended here I cannot be sure...


  M +15 -5     k3bsetupwizard.cpp   1.21
  M +2 -1      k3bsetupwizard.h   1.10


--- kdeextragear-1/k3b/src/k3bsetup/k3bsetupwizard.cpp  #1.20:1.21
@@ -27,5 +27,6 @@
 
 K3bSetupWizard::K3bSetupWizard( K3bSetup* setup, QWidget* parent,  const char* name, \
                bool modal, WFlags fl )
-    : KWizard( parent, name, modal, fl )
+  : KWizard( parent, name, modal, fl ),
+    m_accepted(false)
 {
   // create the K3bSetup instance
@@ -66,8 +67,15 @@ void K3bSetupWizard::showPage( QWidget* 
 void K3bSetupWizard::closeEvent( QCloseEvent* e )
 {
-  if( KMessageBox::questionYesNo( this, i18n("Do you really want to discard all \
changes?"), i18n("Close") ) == KMessageBox::Yes ) +  if( !m_accepted ) {
+    if( KMessageBox::questionYesNo( this, 
+                                    i18n("Do you really want to discard all \
changes?"),  +                                  i18n("Close") )
+        == KMessageBox::Yes )
     e->accept();
   else
     e->ignore();
+  }
+  else
+    e->accept();
 }
 
@@ -110,4 +118,6 @@ void K3bSetupWizard::accept()
 
   KMessageBox::information( this, finishMessage, i18n("K3b Setup Finished") );
+
+  m_accepted = true;
 
   KWizard::accept();

--- kdeextragear-1/k3b/src/k3bsetup/k3bsetupwizard.h  #1.9:1.10
@@ -58,4 +58,5 @@ class K3bSetupWizard : public KWizard
   K3bSetup* m_setup;
   FstabEntriesTab* m_fstabTab;
+  bool m_accepted;
 };
 


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