From 8535c2f36544727e24483b8c9b963f9bd163ad6a Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Sun, 28 Aug 2005 22:37:14 +0000 Subject: Fix linking of kpsion. Fix English in several places. Add USB serial ports to list of ports. Use new names of various KDE headers. --- kde2/kpsion/Makefile.am | 4 ++-- kde2/kpsion/kpsion.cpp | 2 +- kde2/kpsion/kpsionbackuplistview.cpp | 2 +- kde2/kpsion/kpsionconfig.cpp | 6 +++++- kde2/kpsion/main.cpp | 2 +- kde2/kpsion/setupdialog.cpp | 6 +++--- kde2/kpsion/statusbarprogress.cpp | 2 +- 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( "Could not stop all processes.
" "Please stop running programs manually on the Psion, " - "then klick Ok.")); + "then click Ok.")); 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 +#include #include #include #include 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 -#include +#include #include @@ -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 +#include #include #include #include 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 +#include #include #include #include #include #include #include -#include +#include #include #include @@ -523,7 +523,7 @@ checkBackupDir(QString &dir) { QDir d(dir); if (!d.exists()) { if (KMessageBox::questionYesNo(this, - i18n("The folder %1 does not exist.
Shall it be created?").arg(dir)) == KMessageBox::No) { + i18n("The folder %1 does not exist.
Should it be created?").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 #include -#include +#include #include #include #include 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 +#include #include #include #include @@ -134,9 +134,9 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name) "" "Next, please specify some information regarding " "backup policy:
  • How many generations of backups " - "do you want to keep?
  • Shall i perform automatic " - "backups?
  • If yes, in what intervals do you want " - "to happen backups?
" + "do you want to keep?
  • Should I perform automatic " + "backups?
  • If yes, how often do you want backups" + "to happen?
    • " "    " )); grid->addMultiCellWidget(l, 1, 1, 1, 2, Qt::AlignTop); @@ -251,12 +251,12 @@ FirstTimeWizard::FirstTimeWizard(QWidget *parent, const char *name) l->setText(i18n( "" "That's it!
    " - "Next, i will start KPsion and if your Psion is already " - "connected and it's communication turned on (use " - "Ctrl-T at system level), then KPsion will " - "bring up a similar Dialog like this which lets you assing a " - "Name for it. After that, i suggest performing a full " - "Backup.
    Please click Finish now.    " + "Now I will start KPsion and if your Psion is already " + "connected and its communication link turned on (use" + "Ctrl-L on the System screen), then KPsion will " + "bring up a dialog similar to this which lets you assign it a " + "name. After that, I suggest you perform a full backup.
    " + "Please click Finish now.    " )); grid->addWidget(l, 1, 1, Qt::AlignTop); -- cgit v1.2.3