-rw-r--r-- | core/applets/vmemo/vmemo.h | 6 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 0 | ||||
-rw-r--r-- | core/pim/datebook/dateentry.ui | 360 |
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 @@ -26,31 +26,37 @@ #include <qlabel.h> #include <qtimer.h> class VMemo : public QWidget { Q_OBJECT + public: + VMemo( QWidget *parent, const char *name = NULL); ~VMemo(); static int position(); QFile track; int length; QString fileName, errorMsg, date; QLabel* msgLabel; QTimer *t_timer; bool usingIcon, useADPCM; + public slots: + bool record(); void mousePressEvent( QMouseEvent * ); void mouseReleaseEvent( QMouseEvent * ); void receive( const QCString &msg, const QByteArray &data ); bool startRecording(); void stopRecording(); void timerBreak(); + private: + bool useAlerts; void paintEvent( QPaintEvent* ); int setToggleButton(int); int openDSP(); int openWAV(const char *filename); bool fromToggle; 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 @@ -29,64 +29,77 @@ </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>242</width> - <height>339</height> + <width>286</width> + <height>396</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>New Event</string> </property> + <property> + <name>layoutMargin</name> + </property> + <property> + <name>layoutSpacing</name> + </property> <grid> <property stdset="1"> <name>margin</name> <number>2</number> </property> <property stdset="1"> <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> <property stdset="1"> <name>name</name> - <cstring>TextLabel2_2</cstring> + <cstring>TextLabel1</cstring> </property> <property stdset="1"> <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> <item> <property> <name>text</name> <string></string> </property> @@ -136,24 +149,49 @@ </property> <property stdset="1"> <name>duplicatesEnabled</name> <bool>false</bool> </property> </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> <property stdset="1"> <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> <property stdset="1"> <name>text</name> - <string>Description </string> + <string>Location</string> </property> </widget> - <widget row="1" column="1" rowspan="1" colspan="3" > + <widget> <class>QComboBox</class> <item> <property> <name>text</name> <string></string> </property> @@ -191,13 +229,45 @@ </property> <property stdset="1"> <name>duplicatesEnabled</name> <bool>false</bool> </property> </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> <property stdset="1"> <name>name</name> <cstring>comboCategory</cstring> </property> <property stdset="1"> @@ -205,24 +275,73 @@ <sizepolicy> <hsizetype>3</hsizetype> <vsizetype>1</vsizetype> </sizepolicy> </property> </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> <property stdset="1"> <name>name</name> <cstring>TextLabel3</cstring> </property> <property stdset="1"> <name>text</name> <string>Start - End </string> </property> </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> <property stdset="1"> <name>name</name> <cstring>buttonStart</cstring> </property> <property stdset="1"> @@ -241,13 +360,13 @@ </property> <property stdset="1"> <name>text</name> <string>Jan 02 00</string> </property> </widget> - <widget row="4" column="1" > + <widget> <class>QLineEdit</class> <property stdset="1"> <name>name</name> <cstring>comboStart</cstring> </property> <property stdset="1"> @@ -276,16 +395,18 @@ <set>AlignHCenter</set> </property> <property> <name>hAlign</name> </property> </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> <property stdset="1"> <name>orientation</name> <enum>Horizontal</enum> </property> <property stdset="1"> @@ -297,27 +418,28 @@ <size> <width>20</width> <height>20</height> </size> </property> </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> <property stdset="1"> <name>name</name> <cstring>buttonEnd</cstring> </property> <property stdset="1"> @@ -336,13 +458,13 @@ </property> <property stdset="1"> <name>text</name> <string>Jan 02 00</string> </property> </widget> - <widget row="4" column="3" > + <widget> <class>QLineEdit</class> <property stdset="1"> <name>name</name> <cstring>comboEnd</cstring> </property> <property stdset="1"> @@ -371,46 +493,96 @@ <set>AlignHCenter</set> </property> <property> <name>hAlign</name> </property> </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> <property stdset="1"> <name>name</name> <cstring>TimePickerLabel</cstring> </property> <property stdset="1"> <name>text</name> <string>Start time</string> </property> </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> <property stdset="1"> <name>name</name> <cstring>checkAllDay</cstring> </property> <property stdset="1"> <name>text</name> <string>All day</string> </property> </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> <property stdset="1"> <name>name</name> <cstring>TextLabel3_2_2</cstring> </property> <property stdset="1"> <name>text</name> <string>Time zone</string> </property> </widget> - <widget row="7" column="1" rowspan="1" colspan="3" > + <widget> <class>TimeZoneSelector</class> <property stdset="1"> <name>name</name> <cstring>timezone</cstring> </property> <property stdset="1"> @@ -418,13 +590,33 @@ <sizepolicy> <hsizetype>3</hsizetype> <vsizetype>1</vsizetype> </sizepolicy> </property> </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> <property stdset="1"> <name>name</name> <cstring>checkAlarm</cstring> </property> <property stdset="1"> @@ -441,44 +633,77 @@ </property> <property stdset="1"> <name>checked</name> <bool>false</bool> </property> </widget> - <widget row="8" column="1" rowspan="1" colspan="2" > + <widget> <class>QSpinBox</class> <property stdset="1"> <name>name</name> <cstring>spinAlarm</cstring> </property> <property stdset="1"> <name>enabled</name> <bool>false</bool> </property> <property stdset="1"> <name>suffix</name> - <string> minutes</string> + <string></string> </property> <property stdset="1"> <name>maxValue</name> <number>180</number> </property> <property stdset="1"> <name>minValue</name> <number>0</number> </property> <property stdset="1"> <name>lineStep</name> - <number>5</number> + <number>1</number> </property> <property stdset="1"> <name>value</name> <number>5</number> </property> </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> <item> <property> <name>text</name> <string>Silent</string> </property> @@ -495,24 +720,41 @@ </property> <property stdset="1"> <name>enabled</name> <bool>false</bool> </property> </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> <property stdset="1"> <name>name</name> <cstring>lblRepeat</cstring> </property> <property stdset="1"> <name>text</name> <string>Repeat</string> </property> </widget> - <widget row="9" column="1" rowspan="1" colspan="3" > + <widget> <class>QToolButton</class> <property stdset="1"> <name>name</name> <cstring>cmdRepeat</cstring> </property> <property stdset="1"> @@ -528,23 +770,27 @@ </property> <property stdset="1"> <name>text</name> <string>No Repeat...</string> </property> </widget> - <widget row="10" column="0" rowspan="1" colspan="4" > + </hbox> + </widget> + <widget> <class>QToolButton</class> <property stdset="1"> <name>name</name> <cstring>editNote</cstring> </property> <property stdset="1"> <name>text</name> <string>Note...</string> </property> </widget> + </vbox> + </widget> </grid> </widget> <customwidgets> <customwidget> <class>TimeZoneSelector</class> <header location="global">qpe/tzselect.h</header> @@ -644,12 +890,18 @@ <connection> <sender>checkAllDay</sender> <signal>toggled(bool)</signal> <receiver>comboStart</receiver> <slot>setDisabled(bool)</slot> </connection> + <connection> + <sender>checkAlarm</sender> + <signal>toggled(bool)</signal> + <receiver>ComboInterval</receiver> + <slot>setEnabled(bool)</slot> + </connection> <slot access="public">endDateChanged( const QString & )</slot> <slot access="public">endDateChanged( int, int, int )</slot> <slot access="public">endTimeChanged( const QString & )</slot> <slot access="public">slotRepeat()</slot> <slot access="public">slotWait( int )</slot> <slot access="public">startDateChanged( const QString & )</slot> |