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

List:       kde-commits
Subject:    [kmousetool/frameworks] kmousetool: Port away from KGlobal::config().
From:       Jeremy Whiting <jpwhiting () kde ! org>
Date:       2015-08-29 20:25:47
Message-ID: E1ZVmh9-0008R1-UK () scm ! kde ! org
[Download RAW message or body]

Git commit 9221369a1f0db6d69a3f2b10eb19c334b5455c88 by Jeremy Whiting.
Committed on 29/08/2015 at 20:24.
Pushed by whiting into branch 'frameworks'.

Port away from KGlobal::config().
Port away from KPushButton and KNumInput.
Port away from deprecated Phonon api.
Use KHelpMenu to show about and manual.

M  +16   -20   kmousetool/kmousetool.cpp
M  +2    -2    kmousetool/kmousetool.h
M  +213  -186  kmousetool/kmousetoolui.ui
M  +1    -1    kmousetool/main.cpp

http://commits.kde.org/kmousetool/9221369a1f0db6d69a3f2b10eb19c334b5455c88

diff --git a/kmousetool/kmousetool.cpp b/kmousetool/kmousetool.cpp
index 9c3292d..96495d0 100644
--- a/kmousetool/kmousetool.cpp
+++ b/kmousetool/kmousetool.cpp
@@ -34,6 +34,7 @@
 #include <QDesktopWidget>
 #include <QTimerEvent>
 
+#include <KHelpMenu>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -43,9 +44,7 @@
 #include <ksystemtrayicon.h>
 #include <kicon.h>
 #include <kiconloader.h>
-#include <kpushbutton.h>
 #include <kstandardguiitem.h>
-#include <knuminput.h>
 #include <kmenu.h>
 #include <kaboutapplicationdialog.h>
 #include <phonon/MediaObject>
@@ -216,12 +215,12 @@ void KMouseTool::playTickSound()
     if (!playSound)
         return;
 
-    mplayer->setCurrentSource(mSoundFileName);
+    mplayer->setCurrentSource(QUrl::fromLocalFile(mSoundFileName));
     mplayer->play();
 }
 
 KMouseTool::KMouseTool(QWidget *parent, const char *name)
- : QWidget(parent)
+ : QWidget(parent), helpMenu(new KHelpMenu(NULL))
 {
     setupUi(this);
     setObjectName( QLatin1String( name ));
@@ -237,16 +236,16 @@ KMouseTool::KMouseTool(QWidget *parent, const char *name)
     connect(cbStart, SIGNAL(stateChanged(int)), this, SLOT(settingsChanged()));
 
     connect(buttonStartStop, SIGNAL(clicked()), this, SLOT(startStopSelected()));
-    buttonDefault->setGuiItem(KStandardGuiItem::defaults());
+    KGuiItem::assign(buttonDefault, KStandardGuiItem::defaults());
     connect(buttonDefault, SIGNAL(clicked()), this, SLOT(defaultSelected()));
     connect(buttonReset, SIGNAL(clicked()), this, SLOT(resetSelected()));
-    buttonApply->setGuiItem(KStandardGuiItem::apply());
+    KGuiItem::assign(buttonApply, KStandardGuiItem::apply());
     connect(buttonApply, SIGNAL(clicked()), this, SLOT(applySelected()));
-    buttonHelp->setGuiItem(KStandardGuiItem::help());
+    KGuiItem::assign(buttonHelp, KStandardGuiItem::help());
     connect(buttonHelp, SIGNAL(clicked()), this, SLOT(helpSelected()));
-    buttonClose->setGuiItem(KStandardGuiItem::close());
+    KGuiItem::assign(buttonClose, KStandardGuiItem::close());
     connect(buttonClose, SIGNAL(clicked()), this, SLOT(closeSelected()));
-    buttonQuit->setGuiItem(KStandardGuiItem::quit());
+    KGuiItem::assign(buttonQuit, KStandardGuiItem::quit());
     connect(buttonQuit, SIGNAL(clicked()), this, SLOT(quitSelected()));
 
     // When we first start, it's nice to not click immediately.
@@ -261,8 +260,6 @@ KMouseTool::KMouseTool(QWidget *parent, const char *name)
     connect(trayIcon, SIGNAL(aboutSelected()), this, SLOT(aboutSelected()));
     connect(trayIcon, SIGNAL(helpSelected()), this, SLOT(helpSelected()));
     connect(trayIcon, SIGNAL(quitSelected()), this, SLOT(quitSelected()));
-
-//    aboutDlg = new KAboutApplicationDialog (KGlobal::mainComponent().aboutData());
 }
 
 KMouseTool::~KMouseTool()
