Attachment #781 for bug #1032

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

Lines 116-121 private slots: Link Here

(-)a/src/kmplayer.h (+2 lines)
116	void zoom50 ();	116	void zoom50 ();
117	void zoom100 ();	117	void zoom100 ();
118	void zoom150 ();	118	void zoom150 ();
		119	void zoom200 ();
		120	void zoom300 ();
119	void editMode ();	121	void editMode ();
120	void syncEditMode ();	122	void syncEditMode ();
121	void broadcastClicked ();	123	void broadcastClicked ();

Lines 316-321 KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char * Link Here

(-)a/src/kmplayer_part.cpp (-1 / +11 lines)
316	this, TQT_SLOT (setMenuZoom (int)));	316	this, TQT_SLOT (setMenuZoom (int)));
317	panel->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom150,	317	panel->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom150,
318	this, TQT_SLOT (setMenuZoom (int)));	318	this, TQT_SLOT (setMenuZoom (int)));
		319	panel->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom200,
		320	this, TQT_SLOT (setMenuZoom (int)));
		321	panel->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom300,
		322	this, TQT_SLOT (setMenuZoom (int)));
319		323
320	m_view->setNoInfoMessages (m_features != Feat_InfoPanel);	324	m_view->setNoInfoMessages (m_features != Feat_InfoPanel);
321	if (m_features == Feat_InfoPanel)	325	if (m_features == Feat_InfoPanel)
Lines 619-625 KDE_NO_EXPORT void KMPlayerPart::setMenuZoom (int id) { Link Here
619	m_liveconnectextension->setSize (w, h);	623	m_liveconnectextension->setSize (w, h);
620	return;	624	return;
621	}	625	}
622	float scale = 1.5;	626	float scale = 1;
		627	if (id == KMPlayer::ControlPanel::menu_zoom300)
		628	scale = 3.0;
		629	if (id == KMPlayer::ControlPanel::menu_zoom200)
		630	scale = 2.0;
		631	if (id == KMPlayer::ControlPanel::menu_zoom150)
		632	scale = 1.5;
623	if (id == KMPlayer::ControlPanel::menu_zoom50)	633	if (id == KMPlayer::ControlPanel::menu_zoom50)
624	scale = 0.5;	634	scale = 0.5;
625	if (m_view->viewer ())	635	if (m_view->viewer ())

Lines 596-601 KDE_NO_EXPORT void KMPlayerApp::initActions () { Link Here

(-)a/src/kmplayerapp.cpp (+14 lines)
596	new KAction (i18n ("50%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom50 ()), ac, "view_zoom_50");	596	new KAction (i18n ("50%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom50 ()), ac, "view_zoom_50");
597	new KAction (i18n ("100%"), TQString ("viewmagfit"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom100 ()), ac, "view_zoom_100");	597	new KAction (i18n ("100%"), TQString ("viewmagfit"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom100 ()), ac, "view_zoom_100");
598	new KAction (i18n ("150%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom150 ()), ac, "view_zoom_150");	598	new KAction (i18n ("150%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom150 ()), ac, "view_zoom_150");
		599	new KAction (i18n ("200%"), 0, KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom200 ()), ac, "view_zoom_200");
		600	new KAction (i18n ("300%"), 0, KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom300 ()), ac, "view_zoom_300");
599	viewEditMode = new KToggleAction (i18n ("&Edit mode"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (editMode ()), ac, "edit_mode");	601	viewEditMode = new KToggleAction (i18n ("&Edit mode"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (editMode ()), ac, "edit_mode");
600	viewSyncEditMode = new KAction (i18n ("Sync &with playlist"), TQString ("reload"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (syncEditMode ()), ac, "sync_edit_mode");	602	viewSyncEditMode = new KAction (i18n ("Sync &with playlist"), TQString ("reload"), KShortcut (), TQT_TQOBJECT(this), TQT_SLOT (syncEditMode ()), ac, "sync_edit_mode");
601	viewSyncEditMode->setEnabled (false);	603	viewSyncEditMode->setEnabled (false);
Lines 681-686 KDE_NO_EXPORT void KMPlayerApp::initView () { Link Here
681	TQT_TQOBJECT(this), TQT_SLOT (zoom100 ()));	683	TQT_TQOBJECT(this), TQT_SLOT (zoom100 ()));
682	m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom150,	684	m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom150,
683	TQT_TQOBJECT(this), TQT_SLOT (zoom150 ()));	685	TQT_TQOBJECT(this), TQT_SLOT (zoom150 ()));
		686	m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom200,
		687	TQT_TQOBJECT(this), TQT_SLOT (zoom200 ()));
		688	m_view->controlPanel ()->zoomMenu ()->connectItem (KMPlayer::ControlPanel::menu_zoom300,
		689	TQT_TQOBJECT(this), TQT_SLOT (zoom300 ()));
