Skip to content

Commit 5323c98

Browse files
committed
qtplasmac: restyle origin_offsetview
1 parent 0045e1a commit 5323c98

3 files changed

Lines changed: 25 additions & 14 deletions

File tree

share/qtvcp/screens/qtplasmac/qtplasmac.style

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -619,16 +619,19 @@ QHeaderView::section {
619619

620620
/****** ORIGIN OFFSET VIEW ************/
621621
/* this also uses QHeaderView from FILEMANAGER */
622+
#originoffsetview QHeaderView::section {
623+
padding-top: 0;
624+
padding-left: 4;
625+
height: 30px;
626+
width: 60px }
622627

623628
#originoffsetview {
624-
font: 11pt 'DejaVuSans';
629+
font: 11pt 'Mono';
625630
border: 1px solid foregnd;
626631
border-radius: 4px;
627632
alternate-background-color: backgnd;
628633
padding: 2px;
629-
gridline-color: backalt }
630-
631-
#originoffsetview {
634+
gridline-color: backalt;
632635
qproperty-styleColorHighlight: backalt }
633636

634637
#originoffsetview::item:selected:active {
@@ -782,7 +785,6 @@ QPlainTextEdit {
782785
qproperty-background_color: prevu }
783786

784787
/****** GCODE EDITOR & GCODE DISPLAY ************/
785-
786788
EditorBase#lexer {
787789
height: 44 }
788790

@@ -791,14 +793,14 @@ EditorBase#lexer {
791793

792794
EditorBase {
793795
qproperty-styleColorBackground: backgnd;
794-
qproperty-styleColor0: foregnd;
795-
qproperty-styleColor1: foregnd;
796-
qproperty-styleColor2: foregnd;
797-
qproperty-styleColor3: foregnd;
798-
qproperty-styleColor4: foregnd;
799-
qproperty-styleColor5: foregnd;
800-
qproperty-styleColor6: foregnd;
801-
qproperty-styleColor7: foregnd;
796+
qproperty-styleColor0: foregnd; /* parameters */
797+
qproperty-styleColor1: foregnd; /* comments */
798+
qproperty-styleColor2: foregnd; /* g codes */
799+
qproperty-styleColor3: foregnd; /* m codes */
800+
qproperty-styleColor4: foregnd; /* axes */
801+
qproperty-styleColor5: foregnd; /* non axes */
802+
qproperty-styleColor6: foregnd; /* axes values */
803+
qproperty-styleColor7: foregnd; /* non axes values */
802804
qproperty-styleColorMarginText: foregnd;
803805
qproperty-styleColorMarginBackground: backgnd;
804806
qproperty-styleFont0: 'DejaVuSansMono,11,-1,0,60,0,0,0,0,0';

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '1.236.276'
1+
VERSION = '1.236.277'
22

33
'''
44
qtplasmac_handler.py
@@ -3281,6 +3281,10 @@ def preview_stack_changed(self):
32813281
self.set_buttons_state([self.idleOnList, buttonList], False)
32823282
self.w.jog_frame.setEnabled(False)
32833283
self.w.run.setEnabled(False)
3284+
for row in range(self.w.originoffsetview.tablemodel.rowCount(self.w.originoffsetview)):
3285+
self.w.originoffsetview.resizeRowToContents(row)
3286+
for column in range(self.w.originoffsetview.tablemodel.rowCount(self.w.originoffsetview)-1):
3287+
self.w.originoffsetview.resizeColumnToContents(column)
32843288
elif self.w.preview_stack.currentIndex() == self.USER_MANUAL:
32853289
self.button_active(self.umButton)
32863290
self.autorepeat_keys(True)

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ <h2>QtPlasmaC Version History</h2>
3030
</table>
3131
<br>
3232
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
33+
<br><b><u>v1.236.277 2023 June 18</u></b>
34+
<ul style="margin:0;">
35+
<li>restyle origin_offsetview</li>
36+
</ul>
37+
3338
<br><b><u>v1.236.276 2023 June 15</u></b>
3439
<ul style="margin:0;">
3540
<li>fix cut recovery z axis bump from laser</li>

0 commit comments

Comments
 (0)