Attachment #1639 for bug #1701

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 1701
Collapse All | Expand All




,kWinModule(0)
,menubar(0)
,statusbar(0)
,m_session_string(i18n("&Session"))
,m_edit_string(i18n("&Edit"))
,m_view_string(i18n("&View"))
,m_bookmarks_string(i18n("&Bookmarks"))
,m_options_string(i18n("Se&ttings"))
,m_help_string(i18n("&Help"))
,m_session_id(-1)
,m_edit_id(-1)
,m_view_id(-1)
,m_bookmarks_id(-1)
,m_options_id(-1)
,m_help_id(-1)
,m_session(0)
,m_edit(0)
,m_view(0)

  readProperties(config, schema, false);

  makeBasicGUI();
  setMenuAcceleratos();

  if (isRestored) {
    n_tabbar = wanted_tabbar;

  if (m_bookmarksSession)
     connect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));

  m_session_id=menubar->insertItem(m_session_string , m_session);
  m_edit_id=menubar->insertItem(m_edit_string, m_edit);
  m_view_id=menubar->insertItem(m_view_string, m_view);
  if (m_bookmarks)
     m_bookmarks_id=menubar->insertItem(m_bookmarks_string, m_bookmarks);
  if (m_options)
     m_options_id=menubar->insertItem(m_options_string, m_options);
  if (m_help)
     m_help_id=menubar->insertItem(m_help_string, m_help);

  m_shortcuts = new TDEActionCollection(this);


  masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),
                                   TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" );

  showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this),
                                    TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" );
  showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) );


     b_xonXoff = config->readBoolEntry("XonXoff",false);
     b_matchTabWinTitle = config->readBoolEntry("MatchTabWinTitle",false);
     b_mouseWheelScroll = config->readBoolEntry("TabsCycleWheel",true);
     b_menuAccelerators = config->readBoolEntry("MenuAccelerators",false);
     config->setGroup("UTMP");
     b_addToUtmp = config->readBoolEntry("AddToUtmp",true);
     config->setDesktopGroup();

  }

  tabwidget->setMouseWheelScroll(b_mouseWheelScroll);
  setMenuAcceleratos();
}

// Called via emulation via session

   return ret;
}

void Konsole::setMenuAcceleratos()
{
  if (b_menuAccelerators)
  {
    menubar->changeItem(m_session_id, m_session_string);
    menubar->changeItem(m_edit_id, m_edit_string);
    menubar->changeItem(m_view_id, m_view_string);
    if (m_bookmarks)
      menubar->changeItem(m_bookmarks_id, m_bookmarks_string);
    if (m_options)
      menubar->changeItem(m_options_id, m_options_string);
    if (m_help)
      menubar->changeItem(m_help_id, m_help_string);
  }
  else  
  {
    menubar->changeItem(m_session_id, TQString(m_session_string).replace(TQRegExp("&([^&])"), "\\1"));
    menubar->changeItem(m_edit_id, TQString(m_edit_string).replace(TQRegExp("&([^&])"), "\\1"));
    menubar->changeItem(m_view_id, TQString(m_view_string).replace(TQRegExp("&([^&])"), "\\1"));
    if (m_bookmarks)
      menubar->changeItem(m_bookmarks_id, TQString(m_bookmarks_string).replace(TQRegExp("&([^&])"), "\\1"));
    if (m_options)
      menubar->changeItem(m_options_id, TQString(m_options_string).replace(TQRegExp("&([^&])"), "\\1"));
    if (m_help)
      menubar->changeItem(m_help_id, TQString(m_help_string).replace(TQRegExp("&([^&])"), "\\1"));
  }
}
  
#include "konsole.moc"

Lines 297-302 Link Here

(-)ori/tdebase/konsole/konsole/konsole.h (-1 / +20 lines)
297		297
298	bool eventFilter( TQObject o, TQEvent e );	298	bool eventFilter( TQObject o, TQEvent e );
299		299
		300	void setMenuAcceleratos();
		301
