Skip to content

Commit 40ac32b

Browse files
committed
allow editing of user buttons
1 parent 80efaa4 commit 40ac32b

15 files changed

Lines changed: 6997 additions & 1689 deletions
146 KB
Loading
17.1 KB
Loading
15 KB
Loading
14.7 KB
Loading
21 KB
Loading
-30.3 KB
Loading
126 KB
Loading
6.49 KB
Loading

docs/src/plasma/qtplasmac.adoc

Lines changed: 82 additions & 23 deletions
Large diffs are not rendered by default.

share/qtvcp/screens/qtplasmac/qtplasmac.style

Lines changed: 44 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,32 @@
2121
#scribe_config, #spotting_config, #utility_frame,
2222
#gui_frame, #materials_frame, #camview_frame,
2323
#conv_frame, #stats_frame, #pmx_stats_frame,
24-
#machinelog_frame {
24+
#machinelog_frame, #ub_frame, #sd_frame {
2525
border: 1px solid frames;
2626
background: backgnd;
2727
border-radius: 4px }
2828

2929
/****** LABEL ************/
3030
#dro_label, #file_button_label,
3131
#machine_label, #button_label, #edit_label,
32-
#file_label, #jog_label,
33-
#cut_rec_label, #thc_label, #sensor_label,
34-
#arc_label, #control_label, #open_label,
35-
#mdi_label, #config_label, #config_conf_lbl,
36-
#arc_conf_lbl, #thc_conf_lbl, #motion_conf_lbl,
37-
#probe_conf_lbl, #safety_conf_lbl, #scribe_conf_lbl,
32+
#file_label, #jog_label, #cut_rec_label,
33+
#thc_label, #sensor_label, #arc_label,
34+
#control_label, #open_label, #mdi_label,
35+
#config_conf_lbl, #arc_conf_lbl, #thc_conf_lbl,
36+
#motion_conf_lbl, #probe_conf_lbl,
37+
#safety_conf_lbl, #scribe_conf_lbl,
3838
#spotting_conf_lbl, #utility_label, #gui_label,
39-
#materials_label, #camview_label, #conv_label,
40-
#stats_label, #pmx_stats_label, #machinelog_label {
39+
#camview_label, #conv_label, #stats_label,
40+
#pmx_stats_label, #machinelog_label {
4141
color: backgnd;
4242
background: frames;
4343
border-top-left-radius: 2px;
4444
border-top-right-radius: 2px }
4545

46+
/****** MAX VELOCITY ************/
47+
#max_offset_velocity_in {
48+
font: 11pt }
49+
4650
/****** TOOLTIPS ************/
4751
QToolTip {
4852
font: 13px;
@@ -219,54 +223,69 @@ QPushButton:checked:pressed, QToolButton:checked:pressed {
219223
#cut_rec_se:pressed, #cut_rec_sw:pressed {
220224
background: backalt }
221225

222-
/****** OPEN BUTTON<<<<<<<<<<<<*/
223-
#file_open {
226+
/****** HEADERS WITH BUTTONS <<<<<<<<<<<<*/
227+
/* LEFT */
228+
#file_clear, #ub_save, #sd_save,
229+
#save_plasma, #save_material {
224230
color: backgnd;
225231
background: frames;
226232
border: none;
227-
border-top-left-radius: 0px;
233+
border-top-left-radius: 2px;
228234
border-top-right-radius: 0px;
229235
border-bottom-left-radius: 0px;
230236
border-bottom-right-radius: 0px }
231237

232-
#file_open:disabled {
238+
#file_clear:disabled, #ub_save:disabled,
239+
#sd_save:disabled, #save_plasma:disabled,
240+
#save_material:disabled {
233241
background: inactive }
234242

235-
#file_open:pressed {
243+
#file_clear:pressed, #ub_save:pressed,
244+
#sd_save:pressed, #save_plasma:pressed,
245+
#save_material:pressed {
236246
color: frames;
237247
background: backgnd }
238248

239-
/****** RELOAD BUTTON<<<<<<<<<<<<*/
240-
#file_reload {
249+
/* CENTER */
250+
#file_open, #ub_label, #sd_label,
251+
#materials_label, #new_material,
252+
#delete_material, #config_label {
241253
color: backgnd;
242254
background: frames;
243255
border: none;
244256
border-top-left-radius: 0px;
245-
border-top-right-radius: 2px;
257+
border-top-right-radius: 0px;
246258
border-bottom-left-radius: 0px;
247259
border-bottom-right-radius: 0px }
248260

249-
#file_reload:disabled {
261+
#file_open:disabled, #materials_label:disabled,
262+
#new_material:disabled, #delete_material:disabled {
250263
background: inactive }
251264

252-
#file_reload:pressed {
265+
#file_open:pressed, #materials_label:pressed,
266+
#new_material:pressed, #delete_material:pressed {
253267
color: frames;
254268
background: backgnd }
255269

256-
/****** CLEAR BUTTON<<<<<<<<<<<<*/
257-
#file_clear {
270+
/* RIGHT */
271+
#file_reload, #ub_reload, #sd_reload,
272+
#reload_plasma, #reload_material {
258273
color: backgnd;
259274
background: frames;
260275
border: none;
261-
border-top-left-radius: 2px;
262-
border-top-right-radius: 0px;
276+
border-top-left-radius: 0px;
277+
border-top-right-radius: 2px;
263278
border-bottom-left-radius: 0px;
264279
border-bottom-right-radius: 0px }
265280

266-
#file_clear:disabled {
281+
#file_reload:disabled, #sd_reload:disabled,
282+
#ub_reload:disabled, #reload_plasma:disabled,
283+
#reload_material:disabled {
267284
background: inactive }
268285

269-
#file_clear:pressed {
286+
#file_reload:pressed, #up_reload:pressed,
287+
#sd_reload:pressed, #reload_plasma:pressed,
288+
#reload_material:pressed {
270289
color: frames;
271290
background: backgnd }
272291

0 commit comments

Comments
 (0)