Skip to content

Commit 3a6af73

Browse files
SebKuzminskySebKuzminsky
authored
Merge pull request #2441 from hansu/gladevcp-icons-2
Remove gladevcp symlink creation
2 parents 77c4dba + e077047 commit 3a6af73

32 files changed

Lines changed: 30 additions & 88 deletions

‎debian/linuxcnc-uspace.links‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1 @@
1-
usr/share/linuxcnc/ncfiles usr/share/doc/linuxcnc/examples/nc_files
2-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-button.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_button.png
3-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-checkbutton.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_checkbutton.png
4-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-combobox.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_combobox.png
5-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hbox.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_hbox.png
6-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-table.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_hidetable.png
7-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_hscale.png
8-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-label.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_label.png
9-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-colorbutton.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_light_button.png
10-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-progressbar.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_progressbar.png
11-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-radiobutton.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_radiobutton.png
12-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-spinbutton.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_spinbutton.png
13-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-table.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_table.png
14-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-togglebutton.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_togglebutton.png
15-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vbox.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_vbox.png
16-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vscale.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_vscale.png
17-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-button.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-halio_button.png
18-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-halio_hscale.png
19-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-label.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-state_label.png
20-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-label.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-state_sensitive_table.png
21-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-label.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-status_label.png
22-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-override.png
23-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-assistant.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-pyngcgui.png
24-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-iconview.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-icon_filechooser.png
25-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-grid.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-offsetpage.png
26-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserbutton.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-vcp_filechooserbutton.png
27-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserdialog.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-vcp_filechooserdialog.png
28-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treeview.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-vcp_mdihistory.png
29-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-textview.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-vcp_sourceview.png
30-
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hbox.png /usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-vcp_macro_select
1+
usr/share/linuxcnc/ncfiles usr/share/doc/linuxcnc/examples/nc_files

‎lib/python/gladevcp/hal_python.xml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
<init-function>glade_python_init</init-function>
44

