Update dependencies in README file and rename some color settings

Changed files (4)

• modified README
• modified libbirdfont/TabBar.vala
• modified libbirdfont/Theme.vala
• modified libbirdfont/Tool.vala

Diff

diff --git a/README b/READMEindex 2ee2141..b296397 100644--- a/README+++ b/README@@ -20,7 +20,7 @@ valac libgee-dev
 libglib2.0-dev 
 libgtk-3-dev 
-libwebkitgtk-dev
+libwebkitgtk-3.0-dev
 libnotify-dev
 unicode-data (unicode character database)
 
diff --git a/libbirdfont/TabBar.vala b/libbirdfont/TabBar.valaindex 2a5bf29..fd12771 100644--- a/libbirdfont/TabBar.vala+++ b/libbirdfont/TabBar.vala@@ -624,7 +624,7 @@ public class TabBar : GLib.Object {  		cr.save (); 		cr.set_line_width (0);-		cr.set_source_rgba (background_r, background_g, background_b, 1);+		Theme.color (cr, "Background 4"); 		cr.rectangle (0, 0, width, height); 		cr.fill (); 		cr.restore ();diff --git a/libbirdfont/Theme.vala b/libbirdfont/Theme.valaindex 42be67d..ed98627 100644--- a/libbirdfont/Theme.vala+++ b/libbirdfont/Theme.vala@@ -122,19 +122,20 @@ public class Theme : GLib.Object { 		 		Theme.set_default_color ("Background Glyph", 0.2, 0.2, 0.2, 0.5); 		-		Theme.set_default_color ("Tool Border 1", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1);-		Theme.set_default_color ("Tool Background 1", 14 / 255.0, 16 / 255.0, 17 / 255.0, 1);+		Theme.set_default_color ("Button Border 1", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1);+		Theme.set_default_color ("Button Background 1", 14 / 255.0, 16 / 255.0, 17 / 255.0, 1); -		Theme.set_default_color ("Tool Border 2", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1);-		Theme.set_default_color ("Tool Background 2", 26 / 255.0, 30 / 255.0, 32 / 255.0, 1);+		Theme.set_default_color ("Button Border 2", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1);+		Theme.set_default_color ("Button Background 2", 26 / 255.0, 30 / 255.0, 32 / 255.0, 1); -		Theme.set_default_color ("Tool Border 3", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1);-		Theme.set_default_color ("Tool Background 3", 44 / 255.0, 47 / 255.0, 51 / 255.0, 1);+		Theme.set_default_color ("Button Border 3", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1);+		Theme.set_default_color ("Button Background 3", 44 / 255.0, 47 / 255.0, 51 / 255.0, 1); -		Theme.set_default_color ("Tool Border 4", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1);-		Theme.set_default_color ("Tool Background 4", 33 / 255.0, 36 / 255.0, 39 / 255.0, 1);+		Theme.set_default_color ("Button Border 4", 38 / 255.0, 39 / 255.0, 43 / 255.0, 1);+		Theme.set_default_color ("Button Background 4", 33 / 255.0, 36 / 255.0, 39 / 255.0, 1); 		 		Theme.set_default_color ("Button Foreground", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1);+		Theme.set_default_color ("Selected Button Foreground", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1); 		 		N_("Stroke Color"); 		N_("Handle Color");@@ -166,14 +167,14 @@ public class Theme : GLib.Object { 		N_("Guide 2"); 		N_("Guide 3"); 		-		N_("Tool Border 1");-		N_("Tool Background 1");-		N_("Tool Border 2");-		N_("Tool Background 2");-		N_("Tool Border 3");-		N_("Tool Background 3");-		N_("Tool Border 4");-		N_("Tool Background 4");+		N_("Button Border 1");+		N_("Button Background 1");+		N_("Button Border 2");+		N_("Button Background 2");+		N_("Button Border 3");+		N_("Button Background 3");+		N_("Button Border 4");+		N_("Button Background 4"); 		 		N_("Button Foreground"); 		diff --git a/libbirdfont/Tool.vala b/libbirdfont/Tool.valaindex e8ed1c9..b6cc769 100644--- a/libbirdfont/Tool.vala+++ b/libbirdfont/Tool.vala@@ -249,8 +249,8 @@ public class Tool : Widget { 		double bgx, bgy; 		double iconx, icony; 		-		string border = "Tool Border 3";-		string background = "Tool Border 3";+		string border = "Button Border 3";+		string background = "Button Border 3"; 		 		cr.save (); 			@@ -259,23 +259,23 @@ public class Tool : Widget {  		// Button in four states 		if (selected) {-			border = "Tool Border 1";-			background = "Tool Background 1";+			border = "Button Border 1";+			background = "Button Background 1"; 		}  		if (selected && active) {-			border = "Tool Border 2";-			background = "Tool Background 2";+			border = "Button Border 2";+			background = "Button Background 2"; 		}  		if (!selected) {-			border = "Tool Border 3";-			background = "Tool Background 3";+			border = "Button Border 3";+			background = "Button Background 3"; 		}  		if (!selected && active) {-			border = "Tool Border 4";-			background = "Tool Background 4";+			border = "Button Border 4";+			background = "Button Background 4"; 		}  		Theme.color (cr, background);@@ -290,7 +290,11 @@ public class Tool : Widget { 		iconx = bgx + w / 2 - icon_font.get_sidebearing_extent () / 2; 		icony = bgy + h / 2 - icon_font.get_height () / 2; 		-		Theme.text_color (icon_font, "Button Foreground");+		if (!selected || active) {+			Theme.text_color (icon_font, "Button Foreground");+		} else {+			Theme.text_color (icon_font, "Selected Button Foreground");+		}	 		 		icon_font.widget_x = iconx; 		icon_font.widget_y = icony;