@@ -429,7 +426,7 @@ bool KMouseTool::applySettings()
 // Save options to kmousetoolrc file
 void KMouseTool::loadOptions()
 {
-    KConfigGroup cfg = KGlobal::config()->group("UserOptions");
+    KConfigGroup cfg = KSharedConfig::openConfig()->group("UserOptions");
 
     playSound = cfg.readEntry("AudibleClick", false);
     smart_drag_on = cfg.readEntry("SmartDrag", false);
@@ -457,9 +454,9 @@ void KMouseTool::saveOptions()
     int x = p.x();
     int y = p.y();
 
-    KConfigGroup cfg = KGlobal::config()->group("ProgramOptions");
+    KConfigGroup cfg = KSharedConfig::openConfig()->group("ProgramOptions");
     cfg.writeEntry("Version", KMOUSETOOL_VERSION);
-    cfg = KGlobal::config()->group("UserOptions");
+    cfg = KSharedConfig::openConfig()->group("UserOptions");
     cfg.writeEntry("x", x);
     cfg.writeEntry("y", y);
     cfg.writeEntry("strokesEnabled", strokesEnabled);
@@ -540,7 +537,7 @@ void KMouseTool::applySelected()
 // Buttons at the bottom of the dialog
 void KMouseTool::helpSelected()
 {
-    KHelpClient::invokeHelp();
+    helpMenu->appHelpActivated();
 }
 
 void KMouseTool::closeSelected()
@@ -595,8 +592,7 @@ void KMouseTool::configureSelected()
 
 void KMouseTool::aboutSelected()
 {
-#pragma warning FIXME port to KF5
-//    aboutDlg->show();
+    helpMenu->aboutApplication();
 }
 
 
@@ -608,12 +604,12 @@ KMouseToolTray::KMouseToolTray (QWidget *parent) : \
KStatusNotifierItem(parent)  contextMenu()->addSeparator();
     QAction* act;
     act = contextMenu()->addAction (i18n("&Configure KMouseTool..."), this, \
                SIGNAL(configureSelected()));
-    act->setIcon(KIcon(QLatin1String( "configure" )));
+    act->setIcon(QIcon::fromTheme(QLatin1String( "configure" )));
     contextMenu()->addSeparator();
     act = contextMenu()->addAction (i18n("KMousetool &Handbook"), this, \
                SIGNAL(helpSelected()));
-    act->setIcon(KIcon(QLatin1String( "help-contents" )));
+    act->setIcon(QIcon::fromTheme(QLatin1String( "help-contents" )));
     act = contextMenu()->addAction (i18n("&About KMouseTool"), this, \
                SIGNAL(aboutSelected()));
-    act->setIcon(KIcon(QLatin1String( "kmousetool" )));
+    act->setIcon(QIcon::fromTheme(QLatin1String( "kmousetool" )));
 }
 
 KMouseToolTray::~KMouseToolTray() {
diff --git a/kmousetool/kmousetool.h b/kmousetool/kmousetool.h
index 222ab8d..3a8dbd8 100644
--- a/kmousetool/kmousetool.h
+++ b/kmousetool/kmousetool.h
@@ -36,7 +36,7 @@
 class QLabel;
 class QAction;
 class KAudioPlayer;
-class KAboutApplicationDialog;
+class KHelpMenu;
 class KMouseToolTray;
 
 namespace Phonon
@@ -80,7 +80,7 @@ private:
     Phonon::MediaObject *mplayer;
     KMouseToolTray *trayIcon;
 
-    KAboutApplicationDialog *aboutDlg;
+    KHelpMenu *helpMenu;
 
     /**
      * Initialize all variables
diff --git a/kmousetool/kmousetoolui.ui b/kmousetool/kmousetoolui.ui
index e0e2ec3..0427669 100644
--- a/kmousetool/kmousetoolui.ui
+++ b/kmousetool/kmousetoolui.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>KMouseToolUI</class>
- <widget class="QWidget" name="KMouseToolUI" >
-  <property name="geometry" >
+ <widget class="QWidget" name="KMouseToolUI">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,25 +10,34 @@
     <height>478</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>KMouseTool</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="leftMargin">
     <number>11</number>
    </property>
-   <property name="spacing" >
+   <property name="topMargin">
+    <number>11</number>
+   </property>
+   <property name="rightMargin">
+    <number>11</number>
+   </property>
+   <property name="bottomMargin">
+    <number>11</number>
+   </property>
+   <property name="spacing">
     <number>6</number>
    </property>
-   <item row="2" column="0" >
+   <item row="2" column="0">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>30</height>
@@ -35,35 +45,53 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="0" >
-    <widget class="QGroupBox" name="groupBox1" >
-     <property name="title" >
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="groupBox1">
+     <property name="title">
       <string>Settings</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="leftMargin">
+       <number>11</number>
+      </property>
+      <property name="topMargin">
        <number>11</number>
       </property>
-      <property name="spacing" >
+      <property name="rightMargin">
+       <number>11</number>
+      </property>
+      <property name="bottomMargin">
+       <number>11</number>
+      </property>
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="3" column="0" >
-       <layout class="QGridLayout" >
-        <property name="margin" >
+      <item row="3" column="0">
+       <layout class="QGridLayout">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
-        <property name="spacing" >
+        <property name="spacing">
          <number>6</number>
         </property>
-        <item row="0" column="0" >
+        <item row="0" column="0">
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeType" >
+          <property name="sizeType">
            <enum>QSizePolicy::Fixed</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>16</width>
             <height>20</height>
@@ -71,152 +99,107 @@
           </property>
          </spacer>
         </item>
-        <item row="0" column="1" >
-         <widget class="QLabel" name="dragTimeLabel" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+        <item row="0" column="1">
+         <widget class="QLabel" name="dragTimeLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="text" >
-           <string>Drag t&amp;ime (1/10 sec):</string>
+          <property name="text">
+           <string>&amp;Drag time (1/10 sec):</string>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>dragTimeEdit</cstring>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item row="3" column="1" >
-       <widget class="KIntSpinBox" name="dragTimeEdit" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
-          <horstretch>1</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-        <property name="maximum" >
-         <number>40</number>
-        </property>
-        <property name="value" >
-         <number>3</number>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="KIntSpinBox" name="dwellTimeEdit" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
-          <horstretch>1</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-        <property name="maximum" >
-         <number>40</number>
-        </property>
-        <property name="value" >
-         <number>5</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="movementLabel" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QLabel" name="movementLabel">
+        <property name="text">
          <string>&amp;Minimum movement:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>movementEdit</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="KIntSpinBox" name="movementEdit" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
-          <horstretch>1</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-        <property name="maximum" >
-         <number>40</number>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" colspan="2" >
-       <widget class="QCheckBox" name="cbStroke" >
-        <property name="text" >
+      <item row="4" column="0" colspan="2">
+       <widget class="QCheckBox" name="cbStroke">
+        <property name="text">
          <string>&amp;Enable strokes</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="dwellTimeLabel" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+      <item row="1" column="0">
+       <widget class="QLabel" name="dwellTimeLabel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
-         <string>D&amp;well time (1/10 sec):</string>
+        <property name="text">
+         <string>Dwell &amp;time (1/10 sec):</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>dwellTimeEdit</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="2" >
-       <widget class="QCheckBox" name="cbDrag" >
-        <property name="text" >
+      <item row="2" column="0" colspan="2">
+       <widget class="QCheckBox" name="cbDrag">
+        <property name="text">
          <string>Smar&amp;t drag</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="7" column="0" colspan="2" >
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
+      <item row="7" column="0" colspan="2">
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="margin" >
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
-         <widget class="KPushButton" name="buttonDefault" >
-          <property name="text" >
+         <widget class="QPushButton" name="buttonDefault">
+          <property name="text">
            <string>&amp;Defaults</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="KPushButton" name="buttonReset" >
-          <property name="text" >
+         <widget class="QPushButton" name="buttonReset">
+          <property name="text">
            <string>&amp;Reset</string>
           </property>
          </widget>
         </item>
         <item>
          <spacer>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeType" >
+          <property name="sizeType">
            <enum>QSizePolicy::Expanding</enum>
           </property>
-          <property name="sizeHint" stdset="0" >
+          <property name="sizeHint" stdset="0">
            <size>
             <width>31</width>
             <height>20</height>
@@ -225,70 +208,133 @@
          </spacer>
         </item>
         <item>
-         <widget class="KPushButton" name="buttonApply" >
-          <property name="text" >
+         <widget class="QPushButton" name="buttonApply">
+          <property name="text">
            <string>&amp;Apply</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item row="6" column="0" colspan="2" >
-       <widget class="QCheckBox" name="cbStart" >
-        <property name="text" >
+      <item row="6" column="0" colspan="2">
+       <widget class="QCheckBox" name="cbStart">
+        <property name="text">
          <string>Start with &amp;KDE</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="0" colspan="2" >
-       <widget class="QCheckBox" name="cbClick" >
-        <property name="text" >
+      <item row="5" column="0" colspan="2">
+       <widget class="QCheckBox" name="cbClick">
+        <property name="text">
          <string>A&amp;udible click</string>
         </property>
        </widget>
       </item>
+      <item row="3" column="1">
+       <widget class="QSpinBox" name="dragTimeEdit">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>1</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>40</number>
+        </property>
+        <property name="value">
+         <number>3</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="dwellTimeEdit">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>1</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>40</number>
+        </property>
+        <property name="value">
+         <number>5</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="movementEdit">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>1</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>40</number>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+   <item row="0" column="0">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="textLabel1" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+      <widget class="QLabel" name="textLabel1">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>KMouseTool will run as a background application after you close this \
dialog. To change the settings again, restart KMouseTool or use the KDE system \
tray.</string>  </property>
-       <property name="scaledContents" >
+       <property name="scaledContents">
         <bool>false</bool>
        </property>
-       <property name="alignment" >
+       <property name="alignment">
         <set>Qt::AlignJustify|Qt::AlignVCenter</set>
        </property>
-       <property name="wordWrap" >
+       <property name="wordWrap">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Fixed</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>8</width>
          <height>8</height>
@@ -297,44 +343,53 @@
       </spacer>
      </item>
      <item>
-      <widget class="KPushButton" name="buttonStartStop" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+      <widget class="QPushButton" name="buttonStartStop">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>&amp;Start</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="3" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+   <item row="3" column="0">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
       <number>0</number>
      </property>
      <item>
-      <widget class="KPushButton" name="buttonHelp" >
-       <property name="text" >
+      <widget class="QPushButton" name="buttonHelp">
+       <property name="text">
         <string>&amp;Help</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>241</width>
          <height>20</height>
@@ -343,15 +398,15 @@
       </spacer>
      </item>
      <item>
-      <widget class="KPushButton" name="buttonClose" >
-       <property name="text" >
+      <widget class="QPushButton" name="buttonClose">
+       <property name="text">
         <string>&amp;Close</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="KPushButton" name="buttonQuit" >
-       <property name="text" >
+      <widget class="QPushButton" name="buttonQuit">
+       <property name="text">
         <string>&amp;Quit</string>
        </property>
       </widget>
@@ -360,21 +415,9 @@
    </item>
   </layout>
  </widget>
-  <customwidgets>
-  <customwidget>
-   <class>KIntSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>knuminput.h</header>
-  </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
- </customwidgets>
  <includes>
-  <include location="global" >knuminput.h</include>
-  <include location="global" >kpushbutton.h</include>
+  <include location="global">knuminput.h</include>
+  <include location="global">kpushbutton.h</include>
  </includes>
  <resources/>
  <connections>
@@ -384,27 +427,11 @@
    <receiver>dragTimeLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cbDrag</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>dragTimeEdit</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>20</x>
      <y>20</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
diff --git a/kmousetool/main.cpp b/kmousetool/main.cpp
index 7a103ad..3115c99 100644
--- a/kmousetool/main.cpp
+++ b/kmousetool/main.cpp
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 
     KMouseTool *kmousetool = new KMouseTool();
 
-    if (!KGlobal::config()->group("UserOptions").readEntry("IsMinimized", false))
+    if (!KSharedConfig::openConfig()->group("UserOptions").readEntry("IsMinimized", \
false))  kmousetool->show();
 
     return a.exec();


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

Configure | About | News | Add a list | Sponsored by KoreLogic