aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/Effect/filewriter/settingsdialog.cpp27
-rw-r--r--src/plugins/Effect/filewriter/settingsdialog.h2
-rw-r--r--src/plugins/General/converter/converterdialog.cpp28
-rw-r--r--src/plugins/General/converter/converterdialog.h5
-rw-r--r--src/plugins/General/fileops/settingsdialog.cpp27
-rw-r--r--src/plugins/General/fileops/settingsdialog.h5
-rw-r--r--src/plugins/General/trackchange/settingsdialog.cpp32
-rw-r--r--src/plugins/General/trackchange/settingsdialog.h4
-rw-r--r--src/plugins/Ui/qsui/popupsettings.cpp29
-rw-r--r--src/plugins/Ui/qsui/popupsettings.h5
-rw-r--r--src/plugins/Ui/qsui/qsuisettings.cpp31
-rw-r--r--src/plugins/Ui/qsui/qsuisettings.h6
-rw-r--r--src/plugins/Ui/skinned/popupsettings.cpp54
-rw-r--r--src/plugins/Ui/skinned/popupsettings.h10
-rw-r--r--src/plugins/Ui/skinned/skinnedsettings.cpp31
-rw-r--r--src/plugins/Ui/skinned/skinnedsettings.h4
16 files changed, 78 insertions, 222 deletions
diff --git a/src/plugins/Effect/filewriter/settingsdialog.cpp b/src/plugins/Effect/filewriter/settingsdialog.cpp
index 424c1dc91..ec4393ceb 100644
--- a/src/plugins/Effect/filewriter/settingsdialog.cpp
+++ b/src/plugins/Effect/filewriter/settingsdialog.cpp
@@ -20,9 +20,9 @@
#include <QSettings>
#include <QDesktopServices>
-#include <QMenu>
#include <qmmp/qmmp.h>
#include <qmmpui/filedialog.h>
+#include <qmmpui/metadataformattermenu.h>
#include "settingsdialog.h"
SettingsDialog::SettingsDialog(QWidget *parent)
@@ -31,25 +31,10 @@ SettingsDialog::SettingsDialog(QWidget *parent)
m_ui.setupUi(this);
setAttribute(Qt::WA_DeleteOnClose, true);
- QMenu *fileNameMenu = new QMenu(this);
- fileNameMenu->addAction(tr("Artist"))->setData("%p");
- fileNameMenu->addAction(tr("Album"))->setData("%a");
- fileNameMenu->addAction(tr("Album Artist"))->setData("%aa");
- fileNameMenu->addAction(tr("Title"))->setData("%t");
- fileNameMenu->addAction(tr("Track Number"))->setData("%n");
- fileNameMenu->addAction(tr("Two-digit Track Number"))->setData("%NN");
- fileNameMenu->addAction(tr("Genre"))->setData("%g");
- fileNameMenu->addAction(tr("Comment"))->setData("%c");
- fileNameMenu->addAction(tr("Composer"))->setData("%C");
- fileNameMenu->addAction(tr("Duration"))->setData("%l");
- fileNameMenu->addAction(tr("Disc Number"))->setData("%D");
- fileNameMenu->addAction(tr("File Name"))->setData("%f");
- fileNameMenu->addAction(tr("File Path"))->setData("%F");
- fileNameMenu->addAction(tr("Year"))->setData("%y");
- fileNameMenu->addAction(tr("Condition"))->setData("%p%if(%p&%t, - ,)%t");
+ MetaDataFormatterMenu *fileNameMenu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
m_ui.fileNameButton->setMenu(fileNameMenu);
m_ui.fileNameButton->setPopupMode(QToolButton::InstantPopup);
- connect(fileNameMenu, SIGNAL(triggered(QAction *)), SLOT(addTitleString(QAction *)));
+ connect(fileNameMenu, SIGNAL(patternSelected(QString)), SLOT(addTitleString(QString)));
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
QString outDir = QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
@@ -71,12 +56,12 @@ void SettingsDialog::accept()
QDialog::accept();
}
-void SettingsDialog::addTitleString(QAction *a)
+void SettingsDialog::addTitleString(const QString &str)
{
if (m_ui.outFileEdit->cursorPosition () < 1)
- m_ui.outFileEdit->insert(a->data().toString());
+ m_ui.outFileEdit->insert(str);
else
- m_ui.outFileEdit->insert(" - "+a->data().toString());
+ m_ui.outFileEdit->insert(" - "+str);
}
void SettingsDialog::on_dirButton_clicked()
diff --git a/src/plugins/Effect/filewriter/settingsdialog.h b/src/plugins/Effect/filewriter/settingsdialog.h
index f90900abf..7f19f9f64 100644
--- a/src/plugins/Effect/filewriter/settingsdialog.h
+++ b/src/plugins/Effect/filewriter/settingsdialog.h
@@ -38,7 +38,7 @@ public slots:
virtual void accept();
private slots:
- void addTitleString(QAction *a);
+ void addTitleString(const QString &str);
void on_dirButton_clicked();
private:
diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp
index 164d592dd..97ac12699 100644
--- a/src/plugins/General/converter/converterdialog.cpp
+++ b/src/plugins/General/converter/converterdialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2016 by Ilya Kotov *
+ * Copyright (C) 2011-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -31,6 +31,7 @@
#include <qmmpui/metadataformatter.h>
#include <qmmpui/filedialog.h>
#include <qmmp/metadatamanager.h>
+#include <qmmpui/metadataformattermenu.h>
#include "converter.h"
#include "preseteditor.h"
#include "converterdialog.h"
@@ -186,25 +187,10 @@ void ConverterDialog::reject()
void ConverterDialog::createMenus()
{
- QMenu *fileNameMenu = new QMenu(this);
- fileNameMenu->addAction(tr("Artist"))->setData("%p");
- fileNameMenu->addAction(tr("Album"))->setData("%a");
- fileNameMenu->addAction(tr("Album Artist"))->setData("%aa");
- fileNameMenu->addAction(tr("Title"))->setData("%t");
- fileNameMenu->addAction(tr("Track Number"))->setData("%n");
- fileNameMenu->addAction(tr("Two-digit Track Number"))->setData("%NN");
- fileNameMenu->addAction(tr("Genre"))->setData("%g");
- fileNameMenu->addAction(tr("Comment"))->setData("%c");
- fileNameMenu->addAction(tr("Composer"))->setData("%C");
- fileNameMenu->addAction(tr("Duration"))->setData("%l");
- fileNameMenu->addAction(tr("Disc Number"))->setData("%D");
- fileNameMenu->addAction(tr("File Name"))->setData("%f");
- fileNameMenu->addAction(tr("File Path"))->setData("%F");
- fileNameMenu->addAction(tr("Year"))->setData("%y");
- fileNameMenu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
+ MetaDataFormatterMenu *fileNameMenu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
m_ui.fileNameButton->setMenu(fileNameMenu);
m_ui.fileNameButton->setPopupMode(QToolButton::InstantPopup);
- connect(fileNameMenu, SIGNAL(triggered(QAction *)), SLOT(addTitleString(QAction *)));
+ connect(fileNameMenu, SIGNAL(patternSelected(QString)), SLOT(addTitleString(QString)));
QMenu *presetMenu = new QMenu(this);
presetMenu->addAction(tr("Create"), this, SLOT(createPreset()));
@@ -215,12 +201,12 @@ void ConverterDialog::createMenus()
m_ui.presetButton->setPopupMode(QToolButton::InstantPopup);
}
-void ConverterDialog::addTitleString(QAction *a)
+void ConverterDialog::addTitleString(const QString &str)
{
if (m_ui.outFileEdit->cursorPosition () < 1)
- m_ui.outFileEdit->insert(a->data().toString());
+ m_ui.outFileEdit->insert(str);
else
- m_ui.outFileEdit->insert(" - "+a->data().toString());
+ m_ui.outFileEdit->insert(" - "+str);
}
void ConverterDialog::createPreset()
diff --git a/src/plugins/General/converter/converterdialog.h b/src/plugins/General/converter/converterdialog.h
index c8cb59838..23c7384d9 100644
--- a/src/plugins/General/converter/converterdialog.h
+++ b/src/plugins/General/converter/converterdialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2016 by Ilya Kotov *
+ * Copyright (C) 2011-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -26,7 +26,6 @@
#include <QCloseEvent>
#include "ui_converterdialog.h"
-class QAction;
class PlayListTrack;
class ConverterPreset;
class Converter;
@@ -50,7 +49,7 @@ private slots:
void on_stopButton_clicked();
void onStateChanged(int row, QString message);
void onConvertFinished(Converter *c);
- void addTitleString(QAction *a);
+ void addTitleString(const QString &str);
void createPreset();
void editPreset();
void copyPreset();
diff --git a/src/plugins/General/fileops/settingsdialog.cpp b/src/plugins/General/fileops/settingsdialog.cpp
index 475949d33..1f0f7db8b 100644
--- a/src/plugins/General/fileops/settingsdialog.cpp
+++ b/src/plugins/General/fileops/settingsdialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2015 by Ilya Kotov *
+ * Copyright (C) 2009-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -18,7 +18,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <QSettings>
-#include <QMenu>
#include <QHeaderView>
#include <QApplication>
#include <QCheckBox>
@@ -26,6 +25,7 @@
#include <QDesktopServices>
#include <qmmp/qmmp.h>
#include <qmmpui/filedialog.h>
+#include <qmmpui/metadataformattermenu.h>
#include "fileops.h"
#include "hotkeydialog.h"
#include "settingsdialog.h"
@@ -216,30 +216,15 @@ void SettingsDialog::on_patternEdit_textChanged(QString pattern)
void SettingsDialog::createMenus()
{
- QMenu *menu = new QMenu(this);
- menu->addAction(tr("Artist"))->setData("%p");
- menu->addAction(tr("Album"))->setData("%a");
- menu->addAction(tr("Album Artist"))->setData("%aa");
- menu->addAction(tr("Title"))->setData("%t");
- menu->addAction(tr("Track Number"))->setData("%n");
- menu->addAction(tr("Two-digit Track Number"))->setData("%NN");
- menu->addAction(tr("Genre"))->setData("%g");
- menu->addAction(tr("Comment"))->setData("%c");
- menu->addAction(tr("Composer"))->setData("%C");
- menu->addAction(tr("Duration"))->setData("%l");
- menu->addAction(tr("Disc Number"))->setData("%D");
- menu->addAction(tr("File Name"))->setData("%f");
- menu->addAction(tr("File Path"))->setData("%F");
- menu->addAction(tr("Year"))->setData("%y");
- menu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
+ MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
m_ui.patternButton->setMenu(menu);
m_ui.patternButton->setPopupMode(QToolButton::InstantPopup);
- connect(menu, SIGNAL(triggered (QAction *)), SLOT(addTitleString( QAction *)));
+ connect(menu, SIGNAL(patternSelected(QString)), SLOT(addTitleString(QString)));
}
-void SettingsDialog::addTitleString(QAction *a)
+void SettingsDialog::addTitleString(const QString &str)
{
- m_ui.patternEdit->insert(a->data().toString());
+ m_ui.patternEdit->insert(str);
}
void SettingsDialog::on_destButton_clicked()
diff --git a/src/plugins/General/fileops/settingsdialog.h b/src/plugins/General/fileops/settingsdialog.h
index 00bf112dd..4b538db32 100644
--- a/src/plugins/General/fileops/settingsdialog.h
+++ b/src/plugins/General/fileops/settingsdialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2015 by Ilya Kotov *
+ * Copyright (C) 2009-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -21,7 +21,6 @@
#define SETTINGSDIALOG_H
#include <QDialog>
-
#include "ui_settingsdialog.h"
/**
@@ -47,7 +46,7 @@ private slots:
void updateLineEdits();
void on_destinationEdit_textChanged(QString dest);
void on_patternEdit_textChanged(QString pattern);
- void addTitleString(QAction *action);
+ void addTitleString(const QString &str);
void on_destButton_clicked();
void on_tableWidget_itemDoubleClicked (QTableWidgetItem *item);
diff --git a/src/plugins/General/trackchange/settingsdialog.cpp b/src/plugins/General/trackchange/settingsdialog.cpp
index 5cc8991fb..8c5ca71e0 100644
--- a/src/plugins/General/trackchange/settingsdialog.cpp
+++ b/src/plugins/General/trackchange/settingsdialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2013-2015 by Ilya Kotov *
+ * Copyright (C) 2013-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -21,6 +21,7 @@
#include <QSettings>
#include <QMenu>
#include <qmmp/qmmp.h>
+#include <qmmpui/metadataformattermenu.h>
#include "settingsdialog.h"
SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
@@ -53,28 +54,13 @@ void SettingsDialog::accept()
void SettingsDialog::addMenu(QToolButton *button)
{
- QMenu *menu = new QMenu(this);
- menu->addAction(tr("Artist"))->setData("%p");
- menu->addAction(tr("Album"))->setData("%a");
- menu->addAction(tr("Album Artist"))->setData("%aa");
- menu->addAction(tr("Title"))->setData("%t");
- menu->addAction(tr("Track Number"))->setData("%n");
- menu->addAction(tr("Two-digit Track Number"))->setData("%NN");
- menu->addAction(tr("Genre"))->setData("%g");
- menu->addAction(tr("Comment"))->setData("%c");
- menu->addAction(tr("Composer"))->setData("%C");
- menu->addAction(tr("Duration"))->setData("%l");
- menu->addAction(tr("Disc Number"))->setData("%D");
- menu->addAction(tr("File Name"))->setData("%f");
- menu->addAction(tr("File Path"))->setData("%F");
- menu->addAction(tr("Year"))->setData("%y");
- menu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
+ MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
button->setMenu(menu);
button->setPopupMode(QToolButton::InstantPopup);
- connect(menu, SIGNAL(triggered (QAction *)), SLOT(addTemplateString(QAction *)));
+ connect(menu, SIGNAL(patternSelected(QString)), SLOT(addTemplateString(QString)));
}
-void SettingsDialog::addTemplateString(QAction *a)
+void SettingsDialog::addTemplateString(const QString &str)
{
QMenu *menu = qobject_cast<QMenu*> (sender());
if(!menu)
@@ -82,18 +68,18 @@ void SettingsDialog::addTemplateString(QAction *a)
if(m_ui.newTrackButton->menu() == menu)
{
- m_ui.newTrackLineEdit->insert(a->data().toString());
+ m_ui.newTrackLineEdit->insert(str);
}
else if(m_ui.endOfTrackButton->menu() == menu)
{
- m_ui.endOfTrackLineEdit->insert(a->data().toString());
+ m_ui.endOfTrackLineEdit->insert(str);
}
else if(m_ui.endOfPlayListButton->menu() == menu)
{
- m_ui.endOfPlayListLineEdit->insert(a->data().toString());
+ m_ui.endOfPlayListLineEdit->insert(str);
}
else if(m_ui.titleChangeButton->menu() == menu)
{
- m_ui.titleChangeLineEdit->insert(a->data().toString());
+ m_ui.titleChangeLineEdit->insert(str);
}
}
diff --git a/src/plugins/General/trackchange/settingsdialog.h b/src/plugins/General/trackchange/settingsdialog.h
index e7e55ef0c..fa0b00e1e 100644
--- a/src/plugins/General/trackchange/settingsdialog.h
+++ b/src/plugins/General/trackchange/settingsdialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2013 by Ilya Kotov *
+ * Copyright (C) 2013-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -41,7 +41,7 @@ public slots:
void accept();
private slots:
- void addTemplateString(QAction *);
+ void addTemplateString(const QString &str);
private:
void addMenu(QToolButton *button);
diff --git a/src/plugins/Ui/qsui/popupsettings.cpp b/src/plugins/Ui/qsui/popupsettings.cpp
index 3c57cc0ee..320e9970e 100644
--- a/src/plugins/Ui/qsui/popupsettings.cpp
+++ b/src/plugins/Ui/qsui/popupsettings.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2015 by Ilya Kotov *
+ * Copyright (C) 2009-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -19,8 +19,8 @@
***************************************************************************/
#include <QSettings>
-#include <QMenu>
#include <qmmp/qmmp.h>
+#include <qmmpui/metadataformattermenu.h>
#include "popupwidget.h"
#include "popupsettings.h"
@@ -39,7 +39,6 @@ PopupSettings::PopupSettings(QWidget *parent)
createMenu();
}
-
PopupSettings::~PopupSettings()
{}
@@ -58,29 +57,9 @@ void PopupSettings::accept()
void PopupSettings::createMenu()
{
- QMenu *menu = new QMenu(this);
- menu->addAction(tr("Artist"))->setData("%p");
- menu->addAction(tr("Album"))->setData("%a");
- menu->addAction(tr("Album Artist"))->setData("%aa");
- menu->addAction(tr("Title"))->setData("%t");
- menu->addAction(tr("Track Number"))->setData("%n");
- menu->addAction(tr("Two-digit Track Number"))->setData("%NN");
- menu->addAction(tr("Genre"))->setData("%g");
- menu->addAction(tr("Comment"))->setData("%c");
- menu->addAction(tr("Composer"))->setData("%C");
- menu->addAction(tr("Duration"))->setData("%l");
- menu->addAction(tr("Disc Number"))->setData("%D");
- menu->addAction(tr("File Name"))->setData("%f");
- menu->addAction(tr("File Path"))->setData("%F");
- menu->addAction(tr("Year"))->setData("%y");
- menu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
+ MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
m_ui.insertButton->setMenu(menu);
- connect(menu, SIGNAL(triggered (QAction *)), SLOT(insertExpression(QAction *)));
-}
-
-void PopupSettings::insertExpression(QAction *a)
-{
- m_ui.textEdit->insertPlainText(a->data().toString());
+ connect(menu, SIGNAL(patternSelected(QString)), m_ui.textEdit, SLOT(insertPlainText(QString)));
}
void PopupSettings::on_resetButton_clicked()
diff --git a/src/plugins/Ui/qsui/popupsettings.h b/src/plugins/Ui/qsui/popupsettings.h
index 6c5b7f545..b653b8d3b 100644
--- a/src/plugins/Ui/qsui/popupsettings.h
+++ b/src/plugins/Ui/qsui/popupsettings.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2015 by Ilya Kotov *
+ * Copyright (C) 2009-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -23,8 +23,6 @@
#include <QDialog>
#include "ui_popupsettings.h"
-class Action;
-
/**
@author Ilya Kotov <forkotov02@hotmail.ru>
*/
@@ -40,7 +38,6 @@ public slots:
virtual void accept();
private slots:
- void insertExpression(QAction *);
void on_resetButton_clicked();
private:
diff --git a/src/plugins/Ui/qsui/qsuisettings.cpp b/src/plugins/Ui/qsui/qsuisettings.cpp
index d64443f24..dc175e914 100644
--- a/src/plugins/Ui/qsui/qsuisettings.cpp
+++ b/src/plugins/Ui/qsui/qsuisettings.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2015 by Ilya Kotov *
+ * Copyright (C) 2011-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -21,10 +21,10 @@
#include <QSettings>
#include <QDir>
#include <QFontDialog>
-#include <QMenu>
#include <qmmp/qmmp.h>
#include <qmmpui/filedialog.h>
#include <qmmpui/uihelper.h>
+#include <qmmpui/metadataformattermenu.h>
#include "actionmanager.h"
#include "shortcutitem.h"
#include "shortcutdialog.h"
@@ -114,27 +114,10 @@ void QSUISettings::loadFonts()
void QSUISettings::createActions()
{
- QMenu *menu = new QMenu(this);
- menu->addAction(tr("Artist"))->setData("%p");
- menu->addAction(tr("Album"))->setData("%a");
- menu->addAction(tr("Album Artist"))->setData("%aa");
- menu->addAction(tr("Title"))->setData("%t");
- menu->addAction(tr("Track Number"))->setData("%n");
- menu->addAction(tr("Two-digit Track Number"))->setData("%NN");
- menu->addAction(tr("Genre"))->setData("%g");
- menu->addAction(tr("Comment"))->setData("%c");
- menu->addAction(tr("Composer"))->setData("%C");
- menu->addAction(tr("Duration"))->setData("%l");
- menu->addAction(tr("Disc Number"))->setData("%D");
- menu->addAction(tr("File Name"))->setData("%f");
- menu->addAction(tr("File Path"))->setData("%F");
- menu->addAction(tr("Year"))->setData("%y");
- menu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
- menu->addAction(tr("Artist - Title"))->setData("%if(%p,%p - %t,%t)");
-
+ MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
m_ui.windowTitleButton->setMenu(menu);
m_ui.windowTitleButton->setPopupMode(QToolButton::InstantPopup);
- connect(menu, SIGNAL(triggered (QAction *)), SLOT(addWindowTitleString(QAction *)));
+ connect(menu, SIGNAL(patternSelected(QString)), SLOT(addWindowTitleString(QString)));
}
void QSUISettings::on_popupTemplateButton_clicked()
@@ -236,10 +219,10 @@ void QSUISettings::on_resetFontsButton_clicked()
loadFonts();
}
-void QSUISettings::addWindowTitleString(QAction *a)
+void QSUISettings::addWindowTitleString(const QString &str)
{
if (m_ui.windowTitleLineEdit->cursorPosition () < 1)
- m_ui.windowTitleLineEdit->insert(a->data().toString());
+ m_ui.windowTitleLineEdit->insert(str);
else
- m_ui.windowTitleLineEdit->insert(" - "+a->data().toString());
+ m_ui.windowTitleLineEdit->insert(" - "+str);
}
diff --git a/src/plugins/Ui/qsui/qsuisettings.h b/src/plugins/Ui/qsui/qsuisettings.h
index a6396a5c8..ea052aab1 100644
--- a/src/plugins/Ui/qsui/qsuisettings.h
+++ b/src/plugins/Ui/qsui/qsuisettings.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2015 by Ilya Kotov *
+ * Copyright (C) 2011-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -25,8 +25,6 @@
#include <QFileInfo>
#include "ui_qsuisettings.h"
-class QAction;
-
/**
@author Ilya Kotov <forkotov02@hotmail.ru>
*/
@@ -45,7 +43,7 @@ private slots:
void on_tabsFontButton_clicked();
void on_popupTemplateButton_clicked();
void on_resetFontsButton_clicked();
- void addWindowTitleString(QAction *a);
+ void addWindowTitleString(const QString &str);
private:
void showEvent(QShowEvent *);
diff --git a/src/plugins/Ui/skinned/popupsettings.cpp b/src/plugins/Ui/skinned/popupsettings.cpp
index e057f72ec..c6ceef853 100644
--- a/src/plugins/Ui/skinned/popupsettings.cpp
+++ b/src/plugins/Ui/skinned/popupsettings.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009-2015 by Ilya Kotov *
+ * Copyright (C) 2009-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -19,22 +19,22 @@
***************************************************************************/
#include <QSettings>
-#include <QMenu>
#include <qmmp/qmmp.h>
+#include <qmmpui/metadataformattermenu.h>
#include "popupwidget.h"
#include "popupsettings.h"
PopupSettings::PopupSettings(QWidget *parent)
: QDialog(parent)
{
- ui.setupUi(this);
+ m_ui.setupUi(this);
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.beginGroup("Skinned");
- ui.transparencySlider->setValue(100 - settings.value("popup_opacity", 1.0).toDouble()*100);
- ui.coverSizeSlider->setValue(settings.value ("popup_cover_size", 48).toInt());
- ui.textEdit->setPlainText(settings.value ("popup_template", DEFAULT_TEMPLATE).toString());
- ui.delaySpinBox->setValue(settings.value("popup_delay", 2500).toInt());
- ui.coverCheckBox->setChecked(settings.value("popup_show_cover",true).toBool());
+ m_ui.transparencySlider->setValue(100 - settings.value("popup_opacity", 1.0).toDouble()*100);
+ m_ui.coverSizeSlider->setValue(settings.value ("popup_cover_size", 48).toInt());
+ m_ui.textEdit->setPlainText(settings.value ("popup_template", DEFAULT_TEMPLATE).toString());
+ m_ui.delaySpinBox->setValue(settings.value("popup_delay", 2500).toInt());
+ m_ui.coverCheckBox->setChecked(settings.value("popup_show_cover",true).toBool());
settings.endGroup();
createMenu();
}
@@ -47,43 +47,23 @@ void PopupSettings::accept()
{
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.beginGroup("Skinned");
- settings.setValue("popup_opacity", 1.0 - (double)ui.transparencySlider->value()/100);
- settings.setValue("popup_cover_size", ui.coverSizeSlider->value());
- settings.setValue("popup_template", ui.textEdit->toPlainText());
- settings.setValue("popup_delay", ui.delaySpinBox->value());
- settings.setValue("popup_show_cover", ui.coverCheckBox->isChecked());
+ settings.setValue("popup_opacity", 1.0 - (double)m_ui.transparencySlider->value()/100);
+ settings.setValue("popup_cover_size", m_ui.coverSizeSlider->value());
+ settings.setValue("popup_template", m_ui.textEdit->toPlainText());
+ settings.setValue("popup_delay", m_ui.delaySpinBox->value());
+ settings.setValue("popup_show_cover", m_ui.coverCheckBox->isChecked());
settings.endGroup();
QDialog::accept();
}
void PopupSettings::createMenu()
{
- QMenu *menu = new QMenu(this);
- menu->addAction(tr("Artist"))->setData("%p");
- menu->addAction(tr("Album"))->setData("%a");
- menu->addAction(tr("Album Artist"))->setData("%aa");
- menu->addAction(tr("Title"))->setData("%t");
- menu->addAction(tr("Track Number"))->setData("%n");
- menu->addAction(tr("Two-digit Track Number"))->setData("%NN");
- menu->addAction(tr("Genre"))->setData("%g");
- menu->addAction(tr("Comment"))->setData("%c");
- menu->addAction(tr("Composer"))->setData("%C");
- menu->addAction(tr("Duration"))->setData("%l");
- menu->addAction(tr("Disc Number"))->setData("%D");
- menu->addAction(tr("File Name"))->setData("%f");
- menu->addAction(tr("File Path"))->setData("%F");
- menu->addAction(tr("Year"))->setData("%y");
- menu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
- ui.insertButton->setMenu(menu);
- connect(menu, SIGNAL(triggered (QAction *)), SLOT(insertExpression(QAction *)));
-}
-
-void PopupSettings::insertExpression(QAction *a)
-{
- ui.textEdit->insertPlainText(a->data().toString());
+ MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
+ m_ui.insertButton->setMenu(menu);
+ connect(menu, SIGNAL(patternSelected(QString)), m_ui.textEdit, SLOT(insertPlainText(QString)));
}
void PopupSettings::on_resetButton_clicked()
{
- ui.textEdit->setPlainText(DEFAULT_TEMPLATE);
+ m_ui.textEdit->setPlainText(DEFAULT_TEMPLATE);
}
diff --git a/src/plugins/Ui/skinned/popupsettings.h b/src/plugins/Ui/skinned/popupsettings.h
index ae60e89a2..84af1e7a5 100644
--- a/src/plugins/Ui/skinned/popupsettings.h
+++ b/src/plugins/Ui/skinned/popupsettings.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009 by Ilya Kotov *
+ * Copyright (C) 2009-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -23,10 +23,8 @@
#include <QDialog>
#include "ui_popupsettings.h"
-class Action;
-
/**
- @author Ilya Kotov <forkotov02@hotmail.ru>
+ @author Ilya Kotov <forkotov02@hotmail.ru>
*/
class PopupSettings : public QDialog
{
@@ -35,17 +33,15 @@ public:
PopupSettings(QWidget *parent = 0);
~PopupSettings();
-
public slots:
virtual void accept();
private slots:
- void insertExpression(QAction *);
void on_resetButton_clicked();
private:
void createMenu();
- Ui::PopupSettings ui;
+ Ui::PopupSettings m_ui;
QMap<uint, QPushButton*> m_buttons;
};
diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp
index b068e2e80..dbcab3ccb 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.cpp
+++ b/src/plugins/Ui/skinned/skinnedsettings.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2015 by Ilya Kotov *
+ * Copyright (C) 2011-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -21,10 +21,10 @@
#include <QSettings>
#include <QDir>
#include <QFontDialog>
-#include <QMenu>
#include <qmmp/qmmp.h>
#include <qmmpui/filedialog.h>
#include <qmmpui/uihelper.h>
+#include <qmmpui/metadataformattermenu.h>
#include "skinreader.h"
#include "skin.h"
#include "popupsettings.h"
@@ -179,27 +179,10 @@ void SkinnedSettings::findSkins(const QString &path)
void SkinnedSettings::createActions()
{
- QMenu *menu = new QMenu(this);
- menu->addAction(tr("Artist"))->setData("%p");
- menu->addAction(tr("Album"))->setData("%a");
- menu->addAction(tr("Album Artist"))->setData("%aa");
- menu->addAction(tr("Title"))->setData("%t");
- menu->addAction(tr("Track Number"))->setData("%n");
- menu->addAction(tr("Two-digit Track Number"))->setData("%NN");
- menu->addAction(tr("Genre"))->setData("%g");
- menu->addAction(tr("Comment"))->setData("%c");
- menu->addAction(tr("Composer"))->setData("%C");
- menu->addAction(tr("Duration"))->setData("%l");
- menu->addAction(tr("Disc Number"))->setData("%D");
- menu->addAction(tr("File Name"))->setData("%f");
- menu->addAction(tr("File Path"))->setData("%F");
- menu->addAction(tr("Year"))->setData("%y");
- menu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
- menu->addAction(tr("Artist - Title"))->setData("%if(%p,%p - %t,%t)");
-
+ MetaDataFormatterMenu *menu = new MetaDataFormatterMenu(MetaDataFormatterMenu::TITLE_MENU, this);
m_ui.windowTitleButton->setMenu(menu);
m_ui.windowTitleButton->setPopupMode(QToolButton::InstantPopup);
- connect(menu, SIGNAL(triggered (QAction *)), SLOT(addWindowTitleString(QAction *)));
+ connect(menu, SIGNAL(patternSelected(QString)), SLOT(addWindowTitleString(QString)));
}
void SkinnedSettings::loadSkins()
@@ -245,12 +228,12 @@ void SkinnedSettings::on_popupTemplateButton_clicked()
p->deleteLater();
}
-void SkinnedSettings::addWindowTitleString(QAction *a)
+void SkinnedSettings::addWindowTitleString(const QString &str)
{
if (m_ui.windowTitleLineEdit->cursorPosition () < 1)
- m_ui.windowTitleLineEdit->insert(a->data().toString());
+ m_ui.windowTitleLineEdit->insert(str);
else
- m_ui.windowTitleLineEdit->insert(" - "+a->data().toString());
+ m_ui.windowTitleLineEdit->insert(" - "+str);
}
void SkinnedSettings::readSettings()
diff --git a/src/plugins/Ui/skinned/skinnedsettings.h b/src/plugins/Ui/skinned/skinnedsettings.h
index 756019981..4fa2de9ab 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.h
+++ b/src/plugins/Ui/skinned/skinnedsettings.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2015 by Ilya Kotov *
+ * Copyright (C) 2011-2017 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -45,7 +45,7 @@ private slots:
void on_skinInstallButton_clicked();
void loadSkins();
void on_popupTemplateButton_clicked();
- void addWindowTitleString(QAction *a);
+ void addWindowTitleString(const QString &str);
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 17:57:08 +0000