diff --git a/src/dialogs/katedialogs.cpp b/src/dialogs/katedialogs.cpp --- a/src/dialogs/katedialogs.cpp +++ b/src/dialogs/katedialogs.cpp @@ -676,7 +676,7 @@ connect(textareaUi->chkAnimateBracketMatching, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); connect(textareaUi->chkFoldFirstLine, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); connect(textareaUi->chkShowWordCount, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); - connect(textareaUi->chkShowLinesCount, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); + connect(textareaUi->chkShowLineCount, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); connect(bordersUi->chkIconBorder, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); connect(bordersUi->chkScrollbarMarks, SIGNAL(toggled(bool)), this, SLOT(slotChanged())); @@ -735,7 +735,7 @@ KateRendererConfig::global()->setAnimateBracketMatching(textareaUi->chkAnimateBracketMatching->isChecked()); KateViewConfig::global()->setFoldFirstLine(textareaUi->chkFoldFirstLine->isChecked()); KateViewConfig::global()->setShowWordCount(textareaUi->chkShowWordCount->isChecked()); - KateViewConfig::global()->setShowLinesCount(textareaUi->chkShowLinesCount->isChecked()); + KateViewConfig::global()->setShowLineCount(textareaUi->chkShowLineCount->isChecked()); KateRendererConfig::global()->configEnd(); KateViewConfig::global()->configEnd(); @@ -767,7 +767,7 @@ textareaUi->chkAnimateBracketMatching->setChecked(KateRendererConfig::global()->animateBracketMatching()); textareaUi->chkFoldFirstLine->setChecked(KateViewConfig::global()->foldFirstLine()); textareaUi->chkShowWordCount->setChecked(KateViewConfig::global()->showWordCount()); - textareaUi->chkShowLinesCount->setChecked(KateViewConfig::global()->showLinesCount()); + textareaUi->chkShowLineCount->setChecked(KateViewConfig::global()->showLineCount()); } void KateViewDefaultsConfig::reset() diff --git a/src/dialogs/textareaappearanceconfigwidget.ui b/src/dialogs/textareaappearanceconfigwidget.ui --- a/src/dialogs/textareaappearanceconfigwidget.ui +++ b/src/dialogs/textareaappearanceconfigwidget.ui @@ -194,12 +194,12 @@ - + - Show/hide Lines count in status bar + Show/hide line count in status bar - Show Lines Count + Show line count diff --git a/src/utils/kateconfig.h b/src/utils/kateconfig.h --- a/src/utils/kateconfig.h +++ b/src/utils/kateconfig.h @@ -572,8 +572,8 @@ bool showWordCount() const; void setShowWordCount(bool on); - bool showLinesCount() const; - void setShowLinesCount(bool on); + bool showLineCount() const; + void setShowLineCount(bool on); bool autoBrackets() const; void setAutoBrackets(bool on); @@ -614,7 +614,7 @@ bool m_scrollPastEnd; bool m_foldFirstLine; bool m_showWordCount = false; - bool m_showLinesCount = false; + bool m_showLineCount = false; bool m_autoBrackets; bool m_backspaceRemoveComposed; @@ -650,7 +650,7 @@ bool m_wordCompletionRemoveTailSet : 1; bool m_foldFirstLineSet : 1; bool m_showWordCountSet : 1; - bool m_showLinesCountSet : 1; + bool m_showLineCountSet : 1; bool m_autoBracketsSet : 1; bool m_backspaceRemoveComposedSet : 1; diff --git a/src/utils/kateconfig.cpp b/src/utils/kateconfig.cpp --- a/src/utils/kateconfig.cpp +++ b/src/utils/kateconfig.cpp @@ -1260,7 +1260,7 @@ m_wordCompletionRemoveTailSet(false), m_foldFirstLineSet(false), m_showWordCountSet(false), - m_showLinesCountSet(false), + m_showLineCountSet(false), m_autoBracketsSet(false), m_backspaceRemoveComposedSet(false) @@ -1309,7 +1309,7 @@ m_wordCompletionRemoveTailSet(false), m_foldFirstLineSet(false), m_showWordCountSet(false), - m_showLinesCountSet(false), + m_showLineCountSet(false), m_autoBracketsSet(false), m_backspaceRemoveComposedSet(false), m_view(view) @@ -1354,7 +1354,7 @@ const char KEY_SMART_COPY_CUT[] = "Smart Copy Cut"; const char KEY_SCROLL_PAST_END[] = "Scroll Past End"; const char KEY_FOLD_FIRST_LINE[] = "Fold First Line"; -const char KEY_SHOW_LINES_COUNT[] = "Show Lines Count"; +const char KEY_SHOW_LINE_COUNT[] = "Show Line Count"; const char KEY_SHOW_WORD_COUNT[] = "Show Word Count"; const char KEY_AUTO_BRACKETS[] = "Auto Brackets"; const char KEY_BACKSPACE_REMOVE_COMPOSED[] = "Backspace Remove Composed Characters"; @@ -1417,7 +1417,7 @@ setSmartCopyCut(config.readEntry(KEY_SMART_COPY_CUT, false)); setScrollPastEnd(config.readEntry(KEY_SCROLL_PAST_END, false)); setFoldFirstLine(config.readEntry(KEY_FOLD_FIRST_LINE, false)); - setShowLinesCount(config.readEntry(KEY_SHOW_LINES_COUNT, false)); + setShowLineCount(config.readEntry(KEY_SHOW_LINE_COUNT, false)); setShowWordCount(config.readEntry(KEY_SHOW_WORD_COUNT, false)); setAutoBrackets(config.readEntry(KEY_AUTO_BRACKETS, false)); @@ -1482,7 +1482,7 @@ config.writeEntry(KEY_VI_INPUT_MODE_STEAL_KEYS, viInputModeStealKeys()); config.writeEntry(KEY_VI_RELATIVE_LINE_NUMBERS, viRelativeLineNumbers()); - config.writeEntry(KEY_SHOW_LINES_COUNT, showLinesCount()); + config.writeEntry(KEY_SHOW_LINE_COUNT, showLineCount()); config.writeEntry(KEY_SHOW_WORD_COUNT, showWordCount()); config.writeEntry(KEY_AUTO_BRACKETS, autoBrackets()); @@ -2250,24 +2250,24 @@ configEnd(); } -bool KateViewConfig::showLinesCount() const +bool KateViewConfig::showLineCount() const { - if (m_showLinesCountSet || isGlobal()) { - return m_showLinesCount; + if (m_showLineCountSet || isGlobal()) { + return m_showLineCount; } - return s_global->showLinesCount(); + return s_global->showLineCount(); } -void KateViewConfig::setShowLinesCount(bool on) +void KateViewConfig::setShowLineCount(bool on) { - if (m_showLinesCountSet && m_showLinesCount == on) { + if (m_showLineCountSet && m_showLineCount == on) { return; } configStart(); - m_showLinesCountSet = true; - m_showLinesCount = on; + m_showLineCountSet = true; + m_showLineCount = on; configEnd(); } diff --git a/src/view/katestatusbar.cpp b/src/view/katestatusbar.cpp --- a/src/view/katestatusbar.cpp +++ b/src/view/katestatusbar.cpp @@ -224,9 +224,9 @@ void KateStatusBar::contextMenuEvent(QContextMenuEvent *event) { QMenu menu(this); - QAction *showLines = menu.addAction(QStringLiteral("Show Lines Count"), this, &KateStatusBar::toggleShowLines); + QAction *showLines = menu.addAction(QStringLiteral("Show line count"), this, &KateStatusBar::toggleShowLines); showLines->setCheckable(true); - showLines->setChecked(KateViewConfig::global()->showLinesCount()); + showLines->setChecked(KateViewConfig::global()->showLineCount()); QAction *showWords = menu.addAction(QStringLiteral("Show word count"), this, &KateStatusBar::toggleShowWords); showWords->setCheckable(true); showWords->setChecked(KateViewConfig::global()->showWordCount()); @@ -235,7 +235,7 @@ void KateStatusBar::toggleShowLines(bool checked) { - KateViewConfig::global()->setShowLinesCount(checked); + KateViewConfig::global()->setShowLineCount(checked); } void KateStatusBar::toggleShowWords(bool checked) @@ -279,7 +279,7 @@ { KTextEditor::Cursor position (m_view->cursorPositionVirtual()); - if( KateViewConfig::global()->showLinesCount() ) + if( KateViewConfig::global()->showLineCount() ) m_lineColLabel->setText( i18n("Line %1 of %2, Column %3" , QLocale().toString(position.line() + 1)