summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-01-27 07:29:29 (UTC)
committer zautrix <zautrix>2005-01-27 07:29:29 (UTC)
commitdb6adbdecaa74972df9e2b78b09f81b2d74752b2 (patch) (unidiff)
tree69af62cb8748e1071539a6bca034f1acec0a6954
parentf20b5e71f9ae61b18f0ced792508b40432ad50b6 (diff)
downloadkdepimpi-db6adbdecaa74972df9e2b78b09f81b2d74752b2.zip
kdepimpi-db6adbdecaa74972df9e2b78b09f81b2d74752b2.tar.gz
kdepimpi-db6adbdecaa74972df9e2b78b09f81b2d74752b2.tar.bz2
fixes
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
@@ -199,6 +199,9 @@ Now the next days from today are selected, but after selecting
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
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
@@ -75,9 +75,6 @@
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>" },
@@ -406,7 +403,6 @@
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: " },
@@ -1195,7 +1191,7 @@
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
@@ -216,8 +216,8 @@ void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e )
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
@@ -231,8 +231,8 @@ void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e )
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;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index e255b83..94c459b 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -182,7 +182,7 @@ void KOViewManager::raiseCurrentView( bool fullScreen )
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;
@@ -200,10 +200,12 @@ void KOViewManager::raiseCurrentView( bool fullScreen )
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()
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index 3c251fb..c8c7a7a 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -79,6 +79,8 @@ class KOViewManager : public QObject
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();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 877b6f2..145b36c 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -545,7 +545,7 @@ void MainWindow::initActions()
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;
@@ -560,16 +560,15 @@ void MainWindow::initActions()
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 );
@@ -602,16 +601,27 @@ void MainWindow::initActions()
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" );
@@ -1720,24 +1730,19 @@ void MainWindow::setCaptionToDates()
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
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 96e627e..6de0543 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -38,14 +38,14 @@ class MainWindow : public QMainWindow
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();
@@ -84,18 +84,15 @@ class MainWindow : public QMainWindow
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
@@ -127,6 +124,11 @@ class MainWindow : public QMainWindow
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;