Attachment #688 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 689-694 Link Here

(-)kmplayer-trinity-3.5.13.orig/src/kmplayerapp.cpp (+2 lines)
689	TQT_TQOBJECT(this), TQT_SLOT (zoom100 ()));	689	TQT_TQOBJECT(this), TQT_SLOT (zoom100 ()));
690	connect (m_view, TQT_SIGNAL (fullScreenChanged ()),	690	connect (m_view, TQT_SIGNAL (fullScreenChanged ()),
691	TQT_TQOBJECT(this), TQT_SLOT (fullScreen ()));	691	TQT_TQOBJECT(this), TQT_SLOT (fullScreen ()));
		692	connect (m_player, TQT_SIGNAL (toggleMinimalMode ()),
		693	TQT_TQOBJECT(this), TQT_SLOT (slotMinimalMode ()));
692	connect (m_view->playList (), TQT_SIGNAL (selectionChanged (TQListViewItem *)),	694	connect (m_view->playList (), TQT_SIGNAL (selectionChanged (TQListViewItem *)),
693	TQT_TQOBJECT(this), TQT_SLOT (playListItemSelected (TQListViewItem *)));	695	TQT_TQOBJECT(this), TQT_SLOT (playListItemSelected (TQListViewItem *)));
694	connect (m_view->playList(), TQT_SIGNAL (dropped (TQDropEvent, TQListViewItem)),	696	connect (m_view->playList(), TQT_SIGNAL (dropped (TQDropEvent, TQListViewItem)),




    m_buttons[button_config] = new KMPlayerMenuButton (this, m_buttonbox, config_xpm);
    m_buttons[button_playlist] = ctrlButton (this, m_buttonbox, playlist_xpm);
    m_buttons[button_back] = ctrlButton (this, m_buttonbox, back_xpm);
    m_buttons[button_play] = ctrlButton(this, m_buttonbox, play_xpm, TQt::Key_P);
    m_buttons[button_forward] = ctrlButton (this, m_buttonbox, forward_xpm);
    m_buttons[button_stop] = ctrlButton(this, m_buttonbox, stop_xpm, TQt::Key_S);
    m_buttons[button_pause]=ctrlButton(this, m_buttonbox, pause_xpm, TQt::Key_Space);
    m_buttons[button_record] = ctrlButton (this, m_buttonbox, record_xpm);
    m_buttons[button_broadcast] = ctrlButton (this, m_buttonbox, broadcast_xpm);
    m_buttons[button_language] = new KMPlayerMenuButton (this, m_buttonbox, language_xpm);

    m_popupMenu->insertItem (i18n("&Bookmarks"), m_bookmarkMenu, menu_bookmark);
    m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("konsole"), KIcon::Small, 0, true), i18n ("Con&sole"), menu_video);
    m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), KIcon::Small, 0, true), i18n ("Play&list"), menu_playlist);
    m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("empty"), KIcon::Small, 0, true), i18n ("Minimal mode"), menu_minimal);
    m_popupMenu->setAccel (TQKeySequence (TQt::Key_M), menu_minimal);
    m_popupMenu->insertItem (KGlobal::iconLoader()->loadIconSet (TQString ("window_fullscreen"), KIcon::Small, 0, true), i18n ("&Full Screen"), menu_fullscreen);
    m_popupMenu->setAccel (TQKeySequence (TQt::Key_F), menu_fullscreen);
    m_zoomMenu = new KMPlayerPopupMenu (this);
    m_zoomMenu->insertItem (i18n ("50%"), menu_zoom50);
    m_zoomMenu->insertItem (i18n ("100%"), menu_zoom100);
    m_zoomMenu->insertItem (i18n ("150%"), menu_zoom150);
    m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("viewmag"), KIcon::Small, 0, false), i18n ("&Zoom"), m_zoomMenu, menu_zoom);
    m_popupMenu->insertItem (KGlobal::iconLoader()->loadIconSet (TQString ("window_fullscreen"), KIcon::Small, 0, true), i18n ("&Full Screen"), menu_fullscreen);
    m_popupMenu->setAccel (TQKeySequence (TQt::Key_F), menu_fullscreen);
    m_popupMenu->insertSeparator ();
    m_colorMenu = new KMPlayerPopupMenu (this);
    m_languageMenu = new KMPlayerPopupMenu (this);

Lines 101-107 Link Here

(-)kmplayer-trinity-3.5.13.orig/src/kmplayercontrolpanel.h (-1 / +1 lines)
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, menu_zoom150,
104	menu_view, menu_video, menu_playlist	104	menu_view, menu_video, menu_playlist, menu_minimal
105	};	105	};
106	enum Button {	106	enum Button {
107	button_config = 0, button_playlist,	107	button_config = 0, button_playlist,

Lines 217-222 Link Here

(-)kmplayer-trinity-3.5.13.orig/src/kmplayerpartbase.cpp (+6 lines)
217	m_view, TQT_SLOT(toggleVideoConsoleWindow()));	217	m_view, TQT_SLOT(toggleVideoConsoleWindow()));
218	panel->popupMenu ()->connectItem (ControlPanel::menu_playlist,	218	panel->popupMenu ()->connectItem (ControlPanel::menu_playlist,
219	m_view, TQT_SLOT (toggleShowPlaylist ()));	219	m_view, TQT_SLOT (toggleShowPlaylist ()));
		220	panel->popupMenu ()->connectItem (ControlPanel::menu_minimal,
		221	this, TQT_SLOT (minimalMode ()));
