summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-12-29 16:52:29 (UTC)
committer mickeyl <mickeyl>2003-12-29 16:52:29 (UTC)
commit2ecab614a6b91658b1608c62134cd14e257e55b7 (patch) (unidiff)
tree806d351238f4719f0c4ef6a720d9ff4e008003ea
parent8224dfc07a698d4c40cb240d315dc81b67512015 (diff)
downloadopie-2ecab614a6b91658b1608c62134cd14e257e55b7.zip
opie-2ecab614a6b91658b1608c62134cd14e257e55b7.tar.gz
opie-2ecab614a6b91658b1608c62134cd14e257e55b7.tar.bz2
- add customization of the action to take when closing the hinge
- hide hinge customization on models which doesn't support that - hide frequency label on models which doesn't support changing the CPU frequency
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp64
-rw-r--r--core/settings/light-and-power/light.h1
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui300
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
@@ -18,3 +18,3 @@
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
@@ -36,2 +36,3 @@
36 36
37#include <qlabel.h>
37#include <qcheckbox.h> 38#include <qcheckbox.h>
@@ -56,2 +57,4 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
56 57
58 // check whether to show the light sensor stuff
59
57 if ( !ODevice::inst ( )-> hasLightSensor ( )) { 60 if ( !ODevice::inst ( )-> hasLightSensor ( )) {
@@ -62,2 +65,5 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
62 } 65 }
66
67 // check whether to show the contrast stuff
68
63 if (m_cres) { 69 if (m_cres) {
@@ -70,2 +76,4 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
70 76
77 // check whether to show the cpu frequency stuff
78
71 QStrList freq = ODevice::inst()->allowedCpuFrequencies(); 79 QStrList freq = ODevice::inst()->allowedCpuFrequencies();
@@ -75,3 +83,5 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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();
@@ -79,2 +89,11 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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" );
@@ -93,3 +112,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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 );
@@ -112,3 +134,3 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
112 config. setGroup ( "AC" ); 134 config. setGroup ( "AC" );
113 135
114 // ac spinboxes 136 // ac spinboxes
@@ -124,2 +146,5 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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 );
@@ -141,4 +166,4 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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" );
@@ -152,3 +177,3 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
152 if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) { 177 if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) {
153 tabs-> setCurrentPage ( 0 ); 178 tabs-> setCurrentPage ( 0 );
154 } 179 }
@@ -157,3 +182,3 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
157 } 182 }
158 183
159 connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); 184 connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
@@ -164,6 +189,9 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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
168LightSettings::~LightSettings ( ) 196LightSettings::~LightSettings ( )
169{ 197{
@@ -193,3 +221,3 @@ void LightSettings::setBacklight ( int bright )
193 e << bright; 221 e << bright;
194 222
195 if ( bright != -1 ) { 223 if ( bright != -1 ) {
@@ -197,3 +225,3 @@ void LightSettings::setBacklight ( int bright )
197 m_resettimer-> start ( 4000, true ); 225 m_resettimer-> start ( 4000, true );
198 } 226 }
199} 227}
@@ -203,3 +231,2 @@ void LightSettings::setContrast ( int contr )
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);
@@ -209,3 +236,3 @@ void LightSettings::setFrequency ( int index )
209{ 236{
210qWarning("LightSettings::setFrequency(%d)", index); 237 qWarning("LightSettings::setFrequency(%d)", index);
211 ODevice::inst ( )-> setCurrentCpuFrequency(index); 238 ODevice::inst ( )-> setCurrentCpuFrequency(index);
@@ -219,2 +246,7 @@ void LightSettings::resetBacklight ( )
219 246
247void LightSettings::setCloseHingeAction ( int index )
248{
249 qWarning("LightSettings::setCloseHingeStatus(%d)", index);
250}
251
220void LightSettings::accept ( ) 252void LightSettings::accept ( )
@@ -233,2 +265,3 @@ void LightSettings::accept ( )
233 config. writeEntry ( "Freq", frequency->currentItem() ); 265 config. writeEntry ( "Freq", frequency->currentItem() );
266 config. writeEntry ( "CloseHingeAction", closeHingeAction->currentItem() );
234 267
@@ -244,4 +277,5 @@ void LightSettings::accept ( )
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 ( )) {
@@ -277,3 +311,3 @@ void LightSettings::done ( int r )
277 resetBacklight ( ); 311 resetBacklight ( );
278 312
279 LightSettingsBase::done ( r ); 313 LightSettingsBase::done ( r );
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
@@ -56,2 +56,3 @@ protected slots:
56 void setFrequency ( int ); 56 void setFrequency ( int );
57 void setCloseHingeAction ( int );
57 void resetBacklight ( ); 58 void resetBacklight ( );
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
@@ -13,3 +13,3 @@
13 <y>0</y> 13 <y>0</y>
14 <width>343</width> 14 <width>331</width>
15 <height>532</height> 15 <height>532</height>
@@ -107,34 +107,57 @@
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>
@@ -142,3 +165,3 @@
142 <name>name</name> 165 <name>name</name>
143 <cstring>TL1</cstring> 166 <cstring>frequencyLabel</cstring>
144 </property> 167 </property>
@@ -153,6 +176,17 @@
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>
@@ -187,75 +221,34 @@
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>
@@ -290,3 +283,3 @@
290 </widget> 283 </widget>
291 <widget row="3" column="1" > 284 <widget row="3" column="2" >
292 <class>QComboBox</class> 285 <class>QComboBox</class>
@@ -297,2 +290,45 @@
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>
@@ -554,3 +590,3 @@
554 <name>margin</name> 590 <name>margin</name>
555 <number>-1</number> 591 <number>5</number>
556 </property> 592 </property>
@@ -558,3 +594,3 @@
558 <name>spacing</name> 594 <name>spacing</name>
559 <number>-1</number> 595 <number>3</number>
560 </property> 596 </property>
@@ -620,20 +656,2 @@
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" >
@@ -700,2 +718,27 @@
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" >
@@ -718,3 +761,3 @@
718 </widget> 761 </widget>
719 <widget row="2" column="0" > 762 <widget row="0" column="0" >
720 <class>QLabel</class> 763 <class>QLabel</class>
@@ -722,3 +765,3 @@
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>
@@ -733,13 +776,24 @@
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>
@@ -761,14 +815,32 @@
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>
@@ -776,3 +848,3 @@
776 <name>text</name> 848 <name>text</name>
777 <string>CPU frequency</string> 849 <string>On closing the hinge</string>
778 </property> 850 </property>