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

List:       kde-commits
Subject:    KDE/kdebase/workspace/klipper
From:       Esben Mose Hansen <kde () mosehansen ! dk>
Date:       2010-01-11 9:20:39
Message-ID: 1263201639.951593.28141.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1072866 by esben:

Fix initial state of the config dialog

 M  +20 -5     configdialog.cpp  
 M  +2 -0      configdialog.h  


--- trunk/KDE/kdebase/workspace/klipper/configdialog.cpp #1072865:1072866
@@ -38,8 +38,20 @@
     m_ui.setupUi(this);
     m_ui.kcfg_TimeoutForActionPopups->setSuffix(ki18np(" second", " seconds"));
     m_ui.kcfg_MaxClipItems->setSuffix(ki18np(" entry", " entries"));
+
 }
 
+void GeneralWidget::updateWidgets()
+{
+  if (m_ui.kcfg_IgnoreSelection->isChecked()) {
+    m_ui.kcfg_SyncClipboards->setEnabled(false);
+    m_ui.kcfg_SelectionTextOnly->setEnabled(false);
+  } else if (m_ui.kcfg_SyncClipboards->isChecked()) {
+    m_ui.kcfg_IgnoreSelection->setEnabled(false);
+  }
+
+}
+
 ActionsWidget::ActionsWidget(QWidget* parent)
     : QWidget(parent), m_editActDlg(0)
 {
@@ -251,14 +263,16 @@
 
 ConfigDialog::ConfigDialog(QWidget *parent, KConfigSkeleton *skeleton, const \
Klipper* klipper, KActionCollection *collection,  bool isApplet)
-    : KConfigDialog(parent, "preferences", skeleton), m_klipper(klipper)
+    : KConfigDialog(parent, "preferences", skeleton),
+    m_generalPage(new GeneralWidget(this)),
+    m_actionsPage(new ActionsWidget(this)),
+    m_klipper(klipper)
 {
-    if ( isApplet )
+    if ( isApplet ) {
         setHelp( QString(), "klipper" );
+    }
 
-    m_actionsPage = new ActionsWidget(this);
-
-    addPage(new GeneralWidget(this), i18nc("General Config", "General"), "klipper", \
i18n("General Config")); +    addPage(m_generalPage, i18nc("General Config", \
                "General"), "klipper", i18n("General Config"));
     addPage(m_actionsPage, i18nc("Actions Config", "Actions"), "system-run", \
i18n("Actions Config"));  
     QWidget* w = new QWidget(this);
@@ -301,6 +315,7 @@
         kDebug() << "Klipper or grabber object is null";
         return;
     }
+    m_generalPage->updateWidgets();
 }
 
 void ConfigDialog::updateWidgetsDefault()
--- trunk/KDE/kdebase/workspace/klipper/configdialog.h #1072865:1072866
@@ -41,6 +41,7 @@
     Q_OBJECT
 public:
     GeneralWidget(QWidget* parent);
+    void updateWidgets();
 
 private:
     Ui::GeneralWidget m_ui;
@@ -115,6 +116,7 @@
     void updateWidgetsDefault();
 
 private:
+    GeneralWidget* m_generalPage;
     ActionsWidget *m_actionsPage;
     KShortcutsEditor *m_shortcutsWidget;
 


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