[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/powerdevil
From: Dario Freddi <drf () kde ! org>
Date: 2010-10-21 11:22:28
Message-ID: 20101021112228.87E62AC897 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1188081 by dafre:
Prettify the config UIs
M +1 -1 daemon/actions/bundled/powerdevilbrightnesscontrolaction.desktop
M +1 -1 daemon/actions/bundled/powerdevildimdisplayaction.desktop
M +1 -1 daemon/actions/bundled/powerdevilhandlebuttoneventsaction.desktop
M +1 -1 daemon/actions/bundled/powerdevilrunscriptaction.desktop
M +1 -1 daemon/actions/bundled/powerdevilsuspendsessionaction.desktop
M +3 -2 kcmodule/EditPage.cpp
M +3 -0 kcmodule/GeneralPage.cpp
M +49 -0 kcmodule/generalPage.ui
M +1 -1 kcmodule/powerdevilglobalconfig.desktop
M +1 -1 kcmodule/powerdevilprofilesconfig.desktop
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/powerdevilbrightnesscontrolaction.desktop \
#1188080:1188081 @@ -2,7 +2,7 @@
Type=Service
X-KDE-ServiceTypes=PowerDevilAction
X-KDE-Library=powerdevilbrightnesscontrolaction_config
-Icon=preferences-desktop-screensaver
+Icon=preferences-system-power-management
Name=Display Brightness
Name[de]=Bildschirmhelligkeit
Name[es]=Brillo de la pantalla
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/powerdevildimdisplayaction.desktop \
#1188080:1188081 @@ -2,7 +2,7 @@
Type=Service
X-KDE-ServiceTypes=PowerDevilAction
# X-KDE-Library=powerdevildimdisplayaction
-Icon=preferences-desktop-screensaver
+Icon=preferences-desktop-display
Name=Dim Display
Name[de]=Bildschirm dimmen
Name[es]=Atenuación de pantalla
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/powerdevilhandlebuttoneventsaction.desktop \
#1188080:1188081 @@ -2,7 +2,7 @@
Type=Service
X-KDE-ServiceTypes=PowerDevilAction
# X-KDE-Library=powerdevilhandlebuttoneventsaction
-Icon=preferences-desktop-screensaver
+Icon=system-suspend
Name=Button events handling
Name[x-test]=xxButton events handlingxx
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/powerdevilrunscriptaction.desktop \
#1188080:1188081 @@ -2,7 +2,7 @@
Type=Service
X-KDE-ServiceTypes=PowerDevilAction
# X-KDE-Library=powerdevilrunscriptaction
-Icon=preferences-desktop-screensaver
+Icon=system-run
Name=Run Script
Name[de]=Skript ausführen
Name[es]=Ejecutar guión
--- trunk/KDE/kdebase/workspace/powerdevil/daemon/actions/bundled/powerdevilsuspendsessionaction.desktop \
#1188080:1188081 @@ -2,7 +2,7 @@
Type=Service
X-KDE-ServiceTypes=PowerDevilAction
# X-KDE-Library=powerdevilsuspendsessionaction
-Icon=preferences-desktop-screensaver
+Icon=system-shutdown
Name=Suspend Session
Name[de]=Sitzung in den Ruhezustand versetzen
Name[es]=Suspender la sesión
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/EditPage.cpp #1188080:1188081
@@ -118,7 +118,6 @@
connect(actionDeleteProfile, SIGNAL(triggered()), SLOT(deleteCurrentProfile()));
connect(actionNewProfile, SIGNAL(triggered()), SLOT(createProfile()));
- //connect(editProfileButton, SIGNAL(clicked()), SLOT(editProfile()));
connect(actionImportProfiles, SIGNAL(triggered()), SLOT(importProfiles()));
connect(actionExportProfiles, SIGNAL(triggered()), SLOT(exportProfiles()));
@@ -130,7 +129,6 @@
KService::List offers = KServiceTypeTrader::self()->query("PowerDevilAction", \
"(Type == 'Service')");
foreach (const KService::Ptr &offer, offers) {
-// KService::Ptr offer;
//try to load the specified library
KPluginFactory *factory = \
KPluginLoader(offer->property("X-KDE-PowerDevil-Action-UIComponentLibrary",
\
QVariant::String).toString()).factory(); @@ -151,6 +149,9 @@
connect(actionConfig, SIGNAL(changed()), this, SLOT(changed()));
QCheckBox *checkbox = new QCheckBox(offer->name());
+ if (!offer->icon().isEmpty()) {
+ checkbox->setIcon(KIcon(offer->icon()));
+ }
connect(checkbox, SIGNAL(stateChanged(int)), this, SLOT(changed()));
m_actionsHash.insert(offer->property("X-KDE-PowerDevil-Action-ID", \
QVariant::String).toString(), checkbox);
m_actionsConfigHash.insert(offer->property("X-KDE-PowerDevil-Action-ID", \
QVariant::String).toString(), actionConfig);
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/GeneralPage.cpp #1188080:1188081
@@ -64,6 +64,9 @@
++batteryCount;
}
+ eventsIconLabel->setPixmap(KIcon("preferences-desktop-notification").pixmap(24));
+ profileIconLabel->setPixmap(KIcon("preferences-system-power-management").pixmap(24));
+
reloadAvailableProfiles();
tabWidget->setTabIcon(0, KIcon("preferences-other"));
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/generalPage.ui #1188080:1188081
@@ -22,12 +22,38 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <property name="spacing">
+ <number>4</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="eventsIconLabel">
+ <property name="minimumSize">
+ <size>
+ <width>24</width>
+ <height>24</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QLabel" name="label">
<property name="text">
<string><b>Events</b></string>
</property>
</widget>
</item>
+ </layout>
+ </item>
<item>
<layout class="QFormLayout" name="formLayout_4">
<property name="leftMargin">
@@ -101,6 +127,27 @@
</layout>
</item>
<item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="profileIconLabel">
+ <property name="minimumSize">
+ <size>
+ <width>24</width>
+ <height>24</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>24</width>
+ <height>24</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QLabel" name="label_2">
<property name="text">
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" \
"http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -111,6 +158,8 @@
</property>
</widget>
</item>
+ </layout>
+ </item>
<item>
<layout class="QFormLayout" name="formLayout_3">
<property name="leftMargin">
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/powerdevilglobalconfig.desktop \
#1188080:1188081 @@ -1,6 +1,6 @@
[Desktop Entry]
Exec=kcmshell4 powerdevilglobalconfig
-Icon=preferences-system-power-management
+Icon=preferences-other
Type=Service
X-KDE-ServiceTypes=KCModule
X-DocPath=kcontrol/powerdevil/index.html
--- trunk/KDE/kdebase/workspace/powerdevil/kcmodule/powerdevilprofilesconfig.desktop \
#1188080:1188081 @@ -1,6 +1,6 @@
[Desktop Entry]
Exec=kcmshell4 powerdevilprofilesconfig
-Icon=preferences-system-power-management
+Icon=document-edit
Type=Service
X-KDE-ServiceTypes=KCModule
X-DocPath=kcontrol/powerdevil/index.html
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic