author | kergoth <kergoth> | 2003-04-18 22:17:38 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-18 22:17:38 (UTC) |
commit | 6e7112a3610c4e562f991ba6d6f33ca2fe0c605d (patch) (unidiff) | |
tree | ae90d7b8c36c49f109e3c2f231a119fc7fd5b799 | |
parent | d0852e67c15c5a973b7bc7f7bee238a6fd00dee6 (diff) | |
download | opie-6e7112a3610c4e562f991ba6d6f33ca2fe0c605d.zip opie-6e7112a3610c4e562f991ba6d6f33ca2fe0c605d.tar.gz opie-6e7112a3610c4e562f991ba6d6f33ca2fe0c605d.tar.bz2 |
Make appearance and rotate applet use the new rotation method of odevice.
-rw-r--r-- | core/applets/rotateapplet/rotate.cpp | 25 | ||||
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 27 |
2 files changed, 33 insertions, 19 deletions
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp index 04270f1..62567ed 100644 --- a/core/applets/rotateapplet/rotate.cpp +++ b/core/applets/rotateapplet/rotate.cpp | |||
@@ -36,6 +36,10 @@ | |||
36 | #include <qpopupmenu.h> | 36 | #include <qpopupmenu.h> |
37 | 37 | ||
38 | #include <opie/odevice.h> | ||
39 | |||
38 | #include "rotate.h" | 40 | #include "rotate.h" |
39 | 41 | ||
42 | using namespace Opie; | ||
43 | |||
40 | 44 | ||
41 | RotateApplet::RotateApplet ( ) | 45 | RotateApplet::RotateApplet ( ) |
@@ -114,12 +118,17 @@ void RotateApplet::activated ( ) | |||
114 | 118 | ||
115 | int defaultRotation = QPEApplication::defaultRotation(); | 119 | int defaultRotation = QPEApplication::defaultRotation(); |
116 | 120 | int newRotation = defaultRotation; | |
117 | int newRotation; | ||
118 | 121 | ||
119 | Config cfg( "qpe" ); | 122 | Config cfg( "qpe" ); |
120 | cfg.setGroup( "Appearance" ); | 123 | cfg.setGroup( "Appearance" ); |
121 | 124 | ||
122 | // 0 -> 90° clockwise, 1 -> 90° counterclockwise | 125 | int rotDirection = cfg.readNumEntry( "rotatedir" ); |
123 | int rotDirection = cfg.readNumEntry( "rotatedir", 0 ); | 126 | ODirection rot = CW; |
127 | |||
128 | if (rotDirection == -1) { | ||
129 | rot = ODevice::inst ( )-> direction ( ); | ||
130 | } else { | ||
131 | rot = (ODirection)rotDirection; | ||
132 | } | ||
124 | 133 | ||
125 | // hide inputs methods before rotation | 134 | // hide inputs methods before rotation |
@@ -131,9 +140,9 @@ void RotateApplet::activated ( ) | |||
131 | newRotation = defaultRotation; | 140 | newRotation = defaultRotation; |
132 | } else { | 141 | } else { |
133 | if ( rotDirection == 1 ) { | 142 | if ( rot == CCW ) { |
134 | newRotation = ( defaultRotation + 90 ) % 360; | 143 | newRotation = ( defaultRotation + 90 ) % 360; |
135 | } else if ( rotDirection == 0 ) { | 144 | } else if ( rot == CW ) { |
136 | newRotation = ( defaultRotation + 270 ) % 360; | 145 | newRotation = ( defaultRotation + 270 ) % 360; |
137 | } else { | 146 | } else if ( rot == Flip ) { |
138 | newRotation = ( defaultRotation + 180 ) % 360; | 147 | newRotation = ( defaultRotation + 180 ) % 360; |
139 | } | 148 | } |
@@ -164,4 +173,2 @@ Q_EXPORT_INTERFACE( ) | |||
164 | Q_CREATE_INSTANCE( RotateApplet ) | 173 | Q_CREATE_INSTANCE( RotateApplet ) |
165 | } | 174 | } |
166 | |||
167 | |||
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp index 83532de..c376ec7 100644 --- a/noncore/settings/appearance2/appearance.cpp +++ b/noncore/settings/appearance2/appearance.cpp | |||
@@ -430,8 +430,16 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg ) | |||
430 | rotLay-> addWidget ( m_rotdir_flip, 0 ); | 430 | rotLay-> addWidget ( m_rotdir_flip, 0 ); |
431 | 431 | ||
432 | int rot = cfg. readNumEntry ( "rotatedir", 0 ); | 432 | int rotDirection = cfg.readNumEntry( "rotatedir" ); |
433 | m_rotdir_cw-> setChecked ( rot == 0 ); | 433 | ODirection rot = CW; |
434 | m_rotdir_ccw-> setChecked ( rot == 1 ); | 434 | |
435 | m_rotdir_flip-> setChecked ( rot == 2 ); | 435 | if (rotDirection == -1) { |
436 | rot = ODevice::inst ( )-> direction ( ); | ||
437 | } else { | ||
438 | rot = (ODirection)rotDirection; | ||
439 | } | ||
440 | |||
441 | m_rotdir_cw-> setChecked ( rot == CW ); | ||
442 | m_rotdir_ccw-> setChecked ( rot == CCW ); | ||
443 | m_rotdir_flip-> setChecked ( rot == Flip ); | ||
436 | 444 | ||
437 | return tab; | 445 | return tab; |
@@ -527,14 +535,13 @@ void Appearance::accept ( ) | |||
527 | } | 535 | } |
528 | 536 | ||
529 | bool is_rotdir_ccw = m_rotdir_ccw-> isChecked ( ); | 537 | ODirection rot; |
530 | int rotval; | ||
531 | if (m_rotdir_ccw-> isChecked ( )) { | 538 | if (m_rotdir_ccw-> isChecked ( )) { |
532 | rotval = 1; | 539 | rot = CCW; |
533 | } else if (m_rotdir_cw-> isChecked ( )) { | 540 | } else if (m_rotdir_cw-> isChecked ( )) { |
534 | rotval = 0; | 541 | rot = CW; |
535 | } else { | 542 | } else { |
536 | rotval = 2; | 543 | rot = Flip; |
537 | } | 544 | } |
538 | config. writeEntry ( "rotatedir", rotval ); | 545 | config. writeEntry ( "rotatedir", (int)rot ); |
539 | 546 | ||
540 | m_except-> setFocus ( ); // if the focus was on the embedded line-edit, we have to move it away first, so the contents are updated | 547 | m_except-> setFocus ( ); // if the focus was on the embedded line-edit, we have to move it away first, so the contents are updated |