summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
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
@@ -119,7 +119,8 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
// now, for a workaround...
// these two assignments fix the weird redraw bug
+ mRedrawNeeded = true;
if ( mRedrawNeeded ) {
- cx = contentsX() + 2;
- cw = contentsWidth() - 2;
+ cx = contentsX() + frameWidth()*2;
+ cw = contentsWidth() ;
// end of workaround
@@ -153,11 +154,11 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
timeHeight = fm.height();
}
- timeHeight -= (timeHeight/4-2);
+ //timeHeight -= (timeHeight/4-2);
QFont sFont = nFont;
sFont.setPointSize( sFont.pointSize()/2+2 );
QFontMetrics fmS( sFont );
int sHei = fmS.height();
- sHei -= (sHei/4-2);
- int startW = this->width() - frameWidth();
+ //sHei -= (sHei/4-2);
+ int startW = this->width() - frameWidth()-1;
while (y < cy + ch) {
p->drawLine(cx,y,cx+tW,y);
@@ -174,12 +175,12 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
// center and draw the time label
- int timeWidth = fm.width(hour+"i");
+ int timeWidth = fm.width(hour);
int tw2 = fm.width(suffix);
int offset = startW - timeWidth - tw2 ;
p->setFont( nFont );
- p->drawText(cx - borderWidth + offset, y+ timeHeight, hour);
+ p->drawText( offset, y+ timeHeight, hour);
p->setFont( sFont );
- offset = startW - tw2-1;
- p->drawText(cx - borderWidth + offset, y+ sHei, suffix);
+ offset = startW - tw2+1;
+ p->drawText( offset, y+ sHei, suffix);
// increment indices
@@ -419,6 +420,5 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
if ( heibut > widebut )
widebut = heibut ;
- if ( QApplication::desktop()->width() < 480 )
- widebut = widebut*3/2;
+
//mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed,
// QSizePolicy::Fixed ) );
@@ -718,5 +718,5 @@ void KOAgendaView::createDayLabels()
dayLabel = getNewDaylabel();
}
- dayLabel->setFixedWidth( mTimeLabels->width()+2 );
+ dayLabel->setFixedWidth( mTimeLabels->width()+mAgenda->frameWidth() );
dayLabel->setFont( dlf );
dayLabel->setNum( -1 );
@@ -829,6 +829,6 @@ void KOAgendaView::createDayLabels()
}
//dayLabel->hide();//test only
-
- int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ;
+ qDebug("fremwidd %d ", mAgenda->frameWidth());
+ int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()- (mAgenda->frameWidth()*2) ) % mSelectedDates.count() ;
if ( offset < 0 ) offset = 0;
//qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 );
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index dfc6af7..c55f7d7 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -289,5 +289,6 @@ void KODayMatrix::addSelectedDaysTo(DateList& selDays)
bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end)
-{
+{
+ mRedrawNeeded = true;
bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION );
mSelStart = startdate.daysTo(start);
@@ -511,5 +512,6 @@ void KODayMatrix::mousePressEvent (QMouseEvent* e)
if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1;
mSelInit = mSelStart;
- mSelEnd = mSelStart;
+ mSelEnd = mSelStart;
+ mRedrawNeeded = true;
repaint(false);
}
@@ -517,4 +519,5 @@ void KODayMatrix::mousePressEvent (QMouseEvent* e)
void KODayMatrix::mouseReleaseEvent (QMouseEvent* e)
{
+ mRedrawNeeded = true;
if ( e->button() == LeftButton )
if ( ! mouseDown ) {
@@ -557,4 +560,5 @@ void KODayMatrix::mouseMoveEvent (QMouseEvent* e)
return;
}
+ mRedrawNeeded = true;
int tmp = getDayIndexFrom(e->x(), e->y());
if (tmp > NUMDAYS-1) tmp=NUMDAYS-1;
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 2fd13bd..802261c 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -88,6 +88,7 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
mListView->addColumn(i18n("Status"),100);
mListView->addColumn(i18n("RSVP"),35);
- if ( KOPrefs::instance()->mCompactDialogs ) {
- //mListView->setFixedHeight(78);
+ if ( QApplication::desktop()->width() <= 320 ) {
+ //mListView->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding) );
+ mListView->setFixedHeight(80);
}
mListView->setAllColumnsShowFocus (true );
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 97ab4e8..5879a2d 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -171,16 +171,17 @@ KOPrefs::KOPrefs() :
KPrefs::setCurrentGroup("Fonts");
// qDebug(" KPrefs::setCurrentGroup(Fonts); ");
- addItemFont("TimeBar Font",&mTimeBarFont,KGlobalSettings::generalFont() );
- addItemFont("MonthView Font",&mMonthViewFont,KGlobalSettings::generalFont());
- addItemFont("AgendaView Font",&mAgendaViewFont,KGlobalSettings::generalFont());
- addItemFont("MarcusBains Font",&mMarcusBainsFont,KGlobalSettings::generalFont());
- addItemFont("TimeLabels Font",&mTimeLabelsFont,KGlobalSettings::generalFont());
- addItemFont("TodoView Font",&mTodoViewFont,KGlobalSettings::generalFont());
- addItemFont("ListView Font",&mListViewFont,KGlobalSettings::generalFont());
- addItemFont("DateNavigator Font",&mDateNavigatorFont,KGlobalSettings::generalFont());
- addItemFont("EditBox Font",&mEditBoxFont,KGlobalSettings::generalFont());
- addItemFont("JournalView Font",&mJornalViewFont,KGlobalSettings::generalFont());
- addItemFont("WhatsNextView Font",&mWhatsNextFont,KGlobalSettings::generalFont());
- addItemFont("EventView Font",&mEventViewFont,KGlobalSettings::generalFont());
+ QFont fon = KGlobalSettings::generalFont();
+ addItemFont("TimeBar Font",&mTimeBarFont,fon );
+ addItemFont("MonthView Font",&mMonthViewFont,fon);
+ addItemFont("AgendaView Font",&mAgendaViewFont,fon);
+ addItemFont("MarcusBains Font",&mMarcusBainsFont,fon);
+ addItemFont("TimeLabels Font",&mTimeLabelsFont,fon);
+ addItemFont("TodoView Font",&mTodoViewFont,fon);
+ addItemFont("ListView Font",&mListViewFont,fon);
+ addItemFont("DateNavigator Font",&mDateNavigatorFont,fon);
+ addItemFont("EditBox Font",&mEditBoxFont,fon);
+ addItemFont("JournalView Font",&mJornalViewFont,fon);
+ addItemFont("WhatsNextView Font",&mWhatsNextFont,fon);
+ addItemFont("EventView Font",&mEventViewFont,fon);
KPrefs::setCurrentGroup("RemoteSyncing");
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 74037e6..8439b81 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -54,4 +54,5 @@
#include <kemailsettings.h>
#include <kstandarddirs.h>
+#include <kglobalsettings.h>
#include <kurlrequester.h>
@@ -75,8 +76,15 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
{
+ setFont( KGlobalSettings::generalFont() );
setCaption( i18n("Preferences - some settings need a restart (nr)"));
mCategoryDict.setAutoDelete(true);
KGlobal::locale()->insertCatalogue("timezones");
+ mSpacingHint = spacingHintSmall();
+ mMarginHint = marginHintSmall();
+#ifndef DESKTOP_VERSION
+ if ( QApplication::desktop()->height() == 480 )
+ hideButtons();
+#endif
setupGlobalTab();
@@ -95,8 +103,5 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
//setupGroupAutomationTab();
-#ifndef DESKTOP_VERSION
- if ( QApplication::desktop()->height() == 480 )
- hideButtons();
-#endif
+
}
@@ -119,6 +124,6 @@ void KOPrefsDialog::setupLocaleDateTab()
QFrame *topFrame = addPage(i18n("Date Format"),0,0);
QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
int iii = 0;
@@ -175,6 +180,6 @@ void KOPrefsDialog::setupLocaleTab()
QFrame *topFrame = addPage(i18n("Locale"),0,0);
QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
int iii = 0;
KPrefsDialogWidRadios *syncPrefsGroup =
@@ -247,6 +252,6 @@ void KOPrefsDialog::setupSyncAlgTab()
mSetupSyncAlgTab = topFrame;
QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
int iii = 0;
@@ -288,6 +293,6 @@ void KOPrefsDialog::setupSyncTab()
QFrame *topFrame = addPage(i18n("Sync Network"),0,0);
QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame);
int iii = 0;
@@ -338,6 +343,6 @@ void KOPrefsDialog::setupMainTab()
QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
// KPrefsDialogWidBool *emailControlCenter =
@@ -399,5 +404,5 @@ void KOPrefsDialog::setupMainTab()
QHBox *intervalBox = new QHBox(topFrame);
- // intervalBox->setSpacing(spacingHint());
+ // intervalBox->setSpacing(mSpacingHint);
topLayout->addMultiCellWidget(intervalBox,6,6,0,1);
QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
@@ -489,6 +494,6 @@ void KOPrefsDialog::setupTimeTab()
QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
QHBox *dummy = new QHBox(topFrame);
@@ -562,6 +567,6 @@ void KOPrefsDialog::setupViewsTab()
QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
// QBoxLayout *dayBeginsLayout = new QHBoxLayout;
@@ -607,6 +612,6 @@ void KOPrefsDialog::setupViewsTab()
topLayout = new QGridLayout(topFrame,6,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
ii = 0;
@@ -654,10 +659,10 @@ void KOPrefsDialog::setupViewsTab()
topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
-
+#ifdef DESKTOP_VERSION
KPrefsDialogWidBool *enableToolTips =
addWidBool(i18n("Enable tooltips displaying summary of ev."),
&(KOPrefs::instance()->mEnableToolTips),topFrame);
topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
-
+#endif
// *********************************************************
@@ -666,6 +671,6 @@ void KOPrefsDialog::setupViewsTab()
topLayout = new QGridLayout(topFrame,5,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
ii = 0;
@@ -713,6 +718,7 @@ void KOPrefsDialog::setupViewsTab()
topLayout = new QGridLayout(topFrame,5,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
+ qDebug("%d %d ",mSpacingHint, mMarginHint );
ii = 0;
QLabel *lab;
@@ -807,6 +813,6 @@ void KOPrefsDialog::setupViewsTab()
topLayout = new QGridLayout(topFrame,4,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
ii = 0;
@@ -819,5 +825,5 @@ void KOPrefsDialog::setupViewsTab()
QHBox *prioBox = new QHBox(topFrame);
- // intervalBox->setSpacing(spacingHint());
+ // intervalBox->setSpacing(mSpacingHint);
topLayout->addWidget(prioBox,ii++,0);
QString messa = i18n("Show topmost todo prios in What's Next:");
@@ -863,6 +869,6 @@ void KOPrefsDialog::setupViewsTab()
topLayout = new QGridLayout(topFrame,4,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
ii = 0;
dummy =
@@ -929,6 +935,6 @@ dummy =
topLayout = new QGridLayout(topFrame,4,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
ii = 0;
lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame);
@@ -964,6 +970,6 @@ dummy =
topLayout = new QGridLayout(topFrame,2,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
int iii = 0;
@@ -1190,6 +1196,6 @@ void KOPrefsDialog::setupColorsTab()
QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
- // topLayout->setSpacing(spacingHint());
- // topLayout->setMargin(marginHint());
+ // topLayout->setSpacing(mSpacingHint);
+ // topLayout->setMargin(mMarginHint);
topLayout->setSpacing(2);
@@ -1299,6 +1305,6 @@ void KOPrefsDialog::setupPrinterTab()
QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
topLayout->setRowStretch(4,1);
@@ -1312,6 +1318,6 @@ void KOPrefsDialog::setupGroupSchedulingTab()
QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
#if 0
@@ -1363,6 +1369,6 @@ void KOPrefsDialog::setupGroupAutomationTab()
QGridLayout *topLayout = new QGridLayout(topFrame,5,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
KPrefsDialogWidRadios *autoRefreshGroup =
@@ -1662,6 +1668,6 @@ void KOPrefsDialog::setupTimeZoneTab()
QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
QHBox *timeZoneBox = new QHBox( topFrame );
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index e20969a..6892028 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -160,4 +160,6 @@ class KOPrefsDialog : public KPrefsDialog
QLineEdit * mDefaultAlarmFile;
+ int mSpacingHint;
+ int mMarginHint;
};
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 0610d55..b03870f 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -217,5 +217,5 @@ void NavigatorBar::resetFont ( QFont fo )
mCurrentHei = size +2;
mCurrentMinWid = maxwidth+2;
- mCurrentButtonMinWid = mPrevYear->sizeHint().width()+2;
+ mCurrentButtonMinWid = mPrevYear->sizeHint().width();
}