summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-04 17:45:57 (UTC)
committer zautrix <zautrix>2005-02-04 17:45:57 (UTC)
commitf4c3a3e3da57e957b920fe4662c6decd6764f0ee (patch) (unidiff)
tree05648d7d7ac6a0e4798cad08b2993df1375d84d5
parentb7c502a598566264e6e7129524104b6e39438f03 (diff)
downloadkdepimpi-f4c3a3e3da57e957b920fe4662c6decd6764f0ee.zip
kdepimpi-f4c3a3e3da57e957b920fe4662c6decd6764f0ee.tar.gz
kdepimpi-f4c3a3e3da57e957b920fe4662c6decd6764f0ee.tar.bz2
fixxx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--korganizer/komonthview.cpp18
-rw-r--r--korganizer/komonthview.h2
-rw-r--r--korganizer/koprefs.cpp3
-rw-r--r--korganizer/koprefs.h1
-rw-r--r--korganizer/koprefsdialog.cpp5
6 files changed, 25 insertions, 6 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 8c3b1e4..5a5b73e 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1206,20 +1206,20 @@
1206{ "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" }, 1206{ "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" },
1207{ "Default todo done color:","Standard Todo erledigt Farbe" }, 1207{ "Default todo done color:","Standard Todo erledigt Farbe" },
1208{ "Select week %1-%2","Selektiere Woche %1-%2" }, 1208{ "Select week %1-%2","Selektiere Woche %1-%2" },
1209{ "Select Week","Selektiere Woche" }, 1209{ "Select Week","Selektiere Woche" },
1210{ "Set alarm for selected...","Setze Alarm für Selekt..." }, 1210{ "Set alarm for selected...","Setze Alarm für Selekt..." },
1211{ "Set reminder offset to:","Setze Alarm Offset auf:" }, 1211{ "Set reminder offset to:","Setze Alarm Offset auf:" },
1212{ "Set Alarm!","Setze Alarm!" }, 1212{ "Set Alarm!","Setze Alarm!" },
1213{ "Canged alarm for %1 items","Alarm für %1 Items geändert" }, 1213{ "Canged alarm for %1 items","Alarm für %1 Items geändert" },
1214{ " and "," und " }, 1214{ " and "," und " },
1215{ "<IMG src="%1"> only )","nur <IMG src="%1"> )" }, 1215{ "<IMG src="%1"> only )","nur <IMG src="%1"> )" },
1216{ "Mail to selected","Mail an Ausgewählte" }, 1216{ "Mail to selected","Mail an Ausgewählte" },
1217{ "Mail to all","Mail an Alle" }, 1217{ "Mail to all","Mail an Alle" },
1218{ "","" }, 1218{ "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" },
1219{ "","" }, 1219{ "","" },
1220{ "","" }, 1220{ "","" },
1221{ "","" }, 1221{ "","" },
1222{ "","" }, 1222{ "","" },
1223{ "","" }, 1223{ "","" },
1224{ "","" }, 1224{ "","" },
1225{ "","" }, 1225{ "","" },
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index daa37fd..dfa89e2 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -605,27 +605,36 @@ void MonthViewCell::updateCell()
605 } 605 }
606 // insert due todos 606 // insert due todos
607 QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate ); 607 QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
608 Todo *todo; 608 Todo *todo;
609 for(todo = todos.first(); todo; todo = todos.next()) { 609 for(todo = todos.first(); todo; todo = todos.next()) {
610 insertTodo( todo ); 610 insertTodo( todo );
611 } 611 }
612 finishUpdateCell(); 612 finishUpdateCell();
613 // if ( isVisible()) 613 // if ( isVisible())
614 //qApp->processEvents(); 614 //qApp->processEvents();
615} 615}
616 616
617void MonthViewCell::updateConfig() 617void MonthViewCell::updateConfig( bool bigFont ) // = false
618{ 618{
619 setFont( KOPrefs::instance()->mMonthViewFont ); 619
620 if ( bigFont ) {
621 QFont fo = KOPrefs::instance()->mMonthViewFont;
622 int ps = fo.pointSize() + 2;
623 if ( ps < 18 )
624 ps += 2;
625 fo.setPointSize( ps );
626 setFont( fo );
627 } else
628 setFont( KOPrefs::instance()->mMonthViewFont );
620 629
621 QFontMetrics fm( font() ); 630 QFontMetrics fm( font() );
622 mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 ); 631 mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 );
623 mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 ); 632 mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 );
624 mHolidayPalette = mStandardPalette; 633 mHolidayPalette = mStandardPalette;
625 mPrimaryPalette = mStandardPalette; 634 mPrimaryPalette = mStandardPalette;
626 mNonPrimaryPalette = mStandardPalette; 635 mNonPrimaryPalette = mStandardPalette;
627 if ( KOPrefs::instance()->mMonthViewUsesDayColors ) { 636 if ( KOPrefs::instance()->mMonthViewUsesDayColors ) {
628 mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor ); 637 mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor );
629 mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor ); 638 mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor );
630 mHolidayPalette.setColor(QColorGroup::Foreground, KOPrefs::instance()->mMonthViewHolidayColor.dark()); 639 mHolidayPalette.setColor(QColorGroup::Foreground, KOPrefs::instance()->mMonthViewHolidayColor.dark());
631 mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark()); 640 mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark());
@@ -860,24 +869,25 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
860 } 869 }
861 mCellsW.resize( mDaysPerWeek ); 870 mCellsW.resize( mDaysPerWeek );
862 for( col = 0; col < mDaysPerWeek; ++col ) { 871 for( col = 0; col < mDaysPerWeek; ++col ) {
863 MonthViewCell *cell = new MonthViewCell( this, mWeekView ); 872 MonthViewCell *cell = new MonthViewCell( this, mWeekView );
864 mCellsW.insert( col, cell ); 873 mCellsW.insert( col, cell );
865 874
866 connect( cell, SIGNAL( defaultAction( Incidence * ) ), 875 connect( cell, SIGNAL( defaultAction( Incidence * ) ),
867 SLOT( defaultAction( Incidence * ) ) ); 876 SLOT( defaultAction( Incidence * ) ) );
868 connect( cell, SIGNAL( newEventSignal( QDateTime ) ), 877 connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
869 SIGNAL( newEventSignal( QDateTime ) ) ); 878 SIGNAL( newEventSignal( QDateTime ) ) );
870 connect( cell, SIGNAL( showDaySignal( QDate ) ), 879 connect( cell, SIGNAL( showDaySignal( QDate ) ),
871 SIGNAL( showDaySignal( QDate ) ) ); 880 SIGNAL( showDaySignal( QDate ) ) );
881 cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
872 } 882 }
873 883
874 //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) ); 884 //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
875 mContextMenu = eventPopup(); 885 mContextMenu = eventPopup();
876 // updateConfig(); //useless here 886 // updateConfig(); //useless here
877 887
878 //mWeekLabels[mNumWeeks]->setText( i18n("W")); 888 //mWeekLabels[mNumWeeks]->setText( i18n("W"));
879#if 0 889#if 0
880 mWidStack = new QWidgetStack( this ); 890 mWidStack = new QWidgetStack( this );
881 mMonthView = new QWidget( mWidStack ); 891 mMonthView = new QWidget( mWidStack );
882 mWeekView = new QWidget( mWidStack ); 892 mWeekView = new QWidget( mWidStack );
883#endif 893#endif
@@ -983,24 +993,28 @@ void KOMonthView::updateConfig()
983 mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; 993 mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
984 if ( ! mShowWeekView ) { 994 if ( ! mShowWeekView ) {
985 if ( temp != KOPrefs::instance()->mMonthViewSatSunTog ) 995 if ( temp != KOPrefs::instance()->mMonthViewSatSunTog )
986 computeLayout(); 996 computeLayout();
987 } 997 }
988 updateDayLabels(); 998 updateDayLabels();
989 //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks); 999 //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks);
990 //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks; 1000 //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks;
991 //resizeEvent( 0 ); 1001 //resizeEvent( 0 );
992 for (uint i = 0; i < mCells.count(); ++i) { 1002 for (uint i = 0; i < mCells.count(); ++i) {
993 mCells[i]->updateConfig(); 1003 mCells[i]->updateConfig();
994 } 1004 }
1005
1006 for (uint i = 0; i < mCellsW.count(); ++i) {
1007 mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont);
1008 }
995#ifdef DESKTOP_VERSION 1009#ifdef DESKTOP_VERSION
996 MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 1010 MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips);
997#endif 1011#endif
998 updateView(); 1012 updateView();
999} 1013}
1000 1014
1001void KOMonthView::updateDayLabels() 1015void KOMonthView::updateDayLabels()
1002{ 1016{
1003 1017
1004 QPtrVector<QLabel> *mDayLabelsT; 1018 QPtrVector<QLabel> *mDayLabelsT;
1005#if 0 1019#if 0
1006 if (mShowWeekView ) 1020 if (mShowWeekView )
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index b89b2bc..700f098 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -134,25 +134,25 @@ class MonthViewCell : public QWidget
134 void setPrimary( bool ); 134 void setPrimary( bool );
135 bool isPrimary() const; 135 bool isPrimary() const;
136 136
137 void setHoliday( bool ); 137 void setHoliday( bool );
138 void setHoliday( const QString & ); 138 void setHoliday( const QString & );
139 139
140 void updateCell(); 140 void updateCell();
141 void startUpdateCell(); 141 void startUpdateCell();
142 void finishUpdateCell(); 142 void finishUpdateCell();
143 void insertEvent(Event *); 143 void insertEvent(Event *);
144 void insertTodo(Todo *); 144 void insertTodo(Todo *);
145 145
146 void updateConfig(); 146 void updateConfig( bool bigFont = false );
147 147
148 void enableScrollBars( bool ); 148 void enableScrollBars( bool );
149 149
150 Incidence *selectedIncidence(); 150 Incidence *selectedIncidence();
151 QDate selectedIncidenceDate(); 151 QDate selectedIncidenceDate();
152 152
153 void deselect(); 153 void deselect();
154 void select(); 154 void select();
155 void clear(); 155 void clear();
156 156
157#ifdef DESKTOP_VERSION 157#ifdef DESKTOP_VERSION
158 static QToolTipGroup *toolTipGroup(); 158 static QToolTipGroup *toolTipGroup();
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 2fb7c36..ea5aaa1 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -236,25 +236,26 @@ KOPrefs::KOPrefs() :
236 addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true); 236 addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true);
237 addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false); 237 addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
238 addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); 238 addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
239 addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); 239 addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
240 addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); 240 addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
241 addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);; 241 addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
242 addItemBool("WNViewShowsPast",&mWNViewShowsPast,true); 242 addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
243 addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); 243 addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
244 addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); 244 addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
245 addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); 245 addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
246 addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); 246 addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
247 addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false); 247 addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
248 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false); 248 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true);
249 addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true);
249 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false); 250 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
250 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false); 251 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
251#ifdef DESKTOP_VERSION 252#ifdef DESKTOP_VERSION
252 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true); 253 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
253#else 254#else
254 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false); 255 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
255#endif 256#endif
256 addItemInt("Day Begins",&mDayBegins,7); 257 addItemInt("Day Begins",&mDayBegins,7);
257 addItemInt("Working Hours Start",&mWorkingHoursStart,8); 258 addItemInt("Working Hours Start",&mWorkingHoursStart,8);
258 addItemInt("Working Hours End",&mWorkingHoursEnd,17); 259 addItemInt("Working Hours End",&mWorkingHoursEnd,17);
259 addItemBool("Exclude Holidays",&mExcludeHolidays,true); 260 addItemBool("Exclude Holidays",&mExcludeHolidays,true);
260 addItemBool("Exclude Saturdays",&mExcludeSaturdays,true); 261 addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 6541af2..dddcdca 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -231,24 +231,25 @@ class KOPrefs : public KPimPrefs
231 bool mViewChangeHoldFullscreen; 231 bool mViewChangeHoldFullscreen;
232 bool mViewChangeHoldNonFullscreen; 232 bool mViewChangeHoldNonFullscreen;
233 bool mCenterOnCurrentTime; 233 bool mCenterOnCurrentTime;
234 bool mSetTimeToDayStartAt; 234 bool mSetTimeToDayStartAt;
235 bool mHighlightCurrentDay; 235 bool mHighlightCurrentDay;
236 bool mUseHighlightLightColor; 236 bool mUseHighlightLightColor;
237 bool mListViewMonthTimespan; 237 bool mListViewMonthTimespan;
238 bool mWNViewShowsParents; 238 bool mWNViewShowsParents;
239 bool mWNViewShowsPast; 239 bool mWNViewShowsPast;
240 bool mWNViewShowLocation; 240 bool mWNViewShowLocation;
241 bool mTodoViewShowsPercentage; 241 bool mTodoViewShowsPercentage;
242 bool mTodoViewUsesCatColors; 242 bool mTodoViewUsesCatColors;
243 bool mMonthViewUsesBigFont;
243 bool mTodoViewUsesSmallFont; 244 bool mTodoViewUsesSmallFont;
244 bool mTodoViewUsesForegroundColor; 245 bool mTodoViewUsesForegroundColor;
245 bool mMonthViewUsesForegroundColor; 246 bool mMonthViewUsesForegroundColor;
246 247
247 bool mHightlightDateTimeEdit; 248 bool mHightlightDateTimeEdit;
248 bool mShortDateInViewer; 249 bool mShortDateInViewer;
249 250
250 bool mShowDateNavigator; 251 bool mShowDateNavigator;
251 252
252 QStringList mLocationDefaults; 253 QStringList mLocationDefaults;
253 QStringList mEventSummaryUser; 254 QStringList mEventSummaryUser;
254 QStringList mTodoSummaryUser; 255 QStringList mTodoSummaryUser;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 580dff2..452d019 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -750,25 +750,28 @@ void KOPrefsDialog::setupViewsTab()
750 weeklyRecur = 750 weeklyRecur =
751 addWidBool(i18n("icons"), 751 addWidBool(i18n("icons"),
752 &(KOPrefs::instance()->mMonthShowIcons),habo); 752 &(KOPrefs::instance()->mMonthShowIcons),habo);
753 753
754 topLayout->addMultiCellWidget(habo,ii, ii,0,1); 754 topLayout->addMultiCellWidget(habo,ii, ii,0,1);
755 ii++; 755 ii++;
756#ifdef DESKTOP_VERSION 756#ifdef DESKTOP_VERSION
757 KPrefsDialogWidBool *enableMonthScroll = 757 KPrefsDialogWidBool *enableMonthScroll =
758 addWidBool(i18n("Enable scrollbars in month view cells"), 758 addWidBool(i18n("Enable scrollbars in month view cells"),
759 &(KOPrefs::instance()->mEnableMonthScroll),topFrame); 759 &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
760 topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); 760 topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0);
761#endif 761#endif
762 762 dummy =
763 addWidBool(i18n("Week view mode uses bigger font"),
764 &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame);
765 topLayout->addWidget(dummy->checkBox(),ii++,0);
763 dummy = 766 dummy =
764 addWidBool(i18n("Show Sat/Sun together"), 767 addWidBool(i18n("Show Sat/Sun together"),
765 &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); 768 &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame);
766 topLayout->addWidget(dummy->checkBox(),ii++,0); 769 topLayout->addWidget(dummy->checkBox(),ii++,0);
767 770
768 KPrefsDialogWidBool *coloredCategoriesInMonthView = 771 KPrefsDialogWidBool *coloredCategoriesInMonthView =
769 addWidBool(i18n("Month view uses category colors"), 772 addWidBool(i18n("Month view uses category colors"),
770 &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); 773 &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
771 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 774 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
772 775
773 dummy = 776 dummy =
774 addWidBool(i18n("Categorie colors are applied to text"), 777 addWidBool(i18n("Categorie colors are applied to text"),