SVN commit 977598 by ruberg: Bugfix for plasmaboard loosing focus when being opened. This works in conjunction with a ptach for popupapplet in KDE 4.2 and 4.3 trunk Added missing gpl stuff M +1 -1 AlphaNumKey.cpp M +1 -1 AlphaNumKey.h M +1 -1 ArrowBottomKey.h M +1 -1 ArrowLeftKey.cpp M +1 -1 ArrowLeftKey.h M +1 -1 ArrowRightKey.cpp M +1 -1 ArrowRightKey.h M +1 -1 BoardKey.cpp M +1 -1 BoardKey.h M +18 -6 EnterKey.h M +1 -1 FuncKey.cpp M +2 -2 FuncKey.h M +3 -2 Helpers.h M +5 -3 PanelIcon.cpp M +1 -4 PanelIcon.h M +7 -2 README A gpl.txt M +1 -1 plasma_applet_plasmaboard.desktop M +3 -0 widget.cpp M +3 -2 widget.h --- trunk/playground/base/plasma/applets/plasmaboard/AlphaNumKey.cpp #977597:977598 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Sebastian Kuegler * + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * --- trunk/playground/base/plasma/applets/plasmaboard/AlphaNumKey.h #977597:977598 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Sebastian Kuegler * + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * --- trunk/playground/base/plasma/applets/plasmaboard/ArrowBottomKey.h #977597:977598 @@ -1,5 +1,5 @@ /*/*************************************************************************** - * Copyright (C) 2009 by Björn Ruberg * + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * --- trunk/playground/base/plasma/applets/plasmaboard/ArrowLeftKey.cpp #977597:977598 @@ -1,5 +1,5 @@ /*/*************************************************************************** - * Copyright (C) 2009 by Björn Ruberg * + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * --- trunk/playground/base/plasma/applets/plasmaboard/ArrowLeftKey.h #977597:977598 @@ -1,5 +1,5 @@ /*/*************************************************************************** - * Copyright (C) 2009 by Björn Ruberg * + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * --- trunk/playground/base/plasma/applets/plasmaboard/ArrowRightKey.cpp #977597:977598 @@ -1,5 +1,5 @@ /*/*************************************************************************** - * Copyright (C) 2009 by Björn Ruberg * + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * --- trunk/playground/base/plasma/applets/plasmaboard/ArrowRightKey.h #977597:977598 @@ -1,5 +1,5 @@ /*/*************************************************************************** - * Copyright (C) 2009 by Björn Ruberg * + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * --- trunk/playground/base/plasma/applets/plasmaboard/BoardKey.cpp #977597:977598 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Sebastian Kuegler * + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * --- trunk/playground/base/plasma/applets/plasmaboard/BoardKey.h #977597:977598 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Sebastian Kuegler * + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * --- trunk/playground/base/plasma/applets/plasmaboard/EnterKey.h #977597:977598 @@ -1,9 +1,21 @@ -/* - * EnterKey.h - * - * Created on: 11.04.2009 - * Author: bjoern - */ +/*/*************************************************************************** + * Copyright (C) 2009 by Björn Ruberg * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * + ***************************************************************************/ #ifndef ENTERKEY_H_ #define ENTERKEY_H_ --- trunk/playground/base/plasma/applets/plasmaboard/FuncKey.cpp #977597:977598 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Sebastian Kuegler * + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * --- trunk/playground/base/plasma/applets/plasmaboard/FuncKey.h #977597:977598 @@ -1,5 +1,5 @@ -/*************************************************************************** - * Copyright (C) 2007-2008 by Sebastian Kuegler * +/**************************************************************************** + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * --- trunk/playground/base/plasma/applets/plasmaboard/Helpers.h #977597:977598 @@ -1,5 +1,5 @@ -/*************************************************************************** - * Copyright (C) 2007-2008 by Sebastian Kuegler * +/**************************************************************************** + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * ***************************************************************************/ + #include #include #include --- trunk/playground/base/plasma/applets/plasmaboard/PanelIcon.cpp #977597:977598 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Sebastian Kuegler * + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -29,11 +29,13 @@ setPopupIcon("preferences-desktop-keyboard"); KConfigGroup cg = config(); extendedMode = cg.readEntry("extendedMode", false); -} + setPassivePopup(true); + } + void PanelIcon::init(){ - setPassivePopup(true); + /*Plasma::ExtenderItem *eItem = new Plasma::ExtenderItem(extender()); extender()->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); --- trunk/playground/base/plasma/applets/plasmaboard/PanelIcon.h #977597:977598 @@ -21,9 +21,7 @@ #ifndef PANELICON_H_ #define PANELICON_H_ -#include -#include -#include +#include "plasma/popupapplet.h" #include "widget.h" @@ -47,7 +45,6 @@ private: PlasmaboardWidget *m_plasmaboard; const QVariantList args; - Plasma::ExtenderItem *eItem; QAction *contextSwitcher; bool extendedMode; --- trunk/playground/base/plasma/applets/plasmaboard/README #977597:977598 @@ -1,4 +1,4 @@ -Welcome to plasmaboard, a virtual keyboard for your desktop! It is designed exspecially with keyboard users in mind. +Welcome to plasmaboard, a virtual keyboard for your desktop! It is designed especially with keyboard users in mind. REQUIREMENTS: - You need a working GNU Compiler toolchain. @@ -12,13 +12,18 @@ HOW TO INSTALL In the main directory run - - cmake -DCMAKE_INSTALL_PREFIX=/usr/lib/kde4 (Replace with your KDEDIR if necessary) + - cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` - make - make install/strip (as root or: sudo make install/strip ) KNOWN ISSUES +- KEYBOARD DOES NOT WORK +Since KDE 4.2.2 plasmaboard does not work anymore on most distributions. The problem is caused by a change in the plasma library. +To fix that I needed to commit a patch to KDE. Sadly it didn't make into the 4.2.4 release. I hope some package maintainers will integrate the patch. +Plasmaboard works with KDE 4.3 RC1. + - When pressing "Alt Gr" the symbols on the keyboard do not adapt. This is an issue with the underlying X-Function, which seems only to do mapping for the shift key correctly. No known solution yet. Despite of that AltGr works as expected --- trunk/playground/base/plasma/applets/plasmaboard/plasma_applet_plasmaboard.desktop #977597:977598 @@ -25,7 +25,7 @@ X-KDE-PluginInfo-Author=Björn Ruberg X-KDE-PluginInfo-Email=bjoern@ruberg-wegener.de X-KDE-PluginInfo-Name=plasma_applet_plasmaboard -X-KDE-PluginInfo-Version=0.1 +X-KDE-PluginInfo-Version=0.51 X-KDE-PluginInfo-Category=Utilities X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPL --- trunk/playground/base/plasma/applets/plasmaboard/widget.cpp #977597:977598 @@ -73,6 +73,9 @@ setMinimumSize(300,150); setCacheMode(QGraphicsItem::DeviceCoordinateCache); + Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint; + setWindowFlags(wflags); + width = 500; height = 200; isLevel2 = false; --- trunk/playground/base/plasma/applets/plasmaboard/widget.h #977597:977598 @@ -1,5 +1,5 @@ -/*************************************************************************** - * Copyright (C) 2007-2008 by Sebastian Kuegler * +/**************************************************************************** + * Copyright (C) 2009 by Björn Ruberg * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -18,6 +18,7 @@ ***************************************************************************/ + #ifndef WIDGET_H_ #define WIDGET_H_