author | zautrix <zautrix> | 2004-10-23 11:40:59 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-23 11:40:59 (UTC) |
commit | 25b0233d54a6d4bea457fd843073e57183d8bea0 (patch) (unidiff) | |
tree | 4d85c3cec59e8b085738be7111c7e2bb0ee7219e /korganizer/ktimeedit.cpp | |
parent | ba2583db0431059cd7368be23c9653e81af16d29 (diff) | |
download | kdepimpi-25b0233d54a6d4bea457fd843073e57183d8bea0.zip kdepimpi-25b0233d54a6d4bea457fd843073e57183d8bea0.tar.gz kdepimpi-25b0233d54a6d4bea457fd843073e57183d8bea0.tar.bz2 |
global settings bugfixes
-rw-r--r-- | korganizer/ktimeedit.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp index cf07a1a..f5a1c50 100644 --- a/korganizer/ktimeedit.cpp +++ b/korganizer/ktimeedit.cpp | |||
@@ -28,12 +28,13 @@ | |||
28 | #include <qapplication.h> | 28 | #include <qapplication.h> |
29 | 29 | ||
30 | #include <kmessagebox.h> | 30 | #include <kmessagebox.h> |
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kdebug.h> | 32 | #include <kdebug.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | #include <kpimglobalprefs.h> | ||
34 | 35 | ||
35 | #include "ktimeedit.h" | 36 | #include "ktimeedit.h" |
36 | #include "koprefs.h" | 37 | #include "koprefs.h" |
37 | #include <qvalidator.h> | 38 | #include <qvalidator.h> |
38 | 39 | ||
39 | // Validator for a time value with only hours and minutes (no seconds) | 40 | // Validator for a time value with only hours and minutes (no seconds) |
@@ -108,13 +109,13 @@ KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name) | |||
108 | 109 | ||
109 | connect(this, SIGNAL(activated(int)), this, SLOT(activ(int))); | 110 | connect(this, SIGNAL(activated(int)), this, SLOT(activ(int))); |
110 | connect(this, SIGNAL(highlighted(int)), this, SLOT(hilit(int))); | 111 | connect(this, SIGNAL(highlighted(int)), this, SLOT(hilit(int))); |
111 | connect(this,SIGNAL(textChanged(const QString&)),this,SLOT(changedText())); | 112 | connect(this,SIGNAL(textChanged(const QString&)),this,SLOT(changedText())); |
112 | QFontMetrics fm ( font() ); | 113 | QFontMetrics fm ( font() ); |
113 | QString timeString = "24:00"; | 114 | QString timeString = "24:00"; |
114 | if ( KOPrefs::instance()->mPreferredTime == 1 ) | 115 | if ( KPimGlobalPrefs::instance()->mPreferredTime == 1 ) |
115 | timeString = "02:00pm"; | 116 | timeString = "02:00pm"; |
116 | int addSpace = 32; | 117 | int addSpace = 32; |
117 | if ( QApplication::desktop()->width() > 320 ) | 118 | if ( QApplication::desktop()->width() > 320 ) |
118 | timeString += ":00"; | 119 | timeString += ":00"; |
119 | setFixedWidth(fm.width( timeString ) + 32 ); | 120 | setFixedWidth(fm.width( timeString ) + 32 ); |
120 | 121 | ||
@@ -235,13 +236,13 @@ void KOTimeEdit::setSelect( int from, int to ) | |||
235 | 236 | ||
236 | 237 | ||
237 | void KOTimeEdit::keyPressEvent(QKeyEvent *e) | 238 | void KOTimeEdit::keyPressEvent(QKeyEvent *e) |
238 | { | 239 | { |
239 | 240 | ||
240 | qApp->processEvents(); | 241 | qApp->processEvents(); |
241 | bool hour12Format = ( KOPrefs::instance()->mPreferredTime == 1 ); | 242 | bool hour12Format = ( KPimGlobalPrefs::instance()->mPreferredTime == 1 ); |
242 | int maxpos = hour12Format?7:5; | 243 | int maxpos = hour12Format?7:5; |
243 | if ( e->isAutoRepeat() && !mFlagKeyPressed ) { | 244 | if ( e->isAutoRepeat() && !mFlagKeyPressed ) { |
244 | e->ignore(); | 245 | e->ignore(); |
245 | // qDebug(" ignore %d",e->isAutoRepeat() ); | 246 | // qDebug(" ignore %d",e->isAutoRepeat() ); |
246 | return; | 247 | return; |
247 | } | 248 | } |