Attachment #513 for bug #908

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

Lines 442-447 Link Here

(-)pagerapplet.cpp (-3 / +11 lines)
442	{	442	{
443	int newDesk;	443	int newDesk;
444	int desktops = KWin::numberOfDesktops();	444	int desktops = KWin::numberOfDesktops();
		445
		446
		447	if(cycleWindow()){
		448
445	if (m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height() > 1 )	449	if (m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height() > 1 )
446	desktops = m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height();	450	desktops = m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height();
447	if (e->delta() < 0)	451	if (e->delta() < 0)
Lines 452-459 Link Here
452	{	456	{
453	newDesk = (desktops + m_curDesk - 2) % desktops + 1;	457	newDesk = (desktops + m_curDesk - 2) % desktops + 1;
454	}	458	}
455		459
456	slotButtonSelected(newDesk);	460	slotButtonSelected(newDesk);
		461	}
457	}	462	}
458		463
459	void KMiniPager::drawButtons()	464	void KMiniPager::drawButtons()
Lines 729-734 Link Here
729		734
730	showMenu->insertItem(i18n("&Window Thumbnails"), WindowThumbnails);	735	showMenu->insertItem(i18n("&Window Thumbnails"), WindowThumbnails);
731	showMenu->insertItem(i18n("&Window Icons"), WindowIcons);	736	showMenu->insertItem(i18n("&Window Icons"), WindowIcons);
		737	showMenu->insertItem(i18n("&Cycle on Wheel"), Cycle);
732		738
733	showMenu->insertTitle(i18n("Text Label"));	739	showMenu->insertTitle(i18n("Text Label"));
734	showMenu->insertItem(i18n("Desktop N&umber"),	740	showMenu->insertItem(i18n("Desktop N&umber"),
Lines 760-765 Link Here
760		766
761	m_contextMenu->setItemChecked(WindowThumbnails, m_settings->preview());	767	m_contextMenu->setItemChecked(WindowThumbnails, m_settings->preview());
762	m_contextMenu->setItemChecked(WindowIcons, m_settings->icons());	768	m_contextMenu->setItemChecked(WindowIcons, m_settings->icons());
		769	m_contextMenu->setItemChecked(Cycle, m_settings->cycle());
763	m_contextMenu->setItemEnabled(WindowIcons, m_settings->preview());	770	m_contextMenu->setItemEnabled(WindowIcons, m_settings->preview());
764	m_contextMenu->setItemEnabled(RenameDesktop,	771	m_contextMenu->setItemEnabled(RenameDesktop,
765	m_settings->labelType() ==	772	m_settings->labelType() ==
Lines 812-822 Link Here
812	m_settings->setPreview(!m_settings->preview());	819	m_settings->setPreview(!m_settings->preview());
813	TaskManager::the()->trackGeometry();	820	TaskManager::the()->trackGeometry();
814	break;	821	break;
815		822	case Cycle:
		823	m_settings->setCycle(!m_settings->cycle());
		824	break;
816	case WindowIcons:	825	case WindowIcons:
817	m_settings->setIcons(!m_settings->icons());	826	m_settings->setIcons(!m_settings->icons());
818	break;	827	break;
819
820	case PagerSettings::EnumBackgroundType::BgPlain + bgOffset:	828	case PagerSettings::EnumBackgroundType::BgPlain + bgOffset:
821	m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgPlain);	829	m_settings->setBackgroundType(PagerSettings::EnumBackgroundType::BgPlain);
822	break;	830	break;

Lines 49-58 Link Here

(-)pagersettings.kcfg (-1 / +6 lines)
49	<label>Show desktop preview?</label>	49	<label>Show desktop preview?</label>
50	<default>true</default>	50	<default>true</default>
51	</entry>	51	</entry>
52		52
53	<entry name="Icons" type="Bool">	53	<entry name="Icons" type="Bool">
54	<label>Show window icons in previews?</label>	54	<label>Show window icons in previews?</label>
55	<default>true</default>	55	<default>true</default>
56	</entry>	56	</entry>
		57
		58	<entry name="Cycle" type="Bool">
		59	<label>Cycle through desktops with wheel?</label>
		60	<default>true</default>
		61	</entry>
57	</group>	62	</group>
58	</kcfg>	63	</kcfg>




    void setActive( WId active ) { m_activeWindow = active; }
    WId activeWindow() { return m_activeWindow; }

    enum ConfigOptions { LaunchExtPager = 96, WindowThumbnails, Cycle,
                         WindowIcons, ConfigureDesktops, RenameDesktop };
    int labelType() const { return m_settings->labelType(); }

    int bgType() const { return m_settings->backgroundType(); }

    bool desktopPreview() const { return m_settings->preview(); }
    bool cycleWindow() const { return m_settings->cycle(); }
    bool windowIcons() const { return m_settings->icons(); }


    Orientation orientation() const { return KPanelApplet::orientation(); }
    Direction popupDirection() { return KPanelApplet::popupDirection(); }


Return to bug 908

Lines 64-78 Link Here

(-)pagerapplet.h (-1 / +3 lines)
64	void setActive( WId active ) { m_activeWindow = active; }	64	void setActive( WId active ) { m_activeWindow = active; }
65	WId activeWindow() { return m_activeWindow; }	65	WId activeWindow() { return m_activeWindow; }
66		66
67	enum ConfigOptions { LaunchExtPager = 96, WindowThumbnails,	67	enum ConfigOptions { LaunchExtPager = 96, WindowThumbnails, Cycle,
68	WindowIcons, ConfigureDesktops, RenameDesktop };	68	WindowIcons, ConfigureDesktops, RenameDesktop };
69	int labelType() const { return m_settings->labelType(); }	69	int labelType() const { return m_settings->labelType(); }
70		70
71	int bgType() const { return m_settings->backgroundType(); }	71	int bgType() const { return m_settings->backgroundType(); }
72		72
73	bool desktopPreview() const { return m_settings->preview(); }	73	bool desktopPreview() const { return m_settings->preview(); }
		74	bool cycleWindow() const { return m_settings->cycle(); }
74	bool windowIcons() const { return m_settings->icons(); }	75	bool windowIcons() const { return m_settings->icons(); }
75		76
		77
76	Orientation orientation() const { return KPanelApplet::orientation(); }	78	Orientation orientation() const { return KPanelApplet::orientation(); }
77	Direction popupDirection() { return KPanelApplet::popupDirection(); }	79	Direction popupDirection() { return KPanelApplet::popupDirection(); }
78		80