author | zautrix <zautrix> | 2005-06-30 15:06:11 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-30 15:06:11 (UTC) |
commit | d401e425af46703a89eb80802606edeea06c9538 (patch) (unidiff) | |
tree | e32a98c44e340a6af6706fa99544cba648aa19f1 | |
parent | af48ba51eeb7a766ca7b458d2287e55c121388cf (diff) | |
download | kdepimpi-d401e425af46703a89eb80802606edeea06c9538.zip kdepimpi-d401e425af46703a89eb80802606edeea06c9538.tar.gz kdepimpi-d401e425af46703a89eb80802606edeea06c9538.tar.bz2 |
desk fixes
-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | korganizer/journalentry.cpp | 8 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 3 | ||||
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 6 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 14 |
5 files changed, 21 insertions, 12 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 214b829..d0de233 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2582,33 +2582,35 @@ void CalendarView::changeEventDisplay(Event *which, int action) | |||
2582 | mViewManager->currentView()->updateView(); | 2582 | mViewManager->currentView()->updateView(); |
2583 | } | 2583 | } |
2584 | } | 2584 | } |
2585 | 2585 | ||
2586 | 2586 | ||
2587 | void CalendarView::updateTodoViews() | 2587 | void CalendarView::updateTodoViews() |
2588 | { | 2588 | { |
2589 | mTodoList->updateView(); | 2589 | mTodoList->updateView(); |
2590 | mViewManager->currentView()->updateView(); | 2590 | mViewManager->currentView()->updateView(); |
2591 | 2591 | ||
2592 | } | 2592 | } |
2593 | 2593 | ||
2594 | 2594 | ||
2595 | void CalendarView::updateView(const QDate &start, const QDate &end) | 2595 | void CalendarView::updateView(const QDate &start, const QDate &end) |
2596 | { | 2596 | { |
2597 | #ifdef DESKTOP_VERSION | 2597 | #ifdef DESKTOP_VERSION |
2598 | mDateScrollBar->blockSignals( true ); | ||
2598 | mDateScrollBar->setValue( start.dayOfYear()-1); | 2599 | mDateScrollBar->setValue( start.dayOfYear()-1); |
2600 | mDateScrollBar->blockSignals( false ); | ||
2599 | #endif | 2601 | #endif |
2600 | mTodoList->updateView(); | 2602 | mTodoList->updateView(); |
2601 | mViewManager->updateView(start, end); | 2603 | mViewManager->updateView(start, end); |
2602 | //mDateNavigator->updateView(); | 2604 | //mDateNavigator->updateView(); |
2603 | } | 2605 | } |
2604 | 2606 | ||
2605 | void CalendarView::clearAllViews() | 2607 | void CalendarView::clearAllViews() |
2606 | { | 2608 | { |
2607 | mTodoList->clearList(); | 2609 | mTodoList->clearList(); |
2608 | mViewManager->clearAllViews(); | 2610 | mViewManager->clearAllViews(); |
2609 | SearchDialog * sd = mDialogManager->getSearchDialog(); | 2611 | SearchDialog * sd = mDialogManager->getSearchDialog(); |
2610 | if ( sd ) { | 2612 | if ( sd ) { |
2611 | KOListView* kol = sd->listview(); | 2613 | KOListView* kol = sd->listview(); |
2612 | if ( kol ) | 2614 | if ( kol ) |
2613 | kol->clearList(); | 2615 | kol->clearList(); |
2614 | } | 2616 | } |
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index ca8d5f7..3c38f34 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -44,33 +44,39 @@ | |||
44 | #include "koprefs.h" | 44 | #include "koprefs.h" |
45 | #include <klineedit.h> | 45 | #include <klineedit.h> |
46 | 46 | ||
47 | #include <libkcal/journal.h> | 47 | #include <libkcal/journal.h> |
48 | #include <libkcal/calendarresources.h> | 48 | #include <libkcal/calendarresources.h> |
49 | #include <libkcal/resourcecalendar.h> | 49 | #include <libkcal/resourcecalendar.h> |
50 | #include <kresources/resourceselectdialog.h> | 50 | #include <kresources/resourceselectdialog.h> |
51 | 51 | ||
52 | #include "journalentry.h" | 52 | #include "journalentry.h" |
53 | //#include "journalentry.moc" | 53 | //#include "journalentry.moc" |
54 | #ifndef DESKTOP_VERSION | 54 | #ifndef DESKTOP_VERSION |
55 | #include <qpe/qpeapplication.h> | 55 | #include <qpe/qpeapplication.h> |
56 | #endif | 56 | #endif |
57 | JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | 57 | JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : |
58 | QFrame(parent) | 58 | QFrame(parent) |
59 | { | 59 | { |
60 | heiHint = QApplication::desktop()->height() / 5 ; | 60 | |
61 | int fac = 5; | ||
62 | heiHint = QApplication::desktop()->height(); | ||
63 | if ( heiHint > 800 ) | ||
64 | fac += 2; | ||
65 | heiHint = heiHint / fac; | ||
66 | |||
61 | showOnlyMode = false; | 67 | showOnlyMode = false; |
62 | mCalendar = calendar; | 68 | mCalendar = calendar; |
63 | mJournal = 0; | 69 | mJournal = 0; |
64 | visibleMode = true; | 70 | visibleMode = true; |
65 | QHBox * vb = new QHBox ( this ); | 71 | QHBox * vb = new QHBox ( this ); |
66 | QPixmap iconp; | 72 | QPixmap iconp; |
67 | 73 | ||
68 | QPushButton * toggleJournal = new QPushButton( vb ); | 74 | QPushButton * toggleJournal = new QPushButton( vb ); |
69 | iconp = SmallIcon("1updownarrow"); | 75 | iconp = SmallIcon("1updownarrow"); |
70 | toggleJournal->setPixmap (iconp ) ; | 76 | toggleJournal->setPixmap (iconp ) ; |
71 | new QLabel(" "+i18n("Title: "),vb); | 77 | new QLabel(" "+i18n("Title: "),vb); |
72 | mTitle = new KLineEdit ( vb ); | 78 | mTitle = new KLineEdit ( vb ); |
73 | mTitleLabel = new QLabel(i18n("Title"),vb); | 79 | mTitleLabel = new QLabel(i18n("Title"),vb); |
74 | mTitleLabel->setMargin(0); | 80 | mTitleLabel->setMargin(0); |
75 | mTitleLabel->setAlignment(AlignCenter); | 81 | mTitleLabel->setAlignment(AlignCenter); |
76 | QPushButton * loadTemplate = new QPushButton( vb ); | 82 | QPushButton * loadTemplate = new QPushButton( vb ); |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 067c34c..ec1154a 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -1184,33 +1184,34 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
1184 | } | 1184 | } |
1185 | } | 1185 | } |
1186 | p.setPen(mDefaultTextColor); | 1186 | p.setPen(mDefaultTextColor); |
1187 | p.drawRect(0, 0, width(), height()); | 1187 | p.drawRect(0, 0, width(), height()); |
1188 | } else { | 1188 | } else { |
1189 | //qDebug("NO redraw "); | 1189 | //qDebug("NO redraw "); |
1190 | } | 1190 | } |
1191 | 1191 | ||
1192 | bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,CopyROP); | 1192 | bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,CopyROP); |
1193 | mRedrawNeeded = false; | 1193 | mRedrawNeeded = false; |
1194 | } | 1194 | } |
1195 | 1195 | ||
1196 | // ---------------------------------------------------------------------------- | 1196 | // ---------------------------------------------------------------------------- |
1197 | // R E SI Z E E V E N T H A N D L I N G | 1197 | // R E SI Z E E V E N T H A N D L I N G |
1198 | // ---------------------------------------------------------------------------- | 1198 | // ---------------------------------------------------------------------------- |
1199 | 1199 | ||
1200 | void KODayMatrix::resizeEvent(QResizeEvent *) | 1200 | void KODayMatrix::resizeEvent(QResizeEvent * e) |
1201 | { | 1201 | { |
1202 | QRect sz = frameRect(); | 1202 | QRect sz = frameRect(); |
1203 | daysize.setHeight(sz.height()*7 / NUMDAYS); | 1203 | daysize.setHeight(sz.height()*7 / NUMDAYS); |
1204 | daysize.setWidth(sz.width() / 7); | 1204 | daysize.setWidth(sz.width() / 7); |
1205 | QFrame::resizeEvent( e ); | ||
1205 | } | 1206 | } |
1206 | 1207 | ||
1207 | QSize KODayMatrix::sizeHint() const | 1208 | QSize KODayMatrix::sizeHint() const |
1208 | { | 1209 | { |
1209 | 1210 | ||
1210 | QFontMetrics fm ( font() ); | 1211 | QFontMetrics fm ( font() ); |
1211 | int wid = fm.width( "30") *7+3; | 1212 | int wid = fm.width( "30") *7+3; |
1212 | int hei = fm.height() * 6+3; | 1213 | int hei = fm.height() * 6+3; |
1213 | //qDebug("KODayMatrix::sizeHint()********************* %d %d", wid , hei); | 1214 | //qDebug("KODayMatrix::sizeHint()********************* %d %d", wid , hei); |
1214 | return QSize ( wid, hei ); | 1215 | return QSize ( wid, hei ); |
1215 | 1216 | ||
1216 | } | 1217 | } |
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 2fbcd42..e07bc53 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -171,39 +171,39 @@ void KOEditorGeneral::selectedCatPopup( int index ) | |||
171 | if ( categories.find ( colcat ) != categories.end () ) { | 171 | if ( categories.find ( colcat ) != categories.end () ) { |
172 | categories.remove( colcat ); | 172 | categories.remove( colcat ); |
173 | categories.prepend( colcat ); | 173 | categories.prepend( colcat ); |
174 | } | 174 | } |
175 | } | 175 | } |
176 | setCategories( categories.join(",") ); | 176 | setCategories( categories.join(",") ); |
177 | } | 177 | } |
178 | 178 | ||
179 | void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout) | 179 | void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout) |
180 | { | 180 | { |
181 | QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout ); | 181 | QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout ); |
182 | mCatPopup = new QPopupMenu ( parent ); | 182 | mCatPopup = new QPopupMenu ( parent ); |
183 | mCatPopup->setCheckable (true); | 183 | mCatPopup->setCheckable (true); |
184 | connect(mCatPopup,SIGNAL(aboutToShow () ), this ,SLOT(showCatPopup())); | 184 | connect(mCatPopup,SIGNAL(aboutToShow () ), this ,SLOT(showCatPopup())); |
185 | connect(mCatPopup,SIGNAL( activated ( int ) ), this ,SLOT(selectedCatPopup( int ))); | 185 | connect(mCatPopup,SIGNAL( activated ( int ) ), this ,SLOT(selectedCatPopup( int ))); |
186 | mCategoriesButton = new QPushButton(parent); | 186 | mCategoriesButton = new QPushButton(parent); |
187 | mCategoriesButton->setText(i18n("Categories")); | 187 | mCategoriesButton->setText(i18n("Categories...")); |
188 | connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() )); | ||
188 | //connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() )); | 189 | //connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() )); |
189 | categoriesLayout->addWidget(mCategoriesButton); | 190 | categoriesLayout->addWidget(mCategoriesButton); |
190 | mCategoriesButton->setPopup( mCatPopup ); | ||
191 | mCategoriesLabel = new QPushButton(parent);//new QLabel(parent); | 191 | mCategoriesLabel = new QPushButton(parent);//new QLabel(parent); |
192 | mCategoriesLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); | 192 | mCategoriesLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); |
193 | connect(mCategoriesLabel,SIGNAL(clicked()),this, SLOT(editCategories() )); | 193 | mCategoriesLabel->setPopup( mCatPopup ); |
194 | //mCategoriesLabel->setFrameStyle(QFrame::Panel|QFrame::Sunken); | 194 | //mCategoriesLabel->setFrameStyle(QFrame::Panel|QFrame::Sunken); |
195 | categoriesLayout->addWidget(mCategoriesLabel,1); | 195 | categoriesLayout->addWidget(mCategoriesLabel,1); |
196 | } | 196 | } |
197 | 197 | ||
198 | void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout) | 198 | void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout) |
199 | { | 199 | { |
200 | QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout ); | 200 | QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout ); |
201 | 201 | ||
202 | QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent); | 202 | QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent); |
203 | mCancelBox = new QCheckBox ( i18n("Cancelled"), parent); | 203 | mCancelBox = new QCheckBox ( i18n("Cancelled"), parent); |
204 | secrecyLayout->addWidget(mCancelBox); | 204 | secrecyLayout->addWidget(mCancelBox); |
205 | secrecyLayout->addWidget(secrecyLabel); | 205 | secrecyLayout->addWidget(secrecyLabel); |
206 | 206 | ||
207 | mSecrecyCombo = new QComboBox(parent); | 207 | mSecrecyCombo = new QComboBox(parent); |
208 | mSecrecyCombo->insertStringList(Incidence::secrecyList()); | 208 | mSecrecyCombo->insertStringList(Incidence::secrecyList()); |
209 | secrecyLayout->addWidget(mSecrecyCombo); | 209 | secrecyLayout->addWidget(mSecrecyCombo); |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 9db2040..02d7aae 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -378,45 +378,45 @@ void KOPrefs::setCategoryDefaults() | |||
378 | } | 378 | } |
379 | QStringList KOPrefs::getLocationDefaultList() | 379 | QStringList KOPrefs::getLocationDefaultList() |
380 | { | 380 | { |
381 | QStringList retval ; | 381 | QStringList retval ; |
382 | retval << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") | 382 | retval << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") |
383 | << i18n("University") << i18n("Restaurant") << i18n("Bar") << i18n("Conference room") | 383 | << i18n("University") << i18n("Restaurant") << i18n("Bar") << i18n("Conference room") |
384 | << i18n("Cinema") << i18n("Lake") << i18n("Kindergarten") | 384 | << i18n("Cinema") << i18n("Lake") << i18n("Kindergarten") |
385 | << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ; | 385 | << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ; |
386 | // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") | 386 | // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") |
387 | 387 | ||
388 | retval.sort(); | 388 | retval.sort(); |
389 | return retval; | 389 | return retval; |
390 | } | 390 | } |
391 | QStringList KOPrefs::getDefaultList() | 391 | QStringList KOPrefs::getDefaultList() |
392 | { | 392 | { |
393 | QStringList retval ; | 393 | QStringList retval ; |
394 | retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Cinema") << i18n("Customer") | 394 | retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Customer") |
395 | << i18n("Break") | 395 | << i18n("Break") |
396 | << i18n("Family") << i18n("Favorites") << i18n("Fishing")<< i18n("Flight") << i18n("Gifts") | 396 | << i18n("Family") << i18n("Favorites") << i18n("Fishing") << i18n("Gifts") |
397 | << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Key Customer") | 397 | << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") |
398 | << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner") << i18n("Personal") | 398 | << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner") << i18n("Personal") |
399 | << i18n("PHB") << i18n("Phone Calls") << i18n("School") << i18n("Shopping") | 399 | << i18n("PHB") << i18n("Phone Calls") << i18n("Shopping") |
400 | << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University") | 400 | << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV") |
401 | << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ; | 401 | << i18n("Vacation") ; |
402 | retval.sort(); | 402 | retval.sort(); |
403 | //qDebug("cat %s ", retval.join("-").latin1()); | 403 | //qDebug("cat %s ", retval.join("-").latin1()); |
404 | return retval; | 404 | return retval; |
405 | } | 405 | } |
406 | // << i18n("Business Travel") << i18n("Education") << i18n("Hiking") << i18n("Hunting") << i18n("Recurring") << i18n("Personal Travel") << i18n("Speach") << i18n("Festival") << i18n("Competition")<< i18n("Party")<< i18n("Projects")<< i18n("Kids") << i18n("Special Occasion")<< i18n("Breakfast")<< i18n("Dinner") << i18n("Lunch") | 406 | // << i18n("Business Travel") << i18n("Education") << i18n("Hiking") << i18n("Hunting") << i18n("Recurring") << i18n("Personal Travel") << i18n("Speach") << i18n("Festival") << i18n("Competition")<< i18n("Party")<< i18n("Projects")<< i18n("Kids") << i18n("Special Occasion")<< i18n("Breakfast")<< i18n("Dinner") << i18n("Lunch")<< i18n("University")<< i18n("School")<< i18n("Flight")<< i18n("Key Customer") << i18n("VIP") << i18n("SyncEvent") << i18n("Cinema") |
407 | void KOPrefs::usrReadConfig() | 407 | void KOPrefs::usrReadConfig() |
408 | { | 408 | { |
409 | config()->setGroup("General"); | 409 | config()->setGroup("General"); |
410 | 410 | ||
411 | //qDebug("KOPrefs::usrReadConfig() "); | 411 | //qDebug("KOPrefs::usrReadConfig() "); |
412 | mCustomCategories = config()->readListEntry("Custom Categories"); | 412 | mCustomCategories = config()->readListEntry("Custom Categories"); |
413 | mOldLoadedLanguage = mOldLanguage ; | 413 | mOldLoadedLanguage = mOldLanguage ; |
414 | mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; | 414 | mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; |
415 | if (mLocationDefaults.isEmpty()) { | 415 | if (mLocationDefaults.isEmpty()) { |
416 | mLocationDefaults = getLocationDefaultList(); | 416 | mLocationDefaults = getLocationDefaultList(); |
417 | } | 417 | } |
418 | 418 | ||
419 | if (mEventSummaryUser.isEmpty()) { | 419 | if (mEventSummaryUser.isEmpty()) { |
420 | mEventSummaryUser = getDefaultList() ; | 420 | mEventSummaryUser = getDefaultList() ; |
421 | } | 421 | } |
422 | if (mTodoSummaryUser.isEmpty()) { | 422 | if (mTodoSummaryUser.isEmpty()) { |