300	TQPtrList<TEWidget> activeTEs();	302	TQPtrList<TEWidget> activeTEs();
301		303
302	TQPtrDict<TESession> action2session;	304	TQPtrDict<TESession> action2session;
Lines 322-327 Link Here
322	KMenuBar* menubar;	324	KMenuBar* menubar;
323	KStatusBar* statusbar;	325	KStatusBar* statusbar;
324		326
		327	// Text strings for main menu entries
		328	TQString m_session_string;
		329	TQString m_edit_string;
		330	TQString m_view_string;
		331	TQString m_bookmarks_string;
		332	TQString m_options_string;
		333	TQString m_help_string;
		334
		335	// Main menu entry ids
		336	int m_session_id;
		337	int m_edit_id;
		338	int m_view_id;
		339	int m_bookmarks_id;
		340	int m_options_id;
		341	int m_help_id;
		342
325	TDEPopupMenu* m_session;	343	TDEPopupMenu* m_session;
326	TDEPopupMenu* m_edit;	344	TDEPopupMenu* m_edit;
327	TDEPopupMenu* m_view;	345	TDEPopupMenu* m_view;
Lines 338-343 Link Here
338	TDEPopupMenu* m_tabPopupMenu;	356	TDEPopupMenu* m_tabPopupMenu;
339	TDEPopupMenu* m_tabPopupTabsMenu;	357	TDEPopupMenu* m_tabPopupTabsMenu;
340	TDEPopupMenu* m_tabbarPopupMenu;	358	TDEPopupMenu* m_tabbarPopupMenu;
		359	TDEPopupMenu* m_openSelection;
341		360
342	TDEAction *m_zmodemUpload;	361	TDEAction *m_zmodemUpload;
343	TDEToggleAction monitorActivity, m_tabMonitorActivity;	362	TDEToggleAction monitorActivity, m_tabMonitorActivity;
Lines 373-379 Link Here
373	TDEAction *m_closeSession;	392	TDEAction *m_closeSession;
374	TDEAction *m_print;	393	TDEAction *m_print;
375	TDEAction *m_quit;	394	TDEAction *m_quit;
376	TDEPopupMenu *m_openSelection;
377		395
378	TDEActionCollection *m_shortcuts;	396	TDEActionCollection *m_shortcuts;
379		397
Lines 434-439 Link Here
434	bool b_sessionShortcutsMapped:1;	452	bool b_sessionShortcutsMapped:1;
435	bool b_matchTabWinTitle:1;	453	bool b_matchTabWinTitle:1;
436	bool b_mouseWheelScroll:1;	454	bool b_mouseWheelScroll:1;
		455	bool b_menuAccelerators:1;
437		456
438	unsigned int m_histSize;	457	unsigned int m_histSize;
439	int m_separator_id;	458	int m_separator_id;




    connect(dialog->line_spacingSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
    connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
    connect(dialog->tabsCycleWheel,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
    connect(dialog->menuAccelerators,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
    connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
    connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() ));
    connect(dialog->SchemaEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() ));

    dialog->bidiCB->setChecked(bidiOrig);
    dialog->matchTabWinTitleCB->setChecked(config.readBoolEntry("MatchTabWinTitle",false));
    dialog->tabsCycleWheel->setChecked(config.readBoolEntry("TabsCycleWheel",true));
    dialog->menuAccelerators->setChecked(config.readBoolEntry("MenuAccelerators",false));
    dialog->warnCB->setChecked(config.readBoolEntry("WarnQuit",true));
    dialog->ctrldragCB->setChecked(config.readBoolEntry("CtrlDrag",true));
    dialog->cutToBeginningOfLineCB->setChecked(config.readBoolEntry("CutToBeginningOfLine",false));

    config.writeEntry("EnableBidi", bidiNew);
    config.writeEntry("MatchTabWinTitle", dialog->matchTabWinTitleCB->isChecked());
    config.writeEntry("TabsCycleWheel", dialog->tabsCycleWheel->isChecked());
    config.writeEntry("MenuAccelerators", dialog->menuAccelerators->isChecked());
    config.writeEntry("WarnQuit", dialog->warnCB->isChecked());
    config.writeEntry("CtrlDrag", dialog->ctrldragCB->isChecked());
    config.writeEntry("CutToBeginningOfLine", dialog->cutToBeginningOfLineCB->isChecked());

