summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kalarmd/alarmdialog.cpp12
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp11
-rw-r--r--korganizer/mainwindow.cpp13
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
@@ -252,6 +252,12 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo
int dw = QApplication::desktop()->width();
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();
#ifndef _WIN32_
@@ -270,8 +276,6 @@ bool AlarmDialog::eventNotification( QString mess, int replay , QString fn, boo
void AlarmDialog::forceRepaint()
{
-
- showNormal();
setActiveWindow();
- raise();
+ repaint();
mSuspendSpin->setFocus();
playSoundTimer->start( 1000, true );
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index a0ac232..8ea8a73 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -68,4 +68,9 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) );
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 );
mSoundPopUp = new QPopupMenu( this );
@@ -314,5 +319,5 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& )
return;
}
- QTimer::singleShot( 10000, this, SLOT ( writeFile() ) );
+ QTimer::singleShot( 5000, this, SLOT ( writeFile() ) );
return;
}
@@ -340,5 +345,5 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& )
}
- QTimer::singleShot( 10000, this, SLOT ( writeFile() ) );
+ QTimer::singleShot( 5000, this, SLOT ( writeFile() ) );
startAlarm( mAlarmMessage, filename );
@@ -643,5 +648,5 @@ void SimpleAlarmDaemonImpl::newCountdown()
void SimpleAlarmDaemonImpl::simulate()
{
- QTimer::singleShot( 10000, this, SLOT ( writeFile() ) );
+ QTimer::singleShot( 5000, this, SLOT ( writeFile() ) );
QString filename = getenv("QPEDIR") ;
filename += "/pics/kdepim/korganizer/koalarm.wav";
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 98d3e35..fb0b4ad 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -309,6 +309,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
mView->setSyncManager(mSyncManager);
#ifndef DESKTOP_VERSION
- iconToolBar->show();
- qApp->processEvents();
+ //iconToolBar->show();
+ //qApp->processEvents();
#endif
//qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ());
@@ -386,5 +386,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
KMessageBox::information( this,
"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();
}
@@ -443,9 +443,8 @@ void MainWindow::loadDataAfterStart()
connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& )));
disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& )));
+ ((QPEApplication*) qApp)->showMainWidget( this );
if ( !mCStringMess.isEmpty() )
recieve( mCStringMess, mByteData );
#endif
-
-
QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
}
@@ -2045,6 +2044,6 @@ void MainWindow::save()
qDebug("KO: Pending save after wakeup from suspend detected.");
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 );
mSaveTimerStart = QDateTime::currentDateTime();