4 files changed, 51 insertions, 4 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 06454c2..1d5a57e 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2504,42 +2504,42 @@ void CalendarView::showDatePicker( )
 }
 
 void CalendarView::showEventEditor()
 {
 #ifdef DESKTOP_VERSION
     mEventEditor->show();
 #else
     if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) {
         topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
         qDebug("KO: CalendarView: recreate mEventEditor %d %d",  mEventEditor->width(), QApplication::desktop()->width() );
         delete mEventEditor;
         mEventEditor = mDialogManager->getEventEditor(); 
+        topLevelWidget()->setCaption( i18n("") );
     }
     mEventEditor->showMaximized();
-    topLevelWidget()->setCaption( i18n("") );
 #endif
 }
 void CalendarView::showTodoEditor()
 {
 #ifdef DESKTOP_VERSION
     mTodoEditor->show();
 #else
     if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) {
         topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
         qDebug("KO: CalendarView: recreate mTodoEditor %d %d ",  mTodoEditor->width() ,QApplication::desktop()->width()     );
         delete mTodoEditor;  
         mTodoEditor = mDialogManager->getTodoEditor(); 
+        topLevelWidget()->setCaption( i18n("") );
     }
     mTodoEditor->showMaximized();
-    topLevelWidget()->setCaption( i18n("") );
 #endif
 }
 
 void CalendarView::cloneIncidence()
 {
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         cloneIncidence(incidence);
     }
 }
 void CalendarView::moveIncidence()
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 6428757..b5596d9 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -192,25 +192,60 @@ void TimeLabels::updateConfig()
 /** update time label positions */
 void TimeLabels::positionChanged()
 {
     int adjustment = mAgenda->contentsY();
     setContentsPos(0, adjustment);
 }
 
 /**  */
 void TimeLabels::setAgenda(KOAgenda* agenda)
 {
     mAgenda = agenda;
 }
+ 
+void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) 
+{
+    mMouseDownY = e->pos().y();
+}
+  
+void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) 
+{
+  int diff = mMouseDownY -  e->pos().y();
+    if ( diff < 10 && diff > -10 )
+        return;
+    int tSize = KOPrefs::instance()->mHourSize + (diff/10) ;
+    if ( tSize  < 4 )
+        tSize = 4;
+    if ( tSize > 18 )
+        tSize = 18;
+    tSize = (tSize-2)/2;
+    topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize));
 
+}
+void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e ) 
+{
+    int diff = mMouseDownY -  e->pos().y();
+    if ( diff < 10 && diff > -10 )
+        return;
+    int tSize = KOPrefs::instance()->mHourSize + (diff/10);
+    if ( tSize  < 4 )
+        tSize = 4;
+    if ( tSize > 18 )
+        tSize = 18;
+    tSize = (tSize/2)*2;
+    if ( tSize == KOPrefs::instance()->mHourSize )
+        return;
+    KOPrefs::instance()->mHourSize = tSize;
+    emit scaleChanged();
+}
 
 /** This is called in response to repaint() */
 void TimeLabels::paintEvent(QPaintEvent*)
 {
   
     //  kdDebug() << "paintevent..." << endl;
     // this is another hack!
     //  QPainter painter(this);
     //QString c
     repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight());
 }
 
@@ -401,24 +436,26 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame);
     agendaLayout->addWidget(mEventIndicatorTop,0,1);
     mEventIndicatorTop->setPaintWidget( mSplitterAgenda );
     mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom,
                                                agendaFrame);
     agendaLayout->addWidget(mEventIndicatorBottom,2,1);
     QWidget *dummyAgendaRight = new QWidget(agendaFrame);
     agendaLayout->addWidget(dummyAgendaRight,0,2);
 
     // Create time labels
     mTimeLabels = new TimeLabels(24,agendaFrame);
     agendaLayout->addWidget(mTimeLabels,1,0);
