diff --git a/shell/settings/uiconfig.kcfg b/shell/settings/uiconfig.kcfg index 62a3006c38..6c9691bb02 100644 --- a/shell/settings/uiconfig.kcfg +++ b/shell/settings/uiconfig.kcfg @@ -1,25 +1,25 @@ 1 1 1 - false + true diff --git a/shell/settings/uiconfig.ui b/shell/settings/uiconfig.ui index 763dafe006..84af065e56 100644 --- a/shell/settings/uiconfig.ui +++ b/shell/settings/uiconfig.ui @@ -1,210 +1,210 @@ UiConfig 0 0 521 399 User Interface Dock Window Behavior <p>Controls whether the bottom left corner is occupied by the dock at the left, or by the dock at the bottom.</p> Bottom left corner occupied by: <p>Controls whether the bottom right corner is occupied by the dock at the right, or by the dock at the bottom.</p> Bottom right corner occupied by: 0 0 <p>Controls whether the bottom left corner is occupied by the dock at the left, or by the dock at the bottom.</p> Left Dock Bottom Dock 0 0 <p>Controls whether the bottom right corner is occupied by the dock at the right, or by the dock at the bottom.</p> Right Dock Bottom Dock Qt::Vertical 503 21 Tabbed Browsing Controls whether to open new tabs next to the active one. Open new tab after current true When enabled, plugins can group related files side by side. For example, a header file will be opened next to the implementation file. Arrange related documents side by side Enables or disables the display of the tab bar at the top of the editor window. Show tabs true Coloring When enabled, tabs and other widgets are colored based on the project affiliation Color widgets based on the project affiliation - false + true kcfg_TabBarVisibility toggled(bool) kcfg_TabBarOpenAfterCurrent setEnabled(bool) 260 133 260 158 kcfg_TabBarVisibility toggled(bool) kcfg_TabBarArrangeBuddies setEnabled(bool) 260 133 260 183 diff --git a/util/widgetcolorizer.cpp b/util/widgetcolorizer.cpp index f8202f1313..142ba0c284 100644 --- a/util/widgetcolorizer.cpp +++ b/util/widgetcolorizer.cpp @@ -1,85 +1,85 @@ /* * Copyright 2015 Kevin Funk * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of * the License or (at your option) version 3 or any later version * accepted by the membership of KDE e.V. (or its successor approved * by the membership of KDE e.V.), which shall act as a proxy * defined in Section 14 of version 3 of the license. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . * */ #include "widgetcolorizer.h" #include #include #include #include #include #include #include #include #include #include using namespace KDevelop; QColor WidgetColorizer::blendForeground(QColor color, float ratio, const QColor& foreground, const QColor& background) { if (KColorUtils::luma(foreground) > KColorUtils::luma(background)) { // for dark color schemes, produce a fitting color first color = KColorUtils::tint(foreground, color, 0.5); } // adapt contrast return KColorUtils::mix(foreground, color, ratio); } QColor WidgetColorizer::blendBackground(QColor color, float ratio, const QColor& /*foreground*/, const QColor& background) { // adapt contrast return KColorUtils::mix(background, color, ratio); } void WidgetColorizer::drawBranches(const QTreeView* treeView, QPainter* painter, const QRect& rect, const QModelIndex& /*index*/, const QColor& baseColor) { QRect newRect(rect); newRect.setWidth(treeView->indentation()); painter->fillRect(newRect, baseColor); } QColor WidgetColorizer::colorForId(uint id, const QPalette& activePalette, bool forBackground) { const int high = 255; const int low = 100; auto color = QColor(qAbs(id % (high-low)), qAbs((id / 50) % (high-low)), qAbs((id / (50 * 50)) % (high-low))); const auto& foreground = activePalette.foreground().color(); const auto& background = activePalette.background().color(); if (forBackground) { return blendBackground(color, .5, foreground, background); } else { return blendForeground(color, .5, foreground, background); } } bool WidgetColorizer::colorizeByProject() { - return KSharedConfig::openConfig()->group("UiSettings").readEntry("ColorizeByProject", false); + return KSharedConfig::openConfig()->group("UiSettings").readEntry("ColorizeByProject", true); }