fixes

5 files changed, 49 insertions, 38 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 05216a7..f54f7bc 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -218,4 +218,4 @@ void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e )
         tSize = 4;
-    if ( tSize > 18 )
-        tSize = 18;
+    if ( tSize > 22 )
+        tSize = 22;
     tSize = (tSize-2)/2;
@@ -233,4 +233,4 @@ void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e )
         tSize = 4;
-    if ( tSize > 18 )
-        tSize = 18;
+    if ( tSize > 22 )
+        tSize = 22;
     tSize = (tSize/2)*2;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index e255b83..94c459b 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -184,3 +184,3 @@ void KOViewManager::raiseCurrentView( bool fullScreen )
     }
-   
+    emit signalFullScreen( !fullScreen );
     if ( globalFlagBlockAgenda ==  5 ) {
@@ -205,3 +205,5 @@ void KOViewManager::raiseCurrentView( bool fullScreen )
     }
+    emit signalAgendaView( mCurrentView == mAgendaView );
     //qDebug("raiseCurrentView ende ");
+
 }
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index 3c251fb..c8c7a7a 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -81,2 +81,4 @@ class KOViewManager : public QObject
     void printWNV();
+    void signalFullScreen( bool );
+    void signalAgendaView( bool );
   public slots:
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 877b6f2..145b36c 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -562,12 +562,11 @@ void MainWindow::initActions()
     configureAgendaMenu->setCheckable( true );
-    configureAgendaMenu->insertItem(i18n("Tiny"), 4 );
-    configureAgendaMenu->insertItem(i18n("Small"), 6 );
-    configureAgendaMenu->insertItem(i18n("Medium"), 8 );
-    configureAgendaMenu->insertItem(i18n("Normal"), 10 );
-    configureAgendaMenu->insertItem(i18n("Large"), 12 );
-    configureAgendaMenu->insertItem(i18n("Big"), 14 );
-    configureAgendaMenu->insertItem(i18n("Bigger"), 16 );
-    configureAgendaMenu->insertItem(i18n("Biggest"), 18 );
+    int iii ;
+    for ( iii = 1;iii<= 10 ;++iii ){
+        configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
+    }
     //configureMenu->insertItem( "AgendaSize",configureAgendaMenu  );
 
+    connect( configureAgendaMenu, SIGNAL( aboutToShow()),
+             this, SLOT( showConfigureAgenda( ) ) );
+
     icon = loadPixmap( pathString + "configure" );
@@ -604,2 +603,3 @@ void MainWindow::initActions()
              mView, SLOT( toggleDateNavigatorWidget() ) );
+    mToggleNav = action ;
     icon = loadPixmap( pathString + "filter" );
@@ -609,2 +609,3 @@ void MainWindow::initActions()
              mView, SLOT( toggleFilter() ) );
+    mToggleFilter = action;
     icon = loadPixmap( pathString + "allday" );
@@ -614,2 +615,11 @@ void MainWindow::initActions()
              mView, SLOT( toggleAllDaySize() ) );
+    mToggleAllday = action;
+
+
+    connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
+             mToggleNav, SLOT( setEnabled ( bool ) ) );
+    connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
+             mToggleFilter, SLOT( setEnabled ( bool ) ) );
+    connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
+             mToggleAllday, SLOT( setEnabled ( bool ) ) );
 
@@ -1722,20 +1732,15 @@ void MainWindow::setCaptionToDates()
 }
-// parameter item == 0: reinit
+void MainWindow::showConfigureAgenda( )
+{
+    int iii;
+    for ( iii = 1;iii<= 10 ;++iii ){
+        configureAgendaMenu->setItemChecked( (iii+1)*2, false );
+    }
+    configureAgendaMenu->setItemChecked( KOPrefs::instance()->mHourSize, true );
+}
 void MainWindow::configureAgenda( int item )
 {
-
-    KOPrefs *p = KOPrefs::instance();
-
-    int i;
-    // do not allow 4 for widgets higher than 480
- //    if ( QApplication::desktop()->height() > 480 ) {
-//         if ( item == 4 )
-//             item = 6;
-//     }
-    for ( i = 4; i <= 18; i= i+2 )
-        configureAgendaMenu->setItemChecked( i, false );
-    configureAgendaMenu->setItemChecked( item, true );
-    if ( p->mHourSize == item )
+    if ( KOPrefs::instance()->mHourSize == item )
         return;
-    p->mHourSize=item;
+    KOPrefs::instance()->mHourSize=item;
     mView->viewManager()->agendaView()->updateConfig();
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 96e627e..6de0543 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -40,2 +40,5 @@ class MainWindow : public QMainWindow
     bool beamReceiveEnabled();
+    static  QString defaultFileName();
+    static  QString syncFileName();
+    static QString resourcePath();
  public  slots:  
@@ -44,5 +47,2 @@ class MainWindow : public QMainWindow
     void recieve( const QCString& msg, const QByteArray& data );
-    static  QString defaultFileName();
-    static  QString syncFileName();
-    static QString resourcePath();
     protected slots:  
@@ -86,2 +86,6 @@ class MainWindow : public QMainWindow
 
+  private slots:
+    void showConfigureAgenda();
+    void getFile( bool );
+    void syncFileRequest();
     
@@ -89,11 +93,4 @@ class MainWindow : public QMainWindow
     void displayText( QString, QString);
-    
     void enableIncidenceActions( bool );
     
-  private slots:
-    QSocket* piSocket;
-    QString  piFileString;
-    QTime piTime;
-    void getFile( bool );
-    void syncFileRequest();
   private:
@@ -129,2 +126,7 @@ class MainWindow : public QMainWindow
 
+    QAction *mToggleNav;
+    QAction *mToggleFilter;
+    QAction *mToggleAllday;
+
+
     void closeEvent( QCloseEvent* ce );