summaryrefslogtreecommitdiff
path: root/core
Side-by-side diff
Diffstat (limited to 'core') (more/less context) (show whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.h6
-rw-r--r--core/apps/textedit/textedit.cpp0
-rw-r--r--core/pim/datebook/dateentry.ui360
3 files changed, 312 insertions, 54 deletions
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h
index 1bd735f..806fe0e 100644
--- a/core/applets/vmemo/vmemo.h
+++ b/core/applets/vmemo/vmemo.h
@@ -31,3 +31,5 @@ class VMemo : public QWidget
Q_OBJECT
+
public:
+
VMemo( QWidget *parent, const char *name = NULL);
@@ -41,3 +43,5 @@ public:
bool usingIcon, useADPCM;
+
public slots:
+
bool record();
@@ -49,3 +53,5 @@ public slots:
void timerBreak();
+
private:
+
bool useAlerts;
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index ca760bb..759e440 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
diff --git a/core/pim/datebook/dateentry.ui b/core/pim/datebook/dateentry.ui
index f776911..6e4ada1 100644
--- a/core/pim/datebook/dateentry.ui
+++ b/core/pim/datebook/dateentry.ui
@@ -34,4 +34,4 @@
<y>0</y>
- <width>242</width>
- <height>339</height>
+ <width>286</width>
+ <height>396</height>
</rect>
@@ -42,2 +42,8 @@
</property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
<grid>
@@ -49,24 +55,35 @@
<name>spacing</name>
- <number>0</number>
+ <number>2</number>
</property>
- <widget row="1" column="0" >
- <class>QLabel</class>
+ <widget row="0" column="0" >
+ <class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel2</cstring>
+ <cstring>Layout19</cstring>
</property>
+ <vbox>
<property stdset="1">
- <name>frameShape</name>
- <enum>MShape</enum>
+ <name>margin</name>
+ <number>0</number>
</property>
<property stdset="1">
- <name>frameShadow</name>
- <enum>MShadow</enum>
+ <name>spacing</name>
+ <number>6</number>
</property>
+ <widget>
+ <class>QLayoutWidget</class>
<property stdset="1">
- <name>text</name>
- <string>Location</string>
+ <name>name</name>
+ <cstring>Layout1</cstring>
</property>
- </widget>
- <widget row="2" column="0" >
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
<class>QLabel</class>
@@ -74,3 +91,3 @@
<name>name</name>
- <cstring>TextLabel2_2</cstring>
+ <cstring>TextLabel1</cstring>
</property>
@@ -78,10 +95,6 @@
<name>text</name>
- <string>Category</string>
- </property>
- <property>
- <name>buddy</name>
- <cstring>comboPriority</cstring>
+ <string>Description </string>
</property>
</widget>
- <widget row="0" column="1" rowspan="1" colspan="3" >
+ <widget>
<class>QComboBox</class>
@@ -141,3 +154,20 @@
</widget>
- <widget row="0" column="0" >
+ </hbox>
+ </widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout2</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
<class>QLabel</class>
@@ -145,3 +175,11 @@
<name>name</name>
- <cstring>TextLabel1</cstring>
+ <cstring>TextLabel2</cstring>
+ </property>
+ <property stdset="1">
+ <name>frameShape</name>
+ <enum>MShape</enum>
+ </property>
+ <property stdset="1">
+ <name>frameShadow</name>
+ <enum>MShadow</enum>
</property>
@@ -149,6 +187,6 @@
<name>text</name>
- <string>Description </string>
+ <string>Location</string>
</property>
</widget>
- <widget row="1" column="1" rowspan="1" colspan="3" >
+ <widget>
<class>QComboBox</class>
@@ -196,3 +234,35 @@
</widget>
- <widget row="2" column="1" rowspan="1" colspan="3" >
+ </hbox>
+ </widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout3</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel2_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Category</string>
+ </property>
+ <property>
+ <name>buddy</name>
+ <cstring>comboPriority</cstring>
+ </property>
+ </widget>
+ <widget>
<class>CategorySelect</class>
@@ -210,3 +280,35 @@
</widget>
- <widget row="3" column="0" rowspan="2" colspan="1" >
+ </hbox>
+ </widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout18</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout17</cstring>
+ </property>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
<class>QLabel</class>
@@ -221,3 +323,20 @@
</widget>
- <widget row="3" column="1" >
+ </vbox>
+ </widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout4</cstring>
+ </property>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
<class>QPushButton</class>
@@ -246,3 +365,3 @@
</widget>
- <widget row="4" column="1" >
+ <widget>
<class>QLineEdit</class>
@@ -281,6 +400,8 @@
</widget>
- <spacer row="3" column="2" rowspan="2" colspan="1" >
+ </vbox>
+ </widget>
+ <spacer>
<property>
<name>name</name>
- <cstring>Spacer1_2</cstring>
+ <cstring>Spacer12</cstring>
</property>
@@ -302,17 +423,18 @@
</spacer>
- <widget row="5" column="1" rowspan="1" colspan="3" >
- <class>TimePicker</class>
+ <widget>
+ <class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>timePickerStart</cstring>
+ <cstring>Layout5</cstring>
</property>
+ <vbox>
<property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>1</vsizetype>
- </sizepolicy>
+ <name>margin</name>
+ <number>0</number>
</property>
- </widget>
- <widget row="3" column="3" >
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
<class>QPushButton</class>
@@ -341,3 +463,3 @@
</widget>
- <widget row="4" column="3" >
+ <widget>
<class>QLineEdit</class>
@@ -376,3 +498,22 @@
</widget>
- <widget row="5" column="0" >
+ </vbox>
+ </widget>
+ </hbox>
+ </widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout7</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
<class>QLabel</class>
@@ -387,3 +528,19 @@
</widget>
- <widget row="6" column="0" >
+ <widget>
+ <class>TimePicker</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>timePickerStart</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget>
<class>QCheckBox</class>
@@ -398,3 +555,18 @@
</widget>
- <widget row="7" column="0" >
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout8</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
<class>QLabel</class>
@@ -409,3 +581,3 @@
</widget>
- <widget row="7" column="1" rowspan="1" colspan="3" >
+ <widget>
<class>TimeZoneSelector</class>
@@ -423,3 +595,23 @@
</widget>
- <widget row="8" column="0" >
+ </hbox>
+ </widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout9</cstring>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>1</number>
+ </property>
+ <widget>
<class>QCheckBox</class>
@@ -446,3 +638,3 @@
</widget>
- <widget row="8" column="1" rowspan="1" colspan="2" >
+ <widget>
<class>QSpinBox</class>
@@ -458,3 +650,3 @@
<name>suffix</name>
- <string> minutes</string>
+ <string></string>
</property>
@@ -470,3 +662,3 @@
<name>lineStep</name>
- <number>5</number>
+ <number>1</number>
</property>
@@ -477,3 +669,36 @@
</widget>
- <widget row="8" column="3" >
+ <widget>
+ <class>QComboBox</class>
+ <item>
+ <property>
+ <name>text</name>
+ <string>minutes</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>hours</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>days</string>
+ </property>
+ </item>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>ComboInterval</cstring>
+ </property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>false</bool>
+ </property>
+ <property stdset="1">
+ <name>currentItem</name>
+ <number>0</number>
+ </property>
+ </widget>
+ <widget>
<class>QComboBox</class>
@@ -500,3 +725,20 @@
</widget>
- <widget row="9" column="0" >
+ </hbox>
+ </widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout11</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
<class>QLabel</class>
@@ -511,3 +753,3 @@
</widget>
- <widget row="9" column="1" rowspan="1" colspan="3" >
+ <widget>
<class>QToolButton</class>
@@ -533,3 +775,5 @@
</widget>
- <widget row="10" column="0" rowspan="1" colspan="4" >
+ </hbox>
+ </widget>
+ <widget>
<class>QToolButton</class>
@@ -544,2 +788,4 @@
</widget>
+ </vbox>
+ </widget>
</grid>
@@ -649,2 +895,8 @@
</connection>
+ <connection>
+ <sender>checkAlarm</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>ComboInterval</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
<slot access="public">endDateChanged( const QString &amp; )</slot>