From 6f96f16e32a88cf032ff83f6ea73587879d76892 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 11 Feb 2021 18:24:33 +0000 Subject: added feature to change cue editor font git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9726 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/configdialog.cpp | 27 +++++- src/qmmpui/configdialog.h | 2 + src/qmmpui/cueeditor.cpp | 7 ++ src/qmmpui/forms/configdialog.ui | 190 ++++++++++++++++++++++++++++++++------- 4 files changed, 189 insertions(+), 37 deletions(-) diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp index f52478c3e..f125def21 100644 --- a/src/qmmpui/configdialog.cpp +++ b/src/qmmpui/configdialog.cpp @@ -177,10 +177,16 @@ void ConfigDialog::readSettings() QList sizes; sizes << var_sizes.first().toInt() << var_sizes.last().toInt(); m_ui->splitter->setSizes(sizes); + //fonts + QFont font; + font.fromString(settings.value("CueEditor/font", qApp->font("QPlainTextEdit").toString()).toString()); + m_ui->cueFontLabel->setText(font.family() + " " + QString::number(font.pointSize())); + m_ui->cueFontLabel->setFont(font); + m_ui->cueSystemFontCheckBox->setChecked(settings.value("CueEditor/use_system_font", true).toBool()); } -void ConfigDialog::on_contentsWidget_currentItemChanged (QListWidgetItem *current, - QListWidgetItem *previous) +void ConfigDialog::on_contentsWidget_currentItemChanged(QListWidgetItem *current, + QListWidgetItem *previous) { if (!current) current = previous; @@ -442,6 +448,9 @@ void ConfigDialog::saveSettings() int index = m_ui->langComboBox->currentIndex(); if(index >= 0) Qmmp::setUiLanguageID(m_ui->langComboBox->itemData(index).toString()); + //fonts + settings.setValue("CueEditor/font", m_ui->cueFontLabel->font().toString()); + settings.setValue("CueEditor/use_system_font", m_ui->cueSystemFontCheckBox->isChecked()); } void ConfigDialog::on_treeWidget_itemChanged (QTreeWidgetItem *item, int column) @@ -450,7 +459,7 @@ void ConfigDialog::on_treeWidget_itemChanged (QTreeWidgetItem *item, int column) dynamic_cast(item)->setEnabled(item->checkState(0) == Qt::Checked); } -void ConfigDialog::on_treeWidget_currentItemChanged (QTreeWidgetItem *current, QTreeWidgetItem *) +void ConfigDialog::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *) { if(current->type() >= PluginItem::TRANSPORT) { @@ -465,3 +474,15 @@ void ConfigDialog::on_treeWidget_currentItemChanged (QTreeWidgetItem *current, Q m_preferencesAction->setEnabled(m_ui->preferencesButton->isEnabled()); m_informationAction->setEnabled(m_ui->informationButton->isEnabled()); } + +void ConfigDialog::on_cueFontButton_clicked() +{ + bool ok = false; + QFont font = m_ui->cueFontLabel->font(); + font = QFontDialog::getFont (&ok, font, this); + if(ok) + { + m_ui->cueFontLabel->setText(font.family () + " " + QString::number(font.pointSize ())); + m_ui->cueFontLabel->setFont(font); + } +} diff --git a/src/qmmpui/configdialog.h b/src/qmmpui/configdialog.h index e5010da28..885f7d779 100644 --- a/src/qmmpui/configdialog.h +++ b/src/qmmpui/configdialog.h @@ -67,6 +67,8 @@ private slots: void saveSettings(); void on_treeWidget_itemChanged (QTreeWidgetItem *item, int column); void on_treeWidget_currentItemChanged (QTreeWidgetItem *current, QTreeWidgetItem *); + void on_cueFontButton_clicked(); + private: void readSettings(); diff --git a/src/qmmpui/cueeditor.cpp b/src/qmmpui/cueeditor.cpp index 8366e5024..865f59752 100644 --- a/src/qmmpui/cueeditor.cpp +++ b/src/qmmpui/cueeditor.cpp @@ -74,6 +74,13 @@ CueEditor::CueEditor(MetaDataModel *model, const TrackInfo &info, QWidget *paren m_parser.loadData(model->cue().toUtf8()); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_lastDir = settings.value("CueEditor/last_dir", QDir::homePath()).toString(); + if(!settings.value("CueEditor/use_system_font", true).toBool()) + { + QFont font; + font.fromString(settings.value("CueEditor/font", qApp->font("QPlainTextEdit").toString()).toString()); + m_ui->plainTextEdit->setFont(font); + } + m_editable = m_model && (m_model->dialogHints() & MetaDataModel::IsCueEditable) && !m_model->isReadOnly(); new CueSyntaxHighlighter(m_ui->plainTextEdit->document()); diff --git a/src/qmmpui/forms/configdialog.ui b/src/qmmpui/forms/configdialog.ui index 9bc4d8cc6..195d93f5c 100644 --- a/src/qmmpui/forms/configdialog.ui +++ b/src/qmmpui/forms/configdialog.ui @@ -6,8 +6,8 @@ 0 0 - 739 - 545 + 836 + 618 @@ -508,6 +508,80 @@ + + + + CUE Editor + + + + + + Use system font + + + true + + + + + + + + + false + + + + 0 + 0 + + + + Font: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + false + + + + 0 + 0 + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + ??? + + + + + + + false + + + ... + + + + + + + + @@ -920,12 +994,12 @@ setEnabled(bool) - 480 - 63 + 341 + 34 - 617 - 131 + 341 + 33 @@ -936,12 +1010,12 @@ setEnabled(bool) - 480 - 63 + 341 + 34 - 617 - 163 + 341 + 32 @@ -952,12 +1026,12 @@ setEnabled(bool) - 617 - 192 + 341 + 32 - 617 - 224 + 341 + 31 @@ -968,12 +1042,12 @@ setEnabled(bool) - 617 - 192 + 341 + 32 - 617 - 256 + 341 + 31 @@ -984,8 +1058,8 @@ reject() - 633 - 482 + 639 + 611 225 @@ -1000,8 +1074,8 @@ accept() - 633 - 482 + 639 + 611 141 @@ -1016,12 +1090,12 @@ setEnabled(bool) - 480 - 192 + 629 + 221 - 617 - 194 + 813 + 223 @@ -1032,12 +1106,12 @@ setEnabled(bool) - 257 - 50 + 320 + 39 - 261 - 80 + 341 + 35 @@ -1048,12 +1122,60 @@ setEnabled(bool) - 342 - 55 + 341 + 34 + + + 341 + 33 + + + + + cueSystemFontCheckBox + clicked(bool) + label_21 + setDisabled(bool) + + + 291 + 509 + + + 299 + 531 + + + + + cueSystemFontCheckBox + toggled(bool) + cueFontLabel + setDisabled(bool) + + + 350 + 499 + + + 369 + 531 + + + + + cueSystemFontCheckBox + toggled(bool) + cueFontButton + setDisabled(bool) + + + 774 + 502 - 356 - 88 + 804 + 526 -- cgit v1.2.3-13-gbd6f