summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/featuresKOPI.txt3
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt6
-rw-r--r--korganizer/koagendaview.cpp8
-rw-r--r--korganizer/koviewmanager.cpp6
-rw-r--r--korganizer/koviewmanager.h2
-rw-r--r--korganizer/mainwindow.cpp53
-rw-r--r--korganizer/mainwindow.h24
7 files changed, 56 insertions, 46 deletions
diff --git a/bin/kdepim/korganizer/featuresKOPI.txt b/bin/kdepim/korganizer/featuresKOPI.txt
index 7f4009c..ab6b224 100644
--- a/bin/kdepim/korganizer/featuresKOPI.txt
+++ b/bin/kdepim/korganizer/featuresKOPI.txt
@@ -190,19 +190,22 @@ complete next month as date range.
1906) 1906)
191Navigation in agenda view: 191Navigation in agenda view:
192If you select (as an example) 4 days in the date navigator 192If you select (as an example) 4 days in the date navigator
193the (week-) navigation key will select the same 4 days in the next week. 193the (week-) navigation key will select the same 4 days in the next week.
194If you want to get the next 4 days after the selected 4 days selected, 194If you want to get the next 4 days after the selected 4 days selected,
195you have to switch the navigation mode to "next days mode" 195you have to switch the navigation mode to "next days mode"
196by clicking on the next days icons. 196by clicking on the next days icons.
197Now the next days from today are selected, but after selecting 197Now the next days from today are selected, but after selecting
1984 days in the day navigator the (week-) navigation key 1984 days in the day navigator the (week-) navigation key
199will select the next 4 days. 199will select the next 4 days.
200The "next days mode" is turned off by clicking on the 200The "next days mode" is turned off by clicking on the
201week view, work week view or day view button. 201week view, work week view or day view button.
202The agenda view has "time labels" on the left, which displays the hours from 0-24.
203If you press the mouse on the timelabels and move it up/down you can
204increase/decrease the agenda size quickly.
202 205
203 206
204 207
205 208
206 209
207 210
208 211
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 73940c6..35d2812 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -66,27 +66,24 @@
66{"Ask for every entry on conflict","Frage bei Konflikten nach"}, 66{"Ask for every entry on conflict","Frage bei Konflikten nach"},
67{ "Ask for preferences before syncing","Vor dem Syncronisieren nachfragen" }, 67{ "Ask for preferences before syncing","Vor dem Syncronisieren nachfragen" },
68{ "Ask for quit when closing KO/Pi","Vor dem Beenden von KO/Pi nachfragen" }, 68{ "Ask for quit when closing KO/Pi","Vor dem Beenden von KO/Pi nachfragen" },
69{ "Attendees","Teilnehmer" }, 69{ "Attendees","Teilnehmer" },
70{ "Aug","Aug" }, 70{ "Aug","Aug" },
71{ "August","August" }, 71{ "August","August" },
72{ "Auto-Save","Automatisches Abspeichern" }, 72{ "Auto-Save","Automatisches Abspeichern" },
73{ "Auto save delay in minutes:","Verzög.autom.Speichern in Min" }, 73{ "Auto save delay in minutes:","Verzög.autom.Speichern in Min" },
74{ "Auto saving...","Automatische Sicherung..." }, 74{ "Auto saving...","Automatische Sicherung..." },
75{ "Begin on:","Starte mit:" }, 75{ "Begin on:","Starte mit:" },
76{ "Begins on: %1","Starte mit: %1" }, 76{ "Begins on: %1","Starte mit: %1" },
77{ "<b>From:</b> %1 <b>To:</b> %2","<b>Vom:</b> %1 <b>Zum:</b> %2" }, 77{ "<b>From:</b> %1 <b>To:</b> %2","<b>Vom:</b> %1 <b>Zum:</b> %2" },
78{ "Bigger","Größer" },
79{ "Biggest","Riesig" },
80{ "Big","Groß" },
81{ "<b>On:</b> %1","<b>Am:</b> %1" }, 78{ "<b>On:</b> %1","<b>Am:</b> %1" },
82{ "<b>On:</b> %1 <b>From:S</b> %2 <b>To:</b> %3","<b>Am:</b> %1 <b>Vom:S</b> %2 <b>Zum:</b> %3" }, 79{ "<b>On:</b> %1 <b>From:S</b> %2 <b>To:</b> %3","<b>Am:</b> %1 <b>Vom:S</b> %2 <b>Zum:</b> %3" },
83{ "<b>Original event:</b><p>","<b>Original Termin:</b><p>" }, 80{ "<b>Original event:</b><p>","<b>Original Termin:</b><p>" },
84{ " - both are modified after last sync"," - beide wurden nach der letzten Syncronisation verändert" }, 81{ " - both are modified after last sync"," - beide wurden nach der letzten Syncronisation verändert" },
85{ "Busy","Belegt" }, 82{ "Busy","Belegt" },
86{ "&Cancel","Abbre&chen" }, 83{ "&Cancel","Abbre&chen" },
87{ "Cancel","Abbrechen" }, 84{ "Cancel","Abbrechen" },
88{ "Cannot delete To-Do\nwhich has children.","Kann Todo nicht löschen,\n da noch Einträge vorhanden sind" }, 85{ "Cannot delete To-Do\nwhich has children.","Kann Todo nicht löschen,\n da noch Einträge vorhanden sind" },
89{ "Can't generate mail:\nNo event selected.","Kann e-Mail nicht erstellen:\nKein Termin ausgewählt." }, 86{ "Can't generate mail:\nNo event selected.","Kann e-Mail nicht erstellen:\nKein Termin ausgewählt." },
90{ "Categories...","Kategorien..." }, 87{ "Categories...","Kategorien..." },
91{ "Categories","Kategorien" }, 88{ "Categories","Kategorien" },
92{ "Category","Kategorie" }, 89{ "Category","Kategorie" },
@@ -397,25 +394,24 @@
397{ "This item will be\npermanently deleted.","Dieser Eintrag wird\nkomplett gelöscht." }, 394{ "This item will be\npermanently deleted.","Dieser Eintrag wird\nkomplett gelöscht." },
398{ "This item will be permanently deleted.", "Dieser Eintrag wird komplett gelöscht." }, 395{ "This item will be permanently deleted.", "Dieser Eintrag wird komplett gelöscht." },
399{ "Thu","Do" }, 396{ "Thu","Do" },
400{ "Thursday","Donnerstag" }, 397{ "Thursday","Donnerstag" },
401{ "Time associated","Mit Zeit" }, 398{ "Time associated","Mit Zeit" },
402{ "Time bar:","Uhrzeit Zeile:" }, 399{ "Time bar:","Uhrzeit Zeile:" },
403{ "Time && Date","Zeit und Datum" }, 400{ "Time && Date","Zeit und Datum" },
404{ "Time Format","Zeit Format" }, 401{ "Time Format","Zeit Format" },
405{ "Time Format(nr):","Zeit Format(Neustart!)" }, 402{ "Time Format(nr):","Zeit Format(Neustart!)" },
406{ "Date Labels:","Datumsleiste:" }, 403{ "Date Labels:","Datumsleiste:" },
407{ "Time: ","Zeit: " }, 404{ "Time: ","Zeit: " },
408{ "Timezone:","Zeitzone:" }, 405{ "Timezone:","Zeitzone:" },
409{ "Tiny","Sehr klein" },
410{ "To: ","Bis: " }, 406{ "To: ","Bis: " },
411{ "To:","Bis:" }, 407{ "To:","Bis:" },
412{ "Today: ","Heute: " }, 408{ "Today: ","Heute: " },
413{ "Todo due today color:","Heute fällige To-Do's" }, 409{ "Todo due today color:","Heute fällige To-Do's" },
414{ "To-do items:","To-Do items:" }, 410{ "To-do items:","To-Do items:" },
415{ "Todo overdue color:","Überfällige To-Do's" }, 411{ "Todo overdue color:","Überfällige To-Do's" },
416{ "Todo","Todo" }, 412{ "Todo","Todo" },
417{ "To-do view shows completed Todos","To-do Ansicht zeigt erledigte To-dos" }, 413{ "To-do view shows completed Todos","To-do Ansicht zeigt erledigte To-dos" },
418{ "ToDoView:","Todo Ansicht:" }, 414{ "ToDoView:","Todo Ansicht:" },
419{ "Toggle Alarm","Wechsle Alarm" }, 415{ "Toggle Alarm","Wechsle Alarm" },
420{ "Toggle Allday","Umschalten Ganztag" }, 416{ "Toggle Allday","Umschalten Ganztag" },
421{ "Tomorrow: ","Morgen: " }, 417{ "Tomorrow: ","Morgen: " },
@@ -1186,16 +1182,16 @@
1186{ "completed to-dos","erledigte Todos" }, 1182{ "completed to-dos","erledigte Todos" },
1187{ "events","Ereignisse" }, 1183{ "events","Ereignisse" },
1188{ "todos","Todos" }, 1184{ "todos","Todos" },
1189{ "journals","Journale" }, 1185{ "journals","Journale" },
1190{ "public","öffentlich" }, 1186{ "public","öffentlich" },
1191{ "private","privat" }, 1187{ "private","privat" },
1192{ "confidential","vertraulich" }, 1188{ "confidential","vertraulich" },
1193{ "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" }, 1189{ "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" },
1194{ "Yesterday","Gestern" }, 1190{ "Yesterday","Gestern" },
1195{ "Day after tomorrow","Übermorgen" }, 1191{ "Day after tomorrow","Übermorgen" },
1196{ "Tomorrow","Morgen" }, 1192{ "Tomorrow","Morgen" },
1197{ "Day before yesterday","Vorgestern" }, 1193{ "Day before yesterday","Vorgestern" },
1198{ "","" }, 1194{ "Size %1","Größe %1" },
1199{ "","" }, 1195{ "","" },
1200{ "","" }, 1196{ "","" },
1201{ "","" }, 1197{ "","" },
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 05216a7..f54f7bc 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -207,41 +207,41 @@ void TimeLabels::contentsMousePressEvent ( QMouseEvent * e)
207 mMouseDownY = e->pos().y(); 207 mMouseDownY = e->pos().y();
208 mOrgCap = topLevelWidget()->caption(); 208 mOrgCap = topLevelWidget()->caption();
209} 209}
210 210
211void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) 211void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e )
212{ 212{
213 int diff = mMouseDownY - e->pos().y(); 213 int diff = mMouseDownY - e->pos().y();
214 if ( diff < 10 && diff > -10 ) 214 if ( diff < 10 && diff > -10 )
215 return; 215 return;
216 int tSize = KOPrefs::instance()->mHourSize + (diff/10) ; 216 int tSize = KOPrefs::instance()->mHourSize + (diff/10) ;
217 if ( tSize < 4 ) 217 if ( tSize < 4 )
218 tSize = 4; 218 tSize = 4;
219 if ( tSize > 18 ) 219 if ( tSize > 22 )
220 tSize = 18; 220 tSize = 22;
221 tSize = (tSize-2)/2; 221 tSize = (tSize-2)/2;
222 topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize)); 222 topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize));
223 223
224} 224}
225void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e ) 225void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e )
226{ 226{
227 topLevelWidget()->setCaption( mOrgCap ); 227 topLevelWidget()->setCaption( mOrgCap );
228 int diff = mMouseDownY - e->pos().y(); 228 int diff = mMouseDownY - e->pos().y();
229 if ( diff < 10 && diff > -10 ) 229 if ( diff < 10 && diff > -10 )
230 return; 230 return;
231 int tSize = KOPrefs::instance()->mHourSize + (diff/10); 231 int tSize = KOPrefs::instance()->mHourSize + (diff/10);
232 if ( tSize < 4 ) 232 if ( tSize < 4 )
233 tSize = 4; 233 tSize = 4;
234 if ( tSize > 18 ) 234 if ( tSize > 22 )
235 tSize = 18; 235 tSize = 22;
236 tSize = (tSize/2)*2; 236 tSize = (tSize/2)*2;
237 if ( tSize == KOPrefs::instance()->mHourSize ) 237 if ( tSize == KOPrefs::instance()->mHourSize )
238 return; 238 return;
239 KOPrefs::instance()->mHourSize = tSize; 239 KOPrefs::instance()->mHourSize = tSize;
240 emit scaleChanged(); 240 emit scaleChanged();
241} 241}
242 242
243/** This is called in response to repaint() */ 243/** This is called in response to repaint() */
244void TimeLabels::paintEvent(QPaintEvent*) 244void TimeLabels::paintEvent(QPaintEvent*)
245{ 245{
246 246
247 // kdDebug() << "paintevent..." << endl; 247 // kdDebug() << "paintevent..." << endl;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index e255b83..94c459b 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -173,46 +173,48 @@ void KOViewManager::raiseCurrentView( bool fullScreen )
173 } else { 173 } else {
174 mMainView->navigatorBar()->hide(); 174 mMainView->navigatorBar()->hide();
175 } 175 }
176 if ( fullScreen ) { 176 if ( fullScreen ) {
177 mMainView->leftFrame()->hide(); 177 mMainView->leftFrame()->hide();
178 } else { 178 } else {
179 mMainView->leftFrame()->show(); 179 mMainView->leftFrame()->show();
180 if ( KOPrefs::instance()->mVerticalScreen ) 180 if ( KOPrefs::instance()->mVerticalScreen )
181 hei -= mMainView->leftFrame()->height(); 181 hei -= mMainView->leftFrame()->height();
182 else 182 else
183 wid -= mMainView->leftFrame()->width(); 183 wid -= mMainView->leftFrame()->width();
184 } 184 }
185 185 emit signalFullScreen( !fullScreen );
186 if ( globalFlagBlockAgenda == 5 ) { 186 if ( globalFlagBlockAgenda == 5 ) {
187 globalFlagBlockAgenda = 4; 187 globalFlagBlockAgenda = 4;
188 globalFlagBlockAgendaItemPaint = 1; 188 globalFlagBlockAgendaItemPaint = 1;
189 } 189 }
190 mMainView->viewStack()->raiseWidget(mCurrentView); 190 mMainView->viewStack()->raiseWidget(mCurrentView);
191 if ( globalFlagBlockAgenda == 4 ) { 191 if ( globalFlagBlockAgenda == 4 ) {
192 if ( mCurrentView == mAgendaView ) { 192 if ( mCurrentView == mAgendaView ) {
193 //globalFlagBlockAgenda =1 ; 193 //globalFlagBlockAgenda =1 ;
194 if ( KOPrefs::instance()->mSetTimeToDayStartAt ) 194 if ( KOPrefs::instance()->mSetTimeToDayStartAt )
195 mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins ); 195 mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins );
196 else if ( KOPrefs::instance()->mCenterOnCurrentTime ) 196 else if ( KOPrefs::instance()->mCenterOnCurrentTime )
197 mAgendaView->setStartHour( QTime::currentTime ().hour() ); 197 mAgendaView->setStartHour( QTime::currentTime ().hour() );
198 qApp->processEvents(); 198 qApp->processEvents();
199 //qDebug("qApp->processEvents() "); 199 //qDebug("qApp->processEvents() ");
200 globalFlagBlockAgenda = 0; 200 globalFlagBlockAgenda = 0;
201 mAgendaView->repaintAgenda(); 201 mAgendaView->repaintAgenda();
202 202
203 } 203 }
204 globalFlagBlockAgenda = 0; 204 globalFlagBlockAgenda = 0;
205 } 205 }
206 emit signalAgendaView( mCurrentView == mAgendaView );
206 //qDebug("raiseCurrentView ende "); 207 //qDebug("raiseCurrentView ende ");
208
207} 209}
208 210
209void KOViewManager::updateView() 211void KOViewManager::updateView()
210{ 212{
211 // qDebug("KOViewManager::updateView() "); 213 // qDebug("KOViewManager::updateView() ");
212 // if we are updating mTodoView, we get endless recursion 214 // if we are updating mTodoView, we get endless recursion
213 if ( mTodoView == mCurrentView ) 215 if ( mTodoView == mCurrentView )
214 return; 216 return;
215 if ( mCurrentView ) mCurrentView->updateView(); 217 if ( mCurrentView ) mCurrentView->updateView();
216 218
217} 219}
218 220
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index 3c251fb..c8c7a7a 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -70,24 +70,26 @@ class KOViewManager : public QObject
70 70
71 void raiseCurrentView( bool fullScreen = false ); 71 void raiseCurrentView( bool fullScreen = false );
72 72
73 void addView(KOrg::BaseView *); 73 void addView(KOrg::BaseView *);
74 74
75 Incidence *currentSelection(); 75 Incidence *currentSelection();
76 QDate currentSelectionDate(); 76 QDate currentSelectionDate();
77 77
78 KOAgendaView *agendaView() const { return mAgendaView; } 78 KOAgendaView *agendaView() const { return mAgendaView; }
79 79
80 signals: 80 signals:
81 void printWNV(); 81 void printWNV();
82 void signalFullScreen( bool );
83 void signalAgendaView( bool );
82 public slots: 84 public slots:
83 void updateView(); 85 void updateView();
84 void showWhatsNextView(); 86 void showWhatsNextView();
85 void showListView(); 87 void showListView();
86 void showAgendaView( bool fullScreen = false ); 88 void showAgendaView( bool fullScreen = false );
87 void showDayView(); 89 void showDayView();
88 void showWorkWeekView(); 90 void showWorkWeekView();
89 void showWeekView(); 91 void showWeekView();
90 void showNextXView(); 92 void showNextXView();
91 void showMonthView(); 93 void showMonthView();
92 void showTodoView(); 94 void showTodoView();
93 void showJournalView(); 95 void showJournalView();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 877b6f2..145b36c 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -536,49 +536,48 @@ void MainWindow::initActions()
536 menuBar->insertItem( i18n("File"), importMenu ); 536 menuBar->insertItem( i18n("File"), importMenu );
537 menuBar->insertItem( i18n("View"), viewMenu ); 537 menuBar->insertItem( i18n("View"), viewMenu );
538 menuBar->insertItem( i18n("Actions"), actionMenu ); 538 menuBar->insertItem( i18n("Actions"), actionMenu );
539 menuBar->insertItem( i18n("Synchronize"), syncMenu ); 539 menuBar->insertItem( i18n("Synchronize"), syncMenu );
540 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 540 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu );
541 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); 541 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
542 menuBar->insertItem( i18n("Filter"),selectFilterMenu ); 542 menuBar->insertItem( i18n("Filter"),selectFilterMenu );
543 menuBar->insertItem( i18n("Help"), helpMenu ); 543 menuBar->insertItem( i18n("Help"), helpMenu );
544 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); 544 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
545 menuBar1->setMaximumSize( menuBar1->sizeHint( )); 545 menuBar1->setMaximumSize( menuBar1->sizeHint( ));
546 } 546 }
547 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); 547 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
548 connect ( selectFilterMenu, SIGNAL( aboutToShow () ), this, SLOT (fillFilterMenu() ) ); 548 connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
549 549
550 // ****************** 550 // ******************
551 QAction *action; 551 QAction *action;
552 QIconSet icon; 552 QIconSet icon;
553 // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); 553 // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
554 configureToolBarMenu->setCheckable( true ); 554 configureToolBarMenu->setCheckable( true );
555 555
556 QString pathString = ""; 556 QString pathString = "";
557 if ( !p->mToolBarMiniIcons ) { 557 if ( !p->mToolBarMiniIcons ) {
558 if ( QApplication::desktop()->width() < 480 ) 558 if ( QApplication::desktop()->width() < 480 )
559 pathString += "icons16/"; 559 pathString += "icons16/";
560 } else 560 } else
561 pathString += "iconsmini/"; 561 pathString += "iconsmini/";
562 configureAgendaMenu->setCheckable( true ); 562 configureAgendaMenu->setCheckable( true );
563 configureAgendaMenu->insertItem(i18n("Tiny"), 4 ); 563 int iii ;
564 configureAgendaMenu->insertItem(i18n("Small"), 6 ); 564 for ( iii = 1;iii<= 10 ;++iii ){
565 configureAgendaMenu->insertItem(i18n("Medium"), 8 ); 565 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
566 configureAgendaMenu->insertItem(i18n("Normal"), 10 ); 566 }
567 configureAgendaMenu->insertItem(i18n("Large"), 12 );
568 configureAgendaMenu->insertItem(i18n("Big"), 14 );
569 configureAgendaMenu->insertItem(i18n("Bigger"), 16 );
570 configureAgendaMenu->insertItem(i18n("Biggest"), 18 );
571 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); 567 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu );
572 568
569 connect( configureAgendaMenu, SIGNAL( aboutToShow()),
570 this, SLOT( showConfigureAgenda( ) ) );
571
573 icon = loadPixmap( pathString + "configure" ); 572 icon = loadPixmap( pathString + "configure" );
574 action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this ); 573 action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this );
575 action->addTo( actionMenu ); 574 action->addTo( actionMenu );
576 connect( action, SIGNAL( activated() ), 575 connect( action, SIGNAL( activated() ),
577 mView, SLOT( edit_options() ) ); 576 mView, SLOT( edit_options() ) );
578 actionMenu->insertSeparator(); 577 actionMenu->insertSeparator();
579 578
580 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); 579 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
581 action->addTo( actionMenu ); 580 action->addTo( actionMenu );
582 connect( action, SIGNAL( activated() ), 581 connect( action, SIGNAL( activated() ),
583 mView, SLOT( undo_delete() ) ); 582 mView, SLOT( undo_delete() ) );
584 actionMenu->insertSeparator(); 583 actionMenu->insertSeparator();
@@ -593,34 +592,45 @@ void MainWindow::initActions()
593 mView, SLOT( newEvent() ) ); 592 mView, SLOT( newEvent() ) );
594 icon = loadPixmap( pathString + "newtodo" ); 593 icon = loadPixmap( pathString + "newtodo" );
595 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); 594 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
596 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 595 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
597 nt_action->addTo( actionMenu ); 596 nt_action->addTo( actionMenu );
598 connect( nt_action, SIGNAL( activated() ), 597 connect( nt_action, SIGNAL( activated() ),
599 mView, SLOT( newTodo() ) ); 598 mView, SLOT( newTodo() ) );
600 icon = loadPixmap( pathString + "navi" ); 599 icon = loadPixmap( pathString + "navi" );
601 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); 600 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
602 action->addTo( viewMenu ); 601 action->addTo( viewMenu );
603 connect( action, SIGNAL( activated() ), 602 connect( action, SIGNAL( activated() ),
604 mView, SLOT( toggleDateNavigatorWidget() ) ); 603 mView, SLOT( toggleDateNavigatorWidget() ) );
604 mToggleNav = action ;
605 icon = loadPixmap( pathString + "filter" ); 605 icon = loadPixmap( pathString + "filter" );
606 action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); 606 action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
607 action->addTo( viewMenu ); 607 action->addTo( viewMenu );
608 connect( action, SIGNAL( activated() ), 608 connect( action, SIGNAL( activated() ),
609 mView, SLOT( toggleFilter() ) ); 609 mView, SLOT( toggleFilter() ) );
610 mToggleFilter = action;
610 icon = loadPixmap( pathString + "allday" ); 611 icon = loadPixmap( pathString + "allday" );
611 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); 612 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
612 action->addTo( viewMenu ); 613 action->addTo( viewMenu );
613 connect( action, SIGNAL( activated() ), 614 connect( action, SIGNAL( activated() ),
614 mView, SLOT( toggleAllDaySize() ) ); 615 mView, SLOT( toggleAllDaySize() ) );
616 mToggleAllday = action;
617
618
619 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
620 mToggleNav, SLOT( setEnabled ( bool ) ) );
621 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
622 mToggleFilter, SLOT( setEnabled ( bool ) ) );
623 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
624 mToggleAllday, SLOT( setEnabled ( bool ) ) );
615 625
616 viewMenu->insertSeparator(); 626 viewMenu->insertSeparator();
617 icon = loadPixmap( pathString + "picker" ); 627 icon = loadPixmap( pathString + "picker" );
618 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); 628 action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
619 action->addTo( viewMenu ); 629 action->addTo( viewMenu );
620 connect( action, SIGNAL( activated() ), 630 connect( action, SIGNAL( activated() ),
621 mView, SLOT( showDatePicker() ) ); 631 mView, SLOT( showDatePicker() ) );
622 action->addTo( iconToolBar ); 632 action->addTo( iconToolBar );
623 viewMenu->insertSeparator(); 633 viewMenu->insertSeparator();
624 icon = loadPixmap( pathString + "list" ); 634 icon = loadPixmap( pathString + "list" );
625 configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); 635 configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
626 QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); 636 QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
@@ -1711,42 +1721,37 @@ void MainWindow::setCaptionToDates()
1711 else { 1721 else {
1712 QString addString; 1722 QString addString;
1713 if ( mView->startDate() == QDateTime::currentDateTime().date() ) 1723 if ( mView->startDate() == QDateTime::currentDateTime().date() )
1714 addString = i18n("Today"); 1724 addString = i18n("Today");
1715 else if ( mView->startDate() == QDateTime::currentDateTime().date().addDays(1) ) 1725 else if ( mView->startDate() == QDateTime::currentDateTime().date().addDays(1) )
1716 addString = i18n("Tomorrow"); 1726 addString = i18n("Tomorrow");
1717 if ( !addString.isEmpty() ) 1727 if ( !addString.isEmpty() )
1718 selDates = addString+", "+selDates ; 1728 selDates = addString+", "+selDates ;
1719 } 1729 }
1720 setCaption( i18n("Dates: ") + selDates ); 1730 setCaption( i18n("Dates: ") + selDates );
1721 1731
1722} 1732}
1723// parameter item == 0: reinit 1733void MainWindow::showConfigureAgenda( )
1734{
1735 int iii;
1736 for ( iii = 1;iii<= 10 ;++iii ){
1737 configureAgendaMenu->setItemChecked( (iii+1)*2, false );
1738 }
1739 configureAgendaMenu->setItemChecked( KOPrefs::instance()->mHourSize, true );
1740}
1724void MainWindow::configureAgenda( int item ) 1741void MainWindow::configureAgenda( int item )
1725{ 1742{
1726 1743 if ( KOPrefs::instance()->mHourSize == item )
1727 KOPrefs *p = KOPrefs::instance();
1728
1729 int i;
1730 // do not allow 4 for widgets higher than 480
1731 // if ( QApplication::desktop()->height() > 480 ) {
1732// if ( item == 4 )
1733// item = 6;
1734// }
1735 for ( i = 4; i <= 18; i= i+2 )
1736 configureAgendaMenu->setItemChecked( i, false );
1737 configureAgendaMenu->setItemChecked( item, true );
1738 if ( p->mHourSize == item )
1739 return; 1744 return;
1740 p->mHourSize=item; 1745 KOPrefs::instance()->mHourSize=item;
1741 mView->viewManager()->agendaView()->updateConfig(); 1746 mView->viewManager()->agendaView()->updateConfig();
1742} 1747}
1743 1748
1744void MainWindow::saveCalendar() 1749void MainWindow::saveCalendar()
1745{ 1750{
1746 QString fn = KOPrefs::instance()->mLastSaveFile; 1751 QString fn = KOPrefs::instance()->mLastSaveFile;
1747 fn = KFileDialog::getSaveFileName( fn, i18n("Save backup filename"), this ); 1752 fn = KFileDialog::getSaveFileName( fn, i18n("Save backup filename"), this );
1748 1753
1749 if ( fn == "" ) 1754 if ( fn == "" )
1750 return; 1755 return;
1751 QFileInfo info; 1756 QFileInfo info;
1752 info.setFile( fn ); 1757 info.setFile( fn );
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 96e627e..6de0543 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -29,32 +29,32 @@ namespace KCal {
29class CalendarLocal; 29class CalendarLocal;
30} 30}
31 31
32using namespace KCal; 32using namespace KCal;
33 33
34class MainWindow : public QMainWindow 34class MainWindow : public QMainWindow
35{ 35{
36 Q_OBJECT 36 Q_OBJECT
37 public: 37 public:
38 MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); 38 MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
39 ~MainWindow(); 39 ~MainWindow();
40 bool beamReceiveEnabled(); 40 bool beamReceiveEnabled();
41 static QString defaultFileName();
42 static QString syncFileName();
43 static QString resourcePath();
41 public slots: 44 public slots:
42 virtual void showMaximized (); 45 virtual void showMaximized ();
43 void configureAgenda( int ); 46 void configureAgenda( int );
44 void recieve( const QCString& msg, const QByteArray& data ); 47 void recieve( const QCString& msg, const QByteArray& data );
45 static QString defaultFileName(); 48 protected slots:
46 static QString syncFileName();
47 static QString resourcePath();
48 protected slots:
49 void setCaptionToDates(); 49 void setCaptionToDates();
50 void about(); 50 void about();
51 void licence(); 51 void licence();
52 void faq(); 52 void faq();
53 void usertrans(); 53 void usertrans();
54 void features(); 54 void features();
55 void synchowto(); 55 void synchowto();
56 void kdesynchowto(); 56 void kdesynchowto();
57 void multisynchowto(); 57 void multisynchowto();
58 void whatsNew(); 58 void whatsNew();
59 void keyBindings(); 59 void keyBindings();
60 void aboutAutoSaving();; 60 void aboutAutoSaving();;
@@ -75,36 +75,33 @@ class MainWindow : public QMainWindow
75 void configureToolBar( int ); 75 void configureToolBar( int );
76 void printSel(); 76 void printSel();
77 void printCal(); 77 void printCal();
78 void saveCalendar(); 78 void saveCalendar();
79 void loadCalendar(); 79 void loadCalendar();
80 void exportVCalendar(); 80 void exportVCalendar();
81 void fillFilterMenu(); 81 void fillFilterMenu();
82 void selectFilter( int ); 82 void selectFilter( int );
83 void exportToPhone( int ); 83 void exportToPhone( int );
84 void toggleBeamReceive(); 84 void toggleBeamReceive();
85 void disableBR(bool); 85 void disableBR(bool);
86 86
87 private slots:
88 void showConfigureAgenda();
89 void getFile( bool );
90 void syncFileRequest();
87 91
88 protected: 92 protected:
89 void displayText( QString, QString); 93 void displayText( QString, QString);
90
91 void enableIncidenceActions( bool ); 94 void enableIncidenceActions( bool );
92 95
93 private slots:
94 QSocket* piSocket;
95 QString piFileString;
96 QTime piTime;
97 void getFile( bool );
98 void syncFileRequest();
99 private: 96 private:
100 bool mBRdisabled; 97 bool mBRdisabled;
101#ifndef DESKTOP_VERSION 98#ifndef DESKTOP_VERSION
102 QCopChannel* infrared; 99 QCopChannel* infrared;
103#endif 100#endif
104 QAction* brAction; 101 QAction* brAction;
105 KSyncManager* mSyncManager; 102 KSyncManager* mSyncManager;
106 bool mClosed; 103 bool mClosed;
107 void saveOnClose(); 104 void saveOnClose();
108 bool mFlagKeyPressed; 105 bool mFlagKeyPressed;
109 bool mBlockAtStartup; 106 bool mBlockAtStartup;
110 QPEToolBar *iconToolBar; 107 QPEToolBar *iconToolBar;
@@ -118,22 +115,27 @@ class MainWindow : public QMainWindow
118 CalendarLocal *mCalendar; 115 CalendarLocal *mCalendar;
119 CalendarView *mView; 116 CalendarView *mView;
120 QAction *mNewSubTodoAction; 117 QAction *mNewSubTodoAction;
121 118
122 QAction *mShowAction; 119 QAction *mShowAction;
123 QAction *mEditAction; 120 QAction *mEditAction;
124 QAction *mDeleteAction; 121 QAction *mDeleteAction;
125 QAction *mCloneAction; 122 QAction *mCloneAction;
126 QAction *mMoveAction; 123 QAction *mMoveAction;
127 QAction *mBeamAction; 124 QAction *mBeamAction;
128 QAction *mCancelAction; 125 QAction *mCancelAction;
129 126
127 QAction *mToggleNav;
128 QAction *mToggleFilter;
129 QAction *mToggleAllday;
130
131
130 void closeEvent( QCloseEvent* ce ); 132 void closeEvent( QCloseEvent* ce );
131 SimpleAlarmClient mAlarmClient; 133 SimpleAlarmClient mAlarmClient;
132 QTimer mSaveTimer; 134 QTimer mSaveTimer;
133 //bool mBlockSaveFlag; 135 //bool mBlockSaveFlag;
134 bool mCalendarModifiedFlag; 136 bool mCalendarModifiedFlag;
135 QPixmap loadPixmap( QString ); 137 QPixmap loadPixmap( QString );
136}; 138};
137 139
138 140
139#endif 141#endif