summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-07-06 17:04:35 (UTC)
committer zautrix <zautrix>2004-07-06 17:04:35 (UTC)
commit0e4c0997605662222e0c898277de7ef26bd0a0eb (patch) (unidiff)
tree2535e011439859676d8097a6f39fd237a983541a
parent12695014a6bbf791f084d479a33883eeeb6d4e3b (diff)
downloadkdepimpi-0e4c0997605662222e0c898277de7ef26bd0a0eb.zip
kdepimpi-0e4c0997605662222e0c898277de7ef26bd0a0eb.tar.gz
kdepimpi-0e4c0997605662222e0c898277de7ef26bd0a0eb.tar.bz2
Changed external name of Mail
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail.control2
-rw-r--r--kmicromail/kmicromail.desktop6
-rw-r--r--kmicromail/kmicromailE.pro2
-rw-r--r--kmicromail/mainwindow.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/kmicromail.control b/kmicromail.control
index ede8c7d..1d8d692 100644
--- a/kmicromail.control
+++ b/kmicromail.control
@@ -1,14 +1,14 @@
1Files: bin/kmpi apps/Pim/kmicromail.desktop pics/kdepim/kmicromail/* lib/libssl* lib/libcrypto.* lib/libkmicro* 1Files: bin/ompi apps/Pim/kmicromail.desktop pics/kdepim/kmicromail/* lib/libssl* lib/libcrypto.* lib/libkmicro*
2 2
3Priority: optional 3Priority: optional
4Section: qpe/pim 4Section: qpe/pim
5Maintainer: Lutz Rogowski <lutz@pi-sync.net> 5Maintainer: Lutz Rogowski <lutz@pi-sync.net>
6Architecture: arm 6Architecture: arm
7Version: 1.9.2 7Version: 1.9.2
8License: GPL 8License: GPL
9Depends: lib/libmicrokde.so 9Depends: lib/libmicrokde.so
10Description: KOrganizer/Pi and Kaddressbook/Pi 10Description: KOrganizer/Pi and Kaddressbook/Pi
11 The embedded version of KOrganizer/Platform-independend, 11 The embedded version of KOrganizer/Platform-independend,
12 the KDE calendar and scheduling program 12 the KDE calendar and scheduling program
13 optimized for 640x480 and 320x240 resolution 13 optimized for 640x480 and 320x240 resolution
14 on Zaurus PDA 14 on Zaurus PDA
diff --git a/kmicromail/kmicromail.desktop b/kmicromail/kmicromail.desktop
index 791ad4f..a23420a 100644
--- a/kmicromail/kmicromail.desktop
+++ b/kmicromail/kmicromail.desktop
@@ -1,15 +1,15 @@
1[Desktop Entry] 1[Desktop Entry]
2CanFastload=1 2CanFastload=1
3Comment=KM/PI 3Comment=OM/PI
4Comment[de]=KM/PI 4Comment[de]=KM/PI
5Display=640x480/144dpi,480x640/144dpi 5Display=640x480/144dpi,480x640/144dpi
6Exec=kmpi 6Exec=ompi
7GenericName= 7GenericName=
8GenericName[de]= 8GenericName[de]=
9Icon=kdepim/kmicromail/kmicromail 9Icon=kdepim/kmicromail/kmicromail
10MimeType= 10MimeType=
11Name=KM/Pi 11Name=OM/Pi
12StartupNotify=true 12StartupNotify=true
13Terminal=false 13Terminal=false
14TerminalOptions= 14TerminalOptions=
15Type=Application 15Type=Application
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 8f2438c..40761f5 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -31,35 +31,35 @@ SOURCES = main.cpp \
31 settingsdialog.cpp \ 31 settingsdialog.cpp \
32 statuswidget.cpp \ 32 statuswidget.cpp \
33 newmaildir.cpp \ 33 newmaildir.cpp \
34 selectstore.cpp \ 34 selectstore.cpp \
35 selectsmtp.cpp \ 35 selectsmtp.cpp \
36 nntpgroups.cpp \ 36 nntpgroups.cpp \
37 nntpgroupsdlg.cpp 37 nntpgroupsdlg.cpp
38 38
39INTERFACES = editaccountsui.ui \ 39INTERFACES = editaccountsui.ui \
40 selectmailtypeui.ui \ 40 selectmailtypeui.ui \
41 imapconfigui.ui \ 41 imapconfigui.ui \
42 pop3configui.ui \ 42 pop3configui.ui \
43 nntpconfigui.ui \ 43 nntpconfigui.ui \
44 smtpconfigui.ui \ 44 smtpconfigui.ui \
45 composemailui.ui \ 45 composemailui.ui \
46 settingsdialogui.ui \ 46 settingsdialogui.ui \
47 statuswidgetui.ui \ 47 statuswidgetui.ui \
48 newmaildirui.ui \ 48 newmaildirui.ui \
49 selectstoreui.ui \ 49 selectstoreui.ui \
50 nntpgroupsui.ui 50 nntpgroupsui.ui
51 51
52 52
53INCLUDEPATH += ../microkde ../microkde/kdecore ./libetpan/include $(QPEDIR)/include . .. ../microkde/kdeui ../qtcompat 53INCLUDEPATH += ../microkde ../microkde/kdecore ./libetpan/include $(QPEDIR)/include . .. ../microkde/kdeui ../qtcompat
54LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc 54LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc
55LIBS += $(QTOPIALIB) 55LIBS += $(QTOPIALIB)
56#LIBS += -lqtopia 56#LIBS += -lqtopia
57#next line for Zaurus only 57#next line for Zaurus only
58#LIBS += -luuid 58#LIBS += -luuid
59# 59#
60OBJECTS_DIR = obj/$(PLATFORM) 60OBJECTS_DIR = obj/$(PLATFORM)
61MOC_DIR = moc/$(PLATFORM) 61MOC_DIR = moc/$(PLATFORM)
62DESTDIR=$(QPEDIR)/bin 62DESTDIR=$(QPEDIR)/bin
63TARGET = kmpi 63TARGET = ompi
64 64
65 65
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index cd32c72..aa51a37 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -1,54 +1,54 @@
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 8
9#ifndef DESKTOP_VERSION 9#ifndef DESKTOP_VERSION
10#include <qpe/qpeapplication.h> 10#include <qpe/qpeapplication.h>
11#endif 11#endif
12#include "defines.h" 12#include "defines.h"
13#include "mainwindow.h" 13#include "mainwindow.h"
14#include <KDGanttMinimizeSplitter.h> 14#include <KDGanttMinimizeSplitter.h>
15 15
16 16
17#include <kabc/stdaddressbook.h> 17#include <kabc/stdaddressbook.h>
18 18
19MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) 19MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
20 : QMainWindow( parent, name ) //, flags ) 20 : QMainWindow( parent, name ) //, flags )
21{ 21{
22 setCaption( tr( "KMicroMail" ) ); 22 setCaption( tr( "OpieMail/Pi" ) );
23 setToolBarsMovable( false ); 23 setToolBarsMovable( false );
24 KABC::StdAddressBook::self(); 24 KABC::StdAddressBook::self();
25 toolBar = new QToolBar( this ); 25 toolBar = new QToolBar( this );
26 menuBar = new QMenuBar( toolBar ); 26 menuBar = new QMenuBar( toolBar );
27 mailMenu = new QPopupMenu( menuBar ); 27 mailMenu = new QPopupMenu( menuBar );
28 menuBar->insertItem( tr( "Mail" ), mailMenu ); 28 menuBar->insertItem( tr( "Mail" ), mailMenu );
29 settingsMenu = new QPopupMenu( menuBar ); 29 settingsMenu = new QPopupMenu( menuBar );
30 menuBar->insertItem( tr( "Settings" ), settingsMenu ); 30 menuBar->insertItem( tr( "Settings" ), settingsMenu );
31 31
32 addToolBar( toolBar ); 32 addToolBar( toolBar );
33 toolBar->setHorizontalStretchable( true ); 33 toolBar->setHorizontalStretchable( true );
34 34
35 35
36 36
37 composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"), 37 composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"),
38 0, 0, this ); 38 0, 0, this );
39 composeMail->addTo( toolBar ); 39 composeMail->addTo( toolBar );
40 composeMail->addTo( mailMenu ); 40 composeMail->addTo( mailMenu );
41 41
42 sendQueued = new QAction( tr( "Send queued mails" ), SmallIcon("sendqueued") , 42 sendQueued = new QAction( tr( "Send queued mails" ), SmallIcon("sendqueued") ,
43 0, 0, this ); 43 0, 0, this );
44 sendQueued->addTo( toolBar ); 44 sendQueued->addTo( toolBar );
45 sendQueued->addTo( mailMenu ); 45 sendQueued->addTo( mailMenu );
46 46
47 /* 47 /*
48 syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC, 48 syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC,
49 0, 0, this ); 49 0, 0, this );
50 syncFolders->addTo( toolBar ); 50 syncFolders->addTo( toolBar );
51 syncFolders->addTo( mailMenu ); 51 syncFolders->addTo( mailMenu );
52 */ 52 */
53 53
54 showFolders = new QAction( tr( "Show/Hide folders" ), SmallIcon("showfolders") , 54 showFolders = new QAction( tr( "Show/Hide folders" ), SmallIcon("showfolders") ,