Commit ea5e5f96 authored by Urs Fleisch's avatar Urs Fleisch
Browse files

Change ID3 format to tag format.

parent e34c842e
......@@ -697,7 +697,7 @@ TagFormatCommand::TagFormatCommand(Kid3Cli* processor) :
void TagFormatCommand::startCommand()
{
cli()->app()->applyId3Format();
cli()->app()->applyTagFormat();
}
......
......@@ -215,9 +215,9 @@ void KdeMainWindow::initActions()
KAction* toolsApplyFilenameFormat = new KAction(tr("Apply &Filename Format"), this);
actionCollection()->addAction(QLatin1String("apply_filename_format"), toolsApplyFilenameFormat);
connect(toolsApplyFilenameFormat, SIGNAL(triggered()), app(), SLOT(applyFilenameFormat()));
KAction* toolsApplyId3Format = new KAction(tr("Apply &Tag Format"), this);
actionCollection()->addAction(QLatin1String("apply_id3_format"), toolsApplyId3Format);
connect(toolsApplyId3Format, SIGNAL(triggered()), app(), SLOT(applyId3Format()));
KAction* toolsApplyTagFormat = new KAction(tr("Apply &Tag Format"), this);
actionCollection()->addAction(QLatin1String("apply_id3_format"), toolsApplyTagFormat);
connect(toolsApplyTagFormat, SIGNAL(triggered()), app(), SLOT(applyTagFormat()));
KAction* toolsApplyTextEncoding = new KAction(tr("Apply Text &Encoding"), this);
actionCollection()->addAction(QLatin1String("apply_text_encoding"), toolsApplyTextEncoding);
connect(toolsApplyTextEncoding, SIGNAL(triggered()), app(), SLOT(applyTextEncoding()));
......
......@@ -374,14 +374,14 @@ void Kid3MainWindow::initActions()
app(), SLOT(applyFilenameFormat()));
toolsMenu->addAction(toolsApplyFilenameFormat);
QAction* toolsApplyId3Format = new QAction(this);
toolsApplyId3Format->setStatusTip(tr("Apply Tag Format"));
toolsApplyId3Format->setText(tr("Apply &Tag Format"));
toolsApplyId3Format->setObjectName(QLatin1String("apply_id3_format"));
m_shortcutsModel->registerAction(toolsApplyId3Format, menuTitle);
connect(toolsApplyId3Format, SIGNAL(triggered()),
app(), SLOT(applyId3Format()));
toolsMenu->addAction(toolsApplyId3Format);
QAction* toolsApplyTagFormat = new QAction(this);
toolsApplyTagFormat->setStatusTip(tr("Apply Tag Format"));
toolsApplyTagFormat->setText(tr("Apply &Tag Format"));
toolsApplyTagFormat->setObjectName(QLatin1String("apply_id3_format"));
m_shortcutsModel->registerAction(toolsApplyTagFormat, menuTitle);
connect(toolsApplyTagFormat, SIGNAL(triggered()),
app(), SLOT(applyTagFormat()));
toolsMenu->addAction(toolsApplyTagFormat);
QAction* toolsApplyTextEncoding = new QAction(this);
toolsApplyTextEncoding->setStatusTip(tr("Apply Text Encoding"));
......
......@@ -1199,9 +1199,9 @@ void Kid3Application::applyFilenameFormat()
}
/**
* Apply ID3 format.
* Apply tag format.
*/
void Kid3Application::applyId3Format()
void Kid3Application::applyTagFormat()
{
emit fileSelectionUpdateRequested();
FrameCollection frames;
......
......@@ -758,9 +758,9 @@ public slots:
void applyFilenameFormat();
/**
* Apply ID3 format.
* Apply tag format.
*/
void applyId3Format();
void applyTagFormat();
/**
* Apply text encoding.
......
......@@ -308,7 +308,7 @@ void ScriptInterface::applyFilenameFormat()
*/
void ScriptInterface::applyTagFormat()
{
m_app->applyId3Format();
m_app->applyTagFormat();
}
/**
......
......@@ -65,7 +65,7 @@ ConfigDialogPages::ConfigDialogPages(QObject* parent) : QObject(parent),
m_pictureNameComboBox(0), m_markOversizedPicturesCheckBox(0),
m_maximumPictureSizeSpinBox(0), m_genreNotNumericCheckBox(0),
m_textEncodingComboBox(0), m_id3v2VersionComboBox(0),
m_trackNumberDigitsSpinBox(0), m_fnFormatBox(0), m_id3FormatBox(0),
m_trackNumberDigitsSpinBox(0), m_fnFormatBox(0), m_tagFormatBox(0),
m_onlyCustomGenresCheckBox(0), m_genresEditModel(0),
m_quickAccessTagsModel(0), m_playOnDoubleClickCheckBox(0),
m_commandsTable(0), m_commandsTableModel(0), m_browserLineEdit(0),
......@@ -213,9 +213,9 @@ QWidget* ConfigDialogPages::createTagsPage()
QWidget* tag1AndTag2Page = new QWidget;
QVBoxLayout* tag1AndTag2Layout = new QVBoxLayout(tag1AndTag2Page);
QString id3FormatTitle(tr("&Tag Format"));
m_id3FormatBox = new FormatBox(id3FormatTitle, tag1AndTag2Page);
tag1AndTag2Layout->addWidget(m_id3FormatBox);
QString tagFormatTitle(tr("&Tag Format"));
m_tagFormatBox = new FormatBox(tagFormatTitle, tag1AndTag2Page);
tag1AndTag2Layout->addWidget(m_tagFormatBox);
QTabWidget* tagsTabWidget = new QTabWidget;
if (tagCfg.taggedFileFeatures() & TaggedFile::TF_ID3v11) {
......@@ -389,7 +389,7 @@ void ConfigDialogPages::setConfig()
const ImportConfig& importCfg = ImportConfig::instance();
m_fnFormatBox->fromFormatConfig(fnCfg);
m_id3FormatBox->fromFormatConfig(id3Cfg);
m_tagFormatBox->fromFormatConfig(id3Cfg);
m_markTruncationsCheckBox->setChecked(tagCfg.markTruncations());
m_totalNumTracksCheckBox->setChecked(tagCfg.enableTotalNumberOfTracks());
m_loadLastOpenedFileCheckBox->setChecked(fileCfg.loadLastOpenedFile());
......@@ -481,7 +481,7 @@ void ConfigDialogPages::getConfig() const
ImportConfig& importCfg = ImportConfig::instance();
m_fnFormatBox->toFormatConfig(fnCfg);
m_id3FormatBox->toFormatConfig(id3Cfg);
m_tagFormatBox->toFormatConfig(id3Cfg);
tagCfg.setMarkTruncations(m_markTruncationsCheckBox->isChecked());
tagCfg.setEnableTotalNumberOfTracks(m_totalNumTracksCheckBox->isChecked());
fileCfg.setLoadLastOpenedFile(m_loadLastOpenedFileCheckBox->isChecked());
......
......@@ -134,7 +134,7 @@ private:
/** Filename Format box */
FormatBox* m_fnFormatBox;
/** ID3 Format box */
FormatBox* m_id3FormatBox;
FormatBox* m_tagFormatBox;
/** Only custom genres checkbox */
QCheckBox* m_onlyCustomGenresCheckBox;
/** Model with list of custom genres */
......
......@@ -129,7 +129,7 @@ MainView {
}
Action {
text: qsTr("Apply Tag Format")
onTriggered: app.applyId3Format()
onTriggered: app.applyTagFormat()
}
Action {
text: qsTr("Apply Text Encoding")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment