1 files changed, 39 insertions, 13 deletions

diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 82873e1..2742610 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -66,16 +66,19 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) );
     mPopUp->insertSeparator();
     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 );   
-    mPausePopUp = new QPopupMenu( this );    
+    mPausePopUp = new QPopupMenu( this ); 
+    mFontsizePopup = new QPopupMenu( this ); 
+    mFontsizePopup->insertItem( "10", 10 ); 
+    mFontsizePopup->insertItem( "12", 12 ); 
+    mFontsizePopup->insertItem( "14", 14 ); 
+    mFontsizePopup->insertItem( "16", 16 ); 
+    mFontsizePopup->insertItem( "18", 18 ); 
+    mFontsizePopup->insertItem( "24", 24 ); 
     QPopupMenu* savePopUp = new QPopupMenu( this ); 
     savePopUp->insertItem( "Save", 0 );   
     savePopUp->insertItem( "Load", 1 );   
     mSoundPopUp->insertItem( "Buzzer", 0 );   
@@ -100,8 +103,9 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     mSuspendPopUp->insertItem( "30x", 30 );    
     mBeepPopUp->insertItem( "Auto  suspend",mSuspendPopUp  );
     mBeepPopUp->insertItem( "Beep interval",mPausePopUp  );
     mBeepPopUp->insertItem( "Replay",mSoundPopUp  );      
+    mBeepPopUp->insertItem( "Font Size",mFontsizePopup );      
     mBeepPopUp->insertItem( "Config",savePopUp  );        
     mBeepPopUp->insertItem( "300", 300 );      
     mBeepPopUp->insertItem( "180", 180 );         
     mBeepPopUp->insertItem( "60", 60 );       
@@ -128,9 +132,10 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     connect ( mTimerPopUp, SIGNAL(aboutToShow()  ), this, SLOT ( showTimer( ) ) ); 
     connect ( mSoundPopUp, SIGNAL( activated ( int )  ), this, SLOT (confSound( int ) ) );
     connect ( mPausePopUp, SIGNAL( activated ( int )  ), this, SLOT (confPause( int ) ) );
     connect ( mSuspendPopUp, SIGNAL( activated ( int )  ), this, SLOT (confSuspend( int ) ) );  
-    connect ( savePopUp, SIGNAL( activated ( int )  ), this, SLOT (saveSlot( int ) ) );
+    connect ( savePopUp, SIGNAL( activated ( int )  ), this, SLOT (saveSlot( int ) ) ); 
+    connect ( mFontsizePopup, SIGNAL( activated ( int )  ), this, SLOT (confFontSize( int ) ) );
     mTimerTime = 0;
     mCustomText = "Custom Text";
     mCustomMinutes = 7;
     mTimerPopupConf = 1;
@@ -146,17 +151,15 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     else {
         wavAlarm = true;
         mSoundPopUp->setItemChecked ( 1, true );
     }
-    saveSlot( 1 );
     mTimerStartLabel = new QLabel( 0, 0, WType_Popup );
     //mTimerStartLabel->setCaption( "Timer started!");  
     mTimerStartLabel->setAlignment ( Qt::AlignCenter ) ;
-    fon = mTimerPopUp->font();
-    fon.setBold( true );
-    points = (fon.pointSize()*2); 
-    fon.setPointSize( points );
-    mTimerStartLabel->setFont( fon );
+    saveSlot( 1 );
+
+
+    
 }
 
 SimpleAlarmDaemonImpl::~SimpleAlarmDaemonImpl()
 {
@@ -170,8 +173,10 @@ void SimpleAlarmDaemonImpl::saveSlot( int load )
     QString fileName = QDir::homeDirPath() +"/.kopialarmrc";
     //qDebug("save %d ", load );
     QFile file( fileName );
     if ( load ) {
+        mPopupFontSize  = mTimerPopUp->font().pointSize();
+        confFontSize( mPopupFontSize );
         if( !QFile::exists(  fileName) )
             return;
          if (!file.open( IO_ReadOnly ) ) {
             return ;
@@ -188,8 +193,14 @@ void SimpleAlarmDaemonImpl::saveSlot( int load )
                  if ( ok ) {
                      confPause( val );
                  }
              }
+             if ( line.left(4 ) == "POFO" ) {
+                 val = line.mid( 4,len-5).toInt( &ok );
+                 if ( ok ) {
+                     confFontSize( val );
+                 }
+             }
              if ( line.left(4 ) == "SUCO" )  {
                  val = line.mid( 4,len-5).toInt( &ok );
                  if ( ok )
                      confSuspend ( val );
@@ -231,8 +242,9 @@ void SimpleAlarmDaemonImpl::saveSlot( int load )
         } 
         QString configString ;
         configString += "PPAU " + QString::number( mPausePlay ) + "\n";
         configString += "SUCO " + QString::number( mSuspend ) + "\n";
+        configString += "POFO " + QString::number( mPopupFontSize ) + "\n";
         configString += "WAAL " + QString::number( wavAlarm ) + "\n";
         configString += "PLBE " + QString::number( mPlayBeeps ) + "\n";
         configString += "CUTE " + mCustomText + "\n";
         configString += "CUMI " + QString::number( mCustomMinutes ) + "\n";
@@ -630,8 +642,22 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
     QTimer::singleShot( 5000, mTimerStartLabel, SLOT ( hide() )  );
     mTimerTime = 1;
 }
 
+void SimpleAlarmDaemonImpl::confFontSize( int size )
+{
+    
+    mFontsizePopup->setItemChecked( mPopupFontSize, false );
+    mPopupFontSize = size;
+    mFontsizePopup->setItemChecked( mPopupFontSize, true );
+    QFont fon = mTimerPopUp->font();
+    fon.setPointSize(  mPopupFontSize );
+    mTimerPopUp->setFont( fon );
+    mPopUp->setFont( fon );
+    fon.setBold( true );
+    fon.setPointSize( mPopupFontSize * 2 );
+    mTimerStartLabel->setFont( fon );
+}
 void SimpleAlarmDaemonImpl::writeFile()
 { 
     QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
     //QCopEnvelope e("QPE/Application/kopi", "-writeFile");