merge upstream gedit changes

iamgd67 · Jun 27, 2013 · 04583c9 · 04583c9
1 parent f9e5943
commit 04583c9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/gedit/README.md b/gedit/README.md
@@ -1,6 +1,6 @@
 # Solarized for Gedit
 
-## Precision colors for machines and people - **Now with more Gedit!**
+## Precision colors for machines and people - _Now with more Gedit!_
 
 ---
 
@@ -24,6 +24,8 @@ found at <http://github.com/mattcan/solarized-gedit>.
 
 ### Installation
 
+_Please note that installation has only been tested on Ubuntu 12.10 and Gedit 3_
+
 You can download the files in one of two ways:
 
 * using `git clone git://github.com/mattcan/solarized-gedit.git`
@@ -35,21 +37,27 @@ to one of these folders:
 
 * if you are the only user on your computer
 
-		cp solarized-* ~/.local/share/gedit/styles
+```
+mkdir -p ~/.local/share/gedit/styles
+cp solarized-* ~/.local/share/gedit/styles
+```
 
-* if you want everyone on your PC to be able to use the styles (_path
-  below is for Ubuntu_)
+* if you want everyone on your PC to be able to use the styles ( _path
+  below is for Ubuntu_ )
 
-		sudo cp solarized-* /usr/share/gtksourceview-3.0/styles
-		
-You can also use the built installer (_has only been tested with Ubuntu 12.10_)
-
-### Roadmap
+```
+sudo mkdir -p /usr/share/gtksourceview-3.0/styles
+sudo cp solarized-* /usr/share/gtksourceview-3.0/styles
+```
 
-There are a few things that still need to be worked out...
+* you can also use the installer ( _has only been tested with Ubuntu 12.10_ )
 
-1. Clean up the **c:** specific style definitions
-1. Add support for further custom style definitions
+```
+cd wherever/you/extracted
+chmod a+x installer
+# -a for all users, -l for local
+./installer [-a | -l]
+```
 
 [ES]: http://ethanschoonover.com
 [ES-Solarized]: http://ethanschoonover.com/solarized

diff --git a/gedit/installer b/gedit/installer
@@ -41,7 +41,7 @@ do
             ;;
         a)
             INSTALLPATH=/usr/share/gtksourceview-3.0/styles
-            NEEDSUDO=false
+            NEEDSUDO=true
             ;;
         l)
             INSTALLPATH=$HOME/.local/share/gedit/styles

diff --git a/gedit/solarized-dark.xml b/gedit/solarized-dark.xml
@@ -26,7 +26,7 @@
 <style-scheme id="solarizeddark" _name="Solarized Dark" version="1.0">
 
   <author>Matthew Cantelon</author>
-  <_description>Port of the Dark Solarized theme by Ethan Schoonover.</_description>
+  <_description>Gedit port of the dark version of the Solarized theme. Check https://github.com/mattcan/solarized-gedit for more information.</_description>
 
   <!-- Solarized Palette -->
   <color name="base03"                      value="#002b36"/>
@@ -47,12 +47,12 @@
   <color name="green"                       value="#859900"/>
 
   <!-- Global Settings -->
-  <style name="text"                        foreground="base0" background="base03"/>
+  <style name="text"                        foreground="base1" background="base03"/>
   <style name="selection"                   foreground="base03" background="base0"/>
-  <style name="cursor"                      foreground="base0"/>
+  <style name="cursor"                      foreground="base2"/>
   <style name="current-line"                background="base02"/>
-  <style name="line-numbers"                foreground="base1" background="base02"/>
-  <style name="draw-spaces"                 foreground="base1"/>
+  <style name="line-numbers"                foreground="base0" background="base02"/>
+  <style name="draw-spaces"                 foreground="base0"/>
 
   <!-- Bracket Matching -->
   <style name="bracket-match"               foreground="red" bold="true"/>
@@ -64,7 +64,7 @@
   <style name="def:doc-comment-element"     italic="true"/>
 
   <!-- Right Margin -->
-  <style name="right-margin"                foreground="base1" background="base02"/>
+  <style name="right-margin"                foreground="base0" background="base02"/>
 
   <!-- Search Matching -->
   <style name="search-match"                foreground="yellow"/>

diff --git a/gedit/solarized-light.xml b/gedit/solarized-light.xml
@@ -26,7 +26,7 @@
 <style-scheme id="solarizedlight" _name="Solarized Light" version="1.0">
 
   <author>Matthew Cantelon</author>
-  <_description>Port of the Dark Solarized theme by Ethan Schoonover.</_description>
+  <_description>Gedit port of the light version of the Solarized theme. Check https://github.com/mattcan/solarized-gedit for more information.</_description>
 
   <!-- Solarized Palette -->
   <color name="base03"                      value="#002b36"/>