summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/rotateapplet/rotate.cpp8
-rw-r--r--noncore/settings/appearance2/appearance.cpp24
-rw-r--r--noncore/settings/appearance2/appearance.h1
3 files changed, 25 insertions, 8 deletions
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index 0ead016..b490626 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -99,3 +99,3 @@ void RotateApplet::activated ( )
// 0 -> 90° clockwise, 1 -> 90° counterclockwise
- bool rotDirection = cfg.readBoolEntry( "rotatedir", 0 );
+ int rotDirection = cfg.readNumEntry( "rotatedir", 0 );
@@ -109,6 +109,8 @@ void RotateApplet::activated ( )
} else {
- if ( rotDirection ) {
+ if ( rotDirection == 1 ) {
newRotation = ( defaultRotation + 90 ) % 360;
- } else {
+ } else if ( rotDirection == 0 ) {
newRotation = ( defaultRotation + 270 ) % 360;
+ } else {
+ newRotation = ( defaultRotation + 180 ) % 360;
}
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 32234f0..83532de 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -411,2 +411,4 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
QPixmap ccw1;
+ m_rotdir_flip = new QRadioButton( tab, "rotdir_flip" );
+ QPixmap flip1 = Resource::loadIconSet("pass"). pixmap( );
QButtonGroup* rotbtngrp = new QButtonGroup( tab, "rotbuttongroup" );
@@ -417,2 +419,3 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
rotbtngrp-> insert ( m_rotdir_ccw );
+ rotbtngrp-> insert ( m_rotdir_flip );
@@ -421,2 +424,3 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
m_rotdir_ccw-> setPixmap( ccw1 );
+ m_rotdir_flip-> setPixmap( flip1 );
@@ -425,6 +429,8 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
rotLay-> addWidget ( m_rotdir_ccw, 0 );
+ rotLay-> addWidget ( m_rotdir_flip, 0 );
- bool rotcw = !(cfg. readBoolEntry ( "rotatedir", 0 ));
- m_rotdir_cw-> setChecked ( rotcw );
- m_rotdir_ccw-> setChecked ( !rotcw );
+ int rot = cfg. readNumEntry ( "rotatedir", 0 );
+ m_rotdir_cw-> setChecked ( rot == 0 );
+ m_rotdir_ccw-> setChecked ( rot == 1 );
+ m_rotdir_flip-> setChecked ( rot == 2 );
@@ -485,3 +491,2 @@ void Appearance::accept ( )
bool newtabpos = m_tabstyle_top-> isChecked ( );
- bool is_rotdir_ccw = m_rotdir_ccw-> isChecked ( );
int newtabstyle = m_tabstyle_list-> currentItem ( );
@@ -523,3 +528,12 @@ void Appearance::accept ( )
- config. writeEntry ( "rotatedir", is_rotdir_ccw );
+ bool is_rotdir_ccw = m_rotdir_ccw-> isChecked ( );
+ int rotval;
+ if (m_rotdir_ccw-> isChecked ( )) {
+ rotval = 1;
+ } else if (m_rotdir_cw-> isChecked ( )) {
+ rotval = 0;
+ } else {
+ rotval = 2;
+ }
+ config. writeEntry ( "rotatedir", rotval );
diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h
index 0e42298..da9e976 100644
--- a/noncore/settings/appearance2/appearance.h
+++ b/noncore/settings/appearance2/appearance.h
@@ -119,2 +119,3 @@ private:
QRadioButton *m_rotdir_ccw;
+ QRadioButton *m_rotdir_flip;