Skip to content

Commit dcc731b

Browse files
committed
qtdragon/hd -stylesheet: update brushed metal color to enlargen editor buttons
gcode editor buttons were too small for touch screen. MarkoPolo supplied
1 parent 7952416 commit dcc731b

2 files changed

Lines changed: 146 additions & 222 deletions

File tree

share/qtvcp/screens/qtdragon/brushed_metal_color.qss

Lines changed: 73 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* brushed_metal_color stylesheet designed for qtdragon/hd */
22

33
QMainWindow {
4-
background-image: url(:/images/images/brushed_metal.png);
4+
background-image: url(:/images/images/brushed_metal.png);
55
}
66

77
/* comment for blur effect with dialogs */
@@ -11,7 +11,7 @@ QPushButton,
1111
ActionButton,
1212
SystemToolButton,
1313
OffsetToolButton,
14-
AxisToolButton,
14+
AxisToolButton,
1515
QToolButton {
1616
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1.6, stop:0 rgba(160, 160, 160, 225), stop:0.6 rgba(110, 110, 110, 225));
1717
border: 2px solid black;
@@ -20,7 +20,6 @@ background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1.6, stop:0
2020
}
2121

2222

23-
2423
QPushButton:checked,
2524
QPushButton:pressed {
2625
border-color: blue;
@@ -52,37 +51,36 @@ ActionButton#plus_jogbutton_0,
5251
ActionButton#minus_jogbutton_0 {
5352
border-radius: 4px;
5453
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1, stop:0 rgba(180, 255, 180,160), stop:0.6 rgba(80, 255, 80, 160));
55-
5654
}
5755

5856
ActionButton#plus_jogbutton_1,
5957
ActionButton#minus_jogbutton_1 {
6058
border-radius: 4px;
61-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1, stop:0 rgba(255, 180, 180,160), stop:0.6 rgba(255, 80, 80,160));
62-
59+
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1, stop:0 rgba(255, 180, 180,160), stop:0.6 rgba(255, 80, 80,160));
6360
}
61+
6462
ActionButton#plus_jogbutton_2,
6563
ActionButton#minus_jogbutton_2 {
6664
border-radius: 4px;
67-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1, stop:0 rgba(180, 180, 255,160), stop:0.6 rgba(80, 80, 255,160));
65+
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1, stop:0 rgba(180, 180, 255,160), stop:0.6 rgba(80, 80, 255,160));
6866
}
6967

7068

7169

7270
#plus_jogbutton_3,
7371
#minus_jogbutton_3 {
74-
border-radius: 4px;
75-
font: 17pt "Lato Heavy";
76-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1, stop:0 rgba(203, 145, 27,250), stop:0.6 rgba(173, 105, 6, 180));
72+
border-radius: 4px;
73+
font: 17pt "Lato Heavy";
74+
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1, stop:0 rgba(203, 145, 27,250), stop:0.6 rgba(173, 105, 6, 180));
7775

7876
}
7977

8078

8179
#plus_jogbutton_4,
8280
#minus_jogbutton_4 {
83-
border-radius: 4px;
84-
font: 17pt "Lato Heavy";
85-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1, stop:0 rgba(193, 107, 188,250), stop:0.6 rgba(150, 100,140, 200));
81+
border-radius: 4px;
82+
font: 17pt "Lato Heavy";
83+
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1, stop:0 rgba(193, 107, 188,250), stop:0.6 rgba(150, 100,140, 200));
8684
}
8785

8886
ActionButton#action_machine_on[isStateOn=true] {
@@ -110,96 +108,30 @@ QLabel {
110108
color: black;
111109
}
112110

113-
QLabel#lbl_jog_angular{
114-
font: 18pt "Lato Heavy";
115-
color: black;
116-
}
117-
118-
QLabel#label_axis_x {
119-
border: 2px solid black;
120-
border-radius: 4px;
121-
font: 20pt "Lato Heavy";
122-
color: rgb(80, 255, 80);
123-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1.6, stop:0 rgba(160, 160, 160, 225), stop:0.6 rgba(110, 110, 110, 225));
124-
}
125-
126-
QLabel#label_axis_y {
127-
border: 2px solid black;
128-
border-radius: 4px;
129-
font: 20pt "Lato Heavy";
130-
color: rgb(255, 80, 80);
131-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1.6, stop:0 rgba(160, 160, 160, 225), stop:0.6 rgba(110, 110, 110, 225));
132-
}
133-
134-
QLabel#label_axis_z {
135-
border: 2px solid black;
136-
border-radius: 4px;
137-
font: 20pt "Lato Heavy";
138-
color: rgb(80, 80, 255);
139-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1.6, stop:0 rgba(160, 160, 160, 225), stop:0.6 rgba(110, 110, 110, 225));
140-
}
141-
142-
#label_axis_4 {
143-
border: 2px solid black;
144-
border-radius: 4px;
145-
font: 20pt "Lato Heavy";
146-
color: rgb(233, 155, 37);
147-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1.6, stop:0 rgba(160, 160, 160, 225), stop:0.6 rgba(110, 110, 110, 225));
148-
}
149-
150-
#label_axis_5 {
151-
border: 2px solid black;
152-
border-radius: 4px;
153-
font: 20pt "Lato Heavy";
154-
color: rgb(223, 167, 198);
155-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1.6, stop:0 rgba(160, 160, 160, 225), stop:0.6 rgba(110, 110, 110, 225));
156-
}
157111

