Skip to content

Commit 08fe524

Browse files
phillc54phillc54
committed
gladevcp: fix glade catalog paths for package installations
1 parent 22ea7a3 commit 08fe524

17 files changed

Lines changed: 17 additions & 9 deletions

‎debian/linuxcnc.install.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ usr/lib/python3
116116
usr/lib/tcltk
117117

118118
usr/share/axis
119-
usr/share/glade3
119+
usr/share/glade
120120
usr/share/gmoccapy
121121
usr/share/gscreen
122122
usr/share/gtksourceview-2.0

‎lib/python/gladevcp/READ_ME‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
To use gladevcp in a run in place environment just source scripts/rip-environment
1+
To use gladevcp in a run in place environment just source scripts/rip-environment
22
and it will set all paths.
33

4-
To install it system-wide you must link files from ./share/glade3/
5-
to /usr/share/glade3 system folder.
4+
For package installations the required files will be placed in the
5+
/usr/share/glade system folder.
66

7-
When using gladevcp widgets in python programs you need to import
7+
When using gladevcp widgets in python programs you need to import
88
gladevcp.makepins.

‎lib/python/gladevcp/glade-icons/README‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Glade widget icons should be in this directory to ensure that the icons will
2+
be installed to the correct location in a package installation.
3+
4+
The directory for icons is /usr/share/glade/pixmaps/hicolor/22x22/actions/
5+
6+
For run-in-place installations the icons will not appear in Glade.
7+
If you have run-in-place and you would like the icons to appear then you could
8+
manually copy the icon files to the directory above.

lib/python/gladevcp/widget-gladevcp-combi_dro.png renamed to lib/python/gladevcp/glade-icons/widget-gladevcp-combi_dro.png

File renamed without changes.

lib/python/gladevcp/widget-gladevcp-hal_dial.png renamed to lib/python/gladevcp/glade-icons/widget-gladevcp-hal_dial.png

File renamed without changes.

lib/python/gladevcp/widget-gladevcp-hal_dro.png renamed to lib/python/gladevcp/glade-icons/widget-gladevcp-hal_dro.png

File renamed without changes.

lib/python/gladevcp/widget-gladevcp-hal_gremlin.png renamed to lib/python/gladevcp/glade-icons/widget-gladevcp-hal_gremlin.png

File renamed without changes.

lib/python/gladevcp/widget-gladevcp-hal_hbar.png renamed to lib/python/gladevcp/glade-icons/widget-gladevcp-hal_hbar.png

File renamed without changes.

lib/python/gladevcp/widget-gladevcp-hal_led.png renamed to lib/python/gladevcp/glade-icons/widget-gladevcp-hal_led.png

File renamed without changes.

lib/python/gladevcp/widget-gladevcp-hal_meter.png renamed to lib/python/gladevcp/glade-icons/widget-gladevcp-hal_meter.png

File renamed without changes.

0 commit comments

Comments
 (0)