Attachment #618 for bug #869

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

Lines 273-278 Link Here

(-)useractions.cpp (+2 lines)
273	cutWalkThroughDesktopListReverse = keys->shortcut("Walk Through Desktop List (Reverse)");	273	cutWalkThroughDesktopListReverse = keys->shortcut("Walk Through Desktop List (Reverse)");
274	cutWalkThroughWindows = keys->shortcut("Walk Through Windows");	274	cutWalkThroughWindows = keys->shortcut("Walk Through Windows");
275	cutWalkThroughWindowsReverse = keys->shortcut("Walk Through Windows (Reverse)");	275	cutWalkThroughWindowsReverse = keys->shortcut("Walk Through Windows (Reverse)");
		276	cutWalkThroughApps = keys->shortcut("Walk Through Windows of Same Application");
		277	cutWalkThroughAppsReverse = keys->shortcut("Walk Through Windows of Same Application (Reverse)");
276		278
277	keys->updateConnections();	279	keys->updateConnections();
278	disable_shortcuts_keys->updateConnections();	280	disable_shortcuts_keys->updateConnections();

Lines 339-344 Link Here

(-)workspace.h (+4 lines)
339		339
340	void slotWalkThroughDesktops();	340	void slotWalkThroughDesktops();
341	void slotWalkBackThroughDesktops();	341	void slotWalkBackThroughDesktops();
		342	void slotWalkThroughApps();
		343	void slotWalkBackThroughApps();
		344
342	void slotWalkThroughDesktopList();	345	void slotWalkThroughDesktopList();
343	void slotWalkBackThroughDesktopList();	346	void slotWalkBackThroughDesktopList();
344	void slotWalkThroughWindows();	347	void slotWalkThroughWindows();
Lines 559-564 Link Here
559	KShortcut cutWalkThroughDesktops, cutWalkThroughDesktopsReverse;	562	KShortcut cutWalkThroughDesktops, cutWalkThroughDesktopsReverse;
560	KShortcut cutWalkThroughDesktopList, cutWalkThroughDesktopListReverse;	563	KShortcut cutWalkThroughDesktopList, cutWalkThroughDesktopListReverse;
561	KShortcut cutWalkThroughWindows, cutWalkThroughWindowsReverse;	564	KShortcut cutWalkThroughWindows, cutWalkThroughWindowsReverse;
		565	KShortcut cutWalkThroughApps, cutWalkThroughAppsReverse;
562	bool mouse_emulation;	566	bool mouse_emulation;
563	unsigned int mouse_emulation_state;	567	unsigned int mouse_emulation_state;
564	WId mouse_emulation_window;	568	WId mouse_emulation_window;

Lines 47-52 Link Here

(-)tabbox.cpp (-3 / +47 lines)
47	setLineWidth(2);	47	setLineWidth(2);
48	setMargin(2);	48	setMargin(2);
49		49
		50	appsOnly = false;
50	showMiniIcon = false;	51	showMiniIcon = false;
51		52
52	no_tasks = i18n("* No Windows *");	53	no_tasks = i18n("* No Windows *");
Lines 86-103 Link Here
86	m = mode;	87	m = mode;
87	}	88	}
88		89
		90	/*!
		91	Sets AppsOnly, which when true, createClientList will return only applications within the same class
89		92
		93	*/
		94	void TabBox::setAppsOnly( bool a )
		95	{
		96	appsOnly = a;
		97	}
		98
90	/*!	99	/*!
91	Create list of clients on specified desktop, starting with client c	100	Create list of clients on specified desktop, starting with client c
92	*/	101	*/
93	void TabBox::createClientList(ClientList &list, int desktop /-1 = all/, Client *c, bool chain)	102	void TabBox::createClientList(ClientList &list, int desktop /-1 = all/, Client *c, bool chain)
94	{	103	{
95	ClientList::size_type idx = 0;	104	ClientList::size_type idx = 0;
96		105	TQString startClass;
97	list.clear();	106	list.clear();
98		107
99	Client* start = c;	108	Client* start = c;
100		109
		110	if( start )
		111	startClass = start->resourceClass();
		112
101	if ( chain )	113	if ( chain )
102	c = workspace()->nextFocusChainClient(c);	114	c = workspace()->nextFocusChainClient(c);
103	else	115	else
Lines 121-126 Link Here
121	// nothing	133	// nothing
122	}	134	}
123	}	135	}
		136	if(appsOnly && (TQString::compare( startClass, c->resourceClass()) != 0))
		137	{
		138	add = NULL;
		139	}