Lines 178-184 Link Here

(-)ori/tdebase/kcontrol/konsole/kcmkonsoledialog.ui (-5 / +13 lines)
178	<string>Cycle tabs with mouse wheel</string>	178	<string>Cycle tabs with mouse wheel</string>
179	</property>	179	</property>
180	</widget>	180	</widget>
181	<widget class="KIntNumInput" row="11" column="2">	181	<widget class="TQCheckBox" row="11" column="0" rowspan="1" colspan="3">
		182	<property name="name">
		183	<cstring>menuAccelerators</cstring>
		184	</property>
		185	<property name="text">
		186	<string>Enable main menu accelerator keys</string>
		187	</property>
		188	</widget>
		189	<widget class="KIntNumInput" row="12" column="2">
182	<property name="name">	190	<property name="name">
183	<cstring>line_spacingSB</cstring>	191	<cstring>line_spacingSB</cstring>
184	</property>	192	</property>
Lines 197-203 Link Here
197	<number>8</number>	205	<number>8</number>
198	</property>	206	</property>
199	</widget>	207	</widget>
200	<widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2">	208	<widget class="TQLabel" row="12" column="0" rowspan="1" colspan="2">
201	<property name="name">	209	<property name="name">
202	<cstring>TextLabel1_4</cstring>	210	<cstring>TextLabel1_4</cstring>
203	</property>	211	</property>
Lines 216-222 Link Here
216	<cstring>line_spacingSB</cstring>	224	<cstring>line_spacingSB</cstring>
217	</property>	225	</property>
218	</widget>	226	</widget>
219	<spacer row="11" column="3">	227	<spacer row="12" column="3">
220	<property name="name">	228	<property name="name">
221	<cstring>Spacer2</cstring>	229	<cstring>Spacer2</cstring>
222	</property>	230	</property>
Lines 233-239 Link Here
233	</size>	241	</size>
234	</property>	242	</property>
235	</spacer>	243	</spacer>
236	<widget class="TQLabel" row="12" column="0">	244	<widget class="TQLabel" row="13" column="0">
237	<property name="name">	245	<property name="name">
238	<cstring>SilenceLabel</cstring>	246	<cstring>SilenceLabel</cstring>
239	</property>	247	</property>
Lines 252-258 Link Here
252	<cstring>silence_secondsSB</cstring>	260	<cstring>silence_secondsSB</cstring>
253	</property>	261	</property>
254	</widget>	262	</widget>
255	<widget class="KIntNumInput" row="12" column="1" rowspan="1" colspan="2">	263	<widget class="KIntNumInput" row="13" column="1" rowspan="1" colspan="2">
256	<property name="name">	264	<property name="name">
257	<cstring>silence_secondsSB</cstring>	265	<cstring>silence_secondsSB</cstring>
258	</property>	266	</property>

Return to bug 1701

Lines 212-217 Link Here

(-)ori/tdebase/konsole/konsole/konsole.cpp (-7 / +50 lines)
212	,kWinModule(0)	212	,kWinModule(0)
213	,menubar(0)	213	,menubar(0)
214	,statusbar(0)	214	,statusbar(0)
		215	,m_session_string(i18n("&Session"))
		216	,m_edit_string(i18n("&Edit"))
		217	,m_view_string(i18n("&View"))
		218	,m_bookmarks_string(i18n("&Bookmarks"))
		219	,m_options_string(i18n("Se&ttings"))
		220	,m_help_string(i18n("&Help"))
		221	,m_session_id(-1)
		222	,m_edit_id(-1)
		223	,m_view_id(-1)
		224	,m_bookmarks_id(-1)
		225	,m_options_id(-1)
		226	,m_help_id(-1)
215	,m_session(0)	227	,m_session(0)
216	,m_edit(0)	228	,m_edit(0)
217	,m_view(0)	229	,m_view(0)
Lines 321-326 Link Here
321	readProperties(config, schema, false);	333	readProperties(config, schema, false);
322		334
323	makeBasicGUI();	335	makeBasicGUI();
		336	setMenuAcceleratos();
