WSL/SLF GitLab Repository

Commit 3f33f76c authored by Michael Reisecker's avatar Michael Reisecker
Browse files

Switch some icons to text (thanks Mathias)

Also switch warning colors
parent bde82244
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
version="1.1"
width="32"
height="32"
id="svg4505">
<defs
id="defs4507">
<linearGradient
id="linearGradient3820-7-2-2">
<stop
id="stop3822-2-6-36"
style="stop-color:#3d3d3d;stop-opacity:1"
offset="0" />
<stop
id="stop3864-8-7-6"
style="stop-color:#686868;stop-opacity:0.49803922"
offset="0.5" />
<stop
id="stop3824-1-2-4"
style="stop-color:#686868;stop-opacity:0"
offset="1" />
</linearGradient>
<radialGradient
cx="99.157013"
cy="186.17059"
r="62.769119"
fx="99.157013"
fy="186.17059"
id="radialGradient3043"
xlink:href="#linearGradient3820-7-2-2"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.17524541,0,0,0.05575992,-1.37681,18.119145)" />
<linearGradient
id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8">
<stop
id="stop3750-8-9"
style="stop-color:#8cd5ff;stop-opacity:1"
offset="0" />
<stop
id="stop3752-3-2"
style="stop-color:#64baff;stop-opacity:1"
offset="0.26238" />
<stop
id="stop3754-7-2"
style="stop-color:#3689e6;stop-opacity:1"
offset="0.704952" />
<stop
id="stop3756-9-3"
style="stop-color:#0d52bf;stop-opacity:1"
offset="1" />
</linearGradient>
<radialGradient
xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8"
id="radialGradient3146"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,1.7674684,-1.8697707,-4.8107771e-8,31.79921,-9.5910627)"
cx="3.9722471"
cy="8.4497671"
fx="3.9722471"
fy="8.4497671"
r="19.99999" />
<linearGradient
id="linearGradient4806-9">
<stop
offset="0"
style="stop-color:#ffffff;stop-opacity:1"
id="stop4808-49" />
<stop
offset="0.42447853"
style="stop-color:#ffffff;stop-opacity:0.23529412"
id="stop4810-05" />
<stop
offset="0.82089913"
style="stop-color:#ffffff;stop-opacity:0.15686275"
id="stop4812-6" />
<stop
offset="1"
style="stop-color:#ffffff;stop-opacity:0.39215687"
id="stop4814-7" />
</linearGradient>
<linearGradient
gradientTransform="matrix(1.1194481,0,0,1.1219958,-64.797413,-15.266546)"
gradientUnits="userSpaceOnUse"
xlink:href="#linearGradient4806-9"
id="linearGradient4338-5-6"
y2="40.495617"
x2="71.204407"
y1="15.369057"
x1="71.204407" />
<radialGradient
gradientTransform="matrix(0,2.7757648,-2.1876957,-3.1515899e-8,34.375085,-2.0762385)"
gradientUnits="userSpaceOnUse"
xlink:href="#linearGradient4223"
id="radialGradient3126-7-25-24"
fy="8.449769"
fx="0.66680855"
r="19.99999"
cy="8.449769"
cx="-1.2645766" />
<linearGradient
id="linearGradient4526"
osb:paint="solid">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop4528" />
</linearGradient>
<linearGradient
id="linearGradient4223">
<stop
offset="0"
style="stop-color:#d1ff82;stop-opacity:1"
id="stop4225" />
<stop
offset="0.26238"
style="stop-color:#9bdb4d;stop-opacity:1"
id="stop4227" />
<stop
offset="0.66093999"
style="stop-color:#68b723;stop-opacity:1"
id="stop4229" />
<stop
offset="1"
style="stop-color:#3a9104;stop-opacity:1"
id="stop4231" />
</linearGradient>
</defs>
<metadata
id="metadata4510">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<path
d="m 27.000001,28.499999 a 11,3.4999999 0 1 1 -21.9999996,0 11,3.4999999 0 1 1 21.9999996,0 z"
id="path3818-0-2"
style="fill:url(#radialGradient3043);fill-opacity:1;stroke:none" />
<path
d="M 16.000002,1.4999989 C 7.999402,1.4999989 1.5,7.9993983 1.5,15.999999 1.5,24.000599 7.999402,30.500002 16.000002,30.5 24.000599,30.5 30.500008,24.000599 30.5,15.999999 30.5,7.9993983 24.000599,1.4999989 16.000002,1.4999989 z"
id="path2555"
style="color:#000000;fill:url(#radialGradient3146);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
d="m 16.176836,1.4652293 -1.724153,0.199393 -1.967303,0.487405 c 0.166363,-0.055171 0.336014,-0.1022487 0.508404,-0.1550835 L 12.861157,1.7753962 c -0.413443,0.083305 -0.816108,0.1720904 -1.215749,0.288012 -0.0201,0.00581 -0.04621,0.016235 -0.06631,0.022155 -0.469377,0.1382862 -0.922831,0.2842765 -1.370481,0.4652502 l -0.04421,0.04431 -0.08842,0.022155 C 9.9735628,2.659886 9.8676924,2.7054341 9.7665226,2.7502066 L 9.5675817,3.1268376 9.4570588,2.8831352 c -0.091692,0.043104 -0.1967767,0.088053 -0.2873586,0.1329286 l 0.04421,0.4209408 -0.4863,0.376631 -0.2652543,0.7089528 0.5747181,0 0.2210452,-0.4652506 0.088418,-0.1550831 C 9.6030447,3.7303542 9.8589488,3.5360126 10.120195,3.3705402 l 0.596823,0.1772383 c 0.396322,0.255181 0.796987,0.5206198 1.193644,0.7754169 L 12.48538,3.8136356 11.844349,3.5477785 11.534885,2.9717543 10.407554,2.8609804 l -0.0221,-0.1107738 0.4863,0.088619 0.265254,-0.2658573 0.618927,-0.1107739 c 0.144052,-0.066408 0.296673,-0.1231939 0.442091,-0.1772381 l -0.397882,0.3323215 1.370481,0.8861909 0,0.5317147 -0.530509,0.5095593 0.707345,1.3292863 0.4863,-0.2437027 0.618927,-0.8861907 C 15.308516,4.493378 16.054296,4.2047674 16.862076,3.8579449 l -0.04421,0.3323217 0.419986,0.2437028 0.707345,-0.4430957 -0.353673,-0.3987859 -0.486299,0.2658571 -0.154732,-0.044311 c 0.035,-0.015145 0.07543,-0.028954 0.110523,-0.044311 l 0.707345,-1.728072 -1.547318,-0.576024 c -0.0203,-4.375e-4 -0.02391,3.581e-4 -0.04421,0 z m -6.9187172,2.5921081 0.5968224,0.3766315 0.4641948,0 0,-0.4430957 L 9.7444183,3.747171 Z m -1.7683623,0 -0.24315,0.6424886 c 0,0 -0.4386669,0.061941 -0.5526134,0.088619 -1.4552006,1.2708207 -4.4009484,4.015274 -5.0840413,9.194229 0.02705,0.120068 0.4862995,0.819727 0.4862995,0.819727 l 1.1052261,0.620334 1.1273315,0.288012 0.4641947,0.553869 0.7515543,0.531715 0.4199857,-0.06646 0.3094638,0.132929 0,0.110774 -0.3978819,1.063429 -0.3315676,0.46525 0.088418,0.221547 -0.24315,0.864037 0.9283905,1.639453 0.972599,0.775417 0.4199862,0.598179 -0.04421,1.196357 0.3094633,0.664643 -0.3094633,1.307132 c -0.00509,0.01634 -0.020296,0.06751 0,0.132928 0.04096,0.130925 1.7072333,1.004702 1.8125714,0.930501 0.025841,-0.0186 0.020876,-0.02737 0.04421,-0.04431 -0.5882965,-1.049185 -0.9283905,-2.255272 -0.9283905,-3.544763 0,-2.042473 0.8559004,-3.864714 2.2104534,-5.184216 L 10.407554,17.305889 9.6117912,17.128651 9.191805,16.065222 8.1528922,16.175996 7.2466065,15.555662 l -0.9725991,0.797572 0,0.110774 C 5.9853227,16.385036 5.6468794,16.370087 5.389826,16.220306 l -0.1989405,-0.576024 0,-0.620334 -0.6631362,0.06646 c 0.053058,-0.398086 0.1233994,-0.798342 0.1768362,-1.196358 l -0.3757766,0 -0.3978819,0.465251 -0.3536724,0.155083 -0.5305086,-0.288012 -0.04421,-0.620334 0.1105224,-0.664643 0.7736585,-0.598178 0.6410315,0 L 4.660376,12.010899 5.4340346,12.188137 6.0308569,12.89709 6.119275,11.722887 7.1360836,10.94747 7.489756,10.105589 8.2634145,9.795422 8.661296,9.219398 9.6117907,9.0643144 10.120195,8.3775165 l -1.458899,0 0.9062857,-0.3987854 0.6410313,0 0.817868,-0.2658576 0.154731,0.7311076 L 11.534885,7.9344213 11.137003,7.6685642 11.225421,7.3583973 10.893854,7.0703854 10.540181,6.9817663 10.628599,6.6051348 10.363345,6.0955755 9.7223136,6.3392777 9.8328359,5.8740277 9.0812822,5.4752418 8.5065641,6.4278967 8.5728779,6.7823734 7.9760555,7.0260756 7.6223831,7.7571832 7.4455469,7.0703854 6.4508431,6.6715995 6.2740069,6.1620396 7.6223831,5.430932 8.2192055,4.8992179 8.263415,4.2788842 7.9318469,4.1016461 Z m 13.6605985,0.2658575 -0.110522,0.066464 0,0.376631 -1.038913,0.6203336 0.198941,0.9305001 0.596822,-0.3987859 0.397881,0.3987859 0.419987,0.2437027 0.287359,-0.6867979 -0.154732,-0.4209407 0.08842,-0.1550832 C 21.631336,4.9502797 21.399915,4.6358636 21.150355,4.3231949 Z m -2.763066,0.8861907 0,0.3987859 0.221045,0.2215474 0,0.5981788 -0.132627,0.7532626 0.663137,-0.110774 0.486299,-0.4652505 -0.44209,-0.376631 C 19.043217,5.8756254 18.915971,5.547848 18.740962,5.2093856 Z m -0.574717,0.775417 -0.397882,0.1107739 0.110523,0.7089522 0.508404,-0.2658571 z m 3.050425,0.3987859 -0.375777,0.2658571 0.154732,0.3987859 -0.596823,0 -0.331568,0.5095598 -0.397881,0.4430951 -0.72945,0.1550837 0.419986,0.3987859 0.110523,0.3987859 -0.530509,0 -0.707345,0.376631 0,1.0634291 0.309464,0 0.309463,0.310167 0.685241,-0.310167 0.265254,-0.6646432 0.486299,-0.2880119 0.110523,-0.2215479 0.817868,-0.2215478 0.44209,0.4874049 0.508405,0.2437027 -0.287359,0.5317142 0.419986,-0.110774 0.221045,-0.5317141 -0.552613,-0.6203337 0.24315,0 0.552613,0.4430957 0.110522,0.5760241 0.265255,0.288012 C 22.880501,9.8433445 22.940823,9.3542936 22.940823,8.8649229 22.887559,8.0341097 22.684739,7.2492877 22.388209,6.4943624 l -0.68524,0.5538691 -0.839972,-0.199393 z m -0.375777,4.2315615 -1.038913,0.110774 -0.906286,0.221547 c -0.520894,0.559635 -1.076402,1.146865 -1.569421,1.728072 l -0.574718,1.329286 0.265254,0.288012 -0.4863,0.708953 0.419987,0.930501 c 2.647134,-0.278159 4.87513,-2.025548 5.835595,-4.4088 l -0.221045,0.221548 -1.016809,-0.952655 z"
id="path6534-2"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#002e99;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
<g
id="g4341"
transform="translate(41.927245,-0.45393939)">
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
id="path2555-1-30-7"
d="m -26.208595,1.9539439 c 2.2843,0 7.34375,4.085606 7.34375,10.2137111 0,3.897361 -3.18719,5.286289 -7.09375,5.286289 l -0.375,0.03125 c -3.83615,0.194377 -6.90625,3.343829 -6.90625,7.21875 0,2.147354 0.94737,4.081921 2.4375,5.40625 1.52285,0.544051 3.16658,0.843751 4.875,0.84375 7.83023,0 14.20007,-6.234561 14.46875,-14 -0.26353,-7.7983821 -6.63248,-14.9805871 -14.46875,-15.0000001 -0.0106,0 -0.0206,-2.3e-5 -0.0312,0 -0.0834,0 -0.1674,0 -0.25,0 z" />
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
id="path4390"
d="m -25.927345,1.9539439 c -0.51066,0 -1.00287,0.01084 -1.5,0.0625 a 1.107975,1.107975 0 0 0 1.09375,1.03125 c 1.21653,0 2.7946,0.899208 4.0625,2.34375 1.25386,1.428545 2.1876,3.326455 2.3125,5.0000001 10e-4,0.01874 -0.001,0.04382 0,0.0625 -0.0344,3.263756 -2.71331,5.90625 -6,5.90625 a 1.107975,1.107975 0 0 0 -0.0937,0 l -0.34375,0.03125 -0.0312,0 c -4.39571,0.23919 -7.90625,3.863043 -7.90625,8.3125 0,1.600853 0.45825,3.089872 1.25,4.34375 2.11493,1.206731 4.54987,1.906251 7.15625,1.90625 8.0006,0 14.50001,-6.499399 14.5,-14.5 0,-8.0006001 -6.4994,-14.5000001 -14.5,-14.5000001 z" />
</g>
<path
d="m 15.483973,1.4026386 c 3.775266,0 7.194244,3.4319395 7.453038,7.4687836 5e-6,3.9149678 -3.173674,7.0953448 -7.080383,7.0953448 l -0.372655,0.02334 c -3.836301,0.195255 -6.8940567,3.366296 -6.8940567,7.258724 0,3.892431 3.0577557,7.06347 6.8940567,7.258725 l 0,0.02333 c 0.12441,0.0031 0.247493,0 0.372655,0 8.018294,0 14.533425,-6.52889 14.53342,-14.564129 0,-8.0352385 -6.515126,-14.5641288 -14.53342,-14.5641288 -0.125162,0 -0.248245,-0.0031 -0.372655,5.9e-6 z"
id="path2555-1-1"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3126-7-25-24);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
<path
d="m 15.602118,1.4772347 c 3.775266,0 7.190433,3.351358 7.449227,7.3882016 5e-6,3.9149687 -3.166741,7.1116817 -7.07345,7.1116817 l -0.375777,0.02216 c -3.836301,0.195254 -7.0223216,3.352182 -7.0223216,7.24461 0,3.892431 3.1860206,7.07151 7.0223216,7.266764 l 0,0.02216 c 0.12441,0.0031 0.250615,0 0.375777,0 M 16,1.4657447 c -8.0009151,0 -14.5005711,6.5144274 -14.5005711,14.5335283 0,8.019101 6.499656,14.533533 14.5005711,14.53353 8.000914,0 14.500576,-6.514429 14.500572,-14.53353 C 30.500572,7.9801721 24.000914,1.4657447 16,1.4657447 Z"
id="path3871"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#002728;stroke-width:0.99999994;marker:none;enable-background:accumulate;stroke-opacity:1" />
<path
d="m 29.5,16 c 0,7.472812 -6.044161,13.530721 -13.500007,13.530721 C 8.5441583,29.530721 2.5000001,23.472812 2.5000001,16 2.5000001,8.5271892 8.5441583,2.4692775 15.999993,2.4692775 23.455839,2.4692775 29.5,8.5271892 29.5,16 Z M 22.201565,4.0153255 c 1.568545,2.0923033 1.748962,2.9077858 1.885208,5.0330535 0.172722,4.234959 -3.827574,7.732917 -7.467251,7.865472 -0.340793,0.02719 -0.7114,0.08788 -1.031327,0.113174 -3.489732,0 -6.0206785,3.348594 -6.0206785,6.063594 0,3.434455 2.8196825,6.268074 6.0863275,6.434336"
id="path4762-7"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient4338-5-6);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
</svg>
This diff is collapsed.
......@@ -69,7 +69,6 @@ OR find icons/ -name "*.svg" | grep "elementary" | awk '{printf("<file>%s</file>
<file>icons/flat-bw/svg/go-up.svg</file>
<file>icons/flat-bw/svg/help-about.svg</file>
<file>icons/flat-bw/svg/help-contents.svg</file>
<file>icons/flat-bw/svg/internet-web-browser.svg</file>
<file>icons/flat-bw/svg/markasblank.svg</file>
<file>icons/flat-bw/svg/preferences-system.svg</file>
<file>icons/flat-bw/svg/tab-close.svg</file>
......@@ -110,7 +109,6 @@ OR find icons/ -name "*.svg" | grep "elementary" | awk '{printf("<file>%s</file>
<file>icons/elementary/svg/go-up.svg</file>
<file>icons/elementary/svg/help-about.svg</file>
<file>icons/elementary/svg/help-contents.svg</file>
<file>icons/elementary/svg/internet-web-browser.svg</file>
<file>icons/elementary/svg/markasblank.svg</file>
<file>icons/elementary/svg/preferences-system.svg</file>
<file>icons/elementary/svg/tab-close.svg</file>
......
......@@ -17,6 +17,7 @@
*/
#include "Atomic.h"
#include "src/main/constants.h"
#include "src/main/inishell.h"
#include "src/main/os.h"
......@@ -135,6 +136,7 @@ void Atomic::setHighlightedStyle(const bool &on, const int &reset_interval)
}
this->style()->unpolish(emphasis_widget_);
this->style()->polish(emphasis_widget_);
//emphasis_widget_->repaint(); //needed for e. g. border styling
if (reset_interval != -1)
style_timer_.start();
......@@ -178,16 +180,15 @@ void Atomic::setPanelStyle(const PanelStyle &style, const bool &set, QWidget *wi
case MANDATORY:
style_string = "mandatory";
{ //if the styling widget is a label we also append an asterisk to the label of missing values:
QLabel* key_label( qobject_cast<QLabel*>(getEmphasisWidget()) );
QLabel *key_label( qobject_cast<QLabel *>(getEmphasisWidget()) );
if (key_label) {
if (set) {
if (!key_label->text().endsWith(" *"))
key_label->setText(key_label->text() + " *");
if (!key_label->text().startsWith(Cst::star + " "))
key_label->setText(Cst::star + " " + key_label->text());
} else {
if (key_label->text().endsWith(" *")) {
if (key_label->text().startsWith(Cst::star + " ")) {
QString pure_label( key_label->text() ); //non-const copy
pure_label.chop(2);
key_label->setText(pure_label);
key_label->setText(pure_label.mid(2));
}
} //endif set
} //endif key_label
......
......@@ -18,6 +18,7 @@
#include "Textfield.h"
#include "Label.h"
#include "src/main/constants.h"
#include "src/main/expressions.h"
#include <QDesktopServices>
......@@ -50,7 +51,7 @@ Textfield::Textfield(const QString &section, const QString &key, const QDomNode
check_button_ = new QToolButton; //a button that can pop up if the text has a certain format
check_button_->setVisible(false);
check_button_->setAutoRaise(true);
check_button_->setIcon(getIcon("internet-web-browser")); //only coordinates for now
check_button_->setText(Cst::globe);
connect(check_button_, &QToolButton::clicked, this, &Textfield::checkButtonClicked);
/* layout of textbox plus button and the main layout */
......
......@@ -68,11 +68,11 @@ QColor getQColor(const QString &colorname)
else if (name == "helptext")
name = "sl_base1";
else if (name == "mandatory")
name = "sl_orange";
name = "sl_red";
else if (name == "default_values")
name = "sl_base00";
else if (name == "faulty_values")
name = "sl_orange";
name = "sl_yellow";
else if (name == "valid_values")
return (use_darkmode)? QColor("white") : QColor();
else if (name == "number")
......
......@@ -29,6 +29,11 @@
namespace Cst {
/* Unicode character literals */
static const QString star( QChar( 0x2217 ) ); //∗
static const uint globe_32 = 0x1F30D;
static const QString globe( QString::fromUcs4(&globe_32, 1) ); //🌍
/* main window */
static constexpr int width_inishell_default = 1400;
static constexpr int height_inishell_default = 800;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment