summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (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
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp2
-rw-r--r--microkde/KDGanttMinimizeSplitter.cpp14
-rw-r--r--microkde/kdialogbase.cpp2
10 files changed, 105 insertions, 81 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 218396d..072d464 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -118,9 +118,10 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
118 118
119 // now, for a workaround... 119 // now, for a workaround...
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
125 126
126 int cell = ((int)(cy/mCellHeight)); 127 int cell = ((int)(cy/mCellHeight));
@@ -152,13 +153,13 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
152 borderWidth = 4; 153 borderWidth = 4;
153 timeHeight = fm.height(); 154 timeHeight = fm.height();
154 } 155 }
155 timeHeight -= (timeHeight/4-2); 156 //timeHeight -= (timeHeight/4-2);
156 QFont sFont = nFont; 157 QFont sFont = nFont;
157 sFont.setPointSize( sFont.pointSize()/2+2 ); 158 sFont.setPointSize( sFont.pointSize()/2+2 );
158 QFontMetrics fmS( sFont ); 159 QFontMetrics fmS( sFont );
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) {
163 p->drawLine(cx,y,cx+tW,y); 164 p->drawLine(cx,y,cx+tW,y);
164 hour.setNum(cell); 165 hour.setNum(cell);
@@ -173,14 +174,14 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
173 } 174 }
174 175
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);
178 int offset = startW - timeWidth - tw2 ; 179 int offset = startW - timeWidth - tw2 ;
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
185 // increment indices 186 // increment indices
186 y += mCellHeight; 187 y += mCellHeight;
@@ -418,8 +419,7 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
418 int heibut = mExpandButton->sizeHint().height()+4; 419 int heibut = mExpandButton->sizeHint().height()+4;
419 if ( heibut > widebut ) 420 if ( heibut > widebut )
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,
424 // QSizePolicy::Fixed ) ); 424 // QSizePolicy::Fixed ) );
425 mExpandButton->setFixedSize( widebut, widebut); 425 mExpandButton->setFixedSize( widebut, widebut);
@@ -717,7 +717,7 @@ void KOAgendaView::createDayLabels()
717 appendLabels = true; 717 appendLabels = true;
718 dayLabel = getNewDaylabel(); 718 dayLabel = getNewDaylabel();
719 } 719 }
720 dayLabel->setFixedWidth( mTimeLabels->width()+2 ); 720 dayLabel->setFixedWidth( mTimeLabels->width()+mAgenda->frameWidth() );
721 dayLabel->setFont( dlf ); 721 dayLabel->setFont( dlf );
722 dayLabel->setNum( -1 ); 722 dayLabel->setNum( -1 );
723 //dayLabel->setAlignment(QLabel::AlignHCenter); 723 //dayLabel->setAlignment(QLabel::AlignHCenter);
@@ -828,8 +828,8 @@ void KOAgendaView::createDayLabels()
828 dayLabel = getNewDaylabel(); 828 dayLabel = getNewDaylabel();
829 } 829 }
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;
834 //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); 834 //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 );
835 dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); 835 dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) );
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index dfc6af7..c55f7d7 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -288,7 +288,8 @@ void KODayMatrix::addSelectedDaysTo(DateList& selDays)
288} 288}
289 289
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 );
293 mSelStart = startdate.daysTo(start); 294 mSelStart = startdate.daysTo(start);
294 if ( mSelStart < 0 ) 295 if ( mSelStart < 0 )
@@ -510,12 +511,14 @@ void KODayMatrix::mousePressEvent (QMouseEvent* e)
510 mSelStart = getDayIndexFrom(e->x(), e->y()); 511 mSelStart = getDayIndexFrom(e->x(), e->y());
511 if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1; 512 if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1;
512 mSelInit = mSelStart; 513 mSelInit = mSelStart;
513 mSelEnd = mSelStart; 514 mSelEnd = mSelStart;
515 mRedrawNeeded = true;
514 repaint(false); 516 repaint(false);
515} 517}
516 518
517void KODayMatrix::mouseReleaseEvent (QMouseEvent* e) 519void KODayMatrix::mouseReleaseEvent (QMouseEvent* e)
518{ 520{
521 mRedrawNeeded = true;
519 if ( e->button() == LeftButton ) 522 if ( e->button() == LeftButton )
520 if ( ! mouseDown ) { 523 if ( ! mouseDown ) {
521 return; 524 return;
@@ -556,6 +559,7 @@ void KODayMatrix::mouseMoveEvent (QMouseEvent* e)
556 if ( ! mouseDown ) { 559 if ( ! mouseDown ) {
557 return; 560 return;
558 } 561 }
562 mRedrawNeeded = true;
559 int tmp = getDayIndexFrom(e->x(), e->y()); 563 int tmp = getDayIndexFrom(e->x(), e->y());
560 if (tmp > NUMDAYS-1) tmp=NUMDAYS-1; 564 if (tmp > NUMDAYS-1) tmp=NUMDAYS-1;
561 565
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 2fd13bd..802261c 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -87,8 +87,9 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
87 mListView->addColumn(i18n("Role"),60); 87 mListView->addColumn(i18n("Role"),60);
88 mListView->addColumn(i18n("Status"),100); 88 mListView->addColumn(i18n("Status"),100);
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 }
93 mListView->setAllColumnsShowFocus (true ); 94 mListView->setAllColumnsShowFocus (true );
94 //mListView->setSingleClick( true ); 95 //mListView->setSingleClick( true );
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 97ab4e8..5879a2d 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -170,18 +170,19 @@ KOPrefs::KOPrefs() :
170 170
171 KPrefs::setCurrentGroup("Fonts"); 171 KPrefs::setCurrentGroup("Fonts");
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
186 KPrefs::setCurrentGroup("RemoteSyncing"); 187 KPrefs::setCurrentGroup("RemoteSyncing");
187 addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" ); 188 addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 74037e6..8439b81 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -53,6 +53,7 @@
53#include <kiconloader.h> 53#include <kiconloader.h>
54#include <kemailsettings.h> 54#include <kemailsettings.h>
55#include <kstandarddirs.h> 55#include <kstandarddirs.h>
56#include <kglobalsettings.h>
56 57
57#include <kurlrequester.h> 58#include <kurlrequester.h>
58#include <klineedit.h> 59#include <klineedit.h>
@@ -74,10 +75,17 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
74 KPrefsDialog(KOPrefs::instance(),parent,name,true) 75 KPrefsDialog(KOPrefs::instance(),parent,name,true)
75{ 76{
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)"));
78 mCategoryDict.setAutoDelete(true); 80 mCategoryDict.setAutoDelete(true);
79 81
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
82 setupGlobalTab(); 90 setupGlobalTab();
83 setupMainTab(); 91 setupMainTab();
@@ -94,10 +102,7 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
94 //setupGroupSchedulingTab(); 102 //setupGroupSchedulingTab();
95 //setupGroupAutomationTab(); 103 //setupGroupAutomationTab();
96 104
97#ifndef DESKTOP_VERSION 105
98 if ( QApplication::desktop()->height() == 480 )
99 hideButtons();
100#endif
101} 106}
102 107
103 108
@@ -118,8 +123,8 @@ void KOPrefsDialog::setupLocaleDateTab()
118#if 0 123#if 0
119QFrame *topFrame = addPage(i18n("Date Format"),0,0); 124QFrame *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;
124 129
125 130
@@ -174,8 +179,8 @@ void KOPrefsDialog::setupLocaleTab()
174#if 0 179#if 0
175 QFrame *topFrame = addPage(i18n("Locale"),0,0); 180 QFrame *topFrame = addPage(i18n("Locale"),0,0);
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;
180 KPrefsDialogWidRadios *syncPrefsGroup = 185 KPrefsDialogWidRadios *syncPrefsGroup =
181 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); 186 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
@@ -246,8 +251,8 @@ void KOPrefsDialog::setupSyncAlgTab()
246 QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); 251 QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
247 mSetupSyncAlgTab = topFrame; 252 mSetupSyncAlgTab = topFrame;
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;
252 257
253 KPrefsDialogWidBool *sb = 258 KPrefsDialogWidBool *sb =
@@ -287,8 +292,8 @@ void KOPrefsDialog::setupSyncTab()
287 QLabel * lab; 292 QLabel * lab;
288 QFrame *topFrame = addPage(i18n("Sync Network"),0,0); 293 QFrame *topFrame = addPage(i18n("Sync Network"),0,0);
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);
293 int iii = 0; 298 int iii = 0;
294 topLayout->addMultiCellWidget(lab , iii,iii,0,1); 299 topLayout->addMultiCellWidget(lab , iii,iii,0,1);
@@ -337,8 +342,8 @@ void KOPrefsDialog::setupMainTab()
337 // DesktopIcon("identity",KIcon::SizeMedium)); 342 // DesktopIcon("identity",KIcon::SizeMedium));
338 343
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
343 // KPrefsDialogWidBool *emailControlCenter = 348 // KPrefsDialogWidBool *emailControlCenter =
344// addWidBool(i18n("&Use email settings from Control Center"), 349// addWidBool(i18n("&Use email settings from Control Center"),
@@ -398,7 +403,7 @@ void KOPrefsDialog::setupMainTab()
398 // &(KOPrefs::instance()->mAutoSave),autoSaveGroup); 403 // &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
399 404
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);
403 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox); 408 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
404 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox); 409 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
@@ -488,8 +493,8 @@ void KOPrefsDialog::setupTimeTab()
488 // DesktopIcon("clock",KIcon::SizeMedium)); 493 // DesktopIcon("clock",KIcon::SizeMedium));
489 494
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
494 QHBox *dummy = new QHBox(topFrame); 499 QHBox *dummy = new QHBox(topFrame);
495 KPrefsDialogWidTime *dayBegins = 500 KPrefsDialogWidTime *dayBegins =
@@ -561,8 +566,8 @@ void KOPrefsDialog::setupViewsTab()
561 // DesktopIcon("viewmag",KIcon::SizeMedium)); 566 // DesktopIcon("viewmag",KIcon::SizeMedium));
562 567
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
567// QBoxLayout *dayBeginsLayout = new QHBoxLayout; 572// QBoxLayout *dayBeginsLayout = new QHBoxLayout;
568// topLayout->addLayout(dayBeginsLayout,0,0); 573// topLayout->addLayout(dayBeginsLayout,0,0);
@@ -606,8 +611,8 @@ void KOPrefsDialog::setupViewsTab()
606 // DesktopIcon("viewmag",KIcon::SizeMedium)); 611 // DesktopIcon("viewmag",KIcon::SizeMedium));
607 612
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;
612 617
613#endif 618#endif
@@ -653,20 +658,20 @@ void KOPrefsDialog::setupViewsTab()
653 &(KOPrefs::instance()->mWeeklyRecur),topFrame); 658 &(KOPrefs::instance()->mWeeklyRecur),topFrame);
654 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); 659 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
655 660
656 661#ifdef DESKTOP_VERSION
657 KPrefsDialogWidBool *enableToolTips = 662 KPrefsDialogWidBool *enableToolTips =
658 addWidBool(i18n("Enable tooltips displaying summary of ev."), 663 addWidBool(i18n("Enable tooltips displaying summary of ev."),
659 &(KOPrefs::instance()->mEnableToolTips),topFrame); 664 &(KOPrefs::instance()->mEnableToolTips),topFrame);
660 topLayout->addWidget(enableToolTips->checkBox(),ii++,0); 665 topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
661 666#endif
662 // ********************************************************* 667 // *********************************************************
663 668
664 topFrame = addPage(i18n("Agenda View"),0,0); 669 topFrame = addPage(i18n("Agenda View"),0,0);
665 // DesktopIcon("viewmag",KIcon::SizeMedium)); 670 // DesktopIcon("viewmag",KIcon::SizeMedium));
666 671
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;
671 676
672 677
@@ -712,8 +717,9 @@ void KOPrefsDialog::setupViewsTab()
712 // DesktopIcon("viewmag",KIcon::SizeMedium)); 717 // DesktopIcon("viewmag",KIcon::SizeMedium));
713 718
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;
718 QLabel *lab; 724 QLabel *lab;
719 QHBox *habo = new QHBox( topFrame ); 725 QHBox *habo = new QHBox( topFrame );
@@ -806,8 +812,8 @@ void KOPrefsDialog::setupViewsTab()
806 // DesktopIcon("viewmag",KIcon::SizeMedium)); 812 // DesktopIcon("viewmag",KIcon::SizeMedium));
807 813
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;
812 818
813 819
@@ -818,7 +824,7 @@ void KOPrefsDialog::setupViewsTab()
818 topLayout->addWidget(hdummy,ii++,0); 824 topLayout->addWidget(hdummy,ii++,0);
819 825
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);
823 QString messa = i18n("Show topmost todo prios in What's Next:"); 829 QString messa = i18n("Show topmost todo prios in What's Next:");
824 830
@@ -862,8 +868,8 @@ void KOPrefsDialog::setupViewsTab()
862 // DesktopIcon("viewmag",KIcon::SizeMedium)); 868 // DesktopIcon("viewmag",KIcon::SizeMedium));
863 869
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;
868dummy = 874dummy =
869 addWidBool(i18n("Hide not running Todos in To-do view"), 875 addWidBool(i18n("Hide not running Todos in To-do view"),
@@ -928,8 +934,8 @@ dummy =
928 topFrame = addPage(i18n("View Options"),0,0); 934 topFrame = addPage(i18n("View Options"),0,0);
929 935
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;
934 lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); 940 lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame);
935 topLayout->addWidget(lab ,ii++,0); 941 topLayout->addWidget(lab ,ii++,0);
@@ -963,8 +969,8 @@ dummy =
963 // DesktopIcon("viewmag",KIcon::SizeMedium)); 969 // DesktopIcon("viewmag",KIcon::SizeMedium));
964 970
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;
969 975
970 dummy = 976 dummy =
@@ -1189,8 +1195,8 @@ void KOPrefsDialog::setupColorsTab()
1189 // DesktopIcon("colorize",KIcon::SizeMedium)); 1195 // DesktopIcon("colorize",KIcon::SizeMedium));
1190 1196
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
1195 topLayout->setSpacing(2); 1201 topLayout->setSpacing(2);
1196 topLayout->setMargin(3); 1202 topLayout->setMargin(3);
@@ -1298,8 +1304,8 @@ void KOPrefsDialog::setupPrinterTab()
1298 DesktopIcon("fileprint",KIcon::SizeMedium)); 1304 DesktopIcon("fileprint",KIcon::SizeMedium));
1299 1305
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
1304 topLayout->setRowStretch(4,1); 1310 topLayout->setRowStretch(4,1);
1305} 1311}
@@ -1311,8 +1317,8 @@ void KOPrefsDialog::setupGroupSchedulingTab()
1311 DesktopIcon("personal",KIcon::SizeMedium)); 1317 DesktopIcon("personal",KIcon::SizeMedium));
1312 1318
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
1317#if 0 1323#if 0
1318 KPrefsDialogWidRadios *schedulerGroup = 1324 KPrefsDialogWidRadios *schedulerGroup =
@@ -1362,8 +1368,8 @@ void KOPrefsDialog::setupGroupAutomationTab()
1362 DesktopIcon("personal",KIcon::SizeMedium)); 1368 DesktopIcon("personal",KIcon::SizeMedium));
1363 1369
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
1368 KPrefsDialogWidRadios *autoRefreshGroup = 1374 KPrefsDialogWidRadios *autoRefreshGroup =
1369 addWidRadios(i18n("Auto Send Refresh"), 1375 addWidRadios(i18n("Auto Send Refresh"),
@@ -1661,8 +1667,8 @@ void KOPrefsDialog::setupTimeZoneTab()
1661 // DesktopIcon("clock",KIcon::SizeMedium)); 1667 // DesktopIcon("clock",KIcon::SizeMedium));
1662 1668
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
1667 QHBox *timeZoneBox = new QHBox( topFrame ); 1673 QHBox *timeZoneBox = new QHBox( topFrame );
1668 topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); 1674 topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index e20969a..6892028 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -159,6 +159,8 @@ class KOPrefsDialog : public KPrefsDialog
159 QSpinBox * mAlarmBeepInterval; 159 QSpinBox * mAlarmBeepInterval;
160 160
161 QLineEdit * mDefaultAlarmFile; 161 QLineEdit * mDefaultAlarmFile;
162 int mSpacingHint;
163 int mMarginHint;
162}; 164};
163 165
164#endif 166#endif
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 0610d55..b03870f 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -216,7 +216,7 @@ void NavigatorBar::resetFont ( QFont fo )
216 mNextYear->setFixedHeight ( size ); 216 mNextYear->setFixedHeight ( size );
217 mCurrentHei = size +2; 217 mCurrentHei = size +2;
218 mCurrentMinWid = maxwidth+2; 218 mCurrentMinWid = maxwidth+2;
219 mCurrentButtonMinWid = mPrevYear->sizeHint().width()+2; 219 mCurrentButtonMinWid = mPrevYear->sizeHint().width();
220} 220}
221 221
222void NavigatorBar::showButtons( bool left, bool right ) 222void NavigatorBar::showButtons( bool left, bool right )
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 4fe1e66..d62d9f9 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -206,7 +206,7 @@ void KDEPIMConfigWidget::setupExternalAppTab()
206 206
207 mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); 207 mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
208 QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); 208 QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" );
209 mExternalAppGroupBox->layout()->setMargin(5); 209 mExternalAppGroupBox->layout()->setMargin(4);
210 210
211 mClient = new QComboBox( mExternalAppGroupBox ); 211 mClient = new QComboBox( mExternalAppGroupBox );
212 boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); 212 boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index ea3a329..d675517 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -678,10 +678,16 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
678 if ( !mRubberBand ) { 678 if ( !mRubberBand ) {
679 mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop); 679 mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop);
680 mRubberBand->setFrameStyle( Box | Raised ); 680 mRubberBand->setFrameStyle( Box | Raised );
681 mRubberBand->setPalette( QPalette ( Qt::green.light(),Qt::green.dark() ) ); 681 mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) );
682 } 682 }
683 QRect r = contentsRect(); 683 QRect r = contentsRect();
684 const int rBord = 5; //Themable???? 684 static int rBord = 0; //Themable????
685 if ( !rBord ) {
686 if (QApplication::desktop()->width() <= 320 )
687 rBord = 4;
688 else
689 rBord = 5;
690 }
685 int sw = style().splitterWidth(); 691 int sw = style().splitterWidth();
686 if ( orient == Horizontal ) { 692 if ( orient == Horizontal ) {
687 if ( p >= 0 ) { 693 if ( p >= 0 ) {
@@ -695,7 +701,9 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
695 } 701 }
696 } 702 }
697 opaqueOldPos = p; 703 opaqueOldPos = p;
698 mRubberBand->show(); 704 if ( ! mRubberBand->isVisible() ) {
705 mRubberBand->show();
706 }
699#endif 707#endif
700} 708}
701 709
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index f453331..e6144de 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -151,6 +151,8 @@ void KDialogBase::initLayout()
151 if ( mDefaultButton ) buttonLayout->addWidget( mDefaultButton ); 151 if ( mDefaultButton ) buttonLayout->addWidget( mDefaultButton );
152 if ( mCancelButton ) buttonLayout->addWidget( mCancelButton ); 152 if ( mCancelButton ) buttonLayout->addWidget( mCancelButton );
153 if ( mCloseButton ) buttonLayout->addWidget( mCloseButton ); 153 if ( mCloseButton ) buttonLayout->addWidget( mCloseButton );
154 buttonLayout->setMargin( 0 );
155 buttonLayout->setSpacing( spacingHint() );
154} 156}
155 157
156QFrame *KDialogBase::addPage( const QString &name ) 158QFrame *KDialogBase::addPage( const QString &name )