summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-07-08 12:15:38 (UTC)
committer zautrix <zautrix>2005-07-08 12:15:38 (UTC)
commit3e94cf2e8a14c7d40aea28a0fe5538abcd211746 (patch) (unidiff)
tree04b5095d96824d5c3d4e01c144e2968dc99e46d8
parente1ed9342934d027f8b72a97eb710a52abe53b719 (diff)
downloadkdepimpi-3e94cf2e8a14c7d40aea28a0fe5538abcd211746.zip
kdepimpi-3e94cf2e8a14c7d40aea28a0fe5538abcd211746.tar.gz
kdepimpi-3e94cf2e8a14c7d40aea28a0fe5538abcd211746.tar.bz2
fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefs.cpp2
-rw-r--r--korganizer/mainwindow.cpp26
-rw-r--r--korganizer/mainwindow.h1
3 files changed, 24 insertions, 5 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 9e7f18c..6560877 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -255,25 +255,25 @@ KOPrefs::KOPrefs() :
255 addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); 255 addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
256 addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); 256 addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
257 addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); 257 addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
258 addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);; 258 addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
259 addItemBool("WNViewShowsPast",&mWNViewShowsPast,true); 259 addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
260 addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); 260 addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
261 addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); 261 addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
262 addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); 262 addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
263 addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); 263 addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
264 addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false); 264 addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
265 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true); 265 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true);
266 addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true); 266 addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true);
267 addItemBool("MonthViewWeekRowlayout",&mMonthViewWeekRowlayout,true); 267 addItemBool("MonthViewWeekRowlayout",&mMonthViewWeekRowlayout,false);
268 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false); 268 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
269 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false); 269 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
270#ifdef DESKTOP_VERSION 270#ifdef DESKTOP_VERSION
271 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true); 271 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
272#else 272#else
273 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false); 273 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
274#endif 274#endif
275 addItemInt("Day Begins",&mDayBegins,7); 275 addItemInt("Day Begins",&mDayBegins,7);
276 addItemInt("Working Hours Start",&mWorkingHoursStart,8); 276 addItemInt("Working Hours Start",&mWorkingHoursStart,8);
277 addItemInt("Working Hours End",&mWorkingHoursEnd,17); 277 addItemInt("Working Hours End",&mWorkingHoursEnd,17);
278 addItemBool("Exclude Holidays",&mExcludeHolidays,true); 278 addItemBool("Exclude Holidays",&mExcludeHolidays,true);
279 addItemBool("Exclude Saturdays",&mExcludeSaturdays,true); 279 addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index bfae1b5..5249300 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1109,24 +1109,25 @@ void MainWindow::initActions()
1109 action->addTo( exportMenu_X ); 1109 action->addTo( exportMenu_X );
1110 connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); 1110 connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
1111 1111
1112 1112
1113 //LR 1113 //LR
1114 QPopupMenu *ex2phone = new QPopupMenu( this ); 1114 QPopupMenu *ex2phone = new QPopupMenu( this );
1115 ex2phone->insertItem(i18n("Complete calendar..."), 1 ); 1115 ex2phone->insertItem(i18n("Complete calendar..."), 1 );
1116 ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); 1116 ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
1117 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); 1117 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
1118 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); 1118 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
1119 1119
1120 importMenu->insertItem( i18n("Export"), exportMenu_X ); 1120 importMenu->insertItem( i18n("Export"), exportMenu_X );
1121 mPrintSelAction = 0;
1121#ifndef DESKTOP_VERSION 1122#ifndef DESKTOP_VERSION
1122 //importMenu->insertSeparator(); 1123 //importMenu->insertSeparator();
1123 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, 1124 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
1124 this ); 1125 this );
1125 brAction->addTo( beamMenu_X ); 1126 brAction->addTo( beamMenu_X );
1126 brAction->setToggleAction (true ) ; 1127 brAction->setToggleAction (true ) ;
1127 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); 1128 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
1128 1129
1129 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, 1130 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
1130 this ); 1131 this );
1131 action->addTo( beamMenu_X ); 1132 action->addTo( beamMenu_X );
1132 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); 1133 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
@@ -1135,46 +1136,48 @@ void MainWindow::initActions()
1135 this ); 1136 this );
1136 action->addTo( beamMenu_X ); 1137 action->addTo( beamMenu_X );
1137 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); 1138 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
1138 importMenu->insertItem( i18n("Beam"), beamMenu_X ); 1139 importMenu->insertItem( i18n("Beam"), beamMenu_X );
1139#else 1140#else
1140 //importMenu->insertSeparator(); 1141 //importMenu->insertSeparator();
1141 icon = loadPixmap( pathString + "print" ); 1142 icon = loadPixmap( pathString + "print" );
1142 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); 1143 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
1143 action->addTo( beamMenu_X ); 1144 action->addTo( beamMenu_X );
1144 connect( action, SIGNAL( activated() ), 1145 connect( action, SIGNAL( activated() ),
1145 this, SLOT( printCal() ) ); 1146 this, SLOT( printCal() ) );
1146 1147
1147 icon = loadPixmap( pathString + "print" ); 1148 icon = loadPixmap( pathString + "week" );
1148 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); 1149 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
1149 action->addTo( beamMenu_X ); 1150 action->addTo( beamMenu_X );
1150 connect( action, SIGNAL( activated() ), 1151 connect( action, SIGNAL( activated() ),
1151 this, SLOT( printSel() ) ); 1152 this, SLOT( printSel() ) );
1153 icon = loadPixmap( pathString + "whatsnext" );
1152 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); 1154 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
1153 action->addTo( beamMenu_X ); 1155 action->addTo( beamMenu_X );
1154 connect( action, SIGNAL( activated() ), 1156 connect( action, SIGNAL( activated() ),
1155 mView->viewManager(), SLOT( slotprintWNV() ) ); 1157 mView->viewManager(), SLOT( slotprintWNV() ) );
1156 1158
1157 1159
1158 icon = loadPixmap( pathString + "print" ); 1160 icon = loadPixmap( pathString + "list" );
1159 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); 1161 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
1160 action->addTo( beamMenu_X ); 1162 action->addTo( beamMenu_X );
1161 connect( action, SIGNAL( activated() ), 1163 connect( action, SIGNAL( activated() ),
1162 this, SLOT( printListView() ) ); 1164 this, SLOT( printListView() ) );
1163 1165
1166 icon = loadPixmap( pathString + "newevent" );
1164 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); 1167 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
1165 action->addTo( beamMenu_X ); 1168 action->addTo( beamMenu_X );
1166 connect( action, SIGNAL( activated() ), 1169 connect( action, SIGNAL( activated() ),
1167 mView, SLOT( slotprintSelInc() ) ); 1170 mView, SLOT( slotprintSelInc() ) );
1168 1171 mPrintSelAction = action;
1169 importMenu->insertItem( i18n("Print"), beamMenu_X ); 1172 importMenu->insertItem( i18n("Print"), beamMenu_X );
1170#endif 1173#endif
1171 1174
1172 importMenu->insertSeparator(); 1175 importMenu->insertSeparator();
1173 action = new QAction( "beam all", i18n("Save"), 0, 1176 action = new QAction( "beam all", i18n("Save"), 0,
1174 this ); 1177 this );
1175 action->addTo( importMenu ); 1178 action->addTo( importMenu );
1176 connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); 1179 connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
1177 action = new QAction( "beam all", i18n("Exit (+save)"), 0, 1180 action = new QAction( "beam all", i18n("Exit (+save)"), 0,
1178 this ); 1181 this );
1179 action->addTo( importMenu ); 1182 action->addTo( importMenu );
1180 connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); 1183 connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
@@ -1731,37 +1734,52 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
1731 setCaption( incidence->summary()+startString); 1734 setCaption( incidence->summary()+startString);
1732 enableIncidenceActions( true ); 1735 enableIncidenceActions( true );
1733 if ( incidence->typeID() == eventID ) { 1736 if ( incidence->typeID() == eventID ) {
1734 mShowAction->setMenuText( i18n("Show Event") ); 1737 mShowAction->setMenuText( i18n("Show Event") );
1735 mNewSubTodoAction->setEnabled( false ); 1738 mNewSubTodoAction->setEnabled( false );
1736 } else if ( incidence->typeID() == todoID ) { 1739 } else if ( incidence->typeID() == todoID ) {
1737 mShowAction->setMenuText( i18n("Show Todo") ); 1740 mShowAction->setMenuText( i18n("Show Todo") );
1738 mNewSubTodoAction->setEnabled( true ); 1741 mNewSubTodoAction->setEnabled( true );
1739 } else { 1742 } else {
1740 mShowAction->setMenuText( i18n("Show") ); 1743 mShowAction->setMenuText( i18n("Show") );
1741 mNewSubTodoAction->setEnabled( false ); 1744 mNewSubTodoAction->setEnabled( false );
1742 } 1745 }
1746 static QPixmap jP = SmallIcon( "journal" );
1747 static QPixmap eP = SmallIcon( "newevent" );
1748 static QPixmap tP = SmallIcon( "newtodo" );
1749#ifdef DESKTOP_VERSION
1750 QIconSet icon;
1751 if ( incidence->typeID() == todoID )
1752 icon = QIconSet ( tP );
1753 else if ( incidence->typeID() == eventID )
1754 icon = QIconSet ( eP );
1755 else if ( incidence->typeID() == journalID )
1756 icon = QIconSet ( jP );
1757 mPrintSelAction->setIconSet ( icon );
1758#endif
1743} 1759}
1744 1760
1745void MainWindow::enableIncidenceActions( bool enabled ) 1761void MainWindow::enableIncidenceActions( bool enabled )
1746{ 1762{
1747 mShowAction->setEnabled( enabled ); 1763 mShowAction->setEnabled( enabled );
1748 mEditAction->setEnabled( enabled ); 1764 mEditAction->setEnabled( enabled );
1749 mDeleteAction->setEnabled( enabled ); 1765 mDeleteAction->setEnabled( enabled );
1750 1766
1751 mCloneAction->setEnabled( enabled ); 1767 mCloneAction->setEnabled( enabled );
1752 mMoveAction->setEnabled( enabled ); 1768 mMoveAction->setEnabled( enabled );
1753#ifndef DESKTOP_VERSION 1769#ifndef DESKTOP_VERSION
1754 mBeamAction->setEnabled( enabled ); 1770 mBeamAction->setEnabled( enabled );
1755#endif 1771#else
1772 mPrintSelAction->setEnabled( enabled );
1773#endif
1756 mCancelAction->setEnabled( enabled ); 1774 mCancelAction->setEnabled( enabled );
1757} 1775}
1758 1776
1759void MainWindow::importOL() 1777void MainWindow::importOL()
1760{ 1778{
1761#ifdef _OL_IMPORT_ 1779#ifdef _OL_IMPORT_
1762 mView->clearAllViews(); 1780 mView->clearAllViews();
1763 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); 1781 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
1764 id->exec(); 1782 id->exec();
1765 delete id; 1783 delete id;
1766 mView->calendar()->checkAlarmForIncidence( 0, true ); 1784 mView->calendar()->checkAlarmForIncidence( 0, true );
1767 mView->updateView(); 1785 mView->updateView();
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 41d5807..d648f14 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -146,24 +146,25 @@ class MainWindow : public QMainWindow
146 QAction *mWeekAction; 146 QAction *mWeekAction;
147 QFont mWeekFont; 147 QFont mWeekFont;
148 QPixmap mWeekPixmap; 148 QPixmap mWeekPixmap;
149 QColor mWeekBgColor; 149 QColor mWeekBgColor;
150 150
151 QAction *mShowAction; 151 QAction *mShowAction;
152 QAction *mEditAction; 152 QAction *mEditAction;
153 QAction *mDeleteAction; 153 QAction *mDeleteAction;
154 QAction *mCloneAction; 154 QAction *mCloneAction;
155 QAction *mMoveAction; 155 QAction *mMoveAction;
156 QAction *mBeamAction; 156 QAction *mBeamAction;
157 QAction *mCancelAction; 157 QAction *mCancelAction;
158 QAction *mPrintSelAction;
158 159
159 QAction *mToggleNav; 160 QAction *mToggleNav;
160 QAction *mToggleFilter; 161 QAction *mToggleFilter;
161 QAction *mToggleAllday; 162 QAction *mToggleAllday;
162 QAction *actionFilterMenuTB; 163 QAction *actionFilterMenuTB;
163 164
164 void closeEvent( QCloseEvent* ce ); 165 void closeEvent( QCloseEvent* ce );
165 QTimer mSaveTimer; 166 QTimer mSaveTimer;
166 //bool mBlockSaveFlag; 167 //bool mBlockSaveFlag;
167 bool mCalendarModifiedFlag; 168 bool mCalendarModifiedFlag;
168 QPixmap loadPixmap( QString ); 169 QPixmap loadPixmap( QString );
169 QPixmap listviewPix, listviewPix0, listviewPix20, listviewPix40, listviewPix60, listviewPix80, journalPix; 170 QPixmap listviewPix, listviewPix0, listviewPix20, listviewPix40, listviewPix60, listviewPix80, journalPix;