From db6adbdecaa74972df9e2b78b09f81b2d74752b2 Mon Sep 17 00:00:00 2001 From: zautrix Date: Thu, 27 Jan 2005 07:29:29 +0000 Subject: fixes --- 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 will select the next 4 days. The "next days mode" is turned off by clicking on the week view, work week view or day view button. +The agenda view has "time labels" on the left, which displays the hours from 0-24. +If you press the mouse on the timelabels and move it up/down you can +increase/decrease the agenda size quickly. 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 @@ { "Begin on:","Starte mit:" }, { "Begins on: %1","Starte mit: %1" }, { "From: %1 To: %2","Vom: %1 Zum: %2" }, -{ "Bigger","Größer" }, -{ "Biggest","Riesig" }, -{ "Big","Groß" }, { "On: %1","Am: %1" }, { "On: %1 From:S %2 To: %3","Am: %1 Vom:S %2 Zum: %3" }, { "Original event:

","Original Termin:

" }, @@ -406,7 +403,6 @@ { "Date Labels:","Datumsleiste:" }, { "Time: ","Zeit: " }, { "Timezone:","Zeitzone:" }, -{ "Tiny","Sehr klein" }, { "To: ","Bis: " }, { "To:","Bis:" }, { "Today: ","Heute: " }, @@ -1195,7 +1191,7 @@ { "Day after tomorrow","Übermorgen" }, { "Tomorrow","Morgen" }, { "Day before yesterday","Vorgestern" }, -{ "","" }, +{ "Size %1","Größe %1" }, { "","" }, { "","" }, { "","" }, 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 ) int tSize = KOPrefs::instance()->mHourSize + (diff/10) ; 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)); @@ -231,8 +231,8 @@ void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e ) int tSize = KOPrefs::instance()->mHourSize + (diff/10); if ( tSize < 4 ) tSize = 4; - if ( tSize > 18 ) - tSize = 18; + if ( tSize > 22 ) + tSize = 22; tSize = (tSize/2)*2; if ( tSize == KOPrefs::instance()->mHourSize ) 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 ) else wid -= mMainView->leftFrame()->width(); } - + emit signalFullScreen( !fullScreen ); if ( globalFlagBlockAgenda == 5 ) { globalFlagBlockAgenda = 4; globalFlagBlockAgendaItemPaint = 1; @@ -200,10 +200,12 @@ void KOViewManager::raiseCurrentView( bool fullScreen ) globalFlagBlockAgenda = 0; mAgendaView->repaintAgenda(); - } + } globalFlagBlockAgenda = 0; } + emit signalAgendaView( mCurrentView == mAgendaView ); //qDebug("raiseCurrentView ende "); + } void 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 signals: void printWNV(); + void signalFullScreen( bool ); + void signalAgendaView( bool ); public slots: void updateView(); 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() menuBar1->setMaximumSize( menuBar1->sizeHint( )); } connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); - connect ( selectFilterMenu, SIGNAL( aboutToShow () ), this, SLOT (fillFilterMenu() ) ); + connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); // ****************** QAction *action; @@ -560,16 +560,15 @@ void MainWindow::initActions() } else 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 ); action->addTo( actionMenu ); @@ -602,16 +601,27 @@ void MainWindow::initActions() action->addTo( viewMenu ); 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 ); action->addTo( viewMenu ); 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 ); action->addTo( viewMenu ); 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(); icon = loadPixmap( pathString + "picker" ); @@ -1720,24 +1730,19 @@ void MainWindow::setCaptionToDates() setCaption( i18n("Dates: ") + selDates ); } -// 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 @@ -38,14 +38,14 @@ class MainWindow : public QMainWindow MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); ~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(); void licence(); @@ -84,18 +84,15 @@ class MainWindow : public QMainWindow void toggleBeamReceive(); 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; #ifndef DESKTOP_VERSION @@ -127,6 +124,11 @@ class MainWindow : public QMainWindow QAction *mBeamAction; QAction *mCancelAction; + QAction *mToggleNav; + QAction *mToggleFilter; + QAction *mToggleAllday; + + void closeEvent( QCloseEvent* ce ); SimpleAlarmClient mAlarmClient; QTimer mSaveTimer; -- cgit v0.9.0.2