author | zautrix <zautrix> | 2005-03-28 13:31:19 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-28 13:31:19 (UTC) |
commit | e4e6bda3a6b0a82e3f64db0fa5f7d60cab9f0e48 (patch) (unidiff) | |
tree | e1b5b2d51b8026b08f6eb3680304fa8d86d1873a /korganizer | |
parent | 314908d5d9139af7711c6e425260363bb014afce (diff) | |
download | kdepimpi-e4e6bda3a6b0a82e3f64db0fa5f7d60cab9f0e48.zip kdepimpi-e4e6bda3a6b0a82e3f64db0fa5f7d60cab9f0e48.tar.gz kdepimpi-e4e6bda3a6b0a82e3f64db0fa5f7d60cab9f0e48.tar.bz2 |
fixes
-rw-r--r-- | korganizer/calendarview.cpp | 11 | ||||
-rw-r--r-- | korganizer/calendarview.h | 1 | ||||
-rw-r--r-- | korganizer/koeventviewer.cpp | 29 | ||||
-rw-r--r-- | korganizer/koeventviewer.h | 1 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 14 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.h | 1 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 7 | ||||
-rw-r--r-- | korganizer/koviewmanager.h | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 16 | ||||
-rw-r--r-- | korganizer/navigatorbar.cpp | 15 |
10 files changed, 86 insertions, 10 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a330414..0015bd6 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -3414,33 +3414,42 @@ bool CalendarView::isReadOnly() | |||
3414 | { | 3414 | { |
3415 | return mReadOnly; | 3415 | return mReadOnly; |
3416 | } | 3416 | } |
3417 | 3417 | ||
3418 | void CalendarView::setReadOnly(bool readOnly) | 3418 | void CalendarView::setReadOnly(bool readOnly) |
3419 | { | 3419 | { |
3420 | if (mReadOnly != readOnly) { | 3420 | if (mReadOnly != readOnly) { |
3421 | mReadOnly = readOnly; | 3421 | mReadOnly = readOnly; |
3422 | emit readOnlyChanged(mReadOnly); | 3422 | emit readOnlyChanged(mReadOnly); |
3423 | } | 3423 | } |
3424 | } | 3424 | } |
3425 | 3425 | ||
3426 | bool CalendarView::isModified() | 3426 | bool CalendarView::isModified() |
3427 | { | 3427 | { |
3428 | return mModified; | 3428 | return mModified; |
3429 | } | 3429 | } |
3430 | 3430 | void CalendarView::slotprintSelInc() | |
3431 | { | ||
3432 | if ( currentSelection() == 0 ) { | ||
3433 | KMessageBox::sorry(this,i18n("There is nothing selected!")); | ||
3434 | return; | ||
3435 | } | ||
3436 | showIncidence(); | ||
3437 | getEventViewerDialog()->print(); | ||
3438 | |||
3439 | } | ||
3431 | void CalendarView::printSetup() | 3440 | void CalendarView::printSetup() |
3432 | { | 3441 | { |
3433 | #ifndef KORG_NOPRINTER | 3442 | #ifndef KORG_NOPRINTER |
3434 | createPrinter(); | 3443 | createPrinter(); |
3435 | 3444 | ||
3436 | mCalPrinter->setupPrinter(); | 3445 | mCalPrinter->setupPrinter(); |
3437 | #endif | 3446 | #endif |
3438 | } | 3447 | } |
3439 | 3448 | ||
3440 | void CalendarView::print() | 3449 | void CalendarView::print() |
3441 | { | 3450 | { |
3442 | #ifndef KORG_NOPRINTER | 3451 | #ifndef KORG_NOPRINTER |
3443 | createPrinter(); | 3452 | createPrinter(); |
3444 | 3453 | ||
3445 | DateList tmpDateList = mNavigator->selectedDates(); | 3454 | DateList tmpDateList = mNavigator->selectedDates(); |
3446 | mCalPrinter->print(CalPrinter::Month, | 3455 | mCalPrinter->print(CalPrinter::Month, |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 9782ffe..05a34b4 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -163,32 +163,33 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
163 | void pasteEnabled(bool); | 163 | void pasteEnabled(bool); |
164 | 164 | ||
165 | /** Emitted, when the number of incoming messages has changed. */ | 165 | /** Emitted, when the number of incoming messages has changed. */ |
166 | void numIncomingChanged(int); | 166 | void numIncomingChanged(int); |
167 | 167 | ||
168 | /** Emitted, when the number of outgoing messages has changed. */ | 168 | /** Emitted, when the number of outgoing messages has changed. */ |
169 | void numOutgoingChanged(int); | 169 | void numOutgoingChanged(int); |
170 | 170 | ||
171 | /** Send status message, which can e.g. be displayed in the status bar. */ | 171 | /** Send status message, which can e.g. be displayed in the status bar. */ |
172 | void statusMessage(const QString &); | 172 | void statusMessage(const QString &); |
173 | 173 | ||
174 | void calendarViewExpanded( bool ); | 174 | void calendarViewExpanded( bool ); |
175 | void updateSearchDialog(); | 175 | void updateSearchDialog(); |
176 | 176 | ||
177 | 177 | ||
178 | public slots: | 178 | public slots: |
179 | void slotprintSelInc(); | ||
179 | void showNextAlarms(); | 180 | void showNextAlarms(); |
180 | void showOpenError(); | 181 | void showOpenError(); |
181 | void watchSavedFile(); | 182 | void watchSavedFile(); |
182 | void recheckTimerAlarm(); | 183 | void recheckTimerAlarm(); |
183 | void checkNextTimerAlarm(); | 184 | void checkNextTimerAlarm(); |
184 | void addAlarm(const QDateTime &qdt, const QString ¬i ); | 185 | void addAlarm(const QDateTime &qdt, const QString ¬i ); |
185 | void addSuspendAlarm(const QDateTime &qdt, const QString ¬i ); | 186 | void addSuspendAlarm(const QDateTime &qdt, const QString ¬i ); |
186 | void removeAlarm(const QDateTime &qdt, const QString ¬i ); | 187 | void removeAlarm(const QDateTime &qdt, const QString ¬i ); |
187 | 188 | ||
188 | /** options dialog made a changed to the configuration. we catch this | 189 | /** options dialog made a changed to the configuration. we catch this |
189 | * and notify all widgets which need to update their configuration. */ | 190 | * and notify all widgets which need to update their configuration. */ |
190 | void updateConfig(); | 191 | void updateConfig(); |
191 | 192 | ||
192 | void insertBirthdays(const QString& uid, const QStringList& birthdayList, | 193 | void insertBirthdays(const QString& uid, const QStringList& birthdayList, |
193 | const QStringList& anniversaryList, const QStringList& realNameList, | 194 | const QStringList& anniversaryList, const QStringList& realNameList, |
194 | const QStringList& emailList, const QStringList& assembledNameList, | 195 | const QStringList& emailList, const QStringList& assembledNameList, |
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 1508638..445fc86 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -40,48 +40,77 @@ | |||
40 | #ifndef KORG_NODCOP | 40 | #ifndef KORG_NODCOP |
41 | #include <dcopclient.h> | 41 | #include <dcopclient.h> |
42 | #include "korganizer.h" | 42 | #include "korganizer.h" |
43 | #include "koprefs.h" | 43 | #include "koprefs.h" |
44 | #include "actionmanager.h" | 44 | #include "actionmanager.h" |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | #include "koeventviewer.h" | 47 | #include "koeventviewer.h" |
48 | //#ifndef KORG_NOKABC | 48 | //#ifndef KORG_NOKABC |
49 | //#include <kabc/stdaddressbook.h> | 49 | //#include <kabc/stdaddressbook.h> |
50 | //#define size count | 50 | //#define size count |
51 | //#endif | 51 | //#endif |
52 | 52 | ||
53 | #ifdef DESKTOP_VERSION | 53 | #ifdef DESKTOP_VERSION |
54 | #include <kabc/addresseedialog.h> | 54 | #include <kabc/addresseedialog.h> |
55 | #include <kabc/addresseeview.h> | 55 | #include <kabc/addresseeview.h> |
56 | #include <qprinter.h> | ||
57 | #include <qpainter.h> | ||
58 | #include <qpaintdevicemetrics.h> | ||
56 | #else //DESKTOP_VERSION | 59 | #else //DESKTOP_VERSION |
57 | #include <externalapphandler.h> | 60 | #include <externalapphandler.h> |
58 | #include <qtopia/qcopenvelope_qws.h> | 61 | #include <qtopia/qcopenvelope_qws.h> |
59 | #endif //DESKTOP_VERSION | 62 | #endif //DESKTOP_VERSION |
60 | 63 | ||
61 | KOEventViewer::KOEventViewer(QWidget *parent,const char *name) | 64 | KOEventViewer::KOEventViewer(QWidget *parent,const char *name) |
62 | : QTextBrowser(parent,name) | 65 | : QTextBrowser(parent,name) |
63 | { | 66 | { |
64 | mSyncMode = false; | 67 | mSyncMode = false; |
65 | mColorMode = 0; | 68 | mColorMode = 0; |
66 | } | 69 | } |
67 | 70 | ||
68 | KOEventViewer::~KOEventViewer() | 71 | KOEventViewer::~KOEventViewer() |
69 | { | 72 | { |
70 | } | 73 | } |
71 | 74 | ||
75 | void KOEventViewer::printMe() | ||
76 | { | ||
77 | #ifdef DESKTOP_VERSION | ||
78 | QPrinter printer; | ||
79 | if (!printer.setup() ) | ||
80 | return; | ||
81 | QPainter p; | ||
82 | p.begin ( &printer ); | ||
83 | QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer ); | ||
84 | float dx, dy; | ||
85 | int wid = (m.width() * 9)/10; | ||
86 | dx = (float) wid/(float)contentsWidth (); | ||
87 | dy = (float)(m.height()) / (float)contentsHeight (); | ||
88 | float scale; | ||
89 | // scale to fit the width or height of the paper | ||
90 | if ( dx < dy ) | ||
91 | scale = dx; | ||
92 | else | ||
93 | scale = dy; | ||
94 | p.translate( m.width()/10,0 ); | ||
95 | p.scale( scale, scale ); | ||
96 | drawContents ( &p, 0,0, contentsWidth (), contentsHeight () ); | ||
97 | p.end(); | ||
98 | #endif | ||
99 | |||
100 | } | ||
72 | void KOEventViewer::setSource(const QString& n) | 101 | void KOEventViewer::setSource(const QString& n) |
73 | { | 102 | { |
74 | 103 | ||
75 | if ( n.left(3) == "uid" ) | 104 | if ( n.left(3) == "uid" ) |
76 | #ifdef DESKTOP_VERSION | 105 | #ifdef DESKTOP_VERSION |
77 | { | 106 | { |
78 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); | 107 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); |
79 | KABC::AddressBook::Iterator it; | 108 | KABC::AddressBook::Iterator it; |
80 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { | 109 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { |
81 | // LR I do not understand, why the uid string is different on zaurus and desktop | 110 | // LR I do not understand, why the uid string is different on zaurus and desktop |
82 | QString uid = "uid://"+(*it).uid(); | 111 | QString uid = "uid://"+(*it).uid(); |
83 | 112 | ||
84 | //qDebug("for *%s* +%s+ ", n.latin1(), uid.latin1()); | 113 | //qDebug("for *%s* +%s+ ", n.latin1(), uid.latin1()); |
85 | if (n == uid ) { | 114 | if (n == uid ) { |
86 | //qDebug("found %s ",(*it).mobileHomePhone().latin1() ); | 115 | //qDebug("found %s ",(*it).mobileHomePhone().latin1() ); |
87 | QDialog dia( this,"dia123", true ); | 116 | QDialog dia( this,"dia123", true ); |
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index 47cc5e9..ca5bc15 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h | |||
@@ -39,32 +39,33 @@ class KOEventViewer : public QTextBrowser { | |||
39 | void setSource(const QString &); | 39 | void setSource(const QString &); |
40 | void setEvent(Event *event); | 40 | void setEvent(Event *event); |
41 | void addEvent(Event *event); | 41 | void addEvent(Event *event); |
42 | void setTodo(Todo *event, bool clearV = true ); | 42 | void setTodo(Todo *event, bool clearV = true ); |
43 | void setJournal(Journal *jour, bool clearV = true ); | 43 | void setJournal(Journal *jour, bool clearV = true ); |
44 | 44 | ||
45 | void appendEvent(Event *event, int mode = 0 ); | 45 | void appendEvent(Event *event, int mode = 0 ); |
46 | void appendTodo(Todo *event, int mode = 0 ); | 46 | void appendTodo(Todo *event, int mode = 0 ); |
47 | void appendJournal(Journal *jour, int mode = 0 ); | 47 | void appendJournal(Journal *jour, int mode = 0 ); |
48 | 48 | ||
49 | void clearEvents(bool now=false); | 49 | void clearEvents(bool now=false); |
50 | 50 | ||
51 | void addText(QString text); | 51 | void addText(QString text); |
52 | void setSyncMode( bool ); | 52 | void setSyncMode( bool ); |
53 | void setColorMode( int ); | 53 | void setColorMode( int ); |
54 | void mailToAttendees( bool all ); | 54 | void mailToAttendees( bool all ); |
55 | void printMe(); | ||
55 | 56 | ||
56 | protected: | 57 | protected: |
57 | int mColorMode; | 58 | int mColorMode; |
58 | void addTag(const QString & tag,const QString & text); | 59 | void addTag(const QString & tag,const QString & text); |
59 | 60 | ||
60 | void formatCategories(Incidence *event); | 61 | void formatCategories(Incidence *event); |
61 | void formatAttendees(Incidence *event); | 62 | void formatAttendees(Incidence *event); |
62 | void formatReadOnly(Incidence *event); | 63 | void formatReadOnly(Incidence *event); |
63 | void keyPressEvent ( QKeyEvent * e ); | 64 | void keyPressEvent ( QKeyEvent * e ); |
64 | 65 | ||
65 | private: | 66 | private: |
66 | QTextBrowser *mEventTextView; | 67 | QTextBrowser *mEventTextView; |
67 | bool mSyncMode; | 68 | bool mSyncMode; |
68 | QString deTag(QString text); | 69 | QString deTag(QString text); |
69 | 70 | ||
70 | QString mText; | 71 | QString mText; |
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index f734696..ec55cca 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp | |||
@@ -11,32 +11,33 @@ | |||
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <klocale.h> | 20 | #include <klocale.h> |
21 | 21 | ||
22 | #include <libkcal/event.h> | 22 | #include <libkcal/event.h> |
23 | #include <qtimer.h> | 23 | #include <qtimer.h> |
24 | #include <qpushbutton.h> | 24 | #include <qpushbutton.h> |
25 | 25 | ||
26 | #include "koeventviewer.h" | 26 | #include "koeventviewer.h" |
27 | #include <kmessagebox.h> | ||
27 | #include "koprefs.h" | 28 | #include "koprefs.h" |
28 | #include <libkcal/todo.h> | 29 | #include <libkcal/todo.h> |
29 | #include "qapp.h" | 30 | #include "qapp.h" |
30 | 31 | ||
31 | #include "koeventviewerdialog.h" | 32 | #include "koeventviewerdialog.h" |
32 | extern int globalFlagBlockAgenda; | 33 | extern int globalFlagBlockAgenda; |
33 | 34 | ||
34 | KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name) | 35 | KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name) |
35 | : KDialogBase(parent,name, | 36 | : KDialogBase(parent,name, |
36 | #ifndef DESKTOP_VERSION | 37 | #ifndef DESKTOP_VERSION |
37 | true , | 38 | true , |
38 | #else | 39 | #else |
39 | false, | 40 | false, |
40 | #endif | 41 | #endif |
41 | i18n("Event Viewer"),Ok|User1|Close,Close, false, i18n("Agenda")) | 42 | i18n("Event Viewer"),Ok|User1|Close,Close, false, i18n("Agenda")) |
42 | { | 43 | { |
@@ -77,32 +78,45 @@ void KOEventViewerDialog::showMe() | |||
77 | int x,y,w,h; | 78 | int x,y,w,h; |
78 | x = geometry().x(); | 79 | x = geometry().x(); |
79 | y = geometry().y(); | 80 | y = geometry().y(); |
80 | w = width(); | 81 | w = width(); |
81 | h = height(); | 82 | h = height(); |
82 | show(); | 83 | show(); |
83 | setGeometry(x,y,w,h); | 84 | setGeometry(x,y,w,h); |
84 | #else | 85 | #else |
85 | showMaximized(); | 86 | showMaximized(); |
86 | #endif | 87 | #endif |
87 | raise(); | 88 | raise(); |
88 | setActiveWindow(); | 89 | setActiveWindow(); |
89 | mEventViewer->setFocus(); | 90 | mEventViewer->setFocus(); |
90 | //raise(); | 91 | //raise(); |
91 | 92 | ||
92 | } | 93 | } |
94 | void KOEventViewerDialog::print() | ||
95 | { | ||
96 | qDebug("PRINT "); | ||
97 | int km = KMessageBox::warningContinueCancel(this,mIncidence->summary().left(35) + | ||
98 | i18n("\n\nDo you really want to print this item?"), | ||
99 | i18n("KO/Pi Print Confirmation"),i18n("Print")); | ||
100 | if ( km != KMessageBox::Continue ) { | ||
101 | qDebug("cancel "); | ||
102 | return; | ||
103 | } | ||
104 | mEventViewer->printMe(); | ||
105 | |||
106 | } | ||
93 | void KOEventViewerDialog::setSyncMode( bool b ) | 107 | void KOEventViewerDialog::setSyncMode( bool b ) |
94 | { | 108 | { |
95 | mSyncMode = b; | 109 | mSyncMode = b; |
96 | //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode ); | 110 | //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode ); |
97 | if ( mSyncMode ) { | 111 | if ( mSyncMode ) { |
98 | findButton( Close )->setText( i18n("Cancel Sync")); | 112 | findButton( Close )->setText( i18n("Cancel Sync")); |
99 | findButton( Ok )->setText( i18n("Remote")); | 113 | findButton( Ok )->setText( i18n("Remote")); |
100 | findButton( User1 )->setText( i18n("Local")); | 114 | findButton( User1 )->setText( i18n("Local")); |
101 | } else { | 115 | } else { |
102 | findButton( Close )->setText( i18n("Close")); | 116 | findButton( Close )->setText( i18n("Close")); |
103 | findButton( Ok )->setText( i18n("Edit")); | 117 | findButton( Ok )->setText( i18n("Edit")); |
104 | findButton( User1 )->setText( i18n("Agenda")); | 118 | findButton( User1 )->setText( i18n("Agenda")); |
105 | } | 119 | } |
106 | mEventViewer->setSyncMode( b ); | 120 | mEventViewer->setSyncMode( b ); |
107 | } | 121 | } |
108 | void KOEventViewerDialog::setColorMode( int m ) | 122 | void KOEventViewerDialog::setColorMode( int m ) |
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h index 36431ad..8e1cd44 100644 --- a/korganizer/koeventviewerdialog.h +++ b/korganizer/koeventviewerdialog.h | |||
@@ -38,32 +38,33 @@ class KOEventViewerDialog : public KDialogBase { | |||
38 | KOEventViewerDialog(QWidget *parent=0,const char *name=0); | 38 | KOEventViewerDialog(QWidget *parent=0,const char *name=0); |
39 | virtual ~KOEventViewerDialog(); | 39 | virtual ~KOEventViewerDialog(); |
40 | 40 | ||
41 | void setEvent(Event *event); | 41 | void setEvent(Event *event); |
42 | void addEvent(Event *event); | 42 | void addEvent(Event *event); |
43 | void setTodo(Todo *event); | 43 | void setTodo(Todo *event); |
44 | void setJournal(Journal *journal); | 44 | void setJournal(Journal *journal); |
45 | void setIncidence(Incidence *inc); | 45 | void setIncidence(Incidence *inc); |
46 | void addIncidence(Incidence *inc); | 46 | void addIncidence(Incidence *inc); |
47 | void addText(QString text); | 47 | void addText(QString text); |
48 | void showMe(); | 48 | void showMe(); |
49 | void setSyncMode( bool ); | 49 | void setSyncMode( bool ); |
50 | void setColorMode( int m ); | 50 | void setColorMode( int m ); |
51 | int executeS( bool ); | 51 | int executeS( bool ); |
52 | public slots: | 52 | public slots: |
53 | void updateConfig(); | 53 | void updateConfig(); |
54 | void print(); | ||
54 | signals: | 55 | signals: |
55 | void editIncidence( Incidence* ); | 56 | void editIncidence( Incidence* ); |
56 | void jumpToTime( const QDate &); | 57 | void jumpToTime( const QDate &); |
57 | void showAgendaView( bool ); | 58 | void showAgendaView( bool ); |
58 | void todoCompleted(Todo*); | 59 | void todoCompleted(Todo*); |
59 | void signalViewerClosed(); | 60 | void signalViewerClosed(); |
60 | private slots: | 61 | private slots: |
61 | void slotViewerClosed(); | 62 | void slotViewerClosed(); |
62 | void editIncidence(); | 63 | void editIncidence(); |
63 | void showIncidence(); | 64 | void showIncidence(); |
64 | protected: | 65 | protected: |
65 | void hideEvent ( QHideEvent * e ); | 66 | void hideEvent ( QHideEvent * e ); |
66 | private: | 67 | private: |
67 | bool sendSignalViewerClosed; | 68 | bool sendSignalViewerClosed; |
68 | bool mSyncMode; | 69 | bool mSyncMode; |
69 | int mSyncResult; | 70 | int mSyncResult; |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index e80b3fc..8752636 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -369,32 +369,39 @@ void KOViewManager::showWhatsNextView() | |||
369 | { | 369 | { |
370 | if (!mWhatsNextView) { | 370 | if (!mWhatsNextView) { |
371 | mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(), | 371 | mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(), |
372 | "KOViewManager::WhatsNextView"); | 372 | "KOViewManager::WhatsNextView"); |
373 | mWhatsNextView->setEventViewer( mMainView->getEventViewerDialog()); | 373 | mWhatsNextView->setEventViewer( mMainView->getEventViewerDialog()); |
374 | connect(mMainView, SIGNAL(configChanged()), mWhatsNextView, SLOT(updateConfig())); | 374 | connect(mMainView, SIGNAL(configChanged()), mWhatsNextView, SLOT(updateConfig())); |
375 | addView(mWhatsNextView); | 375 | addView(mWhatsNextView); |
376 | connect(this, SIGNAL( printWNV() ), | 376 | connect(this, SIGNAL( printWNV() ), |
377 | mWhatsNextView, SLOT( printMe() ) ); | 377 | mWhatsNextView, SLOT( printMe() ) ); |
378 | } | 378 | } |
379 | globalFlagBlockAgenda = 1; | 379 | globalFlagBlockAgenda = 1; |
380 | showView(mWhatsNextView, true ); | 380 | showView(mWhatsNextView, true ); |
381 | //mWhatsNextView->updateView(); | 381 | //mWhatsNextView->updateView(); |
382 | 382 | ||
383 | } | 383 | } |
384 | 384 | ||
385 | void KOViewManager::slotprintWNV() | ||
386 | { | ||
387 | if (!mWhatsNextView) | ||
388 | showWhatsNextView(); | ||
389 | emit printWNV(); | ||
390 | |||
391 | } | ||
385 | void KOViewManager::showListView() | 392 | void KOViewManager::showListView() |
386 | { | 393 | { |
387 | if (!mListView) { | 394 | if (!mListView) { |
388 | mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView"); | 395 | mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView"); |
389 | addView(mListView); | 396 | addView(mListView); |
390 | 397 | ||
391 | connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)), | 398 | connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)), |
392 | mMainView, SLOT(showIncidence(Incidence *))); | 399 | mMainView, SLOT(showIncidence(Incidence *))); |
393 | connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)), | 400 | connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)), |
394 | mMainView, SLOT(editIncidence(Incidence *))); | 401 | mMainView, SLOT(editIncidence(Incidence *))); |
395 | connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 402 | connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
396 | mMainView, SLOT(deleteIncidence(Incidence *))); | 403 | mMainView, SLOT(deleteIncidence(Incidence *))); |
397 | connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ), | 404 | connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ), |
398 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 405 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
399 | connect( mListView, SIGNAL( signalNewEvent() ), | 406 | connect( mListView, SIGNAL( signalNewEvent() ), |
400 | mMainView, SLOT( newEvent() ) ); | 407 | mMainView, SLOT( newEvent() ) ); |
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h index d829f14..1d565a6 100644 --- a/korganizer/koviewmanager.h +++ b/korganizer/koviewmanager.h | |||
@@ -69,32 +69,33 @@ class KOViewManager : public QObject | |||
69 | void updateView( const QDate &start, const QDate &end ); | 69 | void updateView( const QDate &start, const QDate &end ); |
70 | 70 | ||
71 | void raiseCurrentView( bool fullScreen = false , bool updateView = false); | 71 | void raiseCurrentView( bool fullScreen = false , bool updateView = false); |
72 | 72 | ||
73 | void addView(KOrg::BaseView *); | 73 | void addView(KOrg::BaseView *); |
74 | 74 | ||
75 | Incidence *currentSelection(); | 75 | Incidence *currentSelection(); |
76 | QDate currentSelectionDate(); | 76 | QDate currentSelectionDate(); |
77 | 77 | ||
78 | KOAgendaView *agendaView() const { return mAgendaView; } | 78 | KOAgendaView *agendaView() const { return mAgendaView; } |
79 | 79 | ||
80 | signals: | 80 | signals: |
81 | void printWNV(); | 81 | void printWNV(); |
82 | void signalFullScreen( bool ); | 82 | void signalFullScreen( bool ); |
83 | void signalAgendaView( bool ); | 83 | void signalAgendaView( bool ); |
84 | public slots: | 84 | public slots: |
85 | void slotprintWNV(); | ||
85 | void showNextView(); | 86 | void showNextView(); |
86 | void showMonth( const QDate & ); | 87 | void showMonth( const QDate & ); |
87 | void showDateView( int, QDate ); | 88 | void showDateView( int, QDate ); |
88 | void updateView(); | 89 | void updateView(); |
89 | void showWhatsNextView(); | 90 | void showWhatsNextView(); |
90 | void showListView(); | 91 | void showListView(); |
91 | void showAgendaView( bool fullScreen = false ); | 92 | void showAgendaView( bool fullScreen = false ); |
92 | void showDayView(); | 93 | void showDayView(); |
93 | void showWorkWeekView(); | 94 | void showWorkWeekView(); |
94 | void showWeekView(); | 95 | void showWeekView(); |
95 | void showNextXView(); | 96 | void showNextXView(); |
96 | void showMonthView(); | 97 | void showMonthView(); |
97 | void showMonthViewWeek(); | 98 | void showMonthViewWeek(); |
98 | void showTodoView(); | 99 | void showTodoView(); |
99 | void showJournalView(); | 100 | void showJournalView(); |
100 | void showTimeSpanView(); | 101 | void showTimeSpanView(); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index a4e0834..ad1c0cd 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -172,33 +172,37 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
172 | tbd = Bottom; | 172 | tbd = Bottom; |
173 | else | 173 | else |
174 | tbd = Top; | 174 | tbd = Top; |
175 | } | 175 | } |
176 | else { | 176 | else { |
177 | if ( p->mToolBarUpF ) | 177 | if ( p->mToolBarUpF ) |
178 | tbd = Right; | 178 | tbd = Right; |
179 | else | 179 | else |
180 | tbd = Left; | 180 | tbd = Left; |
181 | } | 181 | } |
182 | filterToolBar = new QPEToolBar ( this ); | 182 | filterToolBar = new QPEToolBar ( this ); |
183 | filterMenubar = new QPEMenuBar( filterToolBar ); | 183 | filterMenubar = new QPEMenuBar( filterToolBar ); |
184 | QFontMetrics fm ( filterMenubar->font() ); | 184 | QFontMetrics fm ( filterMenubar->font() ); |
185 | 185 | ||
186 | filterPopupMenu = new QPopupMenu( this ); | 186 | filterPopupMenu = new QPopupMenu( this ); |
187 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); | 187 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); |
188 | filterMenubar->setFixedWidth( fm.width( i18n("No Filter")+"Ax" ) ); | 188 | QString addTest = "Ax"; |
189 | #ifdef DESKTOP_VERSION | ||
190 | addTest = "AAAx"; | ||
191 | #endif | ||
192 | filterMenubar->setFixedWidth( fm.width( i18n("No Filter")+addTest ) ); | ||
189 | addToolBar (filterToolBar , tbd ); | 193 | addToolBar (filterToolBar , tbd ); |
190 | connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) ); | 194 | connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) ); |
191 | connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); | 195 | connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); |
192 | } else { | 196 | } else { |
193 | filterToolBar = 0; | 197 | filterToolBar = 0; |
194 | filterMenubar = 0; | 198 | filterMenubar = 0; |
195 | filterPopupMenu = 0; | 199 | filterPopupMenu = 0; |
196 | } | 200 | } |
197 | if ( p->mShowIconOnetoolbar ) { | 201 | if ( p->mShowIconOnetoolbar ) { |
198 | viewToolBar = iconToolBar ; | 202 | viewToolBar = iconToolBar ; |
199 | navigatorToolBar = iconToolBar ; | 203 | navigatorToolBar = iconToolBar ; |
200 | } else { | 204 | } else { |
201 | if ( p->mToolBarHorV ) { | 205 | if ( p->mToolBarHorV ) { |
202 | if ( p->mToolBarUpV ) | 206 | if ( p->mToolBarUpV ) |
203 | tbd = Bottom; | 207 | tbd = Bottom; |
204 | else | 208 | else |
@@ -335,32 +339,33 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
335 | 339 | ||
336 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); | 340 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); |
337 | if ( showWarning ) { | 341 | if ( showWarning ) { |
338 | KMessageBox::information( this, | 342 | KMessageBox::information( this, |
339 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); | 343 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); |
340 | qApp->processEvents(); | 344 | qApp->processEvents(); |
341 | mView->dialogManager()->showSyncOptions(); | 345 | mView->dialogManager()->showSyncOptions(); |
342 | } | 346 | } |
343 | 347 | ||
344 | //US listen for result adressed from Ka/Pi | 348 | //US listen for result adressed from Ka/Pi |
345 | #ifndef DESKTOP_VERSION | 349 | #ifndef DESKTOP_VERSION |
346 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 350 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
347 | #endif | 351 | #endif |
348 | #ifndef DESKTOP_VERSION | 352 | #ifndef DESKTOP_VERSION |
349 | infrared = 0; | 353 | infrared = 0; |
350 | #endif | 354 | #endif |
355 | updateFilterToolbar(); | ||
351 | updateWeek( mView->startDate() ); | 356 | updateWeek( mView->startDate() ); |
352 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | 357 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), |
353 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); | 358 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); |
354 | mBRdisabled = false; | 359 | mBRdisabled = false; |
355 | //toggleBeamReceive(); | 360 | //toggleBeamReceive(); |
356 | } | 361 | } |
357 | MainWindow::~MainWindow() | 362 | MainWindow::~MainWindow() |
358 | { | 363 | { |
359 | //qDebug("MainWindow::~MainWindow() "); | 364 | //qDebug("MainWindow::~MainWindow() "); |
360 | //save toolbar location | 365 | //save toolbar location |
361 | delete mCalendar; | 366 | delete mCalendar; |
362 | delete mSyncManager; | 367 | delete mSyncManager; |
363 | #ifndef DESKTOP_VERSION | 368 | #ifndef DESKTOP_VERSION |
364 | if ( infrared ) | 369 | if ( infrared ) |
365 | delete infrared; | 370 | delete infrared; |
366 | #endif | 371 | #endif |
@@ -979,33 +984,40 @@ void MainWindow::initActions() | |||
979 | #else | 984 | #else |
980 | //importMenu->insertSeparator(); | 985 | //importMenu->insertSeparator(); |
981 | icon = loadPixmap( pathString + "print" ); | 986 | icon = loadPixmap( pathString + "print" ); |
982 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); | 987 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); |
983 | action->addTo( beamMenu_X ); | 988 | action->addTo( beamMenu_X ); |
984 | connect( action, SIGNAL( activated() ), | 989 | connect( action, SIGNAL( activated() ), |
985 | this, SLOT( printCal() ) ); | 990 | this, SLOT( printCal() ) ); |
986 | 991 | ||
987 | icon = loadPixmap( pathString + "print" ); | 992 | icon = loadPixmap( pathString + "print" ); |
988 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); | 993 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); |
989 | action->addTo( beamMenu_X ); | 994 | action->addTo( beamMenu_X ); |
990 | connect( action, SIGNAL( activated() ), | 995 | connect( action, SIGNAL( activated() ), |
991 | this, SLOT( printSel() ) ); | 996 | this, SLOT( printSel() ) ); |
992 | action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); | 997 | action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); |
993 | action->addTo( beamMenu_X ); | 998 | action->addTo( beamMenu_X ); |
994 | connect( action, SIGNAL( activated() ), | 999 | connect( action, SIGNAL( activated() ), |
995 | mView->viewManager(), SIGNAL( printWNV() ) ); | 1000 | mView->viewManager(), SLOT( slotprintWNV() ) ); |
1001 | |||
1002 | action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); | ||
1003 | action->addTo( beamMenu_X ); | ||
1004 | connect( action, SIGNAL( activated() ), | ||
1005 | mView, SLOT( slotprintSelInc() ) ); | ||
1006 | |||
1007 | |||
996 | importMenu->insertItem( i18n("Print"), beamMenu_X ); | 1008 | importMenu->insertItem( i18n("Print"), beamMenu_X ); |
997 | #endif | 1009 | #endif |
998 | importMenu->insertSeparator(); | 1010 | importMenu->insertSeparator(); |
999 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | 1011 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, |
1000 | this ); | 1012 | this ); |
1001 | action->addTo( importMenu ); | 1013 | action->addTo( importMenu ); |
1002 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | 1014 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); |
1003 | importMenu->insertSeparator(); | 1015 | importMenu->insertSeparator(); |
1004 | action = new QAction( "beam all", i18n("Save"), 0, | 1016 | action = new QAction( "beam all", i18n("Save"), 0, |
1005 | this ); | 1017 | this ); |
1006 | action->addTo( importMenu ); | 1018 | action->addTo( importMenu ); |
1007 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); | 1019 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); |
1008 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, | 1020 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, |
1009 | this ); | 1021 | this ); |
1010 | action->addTo( importMenu ); | 1022 | action->addTo( importMenu ); |
1011 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); | 1023 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); |
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 49149f2..0610d55 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp | |||
@@ -100,32 +100,39 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam | |||
100 | QToolTip::add( mNextYear, i18n("Next Year") ); | 100 | QToolTip::add( mNextYear, i18n("Next Year") ); |
101 | mSelectMonth = new QPushButton( mCtrlFrame ); | 101 | mSelectMonth = new QPushButton( mCtrlFrame ); |
102 | // Create month name label | 102 | // Create month name label |
103 | //selectMonth->setFont( tfont ); | 103 | //selectMonth->setFont( tfont ); |
104 | // selectMonth->setAlignment( AlignCenter ); | 104 | // selectMonth->setAlignment( AlignCenter ); |
105 | //mDateLabel = new QLabel( selectMonth ); | 105 | //mDateLabel = new QLabel( selectMonth ); |
106 | //mDateLabel->setFont( tfont ); | 106 | //mDateLabel->setFont( tfont ); |
107 | //mDateLabel->setAlignment( AlignCenter ); | 107 | //mDateLabel->setAlignment( AlignCenter ); |
108 | if ( QString ( name ) == QString("useBigPixmaps") ) { | 108 | if ( QString ( name ) == QString("useBigPixmaps") ) { |
109 | mNextMonth->setFlat( true); | 109 | mNextMonth->setFlat( true); |
110 | mNextWeek->setFlat( true); | 110 | mNextWeek->setFlat( true); |
111 | mNextYear->setFlat( true); | 111 | mNextYear->setFlat( true); |
112 | mSelectMonth->setFlat( true); | 112 | mSelectMonth->setFlat( true); |
113 | mPrevYear->setFlat( true); | 113 | mPrevYear->setFlat( true); |
114 | mPrevMonth->setFlat( true); | 114 | mPrevMonth->setFlat( true); |
115 | mPrevWeek->setFlat( true); | 115 | mPrevWeek->setFlat( true); |
116 | |||
117 | mPrevYear->setAutoRepeat( true ); | ||
118 | mPrevMonth->setAutoRepeat( true ); | ||
119 | mNextMonth->setAutoRepeat( true ); | ||
120 | mPrevWeek->setAutoRepeat( true ); | ||
121 | mNextWeek->setAutoRepeat( true ); | ||
122 | mNextYear->setAutoRepeat( true ); | ||
116 | } else { | 123 | } else { |
117 | mPrevWeek->hide(); | 124 | mPrevWeek->hide(); |
118 | mNextWeek->hide(); | 125 | mNextWeek->hide(); |
119 | } | 126 | } |
120 | 127 | ||
121 | resetFont( font() ); | 128 | resetFont( font() ); |
122 | 129 | ||
123 | 130 | ||
124 | // set up control frame layout | 131 | // set up control frame layout |
125 | QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 ); | 132 | QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 ); |
126 | ctrlLayout->addWidget( mPrevYear, 3 ); | 133 | ctrlLayout->addWidget( mPrevYear, 3 ); |
127 | ctrlLayout->addWidget( mPrevMonth, 3 ); | 134 | ctrlLayout->addWidget( mPrevMonth, 3 ); |
128 | ctrlLayout->addWidget( mPrevWeek, 3 ); | 135 | ctrlLayout->addWidget( mPrevWeek, 3 ); |
129 | //ctrlLayout->addStretch( 1 ); | 136 | //ctrlLayout->addStretch( 1 ); |
130 | // ctrlLayout->addSpacing( 1 ); | 137 | // ctrlLayout->addSpacing( 1 ); |
131 | // ctrlLayout->addWidget( mDateLabel ); | 138 | // ctrlLayout->addWidget( mDateLabel ); |
@@ -138,39 +145,33 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam | |||
138 | 145 | ||
139 | connect( mPrevYear, SIGNAL( clicked() ), SIGNAL( goPrevYear() ) ); | 146 | connect( mPrevYear, SIGNAL( clicked() ), SIGNAL( goPrevYear() ) ); |
140 | connect( mPrevMonth, SIGNAL( clicked() ), SIGNAL( goPrevMonth() ) ); | 147 | connect( mPrevMonth, SIGNAL( clicked() ), SIGNAL( goPrevMonth() ) ); |
141 | connect( mNextMonth, SIGNAL( clicked() ), SIGNAL( goNextMonth() ) ); | 148 | connect( mNextMonth, SIGNAL( clicked() ), SIGNAL( goNextMonth() ) ); |
142 | connect( mPrevWeek, SIGNAL( clicked() ), SIGNAL( goPrevWeek() ) ); | 149 | connect( mPrevWeek, SIGNAL( clicked() ), SIGNAL( goPrevWeek() ) ); |
143 | connect( mNextWeek, SIGNAL( clicked() ), SIGNAL( goNextWeek() ) ); | 150 | connect( mNextWeek, SIGNAL( clicked() ), SIGNAL( goNextWeek() ) ); |
144 | connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) ); | 151 | connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) ); |
145 | connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) ); | 152 | connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) ); |
146 | mPrevYear->setFocusPolicy(NoFocus); | 153 | mPrevYear->setFocusPolicy(NoFocus); |
147 | mPrevMonth->setFocusPolicy(NoFocus); | 154 | mPrevMonth->setFocusPolicy(NoFocus); |
148 | mNextMonth->setFocusPolicy(NoFocus); | 155 | mNextMonth->setFocusPolicy(NoFocus); |
149 | mPrevWeek->setFocusPolicy(NoFocus); | 156 | mPrevWeek->setFocusPolicy(NoFocus); |
150 | mNextWeek->setFocusPolicy(NoFocus); | 157 | mNextWeek->setFocusPolicy(NoFocus); |
151 | mNextYear->setFocusPolicy(NoFocus); | 158 | mNextYear->setFocusPolicy(NoFocus); |
152 | mSelectMonth->setFocusPolicy(NoFocus); | 159 | mSelectMonth->setFocusPolicy(NoFocus); |
153 | setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); | 160 | setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); |
154 | mPrevYear->setAutoRepeat( true ); | 161 | |
155 | mPrevMonth->setAutoRepeat( true ); | ||
156 | mNextMonth->setAutoRepeat( true ); | ||
157 | mPrevWeek->setAutoRepeat( true ); | ||
158 | mNextWeek->setAutoRepeat( true ); | ||
159 | mNextYear->setAutoRepeat( true ); | ||
160 | |||
161 | } | 162 | } |
162 | 163 | ||
163 | NavigatorBar::~NavigatorBar() | 164 | NavigatorBar::~NavigatorBar() |
164 | { | 165 | { |
165 | } | 166 | } |
166 | QSize NavigatorBar::sizeHint() const | 167 | QSize NavigatorBar::sizeHint() const |
167 | { | 168 | { |
168 | int wid = mCurrentMinWid ; | 169 | int wid = mCurrentMinWid ; |
169 | if ( mPrevYear->isVisible() ) | 170 | if ( mPrevYear->isVisible() ) |
170 | wid += mCurrentButtonMinWid; | 171 | wid += mCurrentButtonMinWid; |
171 | if ( mPrevMonth->isVisible() ) | 172 | if ( mPrevMonth->isVisible() ) |
172 | wid += mCurrentButtonMinWid; | 173 | wid += mCurrentButtonMinWid; |
173 | if ( mPrevWeek->isVisible() ) | 174 | if ( mPrevWeek->isVisible() ) |
174 | wid += mCurrentButtonMinWid; | 175 | wid += mCurrentButtonMinWid; |
175 | if ( mNextMonth->isVisible() ) | 176 | if ( mNextMonth->isVisible() ) |
176 | wid += mCurrentButtonMinWid; | 177 | wid += mCurrentButtonMinWid; |