author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /korganizer/mainwindow.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | korganizer/mainwindow.cpp | 316 |
1 files changed, 163 insertions, 153 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 69ccde1..2004939 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -3,5 +3,6 @@ | |||
3 | #include <qaction.h> | 3 | #include <qaction.h> |
4 | #include <qpopupmenu.h> | 4 | #include <Q3Action> |
5 | #include <q3popupmenu.h> | ||
5 | #include <qpainter.h> | 6 | #include <qpainter.h> |
6 | #include <qwhatsthis.h> | 7 | #include <q3whatsthis.h> |
7 | #include <qpushbutton.h> | 8 | #include <qpushbutton.h> |
@@ -12,3 +13,3 @@ | |||
12 | #include <qdir.h> | 13 | #include <qdir.h> |
13 | #include <qapp.h> | 14 | #include <qapplication.h> |
14 | #include <qfileinfo.h> | 15 | #include <qfileinfo.h> |
@@ -18,5 +19,5 @@ | |||
18 | #include <qmap.h> | 19 | #include <qmap.h> |
19 | #include <qwmatrix.h> | 20 | #include <qmatrix.h> |
20 | #include <qtextbrowser.h> | 21 | #include <q3textbrowser.h> |
21 | #include <qtextstream.h> | 22 | #include <q3textstream.h> |
22 | #ifndef DESKTOP_VERSION | 23 | #ifndef DESKTOP_VERSION |
@@ -30,4 +31,13 @@ | |||
30 | #else | 31 | #else |
31 | #include <qtoolbar.h> | 32 | #include <q3toolbar.h> |
32 | #include <qapplication.h> | 33 | #include <qapplication.h> |
34 | //Added by qt3to4: | ||
35 | #include <QResizeEvent> | ||
36 | #include <QPixmap> | ||
37 | #include <QCloseEvent> | ||
38 | #include <QKeyEvent> | ||
39 | #include <Q3VBoxLayout> | ||
40 | #include <QHideEvent> | ||
41 | #include <Q3CString> | ||
42 | #include <Q3PtrList> | ||
33 | //#include <resource.h> | 43 | //#include <resource.h> |
@@ -82,3 +92,3 @@ class KOex2phonePrefs : public QDialog | |||
82 | setCaption( i18n("Export to phone options") ); | 92 | setCaption( i18n("Export to phone options") ); |
83 | QVBoxLayout* lay = new QVBoxLayout( this ); | 93 | Q3VBoxLayout* lay = new Q3VBoxLayout( this ); |
84 | lay->setSpacing( 3 ); | 94 | lay->setSpacing( 3 ); |
@@ -87,5 +97,5 @@ class KOex2phonePrefs : public QDialog | |||
87 | lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) ); | 97 | lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) ); |
88 | lab->setAlignment (AlignHCenter ); | 98 | lab->setAlignment (Qt::AlignHCenter ); |
89 | QHBox* temphb; | 99 | Q3HBox* temphb; |
90 | temphb = new QHBox( this ); | 100 | temphb = new Q3HBox( this ); |
91 | new QLabel( i18n("I/O device: "), temphb ); | 101 | new QLabel( i18n("I/O device: "), temphb ); |
@@ -93,3 +103,3 @@ class KOex2phonePrefs : public QDialog | |||
93 | lay->addWidget( temphb ); | 103 | lay->addWidget( temphb ); |
94 | temphb = new QHBox( this ); | 104 | temphb = new Q3HBox( this ); |
95 | new QLabel( i18n("Connection: "), temphb ); | 105 | new QLabel( i18n("Connection: "), temphb ); |
@@ -97,3 +107,3 @@ class KOex2phonePrefs : public QDialog | |||
97 | lay->addWidget( temphb ); | 107 | lay->addWidget( temphb ); |
98 | temphb = new QHBox( this ); | 108 | temphb = new Q3HBox( this ); |
99 | new QLabel( i18n("Model(opt.): "), temphb ); | 109 | new QLabel( i18n("Model(opt.): "), temphb ); |
@@ -104,3 +114,3 @@ class KOex2phonePrefs : public QDialog | |||
104 | lay->addWidget( mWriteBackFuture ); | 114 | lay->addWidget( mWriteBackFuture ); |
105 | temphb = new QHBox( this ); | 115 | temphb = new Q3HBox( this ); |
106 | new QLabel( i18n("Max. weeks in future: ") , temphb ); | 116 | new QLabel( i18n("Max. weeks in future: ") , temphb ); |
@@ -110,3 +120,3 @@ class KOex2phonePrefs : public QDialog | |||
110 | lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) ); | 120 | lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) ); |
111 | lab->setAlignment (AlignHCenter ); | 121 | lab->setAlignment (Qt::AlignHCenter ); |
112 | QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this ); | 122 | QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this ); |
@@ -136,3 +146,3 @@ int globalFlagBlockStartup; | |||
136 | MainWindow::MainWindow( QWidget *parent, const char *name ) : | 146 | MainWindow::MainWindow( QWidget *parent, const char *name ) : |
137 | QMainWindow( parent, name ) | 147 | Q3MainWindow( parent, name ) |
138 | { | 148 | { |
@@ -187,8 +197,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
187 | p->mHourSize = 22; | 197 | p->mHourSize = 22; |
188 | QMainWindow::ToolBarDock tbd; | 198 | Qt::ToolBarDock tbd; |
189 | if ( p->mToolBarHor ) { | 199 | if ( p->mToolBarHor ) { |
190 | if ( p->mToolBarUp ) | 200 | if ( p->mToolBarUp ) |
191 | tbd = Bottom; | 201 | tbd = Qt::Bottom; |
192 | else | 202 | else |
193 | tbd = Top; | 203 | tbd = Qt::Top; |
194 | } | 204 | } |
@@ -196,5 +206,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
196 | if ( p->mToolBarUp ) | 206 | if ( p->mToolBarUp ) |
197 | tbd = Right; | 207 | tbd = Qt::Right; |
198 | else | 208 | else |
199 | tbd = Left; | 209 | tbd = Qt::Left; |
200 | } | 210 | } |
@@ -215,5 +225,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
215 | if ( p->mToolBarUpF ) | 225 | if ( p->mToolBarUpF ) |
216 | tbd = Bottom; | 226 | tbd = Qt::Bottom; |
217 | else | 227 | else |
218 | tbd = Top; | 228 | tbd = Qt::Top; |
219 | } | 229 | } |
@@ -221,5 +231,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
221 | if ( p->mToolBarUpF ) | 231 | if ( p->mToolBarUpF ) |
222 | tbd = Right; | 232 | tbd = Qt::Right; |
223 | else | 233 | else |
224 | tbd = Left; | 234 | tbd = Qt::Left; |
225 | } | 235 | } |
@@ -232,3 +242,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
232 | #endif | 242 | #endif |
233 | filterPopupMenu = new QPopupMenu( this ); | 243 | filterPopupMenu = new Q3PopupMenu( this ); |
234 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); | 244 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); |
@@ -261,5 +271,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
261 | if ( p->mToolBarUpV ) | 271 | if ( p->mToolBarUpV ) |
262 | tbd = Bottom; | 272 | tbd = Qt::Bottom; |
263 | else | 273 | else |
264 | tbd = Top; | 274 | tbd = Qt::Top; |
265 | } | 275 | } |
@@ -267,5 +277,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
267 | if ( p->mToolBarUpV ) | 277 | if ( p->mToolBarUpV ) |
268 | tbd = Right; | 278 | tbd = Qt::Right; |
269 | else | 279 | else |
270 | tbd = Left; | 280 | tbd = Qt::Left; |
271 | } | 281 | } |
@@ -275,5 +285,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
275 | if ( p->mToolBarUpN ) | 285 | if ( p->mToolBarUpN ) |
276 | tbd = Bottom; | 286 | tbd = Qt::Bottom; |
277 | else | 287 | else |
278 | tbd = Top; | 288 | tbd = Qt::Top; |
279 | } | 289 | } |
@@ -281,5 +291,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
281 | if ( p->mToolBarUpN ) | 291 | if ( p->mToolBarUpN ) |
282 | tbd = Right; | 292 | tbd = Qt::Right; |
283 | else | 293 | else |
284 | tbd = Left; | 294 | tbd = Qt::Left; |
285 | } | 295 | } |
@@ -442,5 +452,5 @@ void MainWindow::loadDataAfterStart() | |||
442 | #ifndef DESKTOP_VERSION | 452 | #ifndef DESKTOP_VERSION |
443 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 453 | connect(qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const Q3CString &, const QByteArray & ))); |
444 | connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& ))); | 454 | connect( qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), this, SLOT(recieve( const Q3CString&, const QByteArray& ))); |
445 | disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& ))); | 455 | disconnect( qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), this, SLOT(receiveStart( const Q3CString&, const QByteArray& ))); |
446 | if ( !mCStringMess.isEmpty() ) | 456 | if ( !mCStringMess.isEmpty() ) |
@@ -511,3 +521,3 @@ void MainWindow::toggleBeamReceive() | |||
511 | infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ; | 521 | infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ; |
512 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve( const QCString&, const QByteArray& ))); | 522 | QObject::connect( infrared, SIGNAL (received ( const Q3CString &, const QByteArray & )),this, SLOT(recieve( const Q3CString&, const QByteArray& ))); |
513 | #endif | 523 | #endif |
@@ -602,3 +612,3 @@ void MainWindow::closeEvent( QCloseEvent* ce ) | |||
602 | } | 612 | } |
603 | void MainWindow::receiveStart( const QCString& cmsg, const QByteArray& data ) | 613 | void MainWindow::receiveStart( const Q3CString& cmsg, const QByteArray& data ) |
604 | { | 614 | { |
@@ -608,5 +618,5 @@ void MainWindow::receiveStart( const QCString& cmsg, const QByteArray& data ) | |||
608 | } | 618 | } |
609 | void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) | 619 | void MainWindow::recieve( const Q3CString& cmsg, const QByteArray& data ) |
610 | { | 620 | { |
611 | QDataStream stream( data, IO_ReadOnly ); | 621 | QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly ); |
612 | // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" ); | 622 | // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" ); |
@@ -617,3 +627,3 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) | |||
617 | if ( cmsg == "setDocument(QString)" ) { | 627 | if ( cmsg == "setDocument(QString)" ) { |
618 | QDataStream stream( data, IO_ReadOnly ); | 628 | QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly ); |
619 | QString fileName; | 629 | QString fileName; |
@@ -746,17 +756,17 @@ void MainWindow::initActions() | |||
746 | 756 | ||
747 | QPopupMenu *viewMenu = new QPopupMenu( this ); | 757 | Q3PopupMenu *viewMenu = new Q3PopupMenu( this ); |
748 | QPopupMenu *actionMenu = new QPopupMenu( this ); | 758 | Q3PopupMenu *actionMenu = new Q3PopupMenu( this ); |
749 | mCurrentItemMenu = new QPopupMenu ( this ); | 759 | mCurrentItemMenu = new Q3PopupMenu ( this ); |
750 | QPopupMenu *nextConflictMenu = new QPopupMenu ( this ); | 760 | Q3PopupMenu *nextConflictMenu = new Q3PopupMenu ( this ); |
751 | QPopupMenu *importMenu = new QPopupMenu( this ); | 761 | Q3PopupMenu *importMenu = new Q3PopupMenu( this ); |
752 | QPopupMenu *importMenu_X = new QPopupMenu( this ); | 762 | Q3PopupMenu *importMenu_X = new Q3PopupMenu( this ); |
753 | QPopupMenu *exportMenu_X = new QPopupMenu( this ); | 763 | Q3PopupMenu *exportMenu_X = new Q3PopupMenu( this ); |
754 | QPopupMenu *beamMenu_X = new QPopupMenu( this ); | 764 | Q3PopupMenu *beamMenu_X = new Q3PopupMenu( this ); |
755 | selectFilterMenu = new QPopupMenu( this ); | 765 | selectFilterMenu = new Q3PopupMenu( this ); |
756 | selectFilterMenu->setCheckable( true ); | 766 | selectFilterMenu->setCheckable( true ); |
757 | syncMenu = new QPopupMenu( this ); | 767 | syncMenu = new Q3PopupMenu( this ); |
758 | configureAgendaMenu = new QPopupMenu( this ); | 768 | configureAgendaMenu = new Q3PopupMenu( this ); |
759 | configureToolBarMenu = new QPopupMenu( this ); | 769 | configureToolBarMenu = new Q3PopupMenu( this ); |
760 | QPopupMenu *helpMenu = new QPopupMenu( this ); | 770 | Q3PopupMenu *helpMenu = new Q3PopupMenu( this ); |
761 | QIconSet icon; | 771 | QIcon icon; |
762 | int pixWid = 22, pixHei = 22; | 772 | int pixWid = 22, pixHei = 22; |
@@ -793,3 +803,3 @@ void MainWindow::initActions() | |||
793 | menuBar1 = new KMenuBar( iconToolBar ); | 803 | menuBar1 = new KMenuBar( iconToolBar ); |
794 | QPopupMenu *menuBar = new QPopupMenu( this ); | 804 | Q3PopupMenu *menuBar = new Q3PopupMenu( this ); |
795 | icon = loadPixmap( pathString + "z_menu" ); | 805 | icon = loadPixmap( pathString + "z_menu" ); |
@@ -820,3 +830,3 @@ void MainWindow::initActions() | |||
820 | icon = mWeekPixmap; | 830 | icon = mWeekPixmap; |
821 | mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); | 831 | mWeekAction = new Q3Action( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); |
822 | if ( p-> mShowIconWeekNum ) | 832 | if ( p-> mShowIconWeekNum ) |
@@ -842,3 +852,3 @@ void MainWindow::initActions() | |||
842 | icon = loadPixmap( pathString + "filter" ); | 852 | icon = loadPixmap( pathString + "filter" ); |
843 | actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this ); | 853 | actionFilterMenuTB = new Q3Action( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this ); |
844 | connect( actionFilterMenuTB, SIGNAL( activated() ), | 854 | connect( actionFilterMenuTB, SIGNAL( activated() ), |
@@ -846,3 +856,3 @@ void MainWindow::initActions() | |||
846 | actionFilterMenuTB->addTo( iconToolBar ); | 856 | actionFilterMenuTB->addTo( iconToolBar ); |
847 | selectFilterMenuTB = new QPopupMenu( this ); | 857 | selectFilterMenuTB = new Q3PopupMenu( this ); |
848 | selectFilterMenuTB->setCheckable( true ); | 858 | selectFilterMenuTB->setCheckable( true ); |
@@ -853,3 +863,3 @@ void MainWindow::initActions() | |||
853 | // ****************** | 863 | // ****************** |
854 | QAction *action; | 864 | Q3Action *action; |
855 | // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); | 865 | // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); |
@@ -868,3 +878,3 @@ void MainWindow::initActions() | |||
868 | icon = loadPixmap( pathString + "today" ); | 878 | icon = loadPixmap( pathString + "today" ); |
869 | QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); | 879 | Q3Action* today_action = new Q3Action( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); |
870 | today_action->addTo( actionMenu ); | 880 | today_action->addTo( actionMenu ); |
@@ -874,3 +884,3 @@ void MainWindow::initActions() | |||
874 | icon = loadPixmap( pathString + "picker" ); | 884 | icon = loadPixmap( pathString + "picker" ); |
875 | QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this ); | 885 | Q3Action* dPickerAction = new Q3Action( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this ); |
876 | dPickerAction->addTo( actionMenu ); | 886 | dPickerAction->addTo( actionMenu ); |
@@ -880,3 +890,3 @@ void MainWindow::initActions() | |||
880 | icon = loadPixmap( pathString + "search" ); | 890 | icon = loadPixmap( pathString + "search" ); |
881 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); | 891 | Q3Action* search_action = new Q3Action( i18n("Search"), icon, i18n("Search..."), 0, this ); |
882 | search_action->addTo( actionMenu ); | 892 | search_action->addTo( actionMenu ); |
@@ -886,3 +896,3 @@ void MainWindow::initActions() | |||
886 | 896 | ||
887 | action = new QAction( "Undo Delete", i18n("All events"), 0, this ); | 897 | action = new Q3Action( "Undo Delete", i18n("All events"), 0, this ); |
888 | action->addTo( nextConflictMenu ); | 898 | action->addTo( nextConflictMenu ); |
@@ -891,3 +901,3 @@ void MainWindow::initActions() | |||
891 | 901 | ||
892 | action = new QAction( "Undo Delete", i18n("Allday events"), 0, this ); | 902 | action = new Q3Action( "Undo Delete", i18n("Allday events"), 0, this ); |
893 | action->addTo( nextConflictMenu ); | 903 | action->addTo( nextConflictMenu ); |
@@ -896,3 +906,3 @@ void MainWindow::initActions() | |||
896 | 906 | ||
897 | action = new QAction( "Undo Delete", i18n("Events with time"), 0, this ); | 907 | action = new Q3Action( "Undo Delete", i18n("Events with time"), 0, this ); |
898 | action->addTo( nextConflictMenu ); | 908 | action->addTo( nextConflictMenu ); |
@@ -904,3 +914,3 @@ void MainWindow::initActions() | |||
904 | icon = loadPixmap( pathString + "newevent" ); | 914 | icon = loadPixmap( pathString + "newevent" ); |
905 | QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); | 915 | Q3Action* ne_action = new Q3Action( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); |
906 | ne_action->addTo( mCurrentItemMenu ); | 916 | ne_action->addTo( mCurrentItemMenu ); |
@@ -909,3 +919,3 @@ void MainWindow::initActions() | |||
909 | icon = loadPixmap( pathString + "newtodo" ); | 919 | icon = loadPixmap( pathString + "newtodo" ); |
910 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); | 920 | Q3Action* nt_action = new Q3Action( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); |
911 | nt_action->addTo( mCurrentItemMenu ); | 921 | nt_action->addTo( mCurrentItemMenu ); |
@@ -913,3 +923,3 @@ void MainWindow::initActions() | |||
913 | mView, SLOT( newTodo() ) ); | 923 | mView, SLOT( newTodo() ) ); |
914 | mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, | 924 | mNewSubTodoAction = new Q3Action( "new_subtodo", i18n("New Sub-Todo..."), 0, |
915 | this ); | 925 | this ); |
@@ -932,3 +942,3 @@ void MainWindow::initActions() | |||
932 | //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); | 942 | //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); |
933 | mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this ); | 943 | mShowAction = new Q3Action( "show_incidence", i18n("Show"), 0, this ); |
934 | mShowAction->addTo( mCurrentItemMenu ); | 944 | mShowAction->addTo( mCurrentItemMenu ); |
@@ -937,3 +947,3 @@ void MainWindow::initActions() | |||
937 | 947 | ||
938 | mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); | 948 | mEditAction = new Q3Action( "edit_incidence", i18n("Edit..."), 0, this ); |
939 | mEditAction->addTo( mCurrentItemMenu ); | 949 | mEditAction->addTo( mCurrentItemMenu ); |
@@ -942,3 +952,3 @@ void MainWindow::initActions() | |||
942 | 952 | ||
943 | mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); | 953 | mDeleteAction = new Q3Action( "delete_incidence", i18n("Delete..."), 0, this ); |
944 | mDeleteAction->addTo( mCurrentItemMenu ); | 954 | mDeleteAction->addTo( mCurrentItemMenu ); |
@@ -948,3 +958,3 @@ void MainWindow::initActions() | |||
948 | 958 | ||
949 | mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); | 959 | mCloneAction = new Q3Action( "clone_incidence", i18n("Clone..."), 0, this ); |
950 | mCloneAction->addTo( mCurrentItemMenu ); | 960 | mCloneAction->addTo( mCurrentItemMenu ); |
@@ -952,3 +962,3 @@ void MainWindow::initActions() | |||
952 | mView, SLOT( cloneIncidence() ) ); | 962 | mView, SLOT( cloneIncidence() ) ); |
953 | mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); | 963 | mMoveAction = new Q3Action( "Move_incidence", i18n("Move..."), 0, this ); |
954 | mMoveAction->addTo( mCurrentItemMenu ); | 964 | mMoveAction->addTo( mCurrentItemMenu ); |
@@ -957,3 +967,3 @@ void MainWindow::initActions() | |||
957 | #ifndef DESKTOP_VERSION | 967 | #ifndef DESKTOP_VERSION |
958 | mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); | 968 | mBeamAction = new Q3Action( "Beam_incidence", i18n("Beam..."), 0, this ); |
959 | mBeamAction->addTo(mCurrentItemMenu ); | 969 | mBeamAction->addTo(mCurrentItemMenu ); |
@@ -962,3 +972,3 @@ void MainWindow::initActions() | |||
962 | #endif | 972 | #endif |
963 | mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); | 973 | mCancelAction = new Q3Action( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); |
964 | mCancelAction->addTo( mCurrentItemMenu ); | 974 | mCancelAction->addTo( mCurrentItemMenu ); |
@@ -969,3 +979,3 @@ void MainWindow::initActions() | |||
969 | mCurrentItemMenu->insertSeparator(); | 979 | mCurrentItemMenu->insertSeparator(); |
970 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); | 980 | action = new Q3Action( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); |
971 | action->addTo( mCurrentItemMenu ); | 981 | action->addTo( mCurrentItemMenu ); |
@@ -981,3 +991,3 @@ void MainWindow::initActions() | |||
981 | configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); | 991 | configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); |
982 | QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); | 992 | Q3Action* FSaction = new Q3Action( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); |
983 | FSaction->addTo( viewMenu ); | 993 | FSaction->addTo( viewMenu ); |
@@ -989,3 +999,3 @@ void MainWindow::initActions() | |||
989 | icon = loadPixmap( pathString + "configure" ); | 999 | icon = loadPixmap( pathString + "configure" ); |
990 | action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this ); | 1000 | action = new Q3Action( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this ); |
991 | action->addTo( viewMenu ); | 1001 | action->addTo( viewMenu ); |
@@ -996,3 +1006,3 @@ void MainWindow::initActions() | |||
996 | configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); | 1006 | configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); |
997 | action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); | 1007 | action = new Q3Action( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); |
998 | action->addTo( viewMenu ); | 1008 | action->addTo( viewMenu ); |
@@ -1003,3 +1013,3 @@ void MainWindow::initActions() | |||
1003 | configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); | 1013 | configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); |
1004 | action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); | 1014 | action = new Q3Action( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); |
1005 | action->addTo( viewMenu ); | 1015 | action->addTo( viewMenu ); |
@@ -1033,3 +1043,3 @@ void MainWindow::initActions() | |||
1033 | configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); | 1043 | configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); |
1034 | QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); | 1044 | Q3Action* whatsnext_action = new Q3Action( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); |
1035 | whatsnext_action->addTo( viewMenu ); | 1045 | whatsnext_action->addTo( viewMenu ); |
@@ -1040,3 +1050,3 @@ void MainWindow::initActions() | |||
1040 | configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); | 1050 | configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); |
1041 | QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); | 1051 | Q3Action* xdays_action = new Q3Action( i18n("Next days"), icon, i18n("Next days"), 0, this ); |
1042 | xdays_action->addTo( viewMenu ); | 1052 | xdays_action->addTo( viewMenu ); |
@@ -1048,3 +1058,3 @@ void MainWindow::initActions() | |||
1048 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); | 1058 | configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); |
1049 | QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); | 1059 | Q3Action* viewjournal_action = new Q3Action( i18n("Journal"), icon, i18n("Journal"), 0, this ); |
1050 | viewjournal_action->addTo( viewMenu ); | 1060 | viewjournal_action->addTo( viewMenu ); |
@@ -1056,3 +1066,3 @@ void MainWindow::initActions() | |||
1056 | configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); | 1066 | configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); |
1057 | QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); | 1067 | Q3Action* day1_action = new Q3Action( i18n("Day View"), icon, i18n("Day View"), 0, this ); |
1058 | day1_action->addTo( viewMenu ); | 1068 | day1_action->addTo( viewMenu ); |
@@ -1064,3 +1074,3 @@ void MainWindow::initActions() | |||
1064 | configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 ); | 1074 | configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 ); |
1065 | QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); | 1075 | Q3Action* day5_action = new Q3Action( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); |
1066 | day5_action->addTo( viewMenu ); | 1076 | day5_action->addTo( viewMenu ); |
@@ -1071,3 +1081,3 @@ void MainWindow::initActions() | |||
1071 | configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); | 1081 | configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); |
1072 | QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this ); | 1082 | Q3Action* day7_action = new Q3Action( i18n("Week"), icon, i18n("Week"), 0, this ); |
1073 | day7_action->addTo( viewMenu ); | 1083 | day7_action->addTo( viewMenu ); |
@@ -1078,3 +1088,3 @@ void MainWindow::initActions() | |||
1078 | configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 ); | 1088 | configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 ); |
1079 | QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this ); | 1089 | Q3Action* day6_action = new Q3Action( i18n("List week"), icon, i18n("List week"), 0, this ); |
1080 | day6_action->addTo( viewMenu ); | 1090 | day6_action->addTo( viewMenu ); |
@@ -1085,3 +1095,3 @@ void MainWindow::initActions() | |||
1085 | configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); | 1095 | configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); |
1086 | QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); | 1096 | Q3Action* month_action = new Q3Action( i18n("Month"), icon, i18n("Month"), 0, this ); |
1087 | month_action->addTo( viewMenu ); | 1097 | month_action->addTo( viewMenu ); |
@@ -1092,3 +1102,3 @@ void MainWindow::initActions() | |||
1092 | configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); | 1102 | configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); |
1093 | QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); | 1103 | Q3Action* showlist_action = new Q3Action( i18n("List View"), icon, i18n("List View"), 0, this ); |
1094 | showlist_action->addTo( viewMenu ); | 1104 | showlist_action->addTo( viewMenu ); |
@@ -1099,3 +1109,3 @@ void MainWindow::initActions() | |||
1099 | configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); | 1109 | configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); |
1100 | QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); | 1110 | Q3Action* todoview_action = new Q3Action( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); |
1101 | todoview_action->addTo( viewMenu ); | 1111 | todoview_action->addTo( viewMenu ); |
@@ -1107,3 +1117,3 @@ void MainWindow::initActions() | |||
1107 | #if 0 | 1117 | #if 0 |
1108 | action = new QAction( "view_timespan", "Time Span", 0, this ); | 1118 | action = new Q3Action( "view_timespan", "Time Span", 0, this ); |
1109 | action->addTo( viewMenu ); | 1119 | action->addTo( viewMenu ); |
@@ -1115,3 +1125,3 @@ void MainWindow::initActions() | |||
1115 | 1125 | ||
1116 | action = new QAction( "purge_completed", i18n("Purge Completed..."), 0, | 1126 | action = new Q3Action( "purge_completed", i18n("Purge Completed..."), 0, |
1117 | this ); | 1127 | this ); |
@@ -1127,3 +1137,3 @@ void MainWindow::initActions() | |||
1127 | actionMenu->insertSeparator(); | 1137 | actionMenu->insertSeparator(); |
1128 | action = new QAction( "manage cat", i18n("Edit category list..."), 0, | 1138 | action = new Q3Action( "manage cat", i18n("Edit category list..."), 0, |
1129 | this ); | 1139 | this ); |
@@ -1132,3 +1142,3 @@ void MainWindow::initActions() | |||
1132 | 1142 | ||
1133 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | 1143 | action = new Q3Action( "manage cat", i18n("Manage new categories..."), 0, |
1134 | this ); | 1144 | this ); |
@@ -1140,3 +1150,3 @@ void MainWindow::initActions() | |||
1140 | icon = loadPixmap( pathString + "configure" ); | 1150 | icon = loadPixmap( pathString + "configure" ); |
1141 | action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); | 1151 | action = new Q3Action( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); |
1142 | action->addTo( actionMenu ); | 1152 | action->addTo( actionMenu ); |
@@ -1144,3 +1154,3 @@ void MainWindow::initActions() | |||
1144 | mView, SLOT( edit_options() ) ); | 1154 | mView, SLOT( edit_options() ) ); |
1145 | action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this ); | 1155 | action = new Q3Action( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this ); |
1146 | action->addTo( actionMenu ); | 1156 | action->addTo( actionMenu ); |
@@ -1148,3 +1158,3 @@ void MainWindow::initActions() | |||
1148 | this, SLOT( calHint() ) ); | 1158 | this, SLOT( calHint() ) ); |
1149 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); | 1159 | action = new Q3Action( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); |
1150 | action->addTo( actionMenu ); | 1160 | action->addTo( actionMenu ); |
@@ -1157,3 +1167,3 @@ void MainWindow::initActions() | |||
1157 | // actionMenu->insertSeparator(); | 1167 | // actionMenu->insertSeparator(); |
1158 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, | 1168 | action = new Q3Action( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, |
1159 | this ); | 1169 | this ); |
@@ -1161,3 +1171,3 @@ void MainWindow::initActions() | |||
1161 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); | 1171 | connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); |
1162 | action = new QAction( "import_quick", i18n("Import last file"), 0, | 1172 | action = new Q3Action( "import_quick", i18n("Import last file"), 0, |
1163 | this ); | 1173 | this ); |
@@ -1166,3 +1176,3 @@ void MainWindow::initActions() | |||
1166 | importMenu_X->insertSeparator(); | 1176 | importMenu_X->insertSeparator(); |
1167 | action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, | 1177 | action = new Q3Action( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, |
1168 | this ); | 1178 | this ); |
@@ -1172,3 +1182,3 @@ void MainWindow::initActions() | |||
1172 | importMenu_X->insertSeparator(); | 1182 | importMenu_X->insertSeparator(); |
1173 | action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, | 1183 | action = new Q3Action( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, |
1174 | this ); | 1184 | this ); |
@@ -1179,3 +1189,3 @@ void MainWindow::initActions() | |||
1179 | importMenu_X->insertSeparator(); | 1189 | importMenu_X->insertSeparator(); |
1180 | action = new QAction( "import_ol", i18n("Import from OL"), 0, | 1190 | action = new Q3Action( "import_ol", i18n("Import from OL"), 0, |
1181 | this ); | 1191 | this ); |
@@ -1188,3 +1198,3 @@ void MainWindow::initActions() | |||
1188 | #if 0 | 1198 | #if 0 |
1189 | action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, | 1199 | action = new Q3Action( "load_cal", i18n("Load Calendar Backup"), 0, |
1190 | this ); | 1200 | this ); |
@@ -1193,3 +1203,3 @@ void MainWindow::initActions() | |||
1193 | #endif | 1203 | #endif |
1194 | action = new QAction( "save_cal", i18n("Save Backup..."), 0, | 1204 | action = new Q3Action( "save_cal", i18n("Save Backup..."), 0, |
1195 | this ); | 1205 | this ); |
@@ -1200,3 +1210,3 @@ void MainWindow::initActions() | |||
1200 | //importMenu->insertSeparator(); | 1210 | //importMenu->insertSeparator(); |
1201 | action = new QAction( "export ical", i18n("Export All Data"), 0, | 1211 | action = new Q3Action( "export ical", i18n("Export All Data"), 0, |
1202 | this ); | 1212 | this ); |
@@ -1204,3 +1214,3 @@ void MainWindow::initActions() | |||
1204 | connect( action, SIGNAL( activated() ), SLOT( exportICalendar() ) ); | 1214 | connect( action, SIGNAL( activated() ), SLOT( exportICalendar() ) ); |
1205 | action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, | 1215 | action = new Q3Action( "import_qtopia", i18n("Export VCalendar"), 0, |
1206 | this ); | 1216 | this ); |
@@ -1211,3 +1221,3 @@ void MainWindow::initActions() | |||
1211 | //LR | 1221 | //LR |
1212 | QPopupMenu *ex2phone = new QPopupMenu( this ); | 1222 | Q3PopupMenu *ex2phone = new Q3PopupMenu( this ); |
1213 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | 1223 | ex2phone->insertItem(i18n("Complete calendar..."), 1 ); |
@@ -1221,3 +1231,3 @@ void MainWindow::initActions() | |||
1221 | //importMenu->insertSeparator(); | 1231 | //importMenu->insertSeparator(); |
1222 | brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, | 1232 | brAction = new Q3Action( "beam toggle", i18n("Beam receive enabled"), 0, |
1223 | this ); | 1233 | this ); |
@@ -1227,3 +1237,3 @@ void MainWindow::initActions() | |||
1227 | 1237 | ||
1228 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, | 1238 | action = new Q3Action( "beam all", i18n("Beam complete calendar..."), 0, |
1229 | this ); | 1239 | this ); |
@@ -1232,3 +1242,3 @@ void MainWindow::initActions() | |||
1232 | 1242 | ||
1233 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, | 1243 | action = new Q3Action( "beam all", i18n("Beam filtered calendar..."), 0, |
1234 | this ); | 1244 | this ); |
@@ -1240,3 +1250,3 @@ void MainWindow::initActions() | |||
1240 | icon = loadPixmap( pathString + "print" ); | 1250 | icon = loadPixmap( pathString + "print" ); |
1241 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); | 1251 | action = new Q3Action( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); |
1242 | action->addTo( beamMenu_X ); | 1252 | action->addTo( beamMenu_X ); |
@@ -1246,3 +1256,3 @@ void MainWindow::initActions() | |||
1246 | icon = loadPixmap( pathString + "week" ); | 1256 | icon = loadPixmap( pathString + "week" ); |
1247 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); | 1257 | action = new Q3Action( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); |
1248 | action->addTo( beamMenu_X ); | 1258 | action->addTo( beamMenu_X ); |
@@ -1251,3 +1261,3 @@ void MainWindow::initActions() | |||
1251 | icon = loadPixmap( pathString + "whatsnext" ); | 1261 | icon = loadPixmap( pathString + "whatsnext" ); |
1252 | action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); | 1262 | action = new Q3Action( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); |
1253 | action->addTo( beamMenu_X ); | 1263 | action->addTo( beamMenu_X ); |
@@ -1258,3 +1268,3 @@ void MainWindow::initActions() | |||
1258 | icon = loadPixmap( pathString + "list" ); | 1268 | icon = loadPixmap( pathString + "list" ); |
1259 | action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); | 1269 | action = new Q3Action( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); |
1260 | action->addTo( beamMenu_X ); | 1270 | action->addTo( beamMenu_X ); |
@@ -1264,3 +1274,3 @@ void MainWindow::initActions() | |||
1264 | icon = loadPixmap( pathString + "newevent" ); | 1274 | icon = loadPixmap( pathString + "newevent" ); |
1265 | action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); | 1275 | action = new Q3Action( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); |
1266 | action->addTo( beamMenu_X ); | 1276 | action->addTo( beamMenu_X ); |
@@ -1273,3 +1283,3 @@ void MainWindow::initActions() | |||
1273 | importMenu->insertSeparator(); | 1283 | importMenu->insertSeparator(); |
1274 | action = new QAction( "beam all", i18n("Save"), 0, | 1284 | action = new Q3Action( "beam all", i18n("Save"), 0, |
1275 | this ); | 1285 | this ); |
@@ -1277,3 +1287,3 @@ void MainWindow::initActions() | |||
1277 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); | 1287 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); |
1278 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, | 1288 | action = new Q3Action( "beam all", i18n("Exit (+save)"), 0, |
1279 | this ); | 1289 | this ); |
@@ -1286,3 +1296,3 @@ void MainWindow::initActions() | |||
1286 | 1296 | ||
1287 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); | 1297 | action = new Q3Action( "Whats New", i18n("What's new?"), 0,this ); |
1288 | action->addTo( helpMenu ); | 1298 | action->addTo( helpMenu ); |
@@ -1290,3 +1300,3 @@ void MainWindow::initActions() | |||
1290 | SLOT( whatsNew() ) ); | 1300 | SLOT( whatsNew() ) ); |
1291 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); | 1301 | action = new Q3Action( "featureHowto", i18n("Features + hints..."), 0,this ); |
1292 | action->addTo( helpMenu ); | 1302 | action->addTo( helpMenu ); |
@@ -1294,3 +1304,3 @@ void MainWindow::initActions() | |||
1294 | SLOT( features() ) ); | 1304 | SLOT( features() ) ); |
1295 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); | 1305 | action = new Q3Action( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); |
1296 | action->addTo( helpMenu ); | 1306 | action->addTo( helpMenu ); |
@@ -1298,3 +1308,3 @@ void MainWindow::initActions() | |||
1298 | SLOT( keyBindings() ) ); | 1308 | SLOT( keyBindings() ) ); |
1299 | action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this ); | 1309 | action = new Q3Action( "Storage Howto", i18n("Storage HowTo..."), 0,this ); |
1300 | action->addTo( helpMenu ); | 1310 | action->addTo( helpMenu ); |
@@ -1302,3 +1312,3 @@ void MainWindow::initActions() | |||
1302 | SLOT( storagehowto() ) ); | 1312 | SLOT( storagehowto() ) ); |
1303 | action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this ); | 1313 | action = new Q3Action( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this ); |
1304 | action->addTo( helpMenu ); | 1314 | action->addTo( helpMenu ); |
@@ -1306,3 +1316,3 @@ void MainWindow::initActions() | |||
1306 | SLOT( timetrackinghowto() ) ); | 1316 | SLOT( timetrackinghowto() ) ); |
1307 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); | 1317 | action = new Q3Action( "Sync Howto", i18n("Sync HowTo..."), 0,this ); |
1308 | action->addTo( helpMenu ); | 1318 | action->addTo( helpMenu ); |
@@ -1310,3 +1320,3 @@ void MainWindow::initActions() | |||
1310 | SLOT( synchowto() ) ); | 1320 | SLOT( synchowto() ) ); |
1311 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); | 1321 | action = new Q3Action( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); |
1312 | action->addTo( helpMenu ); | 1322 | action->addTo( helpMenu ); |
@@ -1314,3 +1324,3 @@ void MainWindow::initActions() | |||
1314 | SLOT( kdesynchowto() ) ); | 1324 | SLOT( kdesynchowto() ) ); |
1315 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); | 1325 | action = new Q3Action( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); |
1316 | action->addTo( helpMenu ); | 1326 | action->addTo( helpMenu ); |
@@ -1318,3 +1328,3 @@ void MainWindow::initActions() | |||
1318 | SLOT( multisynchowto() ) ); | 1328 | SLOT( multisynchowto() ) ); |
1319 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); | 1329 | action = new Q3Action( "Auto saving", i18n("Auto saving..."), 0, this ); |
1320 | action->addTo( helpMenu ); | 1330 | action->addTo( helpMenu ); |
@@ -1322,3 +1332,3 @@ void MainWindow::initActions() | |||
1322 | SLOT( aboutAutoSaving() ) ); | 1332 | SLOT( aboutAutoSaving() ) ); |
1323 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); | 1333 | action = new Q3Action( "Problemd", i18n("Known Problems..."), 0,this ); |
1324 | action->addTo( helpMenu ); | 1334 | action->addTo( helpMenu ); |
@@ -1326,3 +1336,3 @@ void MainWindow::initActions() | |||
1326 | SLOT( aboutKnownBugs() ) ); | 1336 | SLOT( aboutKnownBugs() ) ); |
1327 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); | 1337 | action = new Q3Action( "Translate Howto", i18n("User translation..."), 0,this ); |
1328 | action->addTo( helpMenu ); | 1338 | action->addTo( helpMenu ); |
@@ -1330,3 +1340,3 @@ void MainWindow::initActions() | |||
1330 | SLOT( usertrans() ) ); | 1340 | SLOT( usertrans() ) ); |
1331 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); | 1341 | action = new Q3Action( "Frequently asked questions", i18n("FAQ..."), 0,this ); |
1332 | action->addTo( helpMenu ); | 1342 | action->addTo( helpMenu ); |
@@ -1334,3 +1344,3 @@ void MainWindow::initActions() | |||
1334 | SLOT( faq() ) ); | 1344 | SLOT( faq() ) ); |
1335 | action = new QAction( "licence", i18n("Licence..."), 0, this ); | 1345 | action = new Q3Action( "licence", i18n("Licence..."), 0, this ); |
1336 | action->addTo( helpMenu ); | 1346 | action->addTo( helpMenu ); |
@@ -1338,3 +1348,3 @@ void MainWindow::initActions() | |||
1338 | SLOT( licence() ) ); | 1348 | SLOT( licence() ) ); |
1339 | action = new QAction( "about", i18n("About..."), 0, this ); | 1349 | action = new Q3Action( "about", i18n("About..."), 0, this ); |
1340 | action->addTo( helpMenu ); | 1350 | action->addTo( helpMenu ); |
@@ -1358,3 +1368,3 @@ void MainWindow::initActions() | |||
1358 | if (p-> mShowIconWhatsThis) | 1368 | if (p-> mShowIconWhatsThis) |
1359 | QWhatsThis::whatsThisButton ( iconToolBar ); | 1369 | Q3WhatsThis::whatsThisButton ( iconToolBar ); |
1360 | if (p-> mShowIconNext) | 1370 | if (p-> mShowIconNext) |
@@ -1383,3 +1393,3 @@ void MainWindow::initActions() | |||
1383 | if (p-> mShowIconBackFast) { | 1393 | if (p-> mShowIconBackFast) { |
1384 | action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); | 1394 | action = new Q3Action( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); |
1385 | connect( action, SIGNAL( activated() ), | 1395 | connect( action, SIGNAL( activated() ), |
@@ -1391,3 +1401,3 @@ void MainWindow::initActions() | |||
1391 | if (p-> mShowIconBack) { | 1401 | if (p-> mShowIconBack) { |
1392 | action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); | 1402 | action = new Q3Action( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); |
1393 | connect( action, SIGNAL( activated() ), | 1403 | connect( action, SIGNAL( activated() ), |
@@ -1403,3 +1413,3 @@ void MainWindow::initActions() | |||
1403 | if (p-> mShowIconForward) { | 1413 | if (p-> mShowIconForward) { |
1404 | action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); | 1414 | action = new Q3Action( i18n("Go forward"), icon, i18n("Go forward"),0 , this ); |
1405 | connect( action, SIGNAL( activated() ), | 1415 | connect( action, SIGNAL( activated() ), |
@@ -1411,3 +1421,3 @@ void MainWindow::initActions() | |||
1411 | if (p-> mShowIconForwardFast) { | 1421 | if (p-> mShowIconForwardFast) { |
1412 | action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this ); | 1422 | action = new Q3Action( i18n("Next month"), icon, i18n("Next month"),0 , this ); |
1413 | connect( action, SIGNAL( activated() ), | 1423 | connect( action, SIGNAL( activated() ), |
@@ -1526,3 +1536,3 @@ void MainWindow::exportToPhone( int mode ) | |||
1526 | inFuture = ex2phone.mWriteBackFutureWeeks->value(); | 1536 | inFuture = ex2phone.mWriteBackFutureWeeks->value(); |
1527 | QPtrList<Incidence> delSel; | 1537 | Q3PtrList<Incidence> delSel; |
1528 | if ( mode == 1 ) | 1538 | if ( mode == 1 ) |
@@ -1597,6 +1607,6 @@ void MainWindow::displayText( QString text ,QString cap ) | |||
1597 | dia.setCaption( cap ); | 1607 | dia.setCaption( cap ); |
1598 | QVBoxLayout* lay = new QVBoxLayout( &dia ); | 1608 | Q3VBoxLayout* lay = new Q3VBoxLayout( &dia ); |
1599 | lay->setSpacing( 3 ); | 1609 | lay->setSpacing( 3 ); |
1600 | lay->setMargin( 3 ); | 1610 | lay->setMargin( 3 ); |
1601 | QTextBrowser tb ( &dia ); | 1611 | Q3TextBrowser tb ( &dia ); |
1602 | lay->addWidget( &tb ); | 1612 | lay->addWidget( &tb ); |
@@ -1779,5 +1789,5 @@ void MainWindow::updateWeek(QDate seda) | |||
1779 | p.setFont( mWeekFont ); | 1789 | p.setFont( mWeekFont ); |
1780 | p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) ); | 1790 | p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),Qt::AlignCenter, QString::number( weekNum) ); |
1781 | p.end(); | 1791 | p.end(); |
1782 | QIconSet icon3 ( mWeekPixmap ); | 1792 | QIcon icon3 ( mWeekPixmap ); |
1783 | mWeekAction->setIconSet ( icon3 ); | 1793 | mWeekAction->setIconSet ( icon3 ); |
@@ -1814,3 +1824,3 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1814 | bool ok; | 1824 | bool ok; |
1815 | QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok ); | 1825 | QDateTime noc = incidence->getNextOccurence( (QDateTime)mView->startDate().addDays(-1), &ok ); |
1816 | if ( ok ) { | 1826 | if ( ok ) { |
@@ -1848,9 +1858,9 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1848 | static QPixmap tP = SmallIcon( "newtodo" ); | 1858 | static QPixmap tP = SmallIcon( "newtodo" ); |
1849 | QIconSet icon; | 1859 | QIcon icon; |
1850 | if ( incidence->typeID() == todoID ) | 1860 | if ( incidence->typeID() == todoID ) |
1851 | icon = QIconSet ( tP ); | 1861 | icon = QIcon ( tP ); |
1852 | else if ( incidence->typeID() == eventID ) | 1862 | else if ( incidence->typeID() == eventID ) |
1853 | icon = QIconSet ( eP ); | 1863 | icon = QIcon ( eP ); |
1854 | else if ( incidence->typeID() == journalID ) | 1864 | else if ( incidence->typeID() == journalID ) |
1855 | icon = QIconSet ( jP ); | 1865 | icon = QIcon ( jP ); |
1856 | mPrintSelAction->setIconSet ( icon ); | 1866 | mPrintSelAction->setIconSet ( icon ); |
@@ -2047,3 +2057,3 @@ void MainWindow::backupAllFiles() | |||
2047 | // backup ok | 2057 | // backup ok |
2048 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 2058 | Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
2049 | KopiCalendarFile * cal = calendars.first(); | 2059 | KopiCalendarFile * cal = calendars.first(); |
@@ -2343,3 +2353,3 @@ void MainWindow::fillFilterMenuTB() | |||
2343 | selectFilterMenuTB->insertSeparator(); | 2353 | selectFilterMenuTB->insertSeparator(); |
2344 | QPtrList<CalFilter> fili = mView->filters(); | 2354 | Q3PtrList<CalFilter> fili = mView->filters(); |
2345 | CalFilter *curfilter = mView->filterView()->selectedFilter(); | 2355 | CalFilter *curfilter = mView->filterView()->selectedFilter(); |
@@ -2388,3 +2398,3 @@ void MainWindow::fillFilterMenu() | |||
2388 | selectFilterMenu->insertSeparator(); | 2398 | selectFilterMenu->insertSeparator(); |
2389 | QPtrList<CalFilter> fili = mView->filters(); | 2399 | Q3PtrList<CalFilter> fili = mView->filters(); |
2390 | CalFilter *curfilter = mView->filterView()->selectedFilter(); | 2400 | CalFilter *curfilter = mView->filterView()->selectedFilter(); |
@@ -2409,3 +2419,3 @@ void MainWindow::fillFilterMenuPopup() | |||
2409 | filterPopupMenu->insertSeparator(); | 2419 | filterPopupMenu->insertSeparator(); |
2410 | QPtrList<CalFilter> fili = mView->filters(); | 2420 | Q3PtrList<CalFilter> fili = mView->filters(); |
2411 | CalFilter *curfilter = mView->filterView()->selectedFilter(); | 2421 | CalFilter *curfilter = mView->filterView()->selectedFilter(); |
@@ -2821,3 +2831,3 @@ void MainWindow::resizeEvent( QResizeEvent* e) | |||
2821 | #endif | 2831 | #endif |
2822 | QMainWindow::resizeEvent( e); | 2832 | Q3MainWindow::resizeEvent( e); |
2823 | } | 2833 | } |