684	connect (m_view->controlPanel()->broadcastButton (), TQT_SIGNAL (clicked ()),	690	connect (m_view->controlPanel()->broadcastButton (), TQT_SIGNAL (clicked ()),
685	TQT_TQOBJECT(this), TQT_SLOT (broadcastClicked ()));	691	TQT_TQOBJECT(this), TQT_SLOT (broadcastClicked ()));
686	m_auto_resize = m_player->settings ()->autoresize;	692	m_auto_resize = m_player->settings ()->autoresize;
Lines 1075-1080 KDE_NO_EXPORT void KMPlayerApp::zoom150 () { Link Here
1075	resizePlayer (150);	1081	resizePlayer (150);
1076	}	1082	}
1077		1083
		1084	KDE_NO_EXPORT void KMPlayerApp::zoom200 () {
		1085	resizePlayer (200);
		1086	}
		1087
		1088	KDE_NO_EXPORT void KMPlayerApp::zoom300 () {
		1089	resizePlayer (300);
		1090	}
		1091
1078	KDE_NO_EXPORT void KMPlayerApp::editMode () {	1092	KDE_NO_EXPORT void KMPlayerApp::editMode () {
1079	m_view->docArea ()->hide ();	1093	m_view->docArea ()->hide ();
1080	bool editmode = !m_view->editMode ();	1094	bool editmode = !m_view->editMode ();

Lines 393-398 KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(TQWidget * parent, View * view) Link Here

(-)a/src/kmplayercontrolpanel.cpp (+2 lines)
393	m_zoomMenu->insertItem (i18n ("50%"), menu_zoom50);	393	m_zoomMenu->insertItem (i18n ("50%"), menu_zoom50);
394	m_zoomMenu->insertItem (i18n ("100%"), menu_zoom100);	394	m_zoomMenu->insertItem (i18n ("100%"), menu_zoom100);
395	m_zoomMenu->insertItem (i18n ("150%"), menu_zoom150);	395	m_zoomMenu->insertItem (i18n ("150%"), menu_zoom150);
		396	m_zoomMenu->insertItem (i18n ("200%"), menu_zoom200);
		397	m_zoomMenu->insertItem (i18n ("300%"), menu_zoom300);
396	m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("viewmag"), KIcon::Small, 0, false), i18n ("&Zoom"), m_zoomMenu, menu_zoom);	398	m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("viewmag"), KIcon::Small, 0, false), i18n ("&Zoom"), m_zoomMenu, menu_zoom);
397	m_popupMenu->insertSeparator ();	399	m_popupMenu->insertSeparator ();
398	m_colorMenu = new KMPlayerPopupMenu (this);	400	m_colorMenu = new KMPlayerPopupMenu (this);

Lines 100-106 class KMPLAYER_EXPORT ControlPanel : public TQWidget { Link Here

(-)a/src/kmplayercontrolpanel.h (-1 / +2 lines)
100	public:	100	public:
101	enum MenuID {	101	enum MenuID {
102	menu_config = 0, menu_player, menu_fullscreen, menu_volume,	102	menu_config = 0, menu_player, menu_fullscreen, menu_volume,
103	menu_bookmark, menu_zoom, menu_zoom50, menu_zoom100, menu_zoom150,	103	menu_bookmark, menu_zoom, menu_zoom50, menu_zoom100,
		104	menu_zoom150, menu_zoom200, menu_zoom300,
104	menu_view, menu_video, menu_playlist, menu_minimal	105	menu_view, menu_video, menu_playlist, menu_minimal
105	};	106	};
106	enum Button {	107	enum Button {

Lines 34-39 Link Here

(-)a/src/kmplayerui.rc (+5 lines)
34	<Action name="view_zoom_50"/>	34	<Action name="view_zoom_50"/>
35	<Action name="view_zoom_100"/>	35	<Action name="view_zoom_100"/>
36	<Action name="view_zoom_150"/>	36	<Action name="view_zoom_150"/>
		37	<Action name="view_zoom_200"/>
		38	<Action name="view_zoom_300"/>
37	</Menu>	39	</Menu>
38	<Action name="view_keep_ratio"/>	40	<Action name="view_keep_ratio"/>
39	<Separator />	41	<Separator />
Lines 73-78 Link Here
73	<Action shortcut="F2" name="edit_playlist_item"/>	75	<Action shortcut="F2" name="edit_playlist_item"/>
74	<Action shortcut="C" name="view_arts_control" />	76	<Action shortcut="C" name="view_arts_control" />
75	<Action shortcut="M" name="view_minimal" />	77	<Action shortcut="M" name="view_minimal" />
		78	<Action shortcut="Alt+1" name="view_zoom_100" />
		79	<Action shortcut="Alt+2" name="view_zoom_200" />
		80	<Action shortcut="Alt+3" name="view_zoom_300" />
76	</ActionProperties>	81	</ActionProperties>
77	<ToolBar name="mainToolBar"><text></text>	82	<ToolBar name="mainToolBar"><text></text>
78	<Action name="new_window"/>	83	<Action name="new_window"/>

Return to bug 1032