[Valgrind-valkyrie-dev] valkyrie: r540 - trunk/src/options

[<sv...@va...>]

Author: cerion
Date: 2011-06-28 19:35:46 +0100 (Tue, 28 Jun 2011)
New Revision: 540

Log:
keep Cancel button always enabled in options dialog.
(Apply still enabled depending on 'modified' state)



Modified:
   trunk/src/options/vk_options_dialog.cpp


Modified: trunk/src/options/vk_options_dialog.cpp
===================================================================
--- trunk/src/options/vk_options_dialog.cpp	2011-06-28 15:51:48 UTC (rev 539)
+++ trunk/src/options/vk_options_dialog.cpp	2011-06-28 18:35:46 UTC (rev 540)
@@ -217,7 +217,7 @@
    // ------------------------------------------------------------
    // setup default state
    applyButton->setEnabled( false );
-   cancelButton->setEnabled( false );
+   cancelButton->setEnabled( true );
    okButton->setDefault( true );
 }
 
@@ -377,9 +377,7 @@
    bool modified = page->isModified();
    
    QPushButton* applyButton  = optionsButtonBox->button( QDialogButtonBox::Apply );
-   QPushButton* cancelButton = optionsButtonBox->button( QDialogButtonBox::Cancel );
    applyButton->setEnabled( modified );
-   cancelButton->setEnabled( modified );
    // enable update-defaults only when no edits
    updateDefaultsButton->setEnabled( !modified );