OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

New checkbox icons as svgs and adjusted background colors.

Browse Source
This commit is contained in:
Ruben Thoms
2020-09-28 15:48:18 +02:00
committed by Magne Sjaastad
parent cf1487c2f3
commit 440767d876
12 changed files with 137 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Resources/ResInsight.qrc
View File

@@ -210,6 +210,12 @@
<file>themes/dark/checkbox-checked-disabled-20x20.png</file>
<file>themes/dark/checkbox-indeterminate-disabled-20x20.png</file>
<file>SummaryCase24x24.png</file>
<file>themes/dark/checkbox-checked.svg</file>
<file>themes/dark/checkbox-checked-disabled.svg</file>
<file>themes/dark/checkbox-unchecked.svg</file>
<file>themes/dark/checkbox-unchecked-disabled.svg</file>
<file>themes/dark/checkbox-indeterminate.svg</file>
<file>themes/dark/checkbox-indeterminate-disabled.svg</file>
</qresource>
<qresource prefix="/Shader">
<file>fs_CellFace.glsl</file>

34
ApplicationCode/Resources/themes/dark.qss
View File

@@ -27,36 +27,36 @@ $externalInputColor: #e82257; // External input background color
QCheckBox::indicator:unchecked, QTreeView::indicator:unchecked, QTableView::indicator:unchecked
{
background-color: $backgroundColor1;
image: url(:/themes/dark/checkbox-unchecked-20x20.png);
image: url(:/themes/dark/checkbox-unchecked.svg);
}
QCheckBox::indicator:checked, QTreeView::indicator:checked, QTableView::indicator:checked
{
background-color: $backgroundColor1;
image: url(:/themes/dark/checkbox-checked-20x20.png);
image: url(:/themes/dark/checkbox-checked.svg);
}
QCheckBox::indicator:indeterminate, QTreeView::indicator:indeterminate, QTableView::indicator:indeterminate
{
background-color: $backgroundColor1;
image: url(:/themes/dark/checkbox-indeterminate-20x20.png);
image: url(:/themes/dark/checkbox-indeterminate.svg);
}
QCheckBox::indicator:unchecked:disabled, QTreeView::indicator:unchecked:disabled, QTableView::indicator:unchecked:disabled
{
background-color: $backgroundColor1;
image: url(:/themes/dark/checkbox-unchecked-disabled-20x20.png);
image: url(:/themes/dark/checkbox-unchecked-disabled.svg);
}
QCheckBox::indicator:checked:disabled, QTreeView::indicator:checked:disabled, QTableView::indicator:checked:disabled
{
background-color: $backgroundColor1;
image: url(:/themes/dark/checkbox-checked-disabled-20x20.png);
image: url(:/themes/dark/checkbox-checked-disabled.svg);
}
QCheckBox::indicator:indeterminate:disabled, QTreeView::indicator:indeterminate:disabled, QTableView::indicator:indeterminate:disabled
{
background-color: $backgroundColor1;
image: url(:/themes/dark/checkbox-indeterminate-disabled-20x20.png);
image: url(:/themes/dark/checkbox-indeterminate-disabled.svg);
}
QwtPlot["*"]::grid["*"] {
@@ -186,6 +186,22 @@ QTreeView::branch:open:has-children:has-siblings {
icon-size: 12px;
}
QHeaderView::section
{
background-color: $backgroundColor1;
color: $textColor;
padding: 4px;
}
QTableView QTableCornerButton::section {
background: transparent;
}
QHeaderView
{
background-color: $backgroundColor1;
}
QDockWidget {
background-color: $mainBackgroundColor;
titlebar-close-icon: url(:/themes/dark/blank.svg);
@@ -194,7 +210,6 @@ QDockWidget {
QDockWidget::title {
background-color: $backgroundColor1;
padding: 5px;
}
QDockWidget::close-button, QDockWidget::float-button {
@@ -406,3 +421,8 @@ QWidget[state="ExternalInput"] {
background-color: $externalInputColor;
border: 2px solid $borderColor;
}
QWidget:readonly {
background-color: $backgroundColor1;
color: $backgroundColor3;
}

13
ApplicationCode/Resources/themes/dark/checkbox-checked-disabled.svg Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 13.9 13.9" style="enable-background:new 0 0 13.9 13.9;" xml:space="preserve">
<style type="text/css">
.st0{fill:#394046;stroke:#5B6068;stroke-miterlimit:10;}
.st1{fill:none;stroke:#5B6068;stroke-width:1.5;stroke-miterlimit:10;}
.st2{display:none;fill:#E7E8EA;}
</style>
<rect x="0.5" y="0.5" class="st0" width="12.9" height="12.9"/>
<polyline class="st1" points="3.2,7.3 6.1,10.2 11.8,4.6 "/>
<rect x="3.4" y="3.4" class="st2" width="7" height="7"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 735 B

13
ApplicationCode/Resources/themes/dark/checkbox-checked.svg Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 13.9 13.9" style="enable-background:new 0 0 13.9 13.9;" xml:space="preserve">
<style type="text/css">
.st0{fill:#394046;stroke:#E8E8EA;stroke-miterlimit:10;}
.st1{fill:none;stroke:#E8E8EA;stroke-width:1.5;stroke-miterlimit:10;}
.st2{display:none;fill:#E7E8EA;}
</style>
<rect x="0.5" y="0.5" class="st0" width="12.9" height="12.9"/>
<polyline class="st1" points="3.2,7.3 6.1,10.2 11.8,4.6 "/>
<rect x="3.4" y="3.4" class="st2" width="7" height="7"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 735 B

13
ApplicationCode/Resources/themes/dark/checkbox-indeterminate-disabled.svg Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 13.9 13.9" style="enable-background:new 0 0 13.9 13.9;" xml:space="preserve">
<style type="text/css">
.st0{fill:#394046;stroke:#5B6068;stroke-miterlimit:10;}
.st1{display:none;fill:none;stroke:#5B6068;stroke-miterlimit:10;}
.st2{fill:#5C6169;}
</style>
<rect x="0.5" y="0.5" class="st0" width="12.9" height="12.9"/>
<polyline class="st1" points="3.2,7.3 6.1,10.2 11.8,4.6 "/>
<rect x="3.4" y="3.4" class="st2" width="7" height="7"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 718 B

13
ApplicationCode/Resources/themes/dark/checkbox-indeterminate.svg Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 13.9 13.9" style="enable-background:new 0 0 13.9 13.9;" xml:space="preserve">
<style type="text/css">
.st0{fill:#394046;stroke:#E8E8EA;stroke-miterlimit:10;}
.st1{display:none;fill:none;stroke:#5B6068;stroke-miterlimit:10;}
.st2{fill:#E7E8EA;}
</style>
<rect x="0.5" y="0.5" class="st0" width="12.9" height="12.9"/>
<polyline class="st1" points="3.2,7.3 6.1,10.2 11.8,4.6 "/>
<rect x="3.4" y="3.4" class="st2" width="7" height="7"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 718 B

13
ApplicationCode/Resources/themes/dark/checkbox-tristate-disabled.svg Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
<style type="text/css">
.st0{fill:#394046;stroke:#5B6068;stroke-miterlimit:10;}
.st1{display:none;fill:none;stroke:#5B6068;stroke-miterlimit:10;}
.st2{fill:#5B6068;}
</style>
<rect x="1.6" y="1.6" class="st0" width="12.9" height="12.9"/>
<polyline class="st1" points="4.2,8.4 7.2,11.3 12.9,5.6 "/>
<rect x="4.5" y="4.5" class="st2" width="7" height="7"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 710 B

13
ApplicationCode/Resources/themes/dark/checkbox-tristate.svg Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
<style type="text/css">
.st0{fill:#394046;stroke:#E7E8EA;stroke-miterlimit:10;}
.st1{display:none;fill:none;stroke:#5B6068;stroke-miterlimit:10;}
.st2{fill:#E7E8EA;}
</style>
<rect x="1.6" y="1.6" class="st0" width="12.9" height="12.9"/>
<polyline class="st1" points="4.2,8.4 7.2,11.3 12.9,5.6 "/>
<rect x="4.5" y="4.5" class="st2" width="7" height="7"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 710 B

13
ApplicationCode/Resources/themes/dark/checkbox-unchecked-disabled.svg Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 13.9 13.9" style="enable-background:new 0 0 13.9 13.9;" xml:space="preserve">
<style type="text/css">
.st0{fill:#394046;stroke:#5B6068;stroke-miterlimit:10;}
.st1{display:none;fill:none;stroke:#5B6068;stroke-miterlimit:10;}
.st2{display:none;fill:#5C6169;}
</style>
<rect x="0.5" y="0.5" class="st0" width="12.9" height="12.9"/>
<polyline class="st1" points="3.2,7.3 6.1,10.2 11.8,4.6 "/>
<rect x="3.4" y="3.4" class="st2" width="7" height="7"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 731 B

13
ApplicationCode/Resources/themes/dark/checkbox-unchecked.svg Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.1.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 13.9 13.9" style="enable-background:new 0 0 13.9 13.9;" xml:space="preserve">
<style type="text/css">
.st0{fill:#394046;stroke:#E8E8EA;stroke-miterlimit:10;}
.st1{display:none;fill:none;stroke:#E8E8EA;stroke-width:1.5;stroke-miterlimit:10;}
.st2{display:none;fill:#E7E8EA;}
</style>
<rect x="0.5" y="0.5" class="st0" width="12.9" height="12.9"/>
<polyline class="st1" points="3.2,7.3 6.1,10.2 11.8,4.6 "/>
<rect x="3.4" y="3.4" class="st2" width="7" height="7"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 748 B

4
Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp
View File

@@ -73,14 +73,10 @@ void PdmUiLineEditor::updateLineEditFromReadOnlyState( QLineEdit* lineEdit, bool
if ( isReadOnly )
{
lineEdit->setReadOnly( true );
lineEdit->setStyleSheet( "QLineEdit {"
"color: #808080;"
"background-color: #F0F0F0;}" );
}
else
{
lineEdit->setReadOnly( false );
lineEdit->setStyleSheet( "" );
}
}

4
Fwk/AppFwk/cafUserInterface/cafPdmUiPickableLineEditor.cpp
View File

@@ -72,14 +72,10 @@ void caf::PdmUiPickableLineEditor::configureAndUpdateUi( const QString& uiConfig
if ( m_attribute.enablePicking )
{
m_attribute.pickEventHandler->registerAsPickEventHandler();
m_lineEdit->setStyleSheet( "QLineEdit {"
"color: #000000;"
"background-color: #FFDCFF;}" );
}
else
{
m_attribute.pickEventHandler->unregisterAsPickEventHandler();
m_lineEdit->setStyleSheet( "" );
}
}