Skip to content

Commit

Permalink
allow editing of user buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
phillc54 committed Oct 14, 2022
1 parent 80efaa4 commit 40ac32b
Show file tree
Hide file tree
Showing 15 changed files with 6,997 additions and 1,689 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/src/plasma/images/qtplasmac_16x9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/src/plasma/images/qtplasmac_4x3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/src/plasma/images/qtplasmac_9x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/src/plasma/images/qtplasmac_conversational.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/src/plasma/images/qtplasmac_parameters.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/src/plasma/images/qtplasmac_settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/src/plasma/images/qtplasmac_stats.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
105 changes: 82 additions & 23 deletions docs/src/plasma/qtplasmac.adoc

Large diffs are not rendered by default.

69 changes: 44 additions & 25 deletions share/qtvcp/screens/qtplasmac/qtplasmac.style
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,32 @@
#scribe_config, #spotting_config, #utility_frame,
#gui_frame, #materials_frame, #camview_frame,
#conv_frame, #stats_frame, #pmx_stats_frame,
#machinelog_frame {
#machinelog_frame, #ub_frame, #sd_frame {
border: 1px solid frames;
background: backgnd;
border-radius: 4px }

/****** LABEL ************/
#dro_label, #file_button_label,
#machine_label, #button_label, #edit_label,
#file_label, #jog_label,
#cut_rec_label, #thc_label, #sensor_label,
#arc_label, #control_label, #open_label,
#mdi_label, #config_label, #config_conf_lbl,
#arc_conf_lbl, #thc_conf_lbl, #motion_conf_lbl,
#probe_conf_lbl, #safety_conf_lbl, #scribe_conf_lbl,
#file_label, #jog_label, #cut_rec_label,
#thc_label, #sensor_label, #arc_label,
#control_label, #open_label, #mdi_label,
#config_conf_lbl, #arc_conf_lbl, #thc_conf_lbl,
#motion_conf_lbl, #probe_conf_lbl,
#safety_conf_lbl, #scribe_conf_lbl,
#spotting_conf_lbl, #utility_label, #gui_label,
#materials_label, #camview_label, #conv_label,
#stats_label, #pmx_stats_label, #machinelog_label {
#camview_label, #conv_label, #stats_label,
#pmx_stats_label, #machinelog_label {
color: backgnd;
background: frames;
border-top-left-radius: 2px;
border-top-right-radius: 2px }

/****** MAX VELOCITY ************/
#max_offset_velocity_in {
font: 11pt }

/****** TOOLTIPS ************/
QToolTip {
font: 13px;
Expand Down Expand Up @@ -219,54 +223,69 @@ QPushButton:checked:pressed, QToolButton:checked:pressed {
#cut_rec_se:pressed, #cut_rec_sw:pressed {
background: backalt }

/****** OPEN BUTTON<<<<<<<<<<<<*/
#file_open {
/****** HEADERS WITH BUTTONS <<<<<<<<<<<<*/
/* LEFT */
#file_clear, #ub_save, #sd_save,
#save_plasma, #save_material {
color: backgnd;
background: frames;
border: none;
border-top-left-radius: 0px;
border-top-left-radius: 2px;
border-top-right-radius: 0px;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px }

#file_open:disabled {
#file_clear:disabled, #ub_save:disabled,
#sd_save:disabled, #save_plasma:disabled,
#save_material:disabled {
background: inactive }

#file_open:pressed {
#file_clear:pressed, #ub_save:pressed,
#sd_save:pressed, #save_plasma:pressed,
#save_material:pressed {
color: frames;
background: backgnd }

/****** RELOAD BUTTON<<<<<<<<<<<<*/
#file_reload {
/* CENTER */
#file_open, #ub_label, #sd_label,
#materials_label, #new_material,
#delete_material, #config_label {
color: backgnd;
background: frames;
border: none;
border-top-left-radius: 0px;
border-top-right-radius: 2px;
border-top-right-radius: 0px;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px }

#file_reload:disabled {
#file_open:disabled, #materials_label:disabled,
#new_material:disabled, #delete_material:disabled {
background: inactive }

#file_reload:pressed {
#file_open:pressed, #materials_label:pressed,
#new_material:pressed, #delete_material:pressed {
color: frames;
background: backgnd }

/****** CLEAR BUTTON<<<<<<<<<<<<*/
#file_clear {
/* RIGHT */
#file_reload, #ub_reload, #sd_reload,
#reload_plasma, #reload_material {
color: backgnd;
background: frames;
border: none;
border-top-left-radius: 2px;
border-top-right-radius: 0px;
border-top-left-radius: 0px;
border-top-right-radius: 2px;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px }

#file_clear:disabled {
#file_reload:disabled, #sd_reload:disabled,
#ub_reload:disabled, #reload_plasma:disabled,
#reload_material:disabled {
background: inactive }

#file_clear:pressed {
#file_reload:pressed, #up_reload:pressed,
#sd_reload:pressed, #reload_plasma:pressed,
#reload_material:pressed {
color: frames;
background: backgnd }

Expand Down
Loading

0 comments on commit 40ac32b

Please sign in to comment.