summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-23 06:49:54 (UTC)
committer zautrix <zautrix>2004-10-23 06:49:54 (UTC)
commit65989e4ab454f228fb6cd2fa532145ed54366701 (patch) (side-by-side diff)
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
@@ -111,65 +111,65 @@
{ "&Misc","&Misc" },
{ "Photo","Photo" },
{ "Store as URL","Store as URL" },
{ "Logo","Logo" },
{ "&Images","&Images" },
{ "Home","Home" },
{ "Work","Work" },
{ "Mobile","Mobile" },
{ "Fax","Fax" },
{ "Contact Editor","Contact Editor" },
{ "&Mail...","&Mail..." },
{ "&Print...","&Print..." },
{ "&Save","&Save" },
{ "&New Contact...","&New Contact..." },
{ "Mail &vCard...","Mail &vCard..." },
{ "Selected to phone","Selected to phone" },
{ "Beam selected v&Card(s)","Beam selected v&Card(s)" },
{ "&Beam personal vCard","&Beam personal vCard" },
{ "&Edit Contact...","&Edit Contact..." },
{ "&Exit","&Exit" },
{ "&Copy","&Copy" },
{ "Cu&t","Cu&t" },
{ "&Paste","&Paste" },
{ "Select &All","Select &All" },
{ "&Undo","&Undo" },
{ "Re&do","Re&do" },
{ "&Delete Contact","&Delete Contact" },
{ "Configure &Resources...","Configure &Resources..." },
{ "&Configure %1...","&Configure %1..." },
{ "Configure S&hortcuts...","Configure S&hortcuts..." },
{ "Show Jump Bar","Show Jump Bar" },
{ "Show Details","Show Details" },
-{ "Beam receice enabled","Beam receice enabled" },
+{ "Beam receive enabled","Beam receice enabled" },
{ "Set Who Am I","Set Who Am I" },
{ "Set Categories","Set Categories" },
{ "Remove "voice"...","Remove "voice"..." },
{ "Import from Outlook...","Import from Outlook..." },
{ "Licence","Licence" },
{ "Faq","Faq" },
{ "What's New?","What's New?" },
{ "Sync HowTo","Sync HowTo" },
{ "&About KAddressBook","&About KAddressBook" },
{ "Select Incremental Search Field","Select Incremental Search Field" },
{ "Synchronize","Synchronize" },
{ "Configure...","Configure..." },
{ "Enable Pi-Sync","Enable Pi-Sync" },
{ "Multiple sync","Multiple sync" },
{ "Import CSV List...","Import CSV List..." },
{ "Export CSV List...","Export CSV List..." },
{ "Import KDE 2 Addressbook...","Import KDE 2 Addressbook..." },
{ "Import vCard...","Import vCard..." },
{ "Export vCard 3.0...","Export vCard 3.0..." },
{ "Import Qtopia...","Import Qtopia..." },
{ "Export Qtopia...","Export Qtopia..." },
{ "Edit Contact","Edit Contact" },
{ "Ok","Ok" },
{ "Apply","Apply" },
{ "Cancel","Cancel" },
{ "KAddressbook/Pi","KAddressbook/Pi" },
{ "No Filter","No Filter" },
{ "Given Name","Given Name" },
{ "Family Name","Family Name" },
{ "Email Address","Email Address" },
{ "All Fields","All Fields" },
{ "Question","Question" },
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
@@ -111,65 +111,65 @@
{ "&Misc","&Misc" },
{ "Photo","Photo" },
{ "Store as URL","Store as URL" },
{ "Logo","Logo" },
{ "&Images","&Images" },
{ "Home","Home" },
{ "Work","Work" },
{ "Mobile","Mobile" },
{ "Fax","Fax" },
{ "Contact Editor","Contact Editor" },
{ "&Mail...","&Mail..." },
{ "&Print...","&Print..." },
{ "&Save","&Save" },
{ "&New Contact...","&New Contact..." },
{ "Mail &vCard...","Mail &vCard..." },
{ "Selected to phone","Selected to phone" },
{ "Beam selected v&Card(s)","Beam selected v&Card(s)" },
{ "&Beam personal vCard","&Beam personal vCard" },
{ "&Edit Contact...","&Edit Contact..." },
{ "&Exit","&Exit" },
{ "&Copy","&Copy" },
{ "Cu&t","Cu&t" },
{ "&Paste","&Paste" },
{ "Select &All","Select &All" },
{ "&Undo","&Undo" },
{ "Re&do","Re&do" },
{ "&Delete Contact","&Delete Contact" },
{ "Configure &Resources...","Configure &Resources..." },
{ "&Configure %1...","&Configure %1..." },
{ "Configure S&hortcuts...","Configure S&hortcuts..." },
{ "Show Jump Bar","Show Jump Bar" },
{ "Show Details","Show Details" },
-{ "Beam receice enabled","Beam receice enabled" },
+{ "Beam receive enabled","Beam receice enabled" },
{ "Set Who Am I","Set Who Am I" },
{ "Set Categories","Set Categories" },
{ "Remove "voice"...","Remove "voice"..." },
{ "Import from Outlook...","Import from Outlook..." },
{ "Licence","Licence" },
{ "Faq","Faq" },
{ "What's New?","What's New?" },
{ "Sync HowTo","Sync HowTo" },
{ "&About KAddressBook","&About KAddressBook" },
{ "Select Incremental Search Field","Select Incremental Search Field" },
{ "Synchronize","Synchronize" },
{ "Configure...","Configure..." },
{ "Enable Pi-Sync","Enable Pi-Sync" },
{ "Multiple sync","Multiple sync" },
{ "Import CSV List...","Import CSV List..." },
{ "Export CSV List...","Export CSV List..." },
{ "Import KDE 2 Addressbook...","Import KDE 2 Addressbook..." },
{ "Import vCard...","Import vCard..." },
{ "Export vCard 3.0...","Export vCard 3.0..." },
{ "Import Qtopia...","Import Qtopia..." },
{ "Export Qtopia...","Export Qtopia..." },
{ "Edit Contact","Edit Contact" },
{ "Ok","Ok" },
{ "Apply","Apply" },
{ "Cancel","Cancel" },
{ "KAddressbook/Pi","KAddressbook/Pi" },
{ "No Filter","No Filter" },
{ "Given Name","Given Name" },
{ "Family Name","Family Name" },
{ "Email Address","Email Address" },
{ "All Fields","All Fields" },
{ "Question","Question" },
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
@@ -839,65 +839,65 @@
{ "nobody@nowhere","niemand@nirgendwo" },
{ "calendar.html","calendar.html" },
{ "Unknown Name","Unbekannter Name" },
{ "unknown@nowhere","unbekannt@nirgendwo" },
{ "Beam via IR!","Beam via IR!" },
{ "Next Month","Nächster Monat" },
{ "Prio","Prio" },
{ "Reparent Todo","Mache Sub-Todo" },
{ "tomorrow","morgen" },
{ "today","heute" },
{ "yesterday","gestern" },
{ "Ok","Ok" },
{ "Ok+Agenda","Ok+Agenda" },
{ "Email","Email" },
{ "RSVP","RSVP" },
{ "Email:","Email:" },
{ "Appointment Time ","Termin Zeit " },
{ "2","2" },
{ "3","3" },
{ "4","4" },
{ " 0 %"," 0 %" },
{ " 20 %"," 20 %" },
{ " 40 %"," 40 %" },
{ " 60 %"," 60 %" },
{ " 80 %"," 80 %" },
{ "100 %","100 %" },
{ "Filter","Filter" },
{ "Configure","Konfiguriere" },
{ "What's Next","What's Next" },
{ "Complete calendar...","Kompletten Kalender..." },
{ "Filtered calendar...","Gefilterten Kalender..." },
{ "Export to phone","Exportiere zum Handy" },
-{ "Beam receice enabled","Beam Empfang an" },
+{ "Beam receive enabled","Beam Empfang an" },
{ "What's new?","Was ist neu?" },
{ "FAQ...","FAQ..." },
{ "Licence...","Licence..." },
{ "What's This?","What's This?" },
{ "&Edit...","&Editiere..." },
{ "Oktober","Oktober" },
{ "Title","Titel" },
{ "%1 %","%1 %" },
{ "Enable Pi-Sync","Schalte Pi-Sync an" },
{ "Import!","Importiere!" },
{ "inserting birthdays - close to abort!","Burzeltage werden eingefügt - schließe um abzubrechen!" },
{ "Export to phone options","Export ans Handy Optionen" },
{ "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." },
{ "I/O device: ","I/O device: " },
{ "Connection: ","Connection: " },
{ "Model(opt.): ","Model(opt.): " },
{ "Write back events in future only","Schreibe nur zukünftige Termine zurück" },
{ "Max. weeks in future: ","Max. Wochen in der Zukunft: " },
{ "NOTE: This will remove all old\ntodo/calendar data on phone!","ACHTUNG: Das löscht alle alten\nToDo/Kalender Daten auf dem Handy!" },
{ "Export to mobile phone!","Exportiere auf das Handy!" },
{ "Export complete calendar","Exportiere kompletten Kalender" },
{ "Writing to phone...","Sende Daten ans Handy..." },
{ " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" },
{ "Retry","Nochmal versuchen" },
{ "KDE/Pim phone access","KDE/Pim Handy Zugriff" },
{ "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Gerät!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" },
{ "Error exporting to phone!","Fehler beim Export auf das Handy!" },
{ "Export filtered calendar","Exportiere gefilterten Kalender" },
{ "Preferences","Vorlieben" },
{ "Global","Global" },
{ "Phone","Phone" },
{ "SMS","SMS" },
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
@@ -8,67 +8,65 @@
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
/*
Enhanced Version of the file for platform independent KDE tools.
Copyright (c) 2004 Ulf Schenk
$Id$
*/
//US
#include "kglobal.h"
#include "klocale.h"
#include "qtopiaconverter.h"
#include <qfile.h>
#include <qdir.h>
#include <qtextstream.h>
//#include <.h>
-//#include <qpe/categories.h>
#include <libkdepim/ksyncprofile.h>
-//US #include <qpe/categoryselect.h>
using namespace KABC;
QtopiaConverter::QtopiaConverter()
{
m_edit = 0;
}
QtopiaConverter::~QtopiaConverter()
{
deinit();
}
bool QtopiaConverter::init()
{
QString fn = QDir::homeDirPath() +"/Settings/Categories.xml";
m_edit = new CategoryEdit( fn);
return true;
}
void QtopiaConverter::deinit()
{
if (m_edit)
{
delete m_edit;
m_edit = 0;
}
}
QString QtopiaConverter::categoriesToNumber( const QStringList &list, const QString &app )
{
startover:
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
@@ -1,66 +1,64 @@
/*
This file is part of libkabc.
Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
/*
Enhanced Version of the file for platform independent KDE tools.
Copyright (c) 2004 Ulf Schenk
$Id$
*/
#ifndef KABC_QTOPIACONVERTER_H
#define KABC_QTOPIACONVERTER_H
#include <qstring.h>
#include "addressee.h"
-//#include <qpe/pim/contact.h>
-//#include <qpe/quuid.h>
#include <xml/qdom.h>
class Categories;
namespace KABC {
class OpieCategories {
public:
//friend class KSync::OpieSocket;
friend bool operator== ( const OpieCategories &a, const OpieCategories &b );
OpieCategories();
OpieCategories(const QString &id, const QString &name, const QString &app );
OpieCategories(const OpieCategories & );
~OpieCategories() {};
OpieCategories &operator=(const OpieCategories & );
QString id()const;
QString name()const;
QString app()const;
private:
QString m_name;
QString m_app;
QString m_id;
};
class CategoryEdit {
public:
CategoryEdit();
CategoryEdit(const QString &fileName);
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
@@ -14,66 +14,64 @@
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
/*
Enhanced Version of the file for platform independent KDE tools.
Copyright (c) 2004 Ulf Schenk
$Id$
*/
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <qdir.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qfileinfo.h>
#include <qregexp.h>
//US #include <qtimer.h>
#include <kapplication.h>
#include <kconfig.h>
#include <kdebug.h>
#include <klocale.h>
//US #include <ksavefile.h>
#include <kstandarddirs.h>
#include <kmessagebox.h>
-#include <qpe/pim/addressbookaccess.h>
-
#include "resourceqtopiaconfig.h"
#include "stdaddressbook.h"
#include "qtopiaconverter.h"
#include "resourceqtopia.h"
using namespace KABC;
extern "C"
{
void *init_microkabc_qtopia()
{
return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>();
}
}
ResourceQtopia::ResourceQtopia( const KConfig *config )
: Resource( config ), mConverter (0)
{
// we can not choose the filename. Therefore use the default to display
QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
init( fileName );
}
ResourceQtopia::ResourceQtopia( const QString &fileName )
: Resource( 0 )
{
init( fileName );
}
void ResourceQtopia::init( const QString &fileName )
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
@@ -9,67 +9,64 @@
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
/*
Enhanced Version of the file for platform independent KDE tools.
Copyright (c) 2004 Ulf Schenk
$Id$
*/
#include <qlabel.h>
#include <qlayout.h>
#include <kdebug.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kdialog.h>
#include <unistd.h>
#include <qdir.h>
#include <qfile.h>
#include "resourceqtopia.h"
-//US #include <qpe/qpeapplication.h>
-
-//US #include "stdaddressbook.h"
#include "resourceqtopiaconfig.h"
using namespace KABC;
ResourceQtopiaConfig::ResourceQtopiaConfig( QWidget* parent, const char* name )
: ConfigWidget( parent, name )
{
QGridLayout *mainLayout = new QGridLayout( this, 1, 2, 0,
KDialog::spacingHint() );
QLabel *label = new QLabel( i18n( "Location:" ), this );
mFileNameEdit = new KURLRequester( this );
connect( mFileNameEdit, SIGNAL( textChanged( const QString & ) ),
SLOT( checkFilePermissions( const QString & ) ) );
mainLayout->addWidget( label, 0, 0 );
mainLayout->addWidget( mFileNameEdit, 0, 1 );
}
void ResourceQtopiaConfig::loadSettings( KRES::Resource *res )
{
//US ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
ResourceQtopia *resource = (ResourceQtopia*)( res );
if ( !resource ) {
kdDebug(5700) << "ResourceQtopiaConfig::loadSettings(): cast failed" << endl;
return;
}
diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h
index b2651d4..c5cae20 100644
--- a/korganizer/wordsgerman.h
+++ b/korganizer/wordsgerman.h
@@ -840,65 +840,65 @@
{ "calendar.html","calendar.html" },
{ " Local Time"," Locale Zeit" },
{ "Unknown Name","Unbekannter Name" },
{ "unknown@nowhere","unbekannt@nirgendwo" },
{ "Beam via IR!","Beam via IR!" },
{ "Next Month","Nächster Monat" },
{ "Prio","Prio" },
{ "Reparent Todo","Mache Sub-Todo" },
{ "tomorrow","morgen" },
{ "today","heute" },
{ "yesterday","gestern" },
{ "Ok","Ok" },
{ "Ok+Agenda","Ok+Agenda" },
{ "Email","Email" },
{ "RSVP","RSVP" },
{ "Email:","Email:" },
{ "Appointment Time ","Termin Zeit " },
{ "2","2" },
{ "3","3" },
{ "4","4" },
{ " 0 %"," 0 %" },
{ " 20 %"," 20 %" },
{ " 40 %"," 40 %" },
{ " 60 %"," 60 %" },
{ " 80 %"," 80 %" },
{ "100 %","100 %" },
{ "Filter","Filter" },
{ "Configure","Konfiguriere" },
{ "What's Next","What's Next" },
{ "Complete calendar...","Kompletten Kalender..." },
{ "Filtered calendar...","Gefilterten Kalender..." },
{ "Export to phone","Exportiere zum Handy" },
-{ "Beam receice enabled","Beam Empfang an" },
+{ "Beam receive enabled","Beam Empfang an" },
{ "What's new?","Was ist neu?" },
{ "FAQ...","FAQ..." },
{ "Licence...","Licence..." },
{ "What's This?","What's This?" },
{ "&Edit...","&Editiere..." },
{ "Oktober","Oktober" },
{ "Title","Titel" },
{ "%1 %","%1 %" },
{ "Enable Pi-Sync","Schalte Pi-Sync an" },
{ "Import!","Importiere!" },
{ "inserting birthdays - close to abort!","Burzeltage werden eingefügt - schließe um abzubrechen!" },
{ "Export to phone options","Export ans Handy Optionen" },
{ "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." },
{ "I/O device: ","I/O device: " },
{ "Connection: ","Connection: " },
{ "Model(opt.): ","Model(opt.): " },
{ "Write back events in future only","Schreibe nur zukünftige Termine zurück" },
{ "Max. weeks in future: ","Max. Wochen in der Zukunft: " },
{ "NOTE: This will remove all old\ntodo/calendar data on phone!","ACHTUNG: Das löscht alle alten\nToDo/Kalender Daten auf dem Handy!" },
{ "Export to mobile phone!","Exportiere auf das Handy!" },
{ "Export complete calendar","Exportiere kompletten Kalender" },
{ "Writing to phone...","Sende Daten ans Handy..." },
{ " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" },
{ "Retry","Nochmal versuchen" },
{ "KDE/Pim phone access","KDE/Pim Handy Zugriff" },
{ "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Gerät!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" },
{ "Error exporting to phone!","Fehler beim Export auf das Handy!" },
{ "Export filtered calendar","Exportiere gefilterten Kalender" },
{ "Preferences","Vorlieben" },
{ "Global","Global" },
{ "Phone","Phone" },
{ "SMS","SMS" },
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
@@ -11,64 +11,69 @@
/***************************************************************************
* copyright (C) 2004 by Ulf Schenk
* This file is originaly based on version 1.0.1 of pwmanager
* and was modified to run on embedded devices that run microkde
*
* $Id$
**************************************************************************/
#include <klocale.h>
#include <klistview.h>
#include <ktoolbar.h>
#include <kfiledialog.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#ifndef PWM_EMBEDDED
#include <kmenubar.h>
#include <kstatusbar.h>
#include <dcopclient.h>
#include "configwndimpl.h"
#include "configuration.h"
#else
#include <qmenubar.h>
#include <qmessagebox.h>
#include <pwmprefs.h>
#include <kpimglobalprefs.h>
#include <kcmconfigs/kcmpwmconfig.h>
#include <kcmconfigs/kcmkdepimconfig.h>
#include <kcmultidialog.h>
#endif
+
+#ifndef DESKTOP_VERSION
+#include <qpe/global.h>
+#endif
+
#include <qpixmap.h>
#include <qcheckbox.h>
#include <qspinbox.h>
#include <qlineedit.h>
#include <qfileinfo.h>
#include <qclipboard.h>
#include <stdio.h>
#include "pwm.h"
#include "pwminit.h"
#include "pwmprint.h"
#include "addentrywndimpl.h"
#include "globalstuff.h"
#include "findwndimpl.h"
#include "csv.h"
#ifdef CONFIG_KWALLETIF
# include "kwalletif.h"
# include "kwalletemu.h"
#endif
#ifdef CONFIG_KEYCARD
# include "pwmkeycard.h"
#endif
#define DEFAULT_SIZE (QSize(700, 400))
// Button IDs for "file" popup menu
enum {
BUTTON_POPUP_FILE_NEW = 0,
@@ -136,64 +141,65 @@ enum {
BUTTON_POPUP_HELP_LICENSE = 0,
BUTTON_POPUP_HELP_FAQ,
BUTTON_POPUP_HELP_ABOUT,
BUTTON_POPUP_HELP_SYNC,
BUTTON_POPUP_HELP_WHATSNEW
};
#endif
// Button IDs for toolbar
enum {
BUTTON_TOOL_NEW = 0,
BUTTON_TOOL_OPEN,
BUTTON_TOOL_SAVE,
BUTTON_TOOL_SAVEAS,
BUTTON_TOOL_PRINT,
BUTTON_TOOL_ADD,
BUTTON_TOOL_EDIT,
BUTTON_TOOL_DEL,
BUTTON_TOOL_FIND,
BUTTON_TOOL_LOCK,
BUTTON_TOOL_DEEPLOCK,
BUTTON_TOOL_UNLOCK
};
PwM::PwM(PwMInit *_init, PwMDoc *doc,
bool virginity,
QWidget *parent, const char *name)
: KMainWindow(parent, "HALLO")
, forceQuit (false)
, forceMinimizeToTray (false)
{
+ virgin = !virginity;
init = _init;
connect(doc, SIGNAL(docClosed(PwMDoc *)),
this, SLOT(docClosed(PwMDoc *)));
initMenubar();
initToolbar();
initMetrics();
setVirgin(virginity);
setFocusPolicy(QWidget::WheelFocus);
#ifndef PWM_EMBEDDED
statusBar()->show();
#endif
view = makeNewListView(doc);
setCentralWidget(view);
updateCaption();
showStatMsg(i18n("Ready."));
}
PwM::~PwM()
{
//qDebug("PwM::~PwM()");
disconnect(curDoc(), SIGNAL(docClosed(PwMDoc *)),
this, SLOT(docClosed(PwMDoc *)));
conf()->confWndMainWndSize(size());
emit closed(this);
//qDebug("PwM::~PwM() emited closed(this)");
delete view;
}
void PwM::initMenubar()
{
KIconLoader* picons;
#ifndef PWM_EMBEDDED
@@ -1330,64 +1336,67 @@ void PwM::goToURL_slot()
unsigned int curEntryIndex;
if (!view->getCurEntryIndex(&curEntryIndex))
return;
bool ret = curDoc()->goToURL(view->getCurrentCategory(),
curEntryIndex);
if (ret)
showStatMsg(i18n("started browser with current URL."));
else
showStatMsg(i18n("ERROR: Couldn't start browser! Maybe invalid URL?"));
}
void PwM::copyToClipboard(const QString &s)
{
QClipboard *cb = QApplication::clipboard();
#ifndef PWM_EMBEDDED
if (cb->supportsSelection())
cb->setText(s, QClipboard::Selection);
cb->setText(s, QClipboard::Clipboard);
#else
cb->setText(s);
#endif
}
void PwM::showStatMsg(const QString &msg)
{
#ifndef PWM_EMBEDDED
KStatusBar *statBar = statusBar();
statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000);
#else
qDebug("Statusbar : %s",msg.latin1());
+#ifndef DESKTOP_VERSION
+ Global::statusMessage(msg);
+#endif
#endif
}
void PwM::focusInEvent(QFocusEvent *e)
{
if (e->gotFocus()) {
emit gotFocus(this);
} else if (e->lostFocus()) {
emit lostFocus(this);
}
}
#ifdef PWM_EMBEDDED
void PwM::whatsnew_slot()
{
KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" );
}
void PwM::showLicense_slot()
{
KApplication::showLicence();
}
void PwM::faq_slot()
{
KApplication::showFile( "PWM/Pi FAQ", "kdepim/pwmanager/pwmanagerFAQ.txt" );
}
void PwM::syncHowTo_slot()
{