author | zautrix <zautrix> | 2004-08-06 10:53:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-06 10:53:41 (UTC) |
commit | cde989298c4891f54ad70ae03080ac8fa57b5c3f (patch) (unidiff) | |
tree | 945e4d75d5c6f2a6a2ebed6e50a6a1a769e4366c /korganizer | |
parent | 841ce8881dbeee8a10dea8b96f82addd28f52536 (diff) | |
download | kdepimpi-cde989298c4891f54ad70ae03080ac8fa57b5c3f.zip kdepimpi-cde989298c4891f54ad70ae03080ac8fa57b5c3f.tar.gz kdepimpi-cde989298c4891f54ad70ae03080ac8fa57b5c3f.tar.bz2 |
Added licence menu in kopi
-rw-r--r-- | korganizer/mainwindow.cpp | 10 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 6020a46..57b299f 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -32,24 +32,25 @@ | |||
32 | #include <libkcal/calendarlocal.h> | 32 | #include <libkcal/calendarlocal.h> |
33 | #include <libkcal/todo.h> | 33 | #include <libkcal/todo.h> |
34 | #include <libkdepim/ksyncprofile.h> | 34 | #include <libkdepim/ksyncprofile.h> |
35 | #include <libkdepim/kincidenceformatter.h> | 35 | #include <libkdepim/kincidenceformatter.h> |
36 | 36 | ||
37 | #include "calendarview.h" | 37 | #include "calendarview.h" |
38 | #include "koviewmanager.h" | 38 | #include "koviewmanager.h" |
39 | #include "datenavigator.h" | 39 | #include "datenavigator.h" |
40 | #include "koagendaview.h" | 40 | #include "koagendaview.h" |
41 | #include "koagenda.h" | 41 | #include "koagenda.h" |
42 | #include "kodialogmanager.h" | 42 | #include "kodialogmanager.h" |
43 | #include "kdialogbase.h" | 43 | #include "kdialogbase.h" |
44 | #include "kapplication.h" | ||
44 | #include "kstandarddirs.h" | 45 | #include "kstandarddirs.h" |
45 | #include "koprefs.h" | 46 | #include "koprefs.h" |
46 | #include "kfiledialog.h" | 47 | #include "kfiledialog.h" |
47 | #include "koglobals.h" | 48 | #include "koglobals.h" |
48 | #include "kglobal.h" | 49 | #include "kglobal.h" |
49 | #include "klocale.h" | 50 | #include "klocale.h" |
50 | #include "kconfig.h" | 51 | #include "kconfig.h" |
51 | #include "simplealarmclient.h" | 52 | #include "simplealarmclient.h" |
52 | using namespace KCal; | 53 | using namespace KCal; |
53 | #ifndef _WIN32_ | 54 | #ifndef _WIN32_ |
54 | #include <unistd.h> | 55 | #include <unistd.h> |
55 | #else | 56 | #else |
@@ -682,24 +683,28 @@ void MainWindow::initActions() | |||
682 | connect( action, SIGNAL( activated() ), | 683 | connect( action, SIGNAL( activated() ), |
683 | SLOT( whatsNew() ) ); | 684 | SLOT( whatsNew() ) ); |
684 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); | 685 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); |
685 | action->addTo( helpMenu ); | 686 | action->addTo( helpMenu ); |
686 | connect( action, SIGNAL( activated() ), | 687 | connect( action, SIGNAL( activated() ), |
687 | SLOT( faq() ) ); | 688 | SLOT( faq() ) ); |
688 | 689 | ||
689 | 690 | ||
690 | action = new QAction( "about", i18n("About..."), 0, this ); | 691 | action = new QAction( "about", i18n("About..."), 0, this ); |
691 | action->addTo( helpMenu ); | 692 | action->addTo( helpMenu ); |
692 | connect( action, SIGNAL( activated() ), | 693 | connect( action, SIGNAL( activated() ), |
693 | SLOT( about() ) ); | 694 | SLOT( about() ) ); |
695 | action = new QAction( "licence", i18n("Licence..."), 0, this ); | ||
696 | action->addTo( helpMenu ); | ||
697 | connect( action, SIGNAL( activated() ), | ||
698 | SLOT( licence() ) ); | ||
694 | //menuBar->insertSeparator(); | 699 | //menuBar->insertSeparator(); |
695 | 700 | ||
696 | // ****************************************************** | 701 | // ****************************************************** |
697 | // menubar icons | 702 | // menubar icons |
698 | 703 | ||
699 | 704 | ||
700 | iconToolBar->setHorizontalStretchable (true ); | 705 | iconToolBar->setHorizontalStretchable (true ); |
701 | //menuBar->insertItem( iconToolBar ); | 706 | //menuBar->insertItem( iconToolBar ); |
702 | //xdays_action | 707 | //xdays_action |
703 | if (p-> mShowIconNewEvent) | 708 | if (p-> mShowIconNewEvent) |
704 | ne_action->addTo( iconToolBar ); | 709 | ne_action->addTo( iconToolBar ); |
705 | if (p->mShowIconNewTodo ) | 710 | if (p->mShowIconNewTodo ) |
@@ -1051,24 +1056,29 @@ void MainWindow::synchowto() | |||
1051 | displayFile( "howtoSYNC.txt",i18n("KO/Pi Synchronization HowTo") ); | 1056 | displayFile( "howtoSYNC.txt",i18n("KO/Pi Synchronization HowTo") ); |
1052 | } | 1057 | } |
1053 | void MainWindow::faq() | 1058 | void MainWindow::faq() |
1054 | { | 1059 | { |
1055 | displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") ); | 1060 | displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") ); |
1056 | 1061 | ||
1057 | } | 1062 | } |
1058 | void MainWindow::whatsNew() | 1063 | void MainWindow::whatsNew() |
1059 | { | 1064 | { |
1060 | displayFile( "kopiWhatsNew.txt",i18n("KO/Pi Version Info") ); | 1065 | displayFile( "kopiWhatsNew.txt",i18n("KO/Pi Version Info") ); |
1061 | 1066 | ||
1062 | } | 1067 | } |
1068 | void MainWindow::licence() | ||
1069 | { | ||
1070 | KApplication::showLicence(); | ||
1071 | |||
1072 | } | ||
1063 | void MainWindow::about() | 1073 | void MainWindow::about() |
1064 | { | 1074 | { |
1065 | QString version; | 1075 | QString version; |
1066 | #include <../version> | 1076 | #include <../version> |
1067 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), | 1077 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), |
1068 | i18n("KOrganizer/Platform-independent\n") + | 1078 | i18n("KOrganizer/Platform-independent\n") + |
1069 | "(KO/Pi) " + version + " - " + | 1079 | "(KO/Pi) " + version + " - " + |
1070 | 1080 | ||
1071 | #ifdef DESKTOP_VERSION | 1081 | #ifdef DESKTOP_VERSION |
1072 | i18n("Desktop Edition\n") + | 1082 | i18n("Desktop Edition\n") + |
1073 | #else | 1083 | #else |
1074 | i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") + | 1084 | i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") + |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index a681f42..8a3f7b3 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -31,24 +31,25 @@ class MainWindow : public QMainWindow | |||
31 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); | 31 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); |
32 | ~MainWindow(); | 32 | ~MainWindow(); |
33 | public slots: | 33 | public slots: |
34 | void configureAgenda( int ); | 34 | void configureAgenda( int ); |
35 | void recieve( const QCString& msg, const QByteArray& data ); | 35 | void recieve( const QCString& msg, const QByteArray& data ); |
36 | static QString defaultFileName(); | 36 | static QString defaultFileName(); |
37 | static QString resourcePath(); | 37 | static QString resourcePath(); |
38 | protected slots: | 38 | protected slots: |
39 | void setCaptionToDates(); | 39 | void setCaptionToDates(); |
40 | int ringSync(); | 40 | int ringSync(); |
41 | void multiSync( bool askforPrefs = false ); | 41 | void multiSync( bool askforPrefs = false ); |
42 | void about(); | 42 | void about(); |
43 | void licence(); | ||
43 | void faq(); | 44 | void faq(); |
44 | void usertrans(); | 45 | void usertrans(); |
45 | void features(); | 46 | void features(); |
46 | void synchowto(); | 47 | void synchowto(); |
47 | void whatsNew(); | 48 | void whatsNew(); |
48 | void keyBindings(); | 49 | void keyBindings(); |
49 | void aboutAutoSaving();; | 50 | void aboutAutoSaving();; |
50 | void aboutKnownBugs(); | 51 | void aboutKnownBugs(); |
51 | 52 | ||
52 | void processIncidenceSelection( Incidence * ); | 53 | void processIncidenceSelection( Incidence * ); |
53 | 54 | ||
54 | void importQtopia(); | 55 | void importQtopia(); |