diff options
Diffstat (limited to 'src/plugins/texteditor')
20 files changed, 131 insertions, 123 deletions
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index 89786204ed..572a54f918 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -291,7 +291,7 @@ public: ~BaseTextEditor(); static ITextEditor *openEditorAt(const QString &fileName, int line, int column = 0, - const QString &editorKind = QString()); + const QString &editorId = QString()); const Utils::ChangeSet &changeSet() const; void setChangeSet(const Utils::ChangeSet &changeSet); diff --git a/src/plugins/texteditor/behaviorsettingspage.cpp b/src/plugins/texteditor/behaviorsettingspage.cpp index 79c0d7e29a..9e6c8fbf8b 100644 --- a/src/plugins/texteditor/behaviorsettingspage.cpp +++ b/src/plugins/texteditor/behaviorsettingspage.cpp @@ -83,9 +83,9 @@ QString BehaviorSettingsPage::id() const return m_d->m_parameters.id; } -QString BehaviorSettingsPage::trName() const +QString BehaviorSettingsPage::displayName() const { - return m_d->m_parameters.name; + return m_d->m_parameters.displayName; } QString BehaviorSettingsPage::category() const @@ -93,9 +93,9 @@ QString BehaviorSettingsPage::category() const return m_d->m_parameters.category; } -QString BehaviorSettingsPage::trCategory() const +QString BehaviorSettingsPage::displayCategory() const { - return m_d->m_parameters.trCategory; + return m_d->m_parameters.displayCategory; } QWidget *BehaviorSettingsPage::createPage(QWidget *parent) diff --git a/src/plugins/texteditor/behaviorsettingspage.h b/src/plugins/texteditor/behaviorsettingspage.h index a07eb24ef7..389e0c5947 100644 --- a/src/plugins/texteditor/behaviorsettingspage.h +++ b/src/plugins/texteditor/behaviorsettingspage.h @@ -45,9 +45,9 @@ struct BehaviorSettings; struct BehaviorSettingsPageParameters { QString id; - QString name; + QString displayName; QString category; - QString trCategory; + QString displayCategory; QString settingsPrefix; }; @@ -61,9 +61,9 @@ public: // IOptionsPage QString id() const; - QString trName() const; + QString displayName() const; QString category() const; - QString trCategory() const; + QString displayCategory() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/texteditor/colorscheme.cpp b/src/plugins/texteditor/colorscheme.cpp index 87ab6efe0c..8feecd69f9 100644 --- a/src/plugins/texteditor/colorscheme.cpp +++ b/src/plugins/texteditor/colorscheme.cpp @@ -142,8 +142,8 @@ bool ColorScheme::save(const QString &fileName) const w.writeStartDocument(); w.writeStartElement(QLatin1String("style-scheme")); w.writeAttribute(QLatin1String("version"), QLatin1String("1.0")); - if (!m_name.isEmpty()) - w.writeAttribute(QLatin1String("name"), m_name); + if (!m_displayName.isEmpty()) + w.writeAttribute(QLatin1String("name"), m_displayName); Format textFormat = formatFor(QLatin1String(Constants::C_TEXT)); @@ -245,7 +245,7 @@ void ColorSchemeReader::readStyleScheme() // We're done raiseError(QLatin1String("name loaded")); else - m_scheme->setName(m_name); + m_scheme->setDisplayName(m_name); while (readNextStartElement()) { if (name() == QLatin1String("style")) diff --git a/src/plugins/texteditor/colorscheme.h b/src/plugins/texteditor/colorscheme.h index 7ccd9f70fd..22bbc399f8 100644 --- a/src/plugins/texteditor/colorscheme.h +++ b/src/plugins/texteditor/colorscheme.h @@ -80,11 +80,11 @@ class ColorScheme public: ColorScheme(); - void setName(const QString &name) - { m_name = name; } + void setDisplayName(const QString &name) + { m_displayName = name; } - QString name() const - { return m_name; } + QString displayName() const + { return m_displayName; } inline bool isEmpty() const { return m_formats.isEmpty(); } @@ -104,14 +104,14 @@ public: inline bool equals(const ColorScheme &cs) const { return m_formats == cs.m_formats - && m_name == cs.m_name; + && m_displayName == cs.m_displayName; } static QString readNameOfScheme(const QString &fileName); private: QMap<QString, Format> m_formats; - QString m_name; + QString m_displayName; }; inline bool operator==(const ColorScheme &cs1, const ColorScheme &cs2) { return cs1.equals(cs2); } diff --git a/src/plugins/texteditor/colorschemeedit.cpp b/src/plugins/texteditor/colorschemeedit.cpp index 9f70d3154d..5de321a680 100644 --- a/src/plugins/texteditor/colorschemeedit.cpp +++ b/src/plugins/texteditor/colorschemeedit.cpp @@ -95,23 +95,23 @@ public: switch (role) { case Qt::DisplayRole: - return description.trName(); + return description.displayName(); case Qt::ForegroundRole: { - QColor foreground = m_scheme->formatFor(description.name()).foreground(); + QColor foreground = m_scheme->formatFor(description.id()).foreground(); if (foreground.isValid()) return foreground; else return m_scheme->formatFor(QLatin1String(TextEditor::Constants::C_TEXT)).foreground(); } case Qt::BackgroundRole: { - QColor background = m_scheme->formatFor(description.name()).background(); + QColor background = m_scheme->formatFor(description.id()).background(); if (background.isValid()) return background; } case Qt::FontRole: { QFont font = m_baseFont; - font.setBold(m_scheme->formatFor(description.name()).bold()); - font.setItalic(m_scheme->formatFor(description.name()).italic()); + font.setBold(m_scheme->formatFor(description.id()).bold()); + font.setItalic(m_scheme->formatFor(description.id()).italic()); return font; } } @@ -218,7 +218,7 @@ void ColorSchemeEdit::currentItemChanged(const QModelIndex &index) void ColorSchemeEdit::updateControls() { - const Format &format = m_scheme.formatFor(m_descriptions[m_curItem].name()); + const Format &format = m_scheme.formatFor(m_descriptions[m_curItem].id()); m_ui->foregroundToolButton->setStyleSheet(colorButtonStyleSheet(format.foreground())); m_ui->backgroundToolButton->setStyleSheet(colorButtonStyleSheet(format.background())); @@ -238,7 +238,7 @@ void ColorSchemeEdit::changeForeColor() { if (m_curItem == -1) return; - QColor color = m_scheme.formatFor(m_descriptions[m_curItem].name()).foreground(); + QColor color = m_scheme.formatFor(m_descriptions[m_curItem].id()).foreground(); const QColor newColor = QColorDialog::getColor(color, m_ui->boldCheckBox->window()); if (!newColor.isValid()) return; @@ -247,7 +247,7 @@ void ColorSchemeEdit::changeForeColor() m_ui->foregroundToolButton->setStyleSheet(colorButtonStyleSheet(newColor)); foreach (const QModelIndex &index, m_ui->itemList->selectionModel()->selectedRows()) { - const QString category = m_descriptions[index.row()].name(); + const QString category = m_descriptions[index.row()].id(); m_scheme.formatFor(category).setForeground(newColor); m_formatsModel->emitDataChanged(index); } @@ -257,7 +257,7 @@ void ColorSchemeEdit::changeBackColor() { if (m_curItem == -1) return; - QColor color = m_scheme.formatFor(m_descriptions[m_curItem].name()).background(); + QColor color = m_scheme.formatFor(m_descriptions[m_curItem].id()).background(); const QColor newColor = QColorDialog::getColor(color, m_ui->boldCheckBox->window()); if (!newColor.isValid()) return; @@ -265,7 +265,7 @@ void ColorSchemeEdit::changeBackColor() m_ui->eraseBackgroundToolButton->setEnabled(true); foreach (const QModelIndex &index, m_ui->itemList->selectionModel()->selectedRows()) { - const QString category = m_descriptions[index.row()].name(); + const QString category = m_descriptions[index.row()].id(); m_scheme.formatFor(category).setBackground(newColor); m_formatsModel->emitDataChanged(index); // Synchronize item list background with text background @@ -283,7 +283,7 @@ void ColorSchemeEdit::eraseBackColor() m_ui->eraseBackgroundToolButton->setEnabled(false); foreach (const QModelIndex &index, m_ui->itemList->selectionModel()->selectedRows()) { - const QString category = m_descriptions[index.row()].name(); + const QString category = m_descriptions[index.row()].id(); m_scheme.formatFor(category).setBackground(newColor); m_formatsModel->emitDataChanged(index); } @@ -295,7 +295,7 @@ void ColorSchemeEdit::checkCheckBoxes() return; foreach (const QModelIndex &index, m_ui->itemList->selectionModel()->selectedRows()) { - const QString category = m_descriptions[index.row()].name(); + const QString category = m_descriptions[index.row()].id(); m_scheme.formatFor(category).setBold(m_ui->boldCheckBox->isChecked()); m_scheme.formatFor(category).setItalic(m_ui->italicCheckBox->isChecked()); m_formatsModel->emitDataChanged(index); diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp index 19efd49f27..c250ae8ea1 100644 --- a/src/plugins/texteditor/displaysettingspage.cpp +++ b/src/plugins/texteditor/displaysettingspage.cpp @@ -74,9 +74,9 @@ QString DisplaySettingsPage::id() const return m_d->m_parameters.id; } -QString DisplaySettingsPage::trName() const +QString DisplaySettingsPage::displayName() const { - return m_d->m_parameters.name; + return m_d->m_parameters.displayName; } QString DisplaySettingsPage::category() const @@ -84,9 +84,9 @@ QString DisplaySettingsPage::category() const return m_d->m_parameters.category; } -QString DisplaySettingsPage::trCategory() const +QString DisplaySettingsPage::displayCategory() const { - return m_d->m_parameters.trCategory; + return m_d->m_parameters.displayCategory; } QWidget *DisplaySettingsPage::createPage(QWidget *parent) diff --git a/src/plugins/texteditor/displaysettingspage.h b/src/plugins/texteditor/displaysettingspage.h index 0554aa5149..c6dfe13091 100644 --- a/src/plugins/texteditor/displaysettingspage.h +++ b/src/plugins/texteditor/displaysettingspage.h @@ -43,9 +43,9 @@ struct DisplaySettings; struct DisplaySettingsPageParameters { QString id; - QString name; + QString displayName; QString category; - QString trCategory; + QString displayCategory; QString settingsPrefix; }; @@ -59,9 +59,9 @@ public: // IOptionsPage QString id() const; - QString trName() const; + QString displayName() const; QString category() const; - QString trCategory() const; + QString displayCategory() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp index cf14545c8f..e707af2670 100644 --- a/src/plugins/texteditor/fontsettings.cpp +++ b/src/plugins/texteditor/fontsettings.cpp @@ -126,8 +126,8 @@ bool FontSettings::fromSettings(const QString &category, } else { // Load color scheme from ini file foreach (const FormatDescription &desc, descriptions) { - const QString name = desc.name(); - const QString fmt = s->value(group + name, QString()).toString(); + const QString id = desc.id(); + const QString fmt = s->value(group + id, QString()).toString(); Format format; if (fmt.isEmpty()) { format.setForeground(desc.foreground()); @@ -137,10 +137,10 @@ bool FontSettings::fromSettings(const QString &category, } else { format.fromString(fmt); } - m_scheme.setFormatFor(name, format); + m_scheme.setFormatFor(id, format); } - m_scheme.setName(QCoreApplication::translate("TextEditor::Internal::FontSettings", "Customized")); + m_scheme.setDisplayName(QCoreApplication::translate("TextEditor::Internal::FontSettings", "Customized")); } return true; @@ -286,14 +286,14 @@ bool FontSettings::loadColorScheme(const QString &fileName, // Apply default formats to undefined categories foreach (const FormatDescription &desc, descriptions) { - const QString name = desc.name(); - if (!m_scheme.contains(name)) { + const QString id = desc.id(); + if (!m_scheme.contains(id)) { Format format; format.setForeground(desc.foreground()); format.setBackground(desc.background()); format.setBold(desc.format().bold()); format.setItalic(desc.format().italic()); - m_scheme.setFormatFor(name, format); + m_scheme.setFormatFor(id, format); } } diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index ea351db3a0..450267ac25 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -125,10 +125,10 @@ public: public: const QString m_id; - const QString m_name; + const QString m_displayName; const QString m_settingsGroup; const QString m_category; - const QString m_trCategory; + const QString m_displayCategory; TextEditor::FormatDescriptions m_descriptions; FontSettings m_value; @@ -178,14 +178,14 @@ static QString createColorSchemeFileName(const QString &pattern) // ------- FontSettingsPagePrivate FontSettingsPagePrivate::FontSettingsPagePrivate(const TextEditor::FormatDescriptions &fd, const QString &id, - const QString &name, + const QString &displayName, const QString &category, const QString &trCategory) : m_id(id), - m_name(name), + m_displayName(displayName), m_settingsGroup(Utils::settingsKey(category)), m_category(category), - m_trCategory(trCategory), + m_displayCategory(trCategory), m_descriptions(fd), m_schemeListModel(new SchemeListModel), m_refreshingSchemeList(false) @@ -197,22 +197,22 @@ FontSettingsPagePrivate::FontSettingsPagePrivate(const TextEditor::FormatDescrip if (!settingsFound) { // Apply defaults foreach (const FormatDescription &f, m_descriptions) { - const QString name = f.name(); + const QString id = f.id(); - m_value.formatFor(name).setForeground(f.foreground()); - m_value.formatFor(name).setBackground(f.background()); - m_value.formatFor(name).setBold(f.format().bold()); - m_value.formatFor(name).setItalic(f.format().italic()); + m_value.formatFor(id).setForeground(f.foreground()); + m_value.formatFor(id).setBackground(f.background()); + m_value.formatFor(id).setBold(f.format().bold()); + m_value.formatFor(id).setItalic(f.format().italic()); } } else if (m_value.colorSchemeFileName().isEmpty()) { // No color scheme was loaded, but one might be imported from the ini file ColorScheme defaultScheme; foreach (const FormatDescription &f, m_descriptions) { - const QString name = f.name(); - defaultScheme.formatFor(name).setForeground(f.foreground()); - defaultScheme.formatFor(name).setBackground(f.background()); - defaultScheme.formatFor(name).setBold(f.format().bold()); - defaultScheme.formatFor(name).setItalic(f.format().italic()); + const QString id = f.id(); + defaultScheme.formatFor(id).setForeground(f.foreground()); + defaultScheme.formatFor(id).setBackground(f.background()); + defaultScheme.formatFor(id).setBold(f.format().bold()); + defaultScheme.formatFor(id).setItalic(f.format().italic()); } if (m_value.colorScheme() != defaultScheme) { // Save it as a color scheme file @@ -234,32 +234,32 @@ FontSettingsPagePrivate::~FontSettingsPagePrivate() // ------- FormatDescription -FormatDescription::FormatDescription(const QString &name, const QString &trName, const QColor &color) : - m_name(name), - m_trName(trName) +FormatDescription::FormatDescription(const QString &id, const QString &displayName, const QColor &color) : + m_id(id), + m_displayName(displayName) { m_format.setForeground(color); } QColor FormatDescription::foreground() const { - if (m_name == QLatin1String(Constants::C_LINE_NUMBER)) { + if (m_id == QLatin1String(Constants::C_LINE_NUMBER)) { const QColor bg = QApplication::palette().background().color(); if (bg.value() < 128) { return QApplication::palette().foreground().color(); } else { return QApplication::palette().dark().color(); } - } else if (m_name == QLatin1String(Constants::C_CURRENT_LINE_NUMBER)) { + } else if (m_id == QLatin1String(Constants::C_CURRENT_LINE_NUMBER)) { const QColor bg = QApplication::palette().background().color(); if (bg.value() < 128) { return QApplication::palette().foreground().color(); } else { return m_format.foreground(); } - } else if (m_name == QLatin1String(Constants::C_OCCURRENCES_UNUSED)) { + } else if (m_id == QLatin1String(Constants::C_OCCURRENCES_UNUSED)) { return Qt::darkYellow; - } else if (m_name == QLatin1String(Constants::C_PARENTHESES)) { + } else if (m_id == QLatin1String(Constants::C_PARENTHESES)) { return QColor(Qt::red); } return m_format.foreground(); @@ -267,23 +267,23 @@ QColor FormatDescription::foreground() const QColor FormatDescription::background() const { - if (m_name == QLatin1String(Constants::C_TEXT)) + if (m_id == QLatin1String(Constants::C_TEXT)) return Qt::white; - else if (m_name == QLatin1String(Constants::C_LINE_NUMBER)) + else if (m_id == QLatin1String(Constants::C_LINE_NUMBER)) return QApplication::palette().background().color(); - else if (m_name == QLatin1String(Constants::C_SEARCH_RESULT)) + else if (m_id == QLatin1String(Constants::C_SEARCH_RESULT)) return QColor(0xffef0b); - else if (m_name == QLatin1String(Constants::C_PARENTHESES)) + else if (m_id == QLatin1String(Constants::C_PARENTHESES)) return QColor(0xb4, 0xee, 0xb4); - else if (m_name == QLatin1String(Constants::C_CURRENT_LINE) - || m_name == QLatin1String(Constants::C_SEARCH_SCOPE)) { + else if (m_id == QLatin1String(Constants::C_CURRENT_LINE) + || m_id == QLatin1String(Constants::C_SEARCH_SCOPE)) { const QPalette palette = QApplication::palette(); const QColor &fg = palette.color(QPalette::Highlight); const QColor &bg = palette.color(QPalette::Base); qreal smallRatio; qreal largeRatio; - if (m_name == QLatin1String(Constants::C_CURRENT_LINE)) { + if (m_id == QLatin1String(Constants::C_CURRENT_LINE)) { smallRatio = .15; largeRatio = .3; } else { @@ -297,14 +297,14 @@ QColor FormatDescription::background() const fg.greenF() * ratio + bg.greenF() * (1 - ratio), fg.blueF() * ratio + bg.blueF() * (1 - ratio)); return col; - } else if (m_name == QLatin1String(Constants::C_SELECTION)) { + } else if (m_id == QLatin1String(Constants::C_SELECTION)) { const QPalette palette = QApplication::palette(); return palette.color(QPalette::Highlight); - } else if (m_name == QLatin1String(Constants::C_OCCURRENCES)) { + } else if (m_id == QLatin1String(Constants::C_OCCURRENCES)) { return QColor(180, 180, 180); - } else if (m_name == QLatin1String(Constants::C_OCCURRENCES_RENAME)) { + } else if (m_id == QLatin1String(Constants::C_OCCURRENCES_RENAME)) { return QColor(255, 100, 100); - } else if (m_name == QLatin1String(Constants::C_DISABLED_CODE)) { + } else if (m_id == QLatin1String(Constants::C_DISABLED_CODE)) { return QColor(239, 239, 239); } return QColor(); // invalid color @@ -332,9 +332,9 @@ QString FontSettingsPage::id() const return d_ptr->m_id; } -QString FontSettingsPage::trName() const +QString FontSettingsPage::displayName() const { - return d_ptr->m_name; + return d_ptr->m_displayName; } QString FontSettingsPage::category() const @@ -342,9 +342,9 @@ QString FontSettingsPage::category() const return d_ptr->m_category; } -QString FontSettingsPage::trCategory() const +QString FontSettingsPage::displayCategory() const { - return d_ptr->m_trCategory; + return d_ptr->m_displayCategory; } QWidget *FontSettingsPage::createPage(QWidget *parent) @@ -454,7 +454,7 @@ void FontSettingsPage::copyColorScheme() dialog->setInputMode(QInputDialog::TextInput); dialog->setWindowTitle(tr("Copy Color Scheme")); dialog->setLabelText(tr("Color Scheme name:")); - dialog->setTextValue(tr("%1 (copy)").arg(d_ptr->m_value.colorScheme().name())); + dialog->setTextValue(tr("%1 (copy)").arg(d_ptr->m_value.colorScheme().displayName())); connect(dialog, SIGNAL(textValueSelected(QString)), this, SLOT(copyColorScheme(QString))); dialog->open(); @@ -480,7 +480,7 @@ void FontSettingsPage::copyColorScheme(const QString &name) d_ptr->m_value.setColorScheme(d_ptr->ui.schemeEdit->colorScheme()); ColorScheme scheme = d_ptr->m_value.colorScheme(); - scheme.setName(name); + scheme.setDisplayName(name); scheme.save(fileName); d_ptr->m_value.setColorSchemeFileName(fileName); @@ -536,7 +536,7 @@ void FontSettingsPage::maybeSaveColorScheme() QMessageBox *messageBox = new QMessageBox(QMessageBox::Warning, tr("Color Scheme Changed"), tr("The color scheme \"%1\" was modified, do you want to save the changes?") - .arg(d_ptr->ui.schemeEdit->colorScheme().name()), + .arg(d_ptr->ui.schemeEdit->colorScheme().displayName()), QMessageBox::Discard | QMessageBox::Save, d_ptr->ui.schemeComboBox->window()); diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h index 4e555c263b..caaa27b595 100644 --- a/src/plugins/texteditor/fontsettingspage.h +++ b/src/plugins/texteditor/fontsettingspage.h @@ -49,19 +49,19 @@ namespace Internal { class FontSettingsPagePrivate; } // namespace Internal -// GUI description of a format consisting of name (settings key) -// and trName to be displayed +// GUI description of a format consisting of id (settings key) +// and displayName to be displayed class TEXTEDITOR_EXPORT FormatDescription { public: - FormatDescription(const QString &name, const QString &trName, + FormatDescription(const QString &id, const QString &displayName, const QColor &foreground = Qt::black); - QString name() const - { return m_name; } + QString id() const + { return m_id; } - QString trName() const - { return m_trName; } + QString displayName() const + { return m_displayName; } QColor foreground() const; QColor background() const; @@ -70,8 +70,8 @@ public: Format &format() { return m_format; } private: - QString m_name; // Name of the category - QString m_trName; // Displayed name of the category + QString m_id; // Name of the category + QString m_displayName; // Displayed name of the category Format m_format; // Default format }; @@ -91,9 +91,9 @@ public: ~FontSettingsPage(); QString id() const; - QString trName() const; + QString displayName() const; QString category() const; - QString trCategory() const; + QString displayCategory() const; QWidget *createPage(QWidget *parent); void apply(); diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h index 54bb858bfe..c06b441723 100644 --- a/src/plugins/texteditor/linenumberfilter.h +++ b/src/plugins/texteditor/linenumberfilter.h @@ -49,8 +49,8 @@ class LineNumberFilter : public Locator::ILocatorFilter public: explicit LineNumberFilter(QObject *parent = 0); - QString trName() const { return tr("Line in current document"); } - QString name() const { return "Line in current document"; } + QString displayName() const { return tr("Line in current document"); } + QString id() const { return "Line in current document"; } Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::High; } QList<Locator::FilterEntry> matchesFor(const QString &entry); void accept(Locator::FilterEntry selection) const; diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp index a960943a76..53276f0875 100644 --- a/src/plugins/texteditor/plaintexteditor.cpp +++ b/src/plugins/texteditor/plaintexteditor.cpp @@ -42,8 +42,10 @@ PlainTextEditorEditable::PlainTextEditorEditable(PlainTextEditor *editor) : BaseTextEditorEditable(editor) { Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance(); - m_context << uidm->uniqueIdentifier(Core::Constants::K_DEFAULT_TEXT_EDITOR); + m_context << uidm->uniqueIdentifier(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID); m_context << uidm->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR); + + setDisplayName(tr(Core::Constants::K_DEFAULT_TEXT_EDITOR_DISPLAY_NAME)); } PlainTextEditor::PlainTextEditor(QWidget *parent) @@ -55,6 +57,7 @@ PlainTextEditor::PlainTextEditor(QWidget *parent) setLineSeparatorsAllowed(true); setMimeType(QLatin1String(TextEditor::Constants::C_TEXTEDITOR_MIMETYPE_TEXT)); + setDisplayName(tr(Core::Constants::K_DEFAULT_TEXT_EDITOR_DISPLAY_NAME)); } QList<int> PlainTextEditorEditable::context() const @@ -70,9 +73,9 @@ Core::IEditor *PlainTextEditorEditable::duplicate(QWidget *parent) return newEditor->editableInterface(); } -const char *PlainTextEditorEditable::kind() const +QString PlainTextEditorEditable::id() const { - return Core::Constants::K_DEFAULT_TEXT_EDITOR; + return QLatin1String(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID); } // Indent a text block based on previous line. diff --git a/src/plugins/texteditor/plaintexteditor.h b/src/plugins/texteditor/plaintexteditor.h index 68ac887d6d..5c570b0c25 100644 --- a/src/plugins/texteditor/plaintexteditor.h +++ b/src/plugins/texteditor/plaintexteditor.h @@ -46,7 +46,7 @@ public: bool duplicateSupported() const { return true; } Core::IEditor *duplicate(QWidget *parent); - const char *kind() const; + QString id() const; bool isTemporary() const { return false; } private: QList<int> m_context; diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp index db7a1764cc..cff72e1126 100644 --- a/src/plugins/texteditor/plaintexteditorfactory.cpp +++ b/src/plugins/texteditor/plaintexteditorfactory.cpp @@ -40,8 +40,7 @@ using namespace TextEditor; using namespace TextEditor::Internal; PlainTextEditorFactory::PlainTextEditorFactory(QObject *parent) - : Core::IEditorFactory(parent), - m_kind(Core::Constants::K_DEFAULT_TEXT_EDITOR) + : Core::IEditorFactory(parent) { m_actionHandler = new TextEditorActionHandler( QLatin1String(TextEditor::Constants::C_TEXTEDITOR), @@ -55,14 +54,19 @@ PlainTextEditorFactory::~PlainTextEditorFactory() delete m_actionHandler; } -QString PlainTextEditorFactory::kind() const +QString PlainTextEditorFactory::id() const { - return m_kind; + return QLatin1String(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID); +} + +QString PlainTextEditorFactory::displayName() const +{ + return tr(Core::Constants::K_DEFAULT_TEXT_EDITOR_DISPLAY_NAME); } Core::IFile *PlainTextEditorFactory::open(const QString &fileName) { - Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, kind()); + Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, id()); return iface ? iface->file() : 0; } diff --git a/src/plugins/texteditor/plaintexteditorfactory.h b/src/plugins/texteditor/plaintexteditorfactory.h index 9f3f8b4b2c..f9a812bdb5 100644 --- a/src/plugins/texteditor/plaintexteditorfactory.h +++ b/src/plugins/texteditor/plaintexteditorfactory.h @@ -52,14 +52,15 @@ public: virtual QStringList mimeTypes() const; //Core::IEditorFactory - QString kind() const; + QString id() const; + QString displayName() const; + Core::IFile *open(const QString &fileName); Core::IEditor *createEditor(QWidget *parent); TextEditor::TextEditorActionHandler *actionHandler() const { return m_actionHandler; } private: - const QString m_kind; QStringList m_mimeTypes; TextEditor::TextEditorActionHandler *m_actionHandler; }; diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index ea2b6e0168..db17b7bc58 100644 --- a/src/plugins/texteditor/texteditorplugin.cpp +++ b/src/plugins/texteditor/texteditorplugin.cpp @@ -92,11 +92,11 @@ bool TextEditorPlugin::initialize(const QStringList &arguments, QString *errorMe Core::BaseFileWizardParameters wizardParameters(Core::IWizard::FileWizard); wizardParameters.setDescription(tr("Creates a text file (.txt).")); - wizardParameters.setName(tr("Text File")); + wizardParameters.setDisplayName(tr("Text File")); wizardParameters.setCategory(QLatin1String("O.General")); - wizardParameters.setTrCategory(tr("General")); + wizardParameters.setDisplayCategory(tr("General")); m_wizard = new TextFileWizard(QLatin1String(TextEditor::Constants::C_TEXTEDITOR_MIMETYPE_TEXT), - QLatin1String(Core::Constants::K_DEFAULT_TEXT_EDITOR), + QLatin1String(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID), QLatin1String("text$"), wizardParameters); // Add text file wizard diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index 7047ee1bcd..dd74c18432 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -104,28 +104,28 @@ TextEditorSettings::TextEditorSettings(QObject *parent) formatDescriptions.append(FormatDescription(QLatin1String(C_DIFF_LOCATION), tr("Diff Location"), Qt::blue)); const QString category = QLatin1String(Constants::TEXT_EDITOR_SETTINGS_CATEGORY); - const QString trCategory = QCoreApplication::translate("TextEditor", Constants::TEXT_EDITOR_SETTINGS_TR_CATEGORY); + const QString displayCategory = QCoreApplication::translate("TextEditor", Constants::TEXT_EDITOR_SETTINGS_TR_CATEGORY); m_fontSettingsPage = new FontSettingsPage(formatDescriptions, QLatin1String("A.FontSettings"), - category, trCategory, this); + category, displayCategory, this); pm->addObject(m_fontSettingsPage); // Add the GUI used to configure the tab, storage and interaction settings TextEditor::BehaviorSettingsPageParameters behaviorSettingsPageParameters; behaviorSettingsPageParameters.id = QLatin1String("B.BehaviourSettings"); - behaviorSettingsPageParameters.name = tr("Behavior"); + behaviorSettingsPageParameters.displayName = tr("Behavior"); behaviorSettingsPageParameters.category = category; - behaviorSettingsPageParameters.trCategory = trCategory; + behaviorSettingsPageParameters.displayCategory = displayCategory; behaviorSettingsPageParameters.settingsPrefix = QLatin1String("text"); m_behaviorSettingsPage = new BehaviorSettingsPage(behaviorSettingsPageParameters, this); pm->addObject(m_behaviorSettingsPage); TextEditor::DisplaySettingsPageParameters displaySettingsPageParameters; displaySettingsPageParameters.id = QLatin1String("D.DisplaySettings"), - displaySettingsPageParameters.name = tr("Display"); + displaySettingsPageParameters.displayName = tr("Display"); displaySettingsPageParameters.category = category;; - displaySettingsPageParameters.trCategory = trCategory; + displaySettingsPageParameters.displayCategory = displayCategory; displaySettingsPageParameters.settingsPrefix = QLatin1String("text"); m_displaySettingsPage = new DisplaySettingsPage(displaySettingsPageParameters, this); pm->addObject(m_displaySettingsPage); diff --git a/src/plugins/texteditor/textfilewizard.cpp b/src/plugins/texteditor/textfilewizard.cpp index 9b504854e9..9e7595d458 100644 --- a/src/plugins/texteditor/textfilewizard.cpp +++ b/src/plugins/texteditor/textfilewizard.cpp @@ -35,13 +35,13 @@ using namespace TextEditor; TextFileWizard::TextFileWizard(const QString &mimeType, - const QString &editorKind, + const QString &editorId, const QString &suggestedFileName, const BaseFileWizardParameters ¶meters, QObject *parent) : Core::StandardFileWizard(parameters, parent), m_mimeType(mimeType), - m_editorKind(editorKind), + m_editorId(editorId), m_suggestedFileName(suggestedFileName) { } @@ -53,6 +53,6 @@ Core::GeneratedFiles const QString suffix = preferredSuffix(m_mimeType); const QString fileName = Core::BaseFileWizard::buildFileName(path, name, suffix); Core::GeneratedFile file(fileName); - file.setEditorKind(m_editorKind); + file.setEditorId(m_editorId); return Core::GeneratedFiles() << file; } diff --git a/src/plugins/texteditor/textfilewizard.h b/src/plugins/texteditor/textfilewizard.h index bfb38ff963..53217048f3 100644 --- a/src/plugins/texteditor/textfilewizard.h +++ b/src/plugins/texteditor/textfilewizard.h @@ -43,7 +43,7 @@ class TEXTEDITOR_EXPORT TextFileWizard : public Core::StandardFileWizard public: typedef Core::BaseFileWizardParameters BaseFileWizardParameters; TextFileWizard(const QString &mimeType, - const QString &editorKind, + const QString &editorId, const QString &suggestedFileName, const BaseFileWizardParameters ¶meters, QObject *parent = 0); @@ -54,7 +54,7 @@ protected: QString *errorMessage) const; private: const QString m_mimeType; - const QString m_editorKind; + const QString m_editorId; const QString m_suggestedFileName; }; |