220	connect (this, TQT_SIGNAL (statusUpdated (const TQString &)),	222	connect (this, TQT_SIGNAL (statusUpdated (const TQString &)),
221	panel->view (), TQT_SLOT (setStatusMessage (const TQString &)));	223	panel->view (), TQT_SLOT (setStatusMessage (const TQString &)));
222	//connect (panel (), TQT_SIGNAL (clicked ()), m_settings, TQT_SLOT (show ()));	224	//connect (panel (), TQT_SIGNAL (clicked ()), m_settings, TQT_SLOT (show ()));
Lines 870-875 Link Here
870	m_view->fullScreen ();	872	m_view->fullScreen ();
871	}	873	}
872		874
		875	KDE_NO_EXPORT void PartBase::minimalMode () {
		876	emit toggleMinimalMode ();
		877	}
		878
873	KDE_NO_EXPORT bool PartBase::isPlaying () {	879	KDE_NO_EXPORT bool PartBase::isPlaying () {
874	return playing ();	880	return playing ();
875	}	881	}

Lines 208-213 Link Here

(-)kmplayer-trinity-3.5.13.orig/src/kmplayerpartbase.h (+2 lines)
208	void audioIsSelected (int id);	208	void audioIsSelected (int id);
209	void subtitleIsSelected (int id);	209	void subtitleIsSelected (int id);
210	void positioned (int pos, int length);	210	void positioned (int pos, int length);
		211	void toggleMinimalMode ();
211	protected:	212	protected:
212	bool openFile();	213	bool openFile();
213	virtual void timerEvent (TQTimerEvent *);	214	virtual void timerEvent (TQTimerEvent *);
Lines 221-226 Link Here
221	void saturationValueChanged (int val);	222	void saturationValueChanged (int val);
222	void sourceHasChangedAspects ();	223	void sourceHasChangedAspects ();
223	void fullScreen ();	224	void fullScreen ();
		225	void minimalMode ();
224	void playListItemClicked (TQListViewItem *);	226	void playListItemClicked (TQListViewItem *);
225	void playListItemExecuted (TQListViewItem *);	227	void playListItemExecuted (TQListViewItem *);
226	virtual void playingStarted ();	228	virtual void playingStarted ();




  <Action name="pause" icon="player_pause"/>
  <Action name="stop" icon="player_stop"/>
  <Action shortcut="F" name="view_fullscreen" />
  <Action shortcut="P" name="play" />
  <Action shortcut="Space" name="pause" />
  <Action shortcut="S" name="stop" />
  <Action shortcut="F2" name="edit_playlist_item"/>
  <Action shortcut="C" name="view_arts_control" />
  <Action shortcut="M" name="view_minimal" />
</ActionProperties>
<ToolBar name="mainToolBar"><text></text>
  <Action name="new_window"/>

Return to bug 1032

Lines 357-366 Link Here

