summaryrefslogtreecommitdiffstats
path: root/kxkb
diff options
context:
space:
mode:
Diffstat (limited to 'kxkb')
-rw-r--r--kxkb/CMakeL10n.txt6
-rw-r--r--kxkb/CMakeLists.txt6
-rw-r--r--kxkb/eventsrc8
-rw-r--r--kxkb/extension.cpp295
-rw-r--r--kxkb/extension.h27
-rw-r--r--kxkb/kcmlayout.cpp702
-rw-r--r--kxkb/kcmlayout.h16
-rw-r--r--kxkb/kcmlayoutwidget.ui659
-rw-r--r--kxkb/kcmmisc.cpp15
-rw-r--r--kxkb/kcmmisc.h2
-rw-r--r--kxkb/kxkb.cpp257
-rw-r--r--kxkb/kxkb.h36
-rw-r--r--kxkb/kxkbbindings.cpp11
-rw-r--r--kxkb/kxkbconfig.cpp93
-rw-r--r--kxkb/kxkbconfig.h70
-rw-r--r--kxkb/kxkbtraywindow.cpp16
-rw-r--r--kxkb/kxkbtraywindow.h10
-rw-r--r--kxkb/layoutmap.cpp17
-rw-r--r--kxkb/layoutmap.h8
-rw-r--r--kxkb/layoutunit.h64
-rw-r--r--kxkb/pixmap.cpp22
-rw-r--r--kxkb/rules.cpp97
-rw-r--r--kxkb/rules.h20
-rw-r--r--kxkb/x11helper.cpp111
-rw-r--r--kxkb/x11helper.h2
25 files changed, 1523 insertions, 1047 deletions
diff --git a/kxkb/CMakeL10n.txt b/kxkb/CMakeL10n.txt
index 0238bd7e3..66ed038d9 100644
--- a/kxkb/CMakeL10n.txt
+++ b/kxkb/CMakeL10n.txt
@@ -27,3 +27,9 @@ tde_l10n_create_template(
SOURCES *.desktop
DESTINATION "${CMAKE_SOURCE_DIR}/translations"
)
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/kxkb-eventsrc/"
+ SOURCES eventsrc
+ DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+) \ No newline at end of file
diff --git a/kxkb/CMakeLists.txt b/kxkb/CMakeLists.txt
index b8bb14912..cb0d4b9db 100644
--- a/kxkb/CMakeLists.txt
+++ b/kxkb/CMakeLists.txt
@@ -33,6 +33,12 @@ tde_create_translated_desktop(
PO_DIR kxkb-desktops
)
+tde_create_translated_desktop(
+ SOURCE eventsrc
+ DESTINATION ${DATA_INSTALL_DIR}/kxkb
+ PO_DIR kxkb-eventsrc
+)
+
install( FILES kxkb_groups DESTINATION ${CONFIG_INSTALL_DIR} )
tde_create_translated_desktop(
diff --git a/kxkb/eventsrc b/kxkb/eventsrc
new file mode 100644
index 000000000..ce25f3979
--- /dev/null
+++ b/kxkb/eventsrc
@@ -0,0 +1,8 @@
+[!Global!]
+IconName=kxkb
+Comment=TDE Keyboard Tool
+
+[LayoutChange]
+Name=Keyboard layout switch
+Comment=The keyboard layout was switched
+default_presentation=16 \ No newline at end of file
diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp
index 616167944..870ee7eb4 100644
--- a/kxkb/extension.cpp
+++ b/kxkb/extension.cpp
@@ -15,26 +15,18 @@
#include <X11/Xlib.h>
#include <X11/XKBlib.h>
#include <X11/extensions/XKBfile.h>
+#include <X11/extensions/XKBrules.h>
#include <X11/extensions/XKBgeom.h>
#include <X11/extensions/XKM.h>
#include "extension.h"
-TQMap<TQString, FILE*> XKBExtension::fileCache; //TODO: move to class?
-
-
static TQString getLayoutKey(const TQString& layout, const TQString& variant)
{
return layout + "." + variant;
}
-TQString XKBExtension::getPrecompiledLayoutFilename(const TQString& layoutKey)
-{
- TQString compiledLayoutFileName = m_tempDir + layoutKey + ".xkm";
- return compiledLayoutFileName;
-}
-
XKBExtension::XKBExtension(Display *d)
{
if ( d == NULL )
@@ -76,16 +68,11 @@ bool XKBExtension::init()
// Do it, or face horrible memory corrupting bugs
::XkbInitAtoms(NULL);
- return true;
-}
+ // watch group change events
+ XkbSelectEventDetails(m_dpy, XkbUseCoreKbd, XkbStateNotify,
+ XkbAllStateComponentsMask, XkbGroupStateMask);
-void XKBExtension::reset()
-{
- for(TQMap<TQString, FILE*>::ConstIterator it = fileCache.begin(); it != fileCache.end(); it++) {
- fclose(*it);
-// remove( TQFile::encodeName(getPrecompiledLayoutFileName(*it)) );
- }
- fileCache.clear();
+ return true;
}
XKBExtension::~XKBExtension()
@@ -94,106 +81,77 @@ XKBExtension::~XKBExtension()
deletePrecompiledLayouts();*/
}
-bool XKBExtension::setXkbOptions(const TQString& options, bool resetOld)
+bool XKBExtension::setXkbOptions(const XkbOptions options)
{
- if (options.isEmpty())
- return true;
-
- TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
- if (exe.isEmpty())
- return false;
-
- TDEProcess p;
- p << exe;
- if( resetOld )
- p << "-option";
- p << "-option" << options;
+ TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
+ if (exe.isEmpty())
+ return false;
- p.start(TDEProcess::Block);
+ TDEProcess p;
+ p << exe;
- return p.normalExit() && (p.exitStatus() == 0);
-}
+ if (!options.layouts.isEmpty())
+ {
+ p << "-layout";
+ p << options.layouts;
+ }
-bool XKBExtension::setLayout(const TQString& model,
- const TQString& layout, const TQString& variant,
- const TQString& includeGroup, bool useCompiledLayouts)
-{
- if( useCompiledLayouts == false ) {
- return setLayoutInternal( model, layout, variant, includeGroup );
+ if (!options.variants.isEmpty())
+ {
+ p << "-variant";
+ p << options.variants;
}
- const TQString layoutKey = getLayoutKey(layout, variant);
-
- bool res;
- if( fileCache.contains(layoutKey) ) {
- res = setCompiledLayout( layoutKey );
- kdDebug() << "[kxkb-extension] setCompiledLayout " << layoutKey << ": " << res << endl;
-
- if( res )
- return res;
+ if (!options.model.isEmpty()) {
+ p << "-model";
+ p << options.model;
}
-// else {
- res = setLayoutInternal( model, layout, variant, includeGroup );
- kdDebug() << "[kxkb-extension] setRawLayout " << layoutKey << ": " << res << endl;
- if( res )
- compileCurrentLayout( layoutKey );
-
-// }
- return res;
-}
-// private
-bool XKBExtension::setLayoutInternal(const TQString& model,
- const TQString& layout, const TQString& variant,
- const TQString& includeGroup)
-{
- if ( layout.isEmpty() )
- return false;
+ if (options.resetOld) {
+ p << "-option";
+ }
- TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
- if( exe.isEmpty() ) {
- kdError() << "[kxkb-extension] Can't find setxkbmap" << endl;
- return false;
+ if (!options.options.isEmpty()) {
+ if (options.resetOld)
+ {
+ p << "-option" << options.options;
+ }
+ else
+ {
+ // Avoid duplication of options in Append mode
+ TQStringList srvOptions = TQStringList::split(",", XKBExtension::getServerOptions());
+ TQStringList kxkbOptions = TQStringList::split(",", options.options);
+ TQStringList newOptions;
+ for (TQStringList::Iterator it = kxkbOptions.begin(); it != kxkbOptions.end(); ++it)
+ {
+ TQString option(*it);
+ if (!srvOptions.contains(option))
+ {
+ newOptions << option;
+ }
+ }
+ if (!newOptions.isEmpty()) {
+ p << "-option" << newOptions.join(",");
+ }
+ }
}
- TQString fullLayout = layout;
- TQString fullVariant = variant;
- if( includeGroup.isEmpty() == false ) {
- fullLayout = includeGroup;
- fullLayout += ",";
- fullLayout += layout;
-
-// fullVariant = baseVar;
- fullVariant = ",";
- fullVariant += variant;
- }
-
- TDEProcess p;
- p << exe;
-// p << "-rules" << rule;
- if( model.isEmpty() == false )
- p << "-model" << model;
- p << "-layout" << fullLayout;
- if( !fullVariant.isNull() && !fullVariant.isEmpty() )
- p << "-variant" << fullVariant;
+ kdDebug() << "[setXkbOptions] Command: " << p.args() << endl;
- p.start(TDEProcess::Block);
+ p.start(TDEProcess::Block);
- // reload system-wide hotkey-setup keycode -> keysym maps
- TQString modmapFileName = TDEGlobal::dirs()->findResource( "data", "kxkb/system.xmodmap" );
- if ( TQFile::exists( modmapFileName ) ) {
- TDEProcess pXmodmap;
- pXmodmap << "xmodmap" << modmapFileName;
- pXmodmap.start(TDEProcess::Block);
- }
+ return p.normalExit() && (p.exitStatus() == 0);
+}
- if ( TQFile::exists( TQDir::home().path() + "/.Xmodmap" ) ) {
- TDEProcess pXmodmapHome;
- pXmodmapHome << "xmodmap" << TQDir::home().path() + "/.Xmodmap";
- pXmodmapHome.start(TDEProcess::Block);
+TQString XKBExtension::getServerOptions()
+{
+ XkbRF_VarDefsRec vd;
+ if (XkbRF_GetNamesProp(tqt_xdisplay(), nullptr, &vd) && vd.options)
+ {
+ kdDebug() << "[kxkb-extension] Got server options " << vd.options << endl;
+ return TQString(vd.options);
}
-
- return p.normalExit() && (p.exitStatus() == 0);
+ return TQString::null;
}
bool XKBExtension::setGroup(unsigned int group)
@@ -209,130 +167,13 @@ unsigned int XKBExtension::getGroup() const
return xkbState.group;
}
-/**
- * @brief Gets the current layout in its binary compiled form
- * and write it to the file specified by 'fileName'
- * @param[in] fileName file to store compiled layout to
- * @return true if no problem, false otherwise
- */
-bool XKBExtension::compileCurrentLayout(const TQString &layoutKey)
-{
- XkbFileInfo result;
- memset(&result, 0, sizeof(result));
- result.type = XkmKeymapFile;
- XkbReadFromServer(m_dpy, XkbAllMapComponentsMask, XkbAllMapComponentsMask, &result);
-
- const TQString fileName = getPrecompiledLayoutFilename(layoutKey);
-
- kdDebug() << "[kxkb-extension] compiling layout " << this << " cache size: " << fileCache.count() << endl;
- if( fileCache.contains(layoutKey) ) {
- kdDebug() << "[kxkb-extension] trashing old compiled layout for " << fileName << endl;
- if( fileCache[ layoutKey ] != NULL )
- fclose( fileCache[ layoutKey ] ); // recompiling - trash the old file
- fileCache.remove(fileName);
- }
-
- FILE *output = fopen(TQFile::encodeName(fileName), "w");
-
- if ( output == NULL )
- {
- kdWarning() << "[kxkb-extension] Could not open " << fileName << " to precompile: " << strerror(errno) << endl;
- XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
- return false;
- }
-
- if( !XkbWriteXKMFile(output, &result) ) {
- kdWarning() << "[kxkb-extension] Could not write compiled layout to " << fileName << endl;
- fclose(output);
- return false;
- }
-
- fclose(output); // TODO: can we change mode w/out reopening?
- FILE *input = fopen(TQFile::encodeName(fileName), "r");
- fileCache[ layoutKey ] = input;
-
- XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
- return true;
-}
-
-/**
- * @brief takes layout from its compiled binary snapshot in file
- * and sets it as current
- * TODO: cache layout in memory rather than in file
- */
-bool XKBExtension::setCompiledLayout(const TQString &layoutKey)
-{
- FILE *input = NULL;
-
- if( fileCache.contains(layoutKey) ) {
- input = fileCache[ layoutKey ];
- }
-
- if( input == NULL ) {
- kdWarning() << "[kxkb-extension] setCompiledLayout trying to reopen xkb file" << endl; // should never happen
- const TQString fileName = getPrecompiledLayoutFilename(layoutKey);
- input = fopen(TQFile::encodeName(fileName), "r");
-
- // FILE *input = fopen(TQFile::encodeName(fileName), "r");
- if ( input == NULL ) {
- kdDebug() << "[kxkb-extension] Unable to open " << fileName << ": " << strerror(errno) << endl;
- fileCache.remove(layoutKey);
- return false;
- }
- }
- else {
- rewind(input);
- }
-
- XkbFileInfo result;
- memset(&result, 0, sizeof(result));
- if ((result.xkb = XkbAllocKeyboard())==NULL) {
- kdWarning() << "[kxkb-extension] Unable to allocate memory for keyboard description" << endl;
-// fclose(input);
-// fileCache.remove(layoutKey);
- return false;
- }
-
- unsigned retVal = XkmReadFile(input, 0, XkmKeymapLegal, &result);
- if (retVal == XkmKeymapLegal)
- {
- // this means reading the Xkm didn't manage to read any section
- kdWarning() << "[kxkb-extension] Unable to load map from file" << endl;
- XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
- fclose(input);
- fileCache.remove(layoutKey);
- return false;
+/** Examines an X Event passed to it and takes actions if the event is of
+ * interest to KXkb */
+void XKBExtension::processXEvent(XEvent *event) {
+ XkbEvent* xkb_event = (XkbEvent*)event;
+ if (xkb_event->any.xkb_type == XkbStateNotify) {
+ emit groupChanged(xkb_event->state.group);
}
-
- // fclose(input); // don't close - goes in cache
-
- if (XkbChangeKbdDisplay(m_dpy, &result) == Success)
- {
- if (!XkbWriteToServer(&result))
- {
- kdWarning() << "[kxkb-extension] Unable to write the keyboard layout to X display" << endl;
- XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
- return false;
- }
- }
- else
- {
- kdWarning() << "[kxkb-extension] Unable prepare the keyboard layout for X display" << endl;
- }
-
- XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
- return true;
}
-
-// Deletes the precompiled layouts stored in temporary files
-// void XKBExtension::deletePrecompiledLayouts()
-// {
-// TQMapConstIterator<LayoutUnit, TQString> it, end;
-// end = m_compiledLayoutFileNames.end();
-// for (it = m_compiledLayoutFileNames.begin(); it != end; ++it)
-// {
-// unlink(TQFile::encodeName(it.data()));
-// }
-// m_compiledLayoutFileNames.clear();
-// }
+#include "extension.moc"
diff --git a/kxkb/extension.h b/kxkb/extension.h
index bf4293d2b..9a3d2da8e 100644
--- a/kxkb/extension.h
+++ b/kxkb/extension.h
@@ -2,36 +2,33 @@
#define __EXTENSION_H__
#include <X11/Xlib.h>
+#include <tqobject.h>
+#include "kxkbconfig.h"
-class XKBExtension
+class XKBExtension : public TQObject
{
+ TQ_OBJECT
+
public:
XKBExtension(Display *display=NULL);
~XKBExtension();
bool init();
- void reset();
- static bool setXkbOptions(const TQString& options, bool resetOldOptions);
- bool setLayout(const TQString& model,
- const TQString& layout, const TQString& variant,
- const TQString& includeGroup, bool useCompiledLayouts=true);
+ static bool setXkbOptions(const XkbOptions options);
+ static TQString getServerOptions();
bool setGroup(unsigned int group);
unsigned int getGroup() const;
+ void processXEvent(XEvent *ev);
private:
Display *m_dpy;
TQString m_tempDir;
+ int m_keycode;
static TQMap<TQString, FILE*> fileCache;
-
- bool setLayoutInternal(const TQString& model,
- const TQString& layout, const TQString& variant,
- const TQString& includeGroup);
- bool compileCurrentLayout(const TQString& layoutKey);
- bool setCompiledLayout(const TQString& layoutKey);
-
- TQString getPrecompiledLayoutFilename(const TQString& layoutKey);
-// void deletePrecompiledLayouts();
+
+signals:
+ void groupChanged(uint group);
};
#endif
diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp
index a022b6389..73a500e21 100644
--- a/kxkb/kcmlayout.cpp
+++ b/kxkb/kcmlayout.cpp
@@ -13,6 +13,7 @@
#include <tqlistview.h>
#include <tqbuttongroup.h>
#include <tqspinbox.h>
+#include <tqvbox.h>
#include <tdefontrequester.h>
#include <kcolorbutton.h>
@@ -24,6 +25,8 @@
#include <kdebug.h>
#include <tdeapplication.h>
#include <kiconloader.h>
+#include <tdemessagebox.h>
+#include <kglobalaccel.h>
#include <dcopref.h>
#include <dcopclient.h>
@@ -33,6 +36,7 @@
#include "pixmap.h"
#include "kcmmisc.h"
#include "kcmlayoutwidget.h"
+#include "x11helper.h"
#include "kcmlayout.h"
#include "kcmlayout.moc"
@@ -43,8 +47,7 @@ enum {
LAYOUT_COLUMN_NAME = 1,
LAYOUT_COLUMN_MAP = 2,
LAYOUT_COLUMN_VARIANT = 3,
- LAYOUT_COLUMN_INCLUDE = 4,
- LAYOUT_COLUMN_DISPLAY_NAME = 5,
+ LAYOUT_COLUMN_DISPLAY_NAME = 4,
SRC_LAYOUT_COLUMN_COUNT = 3,
DST_LAYOUT_COLUMN_COUNT = 6
};
@@ -100,65 +103,67 @@ static TQListViewItem* copyLVI(const TQListViewItem* src, TQListView* parent)
LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
: TDECModule(parent, name),
- m_rules(NULL)
+ m_rules(NULL),
+ m_forceGrpOverwrite(false)
{
+ X11Helper::initializeTranslations();
TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialog::spacingHint());
widget = new LayoutConfigWidget(this, "widget");
- main->addWidget(TQT_TQWIDGET(widget));
+ main->addWidget(widget);
- connect( TQT_TQOBJECT(widget->chkEnable), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( TQT_TQOBJECT(widget->chkShowSingle), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+ connect( widget->chkEnable, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT(changed()));
+ connect( widget->chkShowSingle, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT(changed()));
- connect( TQT_TQOBJECT(widget->comboModel), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+ connect( widget->comboHotkey, TQ_SIGNAL(activated(int)), this, TQ_SLOT(hotkeyComboChanged()));
+ connect( widget->comboHotkey, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateOptionsCommand()));
+ connect( widget->comboHotkey, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
+ connect( widget->comboModel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
- connect( TQT_TQOBJECT(widget->listLayoutsSrc), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)),
- TQT_TQOBJECT(this), TQT_SLOT(add()));
- connect( TQT_TQOBJECT(widget->btnAdd), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(add()));
- connect( TQT_TQOBJECT(widget->btnRemove), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(remove()));
+ connect( widget->listLayoutsSrc, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)),
+ this, TQ_SLOT(add()));
+ connect( widget->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(add()));
+ connect( widget->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove()));
- connect( TQT_TQOBJECT(widget->comboVariant), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( TQT_TQOBJECT(widget->comboVariant), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(variantChanged()));
- connect( TQT_TQOBJECT(widget->listLayoutsDst), TQT_SIGNAL(selectionChanged(TQListViewItem *)),
- TQT_TQOBJECT(this), TQT_SLOT(layoutSelChanged(TQListViewItem *)));
+ connect( widget->comboVariant, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed()));
+ connect( widget->comboVariant, TQ_SIGNAL(activated(int)), this, TQ_SLOT(variantChanged()));
+ connect( widget->listLayoutsDst, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+ this, TQ_SLOT(layoutSelChanged(TQListViewItem *)));
- connect( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(displayNameChanged(const TQString&)));
-
- connect( widget->chkLatin, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->chkLatin, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(latinChanged()));
+ connect( widget->editDisplayName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(displayNameChanged(const TQString&)));
widget->btnUp->setIconSet(SmallIconSet("1uparrow"));
- connect( widget->btnUp, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->btnUp, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(moveUp()));
+ connect( widget->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+ connect( widget->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveUp()));
widget->btnDown->setIconSet(SmallIconSet("1downarrow"));
- connect( widget->btnDown, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->btnDown, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(moveDown()));
+ connect( widget->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+ connect( widget->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveDown()));
+
+ connect( widget->grpStyle, TQ_SIGNAL( clicked( int ) ), TQ_SLOT(changed()));
+ connect( widget->grpSwitching, TQ_SIGNAL( clicked( int ) ), TQ_SLOT(changed()));
+ connect( widget->grpLabel, TQ_SIGNAL( clicked( int ) ), TQ_SLOT(changed()));
- connect( widget->grpStyle, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
- connect( widget->grpSwitching, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
- connect( widget->grpLabel, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
+ connect( widget->bgColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT(changed()));
+ connect( widget->fgColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT(changed()));
+ connect( widget->chkBgTransparent, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(changed()));
+ connect( widget->labelFont, TQ_SIGNAL( fontSelected(const TQFont&) ), this, TQ_SLOT(changed()));
+ connect( widget->chkLabelShadow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT(changed()));
+ connect( widget->shColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT(changed()));
- connect( widget->bgColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->fgColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->labelFont, TQT_SIGNAL( fontSelected(const TQFont&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->chkLabelShadow, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->shColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+ connect( widget->chkEnableSticky, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+ connect( widget->spinStickyDepth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
- connect( widget->chkEnableSticky, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->spinStickyDepth, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+ connect(widget->chkEnableNotify, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+ connect(widget->chkNotifyUseKMilo, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
widget->listLayoutsSrc->setColumnText(LAYOUT_COLUMN_FLAG, "");
widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_FLAG, "");
- widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_INCLUDE, "");
// widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_DISPLAY_NAME, "");
widget->listLayoutsSrc->setColumnWidth(LAYOUT_COLUMN_FLAG, 28);
widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_FLAG, 28);
- widget->listLayoutsDst->header()->setResizeEnabled(FALSE, LAYOUT_COLUMN_INCLUDE);
widget->listLayoutsDst->header()->setResizeEnabled(FALSE, LAYOUT_COLUMN_DISPLAY_NAME);
- widget->listLayoutsDst->setColumnWidthMode(LAYOUT_COLUMN_INCLUDE, TQListView::Manual);
- widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_INCLUDE, 0);
// widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_DISPLAY_NAME, 0);
widget->listLayoutsDst->setSorting(-1);
@@ -171,9 +176,14 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
//Read rules - we _must_ read _before_ creating xkb-options comboboxes
loadRules();
- makeOptionsTab();
+ // Load global shortcuts
+#define NOSLOTS
+ keys = new TDEGlobalAccel(this);
+#include "kxkbbindings.cpp"
+ makeOptionsTab();
load();
+ makeShortcutsTab();
}
@@ -187,6 +197,8 @@ void LayoutConfig::load()
{
m_kxkbConfig.load(KxkbConfig::LOAD_ALL);
+ keys->readSettings();
+
initUI();
}
@@ -212,7 +224,6 @@ void LayoutConfig::initUI() {
TQListViewItem* newItem = copyLVI(srcItem, widget->listLayoutsDst);
newItem->setText(LAYOUT_COLUMN_VARIANT, layoutUnit.variant);
- newItem->setText(LAYOUT_COLUMN_INCLUDE, layoutUnit.includeGroup);
newItem->setText(LAYOUT_COLUMN_DISPLAY_NAME, layoutUnit.displayName);
widget->listLayoutsDst->insertItem(newItem);
newItem->moveItem(widget->listLayoutsDst->lastItem());
@@ -222,6 +233,25 @@ void LayoutConfig::initUI() {
}
}
+ // initialize hotkey combo
+ TQDict<char> allOptions = m_rules->options();
+
+ TQStringList commonHotkeys;
+ commonHotkeys << "alt_shift_toggle" << "ctrl_shift_toggle"
+ << "win_space_toggle" << "alt_space_toggle"
+ << "caps_toggle" << "menu_toggle"
+ << "lwin_toggle" << "rwin_toggle";
+
+ for (TQStringList::ConstIterator hk = commonHotkeys.begin(); hk != commonHotkeys.end(); ++hk ) {
+ const char *hkOpt = tqstrdup(TQString("grp:" + (*hk)).ascii());
+ const char *hkDesc = allOptions[hkOpt];
+ if (hkDesc != 0) { // the option exists
+ widget->comboHotkey->insertItem(XkbRules::trOpt(hkDesc));
+ }
+ }
+ widget->comboHotkey->insertItem(i18n("None"));
+ widget->comboHotkey->insertItem(i18n("Other..."));
+
// display KXKB switching options
widget->chkShowSingle->setChecked(m_kxkbConfig.m_showSingle);
@@ -231,8 +261,7 @@ void LayoutConfig::initUI() {
widget->radFlagOnly->setChecked( showFlag && !showLabel );
widget->radLabelOnly->setChecked( !showFlag && showLabel );
- widget->chkEnableOptions->setChecked( m_kxkbConfig.m_enableXkbOptions );
- widget->checkResetOld->setChecked(m_kxkbConfig.m_resetOldOptions);
+ widget->xkbOptsMode->setButton(m_kxkbConfig.m_resetOldOptions ? 0 : 1);
widget->grpLabel->setButton( ( m_kxkbConfig.m_useThemeColors ? 0 : 1 ) );
widget->bgColor->setColor( m_kxkbConfig.m_colorBackground );
@@ -265,20 +294,30 @@ void LayoutConfig::initUI() {
widget->spinStickyDepth->setEnabled(m_kxkbConfig.m_stickySwitching);
widget->spinStickyDepth->setValue( m_kxkbConfig.m_stickySwitchingDepth);
+ widget->chkEnableNotify->setChecked(m_kxkbConfig.m_enableNotify);
+ widget->chkNotifyUseKMilo->setChecked(m_kxkbConfig.m_notifyUseKMilo);
+
updateStickyLimit();
widget->chkEnable->setChecked( m_kxkbConfig.m_useKxkb );
widget->grpLayouts->setEnabled( m_kxkbConfig.m_useKxkb );
- widget->optionsFrame->setEnabled( m_kxkbConfig.m_useKxkb );
+ widget->swOptsFrame->setEnabled( m_kxkbConfig.m_useKxkb );
+ widget->indOptsFrame->setEnabled( m_kxkbConfig.m_useKxkb );
// display xkb options
- TQStringList options = TQStringList::split(',', m_kxkbConfig.m_options);
- for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
+ TQStringList activeOptions = TQStringList::split(',', m_kxkbConfig.m_options);
+ bool foundGrp = false;
+ for (TQStringList::ConstIterator it = activeOptions.begin(); it != activeOptions.end(); ++it)
{
TQString option = *it;
TQString optionKey = option.mid(0, option.find(':'));
TQString optionName = m_rules->options()[option];
- OptionListItem *item = m_optionGroups[i18n(optionKey.latin1())];
+
+ if (optionKey == "grp") {
+ foundGrp = true;
+ }
+
+ OptionListItem *item = m_optionGroups[optionKey];
if (item != NULL) {
OptionListItem *child = item->findChildItem( option );
@@ -293,7 +332,15 @@ void LayoutConfig::initUI() {
}
}
+ if (!foundGrp) {
+ OptionListItem *grpNone = itemForOption("grp:none");
+ if (grpNone) {
+ grpNone->setOn(true);
+ }
+ }
+
updateOptionsCommand();
+ updateHotkeyCombo(true);
emit TDECModule::changed( false );
}
@@ -303,8 +350,7 @@ void LayoutConfig::save()
TQString model = lookupLocalized(m_rules->models(), widget->comboModel->currentText());
m_kxkbConfig.m_model = model;
- m_kxkbConfig.m_enableXkbOptions = widget->chkEnableOptions->isChecked();
- m_kxkbConfig.m_resetOldOptions = widget->checkResetOld->isChecked();
+ m_kxkbConfig.m_resetOldOptions = widget->radXkbOverwrite->isOn();
m_kxkbConfig.m_options = createOptionString();
m_kxkbConfig.m_useThemeColors = widget->radLabelUseTheme->isChecked();
@@ -320,17 +366,14 @@ void LayoutConfig::save()
while (item) {
TQString layout = item->text(LAYOUT_COLUMN_MAP);
TQString variant = item->text(LAYOUT_COLUMN_VARIANT);
- TQString includes = item->text(LAYOUT_COLUMN_INCLUDE);
TQString displayName = item->text(LAYOUT_COLUMN_DISPLAY_NAME);
LayoutUnit layoutUnit(layout, variant);
- layoutUnit.includeGroup = includes;
layoutUnit.displayName = displayName;
layouts.append( layoutUnit );
item = item->nextSibling();
kdDebug() << "To save: layout " << layoutUnit.toPair()
- << ", inc: " << layoutUnit.includeGroup
<< ", disp: " << layoutUnit.displayName << endl;
}
m_kxkbConfig.m_layouts = layouts;
@@ -363,8 +406,44 @@ void LayoutConfig::save()
m_kxkbConfig.m_stickySwitching = widget->chkEnableSticky->isChecked();
m_kxkbConfig.m_stickySwitchingDepth = widget->spinStickyDepth->value();
+ m_kxkbConfig.m_enableNotify = widget->chkEnableNotify->isChecked();
+ m_kxkbConfig.m_notifyUseKMilo = widget->chkNotifyUseKMilo->isChecked();
+
m_kxkbConfig.save();
+ // We might need to unset previous hotkey options
+ if (m_forceGrpOverwrite)
+ {
+ // First get all the server's options
+ TQStringList srvOptions = TQStringList::split(",", XKBExtension::getServerOptions());
+ TQStringList newOptions;
+
+ // Then remove all grp: options
+ for (TQStringList::Iterator it = srvOptions.begin(); it != srvOptions.end(); ++it)
+ {
+ TQString opt(*it);
+ if (!opt.startsWith("grp:"))
+ {
+ newOptions << opt;
+ }
+ }
+
+ XkbOptions xkbOptions;
+ xkbOptions.options = newOptions.join(",");
+ xkbOptions.resetOld = true;
+
+ if (!XKBExtension::setXkbOptions(xkbOptions))
+ {
+ kdWarning() << "[LayoutConfig::save] Could not overwrite previous grp: options!" << endl;
+ }
+
+ m_forceGrpOverwrite = false;
+ }
+
+ // Save and apply global shortcuts
+ m_keyChooser->commitChanges();
+ keys->writeSettings(0, true);
+
// Get current layout from Kxkb
if (!kapp->dcopClient()->isAttached())
kapp->dcopClient()->attach();
@@ -397,6 +476,8 @@ void LayoutConfig::save()
}
}
+ updateHotkeyCombo();
+
emit TDECModule::changed( false );
}
@@ -439,9 +520,6 @@ void LayoutConfig::add()
// than one time, with different variants.
TQListViewItem* toadd = copyLVI(sel, widget->listLayoutsDst);
- // Turn on "Include Latin layout" for new language by default (bnc:204402)
- toadd->setText(LAYOUT_COLUMN_INCLUDE, "us");
-
widget->listLayoutsDst->insertItem(toadd);
if( widget->listLayoutsDst->childCount() > 1 )
toadd->moveItem(widget->listLayoutsDst->lastItem());
@@ -513,6 +591,7 @@ void LayoutConfig::variantChanged()
if( selectedVariant == DEFAULT_VARIANT_NAME )
selectedVariant = "";
selLayout->setText(LAYOUT_COLUMN_VARIANT, selectedVariant);
+ updateLayoutCommand();
}
// helper
@@ -551,33 +630,10 @@ void LayoutConfig::updateIndicator(TQListViewItem* selLayout)
{
}
-
-void LayoutConfig::latinChanged()
-{
- TQListViewItem* selLayout = widget->listLayoutsDst->selectedItem();
- if ( !selLayout ) {
- widget->chkLatin->setChecked( false );
- widget->chkLatin->setEnabled( false );
- return;
- }
-
- TQString include;
- if( widget->chkLatin->isChecked() )
- include = "us";
- else
- include = "";
- selLayout->setText(LAYOUT_COLUMN_INCLUDE, include);
-
- LayoutUnit layoutUnitKey = getLayoutUnitKey(selLayout);
- kdDebug() << "layout " << layoutUnitKey.toPair() << ", inc: " << include << endl;
-}
-
void LayoutConfig::layoutSelChanged(TQListViewItem *sel)
{
widget->comboVariant->clear();
widget->comboVariant->setEnabled( sel != NULL );
- widget->chkLatin->setChecked( false );
- widget->chkLatin->setEnabled( sel != NULL );
if( sel == NULL ) {
updateLayoutCommand();
@@ -588,21 +644,6 @@ void LayoutConfig::layoutSelChanged(TQListViewItem *sel)
LayoutUnit layoutUnitKey = getLayoutUnitKey(sel);
TQString kbdLayout = layoutUnitKey.layout;
- // TODO: need better algorithm here for determining if needs us group
- if ( ! m_rules->isSingleGroup(kbdLayout)
- || kbdLayout.startsWith("us") || kbdLayout.startsWith("en") ) {
- widget->chkLatin->setEnabled( false );
- }
- else {
- TQString inc = sel->text(LAYOUT_COLUMN_INCLUDE);
- if ( inc.startsWith("us") || inc.startsWith("en") ) {
- widget->chkLatin->setChecked(true);
- }
- else {
- widget->chkLatin->setChecked(false);
- }
- }
-
TQStringList vars = m_rules->getAvailableVariants(kbdLayout);
kdDebug() << "layout " << kbdLayout << " has " << vars.count() << " variants" << endl;
@@ -630,13 +671,13 @@ TQWidget* LayoutConfig::makeOptionsTab()
listView->setColumnText( 0, i18n( "Options" ) );
listView->clear();
- connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(changed()));
- connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(updateOptionsCommand()));
-
- connect(widget->chkEnableOptions, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(listView, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(changed()));
+ connect(listView, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(resolveConflicts(TQListViewItem *)));
+ connect(listView, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(updateHotkeyCombo()));
- connect(widget->checkResetOld, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
- connect(widget->checkResetOld, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateOptionsCommand()));
+ connect(widget->xkbOptsMode, TQ_SIGNAL(released(int)), TQ_SLOT(changed()));
+ connect(widget->xkbOptsMode, TQ_SIGNAL(released(int)), TQ_SLOT(updateOptionsCommand()));
+ connect(widget->xkbOptsMode, TQ_SIGNAL(released(int)), TQ_SLOT(updateHotkeyCombo()));
//Create controllers for all options
TQDictIterator<char> it(m_rules->options());
@@ -646,19 +687,26 @@ TQWidget* LayoutConfig::makeOptionsTab()
if (!it.currentKey().contains(':'))
{
if( it.currentKey() == "ctrl" || it.currentKey() == "caps"
- || it.currentKey() == "altwin" ) {
- parent = new OptionListItem(listView, i18n( it.current() ),
+ || it.currentKey() == "altwin") {
+ parent = new OptionListItem(listView, XkbRules::trOpt( it.current() ),
TQCheckListItem::RadioButtonController, it.currentKey());
OptionListItem *item = new OptionListItem(parent, i18n( "None" ),
TQCheckListItem::RadioButton, "none");
item->setState(TQCheckListItem::On);
}
+ else if (it.currentKey() == "grp") {
+ parent = new OptionListItem(listView, XkbRules::trOpt(it.current()),
+ TQCheckListItem::RadioButtonController, it.currentKey());
+ parent->setSelectable(false);
+ OptionListItem *item = new OptionListItem(parent, i18n("None"),
+ TQCheckListItem::CheckBox, "grp:none");
+ }
else {
- parent = new OptionListItem(listView, i18n( it.current() ),
+ parent = new OptionListItem(listView, XkbRules::trOpt( it.current() ),
TQCheckListItem::CheckBoxController, it.currentKey());
}
parent->setOpen(true);
- m_optionGroups.insert(i18n(it.currentKey().local8Bit()), parent);
+ m_optionGroups.insert(it.currentKey(), parent);
}
}
@@ -676,12 +724,13 @@ TQWidget* LayoutConfig::makeOptionsTab()
// workaroung for mistake in rules file for xkb options in XFree 4.2.0
TQString text(it.current());
text = text.replace( "Cap$", "Caps." );
- if( parent->type() == TQCheckListItem::RadioButtonController )
- new OptionListItem(parent, i18n(text.utf8()),
- TQCheckListItem::RadioButton, key);
- else
- new OptionListItem(parent, i18n(text.utf8()),
+ if ( parent->type() == TQCheckListItem::CheckBoxController
+ || key.startsWith("grp:"))
+ new OptionListItem(parent, XkbRules::trOpt(text),
TQCheckListItem::CheckBox, key);
+ else
+ new OptionListItem(parent, XkbRules::trOpt(text),
+ TQCheckListItem::RadioButton, key);
}
}
}
@@ -691,68 +740,368 @@ TQWidget* LayoutConfig::makeOptionsTab()
return listView;
}
+TQWidget* LayoutConfig::makeShortcutsTab() {
+ m_keyChooser = new KKeyChooser(keys, widget->tabShortcuts, false, false);
+ connect(m_keyChooser, TQ_SIGNAL(keyChange()), this, TQ_SLOT(changed()));
+ widget->tabShortcuts->layout()->add(m_keyChooser);
+ return m_keyChooser;
+}
+
void LayoutConfig::updateOptionsCommand()
{
TQString setxkbmap;
TQString options = createOptionString();
+ bool overwrite = widget->radXkbOverwrite->isOn();
if( !options.isEmpty() ) {
setxkbmap = "setxkbmap -option "; //-rules " + m_rule
- if( widget->checkResetOld->isChecked() )
+ if (overwrite)
setxkbmap += "-option ";
setxkbmap += options;
}
+ else if (overwrite) {
+ setxkbmap = "setxkbmap -option";
+ }
widget->editCmdLineOpt->setText(setxkbmap);
+ widget->editCmdLineOpt->setDisabled(setxkbmap.isEmpty());
}
void LayoutConfig::updateLayoutCommand()
{
- TQString setxkbmap;
- TQString layoutDisplayName;
- TQListViewItem* sel = widget->listLayoutsDst->selectedItem();
-
- if( sel != NULL ) {
- TQString kbdLayout = sel->text(LAYOUT_COLUMN_MAP);
- TQString variant = widget->comboVariant->currentText();
- if( variant == DEFAULT_VARIANT_NAME )
- variant = "";
-
- setxkbmap = "setxkbmap"; //-rules " + m_rule
- setxkbmap += " -model " + lookupLocalized(m_rules->models(), widget->comboModel->currentText())
- + " -layout ";
- setxkbmap += kbdLayout;
- if( widget->chkLatin->isChecked() )
- setxkbmap += ",us";
-
-/* LayoutUnit layoutUnitKey = getLayoutUnitKey(sel);
- layoutDisplayName = m_kxkbConfig.getLayoutDisplayName( *m_kxkbConfig.m_layouts.find(layoutUnitKey) );*/
- layoutDisplayName = sel->text(LAYOUT_COLUMN_DISPLAY_NAME);
- if( layoutDisplayName.isEmpty() ) {
- int count = 0;
- TQListViewItem *item = widget->listLayoutsDst->firstChild();
- while (item) {
- TQString layout_ = item->text(LAYOUT_COLUMN_MAP);
- if( layout_ == kbdLayout )
- ++count;
- item = item->nextSibling();
- }
- bool single = count < 2;
- layoutDisplayName = m_kxkbConfig.getDefaultDisplayName(LayoutUnit(kbdLayout, variant), single);
- }
- kdDebug() << "disp: '" << layoutDisplayName << "'" << endl;
-
- if( !variant.isEmpty() ) {
- setxkbmap += " -variant ";
- if( widget->chkLatin->isChecked() )
- setxkbmap += ",";
- setxkbmap += variant;
+ TQString setxkbmap = "setxkbmap";
+ setxkbmap += " -model " + lookupLocalized(m_rules->models(),
+ widget->comboModel->currentText());
+ TQStringList layoutCodes;
+ TQStringList layoutVariants;
+ TQListViewItem *item = widget->listLayoutsDst->firstChild();
+ while (item) {
+ layoutCodes << item->text(LAYOUT_COLUMN_MAP);
+
+ TQString layoutVariant = item->text(LAYOUT_COLUMN_VARIANT);
+ if (layoutVariant == DEFAULT_VARIANT_NAME) {
+ layoutVariant = "";
}
+ layoutVariants << layoutVariant;
+
+ item = item->nextSibling();
+ }
+
+ setxkbmap += " -layout " + layoutCodes.join(",");
+
+ if( !layoutVariants.isEmpty() ) {
+ setxkbmap += " -variant " + layoutVariants.join(",");
}
widget->editCmdLine->setText(setxkbmap);
+ /* update display name field */
+ TQListViewItem *sel = widget->listLayoutsDst->selectedItem();
+ if (!sel) {
+ return;
+ }
+ TQString selLayoutCode = sel->text(LAYOUT_COLUMN_MAP);
+ TQString selLayoutVariant = widget->comboVariant->currentText();
+ TQString selDisplayName = sel->text(LAYOUT_COLUMN_DISPLAY_NAME);
+ if (selDisplayName.isEmpty()) {
+ int count = 0;
+ TQListViewItem *item = widget->listLayoutsDst->firstChild();
+ while (item) {
+ TQString layoutCode_ = item->text(LAYOUT_COLUMN_MAP);
+ if (layoutCode_ == selLayoutCode) {
+ ++count;
+ }
+ item = item->nextSibling();
+ }
+ bool single = count < 2;
+ selDisplayName = m_kxkbConfig.getDefaultDisplayName(LayoutUnit(selLayoutCode, selLayoutVariant), single);
+ }
+
widget->editDisplayName->setEnabled( sel != NULL );
- widget->editDisplayName->setText(layoutDisplayName);
+ widget->editDisplayName->setText(selDisplayName);
+}
+
+void LayoutConfig::checkConflicts(OptionListItem *current,
+ TQStringList conflicting,
+ TQStringList &conflicts)
+{
+ if (!current || conflicting.count() < 2 ||
+ !conflicting.contains(current->optionName()))
+ {
+ return;
+ }
+ TQStringList::Iterator it;
+ for (it = conflicting.begin(); it != conflicting.end(); ++it) {
+ TQString option(*it);
+ if (option == current->optionName()) {
+ continue;
+ }
+
+ OptionListItem *item = itemForOption(option);
+ if (item && item->isOn()) {
+ conflicts << item->text();
+ }
+ }
+}
+
+void LayoutConfig::resolveConflicts(TQListViewItem *lvi) {
+ OptionListItem *current = (OptionListItem*)lvi;
+
+ kdDebug() << "resolveConflicts : " << current->optionName() << endl;
+
+ if (current->optionName().startsWith("grp:")) {
+ OptionListItem *grpItem = m_optionGroups["grp"];
+ if (grpItem == NULL) {
+ kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
+ return;
+ }
+
+ OptionListItem *noneItem = grpItem->findChildItem("grp:none");
+ if (!noneItem) {
+ kdDebug() << "LayoutConfig: unable to find None item for grp!" << endl;
+ }
+ else {
+ // Option "none" selected, uncheck all other options immediately
+ if (current->optionName() == "grp:none") {
+ if (current->isOn()) {
+ OptionListItem *child = (OptionListItem*)grpItem->firstChild();
+ while (child) {
+ if (child != current) {
+ child->setOn(false);
+ }
+ child = (OptionListItem*)child->nextSibling();
+ }
+ }
+ else {
+ current->setOn(true);
+ }
+ updateOptionsCommand();
+ return;
+ }
+
+ // If no options are selected then select "none"
+ bool notNone = false;
+ OptionListItem *child = (OptionListItem*)grpItem->firstChild();
+ while (child) {
+ if (child->isOn() && child->optionName() != "none") {
+ notNone = true;
+ break;
+ }
+ child = (OptionListItem*)child->nextSibling();
+ }
+
+ noneItem->setOn(!notNone);
+ }
+ }
+
+ TQStringList conflicts;
+ OptionListItem *conflict;
+
+ TQStringList conflicting;
+ /* Might be incomplete */
+ // Space
+ conflicting << "grp:win_space_toggle"
+ << "grp:alt_space_toggle"
+ << "grp:ctrl_space_toggle";
+ checkConflicts(current, conflicting, conflicts);
+
+ // Shift
+ conflicting.clear();
+ conflicting << "grp:ctrl_shift_toggle"
+ << "grp:alt_shift_toggle";
+ checkConflicts(current, conflicting, conflicts);
+
+ // Control
+ conflicting.clear();
+ conflicting << "grp:ctrl_select"
+ << "grp:ctrl_alt_toggle"
+ << "grp:ctrl_shift_toggle";
+ checkConflicts(current, conflicting, conflicts);
+
+ // Left Ctrl
+ conflicting.clear();
+ conflicting << "grp:lctrl_toggle"
+ << "grp:lctrl_lshift_toggle";
+ checkConflicts(current, conflicting, conflicts);
+
+ // Right Ctrl
+ conflicting.clear();
+ conflicting << "grp:rctrl_toggle"
+ << "grp:rctrl_rshift_toggle";
+ checkConflicts(current, conflicting, conflicts);
+
+ // Win
+ conflicting.clear();
+ conflicting << "grp:win_space_toggle"
+ << "grp:win_switch"
+ << "win_menu_select";
+ checkConflicts(current, conflicting, conflicts);
+
+ // Left Alt
+ conflicting.clear();
+ conflicting << "grp:lalt_toggle"
+ << "grp:lalt_lshift_toggle";
+ checkConflicts(current, conflicting, conflicts);
+
+ // Right Alt
+ conflicting.clear();
+ conflicting << "grp:ralt_toggle"
+ << "grp:ralt_rshift_toggle";
+ checkConflicts(current, conflicting, conflicts);
+
+ // Caps Lock
+ conflicting.clear();
+ conflicting << "grp:caps_toggle"
+ << "grp:caps_select"
+ << "grp:caps_switch"
+ << "grp:alt_caps_toggle";
+ checkConflicts(current, conflicting, conflicts);
+
+ if (conflicts.count()) {
+ TQString curText = current->text();
+ int confirm = KMessageBox::warningYesNoList(this,
+ i18n("<qt>The option <b>%1</b> might conflict with "
+ "other options that you have already enabled.<br>"
+ "Are you sure that you really want to enable "
+ "<b>%2</b>?</qt>")
+ .arg(curText).arg(curText),
+ conflicts,
+ i18n("Conflicting options"));
+ if (confirm == KMessageBox::No) {
+ current->setOn(false);
+ }
+ }
+ updateOptionsCommand();
+}
+
+// Synchronizes Xkb grp options --> hotkeys combobox
+void LayoutConfig::updateHotkeyCombo() {
+ updateHotkeyCombo(false);
+}
+
+void LayoutConfig::updateHotkeyCombo(bool initial) {
+ OptionListItem *grpItem = m_optionGroups["grp"];
+ if (grpItem == NULL) {
+ kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
+ return;
+ }
+
+ TQStringList hotkeys;
+
+ // Get server options first
+ if (initial || widget->xkbOptsMode->selectedId() == 1)
+ {
+ TQStringList opts = TQStringList::split(",", XKBExtension::getServerOptions());
+ for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it)
+ {
+ TQString option(*it);
+
+ if (!option.startsWith("grp:"))
+ {
+ continue;
+ }
+
+ // Get description from existing item
+ // This spares us the trouble of querying Xkb rules second time
+ OptionListItem *item = itemForOption(option);
+ if (!item)
+ {
+ kdWarning() << "[updateHotkeyCombo] server has set unknown option: "
+ << option << endl;
+ continue;
+ }
+
+ TQString optionName = item->text();
+ if (!hotkeys.contains(optionName) && option != "grp:none")
+ {
+ hotkeys << optionName;
+ }
+ }
+ }
+
+ OptionListItem *child = (OptionListItem*)grpItem->firstChild();
+ while (child) {
+ TQString optionText = child->text();
+ if (child->isOn() && !hotkeys.contains(optionText) && child->optionName() != "grp:none") {
+ hotkeys << optionText;
+ }
+ child = (OptionListItem*)child->nextSibling();
+ }
+
+ if (!hotkeys.count()) {
+ OptionListItem *noneItem = itemForOption("grp:none");
+ if (noneItem)
+ {
+ hotkeys << noneItem->text();
+ }
+ else
+ {
+ kdWarning() << "[updateHotkeyCombo] cannot find grp:none item!" << endl;
+ hotkeys << widget->comboHotkey->text(0); // fallback
+ }
+ }
+
+ int other = widget->comboHotkey->count() - 1;
+ widget->comboHotkey->changeItem(i18n("Custom..."), other);
+ if (hotkeys.count() < 2) {
+ bool found = false;
+ for (int i = 0; i < widget->comboHotkey->count(); ++i) {
+ if (hotkeys[0] == widget->comboHotkey->text(i)) {
+ widget->comboHotkey->setCurrentItem(i);
+ found = true;
+ }
+ }
+ if (!found) {
+ widget->comboHotkey->changeItem(i18n("Other (%1)").arg(hotkeys[0]),
+ other);
+ widget->comboHotkey->setCurrentItem(other);
+ }
+ }
+ else {
+ widget->comboHotkey->changeItem(i18n("Multiple (%1)").arg(hotkeys.join("; ")),
+ other);
+ widget->comboHotkey->setCurrentItem(other);
+ }
+}
+
+// Synchronizes hotkeys combobox --> Xkb grp options
+void LayoutConfig::hotkeyComboChanged() {
+ TQStringList hotkeys;
+ int other = widget->comboHotkey->count() - 1;
+
+ if (widget->comboHotkey->currentItem() != other) {
+ hotkeys << widget->comboHotkey->currentText();
+ }
+ else {
+ TQString otherStr = widget->comboHotkey->text(other);
+ int i1 = otherStr.find("(");
+ if (i1 != -1) { // custom hotkey(s) set
+ ++i1;
+ int i2 = otherStr.findRev(")");
+ if (i2 != -1) {
+ hotkeys = TQStringList::split("; ", otherStr.mid(i1, i2-i1));
+ }
+ }
+ }
+
+ OptionListItem *grpItem = m_optionGroups["grp"];
+ if (grpItem == NULL) {
+ kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
+ return;
+ }
+
+ OptionListItem *child = (OptionListItem*)grpItem->firstChild();
+ while (child) {
+ child->setOn(hotkeys.contains(child->text()));
+ child = (OptionListItem*)child->nextSibling();
+ }
+
+ if (widget->comboHotkey->currentItem() == other) {
+ widget->tabWidget->setCurrentPage(4);
+ widget->listOptions->ensureItemVisible(grpItem);
+ widget->listOptions->setFocus();
+ }
+
+ m_forceGrpOverwrite = true;
}
void LayoutConfig::changed()
@@ -802,6 +1151,20 @@ void LayoutConfig::loadRules()
//TODO: reset options and xkb options
}
+OptionListItem* LayoutConfig::itemForOption(TQString option) {
+ if (!option.contains(':')) {
+ return nullptr;
+ }
+
+ TQString optionKey = option.mid(0, option.find(':'));
+ OptionListItem *item = m_optionGroups[optionKey];
+
+ if( !item ) {
+ kdDebug() << "WARNING: skipping empty group for " << option << endl;
+ return nullptr;
+ }
+ return (OptionListItem*)item->findChildItem(option);
+}
TQString LayoutConfig::createOptionString()
{
@@ -809,32 +1172,17 @@ TQString LayoutConfig::createOptionString()
for (TQDictIterator<char> it(m_rules->options()); it.current(); ++it)
{
TQString option(it.currentKey());
-
- if (option.contains(':')) {
-
- TQString optionKey = option.mid(0, option.find(':'));
- OptionListItem *item = m_optionGroups[optionKey];
-
- if( !item ) {
- kdDebug() << "WARNING: skipping empty group for " << it.currentKey()
- << endl;
- continue;
- }
-
- OptionListItem *child = item->findChildItem( option );
-
- if ( child ) {
- if ( child->state() == TQCheckListItem::On ) {
- TQString selectedName = child->optionName();
- if ( !selectedName.isEmpty() && selectedName != "none" ) {
- if (!options.isEmpty())
- options.append(',');
- options.append(selectedName);
- }
- }
+ OptionListItem *child = itemForOption(option);
+ if (!child) {
+ continue;
+ }
+ if ( child->state() == TQCheckListItem::On ) {
+ TQString selectedName = child->optionName();
+ if ( !selectedName.isEmpty() && selectedName != "none" ) {
+ if (!options.isEmpty())
+ options.append(',');
+ options.append(selectedName);
}
- else
- kdDebug() << "Empty option button for group " << it.currentKey() << endl;
}
}
return options;
@@ -902,12 +1250,8 @@ extern "C"
kapp->startServiceByDesktopName("kxkb");
}
else {
- // Even if the layouts have been disabled we still want to set Xkb options
- // user can always switch them off now in the "Options" tab
- if( m_kxkbConfig.m_enableXkbOptions ) {
- if( !XKBExtension::setXkbOptions(m_kxkbConfig.m_options, m_kxkbConfig.m_resetOldOptions) ) {
- kdDebug() << "Setting XKB options failed!" << endl;
- }
+ if (!XKBExtension::setXkbOptions(m_kxkbConfig.getKXkbOptions())) {
+ kdDebug() << "Setting XKB options failed!" << endl;
}
}
}
@@ -991,7 +1335,7 @@ extern "C"
//these seem to be new in XFree86 4.4.0
I18N_NOOP("Shift with numpad keys works as in MS Windows.");
- I18N_NOOP("Special keys (Ctrl+Alt+<key>) handled in a server.");
+ I18N_NOOP("Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.");
I18N_NOOP("Miscellaneous compatibility options");
I18N_NOOP("Right Control key works as Right Alt");
diff --git a/kxkb/kcmlayout.h b/kxkb/kcmlayout.h
index 987fff2b0..db0f89690 100644
--- a/kxkb/kcmlayout.h
+++ b/kxkb/kcmlayout.h
@@ -16,7 +16,7 @@ class XkbRules;
class LayoutConfig : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
LayoutConfig(TQWidget *parent = 0L, const char *name = 0L);
@@ -27,23 +27,27 @@ public:
void defaults();
void initUI();
virtual TQString handbookDocPath() const;
-
+
protected:
TQString createOptionString();
void updateIndicator(TQListViewItem* selLayout);
+ OptionListItem* itemForOption(TQString option);
protected slots:
void moveUp();
void moveDown();
+ void hotkeyComboChanged();
void variantChanged();
void displayNameChanged(const TQString& name);
- void latinChanged();
void layoutSelChanged(TQListViewItem *);
void loadRules();
void updateLayoutCommand();
void updateOptionsCommand();
+ void updateHotkeyCombo();
+ void updateHotkeyCombo(bool initial);
void add();
void remove();
+ void resolveConflicts(TQListViewItem *lvi);
void changed();
@@ -53,10 +57,16 @@ private:
XkbRules *m_rules;
KxkbConfig m_kxkbConfig;
TQDict<OptionListItem> m_optionGroups;
+ bool m_forceGrpOverwrite;
+ KKeyChooser *m_keyChooser;
+ TDEGlobalAccel *keys;
TQWidget* makeOptionsTab();
+ TQWidget* makeShortcutsTab();
void updateStickyLimit();
static LayoutUnit getLayoutUnitKey(TQListViewItem *sel);
+ void checkConflicts(OptionListItem *current, TQStringList conflicting,
+ TQStringList &conflicts);
};
diff --git a/kxkb/kcmlayoutwidget.ui b/kxkb/kcmlayoutwidget.ui
index e8dcc3a9e..11d147211 100644
--- a/kxkb/kcmlayoutwidget.ui
+++ b/kxkb/kcmlayoutwidget.ui
@@ -76,7 +76,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel1_4</cstring>
</property>
@@ -86,7 +86,7 @@
</widget>
<widget class="TQLabel" row="2" column="2" rowspan="1" colspan="3">
<property name="name">
- <cstring>textLabel1_4_2</cstring>
+ <cstring>labelLayouts</cstring>
</property>
<property name="text">
<string>Active layouts:</string>
@@ -94,7 +94,7 @@
</widget>
<widget class="TQLabel" row="0" column="2" rowspan="1" colspan="3">
<property name="name">
- <cstring>textLabel1_2</cstring>
+ <cstring>labelModel</cstring>
</property>
<property name="text">
<string>Keyboard &amp;model:</string>
@@ -167,17 +167,6 @@
</column>
<column>
<property name="text">
- <string>5</string>
- </property>
- <property name="clickable">
- <bool>false</bool>
- </property>
- <property name="resizable">
- <bool>false</bool>
- </property>
- </column>
- <column>
- <property name="text">
<string>Label</string>
</property>
<property name="clickable">
@@ -266,7 +255,7 @@
<cstring>editCmdLine</cstring>
</property>
</widget>
- <widget class="TQListView" row="3" column="0" rowspan="5" colspan="2">
+ <widget class="TQListView" row="1" column="0" rowspan="6" colspan="2">
<column>
<property name="text">
<string></string>
@@ -327,20 +316,6 @@
<string>This is the command which is executed when switching to the selected layout. It may help you if you want to debug layout switching, or if you want to switch layouts without the help of TDE.</string>
</property>
</widget>
- <widget class="TQCheckBox" row="7" column="2" rowspan="1" colspan="3">
- <property name="name">
- <cstring>chkLatin</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Include latin layout</string>
- </property>
- <property name="whatsThis" stdset="0">
- <string>If after you switch to this layout some keyboard shortcuts based on latin keys do not work try to enable this option.</string>
- </property>
- </widget>
<widget class="TQLabel" row="6" column="2">
<property name="name">
<cstring>textLabel1_6</cstring>
@@ -423,18 +398,259 @@
</widget>
<widget class="TQWidget">
<property name="name">
+ <cstring>tabShortcuts</cstring>
+ </property>
+ <attribute name="title">
+ <string>Keyboard Shortcuts</string>
+ </attribute>
+ <vbox>
+ <widget class="TQLabel">
+ <property name="name">
+ <cstring>labelHotkey</cstring>
+ </property>
+ <property name="text">
+ <string>&lt;qt&gt;&lt;b&gt;Key combination to switch layout (X11):&lt;/b&gt;&lt;/qt&gt;</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>comboHotkey</cstring>
+ </property>
+ </widget>
+ <widget class="TQComboBox">
+ <property name="name">
+ <cstring>comboHotkey</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Here you can choose the key combination you want to use to switch to the next layout. This list includes only the most common variants. If you choose "Other...", then you will be redirected to the "Options" tab where you can pick from all the available variants. Note that if you have selected Append Mode in the Xkb Options tab this option is not available; you have to use the Xkb Options tab instead.</string>
+ </property>
+ </widget>
+ <widget class="KSeparator">
+ <property name="name">
+ <cstring>switchingGrpSeparator</cstring>
+ </property>
+ </widget>
+ <widget class="TQLabel">
+ <property name="name">
+ <cstring>labelHotkey</cstring>
+ </property>
+ <property name="text">
+ <string>&lt;qt&gt;&lt;b&gt;TDE shortcuts to switch layout:&lt;/b&gt;&lt;/qt&gt;</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>comboHotkey</cstring>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <widget class="TQWidget">
+ <property name="name">
<cstring>tab</cstring>
</property>
<attribute name="title">
<string>Switching Options</string>
</attribute>
- <grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <spacer row="1" column="0">
+ <vbox>
+ <widget class="TQFrame">
<property name="name">
- <cstring>spacer1</cstring>
+ <cstring>swOptsFrame</cstring>
+ </property>
+ <property name="frameShape">
+ <enum>StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>Raised</enum>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <vbox>
+ <widget class="TQButtonGroup">
+ <property name="name">
+ <cstring>grpSwitching</cstring>
+ </property>
+ <property name="title">
+ <string>Switching Policy</string>
+ </property>
+ <property name="exclusive">
+ <bool>true</bool>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>If you select "Application" or "Window" switching policy, changing the keyboard layout will only affect the current application or window.</string>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="TQRadioButton">
+ <property name="name">
+ <cstring>radioButton1</cstring>
+ </property>
+ <property name="text">
+ <string>&amp;Global</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="TQRadioButton">
+ <property name="name">
+ <cstring>radioButton1_3</cstring>
+ </property>
+ <property name="text">
+ <string>Application</string>
+ </property>
+ </widget>
+ <widget class="TQRadioButton">
+ <property name="name">
+ <cstring>radioButton1_2</cstring>
+ </property>
+ <property name="text">
+ <string>&amp;Window</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <widget class="TQGroupBox">
+ <property name="name">
+ <cstring>grpBoxStickySwitching</cstring>
+ </property>
+ <property name="title">
+ <string>Sticky Switching</string>
+ </property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
+ <property name="name">
+ <cstring>chkEnableSticky</cstring>
+ </property>
+ <property name="text">
+ <string>Enable sticky switching</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>If you have more than two layouts and turn this option on, switching with the keyboard shortcut or clicking on the kxkb indicator will only cycle through the last few layouts. You can specify the number of layouts to rotate below. You can still access all layouts by right-clicking on the kxkb indicator.</string>
+ </property>
+ </widget>
+ <spacer row="1" column="0">
+ <property name="name">
+ <cstring>spacer2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <spacer row="1" column="3">
+ <property name="name">
+ <cstring>spacer2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="TQLabel" row="1" column="1">
+ <property name="name">
+ <cstring>textLabel1_5</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Number of layouts to rotate:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>spinBox1</cstring>
+ </property>
+ </widget>
+ <widget class="TQSpinBox" row="1" column="2">
+ <property name="name">
+ <cstring>spinStickyDepth</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="maxValue">
+ <number>10</number>
+ </property>
+ <property name="minValue">
+ <number>2</number>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ <widget class="TQGroupBox">
+ <property name="name">
+ <cstring>grpBoxNotifications</cstring>
+ </property>
+ <property name="title">
+ <string>Notifications</string>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="TQCheckBox">
+ <property name="name">
+ <cstring>chkEnableNotify</cstring>
+ </property>
+ <property name="text">
+ <string>Enable keyboard layout notification</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>If this option is enabled, a little notification will pop up on the screen displaying the name of the currently selected layout whenever it changes.</string>
+ </property>
+ </widget>
+ <widget class="TQCheckBox">
+ <property name="name">
+ <cstring>chkNotifyUseKMilo</cstring>
+ </property>
+ <property name="text">
+ <string>Use KMilo for notifications, if available</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>If this option is enabled and KMilo is available, it will be used to display the notifications instead of the standard notification system. If KMilo is not available, notifications will be showed via the standard TDE notification system.</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ </vbox>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer2</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
@@ -449,9 +665,19 @@
</size>
</property>
</spacer>
- <widget class="TQFrame" row="0" column="0">
+ </vbox>
+ </widget>
+ <widget class="TQWidget">
+ <property name="name">
+ <cstring>tab</cstring>
+ </property>
+ <attribute name="title">
+ <string>Indicator Options</string>
+ </attribute>
+ <vbox>
+ <widget class="TQFrame">
<property name="name">
- <cstring>optionsFrame</cstring>
+ <cstring>indOptsFrame</cstring>
</property>
<property name="frameShape">
<enum>StyledPanel</enum>
@@ -463,10 +689,7 @@
<number>0</number>
</property>
<grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="TQButtonGroup" row="1" column="0">
+ <widget class="TQButtonGroup" row="0" column="0">
<property name="name">
<cstring>grpStyle</cstring>
</property>
@@ -512,7 +735,7 @@
</widget>
</vbox>
</widget>
- <widget class="TQButtonGroup" row="1" column="1">
+ <widget class="TQButtonGroup" row="1" column="0" colspan="2">
<property name="name">
<cstring>grpLabel</cstring>
</property>
@@ -556,6 +779,9 @@
<enum>Plain</enum>
</property>
<grid>
+ <property name="margin">
+ <number>0</number>
+ </property>
<spacer row="0" column="0">
<property name="name">
<cstring>spacer2</cstring>
@@ -591,7 +817,32 @@
<property name="whatsThis" stdset="0">
<string>This color will be used as the indicator's background unless the indicator was set to display a flag.</string>
</property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
</widget>
+ <spacer row="0" column="3">
+ <property name="name">
+ <cstring>spacer23</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
<spacer row="1" column="0">
<property name="name">
<cstring>spacer2</cstring>
@@ -624,29 +875,71 @@
<property name="name">
<cstring>fgColor</cstring>
</property>
- <property name="whatsThis" stdset="0">
- <string>This color will be used to draw the language label on the indicator.</string>
- </property>
+ <property name="whatsThis" stdset="0">
+ <string>This color will be used to draw the language label on the indicator.</string>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ <spacer row="1" column="3">
+ <property name="name">
+ <cstring>spacer23</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <spacer row="4" column="0">
+ <property name="name">
+ <cstring>spacer22</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Fixed</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="3">
+ <property name="name">
+ <cstring>chkBgTransparent</cstring>
+ </property>
+ <property name="text">
+ <string>Transparent background</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Check this to remove the indicator's background. Only applicable in "Label only" mode.</string>
+ </property>
</widget>
</grid>
</widget>
- <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3">
- <property name="name">
- <cstring>chkBgTransparent</cstring>
- </property>
- <property name="text">
- <string>Transparent background</string>
- </property>
- <property name="whatsThis" stdset="0">
- <string>Check this to remove the indicator's background. Only applicable in "Label only" mode.</string>
- </property>
- </widget>
<widget class="KSeparator" row="5" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>separator1</cstring>
</property>
</widget>
- <widget class="TQLabel" row="6" column="0" rowspan="1">
+ <widget class="TQLabel" row="6" column="0">
<property name="name">
<cstring>labelFontRequester</cstring>
</property>
@@ -657,12 +950,12 @@
<string>This is the font which will be used by the layout indicator to draw the label.</string>
</property>
</widget>
- <widget class="TDEFontRequester" row="6" column="2">
+ <widget class="TDEFontRequester" row="6" column="1" colspan="2">
<property name="name">
<cstring>labelFont</cstring>
</property>
</widget>
- <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2">
+ <widget class="TQCheckBox" row="7" column="0">
<property name="name">
<cstring>chkLabelShadow</cstring>
</property>
@@ -672,8 +965,16 @@
<property name="whatsThis" stdset="0">
<string>Draw a drop shadow behind the language label. In some cases this option can improve readability.</string>
</property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
</widget>
- <widget class="KColorButton" row="7" column="2">
+ <widget class="KColorButton" row="7" column="1">
<property name="name">
<cstring>shColor</cstring>
</property>
@@ -683,86 +984,23 @@
<property name="enabled">
<bool>false</bool>
</property>
- </widget>
- </grid>
- </widget>
- <widget class="TQButtonGroup" row="2" column="0">
- <property name="name">
- <cstring>grpSwitching</cstring>
- </property>
- <property name="title">
- <string>Switching Policy</string>
- </property>
- <property name="exclusive">
- <bool>true</bool>
- </property>
- <property name="whatsThis" stdset="0">
- <string>If you select "Application" or "Window" switching policy, changing the keyboard layout will only affect the current application or window.</string>
- </property>
- <vbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="TQRadioButton">
- <property name="name">
- <cstring>radioButton1</cstring>
- </property>
- <property name="text">
- <string>&amp;Global</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="TQRadioButton">
- <property name="name">
- <cstring>radioButton1_3</cstring>
- </property>
- <property name="text">
- <string>Application</string>
- </property>
- </widget>
- <widget class="TQRadioButton">
- <property name="name">
- <cstring>radioButton1_2</cstring>
- </property>
- <property name="text">
- <string>&amp;Window</string>
- </property>
- </widget>
- </vbox>
- </widget>
- <widget class="TQGroupBox" row="2" column="1">
- <property name="name">
- <cstring>grpBoxStickySwitching</cstring>
- </property>
- <property name="title">
- <string>Sticky Switching</string>
- </property>
- <grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
- <property name="name">
- <cstring>chkEnableSticky</cstring>
- </property>
- <property name="text">
- <string>Enable sticky switching</string>
- </property>
- <property name="whatsThis" stdset="0">
- <string>If you have more than two layouts and turn this option on, switching with the keyboard shortcut or clicking on the kxkb indicator will only cycle through the last few layouts. You can specify the number of layouts to rotate below. You can still access all layouts by right-clicking on the kxkb indicator.</string>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- </widget>
- <spacer row="1" column="0">
+ </widget> <spacer row="7" column="2">
<property name="name">
- <cstring>spacer2</cstring>
+ <cstring>spacer23</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
- <enum>Fixed</enum>
+ <enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
@@ -771,55 +1009,46 @@
</size>
</property>
</spacer>
- <widget class="TQLabel" row="1" column="1">
- <property name="name">
- <cstring>textLabel1_5</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Number of layouts to rotate:</string>
- </property>
- <property name="buddy" stdset="0">
- <cstring>spinBox1</cstring>
- </property>
- </widget>
- <widget class="TQSpinBox" row="1" column="2">
- <property name="name">
- <cstring>spinStickyDepth</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="maxValue">
- <number>10</number>
- </property>
- <property name="minValue">
- <number>2</number>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
</grid>
</widget>
- <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQButtonGroup" row="0" column="1">
<property name="name">
- <cstring>chkShowSingle</cstring>
+ <cstring>grpMisc</cstring>
</property>
- <property name="text">
- <string>Show indicator for single layout</string>
+ <property name="title">
+ <string>Miscellaneous</string>
</property>
+ <vbox>
+ <widget class="TQCheckBox">
+ <property name="name">
+ <cstring>chkShowSingle</cstring>
+ </property>
+ <property name="text">
+ <string>Show indicator for single layout</string>
+ </property>
+ </widget>
+ </vbox>
</widget>
</grid>
</widget>
- </grid>
+ <spacer>
+ <property name="name">
+ <cstring>spacer1</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
</widget>
<widget class="TQWidget">
<property name="name">
@@ -832,17 +1061,6 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="TQCheckBox">
- <property name="name">
- <cstring>chkEnableOptions</cstring>
- </property>
- <property name="text">
- <string>&amp;Enable xkb options</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
<widget class="TQGroupBox">
<property name="name">
<cstring>groupBox3_2</cstring>
@@ -857,15 +1075,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
- <property name="name">
- <cstring>checkResetOld</cstring>
- </property>
- <property name="text">
- <string>&amp;Reset old options</string>
- </property>
- </widget>
- <widget class="TQLabel" row="2" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel1_3_2</cstring>
</property>
@@ -873,7 +1083,7 @@
<string>Command:</string>
</property>
</widget>
- <widget class="TQLineEdit" row="2" column="1">
+ <widget class="TQLineEdit" row="1" column="1">
<property name="name">
<cstring>editCmdLineOpt</cstring>
</property>
@@ -881,7 +1091,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="TQListView" row="1" column="0" rowspan="1" colspan="2">
+ <widget class="TQListView" row="0" column="0" rowspan="1" colspan="2">
<column>
<property name="text">
<string>Options</string>
@@ -899,6 +1109,41 @@
</widget>
</grid>
</widget>
+ <widget class="TQButtonGroup">
+ <property name="name">
+ <cstring>xkbOptsMode</cstring>
+ </property>
+ <property name="title">
+ <string>Options Mode</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Here you can choose how the options you select here will be applied: in addition to, or instead of existing options.</string>
+ </property>
+ <vbox>
+ <widget class="TQRadioButton">
+ <property name="name">
+ <cstring>radXkbOverwrite</cstring>
+ </property>
+ <property name="text">
+ <string>&amp;Overwrite existing options (recommended)</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Overwrite any existing Xkb options that might have been previously set by another program or from a script (e.g. via setxkbmap). This is the recommended option.</string>
+ </property>
+ </widget>
+ <widget class="TQRadioButton">
+ <property name="name">
+ <cstring>radXkbAppend</cstring>
+ </property>
+ <property name="text">
+ <string>&amp;Append to existing options</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Append the selected options to any existing Xkb options that might have been previously set by another program or from a script (e.g. via setxkbmap). Only use this if you really need to.</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
</vbox>
</widget>
</widget>
@@ -912,9 +1157,15 @@
<slot>setEnabled(bool)</slot>
</connection>
<connection>
- <sender>chkEnableOptions</sender>
+ <sender>chkEnable</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>swOptsFrame</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>chkEnable</sender>
<signal>toggled(bool)</signal>
- <receiver>groupBox3_2</receiver>
+ <receiver>indOptsFrame</receiver>
<slot>setEnabled(bool)</slot>
</connection>
<connection>
@@ -942,12 +1193,6 @@
<slot>setEnabled(bool)</slot>
</connection>
<connection>
- <sender>chkEnable</sender>
- <signal>toggled(bool)</signal>
- <receiver>optionsFrame</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
- <connection>
<sender>radFlagOnly</sender>
<signal>toggled(bool)</signal>
<receiver>grpLabel</receiver>
@@ -983,6 +1228,12 @@
<receiver>labelBgColor</receiver>
<slot>setDisabled(bool)</slot>
</connection>
+ <connection>
+ <sender>chkEnableNotify</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>chkNotifyUseKMilo</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
</connections>
<includes>
<include location="local" impldecl="in implementation">kiconloader.h</include>
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index 358d10450..c23b3cf6c 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -48,6 +48,7 @@
#include "kcmmisc.h"
#include "kcmmiscwidget.h"
+#include "x11helper.h"
#include <X11/Xlib.h>
KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *)
@@ -71,14 +72,14 @@ KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *)
ui->rateSlider->setSteps(50, 500);
ui->rateSlider->setTickInterval(500);
- connect(ui->repeatBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
- connect(ui->delay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(delaySpinboxChanged(int)));
- connect(ui->delaySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(delaySliderChanged(int)));
- connect(ui->rate, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(rateSpinboxChanged(double)));
- connect(ui->rateSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rateSliderChanged(int)));
+ connect(ui->repeatBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+ connect(ui->delay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(delaySpinboxChanged(int)));
+ connect(ui->delaySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(delaySliderChanged(int)));
+ connect(ui->rate, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(rateSpinboxChanged(double)));
+ connect(ui->rateSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rateSliderChanged(int)));
- connect(ui->click, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
- connect(ui->numlockGroup, TQT_SIGNAL(released(int)), this, TQT_SLOT(changed()));
+ connect(ui->click, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+ connect(ui->numlockGroup, TQ_SIGNAL(released(int)), this, TQ_SLOT(changed()));
#if !defined(HAVE_XTEST) && !defined(HAVE_XKB)
ui->numlockGroup->setDisabled( true );
diff --git a/kxkb/kcmmisc.h b/kxkb/kcmmisc.h
index d57714295..db4dad84d 100644
--- a/kxkb/kcmmisc.h
+++ b/kxkb/kcmmisc.h
@@ -32,7 +32,7 @@ class KeyboardConfigWidget;
class KeyboardConfig : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KeyboardConfig( TQWidget *parent=0, const char* name=0);
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index 6a37dbf3a..34ed19334 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -47,6 +47,9 @@ DESCRIPTION
#include <tdepopupmenu.h>
#include <kdebug.h>
#include <tdeconfig.h>
+#include <knotifyclient.h>
+#include <dcopclient.h>
+#include <dcopref.h>
#include "x11helper.h"
#include "kxkb.h"
@@ -63,59 +66,52 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled)
m_prevWinId(X11Helper::UNKNOWN_WINDOW_ID),
m_rules(NULL),
m_tray(NULL),
- kWinModule(NULL),
- m_forceSetXKBMap( false )
+ kWinModule(NULL)
{
+ X11Helper::initializeTranslations();
m_extension = new XKBExtension();
if( !m_extension->init() ) {
kdDebug() << "xkb initialization failed, exiting..." << endl;
::exit(1);
}
-
- // keep in sync with kcmlayout.cpp
- keys = new TDEGlobalAccel(TQT_TQOBJECT(this));
-#include "kxkbbindings.cpp"
- keys->updateConnections();
+ connect(m_extension, TQ_SIGNAL(groupChanged(uint)), this, TQ_SLOT(slotGroupChanged(uint)));
m_layoutOwnerMap = new LayoutMap(kxkbConfig);
- connect( this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)) );
+ // keep in sync with kcmlayout.cpp
+ keys = new TDEGlobalAccel(this);
+#include "kxkbbindings.cpp"
+
+ connect( this, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)) );
addKipcEventMask( KIPC::SettingsChanged );
}
KXKBApp::~KXKBApp()
{
-// deletePrecompiledLayouts();
-
- delete keys;
- delete m_tray;
- delete m_rules;
- delete m_extension;
+ delete m_tray;
+ delete m_rules;
+ delete m_extension;
delete m_layoutOwnerMap;
delete kWinModule;
+ delete keys;
}
int KXKBApp::newInstance()
{
- m_extension->reset();
-
- if( settingsRead() )
- layoutApply();
-
+ if (settingsRead()) {
+ layoutApply();
+ }
+
return 0;
}
bool KXKBApp::settingsRead()
{
- kxkbConfig.load( KxkbConfig::LOAD_ACTIVE_OPTIONS );
-
- if( kxkbConfig.m_enableXkbOptions ) {
- kdDebug() << "Setting XKB options " << kxkbConfig.m_options << endl;
- if( !m_extension->setXkbOptions(kxkbConfig.m_options, kxkbConfig.m_resetOldOptions) ) {
- kdDebug() << "Setting XKB options failed!" << endl;
- }
- }
+ XkbOptions options = kxkbConfig.getKXkbOptions();
+ if( !m_extension->setXkbOptions(options) ) {
+ kdDebug() << "Setting XKB options failed!" << endl;
+ }
if ( kxkbConfig.m_useKxkb == false ) {
kapp->quit();
@@ -137,7 +133,7 @@ bool KXKBApp::settingsRead()
if( kWinModule == NULL ) {
kWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP);
- connect(kWinModule, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(windowChanged(WId)));
+ connect(kWinModule, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(windowChanged(WId)));
}
m_prevWinId = kWinModule->activeWindow();
kdDebug() << "Active window " << m_prevWinId << endl;
@@ -151,32 +147,15 @@ bool KXKBApp::settingsRead()
for(int ii=0; ii<(int)kxkbConfig.m_layouts.count(); ii++) {
LayoutUnit& layoutUnit = kxkbConfig.m_layouts[ii];
- layoutUnit.defaultGroup = m_rules->getDefaultGroup(layoutUnit.layout, layoutUnit.includeGroup);
- kdDebug() << "default group for " << layoutUnit.toPair() << " is " << layoutUnit.defaultGroup << endl;
}
- m_currentLayout = kxkbConfig.getDefaultLayout();
-
- if( kxkbConfig.m_layouts.count() == 1 ) {
- TQString layoutName = m_currentLayout.layout;
- TQString variantName = m_currentLayout.variant;
- TQString includeName = m_currentLayout.includeGroup;
- int group = m_currentLayout.defaultGroup;
-
- if( !m_extension->setLayout(kxkbConfig.m_model, layoutName, variantName, includeName, false)
- || !m_extension->setGroup( group ) ) {
- kdDebug() << "Error switching to single layout " << m_currentLayout.toPair() << endl;
- // TODO: alert user
- }
+ m_currentLayout = kxkbConfig.m_layouts[0];
+ kdDebug() << "default layout is " << m_currentLayout.toPair() << endl;
- if( kxkbConfig.m_showSingle == false ) {
- kapp->quit();
- return false;
- }
+ if( kxkbConfig.m_layouts.count() == 1 && !kxkbConfig.m_showSingle) {
+ kapp->quit();
+ return false;
}
- else {
-// initPrecompiledLayouts();
- }
initTray();
@@ -196,8 +175,8 @@ void KXKBApp::initTray()
// popupMenu->insertTitle( kapp->miniIcon(), kapp->caption() );
m_tray = new KxkbLabelController(sysTray, popupMenu);
- connect(popupMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuActivated(int)));
- connect(sysTray, TQT_SIGNAL(toggled()), this, TQT_SLOT(toggled()));
+ connect(popupMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuActivated(int)));
+ connect(sysTray, TQ_SIGNAL(toggled()), this, TQ_SLOT(nextLayout()));
}
m_tray->setShowFlag(kxkbConfig.m_showFlag);
@@ -223,40 +202,57 @@ bool KXKBApp::setLayout(const TQString& layoutPair)
return false;
}
-
// Activates the keyboard layout specified by 'layoutUnit'
-bool KXKBApp::setLayout(const LayoutUnit& layoutUnit, int group)
+bool KXKBApp::setLayout(const LayoutUnit& layoutUnit)
{
- bool res = false;
-
- if( group == -1 )
- group = layoutUnit.defaultGroup;
-
- res = m_extension->setLayout(kxkbConfig.m_model,
- layoutUnit.layout, layoutUnit.variant,
- layoutUnit.includeGroup);
- if( res )
- m_extension->setGroup(group); // not checking for ret - not important
-
- if( res )
- m_currentLayout = layoutUnit;
+ uint group = kxkbConfig.m_layouts.findIndex(layoutUnit);
+ bool res = m_extension->setGroup(group);
+ if (res) {
+ m_currentLayout = layoutUnit;
+ maybeShowLayoutNotification();
+ }
- if (m_tray) {
- if( res )
+ if (m_tray) {
+ if (res) {
m_tray->setCurrentLayout(layoutUnit);
- else
+ } else {
m_tray->setError(layoutUnit.toPair());
+ }
}
- return res;
+ return res;
}
+// Activates the keyboard layout specified by group number
+bool KXKBApp::setLayout(const uint group)
+{
+ bool res = m_extension->setGroup(group);
+ if (res) {
+ m_currentLayout = kxkbConfig.m_layouts[group];
+ }
-void KXKBApp::toggled()
+ if (m_tray) {
+ if (res)
+ m_tray->setCurrentLayout(m_currentLayout);
+ else
+ m_tray->setError(m_currentLayout.toPair());
+ }
+
+ return res;
+}
+
+
+void KXKBApp::nextLayout()
{
const LayoutUnit& layout = m_layoutOwnerMap->getNextLayout().layoutUnit;
setLayout(layout);
}
+void KXKBApp::prevLayout()
+{
+ const LayoutUnit& layout = m_layoutOwnerMap->getPrevLayout().layoutUnit;
+ setLayout(layout);
+}
+
void KXKBApp::menuActivated(int id)
{
if( KxkbLabelController::START_MENU_ID <= id
@@ -282,6 +278,54 @@ void KXKBApp::menuActivated(int id)
// }
}
+void KXKBApp::slotGroupChanged(uint group)
+{
+ if (group >= kxkbConfig.m_layouts.count())
+ {
+ group = 0;
+ }
+ m_currentLayout = kxkbConfig.m_layouts[group];
+ m_tray->setCurrentLayout(m_currentLayout);
+ maybeShowLayoutNotification();
+}
+
+void KXKBApp::maybeShowLayoutNotification() {
+ if (!kxkbConfig.m_enableNotify) return;
+
+ TQString layoutName(m_rules->getLayoutName(m_currentLayout));
+ bool useKMilo = kxkbConfig.m_notifyUseKMilo;
+ bool notificationSent = false;
+
+ // Query KDED whether KMiloD is loaded
+ if (useKMilo) {
+ QCStringList modules;
+ TQCString replyType;
+ TQByteArray replyData;
+ if (kapp->dcopClient()->call("kded", "kded", "loadedModules()",
+ TQByteArray(), replyType, replyData))
+ {
+ if (replyType == "QCStringList") {
+ TQDataStream reply(replyData, IO_ReadOnly);
+ reply >> modules;
+
+ if (!modules.contains("kmilod")) {
+ useKMilo = false;
+ }
+ }
+ }
+ }
+
+ if (useKMilo) {
+ DCOPRef kmilo("kded", "kmilod");
+ if (kmilo.send("displayText(TQString,TQPixmap)", layoutName, kapp->miniIcon()))
+ notificationSent = true;
+ }
+
+ if (!notificationSent) {
+ KNotifyClient::event(m_tray->winId(), "LayoutChange", layoutName);
+ }
+}
+
// TODO: we also have to handle deleted windows
void KXKBApp::windowChanged(WId winId)
{
@@ -291,15 +335,11 @@ void KXKBApp::windowChanged(WId winId)
return;
}
- int group = m_extension->getGroup();
-
kdDebug() << "old WinId: " << m_prevWinId << ", new WinId: " << winId << endl;
- if( m_prevWinId != X11Helper::UNKNOWN_WINDOW_ID ) { // saving layout/group from previous window
-// kdDebug() << "storing " << m_currentLayout.toPair() << ":" << group << " for " << m_prevWinId << endl;
+ if( m_prevWinId != X11Helper::UNKNOWN_WINDOW_ID ) { // saving layout from previous window
// m_layoutOwnerMap->setCurrentWindow(m_prevWinId);
m_layoutOwnerMap->setCurrentLayout(m_currentLayout);
- m_layoutOwnerMap->setCurrentGroup(group);
}
m_prevWinId = winId;
@@ -309,11 +349,8 @@ void KXKBApp::windowChanged(WId winId)
const LayoutState& layoutState = m_layoutOwnerMap->getCurrentLayout();
if( layoutState.layoutUnit != m_currentLayout ) {
- kdDebug() << "switching to " << layoutState.layoutUnit.toPair() << ":" << group << " for " << winId << endl;
- setLayout( layoutState.layoutUnit, layoutState.group );
- }
- else if( layoutState.group != group ) { // we need to change only the group
- m_extension->setGroup(layoutState.group);
+ kdDebug() << "switching to " << layoutState.layoutUnit.toPair() << " for " << winId << endl;
+ setLayout(layoutState.layoutUnit);
}
}
}
@@ -321,56 +358,20 @@ void KXKBApp::windowChanged(WId winId)
void KXKBApp::slotSettingsChanged(int category)
{
- if ( category != TDEApplication::SETTINGS_SHORTCUTS)
- return;
-
- TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
- keys->readSettings();
- keys->updateConnections();
+ if (category == TDEApplication::SETTINGS_SHORTCUTS) {
+ TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
+ keys->readSettings();
+ keys->updateConnections();
+ }
}
-/*
- Viki (onscreen keyboard) has problems determining some modifiers states
- when kxkb uses precompiled layouts instead of setxkbmap. Probably a bug
- in the xkb functions used for the precompiled layouts *shrug*.
-*/
-void KXKBApp::forceSetXKBMap( bool set )
-{
- if( m_forceSetXKBMap == set )
- return;
- m_forceSetXKBMap = set;
- layoutApply();
+bool KXKBApp::x11EventFilter(XEvent *e) {
+ // let the extension process the event and emit signals if necessary
+ m_extension->processXEvent(e);
+ return TDEApplication::x11EventFilter(e);
}
-/*Precompiles the keyboard layouts for faster activation later.
-This is done by loading each one of them and then dumping the compiled
-map from the X server into our local buffer.*/
-// void KXKBApp::initPrecompiledLayouts()
-// {
-// TQStringList dirs = TDEGlobal::dirs()->findDirs ( "tmp", "" );
-// TQString tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0];
-//
-// TQValueList<LayoutUnit>::ConstIterator end = kxkbConfig.m_layouts.end();
-//
-// for (TQValueList<LayoutUnit>::ConstIterator it = kxkbConfig.m_layouts.begin(); it != end; ++it)
-// {
-// LayoutUnit layoutUnit(*it);
-// // const char* baseGr = m_includes[layout];
-// // int group = m_rules->getGroup(layout, baseGr);
-// // if( m_extension->setLayout(m_model, layout, m_variants[layout], group, baseGr) ) {
-// TQString compiledLayoutFileName = tempDir + layoutUnit.layout + "." + layoutUnit.variant + ".xkm";
-// // if( m_extension->getCompiledLayout(compiledLayoutFileName) )
-// m_compiledLayoutFileNames[layoutUnit.toPair()] = compiledLayoutFileName;
-// // }
-// // else {
-// // kdDebug() << "Error precompiling layout " << layout << endl;
-// // }
-// }
-// }
-
-
-const char * DESCRIPTION =
- I18N_NOOP("A utility to switch keyboard maps");
+const char *DESCRIPTION = I18N_NOOP("A utility to switch keyboard maps");
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h
index 18949ba75..ddde9a6c4 100644
--- a/kxkb/kxkb.h
+++ b/kxkb/kxkb.h
@@ -49,44 +49,50 @@ class LayoutMap;
class KXKBApp : public KUniqueApplication
{
- Q_OBJECT
+ TQ_OBJECT
K_DCOP
public:
- KXKBApp(bool allowStyles=true, bool GUIenabled=true);
- ~KXKBApp();
+ KXKBApp(bool allowStyles=true, bool GUIenabled=true);
+ ~KXKBApp();
- virtual int newInstance();
+ virtual int newInstance();
- bool setLayout(const LayoutUnit& layoutUnit, int group=-1);
+ bool setLayout(const LayoutUnit& layoutUnit);
+ bool setLayout(const uint group);
k_dcop:
- bool setLayout(const TQString& layoutPair);
- TQString getCurrentLayout() { return m_currentLayout.toPair(); }
- TQStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); }
- void forceSetXKBMap( bool set );
+ bool setLayout(const TQString& layoutPair);
+ TQString getCurrentLayout() { return m_currentLayout.toPair(); }
+ TQStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); }
+
+public slots:
+ void nextLayout();
+ void prevLayout();
protected slots:
void menuActivated(int id);
- void toggled();
void windowChanged(WId winId);
+ void layoutApply();
+ void slotGroupChanged(uint group);
void slotSettingsChanged(int category);
+ void maybeShowLayoutNotification();
protected:
// Read settings, and apply them.
bool settingsRead();
- void layoutApply();
-
+
private:
- void initTray();
+ void initTray();
+ bool x11EventFilter(XEvent *e);
private:
- KxkbConfig kxkbConfig;
+ KxkbConfig kxkbConfig;
WId m_prevWinId; // for tricky part of saving xkb group
LayoutMap* m_layoutOwnerMap;
- LayoutUnit m_currentLayout;
+ LayoutUnit m_currentLayout;
XKBExtension *m_extension;
XkbRules *m_rules;
diff --git a/kxkb/kxkbbindings.cpp b/kxkb/kxkbbindings.cpp
index fad480f7c..02da8a4ea 100644
--- a/kxkb/kxkbbindings.cpp
+++ b/kxkb/kxkbbindings.cpp
@@ -1,12 +1,13 @@
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString(), key3, key4 )
+ keys->insert( name, i18n(name), TQString(), key3, key4, 0, 0 )
#endif
- keys->insert( "Program:kxkb", i18n("Keyboard") );
- DEF( I18N_NOOP("Switch to Next Keyboard Layout"), ALT+CTRL+Qt::Key_K, KKey::QtWIN+CTRL+Qt::Key_K, toggled() );
+ keys->insert( "Program:kxkb", i18n("Keyboard") );
+ DEF( I18N_NOOP("Switch to Next Keyboard Layout"), TDEShortcut(), TDEShortcut(), nextLayout() );
+ DEF( I18N_NOOP("Switch to Previous Keyboard Layout"), TDEShortcut(), TDEShortcut(), prevLayout() );
-#undef DEF
+#undef DEF \ No newline at end of file
diff --git a/kxkb/kxkbconfig.cpp b/kxkb/kxkbconfig.cpp
index 8e6890161..0c3dc9e0a 100644
--- a/kxkb/kxkbconfig.cpp
+++ b/kxkb/kxkbconfig.cpp
@@ -30,27 +30,14 @@ static const char* switchModes[SWITCH_POLICY_COUNT] = {
const LayoutUnit DEFAULT_LAYOUT_UNIT = LayoutUnit("us", "");
const char* DEFAULT_MODEL = "pc104";
-LayoutUnit KxkbConfig::getDefaultLayout()
-{
- if( m_layouts.size() == 0 )
- return DEFAULT_LAYOUT_UNIT;
-
- return m_layouts[0];
-}
-
bool KxkbConfig::load(int loadMode)
{
TDEConfig *config = new TDEConfig("kxkbrc", true, false);
config->setGroup("Layout");
-// Even if the layouts have been disabled we still want to set Xkb options
-// user can always switch them off now in the "Options" tab
- m_enableXkbOptions = config->readBoolEntry("EnableXkbOptions", false);
-
- if( m_enableXkbOptions == true || loadMode == LOAD_ALL ) {
- m_resetOldOptions = config->readBoolEntry("ResetOldOptions", false);
+ if( loadMode == LOAD_ALL ) {
+ m_resetOldOptions = config->readBoolEntry("ResetOldOptions", true);
m_options = config->readEntry("Options", "");
- kdDebug() << "Xkb options (enabled=" << m_enableXkbOptions << "): " << m_options << endl;
}
m_useKxkb = config->readBoolEntry("Use", false);
@@ -81,7 +68,7 @@ bool KxkbConfig::load(int loadMode)
kdDebug() << " layout " << LayoutUnit(*it).toPair() << " in list: " << m_layouts.contains( LayoutUnit(*it) ) << endl;
}
- kdDebug() << "Found " << m_layouts.count() << " layouts, default is " << getDefaultLayout().toPair() << endl;
+ kdDebug() << "Found " << m_layouts.count() << " layouts" << endl;
TQStringList displayNamesList = config->readListEntry("DisplayNames", ',');
for(TQStringList::ConstIterator it = displayNamesList.begin(); it != displayNamesList.end() ; ++it) {
@@ -94,37 +81,6 @@ bool KxkbConfig::load(int loadMode)
}
}
-// m_includes.clear();
- if( X11Helper::areSingleGroupsSupported() ) {
- if( config->hasKey("IncludeGroups") ) {
- TQStringList includeList = config->readListEntry("IncludeGroups", ',');
- for(TQStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) {
- TQStringList includePair = TQStringList::split(':', *it );
- if( includePair.count() == 2 ) {
- LayoutUnit layoutUnit( includePair[0] );
- if( m_layouts.contains( layoutUnit ) ) {
- m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = includePair[1];
- kdDebug() << "Got inc group: " << includePair[0] << ": " << includePair[1] << endl;
- }
- }
- }
- }
- else { //old includes format
- kdDebug() << "Old includes..." << endl;
- TQStringList includeList = config->readListEntry("Includes");
- for(TQStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) {
- TQString layoutName = LayoutUnit::parseLayout( *it );
- LayoutUnit layoutUnit( layoutName, "" );
- kdDebug() << "old layout for inc: " << layoutUnit.toPair() << " included " << m_layouts.contains( layoutUnit ) << endl;
- if( m_layouts.contains( layoutUnit ) ) {
- TQString variantName = LayoutUnit::parseVariant(*it);
- m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = variantName;
- kdDebug() << "Got inc group: " << layoutUnit.toPair() << ": " << variantName << endl;
- }
- }
- }
- }
-
m_showSingle = config->readBoolEntry("ShowSingle", false);
m_showFlag = config->readBoolEntry("ShowFlag", true);
m_showLabel = config->readBoolEntry("ShowLabel", true);
@@ -173,6 +129,10 @@ bool KxkbConfig::load(int loadMode)
}
}
+ config->setGroup("Notifications");
+ m_enableNotify = config->readBoolEntry("Enable", false);
+ m_notifyUseKMilo = config->readBoolEntry("UseKMilo", true);
+
delete config;
return true;
@@ -185,12 +145,10 @@ void KxkbConfig::save()
config->writeEntry("Model", m_model);
- config->writeEntry("EnableXkbOptions", m_enableXkbOptions );
config->writeEntry("ResetOldOptions", m_resetOldOptions);
config->writeEntry("Options", m_options );
TQStringList layoutList;
- TQStringList includeList;
TQStringList displayNamesList;
TQValueList<LayoutUnit>::ConstIterator it;
@@ -199,11 +157,6 @@ void KxkbConfig::save()
layoutList.append( layoutUnit.toPair() );
- if( layoutUnit.includeGroup.isEmpty() == false ) {
- TQString incGroupUnit = TQString("%1:%2").arg(layoutUnit.toPair(), layoutUnit.includeGroup);
- includeList.append( incGroupUnit );
- }
-
TQString displayName( layoutUnit.displayName );
kdDebug() << " displayName " << layoutUnit.toPair() << " : " << displayName << endl;
if( displayName.isEmpty() == false && displayName != layoutUnit.layout ) {
@@ -215,9 +168,6 @@ void KxkbConfig::save()
config->writeEntry("LayoutList", layoutList);
kdDebug() << "Saving Layouts: " << layoutList << endl;
- config->writeEntry("IncludeGroups", includeList);
- kdDebug() << "Saving includeGroups: " << includeList << endl;
-
// if( displayNamesList.empty() == false )
config->writeEntry("DisplayNames", displayNamesList);
// else
@@ -250,6 +200,10 @@ void KxkbConfig::save()
config->deleteEntry("Additional");
config->deleteEntry("Layout");
+ config->setGroup("Notifications");
+ config->writeEntry("Enable", m_enableNotify);
+ config->writeEntry("UseKMilo", m_notifyUseKMilo);
+
config->sync();
delete config;
@@ -259,8 +213,7 @@ void KxkbConfig::setDefaults()
{
m_model = DEFAULT_MODEL;
- m_enableXkbOptions = false;
- m_resetOldOptions = false;
+ m_resetOldOptions = true;
m_options = "";
m_layouts.clear();
@@ -321,6 +274,26 @@ TQString KxkbConfig::getDefaultDisplayName(const LayoutUnit& layoutUnit, bool si
return displayName;
}
+const XkbOptions KxkbConfig::getKXkbOptions() {
+ load(LOAD_ALL);
+
+ XkbOptions options;
+ TQStringList layouts;
+ TQStringList variants;
+ for(TQValueList<LayoutUnit>::ConstIterator it = m_layouts.begin(); it != m_layouts.end(); ++it) {
+ const LayoutUnit& layoutUnit = *it;
+ layouts << layoutUnit.layout;
+ variants << layoutUnit.variant;
+ }
+ options.layouts = layouts.join(",");
+ options.variants = variants.join(",");
+ options.model = m_model;
+ options.options = m_options;
+ kdDebug() << "[getKXkbOptions] options: " << m_options << endl;
+ options.resetOld = m_resetOldOptions;
+ return options;
+}
+
/**
* @brief Gets the single layout part of a layout(variant) string
* @param[in] layvar String in form layout(variant) to parse
@@ -356,4 +329,4 @@ const TQString LayoutUnit::parseVariant(const TQString &layvar)
if( pos < 2 || len < 2 )
return "";
return varLine.mid(pos+1, len-2);
-}
+} \ No newline at end of file
diff --git a/kxkb/kxkbconfig.h b/kxkb/kxkbconfig.h
index a4dc83e5a..4e424102a 100644
--- a/kxkb/kxkbconfig.h
+++ b/kxkb/kxkbconfig.h
@@ -19,6 +19,15 @@
#include <tqptrqueue.h>
#include <tqmap.h>
+#include "layoutunit.h"
+
+struct XkbOptions {
+ TQString layouts;
+ TQString variants;
+ TQString model;
+ TQString options;
+ bool resetOld;
+};
/* Utility classes for per-window/per-application layout implementation
*/
@@ -29,61 +38,6 @@ enum SwitchingPolicy {
SWITCH_POLICY_COUNT = 3
};
-
-
-inline TQString createPair(TQString key, TQString value)
-{
- if( value.isEmpty() )
- return key;
- return TQString("%1(%2)").arg(key, value);
-}
-
-struct LayoutUnit {
- TQString layout;
- TQString variant;
- TQString includeGroup;
- TQString displayName;
- int defaultGroup;
-
- LayoutUnit() {}
-
- LayoutUnit(TQString layout_, TQString variant_):
- layout(layout_),
- variant(variant_)
- {}
-
- LayoutUnit(TQString pair) {
- setFromPair( pair );
- }
-
- void setFromPair(const TQString& pair) {
- layout = parseLayout(pair);
- variant = parseVariant(pair);
- }
-
- TQString toPair() const {
- return createPair(layout, variant);
- }
-
- bool operator<(const LayoutUnit& lu) const {
- return layout<lu.layout ||
- (layout==lu.layout && variant<lu.variant);
- }
-
- bool operator!=(const LayoutUnit& lu) const {
- return layout!=lu.layout || variant!=lu.variant;
- }
-
- bool operator==(const LayoutUnit& lu) const {
-// kdDebug() << layout << "==" << lu.layout << "&&" << variant << "==" << lu.variant << endl;
- return layout==lu.layout && variant==lu.variant;
- }
-
-//private:
- static const TQString parseLayout(const TQString &layvar);
- static const TQString parseVariant(const TQString &layvar);
-};
-
extern const LayoutUnit DEFAULT_LAYOUT_UNIT;
extern const char* DEFAULT_MODEL;
@@ -102,6 +56,8 @@ public:
SwitchingPolicy m_switchingPolicy;
bool m_stickySwitching;
int m_stickySwitchingDepth;
+ bool m_enableNotify;
+ bool m_notifyUseKMilo;
bool m_useThemeColors;
TQColor m_colorBackground;
@@ -115,8 +71,6 @@ public:
TQString m_options;
TQValueList<LayoutUnit> m_layouts;
- LayoutUnit getDefaultLayout();
-
bool load(int loadMode);
void save();
void setDefaults();
@@ -125,6 +79,8 @@ public:
static TQString getDefaultDisplayName(const TQString& code_);
static TQString getDefaultDisplayName(const LayoutUnit& layoutUnit, bool single=false);
+ const XkbOptions getKXkbOptions();
+
private:
static const TQMap<TQString, TQString> parseIncludesMap(const TQStringList& pairList);
};
diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp
index 46b03da15..573b0b4ef 100644
--- a/kxkb/kxkbtraywindow.cpp
+++ b/kxkb/kxkbtraywindow.cpp
@@ -90,13 +90,15 @@ void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts,
const TQString layoutName = (*it).layout;
const TQString variantName = (*it).variant;
- const TQPixmap& layoutPixmap = LayoutIcon::getInstance().findPixmap(layoutName, PIXMAP_STYLE_CONTEXTMENU, (*it).displayName);
- const TQPixmap pix = iconeffect.apply(layoutPixmap, TDEIcon::Small, TDEIcon::DefaultState);
+ const TQPixmap& layoutPixmap = LayoutIcon::getInstance().findPixmap(
+ (*it).layout, PIXMAP_STYLE_CONTEXTMENU, (*it).displayName);
+ const TQPixmap pix = iconeffect.apply(layoutPixmap, TDEIcon::Small,
+ TDEIcon::DefaultState);
+
+ TQString fullName = rules.getLayoutName((*it));
+ contextMenu->insertItem(pix, fullName, START_MENU_ID + cnt,
+ m_menuStartIndex + cnt);
- TQString fullName = i18n((rules.layouts()[layoutName]));
- if( variantName.isEmpty() == false )
- fullName += " (" + variantName + ")";
- contextMenu->insertItem(pix, fullName, START_MENU_ID + cnt, m_menuStartIndex + cnt);
m_descriptionMap.insert((*it).toPair(), fullName);
cnt++;
@@ -114,7 +116,7 @@ void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts,
/* if( index != -1 ) { //not first start
menu->insertSeparator();
- TDEAction* quitAction = KStdAction::quit(this, TQT_SIGNAL(quitSelected()), actionCollection());
+ TDEAction* quitAction = KStdAction::quit(this, TQ_SIGNAL(quitSelected()), actionCollection());
if (quitAction)
quitAction->plug(menu);
}*/
diff --git a/kxkb/kxkbtraywindow.h b/kxkb/kxkbtraywindow.h
index f451f6473..46d66c44b 100644
--- a/kxkb/kxkbtraywindow.h
+++ b/kxkb/kxkbtraywindow.h
@@ -28,9 +28,9 @@ class XkbRules;
catching keyboard/mouse events and displaying menu when selected
*/
-class KxkbLabelController: public QObject
+class KxkbLabelController: public TQObject
{
-// Q_OBJECT
+// TQ_OBJECT
public:
enum { START_MENU_ID = 100, CONFIG_MENU_ID = 130, HELP_MENU_ID = 131 };
@@ -43,6 +43,8 @@ public:
void setError(const TQString& layoutInfo="");
void setShowFlag(bool showFlag) { m_showFlag = showFlag; }
void show() { label->show(); }
+
+ WId winId() { return label->winId(); }
// signals:
//
@@ -69,7 +71,7 @@ private:
class KxkbSystemTray : public KSystemTray
{
- Q_OBJECT
+ TQ_OBJECT
public:
KxkbSystemTray():
@@ -78,7 +80,7 @@ class KxkbSystemTray : public KSystemTray
void mouseReleaseEvent(TQMouseEvent *ev)
{
- if (ev->button() == Qt::LeftButton)
+ if (ev->button() == TQt::LeftButton)
emit toggled();
KSystemTray::mouseReleaseEvent(ev);
}
diff --git a/kxkb/layoutmap.cpp b/kxkb/layoutmap.cpp
index 106f70950..62b44da10 100644
--- a/kxkb/layoutmap.cpp
+++ b/kxkb/layoutmap.cpp
@@ -88,19 +88,28 @@ LayoutState& LayoutMap::getNextLayout() {
layoutQueue.enqueue(layoutState);
kdDebug() << "map: Next layout: " << layoutQueue.head()->layoutUnit.toPair()
- << " group: " << layoutQueue.head()->layoutUnit.defaultGroup << " for " << m_currentWinId << endl;
+ << " for " << m_currentWinId << endl;
return *layoutQueue.head();
}
-void LayoutMap::setCurrentGroup(int group) {
- getCurrentLayout().group = group;
+LayoutState& LayoutMap::getPrevLayout() {
+ LayoutQueue& layoutQueue = getCurrentLayoutQueue(m_currentWinId);
+ for (int i = 1; i < layoutQueue.count(); ++i) {
+ LayoutState* layoutState = layoutQueue.dequeue();
+ layoutQueue.enqueue(layoutState);
+ }
+
+ kdDebug() << "map: Next layout: " << layoutQueue.head()->layoutUnit.toPair()
+ << " for " << m_currentWinId << endl;
+
+ return *layoutQueue.head();
}
void LayoutMap::setCurrentLayout(const LayoutUnit& layoutUnit) {
LayoutQueue& layoutQueue = getCurrentLayoutQueue(m_currentWinId);
kdDebug() << "map: Storing layout: " << layoutUnit.toPair()
- << " group: " << layoutUnit.defaultGroup << " for " << m_currentWinId << endl;
+ << " for " << m_currentWinId << endl;
int queueSize = (int)layoutQueue.count();
for(int ii=0; ii<queueSize; ii++) {
diff --git a/kxkb/layoutmap.h b/kxkb/layoutmap.h
index 7b0ebad61..812814fff 100644
--- a/kxkb/layoutmap.h
+++ b/kxkb/layoutmap.h
@@ -27,13 +27,11 @@
// LayoutInfo is used for sticky switching and per-window/application switching policy
struct LayoutState {
const LayoutUnit& layoutUnit;
- int group;
LayoutState(const LayoutUnit& layoutUnit_):
- layoutUnit(layoutUnit_),
- group(layoutUnit_.defaultGroup)
+ layoutUnit(layoutUnit_)
{
-// kdDebug() << "new LayoutState " << layoutUnit.toPair() << " group: " << group << endl;
+// kdDebug() << "new LayoutState " << layoutUnit.toPair() << endl;
}
};
@@ -49,8 +47,8 @@ public:
// void setConfig(const KxkbConfig& kxkbConfig);
void setCurrentLayout(const LayoutUnit& layoutUnit);
- void setCurrentGroup(int group);
LayoutState& getNextLayout();
+ LayoutState& getPrevLayout();
LayoutState& getCurrentLayout();
void setCurrentWindow(WId winId);
diff --git a/kxkb/layoutunit.h b/kxkb/layoutunit.h
new file mode 100644
index 000000000..f4d82f73f
--- /dev/null
+++ b/kxkb/layoutunit.h
@@ -0,0 +1,64 @@
+//
+//
+// Author: Andriy Rysin <rysin@kde.org>, (C) 2006
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+
+#ifndef _LAYOUTUNIT_H
+#define _LAYOUTUNIT_H
+
+#include <tqstring.h>
+
+inline TQString createPair(TQString key, TQString value)
+{
+ if (value.isEmpty()) return key;
+ return TQString("%1(%2)").arg(key, value);
+}
+
+struct LayoutUnit {
+ TQString layout;
+ TQString variant;
+ TQString displayName;
+
+ LayoutUnit() {}
+
+ LayoutUnit(TQString layout_, TQString variant_):
+ layout(layout_),
+ variant(variant_)
+ {}
+
+ LayoutUnit(TQString pair) {
+ setFromPair( pair );
+ }
+
+ void setFromPair(const TQString& pair) {
+ layout = parseLayout(pair);
+ variant = parseVariant(pair);
+ }
+
+ TQString toPair() const {
+ return createPair(layout, variant);
+ }
+
+ bool operator<(const LayoutUnit& lu) const {
+ return layout<lu.layout ||
+ (layout==lu.layout && variant<lu.variant);
+ }
+
+ bool operator!=(const LayoutUnit& lu) const {
+ return layout!=lu.layout || variant!=lu.variant;
+ }
+
+ bool operator==(const LayoutUnit& lu) const {
+// kdDebug() << layout << "==" << lu.layout << "&&" << variant << "==" << lu.variant << endl;
+ return layout==lu.layout && variant==lu.variant;
+ }
+
+//private:
+ static const TQString parseLayout(const TQString &layvar);
+ static const TQString parseVariant(const TQString &layvar);
+};
+
+#endif // _LAYOUTUNIT_H \ No newline at end of file
diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp
index c7e08a741..63fc4f1db 100644
--- a/kxkb/pixmap.cpp
+++ b/kxkb/pixmap.cpp
@@ -141,11 +141,11 @@ LayoutIcon::findPixmap(const TQString& code_, int pixmapStyle, const TQString& d
if( m_labelShadow ) {
p.setPen(m_shColor);
- p.drawText(1, 1, pm->width(), pm->height(), Qt::AlignCenter, displayName);
+ p.drawText(1, 1, pm->width(), pm->height(), TQt::AlignCenter, displayName);
}
p.setPen(m_fgColor);
- p.drawText(0, 0, pm->width(), pm->height(), Qt::AlignCenter, displayName);
+ p.drawText(0, 0, pm->width(), pm->height(), TQt::AlignCenter, displayName);
if( m_bgTransparent && !m_showFlag )
{
@@ -156,10 +156,10 @@ LayoutIcon::findPixmap(const TQString& code_, int pixmapStyle, const TQString& d
maskp.setPen(TQt::black);
maskp.setFont(m_labelFont);
- maskp.drawText(0, 0, maskpix.width(), maskpix.height(), Qt::AlignCenter, displayName);
+ maskp.drawText(0, 0, maskpix.width(), maskpix.height(), TQt::AlignCenter, displayName);
if( m_labelShadow )
{
- maskp.drawText(1, 1, maskpix.width(), maskpix.height(), Qt::AlignCenter, displayName);
+ maskp.drawText(1, 1, maskpix.width(), maskpix.height(), TQt::AlignCenter, displayName);
}
TQBitmap mask;
@@ -292,8 +292,8 @@ void LayoutIcon::dimPixmap(TQPixmap& pm)
for (int y=0; y<image.height(); y++)
for(int x=0; x<image.width(); x++)
{
- QRgb rgb = image.pixel(x,y);
- QRgb dimRgb(tqRgb(tqRed(rgb)*3/4, tqGreen(rgb)*3/4, tqBlue(rgb)*3/4));
+ TQRgb rgb = image.pixel(x,y);
+ TQRgb dimRgb(tqRgb(tqRed(rgb)*3/4, tqGreen(rgb)*3/4, tqBlue(rgb)*3/4));
image.setPixel(x, y, dimRgb);
}
pm.convertFromImage(image);
@@ -305,15 +305,15 @@ static const char* ERROR_LABEL = "err";
TQPixmap* LayoutIcon::createErrorPixmap()
{
TQPixmap* pm = new TQPixmap(21, 14);
- pm->fill(Qt::white);
+ pm->fill(TQt::white);
TQPainter p(pm);
p.setFont(m_labelFont);
- p.setPen(Qt::red);
- p.drawText(1, 1, pm->width(), pm->height()-2, Qt::AlignCenter, ERROR_LABEL);
- p.setPen(Qt::blue);
- p.drawText(0, 0, pm->width(), pm->height()-2, Qt::AlignCenter, ERROR_LABEL);
+ p.setPen(TQt::red);
+ p.drawText(1, 1, pm->width(), pm->height()-2, TQt::AlignCenter, ERROR_LABEL);
+ p.setPen(TQt::blue);
+ p.drawText(0, 0, pm->width(), pm->height()-2, TQt::AlignCenter, ERROR_LABEL);
m_pixmapCache.insert(ERROR_CODE, pm);
return pm;
diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp
index 20f817602..ab89b4f17 100644
--- a/kxkb/rules.cpp
+++ b/kxkb/rules.cpp
@@ -35,8 +35,6 @@ XkbRules::XkbRules(bool layoutsOnly):
}
loadRules(rulesFile, layoutsOnly);
- loadOldLayouts(rulesFile);
- loadGroups(::locate("config", "kxkb_groups"));
}
@@ -58,84 +56,6 @@ void XkbRules::loadRules(TQString file, bool layoutsOnly)
// fixLayouts();
}
-// void XkbRules::fixLayouts() {
-// // THIS IS TEMPORARY!!!
-// // This should be fixed in XFree86 (and actually is fixed in XFree 4.2)
-// // some handcoded ones, because the X11 rule file doesn't get them correctly, or in case
-// // the rule file wasn't found
-// static struct {
-// const char * locale;
-// const char * layout;
-// } fixedLayouts[] = {
-// { "ben", "Bengali" },
-// { "ar", "Arabic" },
-// { "ir", "Farsi" },
-// { 0, 0 }
-// };
-//
-// for(int i=0; fixedLayouts[i].layout != 0; i++ ) {
-// if( m_layouts.find(fixedLayouts[i].locale) == 0 )
-// m_layouts.insert(fixedLayouts[i].locale, fixedLayouts[i].layout);
-// }
-// }
-
-bool XkbRules::isSingleGroup(const TQString& layout)
-{
- return X11Helper::areSingleGroupsSupported()
- && !m_oldLayouts.contains(layout)
- && !m_nonLatinLayouts.contains(layout);
-}
-
-
-// check $oldlayouts and $nonlatin groups for XFree 4.3 and later
-void XkbRules::loadOldLayouts(TQString rulesFile)
-{
- OldLayouts* oldLayoutsStruct = X11Helper::loadOldLayouts( rulesFile );
- m_oldLayouts = oldLayoutsStruct->oldLayouts;
- m_nonLatinLayouts = oldLayoutsStruct->nonLatinLayouts;
-}
-
-// for multi-group layouts in XFree 4.2 and older
-// or if layout is present in $oldlayout or $nonlatin groups
-void XkbRules::loadGroups(TQString file)
-{
- TQFile f(file);
- if (f.open(IO_ReadOnly))
- {
- TQTextStream ts(&f);
- TQString locale;
- unsigned int grp;
-
- while (!ts.eof()) {
- ts >> locale >> grp;
- locale.simplifyWhiteSpace();
-
- if (locale[0] == '#' || locale.left(2) == "//" || locale.isEmpty())
- continue;
-
- m_initialGroups.insert(locale, grp);
- }
-
- f.close();
- }
-}
-
-unsigned int
-XkbRules::getDefaultGroup(const TQString& layout, const TQString& includeGroup)
-{
-// check for new one-group layouts in XFree 4.3 and older
- if( isSingleGroup(layout) ) {
- if( includeGroup.isEmpty() == false )
- return 1;
- else
- return 0;
- }
-
- TQMap<TQString, unsigned int>::iterator it = m_initialGroups.find(layout);
- return it == m_initialGroups.end() ? 0 : it.data();
-}
-
-
TQStringList
XkbRules::getAvailableVariants(const TQString& layout)
{
@@ -146,11 +66,24 @@ XkbRules::getAvailableVariants(const TQString& layout)
if( result1 )
return *result1;
- bool oldLayouts = m_oldLayouts.contains(layout);
- TQStringList* result = X11Helper::getVariants(layout, X11_DIR, oldLayouts);
+ TQStringList* result = X11Helper::getVariants(layout, X11_DIR);
m_varLists.insert(layout, result);
return *result;
}
+TQString XkbRules::getLayoutName(LayoutUnit layout) const {
+ TQString fullName = i18n(m_layouts[layout.layout]);
+ if (!layout.variant.isEmpty()) {
+ fullName += " (" + layout.variant + ")";
+ }
+ return fullName;
+}
+
+TQString XkbRules::trOpt(TQString opt) {
+ // xkeyboard-config's translation is generated directly from the xml and has some querks
+ // like sustitution for the '<' and '>'. We will have to workaroung those manually:
+ TQString translated = i18n(opt.replace("<", "&lt;").replace(">", "&gt;").utf8());
+ return translated.replace("&lt;", "<").replace("&gt;", ">");
+}
diff --git a/kxkb/rules.h b/kxkb/rules.h
index a4955317e..0a68f3dbf 100644
--- a/kxkb/rules.h
+++ b/kxkb/rules.h
@@ -3,8 +3,10 @@
#include <tqstring.h>
#include <tqdict.h>
+#include <tqstringlist.h>
#include <tqmap.h>
+#include "layoutunit.h"
class XkbRules
{
@@ -15,30 +17,26 @@ public:
const TQDict<char> &models() const { return m_models; };
const TQDict<char> &layouts() const { return m_layouts; };
const TQDict<char> &options() const { return m_options; };
-
+
TQStringList getAvailableVariants(const TQString& layout);
- unsigned int getDefaultGroup(const TQString& layout, const TQString& includeGroup);
- bool isSingleGroup(const TQString& layout);
+ TQString getLayoutName(LayoutUnit layout) const;
-protected:
+ /// A helper to translate option description
+ static TQString trOpt(TQString opt);
+protected:
void loadRules(TQString filename, bool layoutsOnly=false);
- void loadGroups(TQString filename);
- void loadOldLayouts(TQString filename);
private:
TQDict<char> m_models;
TQDict<char> m_layouts;
TQDict<char> m_options;
- TQMap<TQString, unsigned int> m_initialGroups;
TQDict<TQStringList> m_varLists;
- TQStringList m_oldLayouts;
- TQStringList m_nonLatinLayouts;
-
+
TQString X11_DIR; // pseudo-constant
-
+
// void fixLayouts();
};
diff --git a/kxkb/x11helper.cpp b/kxkb/x11helper.cpp
index 1c8db4a4a..90e29d9e2 100644
--- a/kxkb/x11helper.cpp
+++ b/kxkb/x11helper.cpp
@@ -1,3 +1,4 @@
+#include <tqdom.h>
#include <tqdir.h>
#include <tqstring.h>
#include <tqwindowdefs.h>
@@ -7,6 +8,8 @@
#include <tqregexp.h>
#include <kdebug.h>
+#include <kstandarddirs.h>
+#include <tdelocale.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
@@ -119,13 +122,12 @@ X11Helper::findXkbRulesFile(TQString x11Dir, Display *dpy)
}
}
}
-
+
return rulesFile;
}
RulesInfo*
-X11Helper::loadRules(const TQString& file, bool layoutsOnly)
-{
+X11Helper::loadRules(const TQString& file, bool layoutsOnly) {
XkbRF_RulesPtr xkbRules = XkbRF_Load(TQFile::encodeName(file).data(), "", true, true);
if (xkbRules == NULL) {
@@ -151,32 +153,87 @@ X11Helper::loadRules(const TQString& file, bool layoutsOnly)
XkbRF_Free(xkbRules, true);
return rulesInfo;
}
-
+
for (int i = 0; i < xkbRules->models.num_desc; ++i)
rulesInfo->models.replace(xkbRules->models.desc[i].name, tqstrdup( xkbRules->models.desc[i].desc ) );
- for (int i = 0; i < xkbRules->options.num_desc; ++i)
- rulesInfo->options.replace(xkbRules->options.desc[i].name, tqstrdup( xkbRules->options.desc[i].desc ) );
- XkbRF_Free(xkbRules, true);
+ // Prefer XML file for Xkb options
+ if (TQFile(file + ".xml").exists()) {
+ XkbRF_Free(xkbRules, true);
+
+ TQDomDocument xmlrules("xkbrules");
+ TQFile xmlfile(file + ".xml");
+ if (!xmlfile.open(IO_ReadOnly)) {
+ return NULL;
+ }
+ if (!xmlrules.setContent(&xmlfile)) {
+ xmlfile.close();
+ return NULL;
+ }
+ xmlfile.close();
+
+ TQDomElement options = xmlrules.documentElement().namedItem("optionList").toElement();
+ TQDomNode optGroupNode = options.firstChild();
+ while (!optGroupNode.isNull()) {
+ TQDomElement optGroupElem = optGroupNode.toElement();
+ if (optGroupElem.tagName() == "group") {
+ TQDomNode optNode = optGroupElem.firstChild();
+ while (!optNode.isNull()) {
+ TQDomElement optElem = optNode.toElement();
+ if (!optElem.isNull()) {
+ // This might be either a configItem (group) or an option tag
+ // If it is an option tag, it contains a configItem that describes
+ // the option
+ if (optElem.tagName() == "option") {
+ optElem = optElem.namedItem("configItem").toElement();
+ }
+
+ TQString optName = optElem.namedItem("name").toElement().text();
+ TQString optDesc = optElem.namedItem("description").toElement().text();
+ if (optDesc.isEmpty()) {
+ optDesc = optName;
+ }
+ // Items from these 'meta' groups fall into other groups
+ // Admittedly not the best way to handle this
+ if (optName == "currencysign" || optName == "compat") break;
+
+ // HACK this should be called "compose" or else the code breaks
+ if (optName == "Compose key") optName = "compose";
+
+ rulesInfo->options.replace(optName.ascii(), tqstrdup(optDesc.ascii()));
+ }
+ optNode = optNode.nextSibling();
+ }
+ }
+ optGroupNode = optGroupNode.nextSibling();
+ }
+ }
+ else {
+ for (int i = 0; i < xkbRules->options.num_desc; ++i)
+ rulesInfo->options.replace(xkbRules->options.desc[i].name, tqstrdup( xkbRules->options.desc[i].desc ) );
+
+ XkbRF_Free(xkbRules, true);
+
+ // workaround for empty 'compose' options group description
+ if( rulesInfo->options.find("compose:menu") && !rulesInfo->options.find("compose") ) {
+ rulesInfo->options.replace("compose", I18N_NOOP("Compose Key Position"));
+ }
+ }
-// workaround for empty 'compose' options group description
- if( rulesInfo->options.find("compose:menu") && !rulesInfo->options.find("compose") ) {
- rulesInfo->options.replace("compose", "Compose Key Position");
- }
for(TQDictIterator<char> it(rulesInfo->options) ; it.current() != NULL; ++it ) {
- TQString option(it.currentKey());
- int columnPos = option.find(":");
-
- if( columnPos != -1 ) {
- TQString group = option.mid(0, columnPos);
- if( rulesInfo->options.find(group) == NULL ) {
- rulesInfo->options.replace(group, group.latin1());
- kdDebug() << "Added missing option group: " << group << endl;
- }
- }
+ // Add missing option groups
+ TQString option(it.currentKey());
+ int columnPos = option.find(":");
+
+ if( columnPos != -1 ) {
+ TQString group = option.mid(0, columnPos);
+ if( rulesInfo->options.find(group) == NULL ) {
+ rulesInfo->options.replace(group, group.latin1());
+ kdDebug() << "Added missing option group: " << group << endl;
+ }
+ }
}
-
// // workaround for empty misc options group description in XFree86 4.4.0
// if( rulesInfo->options.find("numpad:microsoft") && !rulesInfo->options.find("misc") ) {
// rulesInfo->options.replace("misc", "Miscellaneous compatibility options" );
@@ -335,3 +392,13 @@ bool X11Helper::areSingleGroupsSupported()
{
return true; //TODO:
}
+
+void X11Helper::initializeTranslations() {
+ // TDE is usually installed into some non-standard prefix and by default system-wide locale
+ // dirs are not considered when searching for gettext message catalogues, so we have to add
+ // it explicitly.
+#ifdef WITH_XKB_TRANSLATIONS
+ TDEGlobal::dirs()->addResourceDir("locale", XKB_CONFIG_LOCALE_DIR);
+ TDEGlobal::locale()->insertCatalogue("xkeyboard-config");
+#endif
+}
diff --git a/kxkb/x11helper.h b/kxkb/x11helper.h
index 042fb4ce5..8315dc446 100644
--- a/kxkb/x11helper.h
+++ b/kxkb/x11helper.h
@@ -3,6 +3,7 @@
#include <tqdict.h>
#include <tqstringlist.h>
+#include <tqwindowdefs.h>
struct RulesInfo {
@@ -36,6 +37,7 @@ public:
static bool areLayoutsClean() { return m_layoutsClean; }
static bool areSingleGroupsSupported();
+ static void initializeTranslations();
};
#endif /*X11HELPER_H_*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 01:20:54 +0000