Skip to content

Commit 9dafdaf

Browse files
c-morleyc-morley
committed
qtdragon/hd/vert/lathe -update brushed metal stylesheet
Thank you MarkoPolo
1 parent c13c034 commit 9dafdaf

4 files changed

Lines changed: 291 additions & 182 deletions

File tree

‎share/qtvcp/screens/qtdragon/brushed_metal_color.qss‎

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -503,10 +503,10 @@ AxisToolButton{
503503

504504
/** GCode Display **/
505505
EditorBase {
506-
qproperty-styleColorBackground: #c0c0c0;
507-
qproperty-styleColorMarginBackground: #666666;
508-
qproperty-styleColorMarginText: #ffffff;
509-
qproperty-styleColorMarkerBackground: #9f9f9f;
506+
qproperty-styleColorBackground: #404040;
507+
qproperty-styleColorMarginBackground: #000000;
508+
qproperty-styleColorMarginText: #ccddcc;
509+
qproperty-styleColorMarkerBackground: #000055;
510510
qproperty-styleColorSelectionBackground: #006aff;
511511
qproperty-styleColorSelectionText: #ffffff;
512512
qproperty-styleFont: "DejaVu Sans Mono,12,-1,5,50,0,0,0,1,0"; /* default */
@@ -516,20 +516,21 @@ EditorBase {
516516
qproperty-styleFont3: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
517517
qproperty-styleFont4: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
518518
qproperty-styleFont5: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
519-
qproperty-styleFont6: "DejaVu Sans Mono,12,-1,5,70,0,0,0,1,0";
520-
qproperty-styleFont7: "DejaVu Sans Mono,12,-1,5,70,0,0,0,1,0";
521-
qproperty-styleFontMargin: "DejaVu Sans Mono,10,-1,5,50,0,0,0,1,0";
522-
qproperty-styleColor0: #efefef;/* default */
523-
qproperty-styleColor1: #444444;/* LineNo & Comments */
524-
qproperty-styleColor2: blue;/* Gcodes */
525-
qproperty-styleColor3: #006412;/* Mcodes #007615; */
526-
qproperty-styleColor4: #ad00ff;/* Axes */
527-
qproperty-styleColor5: red;/* Other (feed, spindle, radius, etc) */
528-
qproperty-styleColor6: #111155;/* Axes Values */
529-
qproperty-styleColor7: #111155;/* Other Values */
530-
qproperty-styleColorCursor: red
519+
qproperty-styleFont6: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
520+
qproperty-styleFont7: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
521+
qproperty-styleFontMargin: "DejaVu Sans Mono,8,-1,5,50,1,0,0,1,0";
522+
qproperty-styleColor0: #ffffff; /* default */
523+
qproperty-styleColor1: white; /* LineNo & Comments */
524+
qproperty-styleColor2: #0099ff; /* Gcodes */
525+
qproperty-styleColor3: lightgreen; /* Mcodes */
526+
qproperty-styleColor4: yellow; /* Axes */
527+
qproperty-styleColor5: #ff0000; /* Other (feed, spindle, radius, etc) */
528+
qproperty-styleColor6: #aaaadf; /* Axes Values */
529+
qproperty-styleColor7: #cd6197; /* Other Values */
531530
}
532531

532+
533+
533534
GcodeEditor QToolButton {
534535
min-width: 35;
535536
height: 35;
@@ -543,4 +544,33 @@ GcodeEditor QLineEdit {
543544
}
544545

545546

547+
MacroTab QPushButton {
548+
width: 80px;
549+
height: 35px;
550+
font: 12pt "Lato Heavy";
551+
}
552+
553+
MacroTab QLabel {
554+
font: 14pt "Lato Heavy";
555+
}
556+
557+
TouchSpinBox LineEdit {
558+
font: 14pt "Lato Heavy";
559+
max-width: 60px;
560+
}
561+
562+
TouchSpinBox QPushButton {
563+
width: 60px;
564+
height: 100px;
565+
}
566+
567+
MacroTab QCheckBox::indicator {
568+
width: 25px;
569+
height: 25px;
570+
}
571+
572+
MacroTab QRadioButton::indicator {
573+
width: 22px;
574+
height: 22px;
575+
}
546576

‎share/qtvcp/screens/qtdragon_hd/brushed_metal_color.qss‎

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -503,10 +503,10 @@ AxisToolButton{
503503

504504
/** GCode Display **/
505505
EditorBase {
506-
qproperty-styleColorBackground: #c0c0c0;
507-
qproperty-styleColorMarginBackground: #666666;
508-
qproperty-styleColorMarginText: #ffffff;
509-
qproperty-styleColorMarkerBackground: #9f9f9f;
506+
qproperty-styleColorBackground: #404040;
507+
qproperty-styleColorMarginBackground: #000000;
508+
qproperty-styleColorMarginText: #ccddcc;
509+
qproperty-styleColorMarkerBackground: #000055;
510510
qproperty-styleColorSelectionBackground: #006aff;
511511
qproperty-styleColorSelectionText: #ffffff;
512512
qproperty-styleFont: "DejaVu Sans Mono,12,-1,5,50,0,0,0,1,0"; /* default */
@@ -516,20 +516,21 @@ EditorBase {
516516
qproperty-styleFont3: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
517517
qproperty-styleFont4: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
518518
qproperty-styleFont5: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
519-
qproperty-styleFont6: "DejaVu Sans Mono,12,-1,5,70,0,0,0,1,0";
520-
qproperty-styleFont7: "DejaVu Sans Mono,12,-1,5,70,0,0,0,1,0";
521-
qproperty-styleFontMargin: "DejaVu Sans Mono,10,-1,5,50,0,0,0,1,0";
522-
qproperty-styleColor0: #efefef;/* default */
523-
qproperty-styleColor1: #444444;/* LineNo & Comments */
524-
qproperty-styleColor2: blue;/* Gcodes */
525-
qproperty-styleColor3: #006412;/* Mcodes #007615; */
526-
qproperty-styleColor4: #ad00ff;/* Axes */
527-
qproperty-styleColor5: red;/* Other (feed, spindle, radius, etc) */
528-
qproperty-styleColor6: #111155;/* Axes Values */
529-
qproperty-styleColor7: #111155;/* Other Values */
530-
qproperty-styleColorCursor: red
519+
qproperty-styleFont6: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
520+
qproperty-styleFont7: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
521+
qproperty-styleFontMargin: "DejaVu Sans Mono,8,-1,5,50,1,0,0,1,0";
522+
qproperty-styleColor0: #ffffff; /* default */
523+
qproperty-styleColor1: white; /* LineNo & Comments */
524+
qproperty-styleColor2: #0099ff; /* Gcodes */
525+
qproperty-styleColor3: lightgreen; /* Mcodes */
526+
qproperty-styleColor4: yellow; /* Axes */
527+
qproperty-styleColor5: #ff0000; /* Other (feed, spindle, radius, etc) */
528+
qproperty-styleColor6: #aaaadf; /* Axes Values */
529+
qproperty-styleColor7: #cd6197; /* Other Values */
531530
}
532531

532+
533+
533534
GcodeEditor QToolButton {
534535
min-width: 35;
535536
height: 35;
@@ -543,4 +544,33 @@ GcodeEditor QLineEdit {
543544
}
544545

545546

547+
MacroTab QPushButton {
548+
width: 80px;
549+
height: 35px;
550+
font: 12pt "Lato Heavy";
551+
}
552+
553+
MacroTab QLabel {
554+
font: 14pt "Lato Heavy";
555+
}
556+
557+
TouchSpinBox LineEdit {
558+
font: 14pt "Lato Heavy";
559+
max-width: 60px;
560+
}
561+
562+
TouchSpinBox QPushButton {
563+
width: 60px;
564+
height: 100px;
565+
}
566+
567+
MacroTab QCheckBox::indicator {
568+
width: 25px;
569+
height: 25px;
570+
}
571+
572+
MacroTab QRadioButton::indicator {
573+
width: 22px;
574+
height: 22px;
575+
}
546576

‎share/qtvcp/screens/qtdragon_hd_vert/brushed_metal_color.qss‎

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -503,10 +503,10 @@ AxisToolButton{
503503

504504
/** GCode Display **/
505505
EditorBase {
506-
qproperty-styleColorBackground: #c0c0c0;
507-
qproperty-styleColorMarginBackground: #666666;
508-
qproperty-styleColorMarginText: #ffffff;
509-
qproperty-styleColorMarkerBackground: #9f9f9f;
506+
qproperty-styleColorBackground: #404040;
507+
qproperty-styleColorMarginBackground: #000000;
508+
qproperty-styleColorMarginText: #ccddcc;
509+
qproperty-styleColorMarkerBackground: #000055;
510510
qproperty-styleColorSelectionBackground: #006aff;
511511
qproperty-styleColorSelectionText: #ffffff;
512512
qproperty-styleFont: "DejaVu Sans Mono,12,-1,5,50,0,0,0,1,0"; /* default */
@@ -516,20 +516,21 @@ EditorBase {
516516
qproperty-styleFont3: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
517517
qproperty-styleFont4: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
518518
qproperty-styleFont5: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
519-
qproperty-styleFont6: "DejaVu Sans Mono,12,-1,5,70,0,0,0,1,0";
520-
qproperty-styleFont7: "DejaVu Sans Mono,12,-1,5,70,0,0,0,1,0";
521-
qproperty-styleFontMargin: "DejaVu Sans Mono,10,-1,5,50,0,0,0,1,0";
522-
qproperty-styleColor0: #efefef;/* default */
523-
qproperty-styleColor1: #444444;/* LineNo & Comments */
524-
qproperty-styleColor2: blue;/* Gcodes */
525-
qproperty-styleColor3: #006412;/* Mcodes #007615; */
526-
qproperty-styleColor4: #ad00ff;/* Axes */
527-
qproperty-styleColor5: red;/* Other (feed, spindle, radius, etc) */
528-
qproperty-styleColor6: #111155;/* Axes Values */
529-
qproperty-styleColor7: #111155;/* Other Values */
530-
qproperty-styleColorCursor: red
519+
qproperty-styleFont6: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
520+
qproperty-styleFont7: "DejaVu Sans Mono,12,-1,5,90,0,0,0,1,0";
521+
qproperty-styleFontMargin: "DejaVu Sans Mono,8,-1,5,50,1,0,0,1,0";
522+
qproperty-styleColor0: #ffffff; /* default */
523+
qproperty-styleColor1: white; /* LineNo & Comments */
524+
qproperty-styleColor2: #0099ff; /* Gcodes */
525+
qproperty-styleColor3: lightgreen; /* Mcodes */
526+
qproperty-styleColor4: yellow; /* Axes */
527+
qproperty-styleColor5: #ff0000; /* Other (feed, spindle, radius, etc) */
528+
qproperty-styleColor6: #aaaadf; /* Axes Values */
529+
qproperty-styleColor7: #cd6197; /* Other Values */
531530
}
532531

532+
533+
533534
GcodeEditor QToolButton {
534535
min-width: 35;
535536
height: 35;
@@ -543,4 +544,33 @@ GcodeEditor QLineEdit {
543544
}
544545

545546

547+
MacroTab QPushButton {
548+
width: 80px;
549+
height: 35px;
550+
font: 12pt "Lato Heavy";
551+
}
552+
553+
MacroTab QLabel {
554+
font: 14pt "Lato Heavy";
555+
}
556+
557+
TouchSpinBox LineEdit {
558+
font: 14pt "Lato Heavy";
559+
max-width: 60px;
560+
}
561+
562+
TouchSpinBox QPushButton {
563+
width: 60px;
564+
height: 100px;
565+
}
566+
567+
MacroTab QCheckBox::indicator {
568+
width: 25px;
569+
height: 25px;
570+
}
571+
572+
MacroTab QRadioButton::indicator {
573+
width: 22px;
574+
height: 22px;
575+
}
546576

0 commit comments

Comments
 (0)