summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp28
-rw-r--r--korganizer/kodaymatrix.cpp4
-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, 89 insertions, 75 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)
// 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
int cell = ((int)(cy/mCellHeight));
@@ -152,13 +153,13 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
borderWidth = 4;
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);
hour.setNum(cell);
@@ -173,14 +174,14 @@ 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
y += mCellHeight;
@@ -418,8 +419,7 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
int heibut = mExpandButton->sizeHint().height()+4;
if ( heibut > widebut )
widebut = heibut ;
- if ( QApplication::desktop()->width() < 480 )
- widebut = widebut*3/2;
+
//mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed,
// QSizePolicy::Fixed ) );
mExpandButton->setFixedSize( widebut, widebut);
@@ -717,7 +717,7 @@ void KOAgendaView::createDayLabels()
appendLabels = true;
dayLabel = getNewDaylabel();
}
- dayLabel->setFixedWidth( mTimeLabels->width()+2 );
+ dayLabel->setFixedWidth( mTimeLabels->width()+mAgenda->frameWidth() );
dayLabel->setFont( dlf );
dayLabel->setNum( -1 );
//dayLabel->setAlignment(QLabel::AlignHCenter);
@@ -828,8 +828,8 @@ void KOAgendaView::createDayLabels()
dayLabel = getNewDaylabel();
}
//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 );
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
@@ -289,6 +289,7 @@ 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);
if ( mSelStart < 0 )
@@ -511,11 +512,13 @@ void KODayMatrix::mousePressEvent (QMouseEvent* e)
if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1;
mSelInit = mSelStart;
mSelEnd = mSelStart;
+ mRedrawNeeded = true;
repaint(false);
}
void KODayMatrix::mouseReleaseEvent (QMouseEvent* e)
{
+ mRedrawNeeded = true;
if ( e->button() == LeftButton )
if ( ! mouseDown ) {
return;
@@ -556,6 +559,7 @@ void KODayMatrix::mouseMoveEvent (QMouseEvent* e)
if ( ! mouseDown ) {
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
@@ -87,8 +87,9 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
mListView->addColumn(i18n("Role"),60);
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 );
//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() :
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");
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 @@
#include <kiconloader.h>
#include <kemailsettings.h>
#include <kstandarddirs.h>
+#include <kglobalsettings.h>
#include <kurlrequester.h>
#include <klineedit.h>
@@ -74,10 +75,17 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
KPrefsDialog(KOPrefs::instance(),parent,name,true)
{
+ 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();
setupMainTab();
@@ -94,10 +102,7 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
//setupGroupSchedulingTab();
//setupGroupAutomationTab();
-#ifndef DESKTOP_VERSION
- if ( QApplication::desktop()->height() == 480 )
- hideButtons();
-#endif
+
}
@@ -118,8 +123,8 @@ void KOPrefsDialog::setupLocaleDateTab()
#if 0
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;
@@ -174,8 +179,8 @@ void KOPrefsDialog::setupLocaleTab()
#if 0
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 =
addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
@@ -246,8 +251,8 @@ void KOPrefsDialog::setupSyncAlgTab()
QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
mSetupSyncAlgTab = topFrame;
QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
int iii = 0;
KPrefsDialogWidBool *sb =
@@ -287,8 +292,8 @@ void KOPrefsDialog::setupSyncTab()
QLabel * lab;
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;
topLayout->addMultiCellWidget(lab , iii,iii,0,1);
@@ -337,8 +342,8 @@ void KOPrefsDialog::setupMainTab()
// DesktopIcon("identity",KIcon::SizeMedium));
QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
// KPrefsDialogWidBool *emailControlCenter =
// addWidBool(i18n("&Use email settings from Control Center"),
@@ -398,7 +403,7 @@ void KOPrefsDialog::setupMainTab()
// &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
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);
mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
@@ -488,8 +493,8 @@ void KOPrefsDialog::setupTimeTab()
// DesktopIcon("clock",KIcon::SizeMedium));
QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
QHBox *dummy = new QHBox(topFrame);
KPrefsDialogWidTime *dayBegins =
@@ -561,8 +566,8 @@ void KOPrefsDialog::setupViewsTab()
// DesktopIcon("viewmag",KIcon::SizeMedium));
QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
// QBoxLayout *dayBeginsLayout = new QHBoxLayout;
// topLayout->addLayout(dayBeginsLayout,0,0);
@@ -606,8 +611,8 @@ void KOPrefsDialog::setupViewsTab()
// DesktopIcon("viewmag",KIcon::SizeMedium));
topLayout = new QGridLayout(topFrame,6,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
ii = 0;
#endif
@@ -653,20 +658,20 @@ void KOPrefsDialog::setupViewsTab()
&(KOPrefs::instance()->mWeeklyRecur),topFrame);
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
// *********************************************************
topFrame = addPage(i18n("Agenda View"),0,0);
// DesktopIcon("viewmag",KIcon::SizeMedium));
topLayout = new QGridLayout(topFrame,5,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
ii = 0;
@@ -712,8 +717,9 @@ void KOPrefsDialog::setupViewsTab()
// DesktopIcon("viewmag",KIcon::SizeMedium));
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;
QHBox *habo = new QHBox( topFrame );
@@ -806,8 +812,8 @@ void KOPrefsDialog::setupViewsTab()
// DesktopIcon("viewmag",KIcon::SizeMedium));
topLayout = new QGridLayout(topFrame,4,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
ii = 0;
@@ -818,7 +824,7 @@ void KOPrefsDialog::setupViewsTab()
topLayout->addWidget(hdummy,ii++,0);
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:");
@@ -862,8 +868,8 @@ void KOPrefsDialog::setupViewsTab()
// DesktopIcon("viewmag",KIcon::SizeMedium));
topLayout = new QGridLayout(topFrame,4,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
ii = 0;
dummy =
addWidBool(i18n("Hide not running Todos in To-do view"),
@@ -928,8 +934,8 @@ dummy =
topFrame = addPage(i18n("View Options"),0,0);
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);
topLayout->addWidget(lab ,ii++,0);
@@ -963,8 +969,8 @@ dummy =
// DesktopIcon("viewmag",KIcon::SizeMedium));
topLayout = new QGridLayout(topFrame,2,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
int iii = 0;
dummy =
@@ -1189,8 +1195,8 @@ void KOPrefsDialog::setupColorsTab()
// DesktopIcon("colorize",KIcon::SizeMedium));
QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
- // topLayout->setSpacing(spacingHint());
- // topLayout->setMargin(marginHint());
+ // topLayout->setSpacing(mSpacingHint);
+ // topLayout->setMargin(mMarginHint);
topLayout->setSpacing(2);
topLayout->setMargin(3);
@@ -1298,8 +1304,8 @@ void KOPrefsDialog::setupPrinterTab()
DesktopIcon("fileprint",KIcon::SizeMedium));
QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
topLayout->setRowStretch(4,1);
}
@@ -1311,8 +1317,8 @@ void KOPrefsDialog::setupGroupSchedulingTab()
DesktopIcon("personal",KIcon::SizeMedium));
QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
#if 0
KPrefsDialogWidRadios *schedulerGroup =
@@ -1362,8 +1368,8 @@ void KOPrefsDialog::setupGroupAutomationTab()
DesktopIcon("personal",KIcon::SizeMedium));
QGridLayout *topLayout = new QGridLayout(topFrame,5,1);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
KPrefsDialogWidRadios *autoRefreshGroup =
addWidRadios(i18n("Auto Send Refresh"),
@@ -1661,8 +1667,8 @@ void KOPrefsDialog::setupTimeZoneTab()
// DesktopIcon("clock",KIcon::SizeMedium));
QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
- topLayout->setSpacing(spacingHint());
- topLayout->setMargin(marginHint());
+ topLayout->setSpacing(mSpacingHint);
+ topLayout->setMargin(mMarginHint);
QHBox *timeZoneBox = new QHBox( topFrame );
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
QSpinBox * mAlarmBeepInterval;
QLineEdit * mDefaultAlarmFile;
+ int mSpacingHint;
+ int mMarginHint;
};
#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 )
mNextYear->setFixedHeight ( size );
mCurrentHei = size +2;
mCurrentMinWid = maxwidth+2;
- mCurrentButtonMinWid = mPrevYear->sizeHint().width()+2;
+ mCurrentButtonMinWid = mPrevYear->sizeHint().width();
}
void NavigatorBar::showButtons( bool left, bool right )