author | hakan <hakan> | 2002-03-26 19:05:31 (UTC) |
---|---|---|
committer | hakan <hakan> | 2002-03-26 19:05:31 (UTC) |
commit | 78211642003f70797a5faa1767a5ab2f5f83606f (patch) (side-by-side diff) | |
tree | 703df6b1f8a98dbd00066ab3c21419b7f97e41b4 /core/pim | |
parent | dbbbe1c0600422e4bd2d6a6aba271476f457ed97 (diff) | |
download | opie-78211642003f70797a5faa1767a5ab2f5f83606f.zip opie-78211642003f70797a5faa1767a5ab2f5f83606f.tar.gz opie-78211642003f70797a5faa1767a5ab2f5f83606f.tar.bz2 |
Added shortcut buttons to set the start time
-rw-r--r-- | core/pim/datebook/clickablelabel.cpp | 71 | ||||
-rw-r--r-- | core/pim/datebook/clickablelabel.h | 10 | ||||
-rw-r--r-- | core/pim/datebook/datebook.cpp | 11 | ||||
-rw-r--r-- | core/pim/datebook/datebook.pro | 6 | ||||
-rw-r--r-- | core/pim/datebook/dateentry.ui | 641 | ||||
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 97 | ||||
-rw-r--r-- | core/pim/datebook/dateentryimpl.h | 7 | ||||
-rw-r--r-- | core/pim/datebook/timepicker.cpp | 119 | ||||
-rw-r--r-- | core/pim/datebook/timepicker.h | 32 |
9 files changed, 342 insertions, 652 deletions
diff --git a/core/pim/datebook/clickablelabel.cpp b/core/pim/datebook/clickablelabel.cpp index 6912c34..1dd0d15 100644 --- a/core/pim/datebook/clickablelabel.cpp +++ b/core/pim/datebook/clickablelabel.cpp @@ -1,2 +1,3 @@ #include "clickablelabel.h" +#include <stdio.h> @@ -7,3 +8,6 @@ ClickableLabel::ClickableLabel(QWidget* parent = 0, { - setFrameShape(NoFrame); + textInverted=false; + isToggle=false; + isDown=false; + showState(false); setFrameShadow(Sunken); @@ -11,5 +15,12 @@ ClickableLabel::ClickableLabel(QWidget* parent = 0, +void ClickableLabel::setToggleButton(bool t) { + isToggle=t; +} + void ClickableLabel::mousePressEvent( QMouseEvent *e ) { - setFrameShape(Panel); - repaint(); + if (isToggle && isDown) { + showState(false); + } else { + showState(true); + } } @@ -17,5 +28,14 @@ void ClickableLabel::mousePressEvent( QMouseEvent *e ) { void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) { - setFrameShape(NoFrame); - repaint(); + if (rect().contains(e->pos()) && isToggle) isDown=!isDown; + + if (isToggle && isDown) { + showState(true); + } else { + showState(false); + } + if (rect().contains(e->pos())) { + if (isToggle) { + emit toggled(isDown); + } emit clicked(); @@ -26,6 +46,43 @@ void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) { if (rect().contains(e->pos())) { - setFrameShape(Panel); + if (isToggle && isDown) { + showState(false); + } else { + showState(true); + } } else { - setFrameShape(NoFrame); + if (isToggle && isDown) { + showState(true); + } else { + showState(false); + } } } + +void ClickableLabel::showState(bool on) { + if (on) { + //setFrameShape(Panel); + setInverted(true); + setBackgroundMode(PaletteHighlight); + } else { + //setFrameShape(NoFrame); + setInverted(false); + setBackgroundMode(PaletteBackground); + } + repaint(); +} + +void ClickableLabel::setInverted(bool on) { + if ( (!textInverted && on) || (textInverted && !on) ) { + QPalette pal=palette(); + QColor col=pal.color(QPalette::Normal, QColorGroup::Foreground); + col.setRgb(255-col.red(),255-col.green(),255-col.blue()); + pal.setColor(QPalette::Normal, QColorGroup::Foreground, col); + setPalette(pal); + textInverted=!textInverted; + } +} + +void ClickableLabel::setOn(bool on) { + isDown=on; + showState(isDown); +} diff --git a/core/pim/datebook/clickablelabel.h b/core/pim/datebook/clickablelabel.h index b6d33ad..d00fee6 100644 --- a/core/pim/datebook/clickablelabel.h +++ b/core/pim/datebook/clickablelabel.h @@ -11,2 +11,3 @@ public: WFlags fl = 0); + void setToggleButton(bool t); protected: @@ -15,4 +16,13 @@ public: void mouseMoveEvent( QMouseEvent *e ); + public slots: + void setOn(bool on); signals: void clicked(); + void toggled(bool on); + private: + bool isToggle; + bool isDown; + void showState(bool on); + bool textInverted; + void setInverted(bool on); }; diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 92dbdc8..2deb96f 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp @@ -209,2 +209,5 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) this, SLOT(receive(const QCString&, const QByteArray&)) ); + channel = new QCopChannel( "QPE/Datebook", this ); + connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), + this, SLOT(receive(const QCString&, const QByteArray&)) ); #endif @@ -228,2 +231,10 @@ void DateBook::receive( const QCString &msg, const QByteArray &data ) } + else if (msg == "editEvent(int)") { + /* Not yet working... + int uid; + stream >> uid; + Event e=db->getEvent(uid); + editEvent(e); + */ + } } diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro index 314a56a..09d5c2d 100644 --- a/core/pim/datebook/datebook.pro +++ b/core/pim/datebook/datebook.pro @@ -13,3 +13,4 @@ HEADERS = datebookday.h \ repeatentry.h \ - clickablelabel.h + clickablelabel.h \ + timepicker.h @@ -25,3 +26,4 @@ SOURCES = main.cpp \ repeatentry.cpp \ - clickablelabel.cpp + clickablelabel.cpp \ + timepicker.cpp diff --git a/core/pim/datebook/dateentry.ui b/core/pim/datebook/dateentry.ui index eac4e23..22ff32d 100644 --- a/core/pim/datebook/dateentry.ui +++ b/core/pim/datebook/dateentry.ui @@ -232,291 +232,3 @@ <widget row="3" column="2" rowspan="1" colspan="2" > - <class>QComboBox</class> - <item> - <property> - <name>text</name> - <string>00:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>00:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>01:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>01:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>02:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>02:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>03:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>03:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>04:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>04:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>05:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>05:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>06:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>06:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>07:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>07:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>08:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>08:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>09:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>09:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>10:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>10:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>11:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>11:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>12:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>12:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>13:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>13:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>14:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>14:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>15:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>15:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>16:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>16:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>17:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>17:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>18:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>18:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>19:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>19:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>20:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>20:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>21:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>21:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>22:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>22:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>23:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>23:30</string> - </property> - </item> + <class>QLineEdit</class> <property stdset="1"> @@ -525,11 +237,10 @@ </property> + </widget> + <widget row="5" column="1" colspan="3"> + <class>TimePicker</class> <property stdset="1"> - <name>editable</name> - <bool>true</bool> - </property> - <property stdset="1"> - <name>duplicatesEnabled</name> - <bool>false</bool> + <name>name</name> + <cstring>timePickerStart</cstring> </property> - </widget> + </widget> <widget row="4" column="1" > @@ -546,291 +257,3 @@ <widget row="4" column="2" rowspan="1" colspan="2" > - <class>QComboBox</class> - <item> - <property> - <name>text</name> - <string>00:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>00:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>01:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>01:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>02:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>02:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>03:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>03:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>04:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>04:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>05:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>05:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>06:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>06:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>07:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>07:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>08:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>08:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>09:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>09:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>10:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>10:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>11:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>11:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>12:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>12:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>13:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>13:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>14:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>14:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>15:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>15:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>16:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>16:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>17:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>17:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>18:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>18:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>19:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>19:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>20:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>20:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>21:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>21:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>22:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>22:30</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>23:00</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>23:30</string> - </property> - </item> + <class>QLineEdit</class> <property stdset="1"> @@ -839,10 +262,2 @@ </property> - <property stdset="1"> - <name>editable</name> - <bool>true</bool> - </property> - <property stdset="1"> - <name>duplicatesEnabled</name> - <bool>false</bool> - </property> </widget> @@ -859,3 +274,3 @@ </widget> - <widget row="5" column="0" > + <widget row="6" column="0" > <class>QCheckBox</class> @@ -870,3 +285,3 @@ </widget> - <widget row="6" column="0" > + <widget row="7" column="0" > <class>QLabel</class> @@ -881,3 +296,3 @@ </widget> - <widget row="6" column="1" rowspan="1" colspan="3" > + <widget row="7" column="1" rowspan="1" colspan="3" > <class>TimeZoneSelector</class> @@ -888,3 +303,3 @@ </widget> - <widget row="7" column="0" > + <widget row="8" column="0" > <class>QCheckBox</class> @@ -911,3 +326,3 @@ </widget> - <widget row="7" column="1" rowspan="1" colspan="2" > + <widget row="8" column="1" rowspan="1" colspan="2" > <class>QSpinBox</class> @@ -942,3 +357,3 @@ </widget> - <widget row="7" column="3" > + <widget row="8" column="3" > <class>QComboBox</class> @@ -965,3 +380,3 @@ </widget> - <widget row="8" column="0" > + <widget row="9" column="0" > <class>QLabel</class> @@ -976,3 +391,3 @@ </widget> - <widget row="8" column="1" rowspan="1" colspan="3" > + <widget row="9" column="1" rowspan="1" colspan="3" > <class>QToolButton</class> @@ -991,3 +406,3 @@ </widget> - <widget row="9" column="0" rowspan="1" colspan="4" > + <widget row="10" column="0" rowspan="1" colspan="4" > <class>QMultiLineEdit</class> @@ -1029,2 +444,16 @@ </customwidget> + <customwidget> + <class>TimePicker</class> + <header location="local">timepicker.h</header> + <sizehint> + <width>-1</width> + <height>-1</height> + </sizehint> + <container>0</container> + <sizepolicy> + <hordata>7</hordata> + <verdata>1</verdata> + </sizepolicy> + <pixmap>image1</pixmap> + </customwidget> </customwidgets> @@ -1049,3 +478,3 @@ <sender>comboEnd</sender> - <signal>activated(const QString&)</signal> + <signal>textChanged(const QString&)</signal> <receiver>DateEntryBase</receiver> @@ -1061,5 +490,5 @@ <sender>comboStart</sender> - <signal>activated(int)</signal> + <signal>textChanged(const QString &)</signal> <receiver>DateEntryBase</receiver> - <slot>startTimeChanged( int )</slot> + <slot>startTimeEdited( const QString & )</slot> </connection> @@ -1090,3 +519,3 @@ <slot access="public">startDateChanged(int, int, int)</slot> - <slot access="public">startTimeChanged( int )</slot> + <slot access="public">startTimeEdited( const QString & )</slot> <slot access="public">typeChanged( const QString & )</slot> diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index b2e3e3a..1c43363 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp @@ -41,2 +41,4 @@ +#include "timepicker.h" + #include <stdlib.h> @@ -62,3 +64,3 @@ DateEntry::DateEntry( bool startOnMonday, const QDateTime &start, setDates(start,end); - setFocusProxy(comboDescription); + setFocusProxy(comboDescription); } @@ -67,2 +69,3 @@ static void addOrPick( QComboBox* combo, const QString& t ) { + // Pick an item if one excists for (int i=0; i<combo->count(); i++) { @@ -73,3 +76,6 @@ static void addOrPick( QComboBox* combo, const QString& t ) } - combo->setEditText(t); + + // Else add one + combo->insertItem(t); + combo->setCurrentItem(combo->count()-1); } @@ -105,6 +111,2 @@ void DateEntry::setDates( const QDateTime& s, const QDateTime& e ) { - int shour, - ehour; - QString strStart, - strEnd; startDate = s.date(); @@ -114,5 +116,14 @@ void DateEntry::setDates( const QDateTime& s, const QDateTime& e ) startDateChanged( s.date().year(), s.date().month(), s.date().day() ); + endDateChanged( e.date().year(), e.date().month(), e.date().day() ); + updateTimeEdit(true,true); +} + +void DateEntry::updateTimeEdit(bool s, bool e) { + + // Comboboxes + QString strStart, strEnd; + int shour, ehour; if ( ampm ) { - shour = s.time().hour(); - ehour = e.time().hour(); + shour = startTime.hour(); + ehour = endTime.hour(); if ( shour >= 12 ) { @@ -120,3 +131,3 @@ void DateEntry::setDates( const QDateTime& s, const QDateTime& e ) shour -= 12; - strStart.sprintf( "%d:%02d PM", shour, s.time().minute() ); + strStart.sprintf( "%d:%02d PM", shour, startTime.minute() ); } else { @@ -124,5 +135,5 @@ void DateEntry::setDates( const QDateTime& s, const QDateTime& e ) shour = 12; - strStart.sprintf( "%d:%02d AM", shour, s.time().minute() ); + strStart.sprintf( "%d:%02d AM", shour, startTime.minute() ); } - if ( ehour == 24 && e.time().minute() == 0 ) { + if ( ehour == 24 && endTime.minute() == 0 ) { strEnd = "11:59 PM"; // or "midnight" @@ -131,3 +142,3 @@ void DateEntry::setDates( const QDateTime& s, const QDateTime& e ) ehour -= 12; - strEnd.sprintf( "%d:%02d PM", ehour, e.time().minute() ); + strEnd.sprintf( "%d:%02d PM", ehour, endTime.minute() ); } else { @@ -135,11 +146,11 @@ void DateEntry::setDates( const QDateTime& s, const QDateTime& e ) ehour = 12; - strEnd.sprintf( "%d:%02d AM", ehour, e.time().minute() ); + strEnd.sprintf( "%d:%02d AM", ehour, endTime.minute() ); } } else { - strStart.sprintf( "%02d:%02d", s.time().hour(), s.time().minute() ); - strEnd.sprintf( "%02d:%02d", e.time().hour(), e.time().minute() ); + strStart.sprintf( "%02d:%02d", startTime.hour(), startTime.minute() ); + strEnd.sprintf( "%02d:%02d", endTime.hour(), endTime.minute() ); } - addOrPick(comboStart, strStart ); - endDateChanged( e.date().year(), e.date().month(), e.date().day() ); - addOrPick(comboEnd, strEnd ); + + if (s) comboStart->setText(strStart); + if (e) comboEnd->setText(strEnd); } @@ -173,2 +184,6 @@ void DateEntry::init() this, SLOT( endDateChanged( int, int, int ) ) ); + + connect(timePickerStart, SIGNAL( timeChanged(const QTime &) ), + this, SLOT( startTimePicked(const QTime &) )); + editNote->setFixedVisibleLines(3); } @@ -242,4 +257,8 @@ void DateEntry::endTimeChanged( const QString &s ) endTime = startTime; - comboEnd->setCurrentItem( comboStart->currentItem() ); + //comboEnd->setCurrentItem( comboStart->currentItem() ); } + +} + +void DateEntry::endTimeChanged( const QTime &t ) { } @@ -272,8 +291,21 @@ void DateEntry::startDateChanged( int y, int m, int d ) */ -void DateEntry::startTimeChanged( int index ) +void DateEntry::startTimeEdited( const QString &s ) { - startTime = parseTime(comboStart->text(index),ampm); - changeEndCombo( index ); - //cout << "Start: " << comboStart->currentText() << endl; + startTimeChanged(parseTime(s,ampm)); + updateTimeEdit(false,true); + timePickerStart->setHour(startTime.hour()); + timePickerStart->setMinute(startTime.minute()); } + +void DateEntry::startTimeChanged( const QTime &t ) +{ + int duration=startTime.secsTo(endTime); + startTime = t; + endTime=t.addSecs(duration); +} +void DateEntry::startTimePicked( const QTime &t ) { + startTimeChanged(t); + updateTimeEdit(true,true); +} + /* @@ -288,12 +320,2 @@ void DateEntry::typeChanged( const QString &s ) } -/* - * public slot - */ -void DateEntry::changeEndCombo( int change ) -{ - if ( change + 2 < comboEnd->count() ) - change += 2; - comboEnd->setCurrentItem( change ); - endTimeChanged( comboEnd->currentText() ); -} @@ -338,4 +360,7 @@ Event DateEntry::event() } - startTime = parseTime( comboStart->currentText(), ampm ); - endTime = parseTime( comboEnd->currentText(), ampm ); + + // This is now done in the changed slots + // startTime = parseTime( comboStart->text(), ampm ); + //endTime = parseTime( comboEnd->text(), ampm ); + if ( startTime > endTime && endDate == startDate ) { @@ -429,2 +454,3 @@ void DateEntry::initCombos() { + /* comboStart->clear(); @@ -474,2 +500,3 @@ void DateEntry::initCombos() } + */ } diff --git a/core/pim/datebook/dateentryimpl.h b/core/pim/datebook/dateentryimpl.h index 785af7a..bde3119 100644 --- a/core/pim/datebook/dateentryimpl.h +++ b/core/pim/datebook/dateentryimpl.h @@ -48,6 +48,8 @@ public slots: void endTimeChanged( const QString & ); + void endTimeChanged( const QTime & ); void startDateChanged(int, int, int); - void startTimeChanged( int index ); + void startTimeEdited( const QString & ); + void startTimeChanged( const QTime & ); + void startTimePicked( const QTime & ); void typeChanged( const QString & ); - void changeEndCombo( int change ); void slotRepeat(); @@ -61,2 +63,3 @@ private: void setRepeatLabel(); + void updateTimeEdit(bool,bool); diff --git a/core/pim/datebook/timepicker.cpp b/core/pim/datebook/timepicker.cpp new file mode 100644 index 0000000..5f08a05 --- a/dev/null +++ b/core/pim/datebook/timepicker.cpp @@ -0,0 +1,119 @@ +#include "timepicker.h" + +#include <qbuttongroup.h> +#include <qtoolbutton.h> +#include <qlayout.h> +#include "clickablelabel.h" +#include <qstring.h> + +TimePicker::TimePicker(QWidget* parent = 0, const char* name = 0, + WFlags fl = 0) : + QWidget(parent,name,fl) +{ + QVBoxLayout *vbox=new QVBoxLayout(this); + + ClickableLabel *r; + QString s; + + // Hour Row + QWidget *row=new QWidget(this); + QHBoxLayout *l=new QHBoxLayout(row); + vbox->addWidget(row); + + + for (int i=0; i<24; i++) { + r=new ClickableLabel(row); + hourLst.append(r); + s.sprintf("%.2d",i); + r->setText(s); + r->setToggleButton(true); + r->setAlignment(AlignHCenter | AlignVCenter); + l->addWidget(r); + connect(r, SIGNAL(toggled(bool)), + this, SLOT(slotHour(bool))); + + if (i==11) { // Second row + row=new QWidget(this); + l=new QHBoxLayout(row); + vbox->addWidget(row); + } + } + + // Minute Row + row=new QWidget(this); + l=new QHBoxLayout(row); + vbox->addWidget(row); + + for (int i=0; i<60; i+=5) { + r=new ClickableLabel(row); + minuteLst.append(r); + s.sprintf("%.2d",i); + r->setText(s); + r->setToggleButton(true); + r->setAlignment(AlignHCenter | AlignVCenter); + l->addWidget(r); + connect(r, SIGNAL(toggled(bool)), + this, SLOT(slotMinute(bool))); + } +} + +void TimePicker::slotHour(bool b) { + + ClickableLabel *r = (ClickableLabel *) sender(); + + if (b) { + QValueListIterator<ClickableLabel *> it; + for (it=hourLst.begin(); it!=hourLst.end(); it++) { + if (*it != r) (*it)->setOn(false); + else tm.setHMS((*it)->text().toInt(), tm.minute(), 0); + } + emit timeChanged(tm); + } else { + r->setOn(true); + } + +} + +void TimePicker::slotMinute(bool b) { + + ClickableLabel *r = (ClickableLabel *) sender(); + + if (b) { + QValueListIterator<ClickableLabel *> it; + for (it=minuteLst.begin(); it!=minuteLst.end(); it++) { + if (*it != r) (*it)->setOn(false); + else tm.setHMS(tm.hour(),(*it)->text().toInt(), 0); + } + emit timeChanged(tm); + } else { + r->setOn(true); + } + +} + +void TimePicker::setMinute(int m) { + + QString minute; + minute.sprintf("%.2d",m); + + QValueListIterator<ClickableLabel *> it; + for (it=minuteLst.begin(); it!=minuteLst.end(); it++) { + if ((*it)->text() == minute) (*it)->setOn(true); + else (*it)->setOn(false); + } + + tm.setHMS(tm.hour(),m,0); +} + +void TimePicker::setHour(int h) { + + QString hour; + hour.sprintf("%.2d",h); + + QValueListIterator<ClickableLabel *> it; + for (it=hourLst.begin(); it!=hourLst.end(); it++) { + if ((*it)->text() == hour) (*it)->setOn(true); + else (*it)->setOn(false); + } + tm.setHMS(h,tm.minute(),0); +} diff --git a/core/pim/datebook/timepicker.h b/core/pim/datebook/timepicker.h new file mode 100644 index 0000000..0acadcb --- a/dev/null +++ b/core/pim/datebook/timepicker.h @@ -0,0 +1,32 @@ +#ifndef TIMEPICKER_H +#define TIMEPICKER_H + +#include <qwidget.h> +#include <qvaluelist.h> +#include "clickablelabel.h" +#include <qdatetime.h> + +class TimePicker: public QWidget { + Q_OBJECT + + public: + TimePicker(QWidget* parent = 0, const char* name = 0, + WFlags fl = 0); + void setHour(int h); + void setMinute(int m); + + private: + QValueList<ClickableLabel *> hourLst; + QValueList<ClickableLabel *> minuteLst; + QTime tm; + + private slots: + void slotHour(bool b); + void slotMinute(bool b); + + signals: + void timeChanged(const QTime &); +}; + + +#endif |