Attachment #3066 for bug #3205

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. View | Details | Raw Unified | Return to bug 3205
Collapse All | Expand All




	widget->radFlagOnly->setChecked( showFlag && !showLabel );
	widget->radLabelOnly->setChecked( !showFlag && showLabel );

	//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 );

	widget->indOptsFrame->setEnabled( m_kxkbConfig.m_useKxkb );

	// display xkb 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)
	{

			foundGrp = true;
		}

		OptionListItem *item = m_optionGroups[optionKey.latin1()];

		if (item != NULL) {
			OptionListItem *child = item->findChildItem( option );

	TQString model = lookupLocalized(m_rules->models(), widget->comboModel->currentText());
	m_kxkbConfig.m_model = model;

	m_kxkbConfig.m_resetOldOptions = true;// widget->radXkbOverwrite->isOn();
	m_kxkbConfig.m_options = createOptionString();

	m_kxkbConfig.m_useThemeColors = widget->radLabelUseTheme->isChecked();

  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()));

  //Create controllers for all options
  TQDictIterator<char> it(m_rules->options());

            TQCheckListItem::CheckBoxController, it.currentKey());
      }
      parent->setOpen(true);
      m_optionGroups.insert(it.currentKey().local8Bit(), parent);
    }
  }


{
  TQString setxkbmap;
  TQString options = createOptionString();
  bool overwrite = true; //widget->radXkbOverwrite->isOn();

  if( !options.isEmpty() ) {
    setxkbmap = "setxkbmap -option "; //-rules " + m_rule

    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;

}

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)

        }
    }

    OptionListItem *grpItem = m_optionGroups["grp"];
    if (grpItem == NULL) {
        kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
        return;

		KxkbConfig m_kxkbConfig;
		m_kxkbConfig.load(KxkbConfig::LOAD_INIT_OPTIONS);

		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;
		}
		if(!XKBExtension::setXkbOptions(opts))
		    kdDebug() << "Setting XKB options failed!" << endl;
				kdDebug() << "Setting XKB options failed!" << endl;
			}
		}
	}
}


Lines 114-120 Link Here

(-)tdebase-trinity-14.1.0/kxkb/extension.cpp~ (-2 / +5 lines)
114	if (!options.options.isEmpty()) {	114	if (!options.options.isEmpty()) {
115	p << "-option";	115	p << "-option";
116		116
117	if (options.resetOld)	117	p << "-option";
		118	p << options.options;
		119
		120	/*if (options.resetOld)
118	{	121	{
119	p << options.options;	122	p << options.options;
120	}	123	}
Lines 133-139 Link Here
133	}	136	}
134	}	137	}
135	p << newOptions.join(",");	138	p << newOptions.join(",");
136	}	139	}*/
137	}	140	}
138		141
139	kdDebug() << "[setXkbOptions] Command: " << p.args() << endl;	142	kdDebug() << "[setXkbOptions] Command: " << p.args() << endl;

Lines 1048-1054 Link Here

(-)tdebase-trinity-14.1.0/kxkb/kcmlayoutwidget.ui~ (-2 / +2 lines)
1048	</widget>	1048	</widget>
1049	</grid>	1049	</grid>
1050	</widget>	1050	</widget>
1051	<widget class="TQButtonGroup">	1051	<!--<widget class="TQButtonGroup">
1052	<property name="name">	1052	<property name="name">
1053	<cstring>xkbOptsMode</cstring>	1053	<cstring>xkbOptsMode</cstring>
1054	</property>	1054	</property>
Lines 1082-1088 Link Here
1082	</property>	1082	</property>
1083	</widget>	1083	</widget>
1084	</vbox>	1084	</vbox>
1085	</widget>	1085	</widget>-->
1086	</vbox>	1086	</vbox>
1087	</widget>	1087	</widget>
1088	</widget>	1088	</widget>

Lines 261-267 Link Here

(-)tdebase-trinity-14.1.0/kxkb/kxkb.cpp~ (-1 / +1 lines)
261	}	260	}
262		261
263	void KXKBApp::slotGroupChanged(uint group) {	262	void KXKBApp::slotGroupChanged(uint group) {
264	m_currentLayout = kxkbConfig.m_layouts[group];	263	m_currentLayout = kxkbConfig.m_layouts[(group<kxkbConfig.m_layouts.count())?group:0];
265	m_tray->setCurrentLayout(m_currentLayout);	264	m_tray->setCurrentLayout(m_currentLayout);
266	}	265	}
267		266

