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

Make TODO plugin theme aware

Browse Source 
Use the theme's colors by default and color the text rather than the
background of items.

Task-number: QTCREATORBUG-17532
Change-Id: I65a2d6da45ce7547b05463a2fb014f8230d0c336
Reviewed-by: Serhii Moroz <frost.asm@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Ulf Hermann
2017-01-05 17:13:42 +01:00
parent cd31fd1a60
commit a45b0d2c05
12 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/themes/dark.creatortheme
View File

@@ -119,7 +119,6 @@ TextColorHighlight=ffff0000
TextColorLink=textColorLink
TextColorLinkVisited=textColorLinkVisited
TextColorNormal=text
TodoItemTextColor=ff000000
ToggleButtonBackgroundColor=shadowBackground
ToolBarBackgroundColor=shadowBackground
TreeViewArrowColorNormal=hoverBackground

1
share/qtcreator/themes/default.creatortheme
View File

@@ -111,7 +111,6 @@ TextColorHighlight=ffa0a0a4
TextColorLink=ff0057ae
TextColorLinkVisited=ff644a9b
TextColorNormal=ff000000
TodoItemTextColor=ff000000
ToggleButtonBackgroundColor=ffff0000
ToolBarBackgroundColor=ffff0000
TreeViewArrowColorNormal=ffff0000

1
share/qtcreator/themes/flat-dark.creatortheme
View File

@@ -124,7 +124,6 @@ TextColorHighlight=ffff0000
TextColorLink=textColorLink
TextColorLinkVisited=textColorLinkVisited
TextColorNormal=text
TodoItemTextColor=ff000000
ToggleButtonBackgroundColor=shadowBackground
ToolBarBackgroundColor=shadowBackground
TreeViewArrowColorNormal=hoverBackground

1
share/qtcreator/themes/flat-light.creatortheme
View File

@@ -122,7 +122,6 @@ TextColorHighlight=ffff0000
TextColorLink=ff007af4
TextColorLinkVisited=ffa57aff
TextColorNormal=text
TodoItemTextColor=ff000000
ToggleButtonBackgroundColor=shadowBackground
ToolBarBackgroundColor=shadowBackground
TreeViewArrowColorNormal=hoverBackground

1
share/qtcreator/themes/flat.creatortheme
View File

@@ -120,7 +120,6 @@ TextColorHighlight=ffff0000
TextColorLink=ff007af4
TextColorLinkVisited=ffa57aff
TextColorNormal=text
TodoItemTextColor=ff000000
ToggleButtonBackgroundColor=shadowBackground
ToolBarBackgroundColor=shadowBackground
TreeViewArrowColorNormal=hoverBackground

1
src/libs/utils/theme/theme.h
View File

@@ -119,7 +119,6 @@ public:
TextColorLink,
TextColorLinkVisited,
TextColorNormal,
TodoItemTextColor,
ToggleButtonBackgroundColor,
ToolBarBackgroundColor,
TreeViewArrowColorNormal,

7
src/plugins/todo/constants.h
View File

@@ -31,13 +31,6 @@
namespace Todo {
namespace Constants {
// Default todo item background colors
const char COLOR_TODO_BG[] = "#ccffcc";
const char COLOR_WARNING_BG[] = "#ffffcc";
const char COLOR_FIXME_BG[] = "#ffcccc";
const char COLOR_BUG_BG[] = "#ffcccc";
const char COLOR_NOTE_BG[] = "#e0ebff";
// Dummy, needs to be changed
const char ICON_TODO[] = ":/todoplugin/images/todo.png";

3
src/plugins/todo/keyword.cpp
View File

@@ -25,11 +25,12 @@
****************************************************************************/
#include "keyword.h"
#include <utils/theme/theme.h>
namespace Todo {
namespace Internal {
Keyword::Keyword() : color(Qt::white)
Keyword::Keyword() : color(Utils::creatorTheme()->color(Utils::Theme::TextColorNormal))
{
}

8
src/plugins/todo/optionsdialog.cpp
View File

@@ -75,7 +75,7 @@ void OptionsDialog::addToKeywordsList(const Keyword &keyword)
QListWidgetItem *item = new QListWidgetItem(
icon(keyword.iconType), keyword.name);
item->setData(Qt::UserRole, static_cast<int>(keyword.iconType));
item->setBackgroundColor(keyword.color);
item->setTextColor(keyword.color);
ui->keywordsList->addItem(item);
}
@@ -116,7 +116,7 @@ void OptionsDialog::editKeyword(QListWidgetItem *item)
Keyword keyword;
keyword.name = item->text();
keyword.iconType = static_cast<IconType>(item->data(Qt::UserRole).toInt());
keyword.color = item->backgroundColor();
keyword.color = item->textColor();
QSet<QString> keywordNamesButThis = keywordNames();
keywordNamesButThis.remove(keyword.name);
@@ -127,7 +127,7 @@ void OptionsDialog::editKeyword(QListWidgetItem *item)
item->setIcon(icon(keyword.iconType));
item->setText(keyword.name);
item->setData(Qt::UserRole, static_cast<int>(keyword.iconType));
item->setBackgroundColor(keyword.color);
item->setTextColor(keyword.color);
}
}
@@ -179,7 +179,7 @@ Settings OptionsDialog::settingsFromUi()
Keyword keyword;
keyword.name = item->text();
keyword.iconType = static_cast<IconType>(item->data(Qt::UserRole).toInt());
keyword.color = item->backgroundColor();
keyword.color = item->textColor();
settings.keywords << keyword;
}

