Skip to content

Commit ffb4e43

Browse files
authored
Merge pull request #2428 from hansu/gladevcp-icons
Gladevcp: added missing icons + added symlinks for default icons
2 parents 6d8a031 + 0dad2f4 commit ffb4e43

55 files changed

Lines changed: 60 additions & 9 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

debian/linuxcnc-uspace.links

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,30 @@
11
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

lib/python/gladevcp/glade-icons/README

Lines changed: 0 additions & 8 deletions
This file was deleted.
-1.1 KB
Binary file not shown.
-238 Bytes
Binary file not shown.
Binary file not shown.
-3.49 KB
Binary file not shown.

scripts/rip-environment.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +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
7172

7273
if [ -z "$TCLLIBPATH" ]; then
7374
TCLLIBPATH=$EMC2_HOME/tcl
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-button.png
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-checkbutton.png
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-combobox.png

0 commit comments

Comments
 (0)