Return to bug 3205

Lines 246-252 Link Here

(-)tdebase-trinity-14.1.0/kxkb/kcmlayout.cpp~ (-19 / +23 lines)
246	widget->radFlagOnly->setChecked( showFlag && !showLabel );	246	widget->radFlagOnly->setChecked( showFlag && !showLabel );
247	widget->radLabelOnly->setChecked( !showFlag && showLabel );	247	widget->radLabelOnly->setChecked( !showFlag && showLabel );
248		248
249	widget->xkbOptsMode->setButton(m_kxkbConfig.m_resetOldOptions ? 0 : 1);	249	//widget->xkbOptsMode->setButton(m_kxkbConfig.m_resetOldOptions ? 0 : 1);
250		250
251	widget->grpLabel->setButton( ( m_kxkbConfig.m_useThemeColors ? 0 : 1 ) );	251	widget->grpLabel->setButton( ( m_kxkbConfig.m_useThemeColors ? 0 : 1 ) );
252	widget->bgColor->setColor( m_kxkbConfig.m_colorBackground );	252	widget->bgColor->setColor( m_kxkbConfig.m_colorBackground );
Lines 287-293 Link Here
287	widget->indOptsFrame->setEnabled( m_kxkbConfig.m_useKxkb );	287	widget->indOptsFrame->setEnabled( m_kxkbConfig.m_useKxkb );
288		288
289	// display xkb options	289	// display xkb options
290	TQStringList activeOptions = TQStringList::split(',', m_kxkbConfig.m_options);	290	TQStringList activeOptions = TQStringList::split(",", XKBExtension::getServerOptions());
		291	//TQStringList::split(',', m_kxkbConfig.m_options);
