Attachment #1561 for bug #1682

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

Lines 20-27 Link Here

(-)original/tdebase/konsole/konsole/konsole.cpp (-20 / +48 lines)
20		20
21	--------------------------------------------------------------	21	--------------------------------------------------------------
22	Additional changes:	22	Additional changes:
23	- 2013/10/14 Michele Calgaro:	23	- 2013/10/14 Michele Calgaro
24	add "scroll tabs on mouse wheel event" functionality	24	add "scroll tabs on mouse wheel event" functionality
		25	- 2013/10/19 Michele Calgaro
		26	add "move session left/right" to tab popup menu
25		27
26	*/	28	*/
27	/* The material contained in here more or less directly orginates from */	29	/* The material contained in here more or less directly orginates from */
Lines 815-835 Link Here
815	m_tabPopupMenu = new TDEPopupMenu( this );	817	m_tabPopupMenu = new TDEPopupMenu( this );
816	TDEAcceleratorManager::manage( m_tabPopupMenu );	818	TDEAcceleratorManager::manage( m_tabPopupMenu );
817		819
818	m_tabDetachSession= new TDEAction( i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTabDetachSession()), TQT_TQOBJECT(this) );	820	if (!m_detachSession)
819	m_tabDetachSession->plug(m_tabPopupMenu);	821	{
		822	m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this),
		823	TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
		824	}
		825	m_detachSession->plug(m_tabPopupMenu);
820		826
821	m_tabPopupMenu->insertItem( i18n("&Rename Session..."), TQT_TQOBJECT(this),	827	m_tabPopupMenu->insertItem( i18n("&Rename Session..."), TQT_TQOBJECT(this),
822	TQT_SLOT(slotTabRenameSession()) );	828	TQT_SLOT(slotTabRenameSession()) );
823	m_tabPopupMenu->insertSeparator();	829	m_tabPopupMenu->insertSeparator();
824		830
825	m_tabMonitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ),	831	m_tabMonitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ),
826	SmallIconSet("activity"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) );	832	SmallIconSet("activity"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) );
827	m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) );	833	m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) );
828	m_tabMonitorActivity->plug(m_tabPopupMenu);	834	m_tabMonitorActivity->plug(m_tabPopupMenu);
829		835
830	m_tabMonitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ),	836	m_tabMonitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ),
831	SmallIconSet("silence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) );	837	SmallIconSet("silence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) );
832	m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) );	838	m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) );
833	m_tabMonitorSilence->plug(m_tabPopupMenu);	839	m_tabMonitorSilence->plug(m_tabPopupMenu);
834		840
835	m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),	841	m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),
Lines 837-842 Link Here
837	m_tabMasterMode->plug(m_tabPopupMenu);	843	m_tabMasterMode->plug(m_tabPopupMenu);
838		844
839	m_tabPopupMenu->insertSeparator();	845	m_tabPopupMenu->insertSeparator();
		846	if (!m_moveSessionLeft)
		847	{
		848	m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",
		849	TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this),
		850	TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
		851	}
		852	m_moveSessionLeft->plug(m_tabPopupMenu);
		853	if (!m_moveSessionRight)
		854	{
		855	m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward",
		856	TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this),
		857	TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
		858	}
		859	m_moveSessionRight->plug(m_tabPopupMenu);
		860
		861	m_tabPopupMenu->insertSeparator();
840	m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), TQT_TQOBJECT(this), TQT_SLOT(slotTabSelectColor()) );	862	m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), TQT_TQOBJECT(this), TQT_SLOT(slotTabSelectColor()) );
841		863
842	m_tabPopupMenu->insertSeparator();	864	m_tabPopupMenu->insertSeparator();
Lines 1098-1105 Link Here
1098	m_clearAllSessionHistories = new TDEAction(i18n("Clear All H&istories"), "history_clear", 0,	1120	m_clearAllSessionHistories = new TDEAction(i18n("Clear All H&istories"), "history_clear", 0,
1099	TQT_TQOBJECT(this), TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories");	1121	TQT_TQOBJECT(this), TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories");
1100		1122
1101	m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this),	1123	if (!m_detachSession)
1102	TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session");	1124	{
		1125	m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this),
		1126	TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
		1127	}
