author | zautrix <zautrix> | 2005-09-18 23:40:38 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-09-18 23:40:38 (UTC) |
commit | 2d346e4052fd726e657daee4ac3f2bcc7103f5fb (patch) (side-by-side diff) | |
tree | 9952b888e0790bc032ba4e0c3c4165ec283a4139 | |
parent | 06ebec95579816144ee65981835e6e3482e20a28 (diff) | |
download | kdepimpi-2d346e4052fd726e657daee4ac3f2bcc7103f5fb.zip kdepimpi-2d346e4052fd726e657daee4ac3f2bcc7103f5fb.tar.gz kdepimpi-2d346e4052fd726e657daee4ac3f2bcc7103f5fb.tar.bz2 |
wn
-rw-r--r-- | kalarmd/alarmdialog.cpp | 12 | ||||
-rw-r--r-- | kalarmd/simplealarmdaemonimpl.cpp | 11 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 13 |
3 files changed, 22 insertions, 14 deletions
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp index ddb125a..18ce9da 100644 --- a/kalarmd/alarmdialog.cpp +++ b/kalarmd/alarmdialog.cpp @@ -253,4 +253,10 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo int dh = QApplication::desktop()->height(); + if ( w < 220 ) w = 220; + if ( h < 220 ) h = 220; setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); - hide(); + showNormal(); + setActiveWindow(); + raise(); + setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); + //hide(); @@ -271,6 +277,4 @@ void AlarmDialog::forceRepaint() { - - showNormal(); setActiveWindow(); - raise(); + repaint(); mSuspendSpin->setFocus(); diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp index a0ac232..8ea8a73 100644 --- a/kalarmd/simplealarmdaemonimpl.cpp +++ b/kalarmd/simplealarmdaemonimpl.cpp @@ -69,2 +69,7 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent ) mTimerPopUp = new QPopupMenu( this ); + QFont fon = mTimerPopUp->font(); + int points = (fon.pointSize()*4)/3; + fon.setPointSize( points ); + mTimerPopUp->setFont( fon ); + mPopUp->setFont( fon ); mBeepPopUp = new QPopupMenu( this ); @@ -315,3 +320,3 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& ) } - QTimer::singleShot( 10000, this, SLOT ( writeFile() ) ); + QTimer::singleShot( 5000, this, SLOT ( writeFile() ) ); return; @@ -341,3 +346,3 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& ) - QTimer::singleShot( 10000, this, SLOT ( writeFile() ) ); + QTimer::singleShot( 5000, this, SLOT ( writeFile() ) ); startAlarm( mAlarmMessage, filename ); @@ -644,3 +649,3 @@ void SimpleAlarmDaemonImpl::simulate() { - QTimer::singleShot( 10000, this, SLOT ( writeFile() ) ); + QTimer::singleShot( 5000, this, SLOT ( writeFile() ) ); QString filename = getenv("QPEDIR") ; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 98d3e35..fb0b4ad 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -310,4 +310,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : #ifndef DESKTOP_VERSION - iconToolBar->show(); - qApp->processEvents(); + //iconToolBar->show(); + //qApp->processEvents(); #endif @@ -387,3 +387,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); - qApp->processEvents(); + //qApp->processEvents(); mView->dialogManager()->showSyncOptions(); @@ -444,2 +444,3 @@ void MainWindow::loadDataAfterStart() disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& ))); + ((QPEApplication*) qApp)->showMainWidget( this ); if ( !mCStringMess.isEmpty() ) @@ -447,4 +448,2 @@ void MainWindow::loadDataAfterStart() #endif - - QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); @@ -2046,4 +2045,4 @@ void MainWindow::save() qDebug("KO: Save delay %d sec. Elapsed save time %d sec.", mSaveDelay, elapsed ); - qDebug("KO: Restarting save timer to save in 15 sec."); - int msec = 15000; + qDebug("KO: Restarting save timer to save in 10 sec."); + int msec = 10000; mSaveTimer.start( msec, true ); |