55
<glade-widget-classes>
6-
<glade-widget-class name="HAL_HideTable" generic-name="hal_hidetable" title="HAL Hideable Table"/>
7-
<glade-widget-class name="HAL_HBox" generic-name="hal_hbox" title="HAL Sensitive HBox"/>
8-
<glade-widget-class name="HAL_Table" generic-name="hal_table" title="HAL Sensitive table"/>
9-
<glade-widget-class name="State_Sensitive_Table" generic-name="state_sensitive_table" title="State_Sensitive_table"/>
10-
<glade-widget-class name="HAL_ComboBox" generic-name="hal_combobox" title="HAL_ComboBox"/>
11-
<glade-widget-class name="HAL_Button" generic-name="hal_button" title="HAL_Button"/>
12-
<glade-widget-class name="HALIO_Button" generic-name="halio_button" title="HALIO_Button"/>
13-
<glade-widget-class name="HAL_CheckButton" generic-name="hal_checkbutton" title="HAL_CheckButton"/>
14-
<glade-widget-class name="HAL_SpinButton" generic-name="hal_spinbutton" title="HAL_SpinButton"/>
15-
<glade-widget-class name="HAL_ToggleButton" generic-name="hal_togglebutton" title="HAL_ToggleButton"/>
16-
<glade-widget-class name="HAL_RadioButton" generic-name="hal_radiobutton" title="HAL_RadioButton"/>
17-
<glade-widget-class name="HAL_HScale" generic-name="hal_hscale" title="HAL_HScale">
6+
<glade-widget-class name="HAL_HideTable" generic-name="hal_hidetable" title="HAL Hideable Table" icon-name="widget-gtk-table"/>
7+
<glade-widget-class name="HAL_HBox" generic-name="hal_hbox" title="HAL Sensitive HBox" icon_name="widget-gtk-hbox"/>
8+
<glade-widget-class name="HAL_Table" generic-name="hal_table" title="HAL Sensitive table" icon-name="widget-gtk-table"/>
9+
<glade-widget-class name="State_Sensitive_Table" generic-name="state_sensitive_table" title="State_Sensitive_table" icon-name="widget-gtk-table"/>
10+
<glade-widget-class name="HAL_ComboBox" generic-name="hal_combobox" title="HAL_ComboBox" icon_name="widget-gtk-combobox"/>
11+
<glade-widget-class name="HAL_Button" generic-name="hal_button" title="HAL_Button" icon_name="widget-gtk-button"/>
12+
<glade-widget-class name="HALIO_Button" generic-name="halio_button" title="HALIO_Button" icon_name="widget-gtk-button"/>
13+
<glade-widget-class name="HAL_CheckButton" generic-name="hal_checkbutton" title="HAL_CheckButton" icon_name="widget-gtk-checkbutton"/>
14+
<glade-widget-class name="HAL_SpinButton" generic-name="hal_spinbutton" title="HAL_SpinButton" icon_name="widget-gtk-spinbutton"/>
15+
<glade-widget-class name="HAL_ToggleButton" generic-name="hal_togglebutton" title="HAL_ToggleButton" icon_name="widget-gtk-togglebutton"/>
16+
<glade-widget-class name="HAL_RadioButton" generic-name="hal_radiobutton" title="HAL_RadioButton" icon_name="widget-gtk-radiobutton"/>
17+
<glade-widget-class name="HAL_HScale" generic-name="hal_hscale" title="HAL_HScale" icon_name="widget-gtk-hscale">
1818
<properties>
1919
<property id="Orientation" query="Horizontal" default="Vertical" visible="False"/>
2020
</properties>
2121
</glade-widget-class>
22-
<glade-widget-class name="HALIO_HScale" generic-name="halio_hscale" title="HALIO_HScale">
22+
<glade-widget-class name="HALIO_HScale" generic-name="halio_hscale" title="HALIO_HScale" icon_name="widget-gtk-hscale">
2323
<properties>
2424
<property id="Orientation" query="Horizontal" default="Vertical" visible="False"/>
2525
</properties>
2626
</glade-widget-class>
27-
<glade-widget-class name="HAL_VScale" generic-name="hal_vscale" title="HAL_VScale"/>
28-
<glade-widget-class name="HAL_ProgressBar" generic-name="hal_progressbar" title="HAL_ProgressBar"/>
29-
<glade-widget-class name="HAL_LightButton" generic-name="hal_light_button" title="HAL_LightButton">
27+
<glade-widget-class name="HAL_VScale" generic-name="hal_vscale" title="HAL_VScale" icon_name="widget-gtk-vscale"/>
28+
<glade-widget-class name="HAL_ProgressBar" generic-name="hal_progressbar" title="HAL_ProgressBar" icon_name="widget-gtk-progressbar"/>
29+
<glade-widget-class name="HAL_LightButton" generic-name="hal_light_button" title="HAL_LightButton" icon_name="widget-gtk-colorbutton">
3030
<properties>
3131
<property id="has_hal_pins" weight="1" />
3232
<property id="button_halio_pin" weight="2" />
@@ -66,12 +66,12 @@
6666
<property id="blink_color" weight ="12"/>
6767
</properties>
6868
</glade-widget-class>
69-
<glade-widget-class name="HAL_Label" generic-name="hal_label" title="HAL Label"/>
70-
<glade-widget-class name="Status_Label" generic-name="status_label" title="Status Label"/>
71-
<glade-widget-class name="State_Label" generic-name="state_label" title="State Label"/>
69+
<glade-widget-class name="HAL_Label" generic-name="hal_label" title="HAL Label" icon_name="widget-gtk-label"/>
70+
<glade-widget-class name="Status_Label" generic-name="status_label" title="Status Label" icon_name="widget-gtk-label"/>
71+
<glade-widget-class name="State_Label" generic-name="state_label" title="State Label" icon_name="widget-gtk-label"/>
7272
<glade-widget-class name="HAL_HBar" generic-name="hal_hbar" title="HAL HBar"/>
7373
<glade-widget-class name="HAL_VBar" generic-name="hal_vbar" title="HAL VBar"/>
74-
<glade-widget-class name="Override" generic-name="override" title="Override Controls">
74+
<glade-widget-class name="Override" generic-name="override" title="Override Controls" icon_name="widget-gtk-hscale">
7575
<properties>
7676
<property id="Orientation" query="Horizontal" default="Vertical" visible="False"/>
7777
<property id="Adjustment" visible="false"/>
@@ -91,7 +91,7 @@
9191
</glade-widget-class>
9292
<glade-widget-class name="Hal_Dial" generic-name="hal_dial" title="Hal_Dial"/>
9393

94-
<glade-widget-class name="PyNgcGui" generic-name="pyngcgui" title="Python NgcGui"/>
94+
<glade-widget-class name="PyNgcGui" generic-name="pyngcgui" title="Python NgcGui" icon_name="widget-gtk-assistant"/>
9595
<glade-widget-class name="HAL_GremlinPlus" generic-name="hal_gremlin_plus" title="HAL Gremlin Plus"/>
9696