124		140
125	if( options->separateScreenFocus && options->xineramaEnabled )	141	if( options->separateScreenFocus && options->xineramaEnabled )
126	{	142	{
Lines 645-650 Link Here
645	XEvent otherEvent;	661	XEvent otherEvent;
646	while (XCheckTypedEvent (qt_xdisplay(), EnterNotify, &otherEvent ) )	662	while (XCheckTypedEvent (qt_xdisplay(), EnterNotify, &otherEvent ) )
647	;	663	;
		664	appsOnly = false;
648	}	665	}
649		666
650		667
Lines 893-898 Link Here
893	}	910	}
894	}	911	}
895		912
		913	void Workspace::slotWalkThroughApps()
		914	{
		915	tab_box->setAppsOnly(true);
		916	slotWalkThroughWindows();
		917	}
		918
		919	void Workspace::slotWalkBackThroughApps()
		920	{
		921	tab_box->setAppsOnly(true);
		922	slotWalkBackThroughWindows();
		923	}
		924
896	void Workspace::slotWalkThroughDesktops()	925	void Workspace::slotWalkThroughDesktops()
897	{	926	{
898	if ( root != qt_xrootwin() )	927	if ( root != qt_xrootwin() )
Lines 1112-1129 Link Here
1112	{	1141	{
1113	bool forward = false;	1142	bool forward = false;
1114	bool backward = false;	1143	bool backward = false;
		1144	bool forwardapps = false;
		1145	bool backwardapps = false;
1115		1146
1116	if (tab_grab)	1147	if (tab_grab)
1117	{	1148	{
1118	forward = cutWalkThroughWindows.contains( keyX );	1149	forward = cutWalkThroughWindows.contains( keyX );
1119	backward = cutWalkThroughWindowsReverse.contains( keyX );	1150	backward = cutWalkThroughWindowsReverse.contains( keyX );
1120	if (forward \|\| backward)	1151
		1152	forwardapps = cutWalkThroughApps.contains( keyX );
		1153	backwardapps = cutWalkThroughAppsReverse.contains( keyX );
		1154
		1155	if ( (forward \|\| backward) && (!tab_box->isAppsOnly()) )
1121	{	1156	{
1122	kdDebug(125) << "== " << cutWalkThroughWindows.toStringInternal()	1157	kdDebug(125) << "== " << cutWalkThroughWindows.toStringInternal()
1123	<< " or " << cutWalkThroughWindowsReverse.toStringInternal() << endl;	1158	<< " or " << cutWalkThroughWindowsReverse.toStringInternal() << endl;
		1159
1124	KDEWalkThroughWindows( forward );	1160	KDEWalkThroughWindows( forward );
1125	}	1161	}
1126	}	1162
		1163	if ( (forwardapps \|\| backwardapps) && (tab_box->isAppsOnly()) )
		1164	{
		1165	kdDebug(125) << "== " << cutWalkThroughWindows.toStringInternal()
		1166	<< " or " << cutWalkThroughWindowsReverse.toStringInternal() << endl;
		1167	KDEWalkThroughWindows( forwardapps );
		1168	}
		1169	}
		1170
1127	else if (control_grab)	1171	else if (control_grab)
1128	{	1172	{
1129	forward = cutWalkThroughDesktops.contains( keyX ) \|\|	1173	forward = cutWalkThroughDesktops.contains( keyX ) \|\|




        Client* currentClient();
        void setCurrentClient( Client* c );
        int currentDesktop();
        
    // DesktopMode and WindowsMode are based on the order in which the desktop
    //  or window were viewed.
    // DesktopListMode lists them in the order created.
        enum Mode { DesktopMode, DesktopListMode, WindowsMode };
        void setMode( Mode mode );
        void setAppsOnly( bool a );
        Mode mode() const;
        bool isAppsOnly() const;

        void reset();
        void nextPrev( bool next = TRUE);

        int desk;
        int lineHeight;
        bool showMiniIcon;
        bool appsOnly;
        TQTimer delayedShowTimer;
        TQString no_tasks;
        bool options_traverse_all;

    return m;
    }

/*! 
  Returns the appsOnly variable

  \sa setAppsOnly()
  */
inline bool TabBox::isAppsOnly() const
    {
    return appsOnly;
    }


} // namespace

#endif

Lines 20-25 Link Here

(-)kwinbindings.cpp (+2 lines)
20	keys->insert( "Group:Navigation", i18n("Navigation") );	20	keys->insert( "Group:Navigation", i18n("Navigation") );
21	DEF( I18N_NOOP("Walk Through Windows"), ALT+Qt::Key_Tab, ALT+Qt::Key_Tab, slotWalkThroughWindows() );	21	DEF( I18N_NOOP("Walk Through Windows"), ALT+Qt::Key_Tab, ALT+Qt::Key_Tab, slotWalkThroughWindows() );
22	DEF( I18N_NOOP("Walk Through Windows (Reverse)"), ALT+SHIFT+Qt::Key_Tab, ALT+SHIFT+Qt::Key_Tab, slotWalkBackThroughWindows() );	22	DEF( I18N_NOOP("Walk Through Windows (Reverse)"), ALT+SHIFT+Qt::Key_Tab, ALT+SHIFT+Qt::Key_Tab, slotWalkBackThroughWindows() );
		23	DEF( I18N_NOOP("Walk Through Windows of Same Application"), ALT+Qt::Key_QuoteLeft, ALT+Qt::Key_QuoteLeft, slotWalkThroughApps() );
		24	DEF( I18N_NOOP("Walk Through Windows of Same Application (Reverse)"), ALT+Qt::Key_AsciiTilde, ALT+Qt::Key_AsciiTilde, slotWalkBackThroughApps() );
23	DEF( I18N_NOOP("Walk Through Desktops"), 0, WIN+Qt::Key_Tab, slotWalkThroughDesktops() );	25	DEF( I18N_NOOP("Walk Through Desktops"), 0, WIN+Qt::Key_Tab, slotWalkThroughDesktops() );
24	DEF( I18N_NOOP("Walk Through Desktops (Reverse)"), 0, WIN+SHIFT+Qt::Key_Tab, slotWalkBackThroughDesktops() );	26	DEF( I18N_NOOP("Walk Through Desktops (Reverse)"), 0, WIN+SHIFT+Qt::Key_Tab, slotWalkBackThroughDesktops() );
25	DEF( I18N_NOOP("Walk Through Desktop List"), 0, 0, slotWalkThroughDesktopList() );	27	DEF( I18N_NOOP("Walk Through Desktop List"), 0, 0, slotWalkThroughDesktopList() );

Return to bug 869

Lines 35-47 Link Here

(-)tabbox.h (-1 / +15 lines)
35	Client* currentClient();	35	Client* currentClient();
36	void setCurrentClient( Client* c );	36	void setCurrentClient( Client* c );
37	int currentDesktop();	37	int currentDesktop();
38		38
39	// DesktopMode and WindowsMode are based on the order in which the desktop	39	// DesktopMode and WindowsMode are based on the order in which the desktop
40	// or window were viewed.	40	// or window were viewed.
41	// DesktopListMode lists them in the order created.	41	// DesktopListMode lists them in the order created.
42	enum Mode { DesktopMode, DesktopListMode, WindowsMode };	42	enum Mode { DesktopMode, DesktopListMode, WindowsMode };
43	void setMode( Mode mode );	43	void setMode( Mode mode );
		44	void setAppsOnly( bool a );
44	Mode mode() const;	45	Mode mode() const;
		46	bool isAppsOnly() const;
45		47
46	void reset();	48	void reset();
47	void nextPrev( bool next = TRUE);	49	void nextPrev( bool next = TRUE);
Lines 72-77 Link Here
72	int desk;	74	int desk;
73	int lineHeight;	75	int lineHeight;
74	bool showMiniIcon;	76	bool showMiniIcon;
		77	bool appsOnly;
75	TQTimer delayedShowTimer;	78	TQTimer delayedShowTimer;
76	TQString no_tasks;	79	TQString no_tasks;
77	bool options_traverse_all;	80	bool options_traverse_all;
Lines 97-102 Link Here
97	return m;	100	return m;
98	}	101	}
99		102
		103	/*!
		104	Returns the appsOnly variable
		105
		106	\sa setAppsOnly()
		107	*/
		108	inline bool TabBox::isAppsOnly() const
		109	{
		110	return appsOnly;
		111	}
		112
		113
100	} // namespace	114	} // namespace
101		115
102	#endif	116	#endif