Skip to content

Commit

Permalink
Added Backend DBUS method and fixed dbus xml file.
Browse files Browse the repository at this point in the history 
Created final UI for the KCM
  • Loading branch information
Radu Andries committed Oct 12, 2012
1 parent fd2a927 commit 108051c
Show file tree
Hide file tree
Showing 4 changed files with 111 additions and 149 deletions.
10 changes: 7 additions & 3 deletions common/switchablegraphics.xml
View file
Expand Up @@ -2,14 +2,18 @@
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.admiral0.Switchablegraphics">
<signal name="StatusChanged">
<arg direction="out" type="a(issiiiiii)" name="devs"/>
<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="DeviceList"/>
</signal>
<method name="Integrated" />
<method name="Discrete" />
<method name="Backend">
<arg name="name" type="s" direction="out" />
</method>
<method name="GetStatus">
<arg name="devicelist" type="a(issiiiiii)" direction="out">
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="DeviceList"/>
</method>
<signal name="StatusChanged">
<arg direction="out" type="a(issiiiiii)" name="devices"/>
</signal>
</interface>
</node>
241 changes: 96 additions & 145 deletions kcm/config.ui
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Form</class>
<widget class="QWidget" name="Form">
<class>switchablegraphics</class>
<widget class="QWidget" name="switchablegraphics">
<property name="geometry">
<rect>
<x>0</x>
Expand All @@ -13,212 +13,163 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="powerManagement">
<property name="text">
<string>Enable Power Management</string>
<widget class="QGroupBox" name="autoSwitch">
<property name="title">
<string>Enable Automatic Switch</string>
</property>
<property name="checked">
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QCheckBox" name="lowBatSwitchFlag">
<property name="text">
<string>Enable switch on low battery</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="perc_layout">
<item>
<widget class="QSlider" name="sliderPerc">
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>20</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="inputPerc">
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>20</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QCheckBox" name="statusIcon">
<property name="text">
<string>Enable status icon</string>
<widget class="QGroupBox" name="statusIconFlag">
<property name="title">
<string>Enable Status Icon</string>
</property>
<property name="checked">
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QCheckBox" name="notificationsFlag">
<property name="text">
<string>Enable Notifications</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="notifications">
<widget class="QLabel" name="infoLabel">
<property name="text">
<string>Enable notifications</string>
</property>
<property name="checked">
<bool>true</bool>
<string/>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>Switch at Low Battery Level:</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="batLevel_disp">
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="perc_disp">
<property name="text">
<string>%</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="1">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>389</width>
<height>20</height>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="desc_label">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="batteryLevel">
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>20</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>statusIcon</sender>
<signal>toggled(bool)</signal>
<receiver>notifications</receiver>
<slot>setEnabled(bool)</slot>
<sender>sliderPerc</sender>
<signal>valueChanged(int)</signal>
<receiver>inputPerc</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel">
<x>55</x>
<y>100</y>
<x>100</x>
<y>75</y>
</hint>
<hint type="destinationlabel">
<x>57</x>
<y>120</y>
<x>347</x>
<y>76</y>
</hint>
</hints>
</connection>
<connection>
<sender>powerManagement</sender>
<sender>lowBatSwitchFlag</sender>
<signal>toggled(bool)</signal>
<receiver>checkBox</receiver>
<receiver>sliderPerc</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>98</x>
<y>10</y>
<x>80</x>
<y>46</y>
</hint>
<hint type="destinationlabel">
<x>101</x>
<y>38</y>
<x>123</x>
<y>79</y>
</hint>
</hints>
</connection>
<connection>
<sender>powerManagement</sender>
<sender>lowBatSwitchFlag</sender>
<signal>toggled(bool)</signal>
<receiver>batteryLevel</receiver>
<receiver>inputPerc</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>133</x>
<y>13</y>
<x>258</x>
<y>43</y>
</hint>
<hint type="destinationlabel">
<x>184</x>
<y>68</y>
<x>361</x>
<y>67</y>
</hint>
</hints>
</connection>
<connection>
<sender>checkBox</sender>
<signal>toggled(bool)</signal>
<receiver>batteryLevel</receiver>
<slot>setEnabled(bool)</slot>
<sender>inputPerc</sender>
<signal>valueChanged(int)</signal>
<receiver>sliderPerc</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel">
<x>135</x>
<y>36</y>
<x>354</x>
<y>84</y>
</hint>
<hint type="destinationlabel">
<x>141</x>
<y>61</y>
<x>198</x>
<y>77</y>
</hint>
</hints>
</connection>
Expand Down
6 changes: 6 additions & 0 deletions kded/switchablegraphics.cpp
View file
Expand Up @@ -221,4 +221,10 @@ void SwitchableGraphics::switchDone(int result)
}
}

QString SwitchableGraphics::Backend()
{
return manager->getBackendName();
}


#include "switchablegraphics.moc"
3 changes: 2 additions & 1 deletion kded/switchablegraphics.h
View file
Expand Up @@ -40,8 +40,9 @@ public slots:
void Integrated();
void Discrete();
QList<SwitcherBackend::Device> GetStatus();
QString Backend();
signals:
void StatusChanged();
void StatusChanged(QList<SwitcherBackend::Device> dev);
private slots:
void updateUi(QList<SwitcherBackend::Device> devs);
void switchDone(int result);
Expand Down

0 comments on commit 108051c

Please sign in to comment.