summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-10-29 11:38:11 (UTC)
committer zautrix <zautrix>2005-10-29 11:38:11 (UTC)
commit126ae577622d43e17d8aeb1e66cafd9d16298cd2 (patch) (unidiff)
tree702518971b9b216237db27e4185a860319514bcd
parent456482e70b06246d1ce3981fa196462e65a2dcd8 (diff)
downloadkdepimpi-126ae577622d43e17d8aeb1e66cafd9d16298cd2.zip
kdepimpi-126ae577622d43e17d8aeb1e66cafd9d16298cd2.tar.gz
kdepimpi-126ae577622d43e17d8aeb1e66cafd9d16298cd2.tar.bz2
fixxx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--desktop/rpm/kdepim_rpm2
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp17
-rw-r--r--version2
3 files changed, 14 insertions, 7 deletions
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 9076943..bf19aca 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -2,3 +2,3 @@ Summary: A collection of PIM programs
2Name: KDE-Pim-Pi 2Name: KDE-Pim-Pi
3Version: 2.2.6 3Version: 2.2.7
4Release: SuSE_9.2 4Release: SuSE_9.2
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 2742610..aa61fb8 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -79,3 +79,10 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
79 mFontsizePopup->insertItem( "18", 18 ); 79 mFontsizePopup->insertItem( "18", 18 );
80 mFontsizePopup->insertItem( "20", 20 );
81 mFontsizePopup->insertItem( "22", 22 );
80 mFontsizePopup->insertItem( "24", 24 ); 82 mFontsizePopup->insertItem( "24", 24 );
83 mFontsizePopup->insertItem( "26", 26 );
84 mFontsizePopup->insertItem( "28", 28 );
85 mFontsizePopup->insertItem( "30", 30 );
86 mFontsizePopup->insertItem( "32", 32 );
87 mFontsizePopup->insertItem( "36", 36 );
81 QPopupMenu* savePopUp = new QPopupMenu( this ); 88 QPopupMenu* savePopUp = new QPopupMenu( this );
@@ -102,9 +109,8 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
102 mSuspendPopUp->insertItem( "20x", 20 ); 109 mSuspendPopUp->insertItem( "20x", 20 );
103 mSuspendPopUp->insertItem( "30x", 30 ); 110 mSuspendPopUp->insertItem( "30x", 30 );
111 mBeepPopUp->insertItem( "Config",savePopUp );
112 mBeepPopUp->insertItem( "Replay",mSoundPopUp );
113 mBeepPopUp->insertItem( "Font Size",mFontsizePopup );
104 mBeepPopUp->insertItem( "Auto suspend",mSuspendPopUp ); 114 mBeepPopUp->insertItem( "Auto suspend",mSuspendPopUp );
105 mBeepPopUp->insertItem( "Beep interval",mPausePopUp ); 115 mBeepPopUp->insertItem( "Beep interval",mPausePopUp );
106 mBeepPopUp->insertItem( "Replay",mSoundPopUp );
107 mBeepPopUp->insertItem( "Font Size",mFontsizePopup );
108 mBeepPopUp->insertItem( "Config",savePopUp );
109 mBeepPopUp->insertItem( "300", 300 );
110 mBeepPopUp->insertItem( "180", 180 ); 116 mBeepPopUp->insertItem( "180", 180 );
@@ -112,2 +118,3 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
112 mBeepPopUp->insertItem( "30", 30 ); 118 mBeepPopUp->insertItem( "30", 30 );
119 mBeepPopUp->insertItem( "18", 18 );
113 mBeepPopUp->insertItem( "10", 10 ); 120 mBeepPopUp->insertItem( "10", 10 );
diff --git a/version b/version
index 4f24d24..fda8303 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "2.2.6"; version = "2.2.7";