summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-06 21:32:25 (UTC)
committer zautrix <zautrix>2004-08-06 21:32:25 (UTC)
commitacc0637eb0965d66b96d138d74514acf2cf24792 (patch) (unidiff)
tree6787abd671406bbdeb2e3387aa39ba4806d84689
parent2087f0a25354897ff9b987093e1c6716d7bd967b (diff)
downloadkdepimpi-acc0637eb0965d66b96d138d74514acf2cf24792.zip
kdepimpi-acc0637eb0965d66b96d138d74514acf2cf24792.tar.gz
kdepimpi-acc0637eb0965d66b96d138d74514acf2cf24792.tar.bz2
more licence stuff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/kmicromail/COPYRIGHTlibetpan28
-rw-r--r--kmicromail/mainwindow.cpp27
-rw-r--r--kmicromail/mainwindow.h3
-rw-r--r--microkde/kapplication.cpp52
-rw-r--r--microkde/kapplication.h1
5 files changed, 87 insertions, 24 deletions
diff --git a/bin/kdepim/kmicromail/COPYRIGHTlibetpan b/bin/kdepim/kmicromail/COPYRIGHTlibetpan
new file mode 100644
index 0000000..a8b98f9
--- a/dev/null
+++ b/bin/kdepim/kmicromail/COPYRIGHTlibetpan
@@ -0,0 +1,28 @@
1libEtPan! -- a mail stuff library
2
3Copyright (C) 2001, 2002 - DINH Viet Hoa
4All rights reserved.
5
6Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions
8are met:
91. Redistributions of source code must retain the above copyright
10 notice, this list of conditions and the following disclaimer.
112. Redistributions in binary form must reproduce the above copyright
12 notice, this list of conditions and the following disclaimer in the
13 documentation and/or other materials provided with the distribution.
143. Neither the name of the libEtPan! project nor the names of its
15 contributors may be used to endorse or promote products derived
16 from this software without specific prior written permission.
17
18THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
19ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
22FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28SUCH DAMAGE.
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index aa51a37..24196b4 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -1,19 +1,20 @@
1#include <qlabel.h> 1#include <qlabel.h>
2#include <qvbox.h> 2#include <qvbox.h>
3#include <qheader.h> 3#include <qheader.h>
4#include <qtimer.h> 4#include <qtimer.h>
5#include <qlayout.h> 5#include <qlayout.h>
6#include <kdialog.h> 6#include <kdialog.h>
7#include <kiconloader.h> 7#include <kiconloader.h>
8#include <kapplication.h>
8 9
9#ifndef DESKTOP_VERSION 10#ifndef DESKTOP_VERSION
10#include <qpe/qpeapplication.h> 11#include <qpe/qpeapplication.h>
11#endif 12#endif
12#include "defines.h" 13#include "defines.h"
13#include "mainwindow.h" 14#include "mainwindow.h"
14#include <KDGanttMinimizeSplitter.h> 15#include <KDGanttMinimizeSplitter.h>
15 16
16 17
17#include <kabc/stdaddressbook.h> 18#include <kabc/stdaddressbook.h>
18 19
19MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) 20MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
@@ -141,30 +142,56 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
141 list.append( 100 ); 142 list.append( 100 );
142 split->setSizes( list ); 143 split->setSizes( list );
143 QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) ); 144 QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
144 mailView->setShowSortIndicator ( true ); 145 mailView->setShowSortIndicator ( true );
145 QLabel *spacer = new QLabel( toolBar ); 146 QLabel *spacer = new QLabel( toolBar );
146 spacer->setBackgroundMode( QWidget::PaletteButton ); 147 spacer->setBackgroundMode( QWidget::PaletteButton );
147 toolBar->setStretchableWidget( spacer ); 148 toolBar->setStretchableWidget( spacer );
148 149
149 QAction* closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this); 150 QAction* closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this);
150 connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); 151 connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
151 closeMail->addTo(toolBar); 152 closeMail->addTo(toolBar);
152 closeMail->addTo(mailMenu); 153 closeMail->addTo(mailMenu);
154
155
156 QPopupMenu* helpMenu = new QPopupMenu( menuBar );
157 menuBar->insertItem( tr( "Help" ), helpMenu );
158 QAction* li = new QAction(tr("About"), QPixmap(), 0, 0, this);
159 connect( li, SIGNAL( activated() ), SLOT( showAbout()) );
160 li->addTo(helpMenu);
161 li = new QAction(tr("Licence"),QPixmap(), 0, 0, this);
162 connect( li, SIGNAL( activated() ), SLOT( showLicence()) );
163 li->addTo(helpMenu);
164 li = new QAction(tr("LibEtPan Licence"), QPixmap(), 0, 0, this);
165 connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) );
166 li->addTo(helpMenu);
153} 167}
154 168
155MainWindow::~MainWindow() 169MainWindow::~MainWindow()
156{ 170{
157} 171}
158 172
173void MainWindow::showLicence()
174{
175 KApplication::showLicence();
176}
177void MainWindow::showAbout()
178{
179 qDebug("MainWindow::showAbout() ");
180}
181void MainWindow::showEtpanLicence()
182{
183 KApplication::showFile( "LibEtPan licence", "kdepim/kmicromail/COPYRIGHTlibetpan" );
184
185}
159void MainWindow::appMessage(const QCString &, const QByteArray &) 186void MainWindow::appMessage(const QCString &, const QByteArray &)
160{ 187{
161 qDebug("appMessage implemented by subclass"); 188 qDebug("appMessage implemented by subclass");
162} 189}
163 190
164void MainWindow::slotAdjustLayout() { 191void MainWindow::slotAdjustLayout() {
165 192
166 /* 193 /*
167 QWidget *d = QApplication::desktop(); 194 QWidget *d = QApplication::desktop();
168 195
169 if ( d->width() < d->height() ) { 196 if ( d->width() < d->height() ) {
170 layout->setDirection( QBoxLayout::TopToBottom ); 197 layout->setDirection( QBoxLayout::TopToBottom );
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index 0cb252c..d6dc6cc 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -31,24 +31,27 @@ public slots:
31 31
32protected slots: 32protected slots:
33 virtual void slotSendQueued(); 33 virtual void slotSendQueued();
34 virtual void slotEditAccounts(); 34 virtual void slotEditAccounts();
35 virtual void slotShowFolders( bool show ); 35 virtual void slotShowFolders( bool show );
36 virtual void refreshMailView(const QValueList<RecMailP>&); 36 virtual void refreshMailView(const QValueList<RecMailP>&);
37 virtual void displayMail(); 37 virtual void displayMail();
38 virtual void slotDeleteMail(); 38 virtual void slotDeleteMail();
39 virtual void mailHold(int, QListViewItem *,const QPoint&,int); 39 virtual void mailHold(int, QListViewItem *,const QPoint&,int);
40 virtual void slotAdjustLayout(); 40 virtual void slotAdjustLayout();
41 virtual void slotEditSettings(); 41 virtual void slotEditSettings();
42 virtual void mailLeftClicked( QListViewItem * ); 42 virtual void mailLeftClicked( QListViewItem * );
43 void showLicence();
44 void showAbout();
45 void showEtpanLicence();
43 46
44protected: 47protected:
45 QToolBar *toolBar; 48 QToolBar *toolBar;
46 StatusWidget *statusWidget; 49 StatusWidget *statusWidget;
47 QMenuBar *menuBar; 50 QMenuBar *menuBar;
48 QPopupMenu *mailMenu, *settingsMenu; 51 QPopupMenu *mailMenu, *settingsMenu;
49 QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, 52 QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails,
50 *editSettings, *editAccounts, *syncFolders; 53 *editSettings, *editAccounts, *syncFolders;
51 AccountView *folderView; 54 AccountView *folderView;
52 QListView *mailView; 55 QListView *mailView;
53 //QBoxLayout *layout; 56 //QBoxLayout *layout;
54}; 57};
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index f0de71e..ad0b78e 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -31,45 +31,49 @@ QString KApplication::randomString(int length)
31 // so what if I work backwards? 31 // so what if I work backwards?
32 } 32 }
33 return str; 33 return str;
34} 34}
35int KApplication::execDialog( QDialog* d ) 35int KApplication::execDialog( QDialog* d )
36{ 36{
37 if (QApplication::desktop()->width() <= 640 ) 37 if (QApplication::desktop()->width() <= 640 )
38 d->showMaximized(); 38 d->showMaximized();
39 return d->exec(); 39 return d->exec();
40} 40}
41void KApplication::showLicence() 41void KApplication::showLicence()
42{ 42{
43 QString fileName ; 43 KApplication::showFile( "KDE-Pim/Pi licence", "kdepim/LICENCE.TXT" );
44 QString text; 44}
45
46void KApplication::showFile(QString caption, QString fn)
47{
48 QString text;
49 QString fileName;
45#ifndef DESKTOP_VERSION 50#ifndef DESKTOP_VERSION
46 fileName = getenv("QPEDIR"); 51 fileName = getenv("QPEDIR");
47 fileName += "/pics/kdepim/LICENCE.TXT" ; 52 fileName += "/pics/" + fn ;
48#else 53#else
49 fileName = qApp->applicationDirPath () + "/kdepim/LICENCE.TXT"; 54 fileName = qApp->applicationDirPath () + "/" + fn;
50#endif 55#endif
51 QFile file( fileName ); 56 QFile file( fileName );
52 qDebug("Licence file name %s ",fileName.latin1() ); 57 if (!file.open( IO_ReadOnly ) ) {
53 if (!file.open( IO_ReadOnly ) ) { 58 return ;
54 return ; 59 }
55 } 60 QTextStream ts( &file );
56 QTextStream ts( &file ); 61 text = ts.read();
57 text = ts.read(); 62 file.close();
58 file.close(); 63
59 64 QDialog dia( 0, "name", true ); ;
60 QDialog dia( 0, "name", true ); ; 65 dia.setCaption( caption );
61 dia.setCaption( "KDE-Pim/Pi licence" ); 66 QVBoxLayout* lay = new QVBoxLayout( &dia );
62 QVBoxLayout* lay = new QVBoxLayout( &dia ); 67 lay->setSpacing( 3 );
63 lay->setSpacing( 3 ); 68 lay->setMargin( 3 );
64 lay->setMargin( 3 ); 69 QTextBrowser tb ( &dia );
65 QTextBrowser tb ( &dia ); 70 lay->addWidget( &tb );
66 lay->addWidget( &tb ); 71 tb.setText( text );
67 tb.setText( text );
68#ifdef DESKTOP_VERSION 72#ifdef DESKTOP_VERSION
69 dia.resize( 640, 480); 73 dia.resize( 640, 480);
70#else 74#else
71 dia.showMaximized(); 75 dia.showMaximized();
72#endif 76#endif
73 dia.exec(); 77 dia.exec();
74 78
75} 79}
diff --git a/microkde/kapplication.h b/microkde/kapplication.h
index 9515c60..5ae5c00 100644
--- a/microkde/kapplication.h
+++ b/microkde/kapplication.h
@@ -9,16 +9,17 @@ class KApplication
9 public: 9 public:
10 static int random(); 10 static int random();
11 11
12//US 12//US
13 /** 13 /**
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 static void showLicence();
21 static void showFile(QString caption, QString file);
21}; 22};
22 23
23 24
24#endif 25#endif