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 | |||
@@ -2596,5 +2596,7 @@ 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(); |
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index ca8d5f7..3c38f34 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -58,5 +58,11 @@ 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; |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 067c34c..ec1154a 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -1198,9 +1198,10 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
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 | ||
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 2fbcd42..e07bc53 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -185,11 +185,11 @@ void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout) | |||
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); |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 9db2040..02d7aae 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -392,17 +392,17 @@ 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 | { |