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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/input
From:       Christoph Feck <christoph () maxiom ! de>
Date:       2010-10-05 13:16:33
Message-ID: 20101005131633.E1AC43E1F1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1182717 by cfeck:

Move Cursor Theme KCM to Workspace Appearance

This probably needs some documentation adjustments.

http://reviewboard.kde.org/r/5468/
CCMAIL: kde-i18n-doc@kde.org


 M  +21 -1     CMakeLists.txt  
 A             cursortheme.desktop  
 A             kcmcursortheme.cpp   [License: GPL (v2+)]
 A             kcmcursortheme.h   [License: GPL (v2+)]
 M  +0 -11     mouse.cpp  
 M  +0 -2      mouse.h  


--- trunk/KDE/kdebase/workspace/kcontrol/input/CMakeLists.txt #1182716:1182717
@@ -54,7 +54,7 @@
 
 ########### next target ###############
 
-set(kcm_input_PART_SRCS mouse.cpp main.cpp logitechmouse.cpp ${libnoinst_SRCS})
+set(kcm_input_PART_SRCS mouse.cpp main.cpp logitechmouse.cpp)
 
 
 kde4_add_ui_files(kcm_input_PART_SRCS kmousedlg.ui logitechmouse_base.ui )
@@ -76,9 +76,29 @@
 install(TARGETS kcm_input  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
+########### next target ###############
+
+set(kcm_cursortheme_PART_SRCS kcmcursortheme.cpp ${libnoinst_SRCS})
+
+kde4_add_plugin(kcm_cursortheme ${kcm_cursortheme_PART_SRCS})
+
+
+target_link_libraries(kcm_cursortheme ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
+
+if (X11_Xcursor_FOUND)
+   target_link_libraries(kcm_cursortheme ${X11_Xcursor_LIB})
+endif (X11_Xcursor_FOUND)
+if (X11_Xfixes_FOUND)
+   target_link_libraries(kcm_cursortheme ${X11_Xfixes_LIB})
+endif (X11_Xfixes_FOUND)
+
+install(TARGETS kcm_cursortheme  DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+
 ########### install files ###############
 
 install( FILES mouse.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+install( FILES cursortheme.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 install( FILES cursor_large_black.pcf.gz cursor_large_white.pcf.gz \
cursor_small_white.pcf.gz  DESTINATION  ${DATA_INSTALL_DIR}/kcminput )  install( \
FILES mouse_cursor_theme.upd  DESTINATION  ${KCONF_UPDATE_INSTALL_DIR} )  
--- trunk/KDE/kdebase/workspace/kcontrol/input/mouse.cpp #1182716:1182717
@@ -180,11 +180,6 @@
     connect(generalTab->cbScrollPolarity, SIGNAL(clicked()), this, SLOT(changed()));
     connect(generalTab->cbScrollPolarity, SIGNAL(clicked()), this, \
SLOT(slotScrollPolarityChanged()));  
-    // Cursor theme tab
-    themetab = new ThemePage(this);
-    connect(themetab, SIGNAL(changed(bool)), SLOT(changed()));
-    tabwidget->addTab(themetab, i18n("&Cursor Theme"));
-
     // Advanced tab
     advancedTab = new QWidget(0);
     advancedTab->setObjectName("Advanced Tab");
@@ -509,8 +504,6 @@
 
   mk_curve->setValue(group.readEntry("MKCurve", 0));
 
-  themetab->load();
-
   checkAccess();
 
   emit changed(false);
@@ -554,8 +547,6 @@
   group.sync();
   group.writeEntry("MKCurve", mk_curve->value());
 
-  themetab->save();
-
   // restart kaccess
   KToolInvocation::startServiceByDesktopName("kaccess");
 
@@ -586,8 +577,6 @@
   mk_max_speed->setValue(1000);
   mk_curve->setValue(0);
   
-  themetab->defaults();
-
   checkAccess();
 
   changed();
--- trunk/KDE/kdebase/workspace/kcontrol/input/mouse.h #1182716:1182717
@@ -49,7 +49,6 @@
 
 #include <kcmodule.h>
 #include "ui_kmousedlg.h"
-#include "themepage.h"
 
 #define RIGHT_HANDED 0
 #define LEFT_HANDED  1
@@ -148,7 +147,6 @@
   QTabWidget *tabwidget;
   QWidget *advancedTab;
   KMouseDlg* generalTab;
-  ThemePage* themetab;
   MouseSettings *settings;
 
  QCheckBox *mouseKeys;


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