158112
#axis_select_0 {
159-
border: 2px solid black;
160-
border-radius: 4px;
161113
font: 16pt "Lato Heavy";
162114
color: rgb(80, 255, 80);
163-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1.6, stop:0 rgba(160, 160, 160, 225), stop:0.6 rgba(110, 110, 110, 225));
164115
}
165116

166117
#axis_select_1 {
167-
border: 2px solid black;
168-
border-radius: 4px;
169118
font: 16pt "Lato Heavy";
170119
color: rgb(255, 80, 80);
171-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1.6, stop:0 rgba(160, 160, 160, 225), stop:0.6 rgba(110, 110, 110, 225));
172120
}
173121

174122
#axis_select_2 {
175-
border: 2px solid black;
176-
border-radius: 4px;
177123
font: 16pt "Lato Heavy";
178124
color: rgb(80, 80, 255);
179-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1.6, stop:0 rgba(160, 160, 160, 225), stop:0.6 rgba(110, 110, 110, 225));
180125
}
181126

182127
#axis_select_3 {
183-
border: 2px solid black;
184-
border-radius: 4px;
185128
font: 16pt "Lato Heavy";
186129
color: rgb(233, 155, 37);
187-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1.6, stop:0 rgba(160, 160, 160, 225), stop:0.6 rgba(110, 110, 110, 225));
188130
}
189131

190132
#axis_select_4 {
191-
border: 2px solid black;
192-
border-radius: 4px;
193133
font: 16pt "Lato Heavy";
194134
color: rgb(223, 167, 198);
195-
background: qlineargradient(spread:reflect, x1:0.5, y:0, x2:0.5, y2:1.6, stop:0 rgba(160, 160, 160, 225), stop:0.6 rgba(110, 110, 110, 225));
196-
}
197-
198-
199-
200-
QLabel#lbl_cycle_start,
201-
QLabel#lbl_home_all {
202-
font: 10pt "Lato Heavy";
203135
}
204136

205137

@@ -232,9 +164,9 @@ Label {
232164
}
233165

234166
StatusLabel#status_act_feedrate {
235-
background: #303030;
236-
color: #00FF00;
237-
font: 13pt "Lato Heavy";
167+
background: #303030;
168+
color: #00FF00;
169+
font: 13pt "Lato Heavy";
238170
}
239171

240172

@@ -248,8 +180,8 @@ DROLabel {
248180
border-radius: 4px;
249181
font: 20pt "Lato Heavy";
250182
color: #00FF00;
251-
qproperty-imperial_template: '%9.4f';
252-
qproperty-metric_template: '%10.3f';
183+
qproperty-imperial_template: '%9.4f';
184+
qproperty-metric_template: '%10.3f';
253185
qproperty-angular_template: '%11.3f';
254186
}
255187

@@ -272,11 +204,11 @@ QLineEdit {
272204
}
273205

274206
QLineEdit#mdiline {
275-
font: 12pt ;
207+
font: 14pt ;
276208
}
277209

278210
QLineEdit#lineEdit_statusbar {
279-
font: 12pt "Lato Heavy";
211+
font: 12pt "Lato Heavy";
280212
}
281213

282214

@@ -302,7 +234,7 @@ QComboBox {
302234
border: 1px solid black;
303235
min-width: 100px;
304236
font: 10pt "Lato Heavy";
305-
color: black;
237+
color: black;
306238
}
307239

