-rw-r--r-- | core/settings/light-and-power/light.cpp | 64 | ||||
-rw-r--r-- | core/settings/light-and-power/light.h | 1 | ||||
-rw-r--r-- | core/settings/light-and-power/lightsettingsbase.ui | 300 |
3 files changed, 236 insertions, 129 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index 6115178..d6d09a1 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp | |||
@@ -15,9 +15,9 @@ | |||
15 | : .. .:, . . . without even the implied warranty of | 15 | : .. .:, . . . without even the implied warranty of |
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
18 | ..}^=.= = ; Public License for more details. | 18 | ..}^=.= = ; Public License for more details. |
19 | ++= -. .` .: | 19 | ++= -. .` .: |
20 | : = ...= . :.=- You should have received a copy of the GNU | 20 | : = ...= . :.=- You should have received a copy of the GNU |
21 | -. .:....=;==+<; General Public License along with this file; | 21 | -. .:....=;==+<; General Public License along with this file; |
22 | -_. . . )=. = see the file COPYING. If not, write to the | 22 | -_. . . )=. = see the file COPYING. If not, write to the |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
@@ -33,8 +33,9 @@ | |||
33 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 33 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
34 | #include <qpe/qcopenvelope_qws.h> | 34 | #include <qpe/qcopenvelope_qws.h> |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | #include <qlabel.h> | ||
37 | #include <qcheckbox.h> | 38 | #include <qcheckbox.h> |
38 | #include <qtabwidget.h> | 39 | #include <qtabwidget.h> |
39 | #include <qslider.h> | 40 | #include <qslider.h> |
40 | #include <qspinbox.h> | 41 | #include <qspinbox.h> |
@@ -53,31 +54,49 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
53 | { | 54 | { |
54 | m_bres = ODevice::inst ( )-> displayBrightnessResolution ( ); | 55 | m_bres = ODevice::inst ( )-> displayBrightnessResolution ( ); |
55 | m_cres = ODevice::inst ( )-> displayContrastResolution ( ); | 56 | m_cres = ODevice::inst ( )-> displayContrastResolution ( ); |
56 | 57 | ||
58 | // check whether to show the light sensor stuff | ||
59 | |||
57 | if ( !ODevice::inst ( )-> hasLightSensor ( )) { | 60 | if ( !ODevice::inst ( )-> hasLightSensor ( )) { |
58 | auto_brightness-> hide ( ); | 61 | auto_brightness-> hide ( ); |
59 | CalibrateLightSensor-> hide ( ); | 62 | CalibrateLightSensor-> hide ( ); |
60 | auto_brightness_ac-> hide ( ); | 63 | auto_brightness_ac-> hide ( ); |
61 | CalibrateLightSensor_ac-> hide ( ); | 64 | CalibrateLightSensor_ac-> hide ( ); |
62 | } | 65 | } |
66 | |||
67 | // check whether to show the contrast stuff | ||
68 | |||
63 | if (m_cres) { | 69 | if (m_cres) { |
64 | GroupLight->setTitle(tr("Backlight && Contrast")); | 70 | GroupLight->setTitle(tr("Backlight && Contrast")); |
65 | GroupLight_ac->setTitle(GroupLight->title()); | 71 | GroupLight_ac->setTitle(GroupLight->title()); |
66 | } else { | 72 | } else { |
67 | contrast->hide(); | 73 | contrast->hide(); |
68 | contrast_ac->hide(); | 74 | contrast_ac->hide(); |
69 | } | 75 | } |
70 | 76 | ||
77 | // check whether to show the cpu frequency stuff | ||
78 | |||
71 | QStrList freq = ODevice::inst()->allowedCpuFrequencies(); | 79 | QStrList freq = ODevice::inst()->allowedCpuFrequencies(); |
72 | if ( freq.count() ) { | 80 | if ( freq.count() ) { |
73 | frequency->insertStrList( freq ); | 81 | frequency->insertStrList( freq ); |
74 | frequency_ac->insertStrList( freq ); | 82 | frequency_ac->insertStrList( freq ); |
75 | } else { | 83 | } else { |
84 | frequencyLabel->hide(); | ||
76 | frequency->hide(); | 85 | frequency->hide(); |
86 | frequencyLabel_ac->hide(); | ||
77 | frequency_ac->hide(); | 87 | frequency_ac->hide(); |
78 | } | 88 | } |
79 | 89 | ||
90 | // check whether to show the hinge action stuff | ||
91 | |||
92 | if ( !ODevice::inst()->hasHingeSensor() ) { | ||
93 | closeHingeLabel->hide(); | ||
94 | closeHingeAction->hide(); | ||
95 | closeHingeLabel_ac->hide(); | ||
96 | closeHingeAction_ac->hide(); | ||
97 | } | ||
98 | |||
80 | Config config ( "apm" ); | 99 | Config config ( "apm" ); |
81 | config. setGroup ( "Battery" ); | 100 | config. setGroup ( "Battery" ); |
82 | 101 | ||
83 | // battery spinboxes | 102 | // battery spinboxes |
@@ -90,9 +109,12 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
90 | 109 | ||
91 | // CPU frequency | 110 | // CPU frequency |
92 | frequency->setCurrentItem( config.readNumEntry("Freq", 0) ); | 111 | frequency->setCurrentItem( config.readNumEntry("Freq", 0) ); |
93 | 112 | ||
94 | int bright = config. readNumEntry ( "Brightness", 127 ); | 113 | // hinge action |
114 | closeHingeAction->setCurrentItem( config.readNumEntry("CloseHingeAction", 0) ); | ||
115 | |||
116 | int bright = config. readNumEntry ( "Brightness", 127 ); | ||
95 | int contr = m_oldcontrast = config. readNumEntry ( "Contrast", 127 ); | 117 | int contr = m_oldcontrast = config. readNumEntry ( "Contrast", 127 ); |
96 | brightness-> setTickInterval ( QMAX( 16, 256 / m_bres )); | 118 | brightness-> setTickInterval ( QMAX( 16, 256 / m_bres )); |
97 | brightness-> setLineStep ( QMAX( 1, 256 / m_bres )); | 119 | brightness-> setLineStep ( QMAX( 1, 256 / m_bres )); |
98 | brightness-> setPageStep ( QMAX( 1, 256 / m_bres )); | 120 | brightness-> setPageStep ( QMAX( 1, 256 / m_bres )); |
@@ -109,9 +131,9 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
109 | auto_brightness-> setChecked ( config. readBoolEntry ( "LightSensor", false )); | 131 | auto_brightness-> setChecked ( config. readBoolEntry ( "LightSensor", false )); |
110 | m_sensordata = config. readListEntry ( "LightSensorData", ';' ); | 132 | m_sensordata = config. readListEntry ( "LightSensorData", ';' ); |
111 | 133 | ||
112 | config. setGroup ( "AC" ); | 134 | config. setGroup ( "AC" ); |
113 | 135 | ||
114 | // ac spinboxes | 136 | // ac spinboxes |
115 | interval_dim_ac-> setValue ( config. readNumEntry ( "Dim", 60 )); | 137 | interval_dim_ac-> setValue ( config. readNumEntry ( "Dim", 60 )); |
116 | interval_lightoff_ac-> setValue ( config. readNumEntry ( "LightOff", 120 )); | 138 | interval_lightoff_ac-> setValue ( config. readNumEntry ( "LightOff", 120 )); |
117 | interval_suspend_ac-> setValue ( config. readNumEntry ( "Suspend", 0 )); | 139 | interval_suspend_ac-> setValue ( config. readNumEntry ( "Suspend", 0 )); |
@@ -121,8 +143,11 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
121 | 143 | ||
122 | // CPU frequency | 144 | // CPU frequency |
123 | frequency_ac->setCurrentItem( config.readNumEntry("Freq", 0) ); | 145 | frequency_ac->setCurrentItem( config.readNumEntry("Freq", 0) ); |
124 | 146 | ||
147 | // hinge action | ||
148 | closeHingeAction_ac->setCurrentItem( config.readNumEntry("CloseHingeAction", 0) ); | ||
149 | |||
125 | bright = config. readNumEntry ( "Brightness", 255 ); | 150 | bright = config. readNumEntry ( "Brightness", 255 ); |
126 | brightness_ac-> setTickInterval ( QMAX( 16, 256 / m_bres )); | 151 | brightness_ac-> setTickInterval ( QMAX( 16, 256 / m_bres )); |
127 | brightness_ac-> setLineStep ( QMAX( 1, 256 / m_bres )); | 152 | brightness_ac-> setLineStep ( QMAX( 1, 256 / m_bres )); |
128 | brightness_ac-> setPageStep ( QMAX( 1, 256 / m_bres )); | 153 | brightness_ac-> setPageStep ( QMAX( 1, 256 / m_bres )); |
@@ -138,10 +163,10 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
138 | 163 | ||
139 | // light sensor | 164 | // light sensor |
140 | auto_brightness_ac-> setChecked ( config. readBoolEntry ( "LightSensor", false )); | 165 | auto_brightness_ac-> setChecked ( config. readBoolEntry ( "LightSensor", false )); |
141 | m_sensordata_ac = config. readListEntry ( "LightSensorData", ';' ); | 166 | m_sensordata_ac = config. readListEntry ( "LightSensorData", ';' ); |
142 | 167 | ||
143 | // advanced settings | 168 | // warnings |
144 | config. setGroup ( "Warnings" ); | 169 | config. setGroup ( "Warnings" ); |
145 | warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 ); | 170 | warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 ); |
146 | lowSpinBox-> setValue ( config. readNumEntry ( "powerverylow", 10 ) ); | 171 | lowSpinBox-> setValue ( config. readNumEntry ( "powerverylow", 10 ) ); |
147 | criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) ); | 172 | criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) ); |
@@ -149,24 +174,27 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
149 | m_resettimer = new QTimer ( this ); | 174 | m_resettimer = new QTimer ( this ); |
150 | connect ( m_resettimer, SIGNAL( timeout ( )), this, SLOT( resetBacklight ( ))); | 175 | connect ( m_resettimer, SIGNAL( timeout ( )), this, SLOT( resetBacklight ( ))); |
151 | 176 | ||
152 | if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) { | 177 | if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) { |
153 | tabs-> setCurrentPage ( 0 ); | 178 | tabs-> setCurrentPage ( 0 ); |
154 | } | 179 | } |
155 | else { | 180 | else { |
156 | tabs-> setCurrentPage ( 1 ); | 181 | tabs-> setCurrentPage ( 1 ); |
157 | } | 182 | } |
158 | 183 | ||
159 | connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); | 184 | connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); |
160 | connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); | 185 | connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); |
161 | if (m_cres) { | 186 | if (m_cres) { |
162 | connect ( contrast, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); | 187 | connect ( contrast, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); |
163 | connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); | 188 | connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); |
164 | } | 189 | } |
165 | connect( frequency, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) ); | 190 | connect( frequency, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) ); |
191 | connect( frequency_ac, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) ); | ||
192 | connect( closeHingeAction, SIGNAL( activated(int) ), this, SLOT( setCloseHingeAction(int) ) ); | ||
193 | connect( closeHingeAction_ac, SIGNAL( activated(int) ), this, SLOT( setCloseHingeAction(int) ) ); | ||
166 | } | 194 | } |
167 | 195 | ||
168 | LightSettings::~LightSettings ( ) | 196 | LightSettings::~LightSettings ( ) |
169 | { | 197 | { |
170 | } | 198 | } |
171 | 199 | ||
172 | void LightSettings::calibrateSensor ( ) | 200 | void LightSettings::calibrateSensor ( ) |
@@ -190,25 +218,24 @@ void LightSettings::calibrateSensorAC ( ) | |||
190 | void LightSettings::setBacklight ( int bright ) | 218 | void LightSettings::setBacklight ( int bright ) |
191 | { | 219 | { |
192 | QCopEnvelope e ( "QPE/System", "setBacklight(int)" ); | 220 | QCopEnvelope e ( "QPE/System", "setBacklight(int)" ); |
193 | e << bright; | 221 | e << bright; |
194 | 222 | ||
195 | if ( bright != -1 ) { | 223 | if ( bright != -1 ) { |
196 | m_resettimer-> stop ( ); | 224 | m_resettimer-> stop ( ); |
197 | m_resettimer-> start ( 4000, true ); | 225 | m_resettimer-> start ( 4000, true ); |
198 | } | 226 | } |
199 | } | 227 | } |
200 | 228 | ||
201 | void LightSettings::setContrast ( int contr ) | 229 | void LightSettings::setContrast ( int contr ) |
202 | { | 230 | { |
203 | if (contr == -1) contr = m_oldcontrast; | 231 | if (contr == -1) contr = m_oldcontrast; |
204 | |||
205 | ODevice::inst ( )-> setDisplayContrast(contr); | 232 | ODevice::inst ( )-> setDisplayContrast(contr); |
206 | } | 233 | } |
207 | 234 | ||
208 | void LightSettings::setFrequency ( int index ) | 235 | void LightSettings::setFrequency ( int index ) |
209 | { | 236 | { |
210 | qWarning("LightSettings::setFrequency(%d)", index); | 237 | qWarning("LightSettings::setFrequency(%d)", index); |
211 | ODevice::inst ( )-> setCurrentCpuFrequency(index); | 238 | ODevice::inst ( )-> setCurrentCpuFrequency(index); |
212 | } | 239 | } |
213 | 240 | ||
214 | void LightSettings::resetBacklight ( ) | 241 | void LightSettings::resetBacklight ( ) |
@@ -216,8 +243,13 @@ void LightSettings::resetBacklight ( ) | |||
216 | setBacklight ( -1 ); | 243 | setBacklight ( -1 ); |
217 | setContrast ( -1 ); | 244 | setContrast ( -1 ); |
218 | } | 245 | } |
219 | 246 | ||
247 | void LightSettings::setCloseHingeAction ( int index ) | ||
248 | { | ||
249 | qWarning("LightSettings::setCloseHingeStatus(%d)", index); | ||
250 | } | ||
251 | |||
220 | void LightSettings::accept ( ) | 252 | void LightSettings::accept ( ) |
221 | { | 253 | { |
222 | Config config ( "apm" ); | 254 | Config config ( "apm" ); |
223 | 255 | ||
@@ -230,8 +262,9 @@ void LightSettings::accept ( ) | |||
230 | config. writeEntry ( "Brightness", brightness-> value () ); | 262 | config. writeEntry ( "Brightness", brightness-> value () ); |
231 | if (m_cres) | 263 | if (m_cres) |
232 | config. writeEntry ( "Contrast", contrast-> value () ); | 264 | config. writeEntry ( "Contrast", contrast-> value () ); |
233 | config. writeEntry ( "Freq", frequency->currentItem() ); | 265 | config. writeEntry ( "Freq", frequency->currentItem() ); |
266 | config. writeEntry ( "CloseHingeAction", closeHingeAction->currentItem() ); | ||
234 | 267 | ||
235 | // ac | 268 | // ac |
236 | config. setGroup ( "AC" ); | 269 | config. setGroup ( "AC" ); |
237 | config. writeEntry ( "LcdOffOnly", LcdOffOnly_ac-> isChecked ( )); | 270 | config. writeEntry ( "LcdOffOnly", LcdOffOnly_ac-> isChecked ( )); |
@@ -241,10 +274,11 @@ void LightSettings::accept ( ) | |||
241 | config. writeEntry ( "Brightness", brightness_ac-> value () ); | 274 | config. writeEntry ( "Brightness", brightness_ac-> value () ); |
242 | if (m_cres) | 275 | if (m_cres) |
243 | config. writeEntry ( "Contrast", contrast_ac-> value () ); | 276 | config. writeEntry ( "Contrast", contrast_ac-> value () ); |
244 | config. writeEntry ( "Freq", frequency_ac->currentItem() ); | 277 | config. writeEntry ( "Freq", frequency_ac->currentItem() ); |
278 | config. writeEntry ( "CloseHingeAction", closeHingeAction_ac->currentItem() ); | ||
245 | 279 | ||
246 | // only make light sensor stuff appear if the unit has a sensor | 280 | // only make light sensor stuff appear if the unit has a sensor |
247 | if ( ODevice::inst ( )-> hasLightSensor ( )) { | 281 | if ( ODevice::inst ( )-> hasLightSensor ( )) { |
248 | config. setGroup ( "Battery" ); | 282 | config. setGroup ( "Battery" ); |
249 | config. writeEntry ( "LightSensor", auto_brightness->isChecked() ); | 283 | config. writeEntry ( "LightSensor", auto_brightness->isChecked() ); |
250 | config. writeEntry ( "LightSensorData", m_sensordata, ';' ); | 284 | config. writeEntry ( "LightSensorData", m_sensordata, ';' ); |
@@ -274,8 +308,8 @@ void LightSettings::accept ( ) | |||
274 | void LightSettings::done ( int r ) | 308 | void LightSettings::done ( int r ) |
275 | { | 309 | { |
276 | m_resettimer-> stop ( ); | 310 | m_resettimer-> stop ( ); |
277 | resetBacklight ( ); | 311 | resetBacklight ( ); |
278 | 312 | ||
279 | LightSettingsBase::done ( r ); | 313 | LightSettingsBase::done ( r ); |
280 | close ( ); | 314 | close ( ); |
281 | } | 315 | } |
diff --git a/core/settings/light-and-power/light.h b/core/settings/light-and-power/light.h index 83d5520..2167817 100644 --- a/core/settings/light-and-power/light.h +++ b/core/settings/light-and-power/light.h | |||
@@ -53,8 +53,9 @@ protected slots: | |||
53 | virtual void calibrateSensorAC ( ); | 53 | virtual void calibrateSensorAC ( ); |
54 | void setBacklight ( int ); | 54 | void setBacklight ( int ); |
55 | void setContrast ( int ); | 55 | void setContrast ( int ); |
56 | void setFrequency ( int ); | 56 | void setFrequency ( int ); |
57 | void setCloseHingeAction ( int ); | ||
57 | void resetBacklight ( ); | 58 | void resetBacklight ( ); |
58 | 59 | ||
59 | private: | 60 | private: |
60 | int m_bres; | 61 | int m_bres; |
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui index e4d5f0e..2af0331 100644 --- a/core/settings/light-and-power/lightsettingsbase.ui +++ b/core/settings/light-and-power/lightsettingsbase.ui | |||
@@ -10,9 +10,9 @@ | |||
10 | <name>geometry</name> | 10 | <name>geometry</name> |
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>343</width> | 14 | <width>331</width> |
15 | <height>532</height> | 15 | <height>532</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
18 | <property stdset="1"> | 18 | <property stdset="1"> |
@@ -104,44 +104,67 @@ | |||
104 | <property stdset="1"> | 104 | <property stdset="1"> |
105 | <name>spacing</name> | 105 | <name>spacing</name> |
106 | <number>3</number> | 106 | <number>3</number> |
107 | </property> | 107 | </property> |
108 | <widget row="1" column="1" > | 108 | <widget row="0" column="0" rowspan="1" colspan="2" > |
109 | <class>QSpinBox</class> | 109 | <class>QLabel</class> |
110 | <property stdset="1"> | 110 | <property stdset="1"> |
111 | <name>name</name> | 111 | <name>name</name> |
112 | <cstring>interval_lightoff</cstring> | 112 | <cstring>TL1</cstring> |
113 | </property> | 113 | </property> |
114 | <property stdset="1"> | 114 | <property stdset="1"> |
115 | <name>suffix</name> | 115 | <name>sizePolicy</name> |
116 | <string> sec</string> | 116 | <sizepolicy> |
117 | <hsizetype>3</hsizetype> | ||
118 | <vsizetype>1</vsizetype> | ||
119 | </sizepolicy> | ||
117 | </property> | 120 | </property> |
118 | <property stdset="1"> | 121 | <property stdset="1"> |
119 | <name>specialValueText</name> | 122 | <name>text</name> |
120 | <string>never</string> | 123 | <string>Dim light after</string> |
121 | </property> | 124 | </property> |
125 | </widget> | ||
126 | <widget row="2" column="0" rowspan="1" colspan="2" > | ||
127 | <class>QLabel</class> | ||
122 | <property stdset="1"> | 128 | <property stdset="1"> |
123 | <name>buttonSymbols</name> | 129 | <name>name</name> |
124 | <enum>PlusMinus</enum> | 130 | <cstring>TL3</cstring> |
125 | </property> | 131 | </property> |
126 | <property stdset="1"> | 132 | <property stdset="1"> |
127 | <name>maxValue</name> | 133 | <name>sizePolicy</name> |
128 | <number>3600</number> | 134 | <sizepolicy> |
135 | <hsizetype>3</hsizetype> | ||
136 | <vsizetype>1</vsizetype> | ||
137 | </sizepolicy> | ||
129 | </property> | 138 | </property> |
130 | <property stdset="1"> | 139 | <property stdset="1"> |
131 | <name>minValue</name> | 140 | <name>text</name> |
132 | <number>0</number> | 141 | <string>Suspend after</string> |
133 | </property> | 142 | </property> |
143 | </widget> | ||
144 | <widget row="4" column="0" rowspan="1" colspan="3" > | ||
145 | <class>QCheckBox</class> | ||
134 | <property stdset="1"> | 146 | <property stdset="1"> |
135 | <name>lineStep</name> | 147 | <name>name</name> |
136 | <number>10</number> | 148 | <cstring>LcdOffOnly</cstring> |
149 | </property> | ||
150 | <property stdset="1"> | ||
151 | <name>sizePolicy</name> | ||
152 | <sizepolicy> | ||
153 | <hsizetype>7</hsizetype> | ||
154 | <vsizetype>0</vsizetype> | ||
155 | </sizepolicy> | ||
156 | </property> | ||
157 | <property stdset="1"> | ||
158 | <name>text</name> | ||
159 | <string>Deactivate LCD only (does not suspend)</string> | ||
137 | </property> | 160 | </property> |
138 | </widget> | 161 | </widget> |
139 | <widget row="0" column="0" > | 162 | <widget row="3" column="0" rowspan="1" colspan="2" > |
140 | <class>QLabel</class> | 163 | <class>QLabel</class> |
141 | <property stdset="1"> | 164 | <property stdset="1"> |
142 | <name>name</name> | 165 | <name>name</name> |
143 | <cstring>TL1</cstring> | 166 | <cstring>frequencyLabel</cstring> |
144 | </property> | 167 | </property> |
145 | <property stdset="1"> | 168 | <property stdset="1"> |
146 | <name>sizePolicy</name> | 169 | <name>sizePolicy</name> |
147 | <sizepolicy> | 170 | <sizepolicy> |
@@ -150,12 +173,23 @@ | |||
150 | </sizepolicy> | 173 | </sizepolicy> |
151 | </property> | 174 | </property> |
152 | <property stdset="1"> | 175 | <property stdset="1"> |
153 | <name>text</name> | 176 | <name>text</name> |
154 | <string>Dim light after</string> | 177 | <string>CPU Frequency</string> |
155 | </property> | 178 | </property> |
156 | </widget> | 179 | </widget> |
157 | <widget row="0" column="1" > | 180 | <widget row="5" column="0" > |
181 | <class>QLabel</class> | ||
182 | <property stdset="1"> | ||
183 | <name>name</name> | ||
184 | <cstring>closeHingeLabel</cstring> | ||
185 | </property> | ||
186 | <property stdset="1"> | ||
187 | <name>text</name> | ||
188 | <string>On closing the hinge</string> | ||
189 | </property> | ||
190 | </widget> | ||
191 | <widget row="0" column="2" > | ||
158 | <class>QSpinBox</class> | 192 | <class>QSpinBox</class> |
159 | <property stdset="1"> | 193 | <property stdset="1"> |
160 | <name>name</name> | 194 | <name>name</name> |
161 | <cstring>interval_dim</cstring> | 195 | <cstring>interval_dim</cstring> |
@@ -184,81 +218,40 @@ | |||
184 | <name>lineStep</name> | 218 | <name>lineStep</name> |
185 | <number>10</number> | 219 | <number>10</number> |
186 | </property> | 220 | </property> |
187 | </widget> | 221 | </widget> |
188 | <widget row="4" column="0" rowspan="1" colspan="2" > | 222 | <widget row="1" column="2" > |
189 | <class>QCheckBox</class> | 223 | <class>QSpinBox</class> |
190 | <property stdset="1"> | ||
191 | <name>name</name> | ||
192 | <cstring>LcdOffOnly</cstring> | ||
193 | </property> | ||
194 | <property stdset="1"> | ||
195 | <name>sizePolicy</name> | ||
196 | <sizepolicy> | ||
197 | <hsizetype>7</hsizetype> | ||
198 | <vsizetype>0</vsizetype> | ||
199 | </sizepolicy> | ||
200 | </property> | ||
201 | <property stdset="1"> | ||
202 | <name>text</name> | ||
203 | <string>Deactivate LCD only (does not suspend)</string> | ||
204 | </property> | ||
205 | </widget> | ||
206 | <widget row="2" column="0" > | ||
207 | <class>QLabel</class> | ||
208 | <property stdset="1"> | 224 | <property stdset="1"> |
209 | <name>name</name> | 225 | <name>name</name> |
210 | <cstring>TL3</cstring> | 226 | <cstring>interval_lightoff</cstring> |
211 | </property> | ||
212 | <property stdset="1"> | ||
213 | <name>sizePolicy</name> | ||
214 | <sizepolicy> | ||
215 | <hsizetype>3</hsizetype> | ||
216 | <vsizetype>1</vsizetype> | ||
217 | </sizepolicy> | ||
218 | </property> | 227 | </property> |
219 | <property stdset="1"> | 228 | <property stdset="1"> |
220 | <name>text</name> | 229 | <name>suffix</name> |
221 | <string>Suspend after</string> | 230 | <string> sec</string> |
222 | </property> | ||
223 | </widget> | ||
224 | <widget row="1" column="0" > | ||
225 | <class>QLabel</class> | ||
226 | <property stdset="1"> | ||
227 | <name>name</name> | ||
228 | <cstring>TL2</cstring> | ||
229 | </property> | 231 | </property> |
230 | <property stdset="1"> | 232 | <property stdset="1"> |
231 | <name>sizePolicy</name> | 233 | <name>specialValueText</name> |
232 | <sizepolicy> | 234 | <string>never</string> |
233 | <hsizetype>3</hsizetype> | ||
234 | <vsizetype>1</vsizetype> | ||
235 | </sizepolicy> | ||
236 | </property> | 235 | </property> |
237 | <property stdset="1"> | 236 | <property stdset="1"> |
238 | <name>text</name> | 237 | <name>buttonSymbols</name> |
239 | <string>Light off after</string> | 238 | <enum>PlusMinus</enum> |
240 | </property> | 239 | </property> |
241 | </widget> | ||
242 | <widget row="3" column="0" > | ||
243 | <class>QLabel</class> | ||
244 | <property stdset="1"> | 240 | <property stdset="1"> |
245 | <name>name</name> | 241 | <name>maxValue</name> |
246 | <cstring>TL3_2</cstring> | 242 | <number>3600</number> |
247 | </property> | 243 | </property> |
248 | <property stdset="1"> | 244 | <property stdset="1"> |
249 | <name>sizePolicy</name> | 245 | <name>minValue</name> |
250 | <sizepolicy> | 246 | <number>0</number> |
251 | <hsizetype>3</hsizetype> | ||
252 | <vsizetype>1</vsizetype> | ||
253 | </sizepolicy> | ||
254 | </property> | 247 | </property> |
255 | <property stdset="1"> | 248 | <property stdset="1"> |
256 | <name>text</name> | 249 | <name>lineStep</name> |
257 | <string>CPU Frequency</string> | 250 | <number>10</number> |
258 | </property> | 251 | </property> |
259 | </widget> | 252 | </widget> |
260 | <widget row="2" column="1" > | 253 | <widget row="2" column="2" > |
261 | <class>QSpinBox</class> | 254 | <class>QSpinBox</class> |
262 | <property stdset="1"> | 255 | <property stdset="1"> |
263 | <name>name</name> | 256 | <name>name</name> |
264 | <cstring>interval_suspend</cstring> | 257 | <cstring>interval_suspend</cstring> |
@@ -287,15 +280,58 @@ | |||
287 | <name>lineStep</name> | 280 | <name>lineStep</name> |
288 | <number>10</number> | 281 | <number>10</number> |
289 | </property> | 282 | </property> |
290 | </widget> | 283 | </widget> |
291 | <widget row="3" column="1" > | 284 | <widget row="3" column="2" > |
292 | <class>QComboBox</class> | 285 | <class>QComboBox</class> |
293 | <property stdset="1"> | 286 | <property stdset="1"> |
294 | <name>name</name> | 287 | <name>name</name> |
295 | <cstring>frequency</cstring> | 288 | <cstring>frequency</cstring> |
296 | </property> | 289 | </property> |
297 | </widget> | 290 | </widget> |
291 | <widget row="5" column="1" rowspan="1" colspan="2" > | ||
292 | <class>QComboBox</class> | ||
293 | <item> | ||
294 | <property> | ||
295 | <name>text</name> | ||
296 | <string>ignore</string> | ||
297 | </property> | ||
298 | </item> | ||
299 | <item> | ||
300 | <property> | ||
301 | <name>text</name> | ||
302 | <string>display off</string> | ||
303 | </property> | ||
304 | </item> | ||
305 | <item> | ||
306 | <property> | ||
307 | <name>text</name> | ||
308 | <string>suspend</string> | ||
309 | </property> | ||
310 | </item> | ||
311 | <property stdset="1"> | ||
312 | <name>name</name> | ||
313 | <cstring>closeHingeAction</cstring> | ||
314 | </property> | ||
315 | </widget> | ||
316 | <widget row="1" column="0" > | ||
317 | <class>QLabel</class> | ||
318 | <property stdset="1"> | ||
319 | <name>name</name> | ||
320 | <cstring>TL2</cstring> | ||
321 | </property> | ||
322 | <property stdset="1"> | ||
323 | <name>sizePolicy</name> | ||
324 | <sizepolicy> | ||
325 | <hsizetype>3</hsizetype> | ||
326 | <vsizetype>1</vsizetype> | ||
327 | </sizepolicy> | ||
328 | </property> | ||
329 | <property stdset="1"> | ||
330 | <name>text</name> | ||
331 | <string>Light off after</string> | ||
332 | </property> | ||
333 | </widget> | ||
298 | </grid> | 334 | </grid> |
299 | </widget> | 335 | </widget> |
300 | <widget> | 336 | <widget> |
301 | <class>QGroupBox</class> | 337 | <class>QGroupBox</class> |
@@ -551,13 +587,13 @@ | |||
551 | </attribute> | 587 | </attribute> |
552 | <vbox> | 588 | <vbox> |
553 | <property stdset="1"> | 589 | <property stdset="1"> |
554 | <name>margin</name> | 590 | <name>margin</name> |
555 | <number>-1</number> | 591 | <number>5</number> |
556 | </property> | 592 | </property> |
557 | <property stdset="1"> | 593 | <property stdset="1"> |
558 | <name>spacing</name> | 594 | <name>spacing</name> |
559 | <number>-1</number> | 595 | <number>3</number> |
560 | </property> | 596 | </property> |
561 | <widget> | 597 | <widget> |
562 | <class>QGroupBox</class> | 598 | <class>QGroupBox</class> |
563 | <property stdset="1"> | 599 | <property stdset="1"> |
@@ -617,26 +653,8 @@ | |||
617 | <name>lineStep</name> | 653 | <name>lineStep</name> |
618 | <number>10</number> | 654 | <number>10</number> |
619 | </property> | 655 | </property> |
620 | </widget> | 656 | </widget> |
621 | <widget row="0" column="0" > | ||
622 | <class>QLabel</class> | ||
623 | <property stdset="1"> | ||
624 | <name>name</name> | ||
625 | <cstring>TextLabel1_3_2</cstring> | ||
626 | </property> | ||
627 | <property stdset="1"> | ||
628 | <name>sizePolicy</name> | ||
629 | <sizepolicy> | ||
630 | <hsizetype>3</hsizetype> | ||
631 | <vsizetype>1</vsizetype> | ||
632 | </sizepolicy> | ||
633 | </property> | ||
634 | <property stdset="1"> | ||
635 | <name>text</name> | ||
636 | <string>Dim light after</string> | ||
637 | </property> | ||
638 | </widget> | ||
639 | <widget row="2" column="1" > | 657 | <widget row="2" column="1" > |
640 | <class>QSpinBox</class> | 658 | <class>QSpinBox</class> |
641 | <property stdset="1"> | 659 | <property stdset="1"> |
642 | <name>name</name> | 660 | <name>name</name> |
@@ -697,8 +715,33 @@ | |||
697 | <name>lineStep</name> | 715 | <name>lineStep</name> |
698 | <number>10</number> | 716 | <number>10</number> |
699 | </property> | 717 | </property> |
700 | </widget> | 718 | </widget> |
719 | <widget row="3" column="1" > | ||
720 | <class>QComboBox</class> | ||
721 | <property stdset="1"> | ||
722 | <name>name</name> | ||
723 | <cstring>frequency_ac</cstring> | ||
724 | </property> | ||
725 | </widget> | ||
726 | <widget row="3" column="0" > | ||
727 | <class>QLabel</class> | ||
728 | <property stdset="1"> | ||
729 | <name>name</name> | ||
730 | <cstring>frequencyLabel_ac</cstring> | ||
731 | </property> | ||
732 | <property stdset="1"> | ||
733 | <name>sizePolicy</name> | ||
734 | <sizepolicy> | ||
735 | <hsizetype>3</hsizetype> | ||
736 | <vsizetype>1</vsizetype> | ||
737 | </sizepolicy> | ||
738 | </property> | ||
739 | <property stdset="1"> | ||
740 | <name>text</name> | ||
741 | <string>CPU Frequency</string> | ||
742 | </property> | ||
743 | </widget> | ||
701 | <widget row="1" column="0" > | 744 | <widget row="1" column="0" > |
702 | <class>QLabel</class> | 745 | <class>QLabel</class> |
703 | <property stdset="1"> | 746 | <property stdset="1"> |
704 | <name>name</name> | 747 | <name>name</name> |
@@ -715,13 +758,13 @@ | |||
715 | <name>text</name> | 758 | <name>text</name> |
716 | <string>Light off after</string> | 759 | <string>Light off after</string> |
717 | </property> | 760 | </property> |
718 | </widget> | 761 | </widget> |
719 | <widget row="2" column="0" > | 762 | <widget row="0" column="0" > |
720 | <class>QLabel</class> | 763 | <class>QLabel</class> |
721 | <property stdset="1"> | 764 | <property stdset="1"> |
722 | <name>name</name> | 765 | <name>name</name> |
723 | <cstring>TextLabel1_2_2_3</cstring> | 766 | <cstring>TextLabel1_3_2</cstring> |
724 | </property> | 767 | </property> |
725 | <property stdset="1"> | 768 | <property stdset="1"> |
726 | <name>sizePolicy</name> | 769 | <name>sizePolicy</name> |
727 | <sizepolicy> | 770 | <sizepolicy> |
@@ -730,19 +773,30 @@ | |||
730 | </sizepolicy> | 773 | </sizepolicy> |
731 | </property> | 774 | </property> |
732 | <property stdset="1"> | 775 | <property stdset="1"> |
733 | <name>text</name> | 776 | <name>text</name> |
734 | <string>Suspend after</string> | 777 | <string>Dim light after</string> |
735 | </property> | 778 | </property> |
736 | </widget> | 779 | </widget> |
737 | <widget row="3" column="1" > | 780 | <widget row="2" column="0" > |
738 | <class>QComboBox</class> | 781 | <class>QLabel</class> |
739 | <property stdset="1"> | 782 | <property stdset="1"> |
740 | <name>name</name> | 783 | <name>name</name> |
741 | <cstring>frequency_ac</cstring> | 784 | <cstring>TextLabel1_2_2_3</cstring> |
785 | </property> | ||
786 | <property stdset="1"> | ||
787 | <name>sizePolicy</name> | ||
788 | <sizepolicy> | ||
789 | <hsizetype>3</hsizetype> | ||
790 | <vsizetype>1</vsizetype> | ||
791 | </sizepolicy> | ||
792 | </property> | ||
793 | <property stdset="1"> | ||
794 | <name>text</name> | ||
795 | <string>Suspend after</string> | ||
742 | </property> | 796 | </property> |
743 | </widget> | 797 | </widget> |
744 | <widget row="4" column="0" > | 798 | <widget row="4" column="0" rowspan="1" colspan="2" > |
745 | <class>QCheckBox</class> | 799 | <class>QCheckBox</class> |
746 | <property stdset="1"> | 800 | <property stdset="1"> |
747 | <name>name</name> | 801 | <name>name</name> |
748 | <cstring>LcdOffOnly_ac</cstring> | 802 | <cstring>LcdOffOnly_ac</cstring> |
@@ -758,24 +812,42 @@ | |||
758 | <name>text</name> | 812 | <name>text</name> |
759 | <string>Deactivate LCD only (does not suspend)</string> | 813 | <string>Deactivate LCD only (does not suspend)</string> |
760 | </property> | 814 | </property> |
761 | </widget> | 815 | </widget> |
762 | <widget row="3" column="0" > | 816 | <widget row="5" column="1" > |
763 | <class>QLabel</class> | 817 | <class>QComboBox</class> |
818 | <item> | ||
819 | <property> | ||
820 | <name>text</name> | ||
821 | <string>ignore</string> | ||
822 | </property> | ||
823 | </item> | ||
824 | <item> | ||
825 | <property> | ||
826 | <name>text</name> | ||
827 | <string>display off</string> | ||
828 | </property> | ||
829 | </item> | ||
830 | <item> | ||
831 | <property> | ||
832 | <name>text</name> | ||
833 | <string>suspend</string> | ||
834 | </property> | ||
835 | </item> | ||
764 | <property stdset="1"> | 836 | <property stdset="1"> |
765 | <name>name</name> | 837 | <name>name</name> |
766 | <cstring>TextLabel1_2_2_3_2</cstring> | 838 | <cstring>closeHingeAction_ac</cstring> |
767 | </property> | 839 | </property> |
840 | </widget> | ||
841 | <widget row="5" column="0" > | ||
842 | <class>QLabel</class> | ||
768 | <property stdset="1"> | 843 | <property stdset="1"> |
769 | <name>sizePolicy</name> | 844 | <name>name</name> |
770 | <sizepolicy> | 845 | <cstring>closeHingeLabel_ac</cstring> |
771 | <hsizetype>3</hsizetype> | ||
772 | <vsizetype>1</vsizetype> | ||
773 | </sizepolicy> | ||
774 | </property> | 846 | </property> |
775 | <property stdset="1"> | 847 | <property stdset="1"> |
776 | <name>text</name> | 848 | <name>text</name> |
777 | <string>CPU frequency</string> | 849 | <string>On closing the hinge</string> |
778 | </property> | 850 | </property> |
779 | </widget> | 851 | </widget> |
780 | </grid> | 852 | </grid> |
781 | </widget> | 853 | </widget> |