summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile22
-rw-r--r--korganizer/mainwindow.cpp10
-rw-r--r--korganizer/mainwindow.h1
-rw-r--r--microkde/kapplication.cpp44
-rw-r--r--microkde/kapplication.h1
5 files changed, 60 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 19c57e5..38fd000 100644
--- a/Makefile
+++ b/Makefile
@@ -23,19 +23,19 @@ SUBDIRS_MICROKDE = \
23 kabc/plugins/dir \ 23 kabc/plugins/dir \
24 korganizer \ 24 korganizer \
25 kalarmd \ 25 kalarmd \
26 kaddressbook 26 kaddressbook
27 27
28SUBDIRS_QTOPIA_PLUGIN = \ 28SUBDIRS_QTOPIA_PLUGIN = \
29 kabc/plugins/qtopia 29 kabc/plugins/qtopia
30 30
31SUBDIRS_OPIE_PLUGIN = \ 31SUBDIRS_OPIE_PLUGIN = \
32 kabc/plugins/opie 32 kabc/plugins/opie
33 33
34SUBDIRS_SHARP_PLUGIN = \ 34SUBDIRS_SHARP_PLUGIN = \
35 kabc/plugins/sharpdtm 35 kabc/plugins/sharpdtm
36 36
37SUBDIRS_LDAP_PLUGIN = \ 37SUBDIRS_LDAP_PLUGIN = \
38 kabc/plugins/ldap 38 kabc/plugins/ldap
39 39
40SUBDIRS_MICROMAIL = \ 40SUBDIRS_MICROMAIL = \
41 kmicromail/libetpan \ 41 kmicromail/libetpan \
@@ -139,16 +139,16 @@ variable_test: variable_info
139 ifdef BUILD_NO_MICROMAIL 139 ifdef BUILD_NO_MICROMAIL
140 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) 140 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
141 endif 141 endif
142 ifdef BUILD_NO_SHARP_PLUGIN 142 ifdef BUILD_NO_SHARP_PLUGIN
143 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) 143 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
144 else 144 else
145 ifndef SHARPDTMSDK 145 ifndef SHARPDTMSDK
146 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) 146 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
147 $(error SHARPDTMSDK is not defined) 147 $(error SHARPDTMSDK is not defined)
148 endif 148 endif
149 endif 149 endif
150 @echo -------------------------------------- 150 @echo --------------------------------------
151 151
152 152
153objects: 153objects:
154 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 154 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
@@ -194,19 +194,17 @@ tmake: objects \
194 kabc/plugins/file/Makefile$(PLATFORM) \ 194 kabc/plugins/file/Makefile$(PLATFORM) \
195 kabc/plugins/dir/Makefile$(PLATFORM) \ 195 kabc/plugins/dir/Makefile$(PLATFORM) \
196 kabc/plugins/ldap/Makefile$(PLATFORM) \ 196 kabc/plugins/ldap/Makefile$(PLATFORM) \
197 kabc/plugins/opie/Makefile$(PLATFORM) \ 197 kabc/plugins/opie/Makefile$(PLATFORM) \
198 kabc/plugins/qtopia/Makefile$(PLATFORM) \ 198 kabc/plugins/qtopia/Makefile$(PLATFORM) \
199 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ 199 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
200 kaddressbook/xxport/opie/Makefile$(PLATFORM) \
201 kaddressbook/xxport/qtopia/Makefile$(PLATFORM) \
202 kaddressbook/xxport/sharpdtm/Makefile$(PLATFORM) \
203 kaddressbook/Makefile$(PLATFORM) \ 200 kaddressbook/Makefile$(PLATFORM) \
204 kmicromail/Makefile$(PLATFORM) \ 201 kmicromail/Makefile$(PLATFORM) \
205 kmicromail/libetpan/Makefile$(PLATFORM) \ 202 kmicromail/libetpan/Makefile$(PLATFORM) \
206 kmicromail/libmailwrapper/Makefile$(PLATFORM) 203 kmicromail/libmailwrapper/Makefile$(PLATFORM)
204
207 205
208 206
209 207
210qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro 208qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
211 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM) 209 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
212 210
@@ -253,22 +251,12 @@ kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
253kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro 251kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
254 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM) 252 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
255 253
256kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro 254kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
257 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM) 255 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM)
258 256
259kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro
260 cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
261
262kaddressbook/xxport/qtopia/Makefile$(PLATFORM): kaddressbook/xxport/qtopia/qtopiaE.pro
263 cd kaddressbook/xxport/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
264
265kaddressbook/xxport/sharpdtm/Makefile$(PLATFORM): kaddressbook/xxport/sharpdtm/sharpdtmE.pro
266 cd kaddressbook/xxport/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM)
267
268
269kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro 257kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
270 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM) 258 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM)
271 259
272kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro 260kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
273 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM) 261 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM)
274 262
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 6020a46..57b299f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -38,12 +38,13 @@
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"
@@ -688,12 +689,16 @@ void MainWindow::initActions()
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
@@ -1057,12 +1062,17 @@ void MainWindow::faq()
1057} 1062}
1058void MainWindow::whatsNew() 1063void 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}
1068void MainWindow::licence()
1069{
1070 KApplication::showLicence();
1071
1072}
1063void MainWindow::about() 1073void 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") +
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index a681f42..8a3f7b3 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -37,12 +37,13 @@ class MainWindow : public QMainWindow
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();
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index 1b3e689..f0de71e 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -1,10 +1,17 @@
1#include <stdlib.h> 1#include <stdlib.h>
2#include <stdio.h>
2 3
3#include "kapplication.h" 4#include "kapplication.h"
4#include <qapplication.h> 5#include <qapplication.h>
6#include <qstring.h>
7#include <qfile.h>
8#include <qtextstream.h>
9#include <qdialog.h>
10#include <qlayout.h>
11#include <qtextbrowser.h>
5 12
6int KApplication::random() 13int KApplication::random()
7{ 14{
8 return rand(); 15 return rand();
9} 16}
10 17
@@ -22,12 +29,47 @@ QString KApplication::randomString(int length)
22 if (r>90) r+=6; 29 if (r>90) r+=6;
23 str += char(r); 30 str += char(r);
24 // so what if I work backwards? 31 // so what if I work backwards?
25 } 32 }
26 return str; 33 return str;
27} 34}
28 int KApplication::execDialog( QDialog* d ) 35int KApplication::execDialog( QDialog* d )
29{ 36{
30 if (QApplication::desktop()->width() <= 640 ) 37 if (QApplication::desktop()->width() <= 640 )
31 d->showMaximized(); 38 d->showMaximized();
32 return d->exec(); 39 return d->exec();
33} 40}
41void KApplication::showLicence()
42{
43 QString fileName ;
44 QString text;
45#ifndef DESKTOP_VERSION
46 fileName = getenv("QPEDIR");
47 fileName += "/pics/kdepim/LICENCE.TXT" ;
48#else
49 fileName = qApp->applicationDirPath () + "/kdepim/LICENCE.TXT";
50#endif
51 QFile file( fileName );
52 qDebug("Licence file name %s ",fileName.latin1() );
53 if (!file.open( IO_ReadOnly ) ) {
54 return ;
55 }
56 QTextStream ts( &file );
57 text = ts.read();
58 file.close();
59
60 QDialog dia( 0, "name", true ); ;
61 dia.setCaption( "KDE-Pim/Pi licence" );
62 QVBoxLayout* lay = new QVBoxLayout( &dia );
63 lay->setSpacing( 3 );
64 lay->setMargin( 3 );
65 QTextBrowser tb ( &dia );
66 lay->addWidget( &tb );
67 tb.setText( text );
68#ifdef DESKTOP_VERSION
69 dia.resize( 640, 480);
70#else
71 dia.showMaximized();
72#endif
73 dia.exec();
74
75}
diff --git a/microkde/kapplication.h b/microkde/kapplication.h
index 77206f5..9515c60 100644
--- a/microkde/kapplication.h
+++ b/microkde/kapplication.h
@@ -14,10 +14,11 @@ class KApplication
14 * Generates a random string. It operates in the range [A-Za-z0-9] 14 * Generates a random string. It operates in the range [A-Za-z0-9]
15 * @param length Generate a string of this length. 15 * @param length Generate a string of this length.
16 * @return the random string 16 * @return the random string
17 */ 17 */
18 static QString randomString(int length); 18 static QString randomString(int length);
19 static int execDialog( QDialog* ); 19 static int execDialog( QDialog* );
20 static void showLicence();
20}; 21};
21 22
22 23
23#endif 24#endif