(-)kmplayer-trinity-3.5.13.orig/src/kmplayercontrolpanel.cpp (-4 / +6 lines)
357	m_buttons[button_config] = new KMPlayerMenuButton (this, m_buttonbox, config_xpm);	357	m_buttons[button_config] = new KMPlayerMenuButton (this, m_buttonbox, config_xpm);
358	m_buttons[button_playlist] = ctrlButton (this, m_buttonbox, playlist_xpm);	358	m_buttons[button_playlist] = ctrlButton (this, m_buttonbox, playlist_xpm);
359	m_buttons[button_back] = ctrlButton (this, m_buttonbox, back_xpm);	359	m_buttons[button_back] = ctrlButton (this, m_buttonbox, back_xpm);
360	m_buttons[button_play] = ctrlButton(this, m_buttonbox, play_xpm, TQt::Key_R);	360	m_buttons[button_play] = ctrlButton(this, m_buttonbox, play_xpm, TQt::Key_P);
361	m_buttons[button_forward] = ctrlButton (this, m_buttonbox, forward_xpm);	361	m_buttons[button_forward] = ctrlButton (this, m_buttonbox, forward_xpm);
362	m_buttons[button_stop] = ctrlButton(this, m_buttonbox, stop_xpm, TQt::Key_S);	362	m_buttons[button_stop] = ctrlButton(this, m_buttonbox, stop_xpm, TQt::Key_S);
363	m_buttons[button_pause]=ctrlButton(this, m_buttonbox, pause_xpm, TQt::Key_P);	363	m_buttons[button_pause]=ctrlButton(this, m_buttonbox, pause_xpm, TQt::Key_Space);
364	m_buttons[button_record] = ctrlButton (this, m_buttonbox, record_xpm);	364	m_buttons[button_record] = ctrlButton (this, m_buttonbox, record_xpm);
365	m_buttons[button_broadcast] = ctrlButton (this, m_buttonbox, broadcast_xpm);	365	m_buttons[button_broadcast] = ctrlButton (this, m_buttonbox, broadcast_xpm);
366	m_buttons[button_language] = new KMPlayerMenuButton (this, m_buttonbox, language_xpm);	366	m_buttons[button_language] = new KMPlayerMenuButton (this, m_buttonbox, language_xpm);
Lines 385-397 Link Here
385	m_popupMenu->insertItem (i18n("&Bookmarks"), m_bookmarkMenu, menu_bookmark);	385	m_popupMenu->insertItem (i18n("&Bookmarks"), m_bookmarkMenu, menu_bookmark);
386	m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("konsole"), KIcon::Small, 0, true), i18n ("Con&sole"), menu_video);	386	m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("konsole"), KIcon::Small, 0, true), i18n ("Con&sole"), menu_video);
387	m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), KIcon::Small, 0, true), i18n ("Play&list"), menu_playlist);	387	m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), KIcon::Small, 0, true), i18n ("Play&list"), menu_playlist);
		388	m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("empty"), KIcon::Small, 0, true), i18n ("Minimal mode"), menu_minimal);
		389	m_popupMenu->setAccel (TQKeySequence (TQt::Key_M), menu_minimal);
		390	m_popupMenu->insertItem (KGlobal::iconLoader()->loadIconSet (TQString ("window_fullscreen"), KIcon::Small, 0, true), i18n ("&Full Screen"), menu_fullscreen);
		391	m_popupMenu->setAccel (TQKeySequence (TQt::Key_F), menu_fullscreen);
388	m_zoomMenu = new KMPlayerPopupMenu (this);	392	m_zoomMenu = new KMPlayerPopupMenu (this);
389	m_zoomMenu->insertItem (i18n ("50%"), menu_zoom50);	393	m_zoomMenu->insertItem (i18n ("50%"), menu_zoom50);
390	m_zoomMenu->insertItem (i18n ("100%"), menu_zoom100);	394	m_zoomMenu->insertItem (i18n ("100%"), menu_zoom100);
391	m_zoomMenu->insertItem (i18n ("150%"), menu_zoom150);	395	m_zoomMenu->insertItem (i18n ("150%"), menu_zoom150);
392	m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("viewmag"), KIcon::Small, 0, false), i18n ("&Zoom"), m_zoomMenu, menu_zoom);	396	m_popupMenu->insertItem (KGlobal::iconLoader ()->loadIconSet (TQString ("viewmag"), KIcon::Small, 0, false), i18n ("&Zoom"), m_zoomMenu, menu_zoom);
393	m_popupMenu->insertItem (KGlobal::iconLoader()->loadIconSet (TQString ("window_fullscreen"), KIcon::Small, 0, true), i18n ("&Full Screen"), menu_fullscreen);
394	m_popupMenu->setAccel (TQKeySequence (TQt::Key_F), menu_fullscreen);
395	m_popupMenu->insertSeparator ();	397	m_popupMenu->insertSeparator ();
396	m_colorMenu = new KMPlayerPopupMenu (this);	398	m_colorMenu = new KMPlayerPopupMenu (this);
397	m_languageMenu = new KMPlayerPopupMenu (this);	399	m_languageMenu = new KMPlayerPopupMenu (this);

Lines 67-77 Link Here

(-)kmplayer-trinity-3.5.13.orig/src/kmplayerui.rc (-2 / +3 lines)
67	<Action name="pause" icon="player_pause"/>	67	<Action name="pause" icon="player_pause"/>
68	<Action name="stop" icon="player_stop"/>	68	<Action name="stop" icon="player_stop"/>
69	<Action shortcut="F" name="view_fullscreen" />	69	<Action shortcut="F" name="view_fullscreen" />
70	<Action shortcut="R" name="play" />	70	<Action shortcut="P" name="play" />
71	<Action shortcut="P" name="pause" />	71	<Action shortcut="Space" name="pause" />
72	<Action shortcut="S" name="stop" />	72	<Action shortcut="S" name="stop" />
73	<Action shortcut="F2" name="edit_playlist_item"/>	73	<Action shortcut="F2" name="edit_playlist_item"/>
74	<Action shortcut="C" name="view_arts_control" />	74	<Action shortcut="C" name="view_arts_control" />
		75	<Action shortcut="M" name="view_minimal" />
75	</ActionProperties>	76	</ActionProperties>
76	<ToolBar name="mainToolBar"><text></text>	77	<ToolBar name="mainToolBar"><text></text>
77	<Action name="new_window"/>	78	<Action name="new_window"/>