LinuxCNC · tseufl · Oct 5, 2016 · Oct 6, 2016 · Oct 9, 2016 · Oct 9, 2016
diff --git a/configs/sim/axis/README b/configs/sim/axis/README
@@ -4,13 +4,14 @@ The principal Axis gui sim ini files:
 
 axis.ini             basic demo (in)
 axis_9axis.ini       9 axes
+axis_foam.ini        foam cutter
 axis_mm.ini          basic demo (mm)
-canterp              demo for a non-gcode interpreter
+canterp.ini          demo for a non-gcode interpreter
 gantry.ini           gantry demo
 gantry_mm.ini        gantry demo (mm)
 histogram_demo.ini   hal-histogram examples
 historical_lathe.ini configured with 3 joints (XYZ with Y unused)
-ini_hal_demo         ini hal pins demo
+ini_hal_demo.ini     ini hal pins demo
 lathe.ini            lathe demo
 ldelta.ini           linear delta robot
 ldelta_demo.ini      linear delta with jog guis

diff --git a/configs/sim/gmoccapy/README b/configs/sim/gmoccapy/README
@@ -5,7 +5,7 @@ This screen is based of the design of moccagui, an GUI coded in FreePascal.
 
 gmoccapy is using Python instead.
 
-gmoccapy is designed to bring the feel of industrial controls to linuxccn users,
+gmoccapy is designed to bring the feel of industrial controls to LinuxCNC users,
 most controls can be used with a touch screen and also most are accesible through
 hal pins, so real hardware can be used.
 

diff --git a/configs/sim/gscreen/README b/configs/sim/gscreen/README
@@ -2,15 +2,14 @@ Gscreen is a customizable operator screen for linuxcnc.
 Built with python, GLADE, and GTK
 
 Usable with touchscreens or a mouse.
-           These show the native look of Gscreen.
+These show the native look of Gscreen.
 
-
-gscreen
+gscreen.ini
   -Imperial milling screen,
   -includes optionnal gladevcp panels
 
-gscreen_lathe
+gscreen_lathe.ini
   -Imperial basic lathe
 
-gscreen_mm
+gscreen_mm.ini
   -Metric milling screen
diff --git a/configs/sim/gscreen/gscreen_custom/README b/configs/sim/gscreen/gscreen_custom/README
@@ -1,22 +1,24 @@
-Gscreen is a customizable operator screen for linuxcnc.
+Gscreen is a customizable operator screen for LinuxCNC.
 
 Built with python, GLADE, and GTK
 
 Usable with touchscreens or a mouse.
 These show some custom looks of Gscreen.
 
-gscreen_custom
+9axis.ini
   -9 axis screen
 
-gscreen_gaxis
+gaxis_no_plot.ini
+gscreen_gaxis.ini
   -A similar-to-AXIS demo
 
-industrial
+industrial.ini
+industrial_lathe.ini
   -Design influenced by Industrial CNC controls.
     (System page unlock code is '123')
 
 tester
-    -Tester is used to load a GLADE file without
+   -Tester is used to load a GLADE file without
 initializing anything beyond the window.
 The glade file must be called tester.glade
 The toplevel window must be called window1
@@ -25,5 +27,3 @@ handler file for adding python code for more
 sophisticated customizations.
 If you run this without adding a GLADE file to
 the folder, it will load a default gscreen file.
-
-
diff --git a/configs/sim/touchy/ngcgui/pyngcgui_touchy.txt b/configs/sim/touchy/ngcgui/pyngcgui_touchy.txt
@@ -1,4 +1,4 @@
-pyngcgui_touchy
+pyngcgui_touchy.ini
 
 Demonstrate gladevcp apps:
    pyngcgui     -- subroutine app

diff --git a/configs/sim/touchy/ngcgui/pyngcgui_touchy_gcmc.txt b/configs/sim/touchy/ngcgui/pyngcgui_touchy_gcmc.txt
@@ -1,4 +1,4 @@
-pyngcgui config for touchy
+pyngcgui_touchy_gcmc.ini
 
 Demonstrate gladevcp apps:
    pyngcgui     -- subroutine app

diff --git a/configs/sim/touchy/ngcgui/pyngcgui_touchy_lathe.txt b/configs/sim/touchy/ngcgui/pyngcgui_touchy_lathe.txt
@@ -1,4 +1,4 @@
-pyngcgui config for touchy lathe config
+pyngcgui_touchy_lathe.ini
 
 Demonstrate gladevcp apps:
    pyngcgui     -- subroutine app

diff --git a/share/axis/tcl/axis.tcl b/share/axis/tcl/axis.tcl
@@ -1,5 +1,5 @@
 #    This is a component of AXIS, a front-end for LinuxCNC
-#    Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015
+#    Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
 #    Jeff Epler <jepler@unpythonic.net> and Chris Radek <chris@timeguy.com>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -1564,7 +1564,7 @@ text .about.message \
 	.about.message configure -cursor hand2
 	.about.message tag configure link -foreground red}
 .about.message tag bind link <ButtonPress-1><ButtonRelease-1> {launch_website}
-.about.message insert end [subst [_ "LinuxCNC/AXIS version \$version\n\nCopyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Jeff Epler and Chris Radek.\n\nThis is free software, and you are welcome to redistribute it under certain conditions.  See the file COPYING, included with LinuxCNC.\n\nVisit the LinuxCNC web site: "]] {} {http://www.linuxcnc.org/} link
+.about.message insert end [subst [_ "LinuxCNC/AXIS version \$version\n\nCopyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Jeff Epler and Chris Radek.\n\nThis is free software, and you are welcome to redistribute it under certain conditions.  See the file COPYING, included with LinuxCNC.\n\nVisit the LinuxCNC web site: "]] {} {http://www.linuxcnc.org/} link
 .about.message configure -state disabled
 
 button .about.ok \

diff --git a/share/gscreen/skins/9_axis/9_axis.glade b/share/gscreen/skins/9_axis/9_axis.glade
@@ -721,7 +721,7 @@
                         <child>
                           <object class="GtkImage" id="image6">
                             <property name="visible">True</property>
-                            <property name="pixbuf">../gscreen/images/linuxcnc-wizard.gif</property>
+                            <property name="pixbuf">../../images/linuxcnc-wizard.gif</property>
                           </object>
                           <packing>
                             <property name="right_attach">3</property>
@@ -2149,7 +2149,7 @@ Readout</property>
                     <child>
                       <object class="GtkImage" id="image5">
                         <property name="visible">True</property>
-                        <property name="pixbuf">../gscreen/images/coolant_mist_plain.gif</property>
+                        <property name="pixbuf">../../images/coolant_mist_plain.gif</property>
                       </object>
                     </child>
                   </object>
@@ -2165,7 +2165,7 @@ Readout</property>
                     <child>
                       <object class="GtkImage" id="image4">
                         <property name="visible">True</property>
-                        <property name="pixbuf">../gscreen/images/coolant_flood_plain.gif</property>
+                        <property name="pixbuf">../../images/coolant_flood_plain.gif</property>
                       </object>
                     </child>
                   </object>
@@ -2531,7 +2531,7 @@ Rotary</property>
                     <child>
                       <object class="GtkImage" id="image7">
                         <property name="visible">True</property>
-                        <property name="pixbuf">../gscreen/images/tool_clear.gif</property>
+                        <property name="pixbuf">../../images/tool_clear.gif</property>
                       </object>
                     </child>
                   </object>