12
src/plugins/todo/settings.cpp
View File

@@ -28,6 +28,7 @@
#include "constants.h"
#include <coreplugin/coreconstants.h>
#include <utils/theme/theme.h>
#include <QSettings>
@@ -110,6 +111,7 @@ void Settings::load(QSettings *settings)
void Settings::setDefault()
{
scanningScope = ScanningScopeCurrentFile;
Utils::Theme *theme = Utils::creatorTheme();
keywords.clear();
@@ -117,27 +119,27 @@ void Settings::setDefault()
keyword.name = QLatin1String("TODO");
keyword.iconType = IconType::Todo;
keyword.color = QColor(QLatin1String(Constants::COLOR_TODO_BG));
keyword.color = theme->color(Utils::Theme::OutputPanes_NormalMessageTextColor);
keywords.append(keyword);
keyword.name = QLatin1String("NOTE");
keyword.iconType = IconType::Info;
keyword.color = QColor(QLatin1String(Constants::COLOR_NOTE_BG));
keyword.color = theme->color(Utils::Theme::OutputPanes_NormalMessageTextColor);
keywords.append(keyword);
keyword.name = QLatin1String("FIXME");
keyword.iconType = IconType::Error;
keyword.color = QColor(QLatin1String(Constants::COLOR_FIXME_BG));
keyword.color = theme->color(Utils::Theme::OutputPanes_ErrorMessageTextColor);
keywords.append(keyword);
keyword.name = QLatin1String("BUG");
keyword.iconType = IconType::Bug;
keyword.color = QColor(QLatin1String(Constants::COLOR_BUG_BG));
keyword.color = theme->color(Utils::Theme::OutputPanes_ErrorMessageTextColor);
keywords.append(keyword);
keyword.name = QLatin1String("WARNING");
keyword.iconType = IconType::Warning;
keyword.color = QColor(QLatin1String(Constants::COLOR_WARNING_BG));
keyword.color = theme->color(Utils::Theme::OutputPanes_WarningMessageTextColor);
keywords.append(keyword);
keywordsEdited = false;

4
src/plugins/todo/todoitemsmodel.cpp
View File

@@ -80,10 +80,8 @@ QVariant TodoItemsModel::data(const QModelIndex &index, int role) const
TodoItem item = m_todoItemsList->at(index.row());
if (role == Qt::BackgroundColorRole)
return item.color;
if (role == Qt::TextColorRole)
return creatorTheme()->color(Theme::TodoItemTextColor);
return item.color;
switch (index.column()) {

2
src/plugins/todo/todooutputpane.cpp
View File

@@ -178,7 +178,7 @@ void TodoOutputPane::todoTreeViewClicked(const QModelIndex &index)
item.text = index.sibling(row, Constants::OUTPUT_COLUMN_TEXT).data().toString();
item.file = Utils::FileName::fromUserInput(index.sibling(row, Constants::OUTPUT_COLUMN_FILE).data().toString());
item.line = index.sibling(row, Constants::OUTPUT_COLUMN_LINE).data().toInt();
item.color = index.data(Qt::BackgroundColorRole).value<QColor>();
item.color = index.data(Qt::TextColorRole).value<QColor>();
item.iconType = static_cast<IconType>(index.sibling(row, Constants::OUTPUT_COLUMN_TEXT)
.data(Qt::UserRole).toInt());