summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-23 06:49:54 (UTC)
committer zautrix <zautrix>2004-10-23 06:49:54 (UTC)
commit65989e4ab454f228fb6cd2fa532145ed54366701 (patch) (unidiff)
treea93a8cd6ef806dd5b6c38e8792a6e007b9e5e413
parent0f0dc54f0edc8c4ec5b320118c82fa5150591fed (diff)
downloadkdepimpi-65989e4ab454f228fb6cd2fa532145ed54366701.zip
kdepimpi-65989e4ab454f228fb6cd2fa532145ed54366701.tar.gz
kdepimpi-65989e4ab454f228fb6cd2fa532145ed54366701.tar.bz2
statusmessage added topwm.fixed initialization problem.changed sring in translation
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt2
-rw-r--r--bin/kdepim/kaddressbook/usertranslation.txt2
-rw-r--r--bin/kdepim/korganizer/usertranslation.txt2
-rw-r--r--kabc/plugins/qtopia/qtopiaconverter.cpp2
-rw-r--r--kabc/plugins/qtopia/qtopiaconverter.h2
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp2
-rw-r--r--kabc/plugins/qtopia/resourceqtopiaconfig.cpp3
-rw-r--r--korganizer/wordsgerman.h2
-rw-r--r--pwmanager/pwmanager/pwm.cpp9
9 files changed, 13 insertions, 13 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index a5ba794..16c4178 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -135,17 +135,17 @@
135{ "&Undo","&Undo" }, 135{ "&Undo","&Undo" },
136{ "Re&do","Re&do" }, 136{ "Re&do","Re&do" },
137{ "&Delete Contact","&Delete Contact" }, 137{ "&Delete Contact","&Delete Contact" },
138{ "Configure &Resources...","Configure &Resources..." }, 138{ "Configure &Resources...","Configure &Resources..." },
139{ "&Configure %1...","&Configure %1..." }, 139{ "&Configure %1...","&Configure %1..." },
140{ "Configure S&hortcuts...","Configure S&hortcuts..." }, 140{ "Configure S&hortcuts...","Configure S&hortcuts..." },
141{ "Show Jump Bar","Show Jump Bar" }, 141{ "Show Jump Bar","Show Jump Bar" },
142{ "Show Details","Show Details" }, 142{ "Show Details","Show Details" },
143{ "Beam receice enabled","Beam receice enabled" }, 143{ "Beam receive enabled","Beam receice enabled" },
144{ "Set Who Am I","Set Who Am I" }, 144{ "Set Who Am I","Set Who Am I" },
145{ "Set Categories","Set Categories" }, 145{ "Set Categories","Set Categories" },
146{ "Remove "voice"...","Remove "voice"..." }, 146{ "Remove "voice"...","Remove "voice"..." },
147{ "Import from Outlook...","Import from Outlook..." }, 147{ "Import from Outlook...","Import from Outlook..." },
148{ "Licence","Licence" }, 148{ "Licence","Licence" },
149{ "Faq","Faq" }, 149{ "Faq","Faq" },
150{ "What's New?","What's New?" }, 150{ "What's New?","What's New?" },
151{ "Sync HowTo","Sync HowTo" }, 151{ "Sync HowTo","Sync HowTo" },
diff --git a/bin/kdepim/kaddressbook/usertranslation.txt b/bin/kdepim/kaddressbook/usertranslation.txt
index a5ba794..16c4178 100644
--- a/bin/kdepim/kaddressbook/usertranslation.txt
+++ b/bin/kdepim/kaddressbook/usertranslation.txt
@@ -135,17 +135,17 @@
135{ "&Undo","&Undo" }, 135{ "&Undo","&Undo" },
136{ "Re&do","Re&do" }, 136{ "Re&do","Re&do" },
137{ "&Delete Contact","&Delete Contact" }, 137{ "&Delete Contact","&Delete Contact" },
138{ "Configure &Resources...","Configure &Resources..." }, 138{ "Configure &Resources...","Configure &Resources..." },
139{ "&Configure %1...","&Configure %1..." }, 139{ "&Configure %1...","&Configure %1..." },
140{ "Configure S&hortcuts...","Configure S&hortcuts..." }, 140{ "Configure S&hortcuts...","Configure S&hortcuts..." },
141{ "Show Jump Bar","Show Jump Bar" }, 141{ "Show Jump Bar","Show Jump Bar" },
142{ "Show Details","Show Details" }, 142{ "Show Details","Show Details" },
143{ "Beam receice enabled","Beam receice enabled" }, 143{ "Beam receive enabled","Beam receice enabled" },
144{ "Set Who Am I","Set Who Am I" }, 144{ "Set Who Am I","Set Who Am I" },
145{ "Set Categories","Set Categories" }, 145{ "Set Categories","Set Categories" },
146{ "Remove "voice"...","Remove "voice"..." }, 146{ "Remove "voice"...","Remove "voice"..." },
147{ "Import from Outlook...","Import from Outlook..." }, 147{ "Import from Outlook...","Import from Outlook..." },
148{ "Licence","Licence" }, 148{ "Licence","Licence" },
149{ "Faq","Faq" }, 149{ "Faq","Faq" },
150{ "What's New?","What's New?" }, 150{ "What's New?","What's New?" },
151{ "Sync HowTo","Sync HowTo" }, 151{ "Sync HowTo","Sync HowTo" },
diff --git a/bin/kdepim/korganizer/usertranslation.txt b/bin/kdepim/korganizer/usertranslation.txt
index 0236b92..f4c4698 100644
--- a/bin/kdepim/korganizer/usertranslation.txt
+++ b/bin/kdepim/korganizer/usertranslation.txt
@@ -863,17 +863,17 @@
863{ " 80 %"," 80 %" }, 863{ " 80 %"," 80 %" },
864{ "100 %","100 %" }, 864{ "100 %","100 %" },
865{ "Filter","Filter" }, 865{ "Filter","Filter" },
866{ "Configure","Konfiguriere" }, 866{ "Configure","Konfiguriere" },
867{ "What's Next","What's Next" }, 867{ "What's Next","What's Next" },
868{ "Complete calendar...","Kompletten Kalender..." }, 868{ "Complete calendar...","Kompletten Kalender..." },
869{ "Filtered calendar...","Gefilterten Kalender..." }, 869{ "Filtered calendar...","Gefilterten Kalender..." },
870{ "Export to phone","Exportiere zum Handy" }, 870{ "Export to phone","Exportiere zum Handy" },
871{ "Beam receice enabled","Beam Empfang an" }, 871{ "Beam receive enabled","Beam Empfang an" },
872{ "What's new?","Was ist neu?" }, 872{ "What's new?","Was ist neu?" },
873{ "FAQ...","FAQ..." }, 873{ "FAQ...","FAQ..." },
874{ "Licence...","Licence..." }, 874{ "Licence...","Licence..." },
875{ "What's This?","What's This?" }, 875{ "What's This?","What's This?" },
876{ "&Edit...","&Editiere..." }, 876{ "&Edit...","&Editiere..." },
877{ "Oktober","Oktober" }, 877{ "Oktober","Oktober" },
878{ "Title","Titel" }, 878{ "Title","Titel" },
879{ "%1 %","%1 %" }, 879{ "%1 %","%1 %" },
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp
index 106596f..39d366b 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.cpp
+++ b/kabc/plugins/qtopia/qtopiaconverter.cpp
@@ -32,19 +32,17 @@ $Id$
32 32
33#include "qtopiaconverter.h" 33#include "qtopiaconverter.h"
34 34
35#include <qfile.h> 35#include <qfile.h>
36#include <qdir.h> 36#include <qdir.h>
37#include <qtextstream.h> 37#include <qtextstream.h>
38//#include <.h> 38//#include <.h>
39 39
40//#include <qpe/categories.h>
41#include <libkdepim/ksyncprofile.h> 40#include <libkdepim/ksyncprofile.h>
42//US #include <qpe/categoryselect.h>
43 41
44 42
45using namespace KABC; 43using namespace KABC;
46 44
47QtopiaConverter::QtopiaConverter() 45QtopiaConverter::QtopiaConverter()
48{ 46{
49 m_edit = 0; 47 m_edit = 0;
50} 48}
diff --git a/kabc/plugins/qtopia/qtopiaconverter.h b/kabc/plugins/qtopia/qtopiaconverter.h
index d318ded..cb5b433 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.h
+++ b/kabc/plugins/qtopia/qtopiaconverter.h
@@ -25,18 +25,16 @@ $Id$
25*/ 25*/
26 26
27#ifndef KABC_QTOPIACONVERTER_H 27#ifndef KABC_QTOPIACONVERTER_H
28#define KABC_QTOPIACONVERTER_H 28#define KABC_QTOPIACONVERTER_H
29 29
30#include <qstring.h> 30#include <qstring.h>
31 31
32#include "addressee.h" 32#include "addressee.h"
33//#include <qpe/pim/contact.h>
34//#include <qpe/quuid.h>
35 33
36#include <xml/qdom.h> 34#include <xml/qdom.h>
37class Categories; 35class Categories;
38 36
39namespace KABC { 37namespace KABC {
40 38
41 39
42 40
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 4ee3c3c..95fa541 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -38,18 +38,16 @@ $Id$
38#include <kapplication.h> 38#include <kapplication.h>
39#include <kconfig.h> 39#include <kconfig.h>
40#include <kdebug.h> 40#include <kdebug.h>
41#include <klocale.h> 41#include <klocale.h>
42//US #include <ksavefile.h> 42//US #include <ksavefile.h>
43#include <kstandarddirs.h> 43#include <kstandarddirs.h>
44#include <kmessagebox.h> 44#include <kmessagebox.h>
45 45
46#include <qpe/pim/addressbookaccess.h>
47
48 46
49#include "resourceqtopiaconfig.h" 47#include "resourceqtopiaconfig.h"
50#include "stdaddressbook.h" 48#include "stdaddressbook.h"
51 49
52#include "qtopiaconverter.h" 50#include "qtopiaconverter.h"
53 51
54#include "resourceqtopia.h" 52#include "resourceqtopia.h"
55 53
diff --git a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
index b2310c4..0505d0b 100644
--- a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
+++ b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
@@ -33,19 +33,16 @@ $Id$
33#include <kstandarddirs.h> 33#include <kstandarddirs.h>
34#include <kdialog.h> 34#include <kdialog.h>
35 35
36#include <unistd.h> 36#include <unistd.h>
37 37
38#include <qdir.h> 38#include <qdir.h>
39#include <qfile.h> 39#include <qfile.h>
40#include "resourceqtopia.h" 40#include "resourceqtopia.h"
41//US #include <qpe/qpeapplication.h>
42
43//US #include "stdaddressbook.h"
44 41
45#include "resourceqtopiaconfig.h" 42#include "resourceqtopiaconfig.h"
46 43
47using namespace KABC; 44using namespace KABC;
48 45
49ResourceQtopiaConfig::ResourceQtopiaConfig( QWidget* parent, const char* name ) 46ResourceQtopiaConfig::ResourceQtopiaConfig( QWidget* parent, const char* name )
50 : ConfigWidget( parent, name ) 47 : ConfigWidget( parent, name )
51{ 48{
diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h
index b2651d4..c5cae20 100644
--- a/korganizer/wordsgerman.h
+++ b/korganizer/wordsgerman.h
@@ -864,17 +864,17 @@
864{ " 80 %"," 80 %" }, 864{ " 80 %"," 80 %" },
865{ "100 %","100 %" }, 865{ "100 %","100 %" },
866{ "Filter","Filter" }, 866{ "Filter","Filter" },
867{ "Configure","Konfiguriere" }, 867{ "Configure","Konfiguriere" },
868{ "What's Next","What's Next" }, 868{ "What's Next","What's Next" },
869{ "Complete calendar...","Kompletten Kalender..." }, 869{ "Complete calendar...","Kompletten Kalender..." },
870{ "Filtered calendar...","Gefilterten Kalender..." }, 870{ "Filtered calendar...","Gefilterten Kalender..." },
871{ "Export to phone","Exportiere zum Handy" }, 871{ "Export to phone","Exportiere zum Handy" },
872{ "Beam receice enabled","Beam Empfang an" }, 872{ "Beam receive enabled","Beam Empfang an" },
873{ "What's new?","Was ist neu?" }, 873{ "What's new?","Was ist neu?" },
874{ "FAQ...","FAQ..." }, 874{ "FAQ...","FAQ..." },
875{ "Licence...","Licence..." }, 875{ "Licence...","Licence..." },
876{ "What's This?","What's This?" }, 876{ "What's This?","What's This?" },
877{ "&Edit...","&Editiere..." }, 877{ "&Edit...","&Editiere..." },
878{ "Oktober","Oktober" }, 878{ "Oktober","Oktober" },
879{ "Title","Titel" }, 879{ "Title","Titel" },
880{ "%1 %","%1 %" }, 880{ "%1 %","%1 %" },
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index ac0c978..9798e8e 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -35,16 +35,21 @@
35#include <qmessagebox.h> 35#include <qmessagebox.h>
36#include <pwmprefs.h> 36#include <pwmprefs.h>
37#include <kpimglobalprefs.h> 37#include <kpimglobalprefs.h>
38#include <kcmconfigs/kcmpwmconfig.h> 38#include <kcmconfigs/kcmpwmconfig.h>
39#include <kcmconfigs/kcmkdepimconfig.h> 39#include <kcmconfigs/kcmkdepimconfig.h>
40#include <kcmultidialog.h> 40#include <kcmultidialog.h>
41#endif 41#endif
42 42
43
44#ifndef DESKTOP_VERSION
45#include <qpe/global.h>
46#endif
47
43#include <qpixmap.h> 48#include <qpixmap.h>
44#include <qcheckbox.h> 49#include <qcheckbox.h>
45#include <qspinbox.h> 50#include <qspinbox.h>
46#include <qlineedit.h> 51#include <qlineedit.h>
47#include <qfileinfo.h> 52#include <qfileinfo.h>
48#include <qclipboard.h> 53#include <qclipboard.h>
49 54
50 55
@@ -160,16 +165,17 @@ enum {
160 165
161PwM::PwM(PwMInit *_init, PwMDoc *doc, 166PwM::PwM(PwMInit *_init, PwMDoc *doc,
162 bool virginity, 167 bool virginity,
163 QWidget *parent, const char *name) 168 QWidget *parent, const char *name)
164 : KMainWindow(parent, "HALLO") 169 : KMainWindow(parent, "HALLO")
165 , forceQuit (false) 170 , forceQuit (false)
166 , forceMinimizeToTray (false) 171 , forceMinimizeToTray (false)
167{ 172{
173 virgin = !virginity;
168 init = _init; 174 init = _init;
169 connect(doc, SIGNAL(docClosed(PwMDoc *)), 175 connect(doc, SIGNAL(docClosed(PwMDoc *)),
170 this, SLOT(docClosed(PwMDoc *))); 176 this, SLOT(docClosed(PwMDoc *)));
171 initMenubar(); 177 initMenubar();
172 initToolbar(); 178 initToolbar();
173 initMetrics(); 179 initMetrics();
174 setVirgin(virginity); 180 setVirgin(virginity);
175 setFocusPolicy(QWidget::WheelFocus); 181 setFocusPolicy(QWidget::WheelFocus);
@@ -1354,16 +1360,19 @@ void PwM::copyToClipboard(const QString &s)
1354 1360
1355void PwM::showStatMsg(const QString &msg) 1361void PwM::showStatMsg(const QString &msg)
1356{ 1362{
1357#ifndef PWM_EMBEDDED 1363#ifndef PWM_EMBEDDED
1358 KStatusBar *statBar = statusBar(); 1364 KStatusBar *statBar = statusBar();
1359 statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000); 1365 statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000);
1360#else 1366#else
1361 qDebug("Statusbar : %s",msg.latin1()); 1367 qDebug("Statusbar : %s",msg.latin1());
1368#ifndef DESKTOP_VERSION
1369 Global::statusMessage(msg);
1370#endif
1362#endif 1371#endif
1363} 1372}
1364 1373
1365void PwM::focusInEvent(QFocusEvent *e) 1374void PwM::focusInEvent(QFocusEvent *e)
1366{ 1375{
1367 if (e->gotFocus()) { 1376 if (e->gotFocus()) {
1368 emit gotFocus(this); 1377 emit gotFocus(this);
1369 } else if (e->lostFocus()) { 1378 } else if (e->lostFocus()) {