Author: arekm Date: Wed Sep 1 12:56:24 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3; branch diff is back
---- Files affected:
packages/kde4-kdebase-workspace:
kde4-kdebase-workspace-branch.diff (1.20 -> 1.21) ,
kde4-kdebase-workspace.spec (1.234 -> 1.235)
---- Diffs:
================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.20
packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.21
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff:1.20
Thu Aug 19 19:20:48 2010
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff Wed Sep
1 14:56:18 2010
@@ -1,2628 +1,1691 @@
---- workspace/ksmserver/kcm/kcmsmserver.desktop
(.../tags/KDE/4.5.0/kdebase) (wersja 1165573)
-+++ workspace/ksmserver/kcm/kcmsmserver.desktop
(.../branches/KDE/4.5/kdebase) (wersja 1165573)
-@@ -21,6 +21,7 @@
- Name[en_GB]=Session Management
- Name[es]=Gestión de sesiones
- Name[et]=Seansihaldus
-+Name[eu]=Saio kudeaketa
- Name[fi]=Istunnonhallinta
- Name[fr]=Gestion de session
- Name[fy]=Sesjebehear
-@@ -42,6 +43,7 @@
- Name[nb]=Øktbehandling
- Name[nds]=Törns plegen
- Name[nl]=Sessiebeheer
-+Name[nn]=Økthandsamar
- Name[pa]=ਸ਼ੈਸ਼ਨ ਪਰਬੰਧ
- Name[pl]=Zarządzanie sesją
- Name[pt]=Gestão de Sessões
---- workspace/ConfigureChecks.cmake (.../tags/KDE/4.5.0/kdebase) (wersja
1165573)
-+++ workspace/ConfigureChecks.cmake (.../branches/KDE/4.5/kdebase) (wersja
1165573)
-@@ -64,6 +64,7 @@
- macro_bool_to_01(FONTCONFIG_FOUND HAVE_FONTCONFIG) #
kcontrol/{fonts,kfontinst}
- macro_bool_to_01(FREETYPE_FOUND HAVE_FREETYPE) # kcontrol/fonts
- macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL) # kwin
-+macro_bool_to_01(DBUSMENUQT_FOUND HAVE_DBUSMENUQT) #
plasma/dataengine/statusnotifieritem
- macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM) # kwin, ksplash
- macro_bool_to_01(X11_XTest_FOUND HAVE_XTEST) # khotkeys, kxkb, kdm
- macro_bool_to_01(X11_Xcomposite_FOUND HAVE_XCOMPOSITE) # kicker, kwin
---- workspace/kcontrol/dateandtime/kcmclock_actions.actions
(.../tags/KDE/4.5.0/kdebase) (wersja 1165573)
-+++ workspace/kcontrol/dateandtime/kcmclock_actions.actions
(.../branches/KDE/4.5/kdebase) (wersja 1165573)
-@@ -175,7 +175,7 @@
- Description[sv]=Systemets policy förhindrar att du sparar inställningar av
datum och tid.
- Description[th]=นโยบายของระบบเพื่อป้องกันจากการจัดเก็บการตั้งค่าต่าง ๆ
ของวันและเวลา
- Description[tr]=Sistem politikaları tarih saat ayarlarını kaydetmenizi
engelliyor.
--Description[uk]=Згідно до загальносистемних правил, ви не можете зберігати
параметри дати/часу.
-+Description[uk]=Відповідно до загальносистемних правил, ви не можете
зберігати параметри дати/часу.
- Description[x-test]=xxSystem policies prevent you from saving the date/time
settings.xx
- Description[zh_CN]=系统安全策略不允许您保存日期/时间设置。
- Description[zh_TW]=系統政策不允許您儲存日期與時間的設定
---- workspace/kcontrol/desktoptheme/desktoptheme.desktop
(.../tags/KDE/4.5.0/kdebase) (wersja 1165573)
-+++ workspace/kcontrol/desktoptheme/desktoptheme.desktop
(.../branches/KDE/4.5/kdebase) (wersja 1165573)
-@@ -20,6 +20,7 @@
- Name[en_GB]=Desktop Theme
- Name[es]=Tema de escritorio
- Name[et]=Töölauateema
-+Name[eu]=Mahaigaineko gaia
- Name[fi]=Työpöydän teema
- Name[fr]=Thème de bureau
- Name[fy]=Desktop tema
-@@ -41,6 +42,7 @@
- Name[nb]=Skrivebordstema
- Name[nds]=Schriefdischmuster
- Name[nl]=Bureaubladthema
-+Name[nn]=Skrivebordstema
- Name[pa]=ਡੈਸਕਟਾਪ ਥੀਮ
- Name[pl]=Motyw pulpitu
- Name[pt]=Tema do Ambiente de Trabalho
-@@ -69,11 +71,13 @@
- Comment[en_GB]=Customise the desktop theme
- Comment[es]=Personalizar el tema de escritorio
- Comment[et]=Töölauateema kohandamine
-+Comment[eu]=Pertsonalizatu mahaigaineko gaia
- Comment[fi]=Mukauta työpöytäteema
- Comment[fr]=Personnalise le thème de bureau
- Comment[fy]=It buroblêdtema oanpasse
- Comment[ga]=Saincheap an téama deisce
- Comment[hi]=डेस्कटॉप प्रसंग मनपसंद बनाएँ
-+Comment[hr]=Prilagodba teme radne površine
- Comment[ia]=Personalisar le thema de scriptorio
- Comment[id]=Sesuaikan tema desktop
- Comment[is]=Sérsníða skjáborðsþema
-@@ -88,6 +92,7 @@
- Comment[nb]=Still inn temaet for skrivebordet
- Comment[nds]=Dat Schriefdischmuster topassen
- Comment[nl]=Pas het bureaubladthema aan
-+Comment[nn]=Tilpass skrivebordstemaet
- Comment[pa]=ਡੈਸਕਟਾਪ ਥੀਮ ਕਸਟਮਾਈਜ਼ ਕਰੋ
- Comment[pl]=Konfiguracja elementów motywu pulpitu
- Comment[pt]=Personalizar o tema do ambiente de trabalho
---- workspace/kcontrol/keyboard/xkb_rules.cpp (.../tags/KDE/4.5.0/kdebase)
(wersja 1165573)
-+++ workspace/kcontrol/keyboard/xkb_rules.cpp (.../branches/KDE/4.5/kdebase)
(wersja 1165573)
-@@ -22,6 +22,7 @@
- #include <klocale.h>
-
- #include <QtCore/QDebug>
-+#include <QtCore/QDir>
- #include <QtGui/QTextDocument> // for Qt::escape
- #include <QtXml/QXmlAttributes>
-
-@@ -120,24 +121,40 @@
- }
-
-
--static QString findXkbRulesFile()
-+QString Rules::getRulesName()
- {
-- QString rulesFile;
- XkbRF_VarDefsRec vd;
- char *tmp = NULL;
-
- if (XkbRF_GetNamesProp(QX11Info::display(), &tmp, &vd) && tmp != NULL )
{
- // qDebug() << "namesprop" << tmp ;
-- QString base;
-- if( QString("/usr/lib/X11") == XLIBDIR ) {
-- base = "/usr/share/X11";
-+ return QString(tmp);
-+ }
-+
-+ return QString::null;
-+}
+--- workspace/kcontrol/dateandtime/helper.cpp (.../tags/KDE/4.5.1/kdebase)
(wersja 1170567)
++++ workspace/kcontrol/dateandtime/helper.cpp (.../branches/KDE/4.5/kdebase)
(wersja 1170567)
+@@ -58,7 +58,7 @@
+ if(!config_file.exists()) {
+ config_file.open(QIODevice::WriteOnly);
+ config_file.close();
+- config_file.setPermissions(QFile::ReadOther);
++ config_file.setPermissions(QFile::ReadOwner | QFile::WriteOwner |
QFile::ReadGroup | QFile::ReadOther);
+ }
+ KConfig _config(config_file.fileName(), KConfig::SimpleConfig);
+ KConfigGroup config(&_config, "NTP");
+--- workspace/kcontrol/keyboard/keyboard_hardware.cpp
(.../tags/KDE/4.5.1/kdebase) (wersja 1170567)
++++ workspace/kcontrol/keyboard/keyboard_hardware.cpp
(.../branches/KDE/4.5/kdebase) (wersja 1170567)
+@@ -16,19 +16,20 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
+ */
+
+-#include <config-workspace.h>
+-#include <config-X11.h>
+-
++#include <kdebug.h>
+ #include <kconfiggroup.h>
+ #include <ksharedconfig.h>
+
+ #include <QtGui/QX11Info>
++#include <QtGui/QCursor> // WTF? - otherwise compiler complains
+
+ #include <X11/Xlib.h>
+
+ #include <math.h>
+
++#include "x11_helper.h"
+
+
-+static QString findXkbRulesFile()
+ /*
+ Originally comes from NumLockX http://dforce.sh.cvut.cz/~seli/en/numlockx
+
+@@ -60,131 +61,114 @@
+ #include <X11/XKBlib.h>
+ #include <X11/keysym.h>
+
+-/* the XKB stuff is based on code created by Oswald Buddenhagen
<[email protected]> */
+-int xkb_init()
+- {
+- int xkb_opcode, xkb_event, xkb_error;
+- int xkb_lmaj = XkbMajorVersion;
+- int xkb_lmin = XkbMinorVersion;
+- return XkbLibraryVersion( &xkb_lmaj, &xkb_lmin )
+- && XkbQueryExtension( QX11Info::display(), &xkb_opcode,
&xkb_event, &xkb_error,
+- &xkb_lmaj, &xkb_lmin );
+- }
+
++static
+ unsigned int xkb_mask_modifier( XkbDescPtr xkb, const char *name )
+- {
+- int i;
+- if( !xkb || !xkb->names )
+- return 0;
+- for( i = 0;
+- i < XkbNumVirtualMods;
+- i++ )
+- {
+- char* modStr = XGetAtomName( xkb->dpy, xkb->names->vmods[i] );
+- if( modStr != NULL && strcmp(name, modStr) == 0 )
+- {
+- unsigned int mask;
+- XkbVirtualModsToReal( xkb, 1 << i, &mask );
+- return mask;
+- }
+{
-+ QString rulesFile;
-+ QString rulesName = Rules::getRulesName();
-+
-+ if ( ! rulesName.isNull() ) {
-+ QString xkbParentDir;
++ if( !xkb || !xkb->names )
++ return 0;
+
-+ QString base(XLIBDIR);
-+ if( base.count('/') >= 3 ) {
-+ QDir baseDir(base + "/../../share/X11");
-+ if( baseDir.exists() ) {
-+ xkbParentDir = baseDir.absolutePath();
-+ }
- }
-- else {
-- //TODO: is it good enough?
-- base = XLIBDIR;
-- base += "/..";
-+
-+ if( xkbParentDir.isEmpty() ) {
-+ xkbParentDir = "/usr/share/X11";
- }
-- rulesFile = base + QString("/xkb/rules/%1.xml").arg(tmp);
-+
-+ rulesFile = QString("%1/xkb/rules/%2.xml").arg(xkbParentDir,
rulesName);
++ for(int i = 0; i < XkbNumVirtualMods; i++ ) {
++ char* modStr = XGetAtomName( xkb->dpy, xkb->names->vmods[i] );
++ if( modStr != NULL && strcmp(name, modStr) == 0 ) {
++ unsigned int mask;
++ XkbVirtualModsToReal( xkb, 1 << i, &mask );
++ return mask;
++ }
}
+- return 0;
+- }
++ return 0;
++}
- return rulesFile;
---- workspace/kcontrol/keyboard/layout_memory.cpp
(.../tags/KDE/4.5.0/kdebase) (wersja 1165573)
-+++ workspace/kcontrol/keyboard/layout_memory.cpp
(.../branches/KDE/4.5/kdebase) (wersja 1165573)
-@@ -22,13 +22,14 @@
++static
+ unsigned int xkb_numlock_mask()
+- {
+- XkbDescPtr xkb;
+- if(( xkb = XkbGetKeyboard( QX11Info::display(), XkbAllComponentsMask,
XkbUseCoreKbd )) != NULL )
+- {
+- unsigned int mask = xkb_mask_modifier( xkb, "NumLock" );
+- XkbFreeKeyboard( xkb, 0, True );
+- return mask;
+- }
+- return 0;
+- }
++{
++ XkbDescPtr xkb;
++ if(( xkb = XkbGetKeyboard( QX11Info::display(), XkbAllComponentsMask,
XkbUseCoreKbd )) != NULL ) {
++ unsigned int mask = xkb_mask_modifier( xkb, "NumLock" );
++ XkbFreeKeyboard( xkb, 0, True );
++ return mask;
++ }
++ else {
++ kError() << "Failed to set numlock: failed to get keyboard";
++ }
++ return 0;
++}
- #include <kdebug.h>
- #include <kwindowsystem.h>
--#include <netwm.h>
-+//#include <netwm.h>
+-int xkb_set_on()
+- {
+- unsigned int mask;
+- if( !xkb_init())
++static
++int xkb_set_numlock(int set)
++{
++ unsigned int mask = xkb_numlock_mask();
++ if( mask == 0 ) {
++ kError() << "Failed to set numlock: numlock mask is 0";
+ return 0;
+- mask = xkb_numlock_mask();
+- if( mask == 0 )
+- return 0;
+- XkbLockModifiers ( QX11Info::display(), XkbUseCoreKbd, mask, mask);
+- return 1;
+ }
+
+-int xkb_set_off()
+- {
+- unsigned int mask;
+- if( !xkb_init())
+- return 0;
+- mask = xkb_numlock_mask();
+- if( mask == 0 )
+- return 0;
+- XkbLockModifiers ( QX11Info::display(), XkbUseCoreKbd, mask, 0);
+- return 1;
+- }
++ unsigned int values = set ? mask : 0;
++ return XkbLockModifiers ( QX11Info::display(), XkbUseCoreKbd, mask,
values);
++}
- #include "x11_helper.h"
+-void numlock_set_on()
+- {
+- if( xkb_set_on())
+- return;
+- }
++static
++void numlockx_change_numlock_state( bool set )
++{
++ if( !X11Helper::xkbSupported(NULL) ) {
++ kError() << "Failed to set numlock: xkb is not supported";
++ return;
++ }
+
+-void numlock_set_off()
+- {
+- if( xkb_set_off())
+- return;
+- }
++ if( ! xkb_set_numlock(set) ) {
++ kError() << "Failed to set numlock: XkbLockModifiers request hasn't
been sent";
++ }
++}
+-void numlockx_change_numlock_state( bool set_P )
+- {
+- if( set_P )
+- numlock_set_on();
+- else
+- numlock_set_off();
+- }
+-
+ // This code is taken from xset utility from XFree 4.3
(http://www.xfree86.org/)
- LayoutMemory::LayoutMemory():
-- switchingPolicy(KeyboardConfig::SWITCH_POLICY_GLOBAL)
-+ switchingPolicy(KeyboardConfig::SWITCH_POLICY_GLOBAL),
-+ layoutList(X11Helper::getLayoutsList())
++static
+ void set_repeatrate(int delay, double rate)
{
- registerListeners();
- }
-@@ -83,7 +84,7 @@
- }
- case KeyboardConfig::SWITCH_POLICY_APPLICATION: {
- WId wid = KWindowSystem::self()->activeWindow();
-- KWindowInfo winInfo = KWindowSystem::windowInfo(wid,
NET::WMWindowType);
-+ KWindowInfo winInfo = KWindowSystem::windowInfo(wid,
NET::WMWindowType, NET::WM2WindowClass);
- NET::WindowType windowType = winInfo.windowType(
NET::NormalMask | NET::DesktopMask | NET::DialogMask );
- kDebug() << "window type" << windowType;
-
-@@ -93,12 +94,12 @@
- if( windowType != NET::Unknown && windowType != NET::Normal &&
windowType != NET::Dialog )
- return QString();
-
--// KWindowInfo winInfo = KWindowSystem::windowInfo(wid,
NET::WM2WindowClass);
--// return QString(winInfo.windowClassName());
-- //TODO: shall we use pid or window class ???
-- NETWinInfo winInfoForPid( QX11Info::display(), wid,
QX11Info::appRootWindow(), NET::WMPid | NET::WM2WindowClass);
--// return QString(winInfo.windowClassClass());
-- return QString::number(winInfoForPid.pid());
-+ // shall we use pid or window class ??? - class seems better
(see e.g. https://bugs.kde.org/show_bug.cgi?id=245507)
-+ // for window class shall we use class.class or class.name?
(seem class.class is a bit better - more app-oriented)
-+ kDebug() << "New active window with class.class: " <<
winInfo.windowClassClass();
-+ return QString(winInfo.windowClassClass());
-+// NETWinInfo winInfoForPid( QX11Info::display(), wid,
QX11Info::appRootWindow(), NET::WMPid);
-+// return QString::number(winInfoForPid.pid());
- }
- case KeyboardConfig::SWITCH_POLICY_DESKTOP:
- return QString::number(KWindowSystem::self()->currentDesktop());
-@@ -107,9 +108,14 @@
- }
+- Display* dpy = QX11Info::display();
+- int xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion;
+- int xkbopcode, xkbevent, xkberror;
++ if( !X11Helper::xkbSupported(NULL) ) {
++ kError() << "Failed to set keyboard repeat rate: xkb is not
supported";
++ return;
++ }
+
+- if (XkbQueryExtension(dpy, &xkbopcode, &xkbevent, &xkberror, &xkbmajor,
+- &xkbminor)) {
+- XkbDescPtr xkb = XkbAllocKeyboard();
+- if (xkb) {
+- int res = XkbGetControls(dpy, XkbRepeatKeysMask, xkb);
+- xkb->ctrls->repeat_delay = delay;
+- xkb->ctrls->repeat_interval = (int)floor(1000/rate + 0.5);
+- res = XkbSetControls(dpy, XkbRepeatKeysMask, xkb);
+- return;
+- }
+- }
++ XkbDescPtr xkb = XkbAllocKeyboard();
++ if (xkb) {
++ Display* dpy = QX11Info::display();
++ int res = XkbGetControls(dpy, XkbRepeatKeysMask, xkb);
++ xkb->ctrls->repeat_delay = delay;
++ xkb->ctrls->repeat_interval = (int)floor(1000/rate + 0.5);
++ res = XkbSetControls(dpy, XkbRepeatKeysMask, xkb);
++ return;
++ }
}
--void LayoutMemory::clear()
-+void LayoutMemory::layoutMapChanged()
+-void init_keyboard_hardware()
++static
++void set_volume(int click_percent, bool auto_repeat_mode)
{
-- layoutMap.clear();
-+ QList<LayoutUnit> newLayoutList(X11Helper::getLayoutsList());
-+ if( newLayoutList != layoutList ) {
-+ layoutList = newLayoutList;
-+ kDebug() << "Clearing layout memory as layout map has changed";
-+ layoutMap.clear();
+- KConfigGroup config(KSharedConfig::openConfig( "kcminputrc" ),
"Keyboard");
+-
+ XKeyboardState kbd;
+ XKeyboardControl kbdc;
+
+ XGetKeyboardControl(QX11Info::display(), &kbd);
+- bool key = config.readEntry("KeyboardRepeating", true);
+- kbdc.key_click_percent = config.readEntry("ClickVolume",
kbd.key_click_percent);
+- kbdc.auto_repeat_mode = (key ? AutoRepeatModeOn : AutoRepeatModeOff);
+
++ if( click_percent != -1 ) {
++ kbdc.key_click_percent = click_percent;
++ }
++ kbdc.auto_repeat_mode = (auto_repeat_mode ? AutoRepeatModeOn :
AutoRepeatModeOff);
++
+ XChangeKeyboardControl(QX11Info::display(),
+ KBKeyClickPercent |
KBAutoRepeatMode,
+ &kbdc);
++}
+
+- if( key ) {
++void init_keyboard_hardware()
++{
++ KConfigGroup config(KSharedConfig::openConfig( "kcminputrc" ),
"Keyboard");
++
++ bool key_repeat = config.readEntry("KeyboardRepeating", true);
++ int click_percent = config.readEntry("ClickVolume", -1);
++
++ set_volume(click_percent, key_repeat);
++
++ if( key_repeat ) {
+ int delay_ = config.readEntry("RepeatDelay", 250);
+ double rate_ = config.readEntry("RepeatRate", 30.);
+ set_repeatrate(delay_, rate_);
+@@ -192,6 +176,7 @@
+
+
+ int numlockState = config.readEntry( "NumLock", 2 );
+- if( numlockState != 2 )
++ if( numlockState != 2 ) {
+ numlockx_change_numlock_state( numlockState == 0 );
+ }
}
+--- workspace/kcontrol/keyboard/xkb_helper.h (.../tags/KDE/4.5.1/kdebase)
(wersja 1170567)
++++ workspace/kcontrol/keyboard/xkb_helper.h (.../branches/KDE/4.5/kdebase)
(wersja 1170567)
+@@ -24,7 +24,6 @@
- void LayoutMemory::layoutChanged()
---- workspace/kcontrol/keyboard/kcm_view_models.cpp
(.../tags/KDE/4.5.0/kdebase) (wersja 1165573)
-+++ workspace/kcontrol/keyboard/kcm_view_models.cpp
(.../branches/KDE/4.5/kdebase) (wersja 1165573)
-@@ -307,8 +307,8 @@
- else {
- int groupRow = index.row();
- const OptionGroupInfo* xkbGroup =
rules->optionGroupInfos[groupRow];
-- foreach(const QString& option, keyboardConfig->xkbOptions) {
-- if( option.startsWith(xkbGroup->name +
Rules::XKB_OPTION_GROUP_SEPARATOR) )
-+ foreach(const OptionInfo* optionInfo, xkbGroup->optionInfos) {
-+ if(
keyboardConfig->xkbOptions.indexOf(optionInfo->name) != -1 )
- return Qt::PartiallyChecked;
- }
- return Qt::Unchecked;
---- workspace/kcontrol/keyboard/keyboard_daemon.cpp
(.../tags/KDE/4.5.0/kdebase) (wersja 1165573)
-+++ workspace/kcontrol/keyboard/keyboard_daemon.cpp
(.../branches/KDE/4.5/kdebase) (wersja 1165573)
-@@ -146,7 +146,7 @@
- connect(xEventNotifier, SIGNAL(newPointerDevice()), this,
SLOT(configureMouse()));
- connect(xEventNotifier, SIGNAL(newKeyboardDevice()), this,
SLOT(configureKeyboard()));
- connect(xEventNotifier, SIGNAL(layoutChanged()), &layoutMemory,
SLOT(layoutChanged()));
-- connect(xEventNotifier, SIGNAL(layoutMapChanged()), &layoutMemory,
SLOT(clear()));
-+ connect(xEventNotifier, SIGNAL(layoutMapChanged()), &layoutMemory,
SLOT(layoutMapChanged()));
- xEventNotifier->start();
- }
-
-@@ -159,7 +159,7 @@
- disconnect(xEventNotifier, SIGNAL(newPointerDevice()), this,
SLOT(configureMouse()));
- disconnect(xEventNotifier, SIGNAL(newKeyboardDevice()), this,
SLOT(configureKeyboard()));
- disconnect(xEventNotifier, SIGNAL(layoutChanged()), &layoutMemory,
SLOT(layoutChanged()));
-- disconnect(xEventNotifier, SIGNAL(layoutMapChanged()), &layoutMemory,
SLOT(clear()));
-+ disconnect(xEventNotifier, SIGNAL(layoutMapChanged()), &layoutMemory,
SLOT(layoutMapChanged()));
- }
-
- void KeyboardDaemon::globalSettingsChanged(int category)
---- workspace/kcontrol/keyboard/plasma_applet_keyboard.desktop
(.../tags/KDE/4.5.0/kdebase) (wersja 1165573)
-+++ workspace/kcontrol/keyboard/plasma_applet_keyboard.desktop
(.../branches/KDE/4.5/kdebase) (wersja 1165573)
-@@ -115,6 +115,7 @@
- Comment[nb]=Miniprogram som viser og bytter utforminger
- Comment[nds]=Lüttprogramm för't Wiesen un Wesseln vun Tasttoornen
- Comment[nl]=Applet om indelingen te tonen en om te schakelen
-+Comment[nn]=Miniprogram for å visa og byta oppsett
- Comment[pa]=ਲੇਆਉਟ ਵੇਖਾਉਣ ਤੇ ਬਦਲਣ ਲਈ ਐਪਲਿਟ
- Comment[pl]=Aplet do pokazywania i przełączania układów
- Comment[pt]='Applet' para mostrar e mudar de disposições
---- workspace/kcontrol/keyboard/CMakeLists.txt (.../tags/KDE/4.5.0/kdebase)
(wersja 1165573)
-+++ workspace/kcontrol/keyboard/CMakeLists.txt (.../branches/KDE/4.5/kdebase)
(wersja 1165573)
-@@ -3,15 +3,12 @@
-
- if( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS )
- set(XiGetDevicePresence_FOUND 1)
-+ ADD_DEFINITIONS(-DHAVE_XINPUT_AND_DEVICE_NOTIFY=1)
- else( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS )
- MESSAGE(STATUS "_XiGetDevicePresenceNotifyEvent is not found, libXi
version 1.2.0 or later is required to keep layouts with keyboard hotplugging")
- endif( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS )
-
--macro_bool_to_01(XiGetDevicePresence_FOUND HAVE_XINPUT)
--ADD_DEFINITIONS(-DHAVE_XINPUT=${HAVE_XINPUT})
-
--
--
- ### kded daemon ###
-
- set( kded_keyboard_SRCS
---- workspace/kcontrol/keyboard/xkb_rules.h (.../tags/KDE/4.5.0/kdebase)
(wersja 1165573)
-+++ workspace/kcontrol/keyboard/xkb_rules.h (.../branches/KDE/4.5/kdebase)
(wersja 1165573)
-@@ -93,6 +93,7 @@
- }
+ class XkbHelper {
+ public:
+- static bool initializeKeyboardLayouts();
+ static bool initializeKeyboardLayouts(KeyboardConfig& config);
- static Rules* readRules();
-+ static QString getRulesName();
- };
+ //private:
+--- workspace/kcontrol/keyboard/xkb_helper.cpp (.../tags/KDE/4.5.1/kdebase)
(wersja 1170567)
++++ workspace/kcontrol/keyboard/xkb_helper.cpp (.../branches/KDE/4.5/kdebase)
(wersja 1170567)
+@@ -30,6 +30,7 @@
- #endif /* XKB_RULES_H_ */
---- workspace/kcontrol/keyboard/layout_memory.h
(.../tags/KDE/4.5.0/kdebase) (wersja 1165573)
-+++ workspace/kcontrol/keyboard/layout_memory.h
(.../branches/KDE/4.5/kdebase) (wersja 1165573)
-@@ -36,6 +36,7 @@
- // if there's some transient windows coming up we'll need to either
ignore it
- // or in case of layout switcher popup menu to apply new layout to
previous key
- QString previousLayoutMapKey;
-+ QList<LayoutUnit> layoutList;
-
- void registerListeners();
- void unregisterListeners();
-@@ -43,7 +44,7 @@
- void setCurrentLayoutFromMap();
-
- public Q_SLOTS:
-- void clear();
-+ void layoutMapChanged();
- void layoutChanged();
- void windowChanged(WId wId);
- void desktopChanged(int desktop);
---- workspace/kcontrol/keyboard/layout_widget.cpp
(.../tags/KDE/4.5.0/kdebase) (wersja 1165573)
-+++ workspace/kcontrol/keyboard/layout_widget.cpp
(.../branches/KDE/4.5/kdebase) (wersja 1165573)
-@@ -190,7 +190,7 @@
-
- m_notifierItem->setToolTipSubTitle(longText);
-
-- const QIcon icon(flags->getIcon(layoutUnit.layout));
-+ const QIcon icon(getFlag(layoutUnit.layout));
- m_notifierItem->setToolTipIconByPixmap(icon);
-
- QIcon textOrIcon = flags->getIconWithText(layoutUnit, *keyboardConfig);
---- workspace/kcontrol/keyboard/xinput_helper.cpp
(.../tags/KDE/4.5.0/kdebase) (wersja 1165573)
-+++ workspace/kcontrol/keyboard/xinput_helper.cpp
(.../branches/KDE/4.5/kdebase) (wersja 1165573)
-@@ -27,7 +27,7 @@
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
+ #include "keyboard_config.h"
--#if HAVE_XINPUT==1
-+#ifdef HAVE_XINPUT_AND_DEVICE_NOTIFY
- #include <X11/extensions/XInput.h>
- #endif
-
-@@ -75,7 +75,7 @@
++
+ static const char* SETXKBMAP_EXEC = "setxkbmap";
+
+ static bool setxkbmapNotFound = false;
+@@ -71,19 +72,19 @@
+ }
}
+-bool XkbHelper::initializeKeyboardLayouts()
+-{
+- getSetxkbmapExe();
+- if( ! setxkbmapNotFound ) {
++//bool XkbHelper::initializeKeyboardLayouts()
++//{
++// getSetxkbmapExe();
++// if( ! setxkbmapNotFound ) {
++//
++// KeyboardConfig config;
++// config.load();
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace-branch.diff?r1=1.20&r2=1.21&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.234&r2=1.235&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