+    connect(mTimeLabels,SIGNAL( scaleChanged()),
+            this,SLOT(updateConfig()));
 
     // Create agenda
     mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame);
     agendaLayout->addMultiCellWidget(mAgenda,1,1,1,2);
     agendaLayout->setColStretch(1,1);
     mAgenda->setFocusPolicy(NoFocus);
     // Create event context menu for agenda
     mAgendaPopup = eventPopup();
   
     mAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
                                     i18n("Toggle Alarm"),mAgenda,
                                     SLOT(popupAlarm()),true);
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 0079253..221b0ea 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -54,33 +54,38 @@ class TimeLabels : public QScrollView {
 
     /** Calculates the minimum width */
     virtual int minimumWidth() const;
 
     /** updates widget's internal state */
     void updateConfig();
 
     /**  */
     void setAgenda(KOAgenda* agenda);
 
     /**  */
     virtual void paintEvent(QPaintEvent* e);
+    void contentsMousePressEvent ( QMouseEvent * ) ;
+    void contentsMouseReleaseEvent ( QMouseEvent * ); 
+    void contentsMouseMoveEvent ( QMouseEvent * ); 
 
   public slots:
     /** update time label positions */
     void positionChanged();
-
+ signals:
+    void scaleChanged();
   protected:
     void drawContents(QPainter *p,int cx, int cy, int cw, int ch);
 
   private:
+    int mMouseDownY;
     int mRows;
     int mCellHeight;
 
     /**  */
     KOAgenda* mAgenda;
 };
 
 class EventIndicator : public QFrame {
     Q_OBJECT
   public:
     enum Location { Top, Bottom };
     EventIndicator(Location loc=Top,QWidget *parent=0,const char *name=0);
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index c99c0cb..41a4dc1 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -284,24 +284,27 @@ KOEventEditor *KODialogManager::getEventEditor()
   connect( eventEditor, SIGNAL( showAgendaView( bool)), 
            mMainView->viewManager(), SLOT(  showAgendaView( bool) ) );
 
   //  connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
   //      eventEditor,SLOT(updateCategoryConfig()));
   // connect(eventEditor,SIGNAL(editCategories()),
   //      mCategoryEditDialog,SLOT(show()));
   connect(eventEditor,SIGNAL(dialogClose(Incidence*)),
           mMainView,SLOT(dialogClosing(Incidence*)));
 
   //connect(mMainView,SIGNAL(closingDown()),eventEditor,SLOT(reject()));
 
+#ifndef DESKTOP_VERSION
+  eventEditor->resize( QApplication::desktop()->width() -20, 100 );
+#endif
   return eventEditor;
 }
 
 KOTodoEditor *KODialogManager::getTodoEditor()
 {
   KOTodoEditor *todoEditor = new KOTodoEditor( mMainView->calendar(),
                                                mMainView );
 
   // connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()),
   //      todoEditor,SLOT(updateCategoryConfig()));
   //  connect(todoEditor,SIGNAL(editCategories()),mCategoryEditDialog,SLOT(show()));
 
@@ -311,25 +314,27 @@ KOTodoEditor *KODialogManager::getTodoEditor()
           mMainView,SLOT(todoChanged(Todo *)));
   connect(todoEditor,SIGNAL(todoDeleted()),
           mMainView,SLOT(todoDeleted()));
   connect(todoEditor,SIGNAL(dialogClose(Incidence*)),
           mMainView,SLOT(dialogClosing(Incidence*)));
   connect( todoEditor, SIGNAL(jumpToTime( const QDate &)), 
            mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) );
   connect( todoEditor, SIGNAL( showAgendaView( bool)), 
            mMainView->viewManager(), SLOT(  showAgendaView( bool) ) );
   // connect(todoEditor,SIGNAL(deleteAttendee(Incidence *)),
   //      mMainView,SLOT(schedule_cancel(Incidence *)));
   //connect(mMainView,SIGNAL(closingDown()),todoEditor,SLOT(reject()));
-
+#ifndef DESKTOP_VERSION
+  todoEditor->resize( QApplication::desktop()->width() -20, 100 );
+#endif
   return todoEditor;
 }
 
 void KODialogManager::updateSearchDialog()
 {
   if (mSearchDialog) mSearchDialog->updateView();
 }
 
 void KODialogManager::setDocumentId( const QString &id )
 {
   if (mOutgoingDialog) mOutgoingDialog->setDocumentId( id );
 }