324		337
325	if (isRestored) {	338	if (isRestored) {
326	n_tabbar = wanted_tabbar;	339	n_tabbar = wanted_tabbar;
Lines 1074-1088 Link Here
1074	if (m_bookmarksSession)	1087	if (m_bookmarksSession)
1075	connect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));	1088	connect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI()));
1076		1089
1077	menubar->insertItem(i18n("Session") , m_session);	1090	m_session_id=menubar->insertItem(m_session_string , m_session);
1078	menubar->insertItem(i18n("Edit"), m_edit);	1091	m_edit_id=menubar->insertItem(m_edit_string, m_edit);
1079	menubar->insertItem(i18n("View"), m_view);	1092	m_view_id=menubar->insertItem(m_view_string, m_view);
1080	if (m_bookmarks)	1093	if (m_bookmarks)
1081	menubar->insertItem(i18n("Bookmarks"), m_bookmarks);	1094	m_bookmarks_id=menubar->insertItem(m_bookmarks_string, m_bookmarks);
1082	if (m_options)	1095	if (m_options)
1083	menubar->insertItem(i18n("Settings"), m_options);	1096	m_options_id=menubar->insertItem(m_options_string, m_options);
1084	if (m_help)	1097	if (m_help)
1085	menubar->insertItem(i18n("Help"), m_help);	1098	m_help_id=menubar->insertItem(m_help_string, m_help);
1086		1099
1087	m_shortcuts = new TDEActionCollection(this);	1100	m_shortcuts = new TDEActionCollection(this);
1088		1101
Lines 1149-1155 Link Here
1149	masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),	1162	masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),
1150	TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" );	1163	TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" );
1151		1164
1152	showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", 0, TQT_TQOBJECT(this),	1165	showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this),
1153	TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" );	1166	TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" );
1154	showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) );	1167	showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) );
1155		1168
Lines 1628-1633 Link Here
1628	b_xonXoff = config->readBoolEntry("XonXoff",false);	1641	b_xonXoff = config->readBoolEntry("XonXoff",false);
1629	b_matchTabWinTitle = config->readBoolEntry("MatchTabWinTitle",false);	1642	b_matchTabWinTitle = config->readBoolEntry("MatchTabWinTitle",false);
1630	b_mouseWheelScroll = config->readBoolEntry("TabsCycleWheel",true);	1643	b_mouseWheelScroll = config->readBoolEntry("TabsCycleWheel",true);
		1644	b_menuAccelerators = config->readBoolEntry("MenuAccelerators",false);
1631	config->setGroup("UTMP");	1645	config->setGroup("UTMP");
1632	b_addToUtmp = config->readBoolEntry("AddToUtmp",true);	1646	b_addToUtmp = config->readBoolEntry("AddToUtmp",true);
1633	config->setDesktopGroup();	1647	config->setDesktopGroup();
Lines 2183-2188 Link Here
2183	}	2197	}
2184		2198
2185	tabwidget->setMouseWheelScroll(b_mouseWheelScroll);	2199	tabwidget->setMouseWheelScroll(b_mouseWheelScroll);
		2200	setMenuAcceleratos();
2186	}	2201	}
2187		2202
2188	// Called via emulation via session	2203	// Called via emulation via session
Lines 4427-4430 Link Here
4427	return ret;	4442	return ret;
4428	}	4443	}
4429		4444
		4445	void Konsole::setMenuAcceleratos()
		4446	{
		4447	if (b_menuAccelerators)
		4448	{
		4449	menubar->changeItem(m_session_id, m_session_string);
		4450	menubar->changeItem(m_edit_id, m_edit_string);
		4451	menubar->changeItem(m_view_id, m_view_string);
		4452	if (m_bookmarks)
		4453	menubar->changeItem(m_bookmarks_id, m_bookmarks_string);
		4454	if (m_options)
		4455	menubar->changeItem(m_options_id, m_options_string);
		4456	if (m_help)
		4457	menubar->changeItem(m_help_id, m_help_string);
		4458	}
		4459	else
		4460	{
		4461	menubar->changeItem(m_session_id, TQString(m_session_string).replace(TQRegExp("&([^&])"), "\\1"));
		4462	menubar->changeItem(m_edit_id, TQString(m_edit_string).replace(TQRegExp("&([^&])"), "\\1"));
		4463	menubar->changeItem(m_view_id, TQString(m_view_string).replace(TQRegExp("&([^&])"), "\\1"));
		4464	if (m_bookmarks)
		4465	menubar->changeItem(m_bookmarks_id, TQString(m_bookmarks_string).replace(TQRegExp("&([^&])"), "\\1"));
		4466	if (m_options)
		4467	menubar->changeItem(m_options_id, TQString(m_options_string).replace(TQRegExp("&([^&])"), "\\1"));
		4468	if (m_help)
		4469	menubar->changeItem(m_help_id, TQString(m_help_string).replace(TQRegExp("&([^&])"), "\\1"));
		4470	}
		4471	}
		4472
