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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/input
From:       Laurent Montel <montel () kde ! org>
Date:       2007-12-19 8:14:47
Message-ID: 1198052087.540817.14667.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 750421 by mlaurent:

Qt3/kde3support free


 M  +2 -2      CMakeLists.txt  
 M  +1 -15     kmousedlg.ui  
 M  +2 -8      logitechmouse_base.ui  
 M  +10 -6     mouse.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/input/CMakeLists.txt #750420:750421
@@ -41,7 +41,7 @@
 
 kde4_add_executable(kapplymousetheme ${kapplymousetheme_SRCS})
 
-target_link_libraries(kapplymousetheme  ${QT_QT3SUPPORT_LIBRARY}
+target_link_libraries(kapplymousetheme 
 ${KDE4_KDEUI_LIBS} ${X11_Xrender_LIB})
 if (X11_Xcursor_FOUND)
    target_link_libraries(kapplymousetheme ${X11_Xcursor_LIB})
@@ -60,7 +60,7 @@
 kde4_add_plugin(kcm_input ${kcm_input_PART_SRCS})
 
 
-target_link_libraries(kcm_input ${KDE4_KDE3SUPPORT_LIBS})
+target_link_libraries(kcm_input ${KDE4_KIO_LIBS})
 if (LIBUSB_FOUND)
    target_link_libraries(kcm_input ${LIBUSB_LIBRARIES})
 endif (LIBUSB_FOUND)
--- trunk/KDE/kdebase/workspace/kcontrol/input/kmousedlg.ui #750420:750421
@@ -11,7 +11,7 @@
   </property>
   <layout class="QVBoxLayout" >
    <item>
-    <widget class="Q3ButtonGroup" name="handedBox" >
+    <widget class="QGroupBox" name="handedBox" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
        <horstretch>0</horstretch>
@@ -21,12 +21,6 @@
      <property name="title" >
       <string>Button Order</string>
      </property>
-     <property name="exclusive" >
-      <bool>true</bool>
-     </property>
-     <property name="radioButtonExclusive" >
-      <bool>true</bool>
-     </property>
      <layout class="QGridLayout" >
       <item row="2" column="2" >
        <spacer>
@@ -310,14 +304,6 @@
  <layoutdefault spacing="6" margin="11" />
  <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>Q3ButtonGroup</class>
-   <extends>Q3GroupBox</extends>
-   <header>Qt3Support/Q3ButtonGroup</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>rightHanded</tabstop>
   <tabstop>leftHanded</tabstop>
--- trunk/KDE/kdebase/workspace/kcontrol/input/logitechmouse_base.ui #750420:750421
@@ -13,16 +13,13 @@
     </widget>
    </item>
    <item>
-    <widget class="Q3ButtonGroup" name="resolutionSelector" >
+    <widget class="QGroupBox" name="resolutionSelector" >
      <property name="enabled" >
       <bool>false</bool>
      </property>
      <property name="title" >
       <string>Sensor Resolution</string>
      </property>
-     <property name="radioButtonExclusive" >
-      <bool>true</bool>
-     </property>
      <layout class="QHBoxLayout" >
       <item>
        <widget class="QRadioButton" name="button400cpi" >
@@ -67,16 +64,13 @@
     </widget>
    </item>
    <item>
-    <widget class="Q3ButtonGroup" name="channelSelector" >
+    <widget class="QGroupBox" name="channelSelector" >
      <property name="enabled" >
       <bool>false</bool>
      </property>
      <property name="title" >
       <string>RF Channel</string>
      </property>
-     <property name="exclusive" >
-      <bool>true</bool>
-     </property>
      <layout class="QHBoxLayout" >
       <item>
        <widget class="QRadioButton" name="channel1" >
--- trunk/KDE/kdebase/workspace/kcontrol/input/mouse.cpp #750420:750421
@@ -104,17 +104,21 @@
     top->addWidget(tabwidget);
 
     tab1 = new KMouseDlg(this);
-    Q3ButtonGroup *group = new Q3ButtonGroup( tab1 );
+    QButtonGroup *group = new QButtonGroup( tab1 );
     group->setExclusive( true );
-    group->hide();
-    group->insert( tab1->singleClick );
-    group->insert( tab1->doubleClick );
+    group->addButton( tab1->singleClick );
+    group->addButton( tab1->doubleClick );
 
     tabwidget->addTab(tab1, i18n("&General"));
 
-    connect(tab1->handedBox, SIGNAL(clicked(int)), this, SLOT(changed()));
-    connect(tab1->handedBox, SIGNAL(clicked(int)), this, SLOT(slotHandedChanged(int)));
+    group = new QButtonGroup( tab1 );
+    group->setExclusive( true );
+    group->addButton( tab1->rightHanded,RIGHT_HANDED );
+    group->addButton( tab1->leftHanded,LEFT_HANDED );
 
+    connect(group, SIGNAL(buttonClicked(int)), this, SLOT(changed()));
+    connect(group, SIGNAL(buttonClicked(int)), this, SLOT(slotHandedChanged(int)));
+
     wtstr = i18n("If you are left-handed, you may prefer to swap the"
          " functions of the left and right buttons on your pointing device"
          " by choosing the 'left-handed' option. If your pointing device"
[prev in list] [next in list] [prev in thread] [next in thread]