summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-04-01 18:10:09 (UTC)
committer zautrix <zautrix>2005-04-01 18:10:09 (UTC)
commitedc032c21ae3788d02a632ea8066e4ac5a4feedb (patch) (unidiff)
tree8e59c8dcf1cc3021694025627d36e152f7adc389 /korganizer
parent5d88f92b76a760f100384ea5fa6ed143088d19bb (diff)
downloadkdepimpi-edc032c21ae3788d02a632ea8066e4ac5a4feedb.zip
kdepimpi-edc032c21ae3788d02a632ea8066e4ac5a4feedb.tar.gz
kdepimpi-edc032c21ae3788d02a632ea8066e4ac5a4feedb.tar.bz2
fixes
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp28
-rw-r--r--korganizer/kodaymatrix.cpp8
-rw-r--r--korganizer/koeditordetails.cpp5
-rw-r--r--korganizer/koprefs.cpp25
-rw-r--r--korganizer/koprefsdialog.cpp98
-rw-r--r--korganizer/koprefsdialog.h2
-rw-r--r--korganizer/navigatorbar.cpp2
7 files changed, 91 insertions, 77 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 218396d..072d464 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -120,5 +120,6 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
120 // these two assignments fix the weird redraw bug 120 // these two assignments fix the weird redraw bug
121 mRedrawNeeded = true;
121 if ( mRedrawNeeded ) { 122 if ( mRedrawNeeded ) {
122 cx = contentsX() + 2; 123 cx = contentsX() + frameWidth()*2;
123 cw = contentsWidth() - 2; 124 cw = contentsWidth() ;
124 // end of workaround 125 // end of workaround
@@ -154,3 +155,3 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
154 } 155 }
155 timeHeight -= (timeHeight/4-2); 156 //timeHeight -= (timeHeight/4-2);
156 QFont sFont = nFont; 157 QFont sFont = nFont;
@@ -159,4 +160,4 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
159 int sHei = fmS.height(); 160 int sHei = fmS.height();
160 sHei -= (sHei/4-2); 161 //sHei -= (sHei/4-2);
161 int startW = this->width() - frameWidth(); 162 int startW = this->width() - frameWidth()-1;
162 while (y < cy + ch) { 163 while (y < cy + ch) {
@@ -175,3 +176,3 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
175 // center and draw the time label 176 // center and draw the time label
176 int timeWidth = fm.width(hour+"i"); 177 int timeWidth = fm.width(hour);
177 int tw2 = fm.width(suffix); 178 int tw2 = fm.width(suffix);
@@ -179,6 +180,6 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
179 p->setFont( nFont ); 180 p->setFont( nFont );
180 p->drawText(cx - borderWidth + offset, y+ timeHeight, hour); 181 p->drawText( offset, y+ timeHeight, hour);
181 p->setFont( sFont ); 182 p->setFont( sFont );
182 offset = startW - tw2-1; 183 offset = startW - tw2+1;
183 p->drawText(cx - borderWidth + offset, y+ sHei, suffix); 184 p->drawText( offset, y+ sHei, suffix);
184 185
@@ -420,4 +421,3 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
420 widebut = heibut ; 421 widebut = heibut ;
421 if ( QApplication::desktop()->width() < 480 ) 422
422 widebut = widebut*3/2;
423 //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, 423 //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed,
@@ -719,3 +719,3 @@ void KOAgendaView::createDayLabels()
719 } 719 }
720 dayLabel->setFixedWidth( mTimeLabels->width()+2 ); 720 dayLabel->setFixedWidth( mTimeLabels->width()+mAgenda->frameWidth() );
721 dayLabel->setFont( dlf ); 721 dayLabel->setFont( dlf );
@@ -830,4 +830,4 @@ void KOAgendaView::createDayLabels()
830 //dayLabel->hide();//test only 830 //dayLabel->hide();//test only
831 831 qDebug("fremwidd %d ", mAgenda->frameWidth());
832 int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; 832 int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()- (mAgenda->frameWidth()*2) ) % mSelectedDates.count() ;
833 if ( offset < 0 ) offset = 0; 833 if ( offset < 0 ) offset = 0;
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index dfc6af7..c55f7d7 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -290,3 +290,4 @@ void KODayMatrix::addSelectedDaysTo(DateList& selDays)
290bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end) 290bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end)
291{ 291{
292 mRedrawNeeded = true;
292 bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION ); 293 bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION );
@@ -512,3 +513,4 @@ void KODayMatrix::mousePressEvent (QMouseEvent* e)
512 mSelInit = mSelStart; 513 mSelInit = mSelStart;
513 mSelEnd = mSelStart; 514 mSelEnd = mSelStart;
515 mRedrawNeeded = true;
514 repaint(false); 516 repaint(false);
@@ -518,2 +520,3 @@ void KODayMatrix::mouseReleaseEvent (QMouseEvent* e)
518{ 520{
521 mRedrawNeeded = true;
519 if ( e->button() == LeftButton ) 522 if ( e->button() == LeftButton )
@@ -558,2 +561,3 @@ void KODayMatrix::mouseMoveEvent (QMouseEvent* e)
558 } 561 }
562 mRedrawNeeded = true;
559 int tmp = getDayIndexFrom(e->x(), e->y()); 563 int tmp = getDayIndexFrom(e->x(), e->y());
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 2fd13bd..802261c 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -89,4 +89,5 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
89 mListView->addColumn(i18n("RSVP"),35); 89 mListView->addColumn(i18n("RSVP"),35);
90 if ( KOPrefs::instance()->mCompactDialogs ) { 90 if ( QApplication::desktop()->width() <= 320 ) {
91 //mListView->setFixedHeight(78); 91 //mListView->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding) );
92 mListView->setFixedHeight(80);
92 } 93 }
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 97ab4e8..5879a2d 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -172,14 +172,15 @@ KOPrefs::KOPrefs() :
172 // qDebug(" KPrefs::setCurrentGroup(Fonts); "); 172 // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
173 addItemFont("TimeBar Font",&mTimeBarFont,KGlobalSettings::generalFont() ); 173 QFont fon = KGlobalSettings::generalFont();
174 addItemFont("MonthView Font",&mMonthViewFont,KGlobalSettings::generalFont()); 174 addItemFont("TimeBar Font",&mTimeBarFont,fon );
175 addItemFont("AgendaView Font",&mAgendaViewFont,KGlobalSettings::generalFont()); 175 addItemFont("MonthView Font",&mMonthViewFont,fon);
176 addItemFont("MarcusBains Font",&mMarcusBainsFont,KGlobalSettings::generalFont()); 176 addItemFont("AgendaView Font",&mAgendaViewFont,fon);
177 addItemFont("TimeLabels Font",&mTimeLabelsFont,KGlobalSettings::generalFont()); 177 addItemFont("MarcusBains Font",&mMarcusBainsFont,fon);
178 addItemFont("TodoView Font",&mTodoViewFont,KGlobalSettings::generalFont()); 178 addItemFont("TimeLabels Font",&mTimeLabelsFont,fon);
179 addItemFont("ListView Font",&mListViewFont,KGlobalSettings::generalFont()); 179 addItemFont("TodoView Font",&mTodoViewFont,fon);
180 addItemFont("DateNavigator Font",&mDateNavigatorFont,KGlobalSettings::generalFont()); 180 addItemFont("ListView Font",&mListViewFont,fon);
181 addItemFont("EditBox Font",&mEditBoxFont,KGlobalSettings::generalFont()); 181 addItemFont("DateNavigator Font",&mDateNavigatorFont,fon);
182 addItemFont("JournalView Font",&mJornalViewFont,KGlobalSettings::generalFont()); 182 addItemFont("EditBox Font",&mEditBoxFont,fon);
183 addItemFont("WhatsNextView Font",&mWhatsNextFont,KGlobalSettings::generalFont()); 183 addItemFont("JournalView Font",&mJornalViewFont,fon);
184 addItemFont("EventView Font",&mEventViewFont,KGlobalSettings::generalFont()); 184 addItemFont("WhatsNextView Font",&mWhatsNextFont,fon);
185 addItemFont("EventView Font",&mEventViewFont,fon);
185 186
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 74037e6..8439b81 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -55,2 +55,3 @@
55#include <kstandarddirs.h> 55#include <kstandarddirs.h>
56#include <kglobalsettings.h>
56 57
@@ -76,2 +77,3 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
76 77
78 setFont( KGlobalSettings::generalFont() );
77 setCaption( i18n("Preferences - some settings need a restart (nr)")); 79 setCaption( i18n("Preferences - some settings need a restart (nr)"));
@@ -80,2 +82,8 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
80 KGlobal::locale()->insertCatalogue("timezones"); 82 KGlobal::locale()->insertCatalogue("timezones");
83 mSpacingHint = spacingHintSmall();
84 mMarginHint = marginHintSmall();
85#ifndef DESKTOP_VERSION
86 if ( QApplication::desktop()->height() == 480 )
87 hideButtons();
88#endif
81 89
@@ -96,6 +104,3 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
96 104
97#ifndef DESKTOP_VERSION 105
98 if ( QApplication::desktop()->height() == 480 )
99 hideButtons();
100#endif
101} 106}
@@ -120,4 +125,4 @@ QFrame *topFrame = addPage(i18n("Date Format"),0,0);
120 QGridLayout *topLayout = new QGridLayout(topFrame,3,2); 125 QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
121 topLayout->setSpacing(spacingHint()); 126 topLayout->setSpacing(mSpacingHint);
122 topLayout->setMargin(marginHint()); 127 topLayout->setMargin(mMarginHint);
123 int iii = 0; 128 int iii = 0;
@@ -176,4 +181,4 @@ void KOPrefsDialog::setupLocaleTab()
176 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 181 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
177 topLayout->setSpacing(spacingHint()); 182 topLayout->setSpacing(mSpacingHint);
178 topLayout->setMargin(marginHint()); 183 topLayout->setMargin(mMarginHint);
179 int iii = 0; 184 int iii = 0;
@@ -248,4 +253,4 @@ void KOPrefsDialog::setupSyncAlgTab()
248 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 253 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
249 topLayout->setSpacing(spacingHint()); 254 topLayout->setSpacing(mSpacingHint);
250 topLayout->setMargin(marginHint()); 255 topLayout->setMargin(mMarginHint);
251 int iii = 0; 256 int iii = 0;
@@ -289,4 +294,4 @@ void KOPrefsDialog::setupSyncTab()
289 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 294 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
290 topLayout->setSpacing(spacingHint()); 295 topLayout->setSpacing(mSpacingHint);
291 topLayout->setMargin(marginHint()); 296 topLayout->setMargin(mMarginHint);
292 lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame); 297 lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame);
@@ -339,4 +344,4 @@ void KOPrefsDialog::setupMainTab()
339 QGridLayout *topLayout = new QGridLayout(topFrame,5,2); 344 QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
340 topLayout->setSpacing(spacingHint()); 345 topLayout->setSpacing(mSpacingHint);
341 topLayout->setMargin(marginHint()); 346 topLayout->setMargin(mMarginHint);
342 347
@@ -400,3 +405,3 @@ void KOPrefsDialog::setupMainTab()
400 QHBox *intervalBox = new QHBox(topFrame); 405 QHBox *intervalBox = new QHBox(topFrame);
401 // intervalBox->setSpacing(spacingHint()); 406 // intervalBox->setSpacing(mSpacingHint);
402 topLayout->addMultiCellWidget(intervalBox,6,6,0,1); 407 topLayout->addMultiCellWidget(intervalBox,6,6,0,1);
@@ -490,4 +495,4 @@ void KOPrefsDialog::setupTimeTab()
490 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 495 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
491 topLayout->setSpacing(spacingHint()); 496 topLayout->setSpacing(mSpacingHint);
492 topLayout->setMargin(marginHint()); 497 topLayout->setMargin(mMarginHint);
493 498
@@ -563,4 +568,4 @@ void KOPrefsDialog::setupViewsTab()
563 QGridLayout *topLayout = new QGridLayout(topFrame,6,1); 568 QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
564 topLayout->setSpacing(spacingHint()); 569 topLayout->setSpacing(mSpacingHint);
565 topLayout->setMargin(marginHint()); 570 topLayout->setMargin(mMarginHint);
566 571
@@ -608,4 +613,4 @@ void KOPrefsDialog::setupViewsTab()
608 topLayout = new QGridLayout(topFrame,6,1); 613 topLayout = new QGridLayout(topFrame,6,1);
609 topLayout->setSpacing(spacingHint()); 614 topLayout->setSpacing(mSpacingHint);
610 topLayout->setMargin(marginHint()); 615 topLayout->setMargin(mMarginHint);
611 ii = 0; 616 ii = 0;
@@ -655,3 +660,3 @@ void KOPrefsDialog::setupViewsTab()
655 660
656 661#ifdef DESKTOP_VERSION
657 KPrefsDialogWidBool *enableToolTips = 662 KPrefsDialogWidBool *enableToolTips =
@@ -660,3 +665,3 @@ void KOPrefsDialog::setupViewsTab()
660 topLayout->addWidget(enableToolTips->checkBox(),ii++,0); 665 topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
661 666#endif
662 // ********************************************************* 667 // *********************************************************
@@ -667,4 +672,4 @@ void KOPrefsDialog::setupViewsTab()
667 topLayout = new QGridLayout(topFrame,5,1); 672 topLayout = new QGridLayout(topFrame,5,1);
668 topLayout->setSpacing(spacingHint()); 673 topLayout->setSpacing(mSpacingHint);
669 topLayout->setMargin(marginHint()); 674 topLayout->setMargin(mMarginHint);
670 ii = 0; 675 ii = 0;
@@ -714,4 +719,5 @@ void KOPrefsDialog::setupViewsTab()
714 topLayout = new QGridLayout(topFrame,5,1); 719 topLayout = new QGridLayout(topFrame,5,1);
715 topLayout->setSpacing(spacingHint()); 720 topLayout->setSpacing(mSpacingHint);
716 topLayout->setMargin(marginHint()); 721 topLayout->setMargin(mMarginHint);
722 qDebug("%d %d ",mSpacingHint, mMarginHint );
717 ii = 0; 723 ii = 0;
@@ -808,4 +814,4 @@ void KOPrefsDialog::setupViewsTab()
808 topLayout = new QGridLayout(topFrame,4,1); 814 topLayout = new QGridLayout(topFrame,4,1);
809 topLayout->setSpacing(spacingHint()); 815 topLayout->setSpacing(mSpacingHint);
810 topLayout->setMargin(marginHint()); 816 topLayout->setMargin(mMarginHint);
811 ii = 0; 817 ii = 0;
@@ -820,3 +826,3 @@ void KOPrefsDialog::setupViewsTab()
820 QHBox *prioBox = new QHBox(topFrame); 826 QHBox *prioBox = new QHBox(topFrame);
821 // intervalBox->setSpacing(spacingHint()); 827 // intervalBox->setSpacing(mSpacingHint);
822 topLayout->addWidget(prioBox,ii++,0); 828 topLayout->addWidget(prioBox,ii++,0);
@@ -864,4 +870,4 @@ void KOPrefsDialog::setupViewsTab()
864 topLayout = new QGridLayout(topFrame,4,1); 870 topLayout = new QGridLayout(topFrame,4,1);
865 topLayout->setSpacing(spacingHint()); 871 topLayout->setSpacing(mSpacingHint);
866 topLayout->setMargin(marginHint()); 872 topLayout->setMargin(mMarginHint);
867 ii = 0; 873 ii = 0;
@@ -930,4 +936,4 @@ dummy =
930 topLayout = new QGridLayout(topFrame,4,1); 936 topLayout = new QGridLayout(topFrame,4,1);
931 topLayout->setSpacing(spacingHint()); 937 topLayout->setSpacing(mSpacingHint);
932 topLayout->setMargin(marginHint()); 938 topLayout->setMargin(mMarginHint);
933 ii = 0; 939 ii = 0;
@@ -965,4 +971,4 @@ dummy =
965 topLayout = new QGridLayout(topFrame,2,1); 971 topLayout = new QGridLayout(topFrame,2,1);
966 topLayout->setSpacing(spacingHint()); 972 topLayout->setSpacing(mSpacingHint);
967 topLayout->setMargin(marginHint()); 973 topLayout->setMargin(mMarginHint);
968 int iii = 0; 974 int iii = 0;
@@ -1191,4 +1197,4 @@ void KOPrefsDialog::setupColorsTab()
1191 QGridLayout *topLayout = new QGridLayout(topFrame,5,2); 1197 QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
1192 // topLayout->setSpacing(spacingHint()); 1198 // topLayout->setSpacing(mSpacingHint);
1193 // topLayout->setMargin(marginHint()); 1199 // topLayout->setMargin(mMarginHint);
1194 1200
@@ -1300,4 +1306,4 @@ void KOPrefsDialog::setupPrinterTab()
1300 QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2); 1306 QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
1301 topLayout->setSpacing(spacingHint()); 1307 topLayout->setSpacing(mSpacingHint);
1302 topLayout->setMargin(marginHint()); 1308 topLayout->setMargin(mMarginHint);
1303 1309
@@ -1313,4 +1319,4 @@ void KOPrefsDialog::setupGroupSchedulingTab()
1313 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 1319 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
1314 topLayout->setSpacing(spacingHint()); 1320 topLayout->setSpacing(mSpacingHint);
1315 topLayout->setMargin(marginHint()); 1321 topLayout->setMargin(mMarginHint);
1316 1322
@@ -1364,4 +1370,4 @@ void KOPrefsDialog::setupGroupAutomationTab()
1364 QGridLayout *topLayout = new QGridLayout(topFrame,5,1); 1370 QGridLayout *topLayout = new QGridLayout(topFrame,5,1);
1365 topLayout->setSpacing(spacingHint()); 1371 topLayout->setSpacing(mSpacingHint);
1366 topLayout->setMargin(marginHint()); 1372 topLayout->setMargin(mMarginHint);
1367 1373
@@ -1663,4 +1669,4 @@ void KOPrefsDialog::setupTimeZoneTab()
1663 QGridLayout *topLayout = new QGridLayout(topFrame,5,2); 1669 QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
1664 topLayout->setSpacing(spacingHint()); 1670 topLayout->setSpacing(mSpacingHint);
1665 topLayout->setMargin(marginHint()); 1671 topLayout->setMargin(mMarginHint);
1666 1672
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index e20969a..6892028 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -161,2 +161,4 @@ class KOPrefsDialog : public KPrefsDialog
161 QLineEdit * mDefaultAlarmFile; 161 QLineEdit * mDefaultAlarmFile;
162 int mSpacingHint;
163 int mMarginHint;
162}; 164};
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 0610d55..b03870f 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -218,3 +218,3 @@ void NavigatorBar::resetFont ( QFont fo )
218 mCurrentMinWid = maxwidth+2; 218 mCurrentMinWid = maxwidth+2;
219 mCurrentButtonMinWid = mPrevYear->sizeHint().width()+2; 219 mCurrentButtonMinWid = mPrevYear->sizeHint().width();
220} 220}