By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] klayout_DefCfg_XkbOpts.patch

klayout_DefCfg_XkbOpts.patch (text/plain), 6.86 KB, created by Roman Savochenko on 2023-06-18 01:25:08 CDT

(hide)

Description: klayout_DefCfg_XkbOpts.patch

Filename:

MIME Type:

Creator: Roman Savochenko

Created: 2023-06-18 01:25:08 CDT

Size: 6.86 KB

patch

obsolete

>--- tdebase-trinity-14.1.0/kxkb/kcmlayout.cpp~ 2023-04-12 17:41:00.000000000 +0300 >+++ tdebase-trinity-14.1.0/kxkb/kcmlayout.cpp 2023-05-07 14:05:01.468389428 +0300 >@@ -246,7 +246,7 @@ > widget->radFlagOnly->setChecked( showFlag && !showLabel ); > widget->radLabelOnly->setChecked( !showFlag && showLabel ); > >- widget->xkbOptsMode->setButton(m_kxkbConfig.m_resetOldOptions ? 0 : 1); >+ //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 ); >@@ -287,7 +287,8 @@ > widget->indOptsFrame->setEnabled( m_kxkbConfig.m_useKxkb ); > > // display xkb options >- TQStringList activeOptions = TQStringList::split(',', m_kxkbConfig.m_options); >+ TQStringList activeOptions = TQStringList::split(",", XKBExtension::getServerOptions()); >+ //TQStringList::split(',', m_kxkbConfig.m_options); > bool foundGrp = false; > for (TQStringList::ConstIterator it = activeOptions.begin(); it != activeOptions.end(); ++it) > { >@@ -299,7 +300,7 @@ > foundGrp = true; > } > >- OptionListItem *item = m_optionGroups[i18n(optionKey.latin1())]; >+ OptionListItem *item = m_optionGroups[optionKey.latin1()]; > > if (item != NULL) { > OptionListItem *child = item->findChildItem( option ); >@@ -332,7 +332,7 @@ > TQString model = lookupLocalized(m_rules->models(), widget->comboModel->currentText()); > m_kxkbConfig.m_model = model; > >- m_kxkbConfig.m_resetOldOptions = widget->radXkbOverwrite->isOn(); >+ m_kxkbConfig.m_resetOldOptions = true;// widget->radXkbOverwrite->isOn(); > m_kxkbConfig.m_options = createOptionString(); > > m_kxkbConfig.m_useThemeColors = widget->radLabelUseTheme->isChecked(); >@@ -650,9 +650,9 @@ > connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(resolveConflicts(TQListViewItem *))); > connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(updateHotkeyCombo())); > >- connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(changed())); >- connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(updateOptionsCommand())); >- connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(updateHotkeyCombo())); >+ //connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(changed())); >+ //connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(updateOptionsCommand())); >+ //connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(updateHotkeyCombo())); > > //Create controllers for all options > TQDictIterator<char> it(m_rules->options()); >@@ -681,7 +682,7 @@ > TQCheckListItem::CheckBoxController, it.currentKey()); > } > parent->setOpen(true); >- m_optionGroups.insert(i18n(it.currentKey().local8Bit()), parent); >+ m_optionGroups.insert(it.currentKey().local8Bit(), parent); > } > } > >@@ -719,7 +719,7 @@ > { > TQString setxkbmap; > TQString options = createOptionString(); >- bool overwrite = widget->radXkbOverwrite->isOn(); >+ bool overwrite = true; //widget->radXkbOverwrite->isOn(); > > if( !options.isEmpty() ) { > setxkbmap = "setxkbmap -option "; //-rules " + m_rule >@@ -817,7 +818,7 @@ > kdDebug() << "resolveConflicts : " << current->optionName() << endl; > > if (current->optionName().startsWith("grp:")) { >- OptionListItem *grpItem = m_optionGroups[i18n("grp")]; >+ OptionListItem *grpItem = m_optionGroups["grp"]; > if (grpItem == NULL) { > kdWarning() << "LayoutConfig: cannot find grp item group" << endl; > return; >@@ -947,7 +948,7 @@ > } > > void LayoutConfig::updateHotkeyCombo(bool initial) { >- OptionListItem *grpItem = m_optionGroups[i18n("grp")]; >+ OptionListItem *grpItem = m_optionGroups["grp"]; > if (grpItem == NULL) { > kdWarning() << "LayoutConfig: cannot find grp item group" << endl; > return; >@@ -956,7 +956,7 @@ > TQStringList hotkeys; > > // Get server options first >- if (initial || widget->xkbOptsMode->selectedId() == 1) >+ if (initial /*|| widget->xkbOptsMode->selectedId() == 1*/) > { > TQStringList opts = TQStringList::split(",", XKBExtension::getServerOptions()); > for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it) >@@ -1051,7 +1052,7 @@ > } > } > >- OptionListItem *grpItem = m_optionGroups[i18n("grp")]; >+ OptionListItem *grpItem = m_optionGroups["grp"]; > if (grpItem == NULL) { > kdWarning() << "LayoutConfig: cannot find grp item group" << endl; > return; >@@ -1214,14 +1215,17 @@ > KxkbConfig m_kxkbConfig; > m_kxkbConfig.load(KxkbConfig::LOAD_INIT_OPTIONS); > >- if( m_kxkbConfig.m_useKxkb == true ) { >+ if( m_kxkbConfig.m_useKxkb == true ) > kapp->startServiceByDesktopName("kxkb"); >+ >+ XkbOptions opts = m_kxkbConfig.getKXkbOptions(); >+ //Only Xkb options processing for compatibility >+ if(!m_kxkbConfig.m_useKxkb) { >+ opts.layouts = opts.variants = opts.model = ""; >+ opts.resetOld = false; > } >- else { >- if (!XKBExtension::setXkbOptions(m_kxkbConfig.getKXkbOptions())) { >- kdDebug() << "Setting XKB options failed!" << endl; >- } >- } >+ if(!XKBExtension::setXkbOptions(opts)) >+ kdDebug() << "Setting XKB options failed!" << endl; > } > } > >--- tdebase-trinity-14.1.0/kxkb/extension.cpp~ 2023-04-12 17:41:00.000000000 +0300 >+++ tdebase-trinity-14.1.0/kxkb/extension.cpp 2023-05-12 22:56:33.083599713 +0300 >@@ -114,7 +114,10 @@ > if (!options.options.isEmpty()) { > p << "-option"; > >- if (options.resetOld) >+ p << "-option"; >+ p << options.options; >+ >+ /*if (options.resetOld) > { > p << options.options; > } >@@ -133,7 +136,7 @@ > } > } > p << newOptions.join(","); >- } >+ }*/ > } > > kdDebug() << "[setXkbOptions] Command: " << p.args() << endl; >--- tdebase-trinity-14.1.0/kxkb/kcmlayoutwidget.ui~ 2023-04-12 17:41:00.000000000 +0300 >+++ tdebase-trinity-14.1.0/kxkb/kcmlayoutwidget.ui 2023-05-12 21:44:32.530253875 +0300 >@@ -1048,7 +1048,7 @@ > </widget> > </grid> > </widget> >- <widget class="TQButtonGroup"> >+ <!--<widget class="TQButtonGroup"> > <property name="name"> > <cstring>xkbOptsMode</cstring> > </property> >@@ -1082,7 +1082,7 @@ > </property> > </widget> > </vbox> >- </widget> >+ </widget>--> > </vbox> > </widget> > </widget> >--- tdebase-trinity-14.1.0/kxkb/kxkb.cpp~ 2023-04-12 17:41:00.000000000 +0300 >+++ tdebase-trinity-14.1.0/kxkb/kxkb.cpp 2023-05-14 20:25:08.993450237 +0300 >@@ -261,7 +260,7 @@ > } > > void KXKBApp::slotGroupChanged(uint group) { >- m_currentLayout = kxkbConfig.m_layouts[group]; >+ m_currentLayout = kxkbConfig.m_layouts[(group<kxkbConfig.m_layouts.count())?group:0]; > m_tray->setCurrentLayout(m_currentLayout); > } > View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]