308240
QGroupBox {
@@ -353,7 +285,7 @@ QHeaderView {
353285
font: 10pt "Lato Heavy";
354286
}
355287

356-
QHeaderView::section::vertical::first,
288+
QHeaderView::section::vertical::first,
357289
QHeaderView::section::vertical::only-one {
358290
width: 60px;
359291
}
@@ -373,43 +305,39 @@ QSlider::groove:vertical {
373305
}
374306

375307
QSlider::sub-page:horizontal {
376-
background: qlineargradient(x1: 0, y1: 0.8, x2: 1, y2: 1, stop: 0 #bbf stop: 1 #55f);
377-
height: 12px;
308+
background: qlineargradient( y2: 0.5,x1: 1, y1: 0.5 stop: 0 #66f stop: 1 #99f);
309+
border: 1px solid #777;
378310
}
379311

380312
QSlider::add-page:horizontal {
381313
background-color: rgb(110, 110, 110);
382-
border: 1px solid #777;
383-
width: 12px;
384314
}
385315

386316
QSlider::add-page:vertical {
387-
background: qlineargradient(x1: 0, y2: 0.8, x2: 1, y2: 1, stop: 0 #bbf, stop: 1 #55f);
317+
background: qlineargradient( x1:0.5, y1:0, x2:0.5, y2:1 stop: 0 #66f, stop: 1 #99f);
388318
border: 1px solid #777;
389-
height: 12px;
390319
}
391320

392321
QSlider::sub-page:vertical {
393322
background-color: rgb(110, 110, 110);
394-
width: 12px;
395323
}
396324

397325
QSlider::handle:horizontal {
398326
background: lightgray;
399327
border: 1px solid black;
400-
width: 16px;
328+
width: 18px;
401329
margin-top: -8px;
402330
margin-bottom: -8px;
403-
border-radius: 2px;
331+
border-radius: 3px;
404332
}
405333

406334
QSlider::handle:vertical {
407335
background: lightgray;
408336
border: 1px solid black;
409-
height: 16px;
337+
height: 18px;
410338
margin-left: -8px;
411339
margin-right: -8px;
412-
border-radius: 2px;
340+
border-radius: 3px;
413341
}
414342

415343
#slider_feed_ovr {
@@ -443,7 +371,7 @@ QSlider::handle:vertical {
443371

444372

445373
QDialog{
446-
background-image: url(:/images/images/brushed_metal.png);
374+
background-image: url(:/images/images/brushed_metal.png);
447375
}
448376

449377
ToolDialog QPushButton, AboutDialog QPushButton{
@@ -482,8 +410,8 @@ CalculatorDialog QLineEdit {
482410

483411
/** Dialogs **/
484412
QDialog QPushButton {
485-
width: 100px;
486-
height: 40px;
413+
width: 100px;
414+
height: 40px;
487415
}
488416

489417

@@ -518,26 +446,47 @@ QTabBar::tab:!selected {
518446
margin-top: 2px; /* make non-selected tabs look smaller */
519447
}
520448

521-
ToolOffsetView {
449+
ToolOffsetView {
522450
font: 12pt "Lato Heavy";
523-
qproperty-imperial_template: '%9.4f';
524-
qproperty-metric_template: '%10.3f';
451+
qproperty-imperial_template: '%9.4f';
452+
qproperty-metric_template: '%10.3f';
525453
}
526454

527-
OriginOffsetView {
528-
font: 11pt "Lato Heavy";
529-
qproperty-imperial_template: '%9.4f';
530-
qproperty-metric_template: '%10.3f';
455+
OriginOffsetView {
456+
font: 11pt "Lato Heavy";
457+
qproperty-imperial_template: '%9.4f';
458+
qproperty-metric_template: '%10.3f';
531459
}
532460

533461
/** Plain Text Edit **/
534462
QTextEdit,
535463
QPlainTextEdit,
536464
QListWidget {
537-
background: #eeeeee;
538-
font: 12pt "Lato Heavy";
465+
background: #eeeeee;
466+
font: 12pt "Lato Heavy";
539467
}
540468

469+
QMenu {
470+
font: 14pt "Lato Heavy";
471+
background: #b0b0b0;
472+
border: 2px solid black;
473+
}
474+
475+
DROLabel{
476+
qproperty-showLast: false;
477+
qproperty-showDivide: false;
478+
qproperty-showGotoOrigin: true;
479+
qproperty-showZeroOrigin: false;
480+
qproperty-showSetOrigin: false;
481+
}
482+
483+
AxisToolButton{
484+
qproperty-showLast: true;
485+
qproperty-showDivide: true;
486+
qproperty-showGotoOrigin: false;
487+
qproperty-showZeroOrigin: true;
488+
qproperty-showSetOrigin: true;
489+
}
541490

542491
#screen_options {
543492
qproperty-user1Color: white; /* default status */
@@ -574,6 +523,19 @@ EditorBase {
574523
qproperty-styleColor5: red;/* Other (feed, spindle, radius, etc) */
575524
qproperty-styleColor6: #111155;/* Axes Values */
576525
qproperty-styleColor7: #111155;/* Other Values */
526+
qproperty-styleColorCursor: red
527+
}
528+
529+
GcodeEditor QToolButton {
530+
min-width: 35;
531+
height: 35;
532+
font: 12pt "Lato Heavy";
533+
}
534+
535+
GcodeEditor QLineEdit {
536+
width: 120;
537+
height: 26;
538+
font: 12pt "Lato Heavy";
577539
}
578540

579541

0 commit comments

Comments
 (0)