-rw-r--r-- | core/settings/light-and-power/light.cpp | 64 | ||||
-rw-r--r-- | core/settings/light-and-power/lightsettingsbase.ui | 86 |
2 files changed, 36 insertions, 114 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index a58b1c1..8b98672 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp | |||
@@ -71,92 +71,88 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
71 | Config config ( "apm" ); | 71 | Config config ( "apm" ); |
72 | config. setGroup ( "Battery" ); | 72 | config. setGroup ( "Battery" ); |
73 | 73 | ||
74 | // battery spinboxes | 74 | // battery spinboxes |
75 | interval_dim-> setValue ( config. readNumEntry ( "Dim", 30 )); | 75 | interval_dim-> setValue ( config. readNumEntry ( "Dim", 30 )); |
76 | interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 20 )); | 76 | interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 20 )); |
77 | interval_suspend-> setValue ( config. readNumEntry ( "Suspend", 60 )); | 77 | interval_suspend-> setValue ( config. readNumEntry ( "Suspend", 60 )); |
78 | 78 | ||
79 | // battery check and slider | 79 | // battery check and slider |
80 | LcdOffOnly-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); | 80 | LcdOffOnly-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); |
81 | 81 | ||
82 | int bright = config. readNumEntry ( "Brightness", 127 ); | 82 | int bright = config. readNumEntry ( "Brightness", 127 ); |
83 | int contr = config. readNumEntry ( "Contrast", 127 ); | 83 | int contr = m_oldcontrast = config. readNumEntry ( "Contrast", 127 ); |
84 | brightness-> setMaxValue ( m_bres - 1 ); | 84 | brightness-> setTickInterval ( QMAX( 16, 256 / m_bres )); |
85 | brightness-> setTickInterval ( QMAX( 1, m_bres / 16 )); | 85 | brightness-> setLineStep ( QMAX( 1, 256 / m_bres )); |
86 | brightness-> setLineStep ( QMAX( 1, m_bres / 16 )); | 86 | brightness-> setPageStep ( QMAX( 1, 256 / m_bres )); |
87 | brightness-> setPageStep ( QMAX( 1, m_bres / 16 )); | 87 | brightness-> setValue ( bright ); |
88 | brightness-> setValue (( bright * ( m_bres - 1 ) + 127 ) / 255 ); | ||
89 | 88 | ||
90 | if (m_cres) { | 89 | if (m_cres) { |
91 | contrast-> setMaxValue ( m_cres - 1 ); | 90 | contrast-> setTickInterval ( QMAX( 16, 256 / m_cres )); |
92 | contrast-> setTickInterval ( QMAX( 1, m_cres / 16 )); | 91 | contrast-> setLineStep ( QMAX( 1, 256 / m_cres )); |
93 | contrast-> setLineStep ( QMAX( 1, m_cres / 16 )); | 92 | contrast-> setPageStep ( QMAX( 1, 256 / m_cres )); |
94 | contrast-> setPageStep ( QMAX( 1, m_cres / 16 )); | 93 | contrast-> setValue ( contr ); |
95 | contrast-> setValue (( contr * ( m_cres - 1 ) + 127 ) / 255 ); | ||
96 | } | 94 | } |
97 | 95 | ||
98 | // light sensor | 96 | // light sensor |
99 | auto_brightness-> setChecked ( config. readBoolEntry ( "LightSensor", false )); | 97 | auto_brightness-> setChecked ( config. readBoolEntry ( "LightSensor", false )); |
100 | m_sensordata = config. readListEntry ( "LightSensorData", ';' ); | 98 | m_sensordata = config. readListEntry ( "LightSensorData", ';' ); |
101 | 99 | ||
102 | config. setGroup ( "AC" ); | 100 | config. setGroup ( "AC" ); |
103 | 101 | ||
104 | // ac spinboxes | 102 | // ac spinboxes |
105 | interval_dim_ac-> setValue ( config. readNumEntry ( "Dim", 60 )); | 103 | interval_dim_ac-> setValue ( config. readNumEntry ( "Dim", 60 )); |
106 | interval_lightoff_ac-> setValue ( config. readNumEntry ( "LightOff", 120 )); | 104 | interval_lightoff_ac-> setValue ( config. readNumEntry ( "LightOff", 120 )); |
107 | interval_suspend_ac-> setValue ( config. readNumEntry ( "Suspend", 0 )); | 105 | interval_suspend_ac-> setValue ( config. readNumEntry ( "Suspend", 0 )); |
108 | 106 | ||
109 | // ac check and slider | 107 | // ac check and slider |
110 | LcdOffOnly_ac-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); | 108 | LcdOffOnly_ac-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); |
111 | 109 | ||
112 | bright = config. readNumEntry ( "Brightness", 255 ); | 110 | bright = config. readNumEntry ( "Brightness", 255 ); |
113 | brightness_ac-> setMaxValue ( m_bres - 1 ); | 111 | brightness_ac-> setTickInterval ( QMAX( 16, 256 / m_bres )); |
114 | brightness_ac-> setTickInterval ( QMAX( 1, m_bres / 16 )); | 112 | brightness_ac-> setLineStep ( QMAX( 1, 256 / m_bres )); |
115 | brightness_ac-> setLineStep ( QMAX( 1, m_bres / 16 )); | 113 | brightness_ac-> setPageStep ( QMAX( 1, 256 / m_bres )); |
116 | brightness_ac-> setPageStep ( QMAX( 1, m_bres / 16 )); | 114 | brightness_ac-> setValue ( bright ); |
117 | brightness_ac-> setValue (( bright * ( m_bres - 1 ) + 127 ) / 255 ); | ||
118 | 115 | ||
119 | if (m_cres) { | 116 | if (m_cres) { |
120 | contr = config. readNumEntry ( "Contrast", 127); | 117 | contr = config. readNumEntry ( "Contrast", 127); |
121 | contrast_ac-> setMaxValue ( m_cres - 1 ); | 118 | contrast_ac-> setTickInterval ( QMAX( 16, 256 / m_cres )); |
122 | contrast_ac-> setTickInterval ( QMAX( 1, m_cres / 16 )); | 119 | contrast_ac-> setLineStep ( QMAX( 1, 256 / m_cres )); |
123 | contrast_ac-> setLineStep ( QMAX( 1, m_cres / 16 )); | 120 | contrast_ac-> setPageStep ( QMAX( 1, 256 / m_cres )); |
124 | contrast_ac-> setPageStep ( QMAX( 1, m_cres / 16 )); | 121 | contrast_ac-> setValue ( contr ); |
125 | contrast_ac-> setValue (( contr * ( m_cres - 1 ) + 127 ) / 255 ); | ||
126 | } | 122 | } |
127 | 123 | ||
128 | // light sensor | 124 | // light sensor |
129 | auto_brightness_ac-> setChecked ( config. readBoolEntry ( "LightSensor", false )); | 125 | auto_brightness_ac-> setChecked ( config. readBoolEntry ( "LightSensor", false )); |
130 | m_sensordata_ac = config. readListEntry ( "LightSensorData", ';' ); | 126 | m_sensordata_ac = config. readListEntry ( "LightSensorData", ';' ); |
131 | 127 | ||
132 | // advanced settings | 128 | // advanced settings |
133 | config. setGroup ( "Warnings" ); | 129 | config. setGroup ( "Warnings" ); |
134 | warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 ); | 130 | warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 ); |
135 | lowSpinBox-> setValue ( config. readNumEntry ( "powerverylow", 10 ) ); | 131 | lowSpinBox-> setValue ( config. readNumEntry ( "powerverylow", 10 ) ); |
136 | criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) ); | 132 | criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) ); |
137 | 133 | ||
138 | m_resettimer = new QTimer ( this ); | 134 | m_resettimer = new QTimer ( this ); |
139 | connect ( m_resettimer, SIGNAL( timeout ( )), this, SLOT( resetBacklight ( ))); | 135 | connect ( m_resettimer, SIGNAL( timeout ( )), this, SLOT( resetBacklight ( ))); |
140 | 136 | ||
141 | if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) { | 137 | if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) { |
142 | tabs-> setCurrentPage ( 0 ); | 138 | tabs-> setCurrentPage ( 0 ); |
143 | } | 139 | } |
144 | else { | 140 | else { |
145 | tabs-> setCurrentPage ( 1 ); | 141 | tabs-> setCurrentPage ( 1 ); |
146 | } | 142 | } |
147 | 143 | ||
148 | connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); | 144 | connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); |
149 | connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); | 145 | connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); |
150 | if (m_havecontrast) { | 146 | if (m_cres) { |
151 | connect ( contrast, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); | 147 | connect ( contrast, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); |
152 | connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); | 148 | connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); |
153 | } | 149 | } |
154 | } | 150 | } |
155 | 151 | ||
156 | LightSettings::~LightSettings ( ) | 152 | LightSettings::~LightSettings ( ) |
157 | { | 153 | { |
158 | } | 154 | } |
159 | 155 | ||
160 | void LightSettings::calibrateSensor ( ) | 156 | void LightSettings::calibrateSensor ( ) |
161 | { | 157 | { |
162 | Sensor *s = new Sensor ( m_sensordata, this ); | 158 | Sensor *s = new Sensor ( m_sensordata, this ); |
@@ -168,79 +164,69 @@ void LightSettings::calibrateSensor ( ) | |||
168 | 164 | ||
169 | void LightSettings::calibrateSensorAC ( ) | 165 | void LightSettings::calibrateSensorAC ( ) |
170 | { | 166 | { |
171 | Sensor *s = new Sensor ( m_sensordata_ac, this ); | 167 | Sensor *s = new Sensor ( m_sensordata_ac, this ); |
172 | connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int ))); | 168 | connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int ))); |
173 | s-> showMaximized ( ); | 169 | s-> showMaximized ( ); |
174 | s-> exec ( ); | 170 | s-> exec ( ); |
175 | delete s; | 171 | delete s; |
176 | } | 172 | } |
177 | 173 | ||
178 | void LightSettings::setBacklight ( int bright ) | 174 | void LightSettings::setBacklight ( int bright ) |
179 | { | 175 | { |
180 | if ( bright >= 0 ) | ||
181 | bright = bright * 255 / ( m_bres - 1 ); | ||
182 | |||
183 | QCopEnvelope e ( "QPE/System", "setBacklight(int)" ); | 176 | QCopEnvelope e ( "QPE/System", "setBacklight(int)" ); |
184 | e << bright; | 177 | e << bright; |
185 | 178 | ||
186 | if ( bright != -1 ) { | 179 | if ( bright != -1 ) { |
187 | m_resettimer-> stop ( ); | 180 | m_resettimer-> stop ( ); |
188 | m_resettimer-> start ( 2000, true ); | 181 | m_resettimer-> start ( 4000, true ); |
189 | } | 182 | } |
190 | } | 183 | } |
191 | 184 | ||
192 | void LightSettings::setContrast ( int contr ) | 185 | void LightSettings::setContrast ( int contr ) |
193 | { | 186 | { |
194 | if ( contr >= 0 ) | 187 | if (contr == -1) contr = m_oldcontrast; |
195 | contr = contr * 255 / ( m_cres - 1 ); | ||
196 | |||
197 | QCopEnvelope e ( "QPE/System", "setContrast(int)" ); | ||
198 | e << contr; | ||
199 | 188 | ||
200 | if ( contr != -1 ) { | 189 | ODevice::inst ( )-> setDisplayContrast(contr); |
201 | m_resettimer-> stop ( ); | ||
202 | m_resettimer-> start ( 2000, true ); | ||
203 | } | ||
204 | } | 190 | } |
205 | 191 | ||
206 | void LightSettings::resetBacklight ( ) | 192 | void LightSettings::resetBacklight ( ) |
207 | { | 193 | { |
208 | setBacklight ( -1 ); | 194 | setBacklight ( -1 ); |
209 | setContrast ( -1 ); | 195 | setContrast ( -1 ); |
210 | } | 196 | } |
211 | 197 | ||
212 | void LightSettings::accept ( ) | 198 | void LightSettings::accept ( ) |
213 | { | 199 | { |
214 | Config config ( "apm" ); | 200 | Config config ( "apm" ); |
215 | 201 | ||
216 | // bat | 202 | // bat |
217 | config. setGroup ( "Battery" ); | 203 | config. setGroup ( "Battery" ); |
218 | config. writeEntry ( "LcdOffOnly", LcdOffOnly-> isChecked ( )); | 204 | config. writeEntry ( "LcdOffOnly", LcdOffOnly-> isChecked ( )); |
219 | config. writeEntry ( "Dim", interval_dim-> value ( )); | 205 | config. writeEntry ( "Dim", interval_dim-> value ( )); |
220 | config. writeEntry ( "LightOff", interval_lightoff-> value ( )); | 206 | config. writeEntry ( "LightOff", interval_lightoff-> value ( )); |
221 | config. writeEntry ( "Suspend", interval_suspend-> value ( )); | 207 | config. writeEntry ( "Suspend", interval_suspend-> value ( )); |
222 | config. writeEntry ( "Brightness", brightness-> value ( ) * 255 / ( m_bres - 1 ) ); | 208 | config. writeEntry ( "Brightness", brightness-> value () ); |
223 | if (m_cres) | 209 | if (m_cres) |
224 | config. writeEntry ( "Contrast", contrast-> value ( ) * 255 / ( m_cres - 1 ) ); | 210 | config. writeEntry ( "Contrast", contrast-> value () ); |
225 | 211 | ||
226 | // ac | 212 | // ac |
227 | config. setGroup ( "AC" ); | 213 | config. setGroup ( "AC" ); |
228 | config. writeEntry ( "LcdOffOnly", LcdOffOnly_ac-> isChecked ( )); | 214 | config. writeEntry ( "LcdOffOnly", LcdOffOnly_ac-> isChecked ( )); |
229 | config. writeEntry ( "Dim", interval_dim_ac-> value ( )); | 215 | config. writeEntry ( "Dim", interval_dim_ac-> value ( )); |
230 | config. writeEntry ( "LightOff", interval_lightoff_ac-> value ( )); | 216 | config. writeEntry ( "LightOff", interval_lightoff_ac-> value ( )); |
231 | config. writeEntry ( "Suspend", interval_suspend_ac-> value ( )); | 217 | config. writeEntry ( "Suspend", interval_suspend_ac-> value ( )); |
232 | config. writeEntry ( "Brightness", brightness_ac-> value ( ) * 255 / ( m_bres - 1 )); | 218 | config. writeEntry ( "Brightness", brightness_ac-> value () ); |
233 | if (m_cres) | 219 | if (m_cres) |
234 | config. writeEntry ( "Contrast", contrast_ac-> value ( ) * 255 / ( m_cres - 1 )); | 220 | config. writeEntry ( "Contrast", contrast_ac-> value () ); |
235 | 221 | ||
236 | // only make light sensor stuff appear if the unit has a sensor | 222 | // only make light sensor stuff appear if the unit has a sensor |
237 | if ( ODevice::inst ( )-> hasLightSensor ( )) { | 223 | if ( ODevice::inst ( )-> hasLightSensor ( )) { |
238 | config. setGroup ( "Battery" ); | 224 | config. setGroup ( "Battery" ); |
239 | config. writeEntry ( "LightSensor", auto_brightness->isChecked() ); | 225 | config. writeEntry ( "LightSensor", auto_brightness->isChecked() ); |
240 | config. writeEntry ( "LightSensorData", m_sensordata, ';' ); | 226 | config. writeEntry ( "LightSensorData", m_sensordata, ';' ); |
241 | config. setGroup ( "AC" ); | 227 | config. setGroup ( "AC" ); |
242 | config. writeEntry ( "LightSensor", auto_brightness_ac->isChecked() ); | 228 | config. writeEntry ( "LightSensor", auto_brightness_ac->isChecked() ); |
243 | config. writeEntry ( "LightSensorData", m_sensordata_ac, ';' ); | 229 | config. writeEntry ( "LightSensorData", m_sensordata_ac, ';' ); |
244 | } | 230 | } |
245 | 231 | ||
246 | // advanced | 232 | // advanced |
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui index 8fdd604..884c21c 100644 --- a/core/settings/light-and-power/lightsettingsbase.ui +++ b/core/settings/light-and-power/lightsettingsbase.ui | |||
@@ -2,25 +2,25 @@ | |||
2 | <class>LightSettingsBase</class> | 2 | <class>LightSettingsBase</class> |
3 | <widget> | 3 | <widget> |
4 | <class>QDialog</class> | 4 | <class>QDialog</class> |
5 | <property stdset="1"> | 5 | <property stdset="1"> |
6 | <name>name</name> | 6 | <name>name</name> |
7 | <cstring>LightSettingsBase</cstring> | 7 | <cstring>LightSettingsBase</cstring> |
8 | </property> | 8 | </property> |
9 | <property stdset="1"> | 9 | <property stdset="1"> |
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>355</width> | 14 | <width>347</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"> |
19 | <name>sizePolicy</name> | 19 | <name>sizePolicy</name> |
20 | <sizepolicy> | 20 | <sizepolicy> |
21 | <hsizetype>7</hsizetype> | 21 | <hsizetype>7</hsizetype> |
22 | <vsizetype>5</vsizetype> | 22 | <vsizetype>5</vsizetype> |
23 | </sizepolicy> | 23 | </sizepolicy> |
24 | </property> | 24 | </property> |
25 | <property stdset="1"> | 25 | <property stdset="1"> |
26 | <name>caption</name> | 26 | <name>caption</name> |
@@ -71,25 +71,25 @@ | |||
71 | <property stdset="1"> | 71 | <property stdset="1"> |
72 | <name>margin</name> | 72 | <name>margin</name> |
73 | <number>5</number> | 73 | <number>5</number> |
74 | </property> | 74 | </property> |
75 | <property stdset="1"> | 75 | <property stdset="1"> |
76 | <name>spacing</name> | 76 | <name>spacing</name> |
77 | <number>3</number> | 77 | <number>3</number> |
78 | </property> | 78 | </property> |
79 | <widget> | 79 | <widget> |
80 | <class>QGroupBox</class> | 80 | <class>QGroupBox</class> |
81 | <property stdset="1"> | 81 | <property stdset="1"> |
82 | <name>name</name> | 82 | <name>name</name> |
83 | <cstring>GroupBox3</cstring> | 83 | <cstring>Group1</cstring> |
84 | </property> | 84 | </property> |
85 | <property stdset="1"> | 85 | <property stdset="1"> |
86 | <name>enabled</name> | 86 | <name>enabled</name> |
87 | <bool>true</bool> | 87 | <bool>true</bool> |
88 | </property> | 88 | </property> |
89 | <property stdset="1"> | 89 | <property stdset="1"> |
90 | <name>title</name> | 90 | <name>title</name> |
91 | <string>General Settings</string> | 91 | <string>General Settings</string> |
92 | </property> | 92 | </property> |
93 | <property> | 93 | <property> |
94 | <name>layoutMargin</name> | 94 | <name>layoutMargin</name> |
95 | </property> | 95 | </property> |
@@ -131,43 +131,43 @@ | |||
131 | <name>minValue</name> | 131 | <name>minValue</name> |
132 | <number>0</number> | 132 | <number>0</number> |
133 | </property> | 133 | </property> |
134 | <property stdset="1"> | 134 | <property stdset="1"> |
135 | <name>lineStep</name> | 135 | <name>lineStep</name> |
136 | <number>10</number> | 136 | <number>10</number> |
137 | </property> | 137 | </property> |
138 | </widget> | 138 | </widget> |
139 | <widget row="1" column="0" > | 139 | <widget row="1" column="0" > |
140 | <class>QLabel</class> | 140 | <class>QLabel</class> |
141 | <property stdset="1"> | 141 | <property stdset="1"> |
142 | <name>name</name> | 142 | <name>name</name> |
143 | <cstring>TextLabel2_2</cstring> | 143 | <cstring>TL2</cstring> |
144 | </property> | 144 | </property> |
145 | <property stdset="1"> | 145 | <property stdset="1"> |
146 | <name>sizePolicy</name> | 146 | <name>sizePolicy</name> |
147 | <sizepolicy> | 147 | <sizepolicy> |
148 | <hsizetype>3</hsizetype> | 148 | <hsizetype>3</hsizetype> |
149 | <vsizetype>1</vsizetype> | 149 | <vsizetype>1</vsizetype> |
150 | </sizepolicy> | 150 | </sizepolicy> |
151 | </property> | 151 | </property> |
152 | <property stdset="1"> | 152 | <property stdset="1"> |
153 | <name>text</name> | 153 | <name>text</name> |
154 | <string>Light off after</string> | 154 | <string>Light off after</string> |
155 | </property> | 155 | </property> |
156 | </widget> | 156 | </widget> |
157 | <widget row="0" column="0" > | 157 | <widget row="0" column="0" > |
158 | <class>QLabel</class> | 158 | <class>QLabel</class> |
159 | <property stdset="1"> | 159 | <property stdset="1"> |
160 | <name>name</name> | 160 | <name>name</name> |
161 | <cstring>TextLabel1_3</cstring> | 161 | <cstring>TL1</cstring> |
162 | </property> | 162 | </property> |
163 | <property stdset="1"> | 163 | <property stdset="1"> |
164 | <name>sizePolicy</name> | 164 | <name>sizePolicy</name> |
165 | <sizepolicy> | 165 | <sizepolicy> |
166 | <hsizetype>3</hsizetype> | 166 | <hsizetype>3</hsizetype> |
167 | <vsizetype>1</vsizetype> | 167 | <vsizetype>1</vsizetype> |
168 | </sizepolicy> | 168 | </sizepolicy> |
169 | </property> | 169 | </property> |
170 | <property stdset="1"> | 170 | <property stdset="1"> |
171 | <name>text</name> | 171 | <name>text</name> |
172 | <string>Dim light after</string> | 172 | <string>Dim light after</string> |
173 | </property> | 173 | </property> |
@@ -229,25 +229,25 @@ | |||
229 | <name>minValue</name> | 229 | <name>minValue</name> |
230 | <number>0</number> | 230 | <number>0</number> |
231 | </property> | 231 | </property> |
232 | <property stdset="1"> | 232 | <property stdset="1"> |
233 | <name>lineStep</name> | 233 | <name>lineStep</name> |
234 | <number>10</number> | 234 | <number>10</number> |
235 | </property> | 235 | </property> |
236 | </widget> | 236 | </widget> |
237 | <widget row="2" column="0" > | 237 | <widget row="2" column="0" > |
238 | <class>QLabel</class> | 238 | <class>QLabel</class> |
239 | <property stdset="1"> | 239 | <property stdset="1"> |
240 | <name>name</name> | 240 | <name>name</name> |
241 | <cstring>TextLabel1_2</cstring> | 241 | <cstring>TL3</cstring> |
242 | </property> | 242 | </property> |
243 | <property stdset="1"> | 243 | <property stdset="1"> |
244 | <name>sizePolicy</name> | 244 | <name>sizePolicy</name> |
245 | <sizepolicy> | 245 | <sizepolicy> |
246 | <hsizetype>3</hsizetype> | 246 | <hsizetype>3</hsizetype> |
247 | <vsizetype>1</vsizetype> | 247 | <vsizetype>1</vsizetype> |
248 | </sizepolicy> | 248 | </sizepolicy> |
249 | </property> | 249 | </property> |
250 | <property stdset="1"> | 250 | <property stdset="1"> |
251 | <name>text</name> | 251 | <name>text</name> |
252 | <string>Suspend after</string> | 252 | <string>Suspend after</string> |
253 | </property> | 253 | </property> |
@@ -299,86 +299,54 @@ | |||
299 | </property> | 299 | </property> |
300 | <widget> | 300 | <widget> |
301 | <class>QSlider</class> | 301 | <class>QSlider</class> |
302 | <property stdset="1"> | 302 | <property stdset="1"> |
303 | <name>name</name> | 303 | <name>name</name> |
304 | <cstring>brightness</cstring> | 304 | <cstring>brightness</cstring> |
305 | </property> | 305 | </property> |
306 | <property stdset="1"> | 306 | <property stdset="1"> |
307 | <name>maxValue</name> | 307 | <name>maxValue</name> |
308 | <number>255</number> | 308 | <number>255</number> |
309 | </property> | 309 | </property> |
310 | <property stdset="1"> | 310 | <property stdset="1"> |
311 | <name>lineStep</name> | ||
312 | <number>1</number> | ||
313 | </property> | ||
314 | <property stdset="1"> | ||
315 | <name>pageStep</name> | ||
316 | <number>16</number> | ||
317 | </property> | ||
318 | <property stdset="1"> | ||
319 | <name>tracking</name> | ||
320 | <bool>true</bool> | ||
321 | </property> | ||
322 | <property stdset="1"> | ||
323 | <name>orientation</name> | 311 | <name>orientation</name> |
324 | <enum>Horizontal</enum> | 312 | <enum>Horizontal</enum> |
325 | </property> | 313 | </property> |
326 | <property stdset="1"> | 314 | <property stdset="1"> |
327 | <name>tickmarks</name> | 315 | <name>tickmarks</name> |
328 | <enum>Right</enum> | 316 | <enum>Right</enum> |
329 | </property> | 317 | </property> |
330 | <property stdset="1"> | ||
331 | <name>tickInterval</name> | ||
332 | <number>32</number> | ||
333 | </property> | ||
334 | <property> | 318 | <property> |
335 | <name>whatsThis</name> | 319 | <name>whatsThis</name> |
336 | <string>set a fix value for backlight</string> | 320 | <string>set a fix value for backlight</string> |
337 | </property> | 321 | </property> |
338 | </widget> | 322 | </widget> |
339 | <widget> | 323 | <widget> |
340 | <class>QSlider</class> | 324 | <class>QSlider</class> |
341 | <property stdset="1"> | 325 | <property stdset="1"> |
342 | <name>name</name> | 326 | <name>name</name> |
343 | <cstring>contrast</cstring> | 327 | <cstring>contrast</cstring> |
344 | </property> | 328 | </property> |
345 | <property stdset="1"> | 329 | <property stdset="1"> |
346 | <name>maxValue</name> | 330 | <name>maxValue</name> |
347 | <number>255</number> | 331 | <number>255</number> |
348 | </property> | 332 | </property> |
349 | <property stdset="1"> | 333 | <property stdset="1"> |
350 | <name>lineStep</name> | ||
351 | <number>1</number> | ||
352 | </property> | ||
353 | <property stdset="1"> | ||
354 | <name>pageStep</name> | ||
355 | <number>16</number> | ||
356 | </property> | ||
357 | <property stdset="1"> | ||
358 | <name>tracking</name> | ||
359 | <bool>true</bool> | ||
360 | </property> | ||
361 | <property stdset="1"> | ||
362 | <name>orientation</name> | 334 | <name>orientation</name> |
363 | <enum>Horizontal</enum> | 335 | <enum>Horizontal</enum> |
364 | </property> | 336 | </property> |
365 | <property stdset="1"> | 337 | <property stdset="1"> |
366 | <name>tickmarks</name> | 338 | <name>tickmarks</name> |
367 | <enum>Right</enum> | 339 | <enum>Right</enum> |
368 | </property> | 340 | </property> |
369 | <property stdset="1"> | ||
370 | <name>tickInterval</name> | ||
371 | <number>32</number> | ||
372 | </property> | ||
373 | <property> | 341 | <property> |
374 | <name>whatsThis</name> | 342 | <name>whatsThis</name> |
375 | <string>set a fix value for contrast</string> | 343 | <string>set a fix value for contrast</string> |
376 | </property> | 344 | </property> |
377 | </widget> | 345 | </widget> |
378 | <widget> | 346 | <widget> |
379 | <class>QLayoutWidget</class> | 347 | <class>QLayoutWidget</class> |
380 | <property stdset="1"> | 348 | <property stdset="1"> |
381 | <name>name</name> | 349 | <name>name</name> |
382 | <cstring>Layout10</cstring> | 350 | <cstring>Layout10</cstring> |
383 | </property> | 351 | </property> |
384 | <property> | 352 | <property> |
@@ -403,25 +371,25 @@ | |||
403 | <name>pixmap</name> | 371 | <name>pixmap</name> |
404 | <pixmap>image0</pixmap> | 372 | <pixmap>image0</pixmap> |
405 | </property> | 373 | </property> |
406 | <property stdset="1"> | 374 | <property stdset="1"> |
407 | <name>scaledContents</name> | 375 | <name>scaledContents</name> |
408 | <bool>false</bool> | 376 | <bool>false</bool> |
409 | </property> | 377 | </property> |
410 | </widget> | 378 | </widget> |
411 | <widget> | 379 | <widget> |
412 | <class>QLabel</class> | 380 | <class>QLabel</class> |
413 | <property stdset="1"> | 381 | <property stdset="1"> |
414 | <name>name</name> | 382 | <name>name</name> |
415 | <cstring>TextLabel4</cstring> | 383 | <cstring>TL4</cstring> |
416 | </property> | 384 | </property> |
417 | <property stdset="1"> | 385 | <property stdset="1"> |
418 | <name>text</name> | 386 | <name>text</name> |
419 | <string>Off</string> | 387 | <string>Off</string> |
420 | </property> | 388 | </property> |
421 | </widget> | 389 | </widget> |
422 | <spacer> | 390 | <spacer> |
423 | <property> | 391 | <property> |
424 | <name>name</name> | 392 | <name>name</name> |
425 | <cstring>Spacer2</cstring> | 393 | <cstring>Spacer2</cstring> |
426 | </property> | 394 | </property> |
427 | <property stdset="1"> | 395 | <property stdset="1"> |
@@ -435,25 +403,25 @@ | |||
435 | <property> | 403 | <property> |
436 | <name>sizeHint</name> | 404 | <name>sizeHint</name> |
437 | <size> | 405 | <size> |
438 | <width>20</width> | 406 | <width>20</width> |
439 | <height>20</height> | 407 | <height>20</height> |
440 | </size> | 408 | </size> |
441 | </property> | 409 | </property> |
442 | </spacer> | 410 | </spacer> |
443 | <widget> | 411 | <widget> |
444 | <class>QLabel</class> | 412 | <class>QLabel</class> |
445 | <property stdset="1"> | 413 | <property stdset="1"> |
446 | <name>name</name> | 414 | <name>name</name> |
447 | <cstring>TextLabel5</cstring> | 415 | <cstring>TL5</cstring> |
448 | </property> | 416 | </property> |
449 | <property stdset="1"> | 417 | <property stdset="1"> |
450 | <name>text</name> | 418 | <name>text</name> |
451 | <string>Full</string> | 419 | <string>Full</string> |
452 | </property> | 420 | </property> |
453 | </widget> | 421 | </widget> |
454 | <widget> | 422 | <widget> |
455 | <class>QLabel</class> | 423 | <class>QLabel</class> |
456 | <property stdset="1"> | 424 | <property stdset="1"> |
457 | <name>name</name> | 425 | <name>name</name> |
458 | <cstring>PixmapLabel1</cstring> | 426 | <cstring>PixmapLabel1</cstring> |
459 | </property> | 427 | </property> |
@@ -557,25 +525,25 @@ | |||
557 | <property stdset="1"> | 525 | <property stdset="1"> |
558 | <name>margin</name> | 526 | <name>margin</name> |
559 | <number>5</number> | 527 | <number>5</number> |
560 | </property> | 528 | </property> |
561 | <property stdset="1"> | 529 | <property stdset="1"> |
562 | <name>spacing</name> | 530 | <name>spacing</name> |
563 | <number>3</number> | 531 | <number>3</number> |
564 | </property> | 532 | </property> |
565 | <widget> | 533 | <widget> |
566 | <class>QGroupBox</class> | 534 | <class>QGroupBox</class> |
567 | <property stdset="1"> | 535 | <property stdset="1"> |
568 | <name>name</name> | 536 | <name>name</name> |
569 | <cstring>GroupBox4</cstring> | 537 | <cstring>Group3</cstring> |
570 | </property> | 538 | </property> |
571 | <property stdset="1"> | 539 | <property stdset="1"> |
572 | <name>enabled</name> | 540 | <name>enabled</name> |
573 | <bool>true</bool> | 541 | <bool>true</bool> |
574 | </property> | 542 | </property> |
575 | <property stdset="1"> | 543 | <property stdset="1"> |
576 | <name>title</name> | 544 | <name>title</name> |
577 | <string>General Settings</string> | 545 | <string>General Settings</string> |
578 | </property> | 546 | </property> |
579 | <property> | 547 | <property> |
580 | <name>layoutMargin</name> | 548 | <name>layoutMargin</name> |
581 | </property> | 549 | </property> |
@@ -753,25 +721,25 @@ | |||
753 | </property> | 721 | </property> |
754 | <property stdset="1"> | 722 | <property stdset="1"> |
755 | <name>text</name> | 723 | <name>text</name> |
756 | <string>Deactivate LCD only (does not suspend)</string> | 724 | <string>Deactivate LCD only (does not suspend)</string> |
757 | </property> | 725 | </property> |
758 | </widget> | 726 | </widget> |
759 | </grid> | 727 | </grid> |
760 | </widget> | 728 | </widget> |
761 | <widget> | 729 | <widget> |
762 | <class>QGroupBox</class> | 730 | <class>QGroupBox</class> |
763 | <property stdset="1"> | 731 | <property stdset="1"> |
764 | <name>name</name> | 732 | <name>name</name> |
765 | <cstring>GroupBox8</cstring> | 733 | <cstring>Group4</cstring> |
766 | </property> | 734 | </property> |
767 | <property stdset="1"> | 735 | <property stdset="1"> |
768 | <name>title</name> | 736 | <name>title</name> |
769 | <string>Backlight</string> | 737 | <string>Backlight</string> |
770 | </property> | 738 | </property> |
771 | <property> | 739 | <property> |
772 | <name>layoutMargin</name> | 740 | <name>layoutMargin</name> |
773 | </property> | 741 | </property> |
774 | <property> | 742 | <property> |
775 | <name>layoutSpacing</name> | 743 | <name>layoutSpacing</name> |
776 | </property> | 744 | </property> |
777 | <vbox> | 745 | <vbox> |
@@ -781,101 +749,69 @@ | |||
781 | </property> | 749 | </property> |
782 | <property stdset="1"> | 750 | <property stdset="1"> |
783 | <name>spacing</name> | 751 | <name>spacing</name> |
784 | <number>6</number> | 752 | <number>6</number> |
785 | </property> | 753 | </property> |
786 | <widget> | 754 | <widget> |
787 | <class>QSlider</class> | 755 | <class>QSlider</class> |
788 | <property stdset="1"> | 756 | <property stdset="1"> |
789 | <name>name</name> | 757 | <name>name</name> |
790 | <cstring>brightness_ac</cstring> | 758 | <cstring>brightness_ac</cstring> |
791 | </property> | 759 | </property> |
792 | <property stdset="1"> | 760 | <property stdset="1"> |
793 | <name>minValue</name> | ||
794 | <number>0</number> | ||
795 | </property> | ||
796 | <property stdset="1"> | ||
797 | <name>maxValue</name> | 761 | <name>maxValue</name> |
798 | <number>255</number> | 762 | <number>255</number> |
799 | </property> | 763 | </property> |
800 | <property stdset="1"> | 764 | <property stdset="1"> |
801 | <name>lineStep</name> | ||
802 | <number>16</number> | ||
803 | </property> | ||
804 | <property stdset="1"> | ||
805 | <name>pageStep</name> | ||
806 | <number>16</number> | ||
807 | </property> | ||
808 | <property stdset="1"> | ||
809 | <name>value</name> | 765 | <name>value</name> |
810 | <number>255</number> | 766 | <number>255</number> |
811 | </property> | 767 | </property> |
812 | <property stdset="1"> | 768 | <property stdset="1"> |
813 | <name>tracking</name> | ||
814 | <bool>true</bool> | ||
815 | </property> | ||
816 | <property stdset="1"> | ||
817 | <name>orientation</name> | 769 | <name>orientation</name> |
818 | <enum>Horizontal</enum> | 770 | <enum>Horizontal</enum> |
819 | </property> | 771 | </property> |
820 | <property stdset="1"> | 772 | <property stdset="1"> |
821 | <name>tickmarks</name> | 773 | <name>tickmarks</name> |
822 | <enum>Right</enum> | 774 | <enum>Right</enum> |
823 | </property> | 775 | </property> |
824 | <property> | 776 | <property> |
825 | <name>whatsThis</name> | 777 | <name>whatsThis</name> |
826 | <string>set a fix value for backlight</string> | 778 | <string>set a fix value for backlight</string> |
827 | </property> | 779 | </property> |
828 | </widget> | 780 | </widget> |
829 | <widget> | 781 | <widget> |
830 | <class>QSlider</class> | 782 | <class>QSlider</class> |
831 | <property stdset="1"> | 783 | <property stdset="1"> |
832 | <name>name</name> | 784 | <name>name</name> |
833 | <cstring>contrast_ac</cstring> | 785 | <cstring>contrast_ac</cstring> |
834 | </property> | 786 | </property> |
835 | <property stdset="1"> | 787 | <property stdset="1"> |
836 | <name>minValue</name> | ||
837 | <number>0</number> | ||
838 | </property> | ||
839 | <property stdset="1"> | ||
840 | <name>maxValue</name> | 788 | <name>maxValue</name> |
841 | <number>255</number> | 789 | <number>255</number> |
842 | </property> | 790 | </property> |
843 | <property stdset="1"> | 791 | <property stdset="1"> |
844 | <name>lineStep</name> | ||
845 | <number>16</number> | ||
846 | </property> | ||
847 | <property stdset="1"> | ||
848 | <name>pageStep</name> | ||
849 | <number>16</number> | ||
850 | </property> | ||
851 | <property stdset="1"> | ||
852 | <name>value</name> | 792 | <name>value</name> |
853 | <number>255</number> | 793 | <number>255</number> |
854 | </property> | 794 | </property> |
855 | <property stdset="1"> | 795 | <property stdset="1"> |
856 | <name>tracking</name> | ||
857 | <bool>true</bool> | ||
858 | </property> | ||
859 | <property stdset="1"> | ||
860 | <name>orientation</name> | 796 | <name>orientation</name> |
861 | <enum>Horizontal</enum> | 797 | <enum>Horizontal</enum> |
862 | </property> | 798 | </property> |
863 | <property stdset="1"> | 799 | <property stdset="1"> |
864 | <name>tickmarks</name> | 800 | <name>tickmarks</name> |
865 | <enum>Right</enum> | 801 | <enum>Right</enum> |
866 | </property> | 802 | </property> |
867 | <property> | 803 | <property> |
868 | <name>whatsThis</name> | 804 | <name>whatsThis</name> |
869 | <string>set a fix value for backlight</string> | 805 | <string>set a fix value for contrast</string> |
870 | </property> | 806 | </property> |
871 | </widget> | 807 | </widget> |
872 | <widget> | 808 | <widget> |
873 | <class>QLayoutWidget</class> | 809 | <class>QLayoutWidget</class> |
874 | <property stdset="1"> | 810 | <property stdset="1"> |
875 | <name>name</name> | 811 | <name>name</name> |
876 | <cstring>Layout20</cstring> | 812 | <cstring>Layout20</cstring> |
877 | </property> | 813 | </property> |
878 | <property> | 814 | <property> |
879 | <name>layoutSpacing</name> | 815 | <name>layoutSpacing</name> |
880 | </property> | 816 | </property> |
881 | <hbox> | 817 | <hbox> |
@@ -1051,25 +987,25 @@ | |||
1051 | <property stdset="1"> | 987 | <property stdset="1"> |
1052 | <name>margin</name> | 988 | <name>margin</name> |
1053 | <number>5</number> | 989 | <number>5</number> |
1054 | </property> | 990 | </property> |
1055 | <property stdset="1"> | 991 | <property stdset="1"> |
1056 | <name>spacing</name> | 992 | <name>spacing</name> |
1057 | <number>3</number> | 993 | <number>3</number> |
1058 | </property> | 994 | </property> |
1059 | <widget> | 995 | <widget> |
1060 | <class>QGroupBox</class> | 996 | <class>QGroupBox</class> |
1061 | <property stdset="1"> | 997 | <property stdset="1"> |
1062 | <name>name</name> | 998 | <name>name</name> |
1063 | <cstring>GroupBox5</cstring> | 999 | <cstring>Group5</cstring> |
1064 | </property> | 1000 | </property> |
1065 | <property stdset="1"> | 1001 | <property stdset="1"> |
1066 | <name>title</name> | 1002 | <name>title</name> |
1067 | <string>Warnings</string> | 1003 | <string>Warnings</string> |
1068 | </property> | 1004 | </property> |
1069 | <property> | 1005 | <property> |
1070 | <name>layoutMargin</name> | 1006 | <name>layoutMargin</name> |
1071 | </property> | 1007 | </property> |
1072 | <property> | 1008 | <property> |
1073 | <name>layoutSpacing</name> | 1009 | <name>layoutSpacing</name> |
1074 | </property> | 1010 | </property> |
1075 | <grid> | 1011 | <grid> |