feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Use text settings for description textbox in submit editor

Browse Source 
When using dark color scheme, highlighting with white background is
unreadable.

Change-Id: I8c65d8c9fc08448f1c04680ed7a1d4c0fd842070
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Orgad Shaneh
2013-08-09 15:09:47 +03:00
committed by Orgad Shaneh
parent ec266325fa
commit b6ef8f3718
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -186,17 +186,25 @@ VcsBaseSubmitEditor::VcsBaseSubmitEditor(const VcsBaseSubmitEditorParameters *pa
document()->setDisplayName(QCoreApplication::translate("VCS", d->m_parameters->displayName)); document()->setDisplayName(QCoreApplication::translate("VCS", d->m_parameters->displayName));
// Message font according to settings // Message font according to settings
Utils::CompletingTextEdit *descriptionEdit = editorWidget->descriptionEdit();
const TextEditor::FontSettings fs = TextEditor::TextEditorSettings::instance()->fontSettings(); const TextEditor::FontSettings fs = TextEditor::TextEditorSettings::instance()->fontSettings();
QFont font = editorWidget->descriptionEdit()->font(); const QTextCharFormat tf = fs.toTextCharFormat(TextEditor::C_TEXT);
font.setFamily(fs.family()); descriptionEdit->setFont(tf.font());
font.setPointSize(fs.fontSize()); const QTextCharFormat selectionFormat = fs.toTextCharFormat(TextEditor::C_SELECTION);
editorWidget->descriptionEdit()->setFont(font); QPalette pal = descriptionEdit->palette();
pal.setColor(QPalette::Base, tf.background().color());
pal.setColor(QPalette::Text, tf.foreground().color());
pal.setColor(QPalette::Foreground, tf.foreground().color());
if (selectionFormat.background().style() != Qt::NoBrush)
pal.setColor(QPalette::Highlight, selectionFormat.background().color());
pal.setBrush(QPalette::HighlightedText, selectionFormat.foreground());
descriptionEdit->setPalette(pal);
d->m_file->setModified(false); d->m_file->setModified(false);
// We are always clean to prevent the editor manager from asking to save. // We are always clean to prevent the editor manager from asking to save.
connect(d->m_widget, SIGNAL(diffSelected(QList<int>)), this, SLOT(slotDiffSelectedVcsFiles(QList<int>))); connect(d->m_widget, SIGNAL(diffSelected(QList<int>)), this, SLOT(slotDiffSelectedVcsFiles(QList<int>)));
connect(d->m_widget->descriptionEdit(), SIGNAL(textChanged()), this, SLOT(slotDescriptionChanged())); connect(descriptionEdit, SIGNAL(textChanged()), this, SLOT(slotDescriptionChanged()));
const CommonVcsSettings settings = VcsPlugin::instance()->settings(); const CommonVcsSettings settings = VcsPlugin::instance()->settings();
// Add additional context menu settings // Add additional context menu settings
@@ -231,7 +239,7 @@ VcsBaseSubmitEditor::VcsBaseSubmitEditor(const VcsBaseSubmitEditorParameters *pa
connect(Core::ICore::mainWindow(), SIGNAL(windowActivated()), this, SLOT(slotRefreshCommitData())); connect(Core::ICore::mainWindow(), SIGNAL(windowActivated()), this, SLOT(slotRefreshCommitData()));
Aggregation::Aggregate *aggregate = new Aggregation::Aggregate; Aggregation::Aggregate *aggregate = new Aggregation::Aggregate;
aggregate->add(new Find::BaseTextFind(d->m_widget->descriptionEdit())); aggregate->add(new Find::BaseTextFind(descriptionEdit));
aggregate->add(this); aggregate->add(this);
} }