Rename underscore to underline

This commit is contained in:
johanneshilden 2017-10-05 17:39:01 +03:00
parent 776e089399
commit 487643651b
3 changed files with 9 additions and 9 deletions

View File

@ -41,7 +41,7 @@ TextFieldSettingsEditor::TextFieldSettingsEditor(QWidget *parent)
connect(ui->inkColorToolButton, SIGNAL(pressed()), this, SLOT(selectColor())); connect(ui->inkColorToolButton, SIGNAL(pressed()), this, SLOT(selectColor()));
connect(ui->underlineColorToolButton, SIGNAL(pressed()), this, SLOT(selectColor())); connect(ui->underlineColorToolButton, SIGNAL(pressed()), this, SLOT(selectColor()));
connect(ui->labelColorToolButton, SIGNAL(pressed()), this, SLOT(selectColor())); connect(ui->labelColorToolButton, SIGNAL(pressed()), this, SLOT(selectColor()));
connect(ui->underscoreCheckBox, SIGNAL(toggled(bool)), this, SLOT(setShowUnderscore())); connect(ui->underlineCheckBox, SIGNAL(toggled(bool)), this, SLOT(setShowUnderline()));
connect(m_textField, SIGNAL(textChanged(QString)), this, SLOT(setupForm())); connect(m_textField, SIGNAL(textChanged(QString)), this, SLOT(setupForm()));
} }
@ -59,7 +59,7 @@ void TextFieldSettingsEditor::setupForm()
ui->labelCheckBox->setChecked(m_textField->hasLabel()); ui->labelCheckBox->setChecked(m_textField->hasLabel());
ui->labelTextLineEdit->setText(m_textField->label()); ui->labelTextLineEdit->setText(m_textField->label());
ui->useThemeColorsCheckBox->setChecked(m_textField->useThemeColors()); ui->useThemeColorsCheckBox->setChecked(m_textField->useThemeColors());
ui->underscoreCheckBox->setChecked( true ); ui->underlineCheckBox->setChecked(m_textField->hasUnderline());
} }
void TextFieldSettingsEditor::updateWidget() void TextFieldSettingsEditor::updateWidget()
@ -70,7 +70,7 @@ void TextFieldSettingsEditor::updateWidget()
m_textField->setLabel(ui->labelTextLineEdit->text()); m_textField->setLabel(ui->labelTextLineEdit->text());
m_textField->setShowLabel(ui->labelCheckBox->isChecked()); m_textField->setShowLabel(ui->labelCheckBox->isChecked());
m_textField->setUseThemeColors(ui->useThemeColorsCheckBox->isChecked()); m_textField->setUseThemeColors(ui->useThemeColorsCheckBox->isChecked());
m_textField->setShowUnderscore(ui->underscoreCheckBox->isChecked()); m_textField->setShowUnderline(ui->underlineCheckBox->isChecked());
} }
void TextFieldSettingsEditor::selectColor() void TextFieldSettingsEditor::selectColor()
@ -96,7 +96,7 @@ void TextFieldSettingsEditor::selectColor()
setupForm(); setupForm();
} }
void TextFieldSettingsEditor::setShowUnderscore() void TextFieldSettingsEditor::setShowUnderline()
{ {
m_textField->setShowUnderscore( ui->underscoreCheckBox->isChecked() ); m_textField->setShowUnderline( ui->underlineCheckBox->isChecked() );
} }

View File

@ -18,7 +18,7 @@ protected slots:
void setupForm(); void setupForm();
void updateWidget(); void updateWidget();
void selectColor(); void selectColor();
void setShowUnderscore(); void setShowUnderline();
private: private:
Ui::TextFieldSettingsForm *const ui; Ui::TextFieldSettingsForm *const ui;

View File

@ -168,14 +168,14 @@
</layout> </layout>
</item> </item>
<item row="10" column="0"> <item row="10" column="0">
<widget class="QLabel" name="labelShowUnderscore"> <widget class="QLabel" name="labelShowUnderline">
<property name="text"> <property name="text">
<string>Underscore</string> <string>Underline</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1"> <item row="10" column="1">
<widget class="QCheckBox" name="underscoreCheckBox"/> <widget class="QCheckBox" name="underlineCheckBox"/>
</item> </item>
</layout> </layout>
</widget> </widget>