author | zautrix <zautrix> | 2005-02-09 10:33:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-09 10:33:00 (UTC) |
commit | 968099947455adc0e8681aedf8c161327e311f38 (patch) (unidiff) | |
tree | 2c4983417cd6d7348765a58990eac50aed8700e6 | |
parent | d0ab37d35ca9a9d919c9fc4856f3314bfef6dd5a (diff) | |
download | kdepimpi-968099947455adc0e8681aedf8c161327e311f38.zip kdepimpi-968099947455adc0e8681aedf8c161327e311f38.tar.gz kdepimpi-968099947455adc0e8681aedf8c161327e311f38.tar.bz2 |
start fix
-rw-r--r-- | korganizer/koagendaview.cpp | 10 | ||||
-rw-r--r-- | korganizer/koagendaview.h | 1 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 7 |
3 files changed, 18 insertions, 0 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 0d36946..13d8398 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -1530,12 +1530,22 @@ void KOAgendaView::scrollOneHourDown() | |||
1530 | 1530 | ||
1531 | void KOAgendaView::setStartHour( int h ) | 1531 | void KOAgendaView::setStartHour( int h ) |
1532 | { | 1532 | { |
1533 | mAgenda->setStartHour( h ); | 1533 | mAgenda->setStartHour( h ); |
1534 | 1534 | ||
1535 | } | 1535 | } |
1536 | void KOAgendaView::setInitStartHour() | ||
1537 | { | ||
1538 | |||
1539 | if ( KOPrefs::instance()->mCenterOnCurrentTime ) | ||
1540 | setStartHour( QTime::currentTime ().hour() ); | ||
1541 | else | ||
1542 | setStartHour( KOPrefs::instance()->mDayBegins ); | ||
1543 | |||
1544 | } | ||
1545 | |||
1536 | 1546 | ||
1537 | void KOAgendaView::updateTodo( Todo * t, int ) | 1547 | void KOAgendaView::updateTodo( Todo * t, int ) |
1538 | { | 1548 | { |
1539 | if ( !isVisible() ) | 1549 | if ( !isVisible() ) |
1540 | return; | 1550 | return; |
1541 | bool remove = false; | 1551 | bool remove = false; |
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index 4a058ce..8b8bac0 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h | |||
@@ -174,12 +174,13 @@ class KOAgendaView : public KOEventView { | |||
174 | /** returns true if selection is for whole day */ | 174 | /** returns true if selection is for whole day */ |
175 | bool selectedIsAllDay() {return mTimeSpanInAllDay;} | 175 | bool selectedIsAllDay() {return mTimeSpanInAllDay;} |
176 | /** make selected start/end invalid */ | 176 | /** make selected start/end invalid */ |
177 | void deleteSelectedDateTime(); | 177 | void deleteSelectedDateTime(); |
178 | void repaintAgenda(); | 178 | void repaintAgenda(); |
179 | public slots: | 179 | public slots: |
180 | void setInitStartHour(); | ||
180 | virtual void updateView(); | 181 | virtual void updateView(); |
181 | virtual void updateConfig(); | 182 | virtual void updateConfig(); |
182 | virtual void showDates(const QDate &start, const QDate &end); | 183 | virtual void showDates(const QDate &start, const QDate &end); |
183 | virtual void showEvents(QPtrList<Event> eventList); | 184 | virtual void showEvents(QPtrList<Event> eventList); |
184 | 185 | ||
185 | void updateTodo( Todo *, int ); | 186 | void updateTodo( Todo *, int ); |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index b0f26d1..f8f6c1d 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -91,13 +91,20 @@ void KOViewManager::readSettings(KConfig *config) | |||
91 | else if (view == "Month") showMonthView(); | 91 | else if (view == "Month") showMonthView(); |
92 | else if (view == "List") showListView(); | 92 | else if (view == "List") showListView(); |
93 | else if (view == "Journal") showJournalView(); | 93 | else if (view == "Journal") showJournalView(); |
94 | else if (view == "TimeSpan") showTimeSpanView(); | 94 | else if (view == "TimeSpan") showTimeSpanView(); |
95 | else if (view == "Todo") showTodoView(); | 95 | else if (view == "Todo") showTodoView(); |
96 | else { | 96 | else { |
97 | config->setGroup( "Views" ); | ||
98 | int dateCount = config->readNumEntry( "ShownDatesCount", 7 ); | ||
99 | mCurrentAgendaView = dateCount; | ||
97 | showAgendaView(); | 100 | showAgendaView(); |
101 | mCurrentAgendaView = dateCount; | ||
102 | #ifdef DESKTOP_VERSION | ||
103 | QTimer::singleShot( 1000, mAgendaView, SLOT ( setInitStartHour() ) ); | ||
104 | #endif | ||
98 | } | 105 | } |
99 | } | 106 | } |
100 | 107 | ||
101 | void KOViewManager::showDateView( int view, QDate date) | 108 | void KOViewManager::showDateView( int view, QDate date) |
102 | { | 109 | { |
103 | static int lastMode = 0; | 110 | static int lastMode = 0; |