fixes

5 files changed, 52 insertions, 41 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 05216a7..f54f7bc 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -217,6 +217,6 @@ void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e )
     if ( tSize  < 4 )
         tSize = 4;
-    if ( tSize > 18 )
-        tSize = 18;
+    if ( tSize > 22 )
+        tSize = 22;
     tSize = (tSize-2)/2;
     topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize));
@@ -232,6 +232,6 @@ void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e )
     if ( tSize  < 4 )
         tSize = 4;
-    if ( tSize > 18 )
-        tSize = 18;
+    if ( tSize > 22 )
+        tSize = 22;
     tSize = (tSize/2)*2;
     if ( tSize == KOPrefs::instance()->mHourSize )
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index e255b83..94c459b 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -183,5 +183,5 @@ void KOViewManager::raiseCurrentView( bool fullScreen )
             wid -= mMainView->leftFrame()->width();
     }
-   
+    emit signalFullScreen( !fullScreen );
     if ( globalFlagBlockAgenda ==  5 ) {
         globalFlagBlockAgenda =  4;
@@ -201,8 +201,10 @@ void KOViewManager::raiseCurrentView( bool fullScreen )
             mAgendaView->repaintAgenda();
 
-        }
+        } 
         globalFlagBlockAgenda = 0;
     }
+    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
@@ -80,4 +80,6 @@ class KOViewManager : public QObject
  signals:
     void printWNV();
+    void signalFullScreen( bool );
+    void signalAgendaView( bool );
   public slots:
     void updateView();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 877b6f2..145b36c 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -546,5 +546,5 @@ void MainWindow::initActions()
     }
     connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
-    connect ( selectFilterMenu, SIGNAL( aboutToShow ()  ), this, SLOT (fillFilterMenu() ) );
+    connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
 
     // ******************
@@ -561,14 +561,13 @@ void MainWindow::initActions()
         pathString += "iconsmini/";
     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" );
     action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this );
@@ -603,4 +602,5 @@ void MainWindow::initActions()
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleDateNavigatorWidget() ) );
+    mToggleNav = action ;
     icon = loadPixmap( pathString + "filter" );
     action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
@@ -608,4 +608,5 @@ void MainWindow::initActions()
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleFilter() ) );
+    mToggleFilter = action;
     icon = loadPixmap( pathString + "allday" );
     action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
@@ -613,4 +614,13 @@ void MainWindow::initActions()
     connect( action, SIGNAL( activated() ),
              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 ) ) );
 
     viewMenu->insertSeparator();
@@ -1721,22 +1731,17 @@ 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
@@ -39,12 +39,12 @@ class MainWindow : public QMainWindow
     ~MainWindow();
     bool beamReceiveEnabled();
+    static  QString defaultFileName();
+    static  QString syncFileName();
+    static QString resourcePath();
  public  slots:  
     virtual void showMaximized (); 
      void configureAgenda( int );
     void recieve( const QCString& msg, const QByteArray& data );
-    static  QString defaultFileName();
-    static  QString syncFileName();
-    static QString resourcePath();
-    protected slots:  
+ protected slots:  
     void setCaptionToDates();
     void about(); 
@@ -85,16 +85,13 @@ class MainWindow : public QMainWindow
     void disableBR(bool);
 
+  private slots:
+    void showConfigureAgenda();
+    void getFile( bool );
+    void syncFileRequest();
     
   protected:
     void displayText( QString, QString);
-    
     void enableIncidenceActions( bool );
     
-  private slots:
-    QSocket* piSocket;
-    QString  piFileString;
-    QTime piTime;
-    void getFile( bool );
-    void syncFileRequest();
   private:
     bool mBRdisabled;
@@ -128,4 +125,9 @@ class MainWindow : public QMainWindow
     QAction *mCancelAction;
 
+    QAction *mToggleNav;
+    QAction *mToggleFilter;
+    QAction *mToggleAllday;
+
+
     void closeEvent( QCloseEvent* ce );
     SimpleAlarmClient mAlarmClient;