TDE
/
kmplayer
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmplayer
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KIcon to enhance compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent e0f85b11f6
commit 92dbbb6df3
5 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File

26
src/kmplayerapp.cpp
Unescape View File

@ -585,7 +585,7 @@ KDE_NO_EXPORT void KMPlayerApp::initActions () {
new TDEAction (i18n ("&Open VCD"), TQString ("cdrom_mount"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openVCD ()), ac, "openvcd"); new TDEAction (i18n ("&Open VCD"), TQString ("cdrom_mount"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openVCD ()), ac, "openvcd");
new TDEAction (i18n ("&Open Audio CD"), TQString ("cdrom_mount"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openAudioCD ()), ac, "openaudiocd"); new TDEAction (i18n ("&Open Audio CD"), TQString ("cdrom_mount"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openAudioCD ()), ac, "openaudiocd");
new TDEAction (i18n ("&Open Pipe..."), TQString ("pipe"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openPipe ()), ac, "source_pipe"); new TDEAction (i18n ("&Open Pipe..."), TQString ("pipe"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openPipe ()), ac, "source_pipe");
//TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), KIcon::Small, 0,true) //TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), TDEIcon::Small, 0,true)
new TDEAction (i18n ("&Connect"), TQString ("connect_established"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (openVDR ()), ac, "vdr_connect"); new TDEAction (i18n ("&Connect"), TQString ("connect_established"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (openVDR ()), ac, "vdr_connect");
editVolumeInc = new TDEAction (i18n ("Increase Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT (increaseVolume ()), ac, "edit_volume_up"); editVolumeInc = new TDEAction (i18n ("Increase Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT (increaseVolume ()), ac, "edit_volume_up");
editVolumeDec = new TDEAction (i18n ("Decrease Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT(decreaseVolume ()), ac, "edit_volume_down"); editVolumeDec = new TDEAction (i18n ("Decrease Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT(decreaseVolume ()), ac, "edit_volume_down");
@ -642,7 +642,7 @@ KDE_NO_EXPORT void KMPlayerApp::initMenu () {
menuBar ()->insertItem (i18n ("&Bookmarks"), bookmarkmenu, -1, 2); menuBar ()->insertItem (i18n ("&Bookmarks"), bookmarkmenu, -1, 2);
m_sourcemenu = menuBar ()->findItem (menuBar ()->idAt (0)); m_sourcemenu = menuBar ()->findItem (menuBar ()->idAt (0));
m_sourcemenu->setText (i18n ("S&ource")); m_sourcemenu->setText (i18n ("S&ource"));
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("dvd_mount"), KIcon::Small, 0, true), i18n ("&DVD"), m_dvdmenu, -1, 5); m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("dvd_mount"), TDEIcon::Small, 0, true), i18n ("&DVD"), m_dvdmenu, -1, 5);
m_dvdmenu->clear (); m_dvdmenu->clear ();
#ifdef HAVE_XINE #ifdef HAVE_XINE
m_dvdnavmenu->clear (); m_dvdnavmenu->clear ();
@ -652,11 +652,11 @@ KDE_NO_EXPORT void KMPlayerApp::initMenu () {
#else #else
m_dvdmenu->insertItem (i18n ("&Open DVD"), TQT_TQOBJECT(this), TQT_SLOT(openDVD ()), 0,-1, 1); m_dvdmenu->insertItem (i18n ("&Open DVD"), TQT_TQOBJECT(this), TQT_SLOT(openDVD ()), 0,-1, 1);
#endif #endif
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("cdrom_mount"), KIcon::Small, 0, true), i18n ("V&CD"), m_vcdmenu, -1, 6); m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("cdrom_mount"), TDEIcon::Small, 0, true), i18n ("V&CD"), m_vcdmenu, -1, 6);
m_vcdmenu->clear (); m_vcdmenu->clear ();
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), KIcon::Small, 0, true), i18n ("&TV"), m_tvmenu, -1, 8); m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), TDEIcon::Small, 0, true), i18n ("&TV"), m_tvmenu, -1, 8);
m_vcdmenu->insertItem (i18n ("&Open VCD"), TQT_TQOBJECT(this), TQT_SLOT(openVCD ()), 0,-1, 1); m_vcdmenu->insertItem (i18n ("&Open VCD"), TQT_TQOBJECT(this), TQT_SLOT(openVCD ()), 0,-1, 1);
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("cdrom_mount"), KIcon::Small, 0, true), i18n ("&Audio CD"), m_audiocdmenu, -1, 7); m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("cdrom_mount"), TDEIcon::Small, 0, true), i18n ("&Audio CD"), m_audiocdmenu, -1, 7);
m_audiocdmenu->insertItem (i18n ("&Open Audio CD"), TQT_TQOBJECT(this), TQT_SLOT(openAudioCD ()), 0,-1, 1); m_audiocdmenu->insertItem (i18n ("&Open Audio CD"), TQT_TQOBJECT(this), TQT_SLOT(openAudioCD ()), 0,-1, 1);
} }
@ -705,10 +705,10 @@ KDE_NO_EXPORT void KMPlayerApp::initView () {
TQT_TQOBJECT(this), TQT_SLOT (playListItemMoved ())); TQT_TQOBJECT(this), TQT_SLOT (playListItemMoved ()));
connect (m_view->playList(), TQT_SIGNAL (prepareMenu (KMPlayer::PlayListItem *, TQPopupMenu *)), TQT_TQOBJECT(this), TQT_SLOT (preparePlaylistMenu (KMPlayer::PlayListItem *, TQPopupMenu *))); connect (m_view->playList(), TQT_SIGNAL (prepareMenu (KMPlayer::PlayListItem *, TQPopupMenu *)), TQT_TQOBJECT(this), TQT_SLOT (preparePlaylistMenu (KMPlayer::PlayListItem *, TQPopupMenu *)));
m_dropmenu = new TQPopupMenu (m_view->playList ()); m_dropmenu = new TQPopupMenu (m_view->playList ());
m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), KIcon::Small, 0, true), i18n ("&Add to list"), TQT_TQOBJECT(this), TQT_SLOT (menuDropInList ())); m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), TDEIcon::Small, 0, true), i18n ("&Add to list"), TQT_TQOBJECT(this), TQT_SLOT (menuDropInList ()));
m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("folder_grey"), KIcon::Small, 0, true), i18n ("Add in new &Group"), TQT_TQOBJECT(this), TQT_SLOT (menuDropInGroup ())); m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("folder_grey"), TDEIcon::Small, 0, true), i18n ("Add in new &Group"), TQT_TQOBJECT(this), TQT_SLOT (menuDropInGroup ()));
m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("editcopy"), KIcon::Small, 0, true), i18n ("&Copy here"), TQT_TQOBJECT(this), TQT_SLOT (menuCopyDrop ())); m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("editcopy"), TDEIcon::Small, 0, true), i18n ("&Copy here"), TQT_TQOBJECT(this), TQT_SLOT (menuCopyDrop ()));
m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("editdelete"), KIcon::Small, 0, true), i18n ("&Delete"), TQT_TQOBJECT(this), TQT_SLOT (menuDeleteNode ())); m_dropmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("editdelete"), TDEIcon::Small, 0, true), i18n ("&Delete"), TQT_TQOBJECT(this), TQT_SLOT (menuDeleteNode ()));
/*TQPopupMenu * viewmenu = new TQPopupMenu; /*TQPopupMenu * viewmenu = new TQPopupMenu;
viewmenu->insertItem (i18n ("Full Screen"), TQT_TQOBJECT(this), TQT_SLOT(fullScreen ()), viewmenu->insertItem (i18n ("Full Screen"), TQT_TQOBJECT(this), TQT_SLOT(fullScreen ()),
TQKeySequence ("CTRL + Key_F")); TQKeySequence ("CTRL + Key_F"));
@ -1669,12 +1669,12 @@ KDE_NO_EXPORT void KMPlayerApp::preparePlaylistMenu (KMPlayer::PlayListItem * it
pm->insertSeparator (); pm->insertSeparator ();
manip_node = item->node; manip_node = item->node;
if (ri->flags & KMPlayer::PlayListView::Deleteable) if (ri->flags & KMPlayer::PlayListView::Deleteable)
pm->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("editdelete"), KIcon::Small, 0, true), i18n ("&Delete item"), TQT_TQOBJECT(this), TQT_SLOT (menuDeleteNode ())); pm->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("editdelete"), TDEIcon::Small, 0, true), i18n ("&Delete item"), TQT_TQOBJECT(this), TQT_SLOT (menuDeleteNode ()));
if (ri->flags & KMPlayer::PlayListView::Moveable) { if (ri->flags & KMPlayer::PlayListView::Moveable) {
if (manip_node->previousSibling ()) if (manip_node->previousSibling ())
pm->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("up"), KIcon::Small, 0, true), i18n ("&Move up"), TQT_TQOBJECT(this), TQT_SLOT (menuMoveUpNode ())); pm->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("up"), TDEIcon::Small, 0, true), i18n ("&Move up"), TQT_TQOBJECT(this), TQT_SLOT (menuMoveUpNode ()));
if (manip_node->nextSibling ()) if (manip_node->nextSibling ())
pm->insertItem (TDEGlobal::iconLoader()->loadIconSet (TQString ("down"), KIcon::Small, 0, true), i18n ("Move &down"), TQT_TQOBJECT(this), TQT_SLOT (menuMoveDownNode ())); pm->insertItem (TDEGlobal::iconLoader()->loadIconSet (TQString ("down"), TDEIcon::Small, 0, true), i18n ("Move &down"), TQT_TQOBJECT(this), TQT_SLOT (menuMoveDownNode ()));
} }
} }
} }
@ -1706,7 +1706,7 @@ KDE_NO_EXPORT void KMPlayerApp::configChanged () {
viewKeepRatio->setChecked (m_player->settings ()->sizeratio); viewKeepRatio->setChecked (m_player->settings ()->sizeratio);
if (m_player->settings ()->docksystray && !m_systray) { if (m_player->settings ()->docksystray && !m_systray) {
m_systray = new KSystemTray (this); m_systray = new KSystemTray (this);
m_systray->setPixmap (TDEGlobal::iconLoader ()->loadIcon (TQString ("kmplayer"), KIcon::NoGroup, 22)); m_systray->setPixmap (TDEGlobal::iconLoader ()->loadIcon (TQString ("kmplayer"), TDEIcon::NoGroup, 22));
m_systray->show (); m_systray->show ();
} else if (!m_player->settings ()->docksystray && m_systray) { } else if (!m_player->settings ()->docksystray && m_systray) {
delete m_systray; delete m_systray;

18
src/kmplayercontrolpanel.cpp
Unescape View File

@ -383,11 +383,11 @@ KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(TQWidget * parent, View * view)
m_popupMenu->insertItem (i18n ("&Play with"), m_playerMenu, menu_player); m_popupMenu->insertItem (i18n ("&Play with"), m_playerMenu, menu_player);
m_bookmarkMenu = new KMPlayerPopupMenu (this); m_bookmarkMenu = new KMPlayerPopupMenu (this);
m_popupMenu->insertItem (i18n("&Bookmarks"), m_bookmarkMenu, menu_bookmark); m_popupMenu->insertItem (i18n("&Bookmarks"), m_bookmarkMenu, menu_bookmark);
m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("konsole"), KIcon::Small, 0, true), i18n ("Con&sole"), menu_video); m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("konsole"), TDEIcon::Small, 0, true), i18n ("Con&sole"), menu_video);
m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), KIcon::Small, 0, true), i18n ("Play&list"), menu_playlist); m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), TDEIcon::Small, 0, true), i18n ("Play&list"), menu_playlist);
m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("empty"), KIcon::Small, 0, true), i18n ("Minimal mode"), menu_minimal); m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("empty"), TDEIcon::Small, 0, true), i18n ("Minimal mode"), menu_minimal);
m_popupMenu->setAccel (TQKeySequence (TQt::Key_M), menu_minimal); m_popupMenu->setAccel (TQKeySequence (TQt::Key_M), menu_minimal);
m_popupMenu->insertItem (TDEGlobal::iconLoader()->loadIconSet (TQString ("window_fullscreen"), KIcon::Small, 0, true), i18n ("&Full Screen"), menu_fullscreen); m_popupMenu->insertItem (TDEGlobal::iconLoader()->loadIconSet (TQString ("window_fullscreen"), TDEIcon::Small, 0, true), i18n ("&Full Screen"), menu_fullscreen);
m_popupMenu->setAccel (TQKeySequence (TQt::Key_F), menu_fullscreen); m_popupMenu->setAccel (TQKeySequence (TQt::Key_F), menu_fullscreen);
m_zoomMenu = new KMPlayerPopupMenu (this); m_zoomMenu = new KMPlayerPopupMenu (this);
m_zoomMenu->insertItem (i18n ("50%"), menu_zoom50); m_zoomMenu->insertItem (i18n ("50%"), menu_zoom50);
@ -395,14 +395,14 @@ KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(TQWidget * parent, View * view)
m_zoomMenu->insertItem (i18n ("150%"), menu_zoom150); m_zoomMenu->insertItem (i18n ("150%"), menu_zoom150);
m_zoomMenu->insertItem (i18n ("200%"), menu_zoom200); m_zoomMenu->insertItem (i18n ("200%"), menu_zoom200);
m_zoomMenu->insertItem (i18n ("300%"), menu_zoom300); m_zoomMenu->insertItem (i18n ("300%"), menu_zoom300);
m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("viewmag"), KIcon::Small, 0, false), i18n ("&Zoom"), m_zoomMenu, menu_zoom); m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("viewmag"), TDEIcon::Small, 0, false), i18n ("&Zoom"), m_zoomMenu, menu_zoom);
m_popupMenu->insertSeparator (); m_popupMenu->insertSeparator ();
m_colorMenu = new KMPlayerPopupMenu (this); m_colorMenu = new KMPlayerPopupMenu (this);
m_languageMenu = new KMPlayerPopupMenu (this); m_languageMenu = new KMPlayerPopupMenu (this);
m_audioMenu = new KMPlayerPopupMenu (this); m_audioMenu = new KMPlayerPopupMenu (this);
m_subtitleMenu = new KMPlayerPopupMenu (this); m_subtitleMenu = new KMPlayerPopupMenu (this);
m_languageMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("mime-sound"), KIcon::Small, 0, true), i18n ("&Audio languages"), m_audioMenu); m_languageMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("mime-sound"), TDEIcon::Small, 0, true), i18n ("&Audio languages"), m_audioMenu);
m_languageMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("view_text"), KIcon::Small, 0, true), i18n ("&Subtitles"), m_subtitleMenu); m_languageMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("view_text"), TDEIcon::Small, 0, true), i18n ("&Subtitles"), m_subtitleMenu);
TQLabel * label = new TQLabel (i18n ("Contrast:"), m_colorMenu); TQLabel * label = new TQLabel (i18n ("Contrast:"), m_colorMenu);
m_colorMenu->insertItem (label); m_colorMenu->insertItem (label);
m_contrastSlider = new TQSlider (-100, 100, 10, 0, Qt::Horizontal, m_colorMenu); m_contrastSlider = new TQSlider (-100, 100, 10, 0, Qt::Horizontal, m_colorMenu);
@ -419,9 +419,9 @@ KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(TQWidget * parent, View * view)
m_colorMenu->insertItem (label); m_colorMenu->insertItem (label);
m_saturationSlider = new TQSlider (-100, 100, 10, 0, Qt::Horizontal, m_colorMenu); m_saturationSlider = new TQSlider (-100, 100, 10, 0, Qt::Horizontal, m_colorMenu);
m_colorMenu->insertItem (m_saturationSlider); m_colorMenu->insertItem (m_saturationSlider);
m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("colorize"), KIcon::Small, 0, true), i18n ("Co&lors"), m_colorMenu); m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("colorize"), TDEIcon::Small, 0, true), i18n ("Co&lors"), m_colorMenu);
m_popupMenu->insertSeparator (); m_popupMenu->insertSeparator ();
m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("configure"), KIcon::Small, 0, true), i18n ("&Configure KMPlayer..."), menu_config); m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("configure"), TDEIcon::Small, 0, true), i18n ("&Configure KMPlayer..."), menu_config);
setAutoControls (true); setAutoControls (true);
connect (m_buttons [button_config], TQT_SIGNAL (clicked ()), connect (m_buttons [button_config], TQT_SIGNAL (clicked ()),
this, TQT_SLOT (buttonClicked ())); this, TQT_SLOT (buttonClicked ()));

10
src/kmplayerview.cpp
Unescape View File

@ -177,14 +177,14 @@ KDE_NO_EXPORT void View::init (TDEActionCollection * action_collection) {
TQPalette pal (TQColor (64, 64,64), TQColor (32, 32, 32)); TQPalette pal (TQColor (64, 64,64), TQColor (32, 32, 32));
TQVBoxLayout * viewbox = new TQVBoxLayout (this, 0, 0); TQVBoxLayout * viewbox = new TQVBoxLayout (this, 0, 0);
m_dockarea = new KDockArea (this, "kde_kmplayer_dock_area"); m_dockarea = new KDockArea (this, "kde_kmplayer_dock_area");
m_dock_video = new KDockWidget (m_dockarea->manager (), 0, TDEGlobal::iconLoader ()->loadIcon (TQString ("kmplayer"), KIcon::Small), m_dockarea); m_dock_video = new KDockWidget (m_dockarea->manager (), 0, TDEGlobal::iconLoader ()->loadIcon (TQString ("kmplayer"), TDEIcon::Small), m_dockarea);
m_dock_video->setEraseColor (TQColor (0, 0, 255)); m_dock_video->setEraseColor (TQColor (0, 0, 255));
m_dock_video->setDockSite (KDockWidget::DockLeft | KDockWidget::DockBottom | KDockWidget::DockRight | KDockWidget::DockTop); m_dock_video->setDockSite (KDockWidget::DockLeft | KDockWidget::DockBottom | KDockWidget::DockRight | KDockWidget::DockTop);
m_dock_video->setEnableDocking(KDockWidget::DockNone); m_dock_video->setEnableDocking(KDockWidget::DockNone);
m_view_area = new ViewArea (m_dock_video, this); m_view_area = new ViewArea (m_dock_video, this);
m_dock_video->setWidget (m_view_area); m_dock_video->setWidget (m_view_area);
m_dockarea->setMainDockWidget (m_dock_video); m_dockarea->setMainDockWidget (m_dock_video);
m_dock_playlist = m_dockarea->createDockWidget (i18n ("Play List"), TDEGlobal::iconLoader ()->loadIcon (TQString ("player_playlist"), KIcon::Small)); m_dock_playlist = m_dockarea->createDockWidget (i18n ("Play List"), TDEGlobal::iconLoader ()->loadIcon (TQString ("player_playlist"), TDEIcon::Small));
m_playlist = new PlayListView (m_dock_playlist, this, action_collection); m_playlist = new PlayListView (m_dock_playlist, this, action_collection);
m_dock_playlist->setWidget (m_playlist); m_dock_playlist->setWidget (m_playlist);
viewbox->addWidget (m_dockarea); viewbox->addWidget (m_dockarea);
@ -210,7 +210,7 @@ KDE_NO_EXPORT void View::init (TDEActionCollection * action_collection) {
m_widgettypes[WT_Picture] = new KMPlayerPictureWidget (m_widgetstack, this); m_widgettypes[WT_Picture] = new KMPlayerPictureWidget (m_widgetstack, this);
m_dock_infopanel = m_dockarea->createDockWidget ("infopanel", TDEGlobal::iconLoader ()->loadIcon (TQString ("info"), KIcon::Small)); m_dock_infopanel = m_dockarea->createDockWidget ("infopanel", TDEGlobal::iconLoader ()->loadIcon (TQString ("info"), TDEIcon::Small));
m_infopanel = new InfoWindow (m_dock_infopanel, this); m_infopanel = new InfoWindow (m_dock_infopanel, this);
m_dock_infopanel->setWidget (m_infopanel); m_dock_infopanel->setWidget (m_infopanel);
@ -394,9 +394,9 @@ void View::toggleVideoConsoleWindow () {
WidgetType wt = WT_Console; WidgetType wt = WT_Console;
if (m_widgetstack->visibleWidget () == m_widgettypes[WT_Console]) { if (m_widgetstack->visibleWidget () == m_widgettypes[WT_Console]) {
wt = WT_Video; wt = WT_Video;
m_control_panel->popupMenu ()->changeItem (ControlPanel::menu_video, TDEGlobal::iconLoader ()->loadIconSet (TQString ("konsole"), KIcon::Small, 0, true), i18n ("Con&sole")); m_control_panel->popupMenu ()->changeItem (ControlPanel::menu_video, TDEGlobal::iconLoader ()->loadIconSet (TQString ("konsole"), TDEIcon::Small, 0, true), i18n ("Con&sole"));
} else } else
m_control_panel->popupMenu ()->changeItem (ControlPanel::menu_video, TDEGlobal::iconLoader ()->loadIconSet (TQString ("video"), KIcon::Small, 0, true), i18n ("V&ideo")); m_control_panel->popupMenu ()->changeItem (ControlPanel::menu_video, TDEGlobal::iconLoader ()->loadIconSet (TQString ("video"), TDEIcon::Small, 0, true), i18n ("V&ideo"));
showWidget (wt); showWidget (wt);
emit windowVideoConsoleToggled (int (wt)); emit windowVideoConsoleToggled (int (wt));
} }

24
src/playlistview.cpp
Unescape View File

@ -125,15 +125,15 @@ KDE_NO_CDTOR_EXPORT PlayListView::PlayListView (TQWidget * parent, View * view,
setPaletteBackgroundColor (TQColor (0, 0, 0)); setPaletteBackgroundColor (TQColor (0, 0, 0));
setPaletteForegroundColor (TQColor (0xB2, 0xB2, 0xB2)); setPaletteForegroundColor (TQColor (0xB2, 0xB2, 0xB2));
m_itemmenu = new TQPopupMenu (this); m_itemmenu = new TQPopupMenu (this);
folder_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("folder"), KIcon::Small); folder_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("folder"), TDEIcon::Small);
auxiliary_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("folder_grey"), KIcon::Small); auxiliary_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("folder_grey"), TDEIcon::Small);
video_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("video"), KIcon::Small); video_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("video"), TDEIcon::Small);
info_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("messagebox_info"), KIcon::Small); info_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("messagebox_info"), TDEIcon::Small);
img_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("colorize"), KIcon::Small); img_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("colorize"), TDEIcon::Small);
unknown_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("unknown"), KIcon::Small); unknown_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("unknown"), TDEIcon::Small);
menu_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("player_playlist"), KIcon::Small); menu_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("player_playlist"), TDEIcon::Small);
config_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("configure"), KIcon::Small); config_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("configure"), TDEIcon::Small);
url_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("www"), KIcon::Small); url_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("www"), TDEIcon::Small);
m_find = KStdAction::find (TQT_TQOBJECT(this), TQT_SLOT (slotFind ()), ac, "find"); m_find = KStdAction::find (TQT_TQOBJECT(this), TQT_SLOT (slotFind ()), ac, "find");
m_find_next = KStdAction::findNext (TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()), ac, "next"); m_find_next = KStdAction::findNext (TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()), ac, "next");
m_find_next->setEnabled (false); m_find_next->setEnabled (false);
@ -157,7 +157,7 @@ int PlayListView::addTree (NodePtr root, const TQString & source, const TQString
ritem->source = source; ritem->source = source;
ritem->icon = icon; ritem->icon = icon;
ritem->setPixmap (0, !ritem->icon.isEmpty () ritem->setPixmap (0, !ritem->icon.isEmpty ()
? TDEGlobal::iconLoader ()->loadIcon (ritem->icon, KIcon::Small) ? TDEGlobal::iconLoader ()->loadIcon (ritem->icon, TDEIcon::Small)
: url_pix); : url_pix);
updateTree (ritem, 0L, false); updateTree (ritem, 0L, false);
return last_id; return last_id;
@ -351,7 +351,7 @@ KDE_NO_EXPORT void PlayListView::contextMenuItem (TQListViewItem * vi, const TQP
m_itemmenu->clear (); m_itemmenu->clear ();
} }
m_itemmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet m_itemmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet
(TQString ("editcopy"), KIcon::Small, 0, true), (TQString ("editcopy"), TDEIcon::Small, 0, true),
i18n ("&Copy to Clipboard"), i18n ("&Copy to Clipboard"),
this, TQT_SLOT (copyToClipboard ()), 0, 0); this, TQT_SLOT (copyToClipboard ()), 0, 0);
if (item->m_attr || if (item->m_attr ||
@ -359,7 +359,7 @@ KDE_NO_EXPORT void PlayListView::contextMenuItem (TQListViewItem * vi, const TQP
item->node->isDocument ()) && item->node->isDocument ()) &&
item->node->mrl ()->bookmarkable)) item->node->mrl ()->bookmarkable))
m_itemmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet m_itemmenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet
(TQString ("bookmark_add"), KIcon::Small, 0, true), (TQString ("bookmark_add"), TDEIcon::Small, 0, true),
i18n ("&Add Bookmark"), i18n ("&Add Bookmark"),
this, TQT_SLOT (addBookMark ()), 0, 1); this, TQT_SLOT (addBookMark ()), 0, 1);
if (ritem->have_dark_nodes) { if (ritem->have_dark_nodes) {

10
src/pref.cpp
Unescape View File

@ -71,7 +71,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti
TQStringList hierarchy; // typo? :) TQStringList hierarchy; // typo? :)
TQVBoxLayout *vlay; TQVBoxLayout *vlay;
frame = addPage(i18n("General Options"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("kmplayer"), KIcon::NoGroup, 32)); frame = addPage(i18n("General Options"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("kmplayer"), TDEIcon::NoGroup, 32));
vlay = new TQVBoxLayout(frame, marginHint(), spacingHint()); vlay = new TQVBoxLayout(frame, marginHint(), spacingHint());
tab = new TQTabWidget (frame); tab = new TQTabWidget (frame);
vlay->addWidget (tab); vlay->addWidget (tab);
@ -84,7 +84,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti
tab->insertTab (m_GeneralPageOutput, i18n("Output")); tab->insertTab (m_GeneralPageOutput, i18n("Output"));
entries.insert (i18n("General Options"), tab); entries.insert (i18n("General Options"), tab);
frame = addPage (i18n ("Source"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("source"), KIcon::NoGroup, 32)); frame = addPage (i18n ("Source"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("source"), TDEIcon::NoGroup, 32));
vlay = new TQVBoxLayout (frame, marginHint(), spacingHint()); vlay = new TQVBoxLayout (frame, marginHint(), spacingHint());
tab = new TQTabWidget (frame); tab = new TQTabWidget (frame);
vlay->addWidget (tab); vlay->addWidget (tab);
@ -92,7 +92,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti
tab->insertTab (m_SourcePageURL, i18n ("URL")); tab->insertTab (m_SourcePageURL, i18n ("URL"));
entries.insert (i18n("Source"), tab); entries.insert (i18n("Source"), tab);
frame = addPage (i18n ("Recording"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("video"), KIcon::NoGroup, 32)); frame = addPage (i18n ("Recording"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("video"), TDEIcon::NoGroup, 32));
vlay = new TQVBoxLayout (frame, marginHint(), spacingHint()); vlay = new TQVBoxLayout (frame, marginHint(), spacingHint());
tab = new TQTabWidget (frame); tab = new TQTabWidget (frame);
vlay->addWidget (tab); vlay->addWidget (tab);
@ -120,7 +120,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti
tab->setCurrentPage (0); tab->setCurrentPage (0);
entries.insert (i18n("Recording"), tab); entries.insert (i18n("Recording"), tab);
frame = addPage (i18n ("Output Plugins"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("image"), KIcon::NoGroup, 32)); frame = addPage (i18n ("Output Plugins"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("image"), TDEIcon::NoGroup, 32));
vlay = new TQVBoxLayout(frame, marginHint(), spacingHint()); vlay = new TQVBoxLayout(frame, marginHint(), spacingHint());
tab = new TQTabWidget (frame); tab = new TQTabWidget (frame);
vlay->addWidget (tab); vlay->addWidget (tab);
@ -160,7 +160,7 @@ KDE_NO_EXPORT void Preferences::addPrefPage (PreferencesPage * page) {
return; return;
TQMap<TQString, TQTabWidget *>::iterator en_it = entries.find (item); TQMap<TQString, TQTabWidget *>::iterator en_it = entries.find (item);
if (en_it == entries.end ()) { if (en_it == entries.end ()) {
frame = addPage (item, TQString(), TDEGlobal::iconLoader()->loadIcon ((icon), KIcon::NoGroup, 32)); frame = addPage (item, TQString(), TDEGlobal::iconLoader()->loadIcon ((icon), TDEIcon::NoGroup, 32));
vlay = new TQVBoxLayout (frame, marginHint(), spacingHint()); vlay = new TQVBoxLayout (frame, marginHint(), spacingHint());
tab = new TQTabWidget (frame); tab = new TQTabWidget (frame);
vlay->addWidget (tab); vlay->addWidget (tab);

Write Preview
Loading…
Cancel
Save