Revision d2380bf...

Go back to digest for 17th March 2013

Features in Other

Alexander Maret-Huskinson committed changes in [wacomtablet] /:

Large GUI rework and more utility classes.

Reworked large parts of the KCM GUI:

* Merged TabletArea and ScreenArea widgets into a more flexible AreaSelectionWdiget, to get rid of a lot of code duplication.
* Changed GUI to merge the KCM tabs for pad mapping, touch mapping and the touch settings into one tab.
* Created TabletPageWidget class which holds the new tablet tab page for all the changed GUI elements.
* Created widgets ScreenAreaSelectionWidget and TabletAreaSelectionWidget and the corresponding dialog classes, which allow the user to map tablet <-> screen.
* Removed some obsolete GUI classes which were never used anyway.

Utility classes:

* Added X11Info which contains helper methods to query the X11 window system.
* Added X11Wacom which contains helper methods to query wacom tablets using Xinput.
* Moved the X11Input classes back to the common code as the KCM module needs them as well.
* Fixed a memory leak in the X11InputDevice class.

Beware! This commit breaks some features! Most notably the global shortcuts
for screen toggling and the tablet <-> screen mappings. These will be
fixed when the property cleanup is done.

File Changes

Added 14 files
  •   src/common/x11wacom.cpp
  •   src/kcmodule/areaselectionwidget.cpp
  •   src/kcmodule/areaselectionwidget.h
  •   src/kcmodule/screenareaselectiondialog.cpp
  •   src/kcmodule/screenareaselectionwidget.cpp
  •   src/kcmodule/screenareaselectionwidget.h
  •   src/kcmodule/screenareaselectionwidget.ui
  •   src/kcmodule/tabletareaselectiondialog.cpp
  •   src/kcmodule/tabletareaselectionwidget.cpp
  •   src/kcmodule/tabletareaselectionwidget.h
  •   src/kcmodule/tabletareaselectionwidget.ui
  •   src/kcmodule/tabletpagewidget.cpp
  •   src/kcmodule/tabletpagewidget.h
  •   src/kcmodule/tabletpagewidget.ui
Deleted 15 files
  • /kcmodule
  •   src/padmapping.cpp
  •   src/padmapping.h
  •   src/padmapping.ui
  •   src/screenarea.cpp
  •   src/screenarea.h
  •   src/screenwidget.cpp
  •   src/screenwidget.h
  •   src/screenwidget.ui
  •   src/selectquotetext.h
  •   src/selectquotetext.ui
  •   src/tabletarea.cpp
  •   src/tabletarea.h
  •   src/touchwidget.cpp
  •   src/touchwidget.h
  •   src/touchwidget.ui
Modified 12 files
  •   src/common/CMakeLists.txt
  •   src/common/property.h
  •   src/common/propertyadaptor.cpp
  •   src/common/propertyadaptor.h
  •   src/common/stringutils.cpp
  •   src/common/stringutils.h
  •   src/kcmodule/CMakeLists.txt
  •   src/kcmodule/padbuttonwidget.ui
  •   src/kcmodule/penwidget.h
  •   src/kcmodule/tabletwidget.cpp
  •   src/kded/CMakeLists.txt
  •   src/kded/xinputadaptor.cpp
41 files changed in total