291	bool foundGrp = false;	292	bool foundGrp = false;
292	for (TQStringList::ConstIterator it = activeOptions.begin(); it != activeOptions.end(); ++it)	293	for (TQStringList::ConstIterator it = activeOptions.begin(); it != activeOptions.end(); ++it)
293	{	294	{
Lines 299-305 Link Here
299	foundGrp = true;	300	foundGrp = true;
300	}	301	}
301		302
302	OptionListItem *item = m_optionGroups[i18n(optionKey.latin1())];	303	OptionListItem *item = m_optionGroups[optionKey.latin1()];
303		304
304	if (item != NULL) {	305	if (item != NULL) {
305	OptionListItem *child = item->findChildItem( option );	306	OptionListItem *child = item->findChildItem( option );
Lines 332-338 Link Here
332	TQString model = lookupLocalized(m_rules->models(), widget->comboModel->currentText());	332	TQString model = lookupLocalized(m_rules->models(), widget->comboModel->currentText());
333	m_kxkbConfig.m_model = model;	333	m_kxkbConfig.m_model = model;
334		334
335	m_kxkbConfig.m_resetOldOptions = widget->radXkbOverwrite->isOn();	335	m_kxkbConfig.m_resetOldOptions = true;// widget->radXkbOverwrite->isOn();
336	m_kxkbConfig.m_options = createOptionString();	336	m_kxkbConfig.m_options = createOptionString();
337		337
338	m_kxkbConfig.m_useThemeColors = widget->radLabelUseTheme->isChecked();	338	m_kxkbConfig.m_useThemeColors = widget->radLabelUseTheme->isChecked();
Lines 650-658 Link Here
650	connect(listView, TQT_SIGNAL(clicked(TQListViewItem )), TQT_SLOT(resolveConflicts(TQListViewItem )));	650	connect(listView, TQT_SIGNAL(clicked(TQListViewItem )), TQT_SLOT(resolveConflicts(TQListViewItem )));
651	connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(updateHotkeyCombo()));	651	connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(updateHotkeyCombo()));
652		652
653	connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(changed()));	653	//connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(changed()));
654	connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(updateOptionsCommand()));	654	//connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(updateOptionsCommand()));
655	connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(updateHotkeyCombo()));	655	//connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(updateHotkeyCombo()));
656		656
657	//Create controllers for all options	657	//Create controllers for all options
658	TQDictIterator<char> it(m_rules->options());	658	TQDictIterator<char> it(m_rules->options());
Lines 681-687 Link Here
681	TQCheckListItem::CheckBoxController, it.currentKey());	682	TQCheckListItem::CheckBoxController, it.currentKey());
682	}	683	}
683	parent->setOpen(true);	684	parent->setOpen(true);
684	m_optionGroups.insert(i18n(it.currentKey().local8Bit()), parent);	685	m_optionGroups.insert(it.currentKey().local8Bit(), parent);
685	}	686	}
686	}	687	}
687		688
Lines 719-725 Link Here
719	{	719	{
720	TQString setxkbmap;	720	TQString setxkbmap;
721	TQString options = createOptionString();	721	TQString options = createOptionString();
722	bool overwrite = widget->radXkbOverwrite->isOn();	722	bool overwrite = true; //widget->radXkbOverwrite->isOn();
723		723
724	if( !options.isEmpty() ) {	724	if( !options.isEmpty() ) {
725	setxkbmap = "setxkbmap -option "; //-rules " + m_rule	725	setxkbmap = "setxkbmap -option "; //-rules " + m_rule
Lines 817-823 Link Here
817	kdDebug() << "resolveConflicts : " << current->optionName() << endl;	818	kdDebug() << "resolveConflicts : " << current->optionName() << endl;
818		819
819	if (current->optionName().startsWith("grp:")) {	820	if (current->optionName().startsWith("grp:")) {
820	OptionListItem *grpItem = m_optionGroups[i18n("grp")];	821	OptionListItem *grpItem = m_optionGroups["grp"];
821	if (grpItem == NULL) {	822	if (grpItem == NULL) {
822	kdWarning() << "LayoutConfig: cannot find grp item group" << endl;	823	kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
823	return;	824	return;
Lines 947-953 Link Here
947	}	948	}
948		949
949	void LayoutConfig::updateHotkeyCombo(bool initial) {	950	void LayoutConfig::updateHotkeyCombo(bool initial) {
950	OptionListItem *grpItem = m_optionGroups[i18n("grp")];	951	OptionListItem *grpItem = m_optionGroups["grp"];
951	if (grpItem == NULL) {	952	if (grpItem == NULL) {
952	kdWarning() << "LayoutConfig: cannot find grp item group" << endl;	953	kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
953	return;	954	return;
Lines 956-962 Link Here
956	TQStringList hotkeys;	956	TQStringList hotkeys;
957		957
958	// Get server options first	958	// Get server options first
959	if (initial \|\| widget->xkbOptsMode->selectedId() == 1)	959	if (initial /\|\| widget->xkbOptsMode->selectedId() == 1/)
960	{	960	{
961	TQStringList opts = TQStringList::split(",", XKBExtension::getServerOptions());	961	TQStringList opts = TQStringList::split(",", XKBExtension::getServerOptions());
962	for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it)	962	for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it)
Lines 1051-1057 Link Here
1051	}	1052	}
1052	}	1053	}
1053		1054
1054	OptionListItem *grpItem = m_optionGroups[i18n("grp")];	1055	OptionListItem *grpItem = m_optionGroups["grp"];
1055	if (grpItem == NULL) {	1056	if (grpItem == NULL) {
1056	kdWarning() << "LayoutConfig: cannot find grp item group" << endl;	1057	kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
1057	return;	1058	return;
Lines 1214-1227 Link Here
1214	KxkbConfig m_kxkbConfig;	1215	KxkbConfig m_kxkbConfig;
1215	m_kxkbConfig.load(KxkbConfig::LOAD_INIT_OPTIONS);	1216	m_kxkbConfig.load(KxkbConfig::LOAD_INIT_OPTIONS);
1216		1217
1217	if( m_kxkbConfig.m_useKxkb == true ) {	1218	if( m_kxkbConfig.m_useKxkb == true )
1218	kapp->startServiceByDesktopName("kxkb");	1219	kapp->startServiceByDesktopName("kxkb");
		1220
		1221	XkbOptions opts = m_kxkbConfig.getKXkbOptions();
		1222	//Only Xkb options processing for compatibility
		1223	if(!m_kxkbConfig.m_useKxkb) {
		1224	opts.layouts = opts.variants = opts.model = "";
		1225	opts.resetOld = false;
1219	}	1226	}
1220	else {	1227	if(!XKBExtension::setXkbOptions(opts))
1221	if (!XKBExtension::setXkbOptions(m_kxkbConfig.getKXkbOptions())) {	1228	kdDebug() << "Setting XKB options failed!" << endl;
1222	kdDebug() << "Setting XKB options failed!" << endl;
1223	}
1224	}
1225	}	1229	}
1226	}	1230	}
1227		1231