-rw-r--r-- | korganizer/mainwindow.cpp | 10 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 357154e..7aa3b60 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1053,65 +1053,69 @@ void MainWindow::initActions() | |||
1053 | importMenu->insertItem( i18n("Print"), beamMenu_X ); | 1053 | importMenu->insertItem( i18n("Print"), beamMenu_X ); |
1054 | #endif | 1054 | #endif |
1055 | importMenu->insertSeparator(); | 1055 | importMenu->insertSeparator(); |
1056 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | 1056 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, |
1057 | this ); | 1057 | this ); |
1058 | action->addTo( importMenu ); | 1058 | action->addTo( importMenu ); |
1059 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | 1059 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); |
1060 | importMenu->insertSeparator(); | 1060 | importMenu->insertSeparator(); |
1061 | action = new QAction( "beam all", i18n("Save"), 0, | 1061 | action = new QAction( "beam all", i18n("Save"), 0, |
1062 | this ); | 1062 | this ); |
1063 | action->addTo( importMenu ); | 1063 | action->addTo( importMenu ); |
1064 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); | 1064 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); |
1065 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, | 1065 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, |
1066 | this ); | 1066 | this ); |
1067 | action->addTo( importMenu ); | 1067 | action->addTo( importMenu ); |
1068 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); | 1068 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); |
1069 | 1069 | ||
1070 | //menuBar->insertItem( "Configure",configureMenu ); | 1070 | //menuBar->insertItem( "Configure",configureMenu ); |
1071 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); | 1071 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); |
1072 | icon = loadPixmap( "korganizer/korganizer" ); | 1072 | icon = loadPixmap( "korganizer/korganizer" ); |
1073 | 1073 | ||
1074 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); | 1074 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); |
1075 | action->addTo( helpMenu ); | 1075 | action->addTo( helpMenu ); |
1076 | connect( action, SIGNAL( activated() ), | 1076 | connect( action, SIGNAL( activated() ), |
1077 | SLOT( whatsNew() ) ); | 1077 | SLOT( whatsNew() ) ); |
1078 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); | 1078 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); |
1079 | action->addTo( helpMenu ); | 1079 | action->addTo( helpMenu ); |
1080 | connect( action, SIGNAL( activated() ), | 1080 | connect( action, SIGNAL( activated() ), |
1081 | SLOT( features() ) ); | 1081 | SLOT( features() ) ); |
1082 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); | 1082 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); |
1083 | action->addTo( helpMenu ); | 1083 | action->addTo( helpMenu ); |
1084 | connect( action, SIGNAL( activated() ), | 1084 | connect( action, SIGNAL( activated() ), |
1085 | SLOT( keyBindings() ) ); | 1085 | SLOT( keyBindings() ) ); |
1086 | action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this ); | ||
1087 | action->addTo( helpMenu ); | ||
1088 | connect( action, SIGNAL( activated() ), | ||
1089 | SLOT( storagehowto() ) ); | ||
1086 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); | 1090 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); |
1087 | action->addTo( helpMenu ); | 1091 | action->addTo( helpMenu ); |
1088 | connect( action, SIGNAL( activated() ), | 1092 | connect( action, SIGNAL( activated() ), |
1089 | SLOT( synchowto() ) ); | 1093 | SLOT( synchowto() ) ); |
1090 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); | 1094 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); |
1091 | action->addTo( helpMenu ); | 1095 | action->addTo( helpMenu ); |
1092 | connect( action, SIGNAL( activated() ), | 1096 | connect( action, SIGNAL( activated() ), |
1093 | SLOT( kdesynchowto() ) ); | 1097 | SLOT( kdesynchowto() ) ); |
1094 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); | 1098 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); |
1095 | action->addTo( helpMenu ); | 1099 | action->addTo( helpMenu ); |
1096 | connect( action, SIGNAL( activated() ), | 1100 | connect( action, SIGNAL( activated() ), |
1097 | SLOT( multisynchowto() ) ); | 1101 | SLOT( multisynchowto() ) ); |
1098 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); | 1102 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); |
1099 | action->addTo( helpMenu ); | 1103 | action->addTo( helpMenu ); |
1100 | connect( action, SIGNAL( activated() ), | 1104 | connect( action, SIGNAL( activated() ), |
1101 | SLOT( aboutAutoSaving() ) ); | 1105 | SLOT( aboutAutoSaving() ) ); |
1102 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); | 1106 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); |
1103 | action->addTo( helpMenu ); | 1107 | action->addTo( helpMenu ); |
1104 | connect( action, SIGNAL( activated() ), | 1108 | connect( action, SIGNAL( activated() ), |
1105 | SLOT( aboutKnownBugs() ) ); | 1109 | SLOT( aboutKnownBugs() ) ); |
1106 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); | 1110 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); |
1107 | action->addTo( helpMenu ); | 1111 | action->addTo( helpMenu ); |
1108 | connect( action, SIGNAL( activated() ), | 1112 | connect( action, SIGNAL( activated() ), |
1109 | SLOT( usertrans() ) ); | 1113 | SLOT( usertrans() ) ); |
1110 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); | 1114 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); |
1111 | action->addTo( helpMenu ); | 1115 | action->addTo( helpMenu ); |
1112 | connect( action, SIGNAL( activated() ), | 1116 | connect( action, SIGNAL( activated() ), |
1113 | SLOT( faq() ) ); | 1117 | SLOT( faq() ) ); |
1114 | action = new QAction( "licence", i18n("Licence..."), 0, this ); | 1118 | action = new QAction( "licence", i18n("Licence..."), 0, this ); |
1115 | action->addTo( helpMenu ); | 1119 | action->addTo( helpMenu ); |
1116 | connect( action, SIGNAL( activated() ), | 1120 | connect( action, SIGNAL( activated() ), |
1117 | SLOT( licence() ) ); | 1121 | SLOT( licence() ) ); |
@@ -1364,64 +1368,68 @@ QString MainWindow::resourcePath() | |||
1364 | } | 1368 | } |
1365 | 1369 | ||
1366 | void MainWindow::displayText( QString text ,QString cap ) | 1370 | void MainWindow::displayText( QString text ,QString cap ) |
1367 | { | 1371 | { |
1368 | QDialog dia( this, "name", true ); ; | 1372 | QDialog dia( this, "name", true ); ; |
1369 | dia.setCaption( cap ); | 1373 | dia.setCaption( cap ); |
1370 | QVBoxLayout* lay = new QVBoxLayout( &dia ); | 1374 | QVBoxLayout* lay = new QVBoxLayout( &dia ); |
1371 | lay->setSpacing( 3 ); | 1375 | lay->setSpacing( 3 ); |
1372 | lay->setMargin( 3 ); | 1376 | lay->setMargin( 3 ); |
1373 | QTextBrowser tb ( &dia ); | 1377 | QTextBrowser tb ( &dia ); |
1374 | lay->addWidget( &tb ); | 1378 | lay->addWidget( &tb ); |
1375 | tb.setText( text ); | 1379 | tb.setText( text ); |
1376 | #ifdef DESKTOP_VERSION | 1380 | #ifdef DESKTOP_VERSION |
1377 | dia.resize( 640, 480); | 1381 | dia.resize( 640, 480); |
1378 | #else | 1382 | #else |
1379 | dia.showMaximized(); | 1383 | dia.showMaximized(); |
1380 | #endif | 1384 | #endif |
1381 | dia.exec(); | 1385 | dia.exec(); |
1382 | } | 1386 | } |
1383 | 1387 | ||
1384 | void MainWindow::features() | 1388 | void MainWindow::features() |
1385 | { | 1389 | { |
1386 | 1390 | ||
1387 | KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" ); | 1391 | KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" ); |
1388 | } | 1392 | } |
1389 | 1393 | ||
1390 | void MainWindow::usertrans() | 1394 | void MainWindow::usertrans() |
1391 | { | 1395 | { |
1392 | 1396 | ||
1393 | KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" ); | 1397 | KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" ); |
1394 | } | 1398 | } |
1395 | 1399 | ||
1400 | void MainWindow::storagehowto() | ||
1401 | { | ||
1402 | KApplication::showFile( "KDE-Pim/Pi Storage HowTo", "kdepim/storagehowto.txt" ); | ||
1403 | } | ||
1396 | void MainWindow::kdesynchowto() | 1404 | void MainWindow::kdesynchowto() |
1397 | { | 1405 | { |
1398 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); | 1406 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); |
1399 | } | 1407 | } |
1400 | void MainWindow::multisynchowto() | 1408 | void MainWindow::multisynchowto() |
1401 | { | 1409 | { |
1402 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); | 1410 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); |
1403 | } | 1411 | } |
1404 | void MainWindow::synchowto() | 1412 | void MainWindow::synchowto() |
1405 | { | 1413 | { |
1406 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); | 1414 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); |
1407 | } | 1415 | } |
1408 | void MainWindow::faq() | 1416 | void MainWindow::faq() |
1409 | { | 1417 | { |
1410 | KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" ); | 1418 | KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" ); |
1411 | 1419 | ||
1412 | } | 1420 | } |
1413 | void MainWindow::whatsNew() | 1421 | void MainWindow::whatsNew() |
1414 | { | 1422 | { |
1415 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); | 1423 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); |
1416 | 1424 | ||
1417 | } | 1425 | } |
1418 | void MainWindow::licence() | 1426 | void MainWindow::licence() |
1419 | { | 1427 | { |
1420 | KApplication::showLicence(); | 1428 | KApplication::showLicence(); |
1421 | 1429 | ||
1422 | } | 1430 | } |
1423 | void MainWindow::about() | 1431 | void MainWindow::about() |
1424 | { | 1432 | { |
1425 | QString version; | 1433 | QString version; |
1426 | #include <../version> | 1434 | #include <../version> |
1427 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), | 1435 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 4d1753f..3151f50 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -38,64 +38,65 @@ class KOMenuBar : public QMenuBar | |||
38 | QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );} | 38 | QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );} |
39 | }; | 39 | }; |
40 | 40 | ||
41 | using namespace KCal; | 41 | using namespace KCal; |
42 | 42 | ||
43 | class MainWindow : public QMainWindow | 43 | class MainWindow : public QMainWindow |
44 | { | 44 | { |
45 | Q_OBJECT | 45 | Q_OBJECT |
46 | public: | 46 | public: |
47 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); | 47 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); |
48 | ~MainWindow(); | 48 | ~MainWindow(); |
49 | bool beamReceiveEnabled(); | 49 | bool beamReceiveEnabled(); |
50 | static QString defaultFileName(); | 50 | static QString defaultFileName(); |
51 | static QString syncFileName(); | 51 | static QString syncFileName(); |
52 | static QString resourcePath(); | 52 | static QString resourcePath(); |
53 | public slots: | 53 | public slots: |
54 | void setCaption ( const QString & ); | 54 | void setCaption ( const QString & ); |
55 | void updateWeekNum(const KCal::DateList &); | 55 | void updateWeekNum(const KCal::DateList &); |
56 | void updateWeek(QDate); | 56 | void updateWeek(QDate); |
57 | void updateFilterToolbar(); | 57 | void updateFilterToolbar(); |
58 | virtual void showMaximized (); | 58 | virtual void showMaximized (); |
59 | void configureAgenda( int ); | 59 | void configureAgenda( int ); |
60 | void recieve( const QCString& msg, const QByteArray& data ); | 60 | void recieve( const QCString& msg, const QByteArray& data ); |
61 | protected slots: | 61 | protected slots: |
62 | void setCaptionToDates(); | 62 | void setCaptionToDates(); |
63 | void weekAction(); | 63 | void weekAction(); |
64 | void about(); | 64 | void about(); |
65 | void licence(); | 65 | void licence(); |
66 | void faq(); | 66 | void faq(); |
67 | void usertrans(); | 67 | void usertrans(); |
68 | void features(); | 68 | void features(); |
69 | void synchowto(); | 69 | void synchowto(); |
70 | void storagehowto(); | ||
70 | void kdesynchowto(); | 71 | void kdesynchowto(); |
71 | void multisynchowto(); | 72 | void multisynchowto(); |
72 | void whatsNew(); | 73 | void whatsNew(); |
73 | void keyBindings(); | 74 | void keyBindings(); |
74 | void aboutAutoSaving();; | 75 | void aboutAutoSaving();; |
75 | void aboutKnownBugs(); | 76 | void aboutKnownBugs(); |
76 | 77 | ||
77 | void processIncidenceSelection( Incidence * ); | 78 | void processIncidenceSelection( Incidence * ); |
78 | 79 | ||
79 | void importQtopia(); | 80 | void importQtopia(); |
80 | void importBday(); | 81 | void importBday(); |
81 | void importOL(); | 82 | void importOL(); |
82 | void importIcal(); | 83 | void importIcal(); |
83 | void importFile( QString, bool ); | 84 | void importFile( QString, bool ); |
84 | void quickImportIcal(); | 85 | void quickImportIcal(); |
85 | 86 | ||
86 | void slotModifiedChanged( bool ); | 87 | void slotModifiedChanged( bool ); |
87 | 88 | ||
88 | void save(); | 89 | void save(); |
89 | void saveStopTimer(); | 90 | void saveStopTimer(); |
90 | void configureToolBar( int ); | 91 | void configureToolBar( int ); |
91 | void printSel(); | 92 | void printSel(); |
92 | void printCal(); | 93 | void printCal(); |
93 | void saveCalendar(); | 94 | void saveCalendar(); |
94 | void loadCalendar(); | 95 | void loadCalendar(); |
95 | void exportVCalendar(); | 96 | void exportVCalendar(); |
96 | void fillFilterMenu(); | 97 | void fillFilterMenu(); |
97 | void fillFilterMenuTB(); | 98 | void fillFilterMenuTB(); |
98 | void selectFilter( int ); | 99 | void selectFilter( int ); |
99 | void fillFilterMenuPopup(); | 100 | void fillFilterMenuPopup(); |
100 | void selectFilterPopup( int ); | 101 | void selectFilterPopup( int ); |
101 | void exportToPhone( int ); | 102 | void exportToPhone( int ); |