diff options
Diffstat (limited to 'src/gui/dialogs/LilyPondOptionsDialog.cpp')
-rw-r--r-- | src/gui/dialogs/LilyPondOptionsDialog.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp index b1adfec..aba8507 100644 --- a/src/gui/dialogs/LilyPondOptionsDialog.cpp +++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp @@ -27,7 +27,7 @@ #include "document/io/LilyPondExporter.h" #include "gui/configuration/HeadersConfigurationPage.h" -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include "document/ConfigGroups.h" @@ -114,10 +114,10 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, m_lilyLanguage = new KComboBox(frameBasic); // See also setDefaultLilyPondVersion below - m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.6")); - m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.8")); - m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.10")); - m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.12")); + m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.6")); + m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.8")); + m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.10")); + m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.12")); m_lilyLanguage->setCurrentItem(config->readUnsignedNumEntry("lilylanguage", 0)); layoutBasic->addWidget(m_lilyLanguage, 0, 1); @@ -154,7 +154,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, m_lilyFontSize = new KComboBox(frameBasic); int sizes[] = { 11, 13, 16, 19, 20, 23, 26 }; for (int i = 0; i < sizeof(sizes)/sizeof(sizes[0]); ++i) { - m_lilyFontSize->insertItem(i18n("%1 pt").tqarg(sizes[i])); + m_lilyFontSize->insertItem(i18n("%1 pt").arg(sizes[i])); } m_lilyFontSize->setCurrentItem(config->readUnsignedNumEntry ("lilyfontsize", 4)); @@ -251,10 +251,10 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, m_lilyLyricsHAlignment->insertItem(i18n("Left")); m_lilyLyricsHAlignment->insertItem(i18n("Center")); m_lilyLyricsHAlignment->insertItem(i18n("Right")); - m_lilyLyricsHAlignment->setCurrentItem(config->readUnsignedNumEntry("lilylyricshtqalignment", 0)); + m_lilyLyricsHAlignment->setCurrentItem(config->readUnsignedNumEntry("lilylyricshalignment", 0)); layoutAdvancedLayout->addWidget(new TQLabel( - i18n("Lyrics tqalignment"), frameAdvancedLayout), 0, 0); + i18n("Lyrics alignment"), frameAdvancedLayout), 0, 0); layoutAdvancedLayout->addWidget(m_lilyLyricsHAlignment, 0, 1); m_lilyRaggedBottom = new TQCheckBox( @@ -292,7 +292,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, advancedGrid->setRowStretch(2, 10); - resize(tqminimumSize()); + resize(minimumSize()); } void @@ -314,7 +314,7 @@ LilyPondOptionsDialog::slotApply() config->writeEntry("lilyexportbeamings", m_lilyExportBeams->isChecked()); config->writeEntry("lilyexportstaffmerge", m_lilyExportStaffMerge->isChecked()); config->writeEntry("lilyexportstaffbrackets", m_lilyExportStaffGroup->isChecked()); - config->writeEntry("lilylyricshtqalignment", m_lilyLyricsHAlignment->currentItem()); + config->writeEntry("lilylyricshalignment", m_lilyLyricsHAlignment->currentItem()); config->writeEntry("lilyexportmarkermode", m_lilyMarkerMode->currentItem()); m_headersPage->apply(); } |