9797
<glade-widget-class name="ToolEdit" generic-name="tooledit" title="Tooleditor">
@@ -101,7 +101,7 @@
101101
<property id="homogeneous" query="False" default="0" visible="False"/>
102102
</properties>
103103
</glade-widget-class>
104-
<glade-widget-class name="OffsetPage" generic-name="offsetpage" title="Offsetpage">
104+
<glade-widget-class name="OffsetPage" generic-name="offsetpage" title="Offsetpage" icon_name="widget-gtk-grid">
105105
<properties>
106106
<property id="size" query="False" default="1" visible="False"/>
107107
<property id="spacing" query="False" default="0" visible="False"/>
@@ -116,7 +116,7 @@
116116
<property id="homogeneous" query="False" default="0" visible="False"/>
117117
</properties>
118118
</glade-widget-class>
119-
<glade-widget-class name="IconFileSelection" generic-name="icon_filechooser" title="Icon File Chooser">
119+
<glade-widget-class name="IconFileSelection" generic-name="icon_filechooser" title="Icon File Chooser" icon_name="widget-gtk-iconview">
120120
<properties>
121121
<property id="size" query="False" default="1" visible="False"/>
122122
<property id="spacing" query="False" default="0" visible="False"/>
@@ -159,19 +159,19 @@
159159
<glade-widget-class name="EMC_RadioAction_OFF" generic-name="vcp_radioaction_off" title="VCP RadioAction OFF" icon-name='gtk-disconnect'/>
160160

161161
<glade-widget-class name="EMC_Stat" generic-name="vcp_stat" title="VCP Stat" icon-name='gtk-properties' toplevel='yes'/>
162-
<glade-widget-class name="EMC_FileChooserDialog" generic-name="vcp_filechooserdialog" title="VCP FileChooserDialog"/>
163-
<glade-widget-class name="EMC_FileChooserButton" generic-name="vcp_filechooserbutton" title="VCP FileChooserButton"/>
162+
<glade-widget-class name="EMC_FileChooserDialog" generic-name="vcp_filechooserdialog" title="VCP FileChooserDialog" icon_name="widget-gtk-filechooserdialog"/>
163+
<glade-widget-class name="EMC_FileChooserButton" generic-name="vcp_filechooserbutton" title="VCP FileChooserButton" icon_name="widget-gtk-filechooserbutton"/>
164164
<glade-widget-class name="EMC_Action_Open" generic-name="vcp_action_open" title="VCP Action Open" icon-name='gtk-open'/>
165165
<glade-widget-class name="EMC_Action_Reload" generic-name="vcp_action_reload" title="VCP Action Reload" icon-name='gtk-refresh'/>
166166
<glade-widget-class name="EMC_Action_Save" generic-name="vcp_action_save" title="VCP Action Save" icon-name='gtk-save'/>
167167
<glade-widget-class name="EMC_Action_SaveAs" generic-name="vcp_action_saveas" title="VCP Action Save As" icon-name='gtk-save-as'/>
168-
<glade-widget-class name="EMC_SourceView" generic-name="vcp_sourceview" title="VCP SourceView"/>
169-
<glade-widget-class name="EMC_MDIHistory" generic-name="vcp_mdihistory" title="VCP MDIHistory">
168+
<glade-widget-class name="EMC_SourceView" generic-name="vcp_sourceview" title="VCP SourceView" icon_name="widget-gtk-textview"/>
169+
<glade-widget-class name="EMC_MDIHistory" generic-name="vcp_mdihistory" title="VCP MDIHistory" icon_name="widget-gtk-treeview">
170170
<properties>
171171
<property id="size" query="False" default="0" visible="False"/>
172172
</properties>
173173
</glade-widget-class>
174-
<glade-widget-class name="MacroSelect" generic-name="vcp_macro_select" title="VCP Macro Select">
174+
<glade-widget-class name="MacroSelect" generic-name="vcp_macro_select" title="VCP Macro Select" icon_name="widget-gtk-hbox">
175175
<properties>
176176
<property id="size" query="False" default="0" visible="False"/>
177177
</properties>

‎scripts/rip-environment.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ LINUXCNCVERSION="@EMC2VERSION@"; export LINUXCNCVERSION
6868
LINUXCNC_NCFILES_DIR="@EMC2_NCFILES_DIR@"; export LINUXCNC_NCFILES_DIR
6969
LINUXCNC_EMCSH=@WISH@; export LINUXCNC_EMCSH
7070
PATH=@EMC2_BIN_DIR@:$EMC2_HOME/scripts:$EMC2_HOME/tcl:"$PATH"
71-
GLADE_ICON_THEME_PATH=$EMC2_HOME/share/glade/pixmaps export GLADE_ICON_THEME_PATH
71+
GLADE_ICON_THEME_PATH=$EMC2_HOME/share/glade/pixmaps:"$GLADE_ICON_THEME_PATH" export GLADE_ICON_THEME_PATH
7272

7373
if [ -z "$TCLLIBPATH" ]; then
7474
TCLLIBPATH=$EMC2_HOME/tcl

‎share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_button.png‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_checkbutton.png‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_combobox.png‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_hbox.png‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_hidetable.png‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_hscale.png‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎share/glade/pixmaps/hicolor/16x16/actions/widget-gladevcp-hal_label.png‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)