4430	#include "konsole.moc"	4473	#include "konsole.moc"

Lines 72-77 Link Here

(-)ori/tdebase/kcontrol/konsole/kcmkonsole.cpp (+3 lines)
72	connect(dialog->line_spacingSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));	72	connect(dialog->line_spacingSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
73	connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));	73	connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
74	connect(dialog->tabsCycleWheel,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));	74	connect(dialog->tabsCycleWheel,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
		75	connect(dialog->menuAccelerators,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
75	connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));	76	connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
76	connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() ));	77	connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() ));
77	connect(dialog->SchemaEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() ));	78	connect(dialog->SchemaEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() ));
Lines 97-102 Link Here
97	dialog->bidiCB->setChecked(bidiOrig);	98	dialog->bidiCB->setChecked(bidiOrig);
98	dialog->matchTabWinTitleCB->setChecked(config.readBoolEntry("MatchTabWinTitle",false));	99	dialog->matchTabWinTitleCB->setChecked(config.readBoolEntry("MatchTabWinTitle",false));
99	dialog->tabsCycleWheel->setChecked(config.readBoolEntry("TabsCycleWheel",true));	100	dialog->tabsCycleWheel->setChecked(config.readBoolEntry("TabsCycleWheel",true));
		101	dialog->menuAccelerators->setChecked(config.readBoolEntry("MenuAccelerators",false));
100	dialog->warnCB->setChecked(config.readBoolEntry("WarnQuit",true));	102	dialog->warnCB->setChecked(config.readBoolEntry("WarnQuit",true));
101	dialog->ctrldragCB->setChecked(config.readBoolEntry("CtrlDrag",true));	103	dialog->ctrldragCB->setChecked(config.readBoolEntry("CtrlDrag",true));
102	dialog->cutToBeginningOfLineCB->setChecked(config.readBoolEntry("CutToBeginningOfLine",false));	104	dialog->cutToBeginningOfLineCB->setChecked(config.readBoolEntry("CutToBeginningOfLine",false));
Lines 136-141 Link Here
136	config.writeEntry("EnableBidi", bidiNew);	138	config.writeEntry("EnableBidi", bidiNew);
137	config.writeEntry("MatchTabWinTitle", dialog->matchTabWinTitleCB->isChecked());	139	config.writeEntry("MatchTabWinTitle", dialog->matchTabWinTitleCB->isChecked());
138	config.writeEntry("TabsCycleWheel", dialog->tabsCycleWheel->isChecked());	140	config.writeEntry("TabsCycleWheel", dialog->tabsCycleWheel->isChecked());
		141	config.writeEntry("MenuAccelerators", dialog->menuAccelerators->isChecked());
139	config.writeEntry("WarnQuit", dialog->warnCB->isChecked());	142	config.writeEntry("WarnQuit", dialog->warnCB->isChecked());
140	config.writeEntry("CtrlDrag", dialog->ctrldragCB->isChecked());	143	config.writeEntry("CtrlDrag", dialog->ctrldragCB->isChecked());
141	config.writeEntry("CutToBeginningOfLine", dialog->cutToBeginningOfLineCB->isChecked());	144	config.writeEntry("CutToBeginningOfLine", dialog->cutToBeginningOfLineCB->isChecked());