From 13368e189e2189c9dff0b5cc11fff4acdf90ba54 Mon Sep 17 00:00:00 2001
From: TimeWaster <sebi@timewaster.de>
Date: Mon, 16 May 2016 16:26:25 +0200
Subject: Extensions: Corrected pySerial download information in plotting
 extension

(bzr r14893)
---
 share/extensions/plotter.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'share')

diff --git a/share/extensions/plotter.py b/share/extensions/plotter.py
index 60858cc6c..1c4a683c1 100755
--- a/share/extensions/plotter.py
+++ b/share/extensions/plotter.py
@@ -144,10 +144,12 @@ class Plot(inkex.Effect):
         try:
             import serial
         except ImportError, e:
-            inkex.errormsg(_("pySerial is not installed."
-                + "\n\n1. Download pySerial here (not the \".exe\"!): http://pypi.python.org/pypi/pyserial"
-                + "\n2. Extract the \"serial\" subfolder from the zip to the following folder: C:\\[Program files]\\inkscape\\python\\Lib\\"
-                + "\n3. Restart Inkscape."))
+            inkex.errormsg(_("pySerial is not installed. Please follow these steps:")
+                + "\n\n" + _("1. Download and extract (unzip) this file to your local harddisk:")
+                + "\n"   +   "   https://pypi.python.org/packages/source/p/pyserial/pyserial-2.7.tar.gz"
+                + "\n"   + _("2. Copy the \"serial\" folder (Can be found inside the just extracted folder)")
+                + "\n"   + _("   into the following Inkscape folder: C:\\<Program files>\\inkscape\\python\\Lib\\")
+                + "\n"   + _("3. Close and restart Inkscape."))
             return
         # init serial framework
         mySerial = serial.Serial()
-- 
cgit v1.2.3


From dcda41314bb620511d799e7cb633831f5ab18cab Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 18 May 2016 10:45:50 +0200
Subject: Remove unneeded widget in Status Bar. Reorder code. Use two lines for
 status message in Gtk3.

(bzr r14900)
---
 share/ui/style.css | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'share')

diff --git a/share/ui/style.css b/share/ui/style.css
index 091cfc319..6729344d2 100644
--- a/share/ui/style.css
+++ b/share/ui/style.css
@@ -41,13 +41,9 @@
 @define-color bg_color7  #636363;
 @define-color bg_color8  #000000; /* Black */
 
-/* Gtk  <= 3.18 */
-GtkWidget {
-/*    font-size: 12pt; */
-}
-
-/* Gtk  >= 3.19.2 */
-widget {
+/* 'GtkWidget' for Gtk  <= 3.18   */
+/* 'widget'    for Gtk  <= 3.19.2 */   
+GtkWidget, widget {
 /*    font-size: 12pt; */
 }
 
@@ -96,7 +92,7 @@ combobox window.popup scrolledwindow treeview separator {
     -GtkComboBox-appears-as-list: true;
 }
 
-#guides_lock {
+#LockGuides {
     padding: 0;
 }
 
-- 
cgit v1.2.3


From 7dd82b62c1175971e19e456989fd8b8543d03e28 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Fri, 20 May 2016 03:15:14 +0100
Subject: Set executable flag in CMake installation of extension scripts

(bzr r14904)
---
 share/extensions/CMakeLists.txt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'share')

diff --git a/share/extensions/CMakeLists.txt b/share/extensions/CMakeLists.txt
index c167a156a..74819309d 100644
--- a/share/extensions/CMakeLists.txt
+++ b/share/extensions/CMakeLists.txt
@@ -1,3 +1,4 @@
+# Install the set of non-executable data files
 file(GLOB _FILES
       "README"
       "fontfix.conf"
@@ -13,13 +14,20 @@ file(GLOB _FILES
       "svg2xaml.xsl"
       "xaml2svg.xsl"
       "inkscape.extension.rng"
+      "*.inx"
+    )
+
+install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions)
+
+# Install the executable scripts
+file(GLOB _SCRIPTS
       "*.py"
       "*.pl"
       "*.sh"
       "*.rb"
-      "*.inx"
     )
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions)
+
+install(PROGRAMS ${_SCRIPTS} DESTINATION ${SHARE_INSTALL}/inkscape/extensions)
 
 file(GLOB _FILES "alphabet_soup/*.svg")
 install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/alphabet_soup)
-- 
cgit v1.2.3