summaryrefslogtreecommitdiff
Side-by-side diff
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/lightsettingsbase.ui86
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
@@ -82,15 +82,13 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
int bright = config. readNumEntry ( "Brightness", 127 );
- int contr = config. readNumEntry ( "Contrast", 127 );
- brightness-> setMaxValue ( m_bres - 1 );
- brightness-> setTickInterval ( QMAX( 1, m_bres / 16 ));
- brightness-> setLineStep ( QMAX( 1, m_bres / 16 ));
- brightness-> setPageStep ( QMAX( 1, m_bres / 16 ));
- brightness-> setValue (( bright * ( m_bres - 1 ) + 127 ) / 255 );
+ int contr = m_oldcontrast = config. readNumEntry ( "Contrast", 127 );
+ brightness-> setTickInterval ( QMAX( 16, 256 / m_bres ));
+ brightness-> setLineStep ( QMAX( 1, 256 / m_bres ));
+ brightness-> setPageStep ( QMAX( 1, 256 / m_bres ));
+ brightness-> setValue ( bright );
if (m_cres) {
- contrast-> setMaxValue ( m_cres - 1 );
- contrast-> setTickInterval ( QMAX( 1, m_cres / 16 ));
- contrast-> setLineStep ( QMAX( 1, m_cres / 16 ));
- contrast-> setPageStep ( QMAX( 1, m_cres / 16 ));
- contrast-> setValue (( contr * ( m_cres - 1 ) + 127 ) / 255 );
+ contrast-> setTickInterval ( QMAX( 16, 256 / m_cres ));
+ contrast-> setLineStep ( QMAX( 1, 256 / m_cres ));
+ contrast-> setPageStep ( QMAX( 1, 256 / m_cres ));
+ contrast-> setValue ( contr );
}
@@ -112,7 +110,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
bright = config. readNumEntry ( "Brightness", 255 );
- brightness_ac-> setMaxValue ( m_bres - 1 );
- brightness_ac-> setTickInterval ( QMAX( 1, m_bres / 16 ));
- brightness_ac-> setLineStep ( QMAX( 1, m_bres / 16 ));
- brightness_ac-> setPageStep ( QMAX( 1, m_bres / 16 ));
- brightness_ac-> setValue (( bright * ( m_bres - 1 ) + 127 ) / 255 );
+ brightness_ac-> setTickInterval ( QMAX( 16, 256 / m_bres ));
+ brightness_ac-> setLineStep ( QMAX( 1, 256 / m_bres ));
+ brightness_ac-> setPageStep ( QMAX( 1, 256 / m_bres ));
+ brightness_ac-> setValue ( bright );
@@ -120,7 +117,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
contr = config. readNumEntry ( "Contrast", 127);
- contrast_ac-> setMaxValue ( m_cres - 1 );
- contrast_ac-> setTickInterval ( QMAX( 1, m_cres / 16 ));
- contrast_ac-> setLineStep ( QMAX( 1, m_cres / 16 ));
- contrast_ac-> setPageStep ( QMAX( 1, m_cres / 16 ));
- contrast_ac-> setValue (( contr * ( m_cres - 1 ) + 127 ) / 255 );
+ contrast_ac-> setTickInterval ( QMAX( 16, 256 / m_cres ));
+ contrast_ac-> setLineStep ( QMAX( 1, 256 / m_cres ));
+ contrast_ac-> setPageStep ( QMAX( 1, 256 / m_cres ));
+ contrast_ac-> setValue ( contr );
}
@@ -149,3 +145,3 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
- if (m_havecontrast) {
+ if (m_cres) {
connect ( contrast, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int )));
@@ -179,5 +175,2 @@ void LightSettings::setBacklight ( int bright )
{
- if ( bright >= 0 )
- bright = bright * 255 / ( m_bres - 1 );
-
QCopEnvelope e ( "QPE/System", "setBacklight(int)" );
@@ -187,3 +180,3 @@ void LightSettings::setBacklight ( int bright )
m_resettimer-> stop ( );
- m_resettimer-> start ( 2000, true );
+ m_resettimer-> start ( 4000, true );
}
@@ -193,12 +186,5 @@ void LightSettings::setContrast ( int contr )
{
- if ( contr >= 0 )
- contr = contr * 255 / ( m_cres - 1 );
-
- QCopEnvelope e ( "QPE/System", "setContrast(int)" );
- e << contr;
+ if (contr == -1) contr = m_oldcontrast;
- if ( contr != -1 ) {
- m_resettimer-> stop ( );
- m_resettimer-> start ( 2000, true );
- }
+ ODevice::inst ( )-> setDisplayContrast(contr);
}
@@ -221,5 +207,5 @@ void LightSettings::accept ( )
config. writeEntry ( "Suspend", interval_suspend-> value ( ));
- config. writeEntry ( "Brightness", brightness-> value ( ) * 255 / ( m_bres - 1 ) );
+ config. writeEntry ( "Brightness", brightness-> value () );
if (m_cres)
- config. writeEntry ( "Contrast", contrast-> value ( ) * 255 / ( m_cres - 1 ) );
+ config. writeEntry ( "Contrast", contrast-> value () );
@@ -231,5 +217,5 @@ void LightSettings::accept ( )
config. writeEntry ( "Suspend", interval_suspend_ac-> value ( ));
- config. writeEntry ( "Brightness", brightness_ac-> value ( ) * 255 / ( m_bres - 1 ));
+ config. writeEntry ( "Brightness", brightness_ac-> value () );
if (m_cres)
- config. writeEntry ( "Contrast", contrast_ac-> value ( ) * 255 / ( m_cres - 1 ));
+ config. writeEntry ( "Contrast", contrast_ac-> value () );
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
@@ -13,3 +13,3 @@
<y>0</y>
- <width>355</width>
+ <width>347</width>
<height>532</height>
@@ -82,3 +82,3 @@
<name>name</name>
- <cstring>GroupBox3</cstring>
+ <cstring>Group1</cstring>
</property>
@@ -142,3 +142,3 @@
<name>name</name>
- <cstring>TextLabel2_2</cstring>
+ <cstring>TL2</cstring>
</property>
@@ -160,3 +160,3 @@
<name>name</name>
- <cstring>TextLabel1_3</cstring>
+ <cstring>TL1</cstring>
</property>
@@ -240,3 +240,3 @@
<name>name</name>
- <cstring>TextLabel1_2</cstring>
+ <cstring>TL3</cstring>
</property>
@@ -310,14 +310,2 @@
<property stdset="1">
- <name>lineStep</name>
- <number>1</number>
- </property>
- <property stdset="1">
- <name>pageStep</name>
- <number>16</number>
- </property>
- <property stdset="1">
- <name>tracking</name>
- <bool>true</bool>
- </property>
- <property stdset="1">
<name>orientation</name>
@@ -329,6 +317,2 @@
</property>
- <property stdset="1">
- <name>tickInterval</name>
- <number>32</number>
- </property>
<property>
@@ -349,14 +333,2 @@
<property stdset="1">
- <name>lineStep</name>
- <number>1</number>
- </property>
- <property stdset="1">
- <name>pageStep</name>
- <number>16</number>
- </property>
- <property stdset="1">
- <name>tracking</name>
- <bool>true</bool>
- </property>
- <property stdset="1">
<name>orientation</name>
@@ -368,6 +340,2 @@
</property>
- <property stdset="1">
- <name>tickInterval</name>
- <number>32</number>
- </property>
<property>
@@ -414,3 +382,3 @@
<name>name</name>
- <cstring>TextLabel4</cstring>
+ <cstring>TL4</cstring>
</property>
@@ -446,3 +414,3 @@
<name>name</name>
- <cstring>TextLabel5</cstring>
+ <cstring>TL5</cstring>
</property>
@@ -568,3 +536,3 @@
<name>name</name>
- <cstring>GroupBox4</cstring>
+ <cstring>Group3</cstring>
</property>
@@ -764,3 +732,3 @@
<name>name</name>
- <cstring>GroupBox8</cstring>
+ <cstring>Group4</cstring>
</property>
@@ -792,6 +760,2 @@
<property stdset="1">
- <name>minValue</name>
- <number>0</number>
- </property>
- <property stdset="1">
<name>maxValue</name>
@@ -800,10 +764,2 @@
<property stdset="1">
- <name>lineStep</name>
- <number>16</number>
- </property>
- <property stdset="1">
- <name>pageStep</name>
- <number>16</number>
- </property>
- <property stdset="1">
<name>value</name>
@@ -812,6 +768,2 @@
<property stdset="1">
- <name>tracking</name>
- <bool>true</bool>
- </property>
- <property stdset="1">
<name>orientation</name>
@@ -835,6 +787,2 @@
<property stdset="1">
- <name>minValue</name>
- <number>0</number>
- </property>
- <property stdset="1">
<name>maxValue</name>
@@ -843,10 +791,2 @@
<property stdset="1">
- <name>lineStep</name>
- <number>16</number>
- </property>
- <property stdset="1">
- <name>pageStep</name>
- <number>16</number>
- </property>
- <property stdset="1">
<name>value</name>
@@ -855,6 +795,2 @@
<property stdset="1">
- <name>tracking</name>
- <bool>true</bool>
- </property>
- <property stdset="1">
<name>orientation</name>
@@ -868,3 +804,3 @@
<name>whatsThis</name>
- <string>set a fix value for backlight</string>
+ <string>set a fix value for contrast</string>
</property>
@@ -1062,3 +998,3 @@
<name>name</name>
- <cstring>GroupBox5</cstring>
+ <cstring>Group5</cstring>
</property>