diff options
-rw-r--r-- | kde2/kpsion/Makefile.am | 4 | ||||
-rw-r--r-- | kde2/kpsion/kpsion.cpp | 2 | ||||
-rw-r--r-- | kde2/kpsion/kpsionbackuplistview.cpp | 2 | ||||
-rw-r--r-- | kde2/kpsion/kpsionconfig.cpp | 6 | ||||
-rw-r--r-- | kde2/kpsion/main.cpp | 2 | ||||
-rw-r--r-- | kde2/kpsion/setupdialog.cpp | 6 | ||||
-rw-r--r-- | kde2/kpsion/statusbarprogress.cpp | 2 | ||||
-rw-r--r-- | kde2/kpsion/wizards.cpp | 20 |
8 files changed, 24 insertions, 20 deletions
diff --git a/kde2/kpsion/Makefile.am b/kde2/kpsion/Makefile.am index 31d38da..fbf31e2 100644 --- a/kde2/kpsion/Makefile.am +++ b/kde2/kpsion/Makefile.am @@ -18,7 +18,7 @@ DISTCLEANFILES = $(kpsion_METASOURCES) ./.deps/* ./.deps/.P lib_LTLIBRARIES = libkpsion.la bin_PROGRAMS = kpsion -libkpsion_la_LDFLAGS = $(PLP_LDFLAGS) $(KDE_LDFLAGS) $(LIBDEBUG) $(KDE_PLUGIN) +libkpsion_la_LDFLAGS = $(X_LDFLAGS) $(PLP_LDFLAGS) $(KDE_LDFLAGS) $(LIBDEBUG) $(KDE_PLUGIN) libkpsion_la_SOURCES = kpsion.cpp setupdialog.cpp wizards.cpp \ statusbarprogress.cpp kpsionconfig.cpp kpsionbackuplistview.cpp \ kpsionrestoredialog.cpp @@ -26,7 +26,7 @@ libkpsion_la_SOURCES = kpsion.cpp setupdialog.cpp wizards.cpp \ libkpsion_la_LIBADD = $(LIB_PLP) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KFILE) $(LIB_QT) kpsion_SOURCES = main.cpp -kpsion_LDFLAGS = $(KDE_RPATH) +kpsion_LDFLAGS = $(KDE_RPATH) $(X_LDFLAGS) kpsion_LDADD = libkpsion.la $(LIB_PLP) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KFILE) $(LIB_QT) applnk_DATA = kpsion.desktop diff --git a/kde2/kpsion/kpsion.cpp b/kde2/kpsion/kpsion.cpp index 161c715..4661fcf 100644 --- a/kde2/kpsion/kpsion.cpp +++ b/kde2/kpsion/kpsion.cpp @@ -1772,7 +1772,7 @@ killSave() { KMessageBox::error(this, i18n( "<QT>Could not stop all processes.<BR/>" "Please stop running programs manually on the Psion, " - "then klick <B>Ok</B>.")); + "then click <B>Ok</B>.")); tstart = time(0) + 5; } } diff --git a/kde2/kpsion/kpsionbackuplistview.cpp b/kde2/kpsion/kpsionbackuplistview.cpp index 4897753..70bec21 100644 --- a/kde2/kpsion/kpsionbackuplistview.cpp +++ b/kde2/kpsion/kpsionbackuplistview.cpp @@ -29,7 +29,7 @@ #include "kpsionbackuplistview.h" #include "kpsionconfig.h" -#include <kapp.h> +#include <kapplication.h> #include <klocale.h> #include <kconfig.h> #include <kiconloader.h> diff --git a/kde2/kpsion/kpsionconfig.cpp b/kde2/kpsion/kpsionconfig.cpp index c4991e9..becfaa8 100644 --- a/kde2/kpsion/kpsionconfig.cpp +++ b/kde2/kpsion/kpsionconfig.cpp @@ -24,7 +24,7 @@ #include "kpsionconfig.h" #include <klocale.h> -#include <kstddirs.h> +#include <kstandarddirs.h> #include <iostream> @@ -105,6 +105,10 @@ getConfigDevices() { l += QString("/dev/ttyS1"); l += QString("/dev/ttyS2"); l += QString("/dev/ttyS3"); + l += QString("/dev/ttyUSB0"); + l += QString("/dev/ttyUSB1"); + l += QString("/dev/ttyUSB2"); + l += QString("/dev/ttyUSB3"); l += QString("/dev/ircomm0"); l += QString("/dev/ircomm1"); l += QString("/dev/ircomm2"); diff --git a/kde2/kpsion/main.cpp b/kde2/kpsion/main.cpp index 8947101..06f5e25 100644 --- a/kde2/kpsion/main.cpp +++ b/kde2/kpsion/main.cpp @@ -27,7 +27,7 @@ #include "kpsion.h" #include "kpsionconfig.h" #include "wizards.h" -#include <kapp.h> +#include <kapplication.h> #include <klocale.h> #include <kconfig.h> #include <kcmdlineargs.h> diff --git a/kde2/kpsion/setupdialog.cpp b/kde2/kpsion/setupdialog.cpp index 66796b1..8225f84 100644 --- a/kde2/kpsion/setupdialog.cpp +++ b/kde2/kpsion/setupdialog.cpp @@ -27,14 +27,14 @@ #include "kpsionconfig.h" #include "setupdialog.h" -#include <kapp.h> +#include <kapplication.h> #include <kconfig.h> #include <kdesktopfile.h> #include <kglobalsettings.h> #include <klocale.h> #include <kfiledialog.h> #include <kmessagebox.h> -#include <kstddirs.h> +#include <kstandarddirs.h> #include <qlayout.h> #include <qgroupbox.h> @@ -523,7 +523,7 @@ checkBackupDir(QString &dir) { QDir d(dir); if (!d.exists()) { if (KMessageBox::questionYesNo(this, - i18n("<QT>The folder <B>%1</B> does <B>not</B> exist.<BR/>Shall it be created?</QT>").arg(dir)) == KMessageBox::No) { + i18n("<QT>The folder <B>%1</B> does <B>not</B> exist.<BR/>Should it be created?</QT>").arg(dir)) == KMessageBox::No) { bdirLabel->setText(tmp); return false; } diff --git a/kde2/kpsion/statusbarprogress.cpp b/kde2/kpsion/statusbarprogress.cpp index 0e97a7d..7951b4f 100644 --- a/kde2/kpsion/statusbarprogress.cpp +++ b/kde2/kpsion/statusbarprogress.cpp @@ -30,7 +30,7 @@ #include <qtooltip.h> #include <qstyle.h> -#include <kapp.h> +#include <kapplication.h> #include <kglobal.h> #include <kglobalsettings.h> #include <klocale.h> diff --git a/kde2/kpsion/wizards.cpp b/kde2/kpsion/wizards.cpp index 4c28780..38145ca 100644 --- a/kde2/kpsion/wizards.cpp +++ b/kde2/kpsion/wizards.cpp @@ -32,7 +32,7 @@ #include "kpsionconfig.h" #include "wizards.h" -#include <kapp.h> +#include <kapplication.h> #include <kdebug.h> #include <kdialog.h> #include <klocale.h> @@ -134,9 +134,9 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name) "<QT>" "Next, please specify some information regarding " "backup policy:<UL><LI>How many generations of backups " - "do you want to keep?</LI><LI>Shall i perform automatic " - "backups?</LI><LI>If yes, in what intervals do you want " - "to happen backups?</LI></UL>" + "do you want to keep?</LI><LI>Should I perform automatic " + "backups?</LI><LI>If yes, how often do you want backups" + "to happen?</LI></UL>" "</QT>" )); grid->addMultiCellWidget(l, 1, 1, 1, 2, Qt::AlignTop); @@ -251,12 +251,12 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name) l->setText(i18n( "<QT>" "That's it!<BR/>" - "Next, i will start <B>KPsion</B> and if your Psion is already " - "connected and it's communication turned on (use " - "<B>Ctrl-T</B> at system level), then <B>KPsion</B> will " - "bring up a similar Dialog like this which lets you assing a " - "Name for it. After that, i suggest performing a full " - "Backup.<BR/>Please click <B>Finish</B> now.</QT>" + "Now I will start <B>KPsion</B> and if your Psion is already " + "connected and its communication link turned on (use" + "<B>Ctrl-L</B> on the System screen), then <B>KPsion</B> will " + "bring up a dialog similar to this which lets you assign it a " + "name. After that, I suggest you perform a full backup.<BR/>" + "Please click <B>Finish</B> now.</QT>" )); grid->addWidget(l, 1, 1, Qt::AlignTop); |