Re: [PATCH] Clock: alarm dialog improvements
Paul Eggleton <[email protected]> Tue, 9 Jan 2007 23:56:18 +1300
| Newsgroups | gmane.comp.handhelds.opie.devel |
|---|---|
| Message-ID | <[email protected]> |
On Tuesday 09 January 2007 01:51, Marcin Juszkiewicz wrote: > Can this be changed to 'default fontsize * 2' in code? 16px fontsize looks > good on qvga, vga but on larger screen (simpad for example) it will be > same size as default probably. OK, I've changed it to default fontsize * 1.7 since 2 looks a bit too big, at least on a qvga display. Revised patch attached. Cheers, Paul _______________________________________________ http://opie.handhelds.org/cgi-bin/moin.cgi/DeveloperWikiIndex Opie-devel mailing list [email protected] https://handhelds.org/mailman/listinfo/opie-devel
clock_alarmdlg2.patch
(text/x-diff, 22.7 KB)
Index: noncore/tools/clock/alarmdlgbase.ui
===================================================================
RCS file: /cvs/opie/noncore/tools/clock/alarmdlgbase.ui,v
retrieving revision 1.1.1.1
diff -u -B -b -r1.1.1.1 alarmdlgbase.ui
--- noncore/tools/clock/alarmdlgbase.ui 3 Apr 2004 18:20:07 -0000 1.1.1.1
+++ noncore/tools/clock/alarmdlgbase.ui 9 Jan 2007 10:50:58 -0000
@@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>124</width>
- <height>92</height>
+ <width>199</width>
+ <height>243</height>
</rect>
</property>
<property stdset="1">
@@ -25,7 +25,7 @@
<vbox>
<property stdset="1">
<name>margin</name>
- <number>6</number>
+ <number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
@@ -54,7 +54,7 @@
</property>
<property stdset="1">
<name>scaledContents</name>
- <bool>true</bool>
+ <bool>false</bool>
</property>
</widget>
<spacer>
@@ -88,6 +88,10 @@
<name>text</name>
<string>TextLabel1</string>
</property>
+ <property stdset="1">
+ <name>scaledContents</name>
+ <bool>false</bool>
+ </property>
</widget>
</hbox>
</widget>
@@ -124,6 +128,10 @@
<cstring>snoozeTime</cstring>
</property>
<property stdset="1">
+ <name>caption</name>
+ <string></string>
+ </property>
+ <property stdset="1">
<name>suffix</name>
<string> mins</string>
</property>
@@ -135,6 +143,13 @@
<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>
@@ -142,9 +157,476 @@
<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>
Index: noncore/tools/clock/clock.cpp
===================================================================
RCS file: /cvs/opie/noncore/tools/clock/clock.cpp,v
retrieving revision 1.30
diff -u -B -b -r1.30 clock.cpp
--- noncore/tools/clock/clock.cpp 23 May 2005 23:47:35 -0000 1.30
+++ noncore/tools/clock/clock.cpp 9 Jan 2007 10:50:59 -0000
@@ -102,15 +102,20 @@
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()));
}
+
//
//
//
@@ -144,14 +149,6 @@
-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
{
Index: noncore/tools/clock/clock.h
===================================================================
RCS file: /cvs/opie/noncore/tools/clock/clock.h,v
retrieving revision 1.13
diff -u -B -b -r1.13 clock.h
--- noncore/tools/clock/clock.h 3 Apr 2004 20:10:15 -0000 1.13
+++ noncore/tools/clock/clock.h 9 Jan 2007 10:51:00 -0000
@@ -44,7 +44,6 @@
private slots:
void checkSnooze(void);
- void changePrompt(int minutes);
};
class Clock : public ClockBase