1103	m_detachSession->setEnabled(false);	1128	m_detachSession->setEnabled(false);
1104		1129
1105	m_renameSession = new TDEAction(i18n("&Rename Session..."), Qt::CTRL+Qt::ALT+Qt::Key_S, TQT_TQOBJECT(this),	1130	m_renameSession = new TDEAction(i18n("&Rename Session..."), Qt::CTRL+Qt::ALT+Qt::Key_S, TQT_TQOBJECT(this),
Lines 1152-1163 Link Here
1152	new TDEAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu");	1177	new TDEAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu");
1153	new TDEAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions");	1178	new TDEAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions");
1154		1179
1155	m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",	1180	if (!m_moveSessionLeft)
1156	TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this),	1181	{
1157	TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");	1182	m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",
1158	m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward",	1183	TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, TQT_TQOBJECT(this),
1159	TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this),	1184	TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
1160	TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");	1185	}
		1186	if (!m_moveSessionRight)
		1187	{
		1188	m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward",
		1189	TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, TQT_TQOBJECT(this),
		1190	TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
		1191	}
1161		1192
1162	new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left,	1193	new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left,
1163	TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session");	1194	TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session");
Lines 1317-1329 Link Here
1317		1348
1318	void Konsole::slotTabContextMenu(TQWidget* _te, const TQPoint & pos)	1349	void Konsole::slotTabContextMenu(TQWidget* _te, const TQPoint & pos)
1319	{	1350	{
1320	if (!m_menuCreated)	1351	if (!m_menuCreated)
1321	makeGUI();	1352	makeGUI();
1322		1353
1323	m_contextMenuSession = sessions.at( tabwidget->indexOf( _te ) );	1354	m_contextMenuSession = sessions.at( tabwidget->indexOf( _te ) );
1324
1325	m_tabDetachSession->setEnabled( tabwidget->count()>1 );
1326
1327	m_tabMonitorActivity->setChecked( m_contextMenuSession->isMonitorActivity() );	1355	m_tabMonitorActivity->setChecked( m_contextMenuSession->isMonitorActivity() );
1328	m_tabMonitorSilence->setChecked( m_contextMenuSession->isMonitorSilence() );	1356	m_tabMonitorSilence->setChecked( m_contextMenuSession->isMonitorSilence() );
1329	m_tabMasterMode->setChecked( m_contextMenuSession->isMasterMode() );	1357	m_tabMasterMode->setChecked( m_contextMenuSession->isMasterMode() );
Lines 1334-1340 Link Here
1334	TQString title=ses->Title();	1362	TQString title=ses->Title();
1335	m_tabPopupTabsMenu->insertItem(SmallIcon(ses->IconName()),title.replace('&',"&&"),counter++);	1363	m_tabPopupTabsMenu->insertItem(SmallIcon(ses->IconName()),title.replace('&',"&&"),counter++);
1336	}	1364	}
1337		1365
1338	m_tabPopupMenu->popup( pos );	1366	m_tabPopupMenu->popup( pos );
1339	}	1367	}
1340		1368

Lines 20-27 Link Here

(-)original/tdebase/konsole/konsole/konsole.h (-2 / +3 lines)
20		20
21	--------------------------------------------------------------	21	--------------------------------------------------------------
22	Additional changes:	22	Additional changes:
23	- 2013/10/14 Michele Calgaro:	23	- 2013/10/14 Michele Calgaro
24	add "scroll tabs on mouse wheel event" functionality	24	add "scroll tabs on mouse wheel event" functionality
		25	- 2013/10/19 Michele Calgaro
		26	add "move session left/right" to tab popup menu
25		27
26	*/	28	*/
27	/* The material contained in here more or less directly orginates from */	29	/* The material contained in here more or less directly orginates from */
Lines 371-377 Link Here
371	TDEAction *m_closeSession;	373	TDEAction *m_closeSession;
372	TDEAction *m_print;	374	TDEAction *m_print;
373	TDEAction *m_quit;	375	TDEAction *m_quit;
374	TDEAction *m_tabDetachSession;
375	TDEPopupMenu *m_openSelection;	376	TDEPopupMenu *m_openSelection;
376		377
377	TDEActionCollection *m_shortcuts;	378	TDEActionCollection *m_shortcuts;

Return to bug 1682