diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-05-21 21:07:01 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-05-21 21:07:01 +0000 |
| commit | 0c4ff843cb6263af471cd0b95ebb3a930b8a000e (patch) | |
| tree | 36559957dab0432bf071f45a0449ccb70167a2cc /share | |
| parent | Update to refresh knots (diff) | |
| parent | Remove duplicated code (diff) | |
| download | inkscape-0c4ff843cb6263af471cd0b95ebb3a930b8a000e.tar.gz inkscape-0c4ff843cb6263af471cd0b95ebb3a930b8a000e.zip | |
update to trunk
(bzr r13645.1.140)
Diffstat (limited to 'share')
| -rw-r--r-- | share/extensions/CMakeLists.txt | 12 | ||||
| -rwxr-xr-x | share/extensions/plotter.py | 10 | ||||
| -rw-r--r-- | share/ui/style.css | 12 |
3 files changed, 20 insertions, 14 deletions
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) 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() 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; } |