From 1d8ec8558e45eb667a490781a978e7b6b73c6b01 Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Sun, 7 Jul 2002 13:45:59 +0000 Subject: - Adaptions to KDE3 and QT3 - Added About dialog --- kde2/klipsi/main.cpp | 6 +++--- kde2/klipsi/toplevel.cpp | 14 +++++++++++++- kde2/klipsi/toplevel.h | 2 ++ 3 files changed, 18 insertions(+), 4 deletions(-) (limited to 'kde2') diff --git a/kde2/klipsi/main.cpp b/kde2/klipsi/main.cpp index 1cfa271..48cb853 100644 --- a/kde2/klipsi/main.cpp +++ b/kde2/klipsi/main.cpp @@ -36,13 +36,13 @@ int main(int argc, char *argv[]) KAboutData about("klipsi", I18N_NOOP("Klipsi"), VERSION, I18N_NOOP("Psion remote clipboard utility"), KAboutData::License_GPL, - "(c) 2001, Fritz Elfert", + "(C) 2001, Fritz Elfert", + "Klipsi is part of plptools", "http://plptools.sourceforge.net", "plptools-developers@sourceforge.net"); about.addAuthor("Fritz Elfert", I18N_NOOP("Original Developer/Maintainer"), - "felfert@users.sourceforge.net", - "http://plptools.sourceforge.net"); + "felfert@users.sourceforge.net"); KCmdLineArgs::init(argc, argv, &about); KUniqueApplication::addCmdLineOptions(); diff --git a/kde2/klipsi/toplevel.cpp b/kde2/klipsi/toplevel.cpp index 1de43b7..6f92e5a 100644 --- a/kde2/klipsi/toplevel.cpp +++ b/kde2/klipsi/toplevel.cpp @@ -26,6 +26,8 @@ #include #include #include +#include +#include #include #include @@ -39,6 +41,7 @@ #include #define QUIT_ITEM 50 +#define ABOUT_ITEM 51 #define CLIPFILE "C:/System/Data/Clpboard.cbd" TopLevel::TopLevel() @@ -47,6 +50,9 @@ TopLevel::TopLevel() KNotifyClient::startDaemon(); clip = kapp->clipboard(); +#if QT_VERSION > 300 + clip->setSelectionMode(true); +#endif menu = new KPopupMenu(0, "main_menu"); timer = new QTimer(); @@ -70,8 +76,10 @@ TopLevel::TopLevel() menu->insertTitle(kapp->miniIcon(), i18n("Klipsi - Psion Clipboard")); menu->insertSeparator(); + menu->insertItem(SmallIcon("help"), i18n("&About Klipsi"), ABOUT_ITEM); menu->insertItem(SmallIcon("exit"), i18n("&Quit"), QUIT_ITEM); + about = new KAboutApplication(0L, 0L, false); connect(menu, SIGNAL(activated(int)), this, SLOT(slotMenuSelected(int))); connect(clip, SIGNAL(dataChanged()), this, SLOT(slotClipboardChanged())); connect(timer, SIGNAL(timeout()), this, SLOT(slotTimer())); @@ -208,10 +216,11 @@ slotClipboardChanged() if (!checkConnection()) return; - QImage clipImage = clip->image(); + QImage clipImage = 0L; QString clipText = clip->text(); if (clipText.isEmpty()) { + clipImage = clip->image(); if (clipImage.isNull()) return; inSend = true; @@ -240,6 +249,9 @@ void TopLevel:: slotMenuSelected(int id) { switch (id) { + case ABOUT_ITEM: + about->show(); + break; case QUIT_ITEM: kapp->quit(); break; diff --git a/kde2/klipsi/toplevel.h b/kde2/klipsi/toplevel.h index 893e43d..b1b4daa 100644 --- a/kde2/klipsi/toplevel.h +++ b/kde2/klipsi/toplevel.h @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -84,6 +85,7 @@ private: QClipboard *clip; KPopupMenu *menu; + KAboutApplication *about; QTimer *timer; ppsocket *rfsvSocket; -- cgit v1.2.3