From bad27e353bded166e8f3670d54466a959ef1e3c6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 21 Sep 2015 22:32:41 +0000 Subject: [PATCH] generic: misc cleanups --- kvkbd/src/kbdtray.cpp | 6 ----- kvkbd/src/kvkbdapp.cpp | 65 ++++++++++++++++++++++---------------------------- kvkbd/src/main.cpp | 60 ++++++++++++++++++++++------------------------ 3 files changed, 56 insertions(+), 75 deletions(-) diff --git a/kvkbd/src/kbdtray.cpp b/kvkbd/src/kbdtray.cpp index a9cf1350..60cd8449 100644 --- a/kvkbd/src/kbdtray.cpp +++ b/kvkbd/src/kbdtray.cpp @@ -24,11 +24,8 @@ #include #include #include -#include #include -#include #include -#include #include #include @@ -50,9 +47,6 @@ KbdTray::~KbdTray() } - - - QMenu* KbdTray::getContextMenu() { return this->contextMenu(); diff --git a/kvkbd/src/kvkbdapp.cpp b/kvkbd/src/kvkbdapp.cpp index 38386980..a15304f6 100644 --- a/kvkbd/src/kvkbdapp.cpp +++ b/kvkbd/src/kvkbdapp.cpp @@ -72,8 +72,6 @@ KvkbdApp::KvkbdApp(bool loginhelper) : KUniqueApplication(), is_login(loginhelpe KConfigGroup cfg = KGlobal::config()->group(""); - - if (!is_login) { widget->setAttribute(Qt::WA_ShowWithoutActivating); widget->setAttribute(Qt::WA_DeleteOnClose, false); @@ -149,8 +147,7 @@ KvkbdApp::KvkbdApp(bool loginhelper) : KUniqueApplication(), is_login(loginhelpe cmenu->addAction(stickyModKeysAction); connect(stickyModKeysAction,SIGNAL(triggered(bool)), this, SLOT(setStickyModKeys(bool))); widget->setProperty("stickyModKeys", stickyModKeys); - - + QFont font = cfg.readEntry("font", widget->font()); widget->setFont(font); @@ -190,50 +187,44 @@ KvkbdApp::KvkbdApp(bool loginhelper) : KUniqueApplication(), is_login(loginhelpe pos.setY(pos.y()-dock->height()); QRect dockGeometry(pos, dock->size()); - + QRect c_dock_geometry = cfg.readEntry("dockGeometry", dockGeometry); if (!screenGeometry.contains(c_dock_geometry, true)) { - c_dock_geometry = dockGeometry; + c_dock_geometry = dockGeometry; } dock->setGeometry(c_dock_geometry); - + widget->show(); - bool extensionVisible = cfg.readEntry("extentVisible", QVariant(true)).toBool(); if (!extensionVisible) { toggleExtension(); } - - setQuitOnLastWindowClosed (is_login); - + connect(this, SIGNAL(aboutToQuit()), this, SLOT(storeConfig())); emit fontUpdated(widget->font()); if (dockVisible && !is_login) { - dock->show(); + dock->show(); } - + xkbd->start(); if (!is_login) { - bool vis = cfg.readEntry("visible", QVariant(true)).toBool(); - if (!vis ) { - - widget->showMinimized(); - - } - widget->setWindowTitle("kvkbd"); - tray->show(); - } - else { - QTimer *timer = new QTimer(this); - timer->setInterval(1000); - connect(timer, SIGNAL(timeout()), widget, SLOT(raise())); - timer->start(); - widget->setWindowTitle("kvkbd.login"); + bool vis = cfg.readEntry("visible", QVariant(true)).toBool(); + if (!vis ) { + widget->showMinimized(); + } + widget->setWindowTitle("kvkbd"); + tray->show(); + } else { + QTimer *timer = new QTimer(this); + timer->setInterval(1000); + connect(timer, SIGNAL(timeout()), widget, SLOT(raise())); + timer->start(); + widget->setWindowTitle("kvkbd.login"); } } @@ -246,15 +237,15 @@ KvkbdApp::~KvkbdApp() void KvkbdApp::storeConfig() { KConfigGroup cfg = KGlobal::config()->group(""); - + cfg.writeEntry("visible", widget->isVisible()); cfg.writeEntry("geometry", widget->geometry()); cfg.writeEntry("locked", widget->isLocked()); cfg.writeEntry("stickyModKeys", widget->property("stickyModKeys")); - + cfg.writeEntry("showdock", dock->isVisible()); cfg.writeEntry("dockGeometry", dock->geometry()); - + cfg.writeEntry("layout", widget->property("layout")); cfg.writeEntry("colors", widget->property("colors")); cfg.writeEntry("font", widget->font()); @@ -293,8 +284,8 @@ void KvkbdApp::chooseFont() QFont widgetFont = widget->font(); - int result = KFontDialog::getFont( widgetFont, KFontChooser::NoDisplayFlags, widget ); - if ( result == KFontDialog::Accepted ) { + int result = KFontDialog::getFont(widgetFont, KFontChooser::NoDisplayFlags, widget); + if (result == KFontDialog::Accepted) { widget->setFont(widgetFont); emit fontUpdated(widgetFont); @@ -358,7 +349,7 @@ void KvkbdApp::partLoaded(MainWidget *vPart, int total_rows, int total_cols) QObject::connect(xkbd, SIGNAL(layoutUpdated(int,QString)), vPart, SLOT(updateLayout(int,QString))); QObject::connect(xkbd, SIGNAL(groupStateChanged(const ModifierGroupStateMap&)), vPart, SLOT(updateGroupState(const ModifierGroupStateMap&))); QObject::connect(xkbd, SIGNAL(keyProcessComplete(unsigned int)), this, SLOT(keyProcessComplete(unsigned int))); - + QObject::connect(this, SIGNAL(textSwitch(bool)), vPart, SLOT(textSwitch(bool))); QObject::connect(this, SIGNAL(fontUpdated(const QFont&)), vPart, SLOT(updateFont(const QFont&))); @@ -368,7 +359,7 @@ void KvkbdApp::partLoaded(MainWidget *vPart, int total_rows, int total_cols) void KvkbdApp::keyProcessComplete(unsigned int) { if (widget->property("stickyModKeys").toBool()) return; - + QListIterator itr(modKeys); while (itr.hasNext()) { VButton *mod = itr.next(); @@ -383,8 +374,8 @@ void KvkbdApp::buttonAction(const QString &action) if (QString::compare(action , "toggleVisibility")==0) { if (!is_login) { - widget->toggleVisibility(); - } + widget->toggleVisibility(); + } } else if (QString::compare(action , "toggleExtension")==0) { diff --git a/kvkbd/src/main.cpp b/kvkbd/src/main.cpp index 88813a28..c8ed482e 100644 --- a/kvkbd/src/main.cpp +++ b/kvkbd/src/main.cpp @@ -34,38 +34,34 @@ static const char version[] = "0.7.2"; void findLoginWindow() { - unsigned int numkids, i, scrn; - Window r, p; - Window *kids=0; - //XWindowAttributes attr; - Window root; - Display *dipsy=0; - char *win_name=0; - - dipsy = XOpenDisplay(0); - if (!dipsy)return; - - scrn = DefaultScreen(dipsy); - root = RootWindow(dipsy, scrn); - - XQueryTree(dipsy, root, &r, &p, &kids, &numkids); - - - for (i = 0; i < numkids; ++i) - { - XFetchName(dipsy, kids[i], &win_name); - QString c(win_name); - - if (c=="kvkbd.login") - { - long wid = kids[i]; - XDestroyWindow(dipsy,wid); - XFlush(dipsy); - i=numkids; - } - XFree(win_name); - } - XCloseDisplay(dipsy); + unsigned int numkids, i, scrn; + Window r, p; + Window *kids=0; + //XWindowAttributes attr; + Window root; + Display *dipsy=0; + char *win_name=0; + + dipsy = XOpenDisplay(0); + if (!dipsy) return; + + scrn = DefaultScreen(dipsy); + root = RootWindow(dipsy, scrn); + + XQueryTree(dipsy, root, &r, &p, &kids, &numkids); + + for (i = 0; i < numkids; ++i) { + XFetchName(dipsy, kids[i], &win_name); + QString c(win_name); + if (c=="kvkbd.login") { + long wid = kids[i]; + XDestroyWindow(dipsy,wid); + XFlush(dipsy); + i=numkids; + } + XFree(win_name); + } + XCloseDisplay(dipsy); } int main(int argc, char **argv) -- 2.11.0