author | paule <paule> | 2007-01-13 07:42:23 (UTC) |
---|---|---|
committer | paule <paule> | 2007-01-13 07:42:23 (UTC) |
commit | a1360b0af73518d97ebe63ad3cd156cd8b57c8b5 (patch) (side-by-side diff) | |
tree | 2630d54134a775f48254624273a8b381e77e39c0 /noncore | |
parent | b1075202780c1d807c9d9f5286a2ffa7714bae51 (diff) | |
download | opie-a1360b0af73518d97ebe63ad3cd156cd8b57c8b5.zip opie-a1360b0af73518d97ebe63ad3cd156cd8b57c8b5.tar.gz opie-a1360b0af73518d97ebe63ad3cd156cd8b57c8b5.tar.bz2 |
* Increase font size (fixes bug #1597)
* Improve usability of snooze function (fixes bug #1598)
* Fix stretched icon (fixes bug #1616)
-rw-r--r-- | noncore/tools/clock/alarmdlgbase.ui | 490 | ||||
-rw-r--r-- | noncore/tools/clock/clock.cpp | 19 | ||||
-rw-r--r-- | noncore/tools/clock/clock.h | 1 |
3 files changed, 494 insertions, 16 deletions
diff --git a/noncore/tools/clock/alarmdlgbase.ui b/noncore/tools/clock/alarmdlgbase.ui index 63759f3..944f532 100644 --- a/noncore/tools/clock/alarmdlgbase.ui +++ b/noncore/tools/clock/alarmdlgbase.ui @@ -10,10 +10,10 @@ <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>124</width> - <height>92</height> + <width>199</width> + <height>243</height> </rect> </property> <property stdset="1"> <name>caption</name> @@ -24,9 +24,9 @@ </property> <vbox> <property stdset="1"> <name>margin</name> - <number>6</number> + <number>11</number> </property> <property stdset="1"> <name>spacing</name> <number>6</number> @@ -53,9 +53,9 @@ <cstring>pixmap</cstring> </property> <property stdset="1"> <name>scaledContents</name> - <bool>true</bool> + <bool>false</bool> </property> </widget> <spacer> <property> @@ -87,8 +87,12 @@ <property stdset="1"> <name>text</name> <string>TextLabel1</string> </property> + <property stdset="1"> + <name>scaledContents</name> + <bool>false</bool> + </property> </widget> </hbox> </widget> <widget> @@ -123,8 +127,12 @@ <name>name</name> <cstring>snoozeTime</cstring> </property> <property stdset="1"> + <name>caption</name> + <string></string> + </property> + <property stdset="1"> <name>suffix</name> <string> mins</string> </property> <property stdset="1"> @@ -134,18 +142,492 @@ <property stdset="1"> <name>lineStep</name> <number>5</number> </property> + <property stdset="1"> + <name>value</name> + <number>5</number> + </property> + <property> + <name>layoutMargin</name> + </property> </widget> </hbox> </widget> <widget> <class>QPushButton</class> <property stdset="1"> <name>name</name> + <cstring>cmdSnooze</cstring> + </property> + <property stdset="1"> + <name>minimumSize</name> + <size> + <width>0</width> + <height>100</height> + </size> + </property> + <property stdset="1"> + <name>palette</name> + <palette> + <active> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>128</green> + <blue>128</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>255</red> + <green>191</green> + <blue>191</blue> + </color> + <color> + <red>127</red> + <green>64</green> + <blue>64</blue> + </color> + <color> + <red>170</red> + <green>85</green> + <blue>85</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>238</red> + <green>238</green> + <blue>230</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>221</green> + <blue>118</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + </active> + <disabled> + <color> + <red>128</red> + <green>128</green> + <blue>128</blue> + </color> + <color> + <red>255</red> + <green>128</green> + <blue>128</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>255</red> + <green>166</green> + <blue>166</blue> + </color> + <color> + <red>127</red> + <green>64</green> + <blue>64</blue> + </color> + <color> + <red>170</red> + <green>85</green> + <blue>85</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>128</red> + <green>128</green> + <blue>128</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>238</red> + <green>238</green> + <blue>230</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>221</green> + <blue>118</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + </disabled> + <inactive> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>128</green> + <blue>128</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>255</red> + <green>166</green> + <blue>166</blue> + </color> + <color> + <red>127</red> + <green>64</green> + <blue>64</blue> + </color> + <color> + <red>170</red> + <green>85</green> + <blue>85</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>238</red> + <green>238</green> + <blue>230</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>221</green> + <blue>118</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + </inactive> + </palette> + </property> + <property stdset="1"> + <name>text</name> + <string>Snooze</string> + </property> + </widget> + <widget> + <class>QPushButton</class> + <property stdset="1"> + <name>name</name> <cstring>cmdOk</cstring> </property> <property stdset="1"> + <name>minimumSize</name> + <size> + <width>0</width> + <height>32</height> + </size> + </property> + <property stdset="1"> + <name>palette</name> + <palette> + <active> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>192</red> + <green>255</green> + <blue>192</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>223</red> + <green>255</green> + <blue>223</blue> + </color> + <color> + <red>96</red> + <green>127</green> + <blue>96</blue> + </color> + <color> + <red>128</red> + <green>170</green> + <blue>128</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>238</red> + <green>238</green> + <blue>230</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>221</green> + <blue>118</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + </active> + <disabled> + <color> + <red>128</red> + <green>128</green> + <blue>128</blue> + </color> + <color> + <red>192</red> + <green>255</green> + <blue>192</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>230</red> + <green>255</green> + <blue>230</blue> + </color> + <color> + <red>96</red> + <green>127</green> + <blue>96</blue> + </color> + <color> + <red>128</red> + <green>170</green> + <blue>128</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>128</red> + <green>128</green> + <blue>128</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>238</red> + <green>238</green> + <blue>230</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>221</green> + <blue>118</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + </disabled> + <inactive> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>192</red> + <green>255</green> + <blue>192</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>230</red> + <green>255</green> + <blue>230</blue> + </color> + <color> + <red>96</red> + <green>127</green> + <blue>96</blue> + </color> + <color> + <red>128</red> + <green>170</green> + <blue>128</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>255</green> + <blue>255</blue> + </color> + <color> + <red>238</red> + <green>238</green> + <blue>230</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <color> + <red>255</red> + <green>221</green> + <blue>118</blue> + </color> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + </inactive> + </palette> + </property> + <property stdset="1"> <name>text</name> <string>Close</string> </property> </widget> diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp index 9b324e0..325a307 100644 --- a/noncore/tools/clock/clock.cpp +++ b/noncore/tools/clock/clock.cpp @@ -101,17 +101,22 @@ public: AlarmDlg::AlarmDlg(QWidget *parent, const char *name, bool modal, const QString &txt) : AlarmDlgBase(parent, name, modal) { + // Increase font size to make it a little more readable + QFont f(font()); + f.setPointSize((int)(f.pointSize() * 1.7)); + setFont(f); + setCaption( tr("Clock") ); pixmap->setPixmap( Opie::Core::OResource::loadPixmap("clock/alarmbell") ); alarmDlgLabel->setText(txt); - connect(snoozeTime, SIGNAL(valueChanged(int)), this, - SLOT(changePrompt(int))); - connect(cmdOk, SIGNAL(clicked()), this, SLOT(checkSnooze())); + connect(cmdSnooze, SIGNAL(clicked()), this, SLOT(checkSnooze())); + connect(cmdOk, SIGNAL(clicked()), this, SLOT(accept())); } + // // // void @@ -143,16 +148,8 @@ AlarmDlg::checkSnooze(void) } -void -AlarmDlg::changePrompt(int mins) -{ - cmdOk->setText(mins > 0 ? tr("Snooze") : tr("Close") ); -} - - - Clock::Clock( QWidget * parent, const char *, WFlags f ) : ClockBase( parent, "clock", f ), swatch_splitms(99), init(FALSE) // No tr { alarmDlg = 0; diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h index c063a9b..10bbfef 100644 --- a/noncore/tools/clock/clock.h +++ b/noncore/tools/clock/clock.h @@ -43,9 +43,8 @@ public: private slots: void checkSnooze(void); - void changePrompt(int minutes); }; class Clock : public ClockBase { |