[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kmplayer/0.12] src: Ported all KIcon, KStatusBar, KInputDialog and more
From: Koos Vriezen <koos.vriezen () gmail ! com>
Date: 2016-06-26 14:55:13
Message-ID: E1bHBSr-0005lr-HB () code ! kde ! org
[Download RAW message or body]
Git commit d21c6091805b7f6fc79b14fd550007678b1457b6 by Koos Vriezen.
Committed on 26/06/2016 at 14:51.
Pushed by vriezen into branch '0.12'.
Ported all KIcon, KStatusBar, KInputDialog and more
but not all
M +33 -31 src/kmplayer.cpp
M +2 -4 src/kmplayer.h
M +4 -4 src/kmplayer_lists.cpp
M +7 -4 src/kmplayer_part.cpp
M +3 -0 src/kmplayer_part.h
M +0 -1 src/kmplayer_xspf.cpp
M +0 -1 src/kmplayerconfig.h
M +10 -10 src/kmplayercontrolpanel.cpp
M +2 -4 src/kmplayercontrolpanel.h
M +7 -4 src/kmplayerpartbase.cpp
M +3 -2 src/kmplayerpartbase.h
M +2 -1 src/kmplayerplaylist.cpp
M +0 -1 src/kmplayerprocess.h
M +6 -8 src/kmplayerview.cpp
M +2 -3 src/kmplayerview.h
M +1 -1 src/mediaobject.cpp
M +4 -3 src/playlistview.cpp
M +3 -1 src/viewarea.cpp
http://commits.kde.org/kmplayer/d21c6091805b7f6fc79b14fd550007678b1457b6
diff --git a/src/kmplayer.cpp b/src/kmplayer.cpp
index 8fc5683..4eac864 100644
--- a/src/kmplayer.cpp
+++ b/src/kmplayer.cpp
@@ -20,6 +20,8 @@
// include files for QT
#include <qdatastream.h>
#include <qregexp.h>
+#include <qicon.h>
+#include <qinputdialog.h>
#include <qiodevice.h>
#include <qprinter.h>
#include <qcursor.h>
@@ -30,6 +32,8 @@
#include <qapplication.h>
#include <qslider.h>
#include <qlayout.h>
+#include <qmenu.h>
+#include <qmimedata.h>
#include <qwhatsthis.h>
#include <qtimer.h>
#include <qfile.h>
@@ -45,21 +49,17 @@
#include <kapplication.h>
#include <kdeversion.h>
#include <kiconloader.h>
-#include <kicon.h>
#include <kmessagebox.h>
#include <kfiledialog.h>
-#include <kinputdialog.h>
#include <kmenubar.h>
#include <kstatusbar.h>
#include <ktoolbar.h>
#include <klocale.h>
#include <kconfig.h>
-#include <kglobal.h>
+#include <ksharedconfig.h>
#include <kstandardaction.h>
#include <kactioncollection.h>
#include <kdebug.h>
-#include <kmenu.h>
-#include <kurlrequester.h>
#include <klineedit.h>
#include <kshortcutsdialog.h>
#include <ksystemtrayicon.h>
@@ -84,13 +84,15 @@
//#include "kmplayervdr.h"
#include "kmplayerconfig.h"
+#include <kurlrequester.h>
+
extern const char * strMPlayerGroup;
KDE_NO_CDTOR_EXPORT KMPlayerApp::KMPlayerApp (QWidget *)
: KXmlGuiWindow (NULL),
m_systray (0L),
- m_player (new KMPlayer::PartBase (this, 0L, KGlobal::config ())),
+ m_player (new KMPlayer::PartBase (this, 0L, KSharedConfig::openConfig ())),
m_view (static_cast <KMPlayer::View*> (m_player->view())),
//m_ffserverconfig (new KMPlayerFFServerConfig),
//m_broadcastconfig (new KMPlayerBroadcastConfig (m_player, \
m_ffserverconfig)), @@ -148,7 +150,7 @@ KDE_NO_EXPORT void KMPlayerApp::initActions \
() { KActionCollection * ac = actionCollection ();
fileNewWindow = ac->addAction ("new_window");
fileNewWindow->setText( i18n( "New window" ) );
- //fileNewWindow->setIcon (KIcon ("window-new"));
+ //fileNewWindow->setIcon (QIcon::fromTheme("window-new"));
connect (fileNewWindow, SIGNAL (triggered (bool)), this, SLOT (slotFileNewWindow \
())); fileOpen = KStandardAction::open (this, SLOT (slotFileOpen()), ac);
fileOpenRecent = KStandardAction::openRecent(this, SLOT(slotFileOpenRecent(const \
QUrl&)), ac); @@ -161,7 +163,7 @@ KDE_NO_EXPORT void KMPlayerApp::initActions () {
connect (viewEditMode, SIGNAL (triggered (bool)), this, SLOT (editMode ()));
QAction *viewplaylist = ac->addAction ( "view_playlist");
viewplaylist->setText (i18n ("Pla&y List"));
- //viewplaylist->setIcon (KIcon ("media-playlist"));
+ //viewplaylist->setIcon (QIcon::fromTheme("media-playlist"));
connect (viewplaylist, SIGNAL(triggered(bool)), m_player, \
SLOT(showPlayListWindow()));
KStandardAction::preferences (m_player, SLOT (showConfigDialog ()), ac);
QAction *playmedia = ac->addAction ("play");
@@ -181,12 +183,12 @@ KDE_NO_EXPORT void KMPlayerApp::initActions () {
connect (viewFullscreen, SIGNAL (triggered (bool)), this, SLOT (fullScreen ()));
toggleView = ac->addAction ("view_video");
toggleView->setText (i18n ("C&onsole"));
- toggleView->setIcon (KIcon ("utilities-terminal"));
+ toggleView->setIcon (QIcon::fromTheme("utilities-terminal"));
connect (toggleView, SIGNAL (triggered (bool)),
m_player->view (), SLOT (toggleVideoConsoleWindow ()));
viewSyncEditMode = ac->addAction ("sync_edit_mode");
viewSyncEditMode->setText (i18n ("Reload"));
- viewSyncEditMode->setIcon (KIcon ("view-refresh"));
+ viewSyncEditMode->setIcon (QIcon::fromTheme("view-refresh"));
connect (viewSyncEditMode, SIGNAL (triggered (bool)), this, SLOT (syncEditMode \
())); viewSyncEditMode->setEnabled (false);
viewToolBar = KStandardAction::create (KStandardAction::ShowToolbar,
@@ -249,7 +251,7 @@ KDE_NO_EXPORT void KMPlayerApp::initMenu () {
//QAction *bookmark_action = actionCollection ()->addAction ("bookmarks");
QList<QAction *> acts = menuBar()->actions();
if (acts.size () > 2) {
- KMenu *bookmark_menu = new KMenu (this);
+ QMenu *bookmark_menu = new QMenu(this);
QAction *bookmark_action = menuBar()->insertMenu (acts.at(2), \
bookmark_menu); bookmark_action->setText (i18n( "&Bookmarks"));
m_player->createBookmarkMenu (bookmark_menu, actionCollection ());
@@ -258,7 +260,7 @@ KDE_NO_EXPORT void KMPlayerApp::initMenu () {
}
KDE_NO_EXPORT void KMPlayerApp::initView () {
- KSharedConfigPtr config = KGlobal::config ();
+ KSharedConfigPtr config = KSharedConfig::openConfig ();
//m_view->docArea ()->readDockConfig (config.data (), QString ("Window \
Layout")); m_player->connectPanel (m_view->controlPanel ());
initMenu ();
@@ -295,13 +297,13 @@ KDE_NO_EXPORT void KMPlayerApp::initView () {
this, SLOT (playListItemDropped (QDropEvent *, KMPlayer::PlayItem *)));
connect (m_view->playList(), SIGNAL (prepareMenu (KMPlayer::PlayItem *, QMenu \
*)), this, SLOT (preparePlaylistMenu (KMPlayer::PlayItem *, QMenu *))); m_dropmenu = \
new QMenu (m_view->playList ());
- dropAdd = m_dropmenu->addAction(KIcon ("view-media-playlist"),
+ dropAdd = m_dropmenu->addAction(QIcon::fromTheme("view-media-playlist"),
i18n ("&Add to list"), this, SLOT (menuDropInList ()));
- dropAddGroup = m_dropmenu->addAction(KIcon ("folder-grey"),
+ dropAddGroup = m_dropmenu->addAction(QIcon::fromTheme("folder-grey"),
i18n ("Add in new &Group"), this, SLOT (menuDropInGroup ()));
- dropCopy = m_dropmenu->addAction(KIcon ("edit-copy"),
+ dropCopy = m_dropmenu->addAction(QIcon::fromTheme("edit-copy"),
i18n ("&Copy here"), this, SLOT (menuCopyDrop ()));
- dropDelete = m_dropmenu->addAction(KIcon ("edit-delete"),
+ dropDelete = m_dropmenu->addAction(QIcon::fromTheme("edit-delete"),
i18n ("&Delete"), this, SLOT (menuDeleteNode ()));
/*QMenu * viewmenu = new QMenu;
viewmenu->addAction(i18n ("Full Screen"), this, SLOT(fullScreen ()),
@@ -339,10 +341,10 @@ KDE_NO_EXPORT void KMPlayerApp::positioned (int pos, int \
length) { KDE_NO_EXPORT void KMPlayerApp::windowVideoConsoleToggled (bool show) {
if (show) {
toggleView->setText (i18n ("V&ideo"));
- toggleView->setIcon (KIcon ("video-display"));
+ toggleView->setIcon (QIcon::fromTheme("video-display"));
} else {
toggleView->setText (i18n ("C&onsole"));
- toggleView->setIcon (KIcon ("utilities-terminal"));
+ toggleView->setIcon (QIcon::fromTheme("utilities-terminal"));
}
}
@@ -445,8 +447,8 @@ KDE_NO_EXPORT void KMPlayerApp::openAudioCD () {
KDE_NO_EXPORT void KMPlayerApp::openPipe () {
slotStatusMsg(i18n("Opening pipe..."));
bool ok;
- QString cmd = KInputDialog::getText (i18n("Read From Pipe"),
- i18n ("Enter a command that will output an audio/video stream\nto the stdout. \
This will be piped to a player's stdin.\n\nCommand:"), m_player->sources () \
["pipesource"]->pipeCmd (), &ok, m_player->view()); + QString cmd = \
QInputDialog::getText(m_player->view(), i18n("Read From Pipe"), + i18n ("Enter a \
command that will output an audio/video stream\nto the stdout. This will be piped to \
a player's stdin.\n\nCommand:"), QLineEdit::Normal, m_player->sources() \
["pipesource"]->pipeCmd(), &ok); if (!ok) {
slotStatusMsg (i18n ("Ready."));
return;
@@ -662,7 +664,7 @@ KDE_NO_EXPORT void IntroSource::deactivate () {
KDE_NO_EXPORT void KMPlayerApp::restoreFromConfig () {
if (m_player->view ()) {
m_view->dockArea ()->hide ();
- KConfigGroup dock_cfg (KGlobal::config(), "Window Layout");
+ KConfigGroup dock_cfg (KSharedConfig::openConfig(), "Window Layout");
m_view->dockArea ()->restoreState (dock_cfg.readEntry ("Layout", QByteArray \
()));
m_view->dockPlaylist ()->setVisible (dock_cfg.readEntry ("Show playlist", \
false)); m_view->dockArea ()->show ();
@@ -842,7 +844,7 @@ KDE_NO_EXPORT bool KMPlayerApp::broadcasting () const {
KDE_NO_EXPORT void KMPlayerApp::saveOptions()
{
- KSharedConfigPtr config = KGlobal::config ();
+ KSharedConfigPtr config = KSharedConfig::openConfig ();
KConfigGroup general (config, "General Options");
if (m_player->settings ()->remembersize)
general.writeEntry ("Geometry", size ());
@@ -854,10 +856,10 @@ KDE_NO_EXPORT void KMPlayerApp::saveOptions()
"Command1", m_player->sources () ["pipesource"]->pipeCmd ());
}
m_view->setInfoMessage (QString ());
- KConfigGroup dock_cfg (KGlobal::config(), "Window Layout");
+ KConfigGroup dock_cfg (KSharedConfig::openConfig(), "Window Layout");
dock_cfg.writeEntry ("Layout", m_view->dockArea ()->saveState ());
dock_cfg.writeEntry ("Show playlist", m_view->dockPlaylist ()->isVisible ());
- KConfigGroup toolbar_cfg (KGlobal::config(), "Main Toolbar");
+ KConfigGroup toolbar_cfg (KSharedConfig::openConfig(), "Main Toolbar");
toolBar("mainToolBar")->saveSettings (toolbar_cfg);
Recents * rc = static_cast <Recents *> (recents.ptr ());
if (rc && rc->resolved) {
@@ -871,7 +873,7 @@ KDE_NO_EXPORT void KMPlayerApp::saveOptions()
KDE_NO_EXPORT void KMPlayerApp::readOptions() {
- KSharedConfigPtr config = KGlobal::config ();
+ KSharedConfigPtr config = KSharedConfig::openConfig ();
KConfigGroup gen_cfg (config, "General Options");
@@ -892,7 +894,7 @@ KDE_NO_EXPORT void KMPlayerApp::readOptions() {
else if (m_player->settings ()->remembersize)
resize (QSize (640, 480));
- KConfigGroup toolbar_cfg (KGlobal::config(), "Main Toolbar");
+ KConfigGroup toolbar_cfg (KSharedConfig::openConfig(), "Main Toolbar");
toolBar("mainToolBar")->applySettings (toolbar_cfg);
KConfigGroup pipe_cfg (config, "Pipe Command");
static_cast <KMPlayerPipeSource *> (m_player->sources () \
["pipesource"])->setCommand ( @@ -1250,7 +1252,7 @@ void \
KMPlayerApp::playListItemDropped (QDropEvent *de, KMPlayer::PlayItem *item) \
m_drop_list.clear ();
if (de->mimeData()->hasFormat ("text/uri-list")) {
- m_drop_list = KUrl::List::fromMimeData (de->mimeData());
+ m_drop_list = de->mimeData()->urls();
} else if (de->mimeData ()->hasFormat \
("application/x-qabstractitemmodeldatalist")) { KMPlayer::PlayItem* pli = \
m_view->playList()->selectedItem (); if (pli && pli->node) {
@@ -1395,12 +1397,12 @@ KDE_NO_EXPORT void KMPlayerApp::preparePlaylistMenu \
(KMPlayer::PlayItem * item, pm->addSeparator();
manip_node = item->node;
if (ri->item_flags & KMPlayer::PlayModel::Deleteable)
- pm->addAction(KIcon("edit-delete"), i18n("&Delete item"), this, \
SLOT(menuDeleteNode())); + pm->addAction(QIcon::fromTheme("edit-delete"), \
i18n("&Delete item"), this, SLOT(menuDeleteNode())); if (ri->item_flags & \
KMPlayer::PlayModel::Moveable) { if (manip_node->previousSibling ())
- pm->addAction(KIcon("go-up"), i18n("&Move up"), this, \
SLOT(menuMoveUpNode())); + pm->addAction(QIcon::fromTheme("go-up"), \
i18n("&Move up"), this, SLOT(menuMoveUpNode())); if (manip_node->nextSibling ())
- pm->addAction(KIcon("go-down"), i18n("Move &down"), this, \
SLOT(menuMoveDownNode())); + \
pm->addAction(QIcon::fromTheme("go-down"), i18n("Move &down"), this, \
SLOT(menuMoveDownNode())); }
}
}
@@ -1408,7 +1410,7 @@ KDE_NO_EXPORT void KMPlayerApp::preparePlaylistMenu \
(KMPlayer::PlayItem * item, KDE_NO_EXPORT void KMPlayerApp::configChanged () {
//viewKeepRatio->setChecked (m_player->settings ()->sizeratio);
if (m_player->settings ()->docksystray && !m_systray) {
- m_systray = new KSystemTrayIcon (KIcon ("kmplayer"), this);
+ m_systray = new KSystemTrayIcon (QIcon::fromTheme("kmplayer"), this);
m_systray->show ();
} else if (!m_player->settings ()->docksystray && m_systray) {
delete m_systray;
diff --git a/src/kmplayer.h b/src/kmplayer.h
index dfaf099..663eff7 100644
--- a/src/kmplayer.h
+++ b/src/kmplayer.h
@@ -25,12 +25,10 @@
#include <qframe.h>
#include <kxmlguiwindow.h>
-#include <kurl.h>
-#include "kmplayerpartbase.h"
#include <ksharedconfig.h>
-#include "kmplayerpartbase.h"
#include "kmplayerconfig.h"
+#include "kmplayerpartbase.h"
class KUrlRequester;
@@ -171,7 +169,7 @@ private:
QMenu * m_generatormenu;
KMPlayerFFServerConfig * m_ffserverconfig;
KMPlayerBroadcastConfig * m_broadcastconfig;
- KUrl::List m_drop_list;
+ QList<QUrl> m_drop_list;
KMPlayer::PlayItem *m_drop_after;
int edit_tree_id;
int manip_tree_id;
diff --git a/src/kmplayer_lists.cpp b/src/kmplayer_lists.cpp
index ec2fd97..f3988f7 100644
--- a/src/kmplayer_lists.cpp
+++ b/src/kmplayer_lists.cpp
@@ -21,11 +21,11 @@
#include <qurl.h>
#include <qtextstream.h>
#include <qbytearray.h>
+#include <qinputdialog.h>
#include <QStandardPaths>
-#include <kinputdialog.h>
#include <kfiledialog.h>
-#include <kglobal.h>
+#include <ksharedconfig.h>
#include <klocale.h>
#include <kdebug.h>
@@ -416,7 +416,7 @@ QString Generator::genReadAsk (KMPlayer::Node *n) {
QString key = static_cast<Element*>(n)->getAttribute ("key");
QString def = static_cast<Element*>(n)->getAttribute ("default");
QString input;
- KConfigGroup cfg (KGlobal::config(), "Generator Defaults");
+ KConfigGroup cfg(KSharedConfig::openConfig(), "Generator Defaults");
if (!key.isEmpty ())
def = cfg.readEntry (key, def);
if (type == "file") {
@@ -435,7 +435,7 @@ QString Generator::genReadAsk (KMPlayer::Node *n) {
desc = c->innerText ().simplified ();
break;
}
- input = KInputDialog::getText (title, desc, def);
+ input = QInputDialog::getText(0, title, desc, QLineEdit::Normal, def);
}
if (input.isNull ())
canceled = true;
diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp
index e078594..428fdc5 100644
--- a/src/kmplayer_part.cpp
+++ b/src/kmplayer_part.cpp
@@ -22,6 +22,7 @@
#include <list>
#include <algorithm>
+#include <qlabel.h>
#include <qmenu.h>
#include <qtimer.h>
#include <qpushbutton.h>
@@ -178,6 +179,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (QWidget *wparent,
m_master (0L),
m_browserextension (new KMPlayerBrowserExtension (this)),
m_liveconnectextension (new KMPlayerLiveConnectExtension (this)),
+ m_playtime_info(0),
m_expected_view_width (0),
m_expected_view_height (0),
m_features (Feat_Unknown),
@@ -383,8 +385,8 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (QWidget *wparent,
last_time_left = 0;
connect (this, SIGNAL (positioned (int, int)),
this, SLOT (statusPosition (int, int)));
- m_view->statusBar ()->insertItem (QString ("--:--"), 1, 0);
- m_view->statusBar ()->setItemAlignment (1, Qt::AlignRight);
+ m_playtime_info = new QLabel("--:--");
+ m_view->statusBar()->addPermanentWidget(m_playtime_info);
}
}
if (group_member) {
@@ -753,7 +755,8 @@ KDE_NO_EXPORT void KMPlayerPart::connectToPart (KMPlayerPart * m) \
{ last_time_left = 0;
connect (m, SIGNAL (positioned (int, int)),
this, SLOT (statusPosition (int, int)));
- m_view->statusBar ()->insertItem (QString ("--:--"), 1, 0);
+ m_playtime_info = new QLabel("--:--");
+ m_view->statusBar()->addPermanentWidget(m_playtime_info);
}
}
@@ -843,7 +846,7 @@ KDE_NO_EXPORT void KMPlayerPart::statusPosition (int pos, int \
length) { else
text.sprintf ("%02d:%02d", m, s);
}
- m_view->statusBar ()->changeItem (text, 1);
+ m_playtime_info->setText(text);
}
}
diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h
index c62492f..f90f85d 100644
--- a/src/kmplayer_part.h
+++ b/src/kmplayer_part.h
@@ -27,6 +27,7 @@
#include "config-kmplayer.h"
+class QLabel;
class KMPlayerPart;
class JSCommandEntry;
namespace KMPlayer {
@@ -160,6 +161,7 @@ public:
virtual QString doEvaluate (const QString &script);
+ using KMPlayer::PartBase::openUrl;
public slots:
virtual bool openUrl(const QUrl& url);
virtual void openUrl(const QUrl&, const QString& t, const QString& srv);
@@ -184,6 +186,7 @@ private:
KMPlayerPart * m_master;
KMPlayerBrowserExtension * m_browserextension;
KMPlayerLiveConnectExtension * m_liveconnectextension;
+ QLabel* m_playtime_info;
QString m_group;
QString m_src_url;
QString m_href_url;
diff --git a/src/kmplayer_xspf.cpp b/src/kmplayer_xspf.cpp
index 36d899e..515c90c 100644
--- a/src/kmplayer_xspf.cpp
+++ b/src/kmplayer_xspf.cpp
@@ -18,7 +18,6 @@
#include "config-kmplayer.h"
#include <kdebug.h>
-#include <kurl.h>
#include "kmplayer_xspf.h"
diff --git a/src/kmplayerconfig.h b/src/kmplayerconfig.h
index 636676c..5ef042a 100644
--- a/src/kmplayerconfig.h
+++ b/src/kmplayerconfig.h
@@ -28,7 +28,6 @@
#include <qmap.h>
#include <ksharedconfig.h>
-#include <kurl.h>
#include "kmplayer_def.h"
diff --git a/src/kmplayercontrolpanel.cpp b/src/kmplayercontrolpanel.cpp
index d52c0b2..106812c 100644
--- a/src/kmplayercontrolpanel.cpp
+++ b/src/kmplayercontrolpanel.cpp
@@ -16,6 +16,7 @@
* Boston, MA 02110-1301, USA.
**/
+#include <qicon.h>
#include <qlayout.h>
#include <qpixmap.h>
#include <qslider.h>
@@ -30,7 +31,6 @@
#include <QWidgetAction>
#include <kiconloader.h>
-#include <kicon.h>
#include <klocale.h>
#include <kdebug.h>
@@ -296,7 +296,7 @@ KDE_NO_EXPORT void KMPlayerMenuButton::enterEvent (QEvent *) {
KDE_NO_CDTOR_EXPORT
KMPlayerPopupMenu::KMPlayerPopupMenu (QWidget *parent, const QString &title)
- : KMenu (title, parent) {}
+ : QMenu(title, parent) {}
KDE_NO_EXPORT void KMPlayerPopupMenu::leaveEvent (QEvent *) {
emit mouseLeft ();
@@ -412,25 +412,25 @@ KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(QWidget * \
parent, View * view) playerMenu = new KMPlayerPopupMenu (this, i18n ("&Play with"));
playersAction = popupMenu->addMenu (playerMenu);
- videoConsoleAction = popupMenu->addAction (KIcon ("utilities-terminal"), i18n \
("Con&sole")); + videoConsoleAction = \
popupMenu->addAction(QIcon::fromTheme("utilities-terminal"), i18n("Con&sole"));
- playlistAction = popupMenu->addAction (KIcon ("view-media-playlist"), i18n \
("Play&list")); + playlistAction = \
popupMenu->addAction(QIcon::fromTheme("view-media-playlist"), i18n("Play&list"));
zoomMenu = new KMPlayerPopupMenu (this, i18n ("&Zoom"));
zoomAction = popupMenu->addMenu (zoomMenu);
- zoomAction->setIcon (KIcon ("zoom-fit-best"));
+ zoomAction->setIcon(QIcon::fromTheme("zoom-fit-best"));
zoom50Action = zoomMenu->addAction (i18n ("50%"));
zoom100Action = zoomMenu->addAction (i18n ("100%"));
zoom150Action = zoomMenu->addAction (i18n ("150%"));
- fullscreenAction = popupMenu->addAction (KIcon ("view-fullscreen"), i18n ("&Full \
Screen")); + fullscreenAction = \
popupMenu->addAction(QIcon::fromTheme("view-fullscreen"), i18n("&Full Screen")); \
fullscreenAction->setShortcut (QKeySequence (Qt::Key_F));
popupMenu->addSeparator ();
colorMenu = new KMPlayerPopupMenu (this, i18n ("Co&lors"));
colorAction = popupMenu->addMenu (colorMenu);
- colorAction->setIcon (KIcon ("format-fill-color"));
+ colorAction->setIcon(QIcon::fromTheme("format-fill-color"));
/*QLabel * label = new QLabel (i18n ("Contrast:"), colorMenu);
colorMenu->insertItem (label);
m_contrastSlider = new QSlider (-100, 100, 10, 0, Qt::Horizontal, colorMenu);
@@ -459,8 +459,8 @@ KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(QWidget * parent, \
View * view) subtitleMenu = new KMPlayerPopupMenu (this, i18n ("&Subtitles"));
QAction *audioAction = languageMenu->addMenu (audioMenu);
QAction *subtitleAction = languageMenu->addMenu (subtitleMenu);
- audioAction->setIcon (KIcon ("audio-x-generic"));
- subtitleAction->setIcon (KIcon ("view-list-text"));
+ audioAction->setIcon(QIcon::fromTheme("audio-x-generic"));
+ subtitleAction->setIcon(QIcon::fromTheme("view-list-text"));
languageAction->setVisible (false);
scaleLabelAction = new QWidgetAction (popupMenu);
@@ -476,7 +476,7 @@ KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(QWidget * parent, \
View * view) scaleAction->setDefaultWidget (scale_slider);
popupMenu->addAction (scaleAction);
- configureAction = popupMenu->addAction (KIcon ("configure"), i18n ("&Configure \
KMPlayer...")); + configureAction = \
popupMenu->addAction(QIcon::fromTheme("configure"), i18n("&Configure KMPlayer...")); \
QPalette pal = palette ();
pal.setColor(backgroundRole(), view->palette().color(QPalette::Background));
diff --git a/src/kmplayercontrolpanel.h b/src/kmplayercontrolpanel.h
index 4dc8c41..bc8f600 100644
--- a/src/kmplayercontrolpanel.h
+++ b/src/kmplayercontrolpanel.h
@@ -22,17 +22,15 @@
#include "config-kmplayer.h"
#include <qwidget.h>
+#include <qmenu.h>
#include <qpushbutton.h>
-#include <kmenu.h>
-
class QSlider;
//class QPushButton;
class QAction;
class QWidgetAction;
class QBoxLayout;
class QStringList;
-class KMenu;
namespace KMPlayer {
@@ -55,7 +53,7 @@ protected:
/*
* The pop down menu from the controlpanel
*/
-class KMPLAYER_EXPORT KMPlayerPopupMenu : public KMenu {
+class KMPLAYER_EXPORT KMPlayerPopupMenu : public QMenu {
Q_OBJECT
public:
KMPlayerPopupMenu (QWidget *, const QString &title);
diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
index 5e3f644..3f4929e 100644
--- a/src/kmplayerpartbase.cpp
+++ b/src/kmplayerpartbase.cpp
@@ -30,7 +30,6 @@
#include <qtimer.h>
#include <qpair.h>
#include <qpushbutton.h>
-#include <QMenu>
#include <QStandardPaths>
#include <qslider.h>
#include <qfile.h>
@@ -211,7 +210,7 @@ void PartBase::connectPanel (ControlPanel * panel) {
//connect (panel (), SIGNAL (clicked ()), m_settings, SLOT (show ()));
}
-void PartBase::createBookmarkMenu (KMenu *owner, KActionCollection *ac) {
+void PartBase::createBookmarkMenu(QMenu *owner, KActionCollection *ac) {
m_bookmark_menu = new KBookmarkMenu (m_bookmark_manager, m_bookmark_owner, \
owner, ac); }
@@ -468,6 +467,10 @@ qlonglong PartBase::length () const {
return m_source ? m_source->length () : 0;
}
+bool PartBase::openUrl (const QUrl &url) {
+ return openUrl(KUrl(url));
+}
+
bool PartBase::openUrl (const KUrl &url) {
kDebug () << "PartBase::openUrl " << url.url() << url.isValid ();
if (!m_view) return false;
@@ -532,7 +535,7 @@ void PartBase::timerEvent (QTimerEvent * e) {
} else if (e->timerId () == m_rec_timer) {
m_rec_timer = 0;
if (m_record_doc)
- openUrl (convertNode <RecordDocument> (m_record_doc)->record_file);
+ openUrl(KUrl(convertNode <RecordDocument> (m_record_doc)->record_file));
}
killTimer (e->timerId ());
}
@@ -726,7 +729,7 @@ void PartBase::recorderPlaying () {
void PartBase::recorderStopped () {
stopRecording ();
if (m_view && m_rec_timer < 0 && m_record_doc)
- openUrl (convertNode <RecordDocument> (m_record_doc)->record_file);
+ openUrl(KUrl(convertNode <RecordDocument> (m_record_doc)->record_file));
}
void PartBase::stopRecording () {
diff --git a/src/kmplayerpartbase.h b/src/kmplayerpartbase.h
index b766bd1..0e50731 100644
--- a/src/kmplayerpartbase.h
+++ b/src/kmplayerpartbase.h
@@ -39,12 +39,12 @@
#include "kmplayerview.h"
#include "kmplayerplaylist.h"
+class QMenu;
class KAboutData;
class KActionCollection;
class KBookmarkMenu;
class KBookmarkManager;
-class KMenu;
namespace KMPlayer {
@@ -263,7 +263,7 @@ public:
* calls init() and reschedules an activate() on the source
* */
void setSource (Source * source);
- void createBookmarkMenu (KMenu *owner, KActionCollection *ac);
+ void createBookmarkMenu(QMenu *owner, KActionCollection *ac);
void connectPanel (ControlPanel * panel);
void connectPlaylist (PlayListView * playlist);
void connectInfoPanel (InfoWindow * infopanel);
@@ -287,6 +287,7 @@ public:
void stopRecording ();
bool isRecording ();
public slots:
+ virtual bool openUrl (const QUrl & url);
virtual bool openUrl (const KUrl & url);
virtual void openUrl (const KUrl &, const QString &t, const QString &srv);
virtual bool openUrl(const QList<QUrl>& urls);
diff --git a/src/kmplayerplaylist.cpp b/src/kmplayerplaylist.cpp
index 30df77a..df3e876 100644
--- a/src/kmplayerplaylist.cpp
+++ b/src/kmplayerplaylist.cpp
@@ -21,7 +21,6 @@
#include <qtextstream.h>
#include <kdebug.h>
-#include <kurl.h>
#ifdef KMPLAYER_WITH_EXPAT
#include <expat.h>
#endif
@@ -35,6 +34,8 @@
#include "kmplayer_xspf.h"
#include "mediaobject.h"
+#include <kurl.h>
+
#ifdef SHAREDPTR_DEBUG
KMPLAYER_EXPORT int shared_data_count;
#endif
diff --git a/src/kmplayerprocess.h b/src/kmplayerprocess.h
index d2942ea..7d5cb2d 100644
--- a/src/kmplayerprocess.h
+++ b/src/kmplayerprocess.h
@@ -29,7 +29,6 @@
#include <qregexp.h>
#include <qprocess.h>
-#include <kurl.h>
#include <kio/global.h>
#include "kmplayer_def.h"
diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp
index 5bf4f1f..4af5529 100644
--- a/src/kmplayerview.cpp
+++ b/src/kmplayerview.cpp
@@ -40,6 +40,7 @@
#include <QDropEvent>
#include <QAction>
#include <QDragEnterEvent>
+#include <QFontDatabase>
#include <QTextDocument>
#include <QTextCursor>
#include <qcursor.h>
@@ -56,7 +57,6 @@
#include <kactioncollection.h>
#include <kshortcut.h>
#include <kfinddialog.h>
-#include <kglobalsettings.h>
#include "kmplayerview.h"
#include "kmplayercontrolpanel.h"
@@ -201,9 +201,7 @@ KDE_NO_EXPORT void View::init (KActionCollection \
*action_collection, bool transp m_control_panel = new ControlPanel (m_view_area, \
this);
m_control_panel->setMaximumHeight(controlPanel ()->maximumSize ().height ());
m_status_bar = new StatusBar (m_view_area);
- m_status_bar->insertItem (QString (""), 0);
- m_status_bar->setItemAlignment (0, Qt::AlignLeft);
- m_status_bar->setSizeGripEnabled (false);
+ m_status_bar->clearMessage();
m_status_bar->setAutoFillBackground (true);
QSize sbsize = m_status_bar->sizeHint ();
m_status_bar->hide ();
@@ -211,7 +209,7 @@ KDE_NO_EXPORT void View::init (KActionCollection \
*action_collection, bool transp setVideoWidget (m_view_area);
m_multiedit = new TextEdit (m_view_area, this);
- QFont fnt = KGlobalSettings::fixedFont ();
+ QFont fnt = QFontDatabase::systemFont(QFontDatabase::FixedFont);
m_multiedit->setFont (fnt);
m_multiedit->hide ();
@@ -255,7 +253,7 @@ void View::setInfoMessage (const QString & msg) {
void View::setStatusMessage (const QString & msg) {
if (m_statusbar_mode != SB_Hide)
- m_status_bar->changeItem (msg, 0);
+ m_status_bar->showMessage(msg);
}
void View::toggleShowPlaylist () {
@@ -336,11 +334,11 @@ void View::toggleVideoConsoleWindow () {
if (m_multiedit->isVisible ()) {
m_multiedit->hide ();
m_view_area->setVideoWidgetVisible (true);
- m_control_panel->videoConsoleAction->setIcon (KIcon (("konsole")));
+ m_control_panel->videoConsoleAction->setIcon(QIcon::fromTheme(("konsole")));
m_control_panel->videoConsoleAction->setText (i18n ("Con&sole"));
delayedShowButtons (false);
} else {
- m_control_panel->videoConsoleAction->setIcon (KIcon ("video"));
+ m_control_panel->videoConsoleAction->setIcon(QIcon::fromTheme("video"));
m_control_panel->videoConsoleAction->setText (i18n ("V&ideo"));
m_multiedit->show ();
m_multiedit->raise ();
diff --git a/src/kmplayerview.h b/src/kmplayerview.h
index 4ce2523..c1216a2 100644
--- a/src/kmplayerview.h
+++ b/src/kmplayerview.h
@@ -26,7 +26,6 @@
#include <QList>
#include <QUrl>
-#include <kurl.h>
#include <kmediaplayer/view.h>
#include "kmplayer_def.h"
@@ -34,11 +33,11 @@
#define MOUSE_INVISIBLE_DELAY 2000
class QSlider;
+class QStatusBar;
class QMainWindow;
class QDockWidget;
class KActionCollection;
class KAction;
-class KStatusBar;
namespace KMPlayer {
@@ -50,7 +49,7 @@ class PlayListView;
class PlayListView;
class TopPlayItem;
-typedef KStatusBar StatusBar;
+typedef QStatusBar StatusBar;
/*
* The console GUI
diff --git a/src/mediaobject.cpp b/src/mediaobject.cpp
index 31dbcad..7d226de 100644
--- a/src/mediaobject.cpp
+++ b/src/mediaobject.cpp
@@ -38,11 +38,11 @@
#include <kurlauthorized.h>
#include "mediaobject.h"
-#include "kmplayerpartbase.h"
#include "kmplayerprocess.h"
#include "kmplayerview.h"
#include "expression.h"
#include "viewarea.h"
+#include "kmplayerpartbase.h"
using namespace KMPlayer;
diff --git a/src/playlistview.cpp b/src/playlistview.cpp
index 8164077..e6c49b1 100644
--- a/src/playlistview.cpp
+++ b/src/playlistview.cpp
@@ -26,7 +26,6 @@
#include <QIcon>
#include <qdrawutil.h>
#include <qpainter.h>
-#include <KIcon>
#include <QAbstractItemDelegate>
#include <QDropEvent>
#include <qstyle.h>
@@ -52,6 +51,8 @@
#include "kmplayerview.h"
#include "kmplayercontrolpanel.h"
+#include <kurl.h>
+
using namespace KMPlayer;
namespace {
@@ -250,14 +251,14 @@ KDE_NO_EXPORT void PlayListView::contextMenuEvent \
(QContextMenuEvent *event) m_find_next->setVisible (false);
m_itemmenu->clear ();
}
- m_itemmenu->addAction (KIcon ("edit-copy"),
+ m_itemmenu->addAction (QIcon::fromTheme("edit-copy"),
i18n ("&Copy to Clipboard"),
this, SLOT (copyToClipboard ()));
if (item->attribute ||
(item->node && (item->node->isPlayable () ||
item->node->isDocument ()) &&
item->node->mrl ()->bookmarkable))
- m_itemmenu->addAction (KIcon ("bookmark-new"),
+ m_itemmenu->addAction (QIcon::fromTheme("bookmark-new"),
i18n ("&Add Bookmark"),
this, SLOT (addBookMark ()));
if (ritem->have_dark_nodes) {
diff --git a/src/viewarea.cpp b/src/viewarea.cpp
index fe56bf8..67903ad 100644
--- a/src/viewarea.cpp
+++ b/src/viewarea.cpp
@@ -59,6 +59,8 @@
#include <xcb/xcb.h>
+#include <kurl.h>
+
using namespace KMPlayer;
//-------------------------------------------------------------------------
@@ -1589,7 +1591,7 @@ static void followLink (SMIL::LinkingBase * link) {
} else {
PlayListNotify *notify = link->document ()->notify_listener;
if (notify && !link->target.isEmpty ()) {
- notify->openUrl (link->href, link->target, QString ());
+ notify->openUrl(KUrl(link->href), link->target, QString());
} else {
NodePtr n = link;
for (NodePtr p = link->parentNode (); p; p = p->parentNode ()) {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic