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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/shells/desktop
From:       Chani Armitage <chanika () gmail ! com>
Date:       2009-08-17 22:34:17
Message-ID: 1250548457.588309.8326.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1012653 by chani:

A basic, ugly-as-sin config dialog

 M  +2 -1      CMakeLists.txt  
 A             ContextActions.ui  
 A             MouseInput.ui  
 M  +4 -0      backgrounddialog.cpp  
 A             contextactions.cpp   [License: UNKNOWN]
 A             contextactions.h   [License: UNKNOWN]


--- trunk/KDE/kdebase/workspace/plasma/shells/desktop/CMakeLists.txt #1012652:1012653
@@ -24,6 +24,7 @@
 set(plasma_SRCS
     backgrounddialog.cpp
     checkbox.cpp
+    contextactions.cpp
     dashboardview.cpp
     desktopcorona.cpp
     desktopview.cpp
@@ -39,7 +40,7 @@
 )
 
 
-kde4_add_ui_files(plasma_SRCS BackgroundDialog.ui globaloptions.ui)
+kde4_add_ui_files(plasma_SRCS BackgroundDialog.ui ContextActions.ui MouseInput.ui globaloptions.ui)
 kde4_add_kcfg_files(plasma_SRCS kcfg/plasma-shell-desktop.kcfgc)
 
 if(WIN32)
--- trunk/KDE/kdebase/workspace/plasma/shells/desktop/backgrounddialog.cpp #1012652:1012653
@@ -10,6 +10,7 @@
 */
 
 #include "backgrounddialog.h"
+#include "contextactions.h"
 
 #include <QPainter>
 #include <QFile>
@@ -400,6 +401,9 @@
 
     m_appearanceItem = addPage(main, i18n("Appearance"), "preferences-desktop-wallpaper");
 
+    ContextActions *ca = new ContextActions(m_containment, this);
+    connect(ca, SIGNAL(modified(bool)), this, SLOT(settingsModified(bool)));
+
     if (m_containment && m_containment->hasConfigurationInterface()) {
         m_containment->createConfigurationInterface(this);
     }
[prev in list] [next in list] [prev in thread] [next in thread]