aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/Ui/skinned/actionmanager.cpp1
-rw-r--r--src/plugins/Ui/skinned/actionmanager.h1
-rw-r--r--src/plugins/Ui/skinned/playlist.cpp15
-rw-r--r--src/plugins/Ui/skinned/playlist.h1
-rw-r--r--src/plugins/Ui/skinned/playlistselector.cpp22
-rw-r--r--src/plugins/Ui/skinned/playlistselector.h3
6 files changed, 23 insertions, 20 deletions
diff --git a/src/plugins/Ui/skinned/actionmanager.cpp b/src/plugins/Ui/skinned/actionmanager.cpp
index dc262ebc0..c151c9ce8 100644
--- a/src/plugins/Ui/skinned/actionmanager.cpp
+++ b/src/plugins/Ui/skinned/actionmanager.cpp
@@ -83,6 +83,7 @@ ActionManager::ActionManager(QObject *parent) :
m_actions[PL_CLOSE] = createAction(tr("&Delete List"), "close_pl", tr("Ctrl+W"), "window-close");
m_actions[PL_LOAD] = createAction(tr("&Load List"), "load_pl", tr("O"), "document-open");
m_actions[PL_SAVE] = createAction(tr("&Save List"), "save_pl", tr("Shift+S"), "document-save-as");
+ m_actions[PL_RENAME] = createAction(tr("&Rename List"), "pl_rename", tr("F2"));
m_actions[PL_SELECT_NEXT] = createAction(tr("&Select Next Playlist"), "next_pl",
tr("Ctrl+PgDown"), "go-next");
m_actions[PL_SELECT_PREVIOUS] = createAction(tr("&Select Previous Playlist"), "prev_pl",
diff --git a/src/plugins/Ui/skinned/actionmanager.h b/src/plugins/Ui/skinned/actionmanager.h
index 1b6eb203e..19b98ba5c 100644
--- a/src/plugins/Ui/skinned/actionmanager.h
+++ b/src/plugins/Ui/skinned/actionmanager.h
@@ -86,6 +86,7 @@ public:
PL_CLOSE,
PL_LOAD,
PL_SAVE,
+ PL_RENAME,
PL_SELECT_NEXT,
PL_SELECT_PREVIOUS,
PL_SHOW_MANAGER,
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 2e772771a..fa85d2942 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -23,9 +23,8 @@
#include <QMenu>
#include <QAction>
#include <QSignalMapper>
-#include <QHBoxLayout>
#include <QCloseEvent>
-#include <QActionGroup>
+#include <QInputDialog>
#include <qmmpui/playlistitem.h>
#include <qmmpui/playlistmodel.h>
#include <qmmpui/playlistmanager.h>
@@ -336,6 +335,7 @@ void PlayList::createActions()
//Playlist Menu
m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_NEW, m_pl_manager, SLOT(createPlayList())));
m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_CLOSE, this, SLOT(deletePlaylist())));
+ m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_RENAME, this, SLOT(renamePlaylist())));
m_playlistMenu->addSeparator();
m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_LOAD, this, SIGNAL(loadPlaylist())));
m_playlistMenu->addAction(SET_ACTION(ActionManager::PL_SAVE, this, SIGNAL(savePlaylist())));
@@ -570,6 +570,17 @@ void PlayList::deletePlaylist()
m_pl_manager->removePlayList(m_pl_manager->selectedPlayList());
}
+void PlayList::renamePlaylist()
+{
+ bool ok = false;
+ QString name = QInputDialog::getText (this,
+ tr("Rename Playlist"), tr("Playlist name:"),
+ QLineEdit::Normal,
+ m_pl_manager->selectedPlayList()->name(), &ok);
+ if(ok)
+ m_pl_manager->selectedPlayList()->setName(name);
+}
+
void PlayList::showPlayLists()
{
if(!m_pl_browser)
diff --git a/src/plugins/Ui/skinned/playlist.h b/src/plugins/Ui/skinned/playlist.h
index db3250dba..533ac6c0c 100644
--- a/src/plugins/Ui/skinned/playlist.h
+++ b/src/plugins/Ui/skinned/playlist.h
@@ -77,6 +77,7 @@ class PlayList : public QWidget
void showPlaylistMenu();
void updateSkin();
void deletePlaylist();
+ void renamePlaylist();
void showPlayLists();
void generateCopySelectedMenu();
void copySelectedMenuActionTriggered(QAction *action);
diff --git a/src/plugins/Ui/skinned/playlistselector.cpp b/src/plugins/Ui/skinned/playlistselector.cpp
index 03dead458..7d38c8e36 100644
--- a/src/plugins/Ui/skinned/playlistselector.cpp
+++ b/src/plugins/Ui/skinned/playlistselector.cpp
@@ -30,6 +30,7 @@
#include <QIcon>
#include <qmmp/qmmp.h>
#include <qmmpui/playlistmanager.h>
+#include "actionmanager.h"
#include "skin.h"
#include "playlistselector.h"
@@ -48,11 +49,11 @@ PlayListSelector::PlayListSelector(PlayListManager *manager, QWidget *parent) :
loadColors();
readSettings();
m_menu = new QMenu(this);
- m_menu->addAction(QIcon::fromTheme("document-open"), tr("&Load"), parent, SIGNAL (loadPlaylist()));
- m_menu->addAction(QIcon::fromTheme("document-save-as"), tr("&Save As..."), parent, SIGNAL (savePlaylist()));
+ m_menu->addAction(ACTION(ActionManager::PL_LOAD));
+ m_menu->addAction(ACTION(ActionManager::PL_SAVE));
m_menu->addSeparator();
- m_menu->addAction(tr("Rename"),this, SLOT (renamePlaylist()));
- m_menu->addAction(QIcon::fromTheme("window-close"), tr("&Delete"),parent, SLOT (deletePlaylist()));
+ m_menu->addAction(ACTION(ActionManager::PL_RENAME));
+ m_menu->addAction(ACTION(ActionManager::PL_CLOSE));
}
PlayListSelector::~PlayListSelector()
@@ -119,17 +120,6 @@ void PlayListSelector::updateSkin()
updateTabs();
}
-void PlayListSelector::renamePlaylist()
-{
- bool ok = false;
- QString name = QInputDialog::getText (this,
- tr("Rename Playlist"), tr("Playlist name:"),
- QLineEdit::Normal,
- m_pl_manager->selectedPlayList()->name(), &ok);
- if(ok)
- m_pl_manager->selectedPlayList()->setName(name);
-}
-
void PlayListSelector::paintEvent(QPaintEvent *)
{
QPainter painter(this);
@@ -277,7 +267,7 @@ void PlayListSelector::mouseReleaseEvent (QMouseEvent *e)
void PlayListSelector::mouseDoubleClickEvent (QMouseEvent *e)
{
if(e->button() == Qt::LeftButton && !(m_scrollable && (e->x() > width() - 40)))
- renamePlaylist();
+ ACTION(ActionManager::PL_RENAME)->trigger();
else
QWidget::mouseDoubleClickEvent(e);
}
diff --git a/src/plugins/Ui/skinned/playlistselector.h b/src/plugins/Ui/skinned/playlistselector.h
index 8ac94ce5d..0cd99da71 100644
--- a/src/plugins/Ui/skinned/playlistselector.h
+++ b/src/plugins/Ui/skinned/playlistselector.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2012 by Ilya Kotov *
+ * Copyright (C) 2009-2015 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -47,7 +47,6 @@ public:
private slots:
void updateTabs();
void updateSkin();
- void renamePlaylist();
private:
void paintEvent(QPaintEvent *);
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 17:38:30 +0000