add tab bar icons

Changed files (6)

• added icons/next_tab.png
• added icons/previous_tab.png
• added icons/tabbar_background.png
• modified src/GtkInterface.vala
• modified src/Main.vala
• modified src/wscript

Diff

diff --git a/icons/next_tab.png b/icons/next_tab.pngnew file mode 100644index 0000000..a2f760cBinary files /dev/null and b/icons/next_tab.png differdiff --git a/icons/previous_tab.png b/icons/previous_tab.pngnew file mode 100644index 0000000..4f9cb9fBinary files /dev/null and b/icons/previous_tab.png differdiff --git a/icons/tabbar_background.png b/icons/tabbar_background.pngnew file mode 100644index 0000000..8a10981Binary files /dev/null and b/icons/tabbar_background.png differdiff --git a/src/GtkInterface.vala b/src/GtkInterface.valaindex 1244f5f..dd4e7a2 100644--- a/src/GtkInterface.vala+++ b/src/GtkInterface.vala@@ -37,14 +37,16 @@ public class GtkWindow : Gtk.Window, NativeWindow { 	static DrawingArea margin_right; 		 	public GtkWindow (string title) {+		// set_title (title);+	}+	+	public void init () { 		margin_bottom = new DrawingArea (); 		margin_right = new DrawingArea (); 	 		margin_bottom.set_size_request (0, 0); 		margin_right.set_size_request (0, 0); 		-		// set_title (title);- 		delete_event.connect (quit); 		 		set_size_and_position ();@@ -152,23 +154,6 @@ public class GtkWindow : Gtk.Window, NativeWindow { 	 	} -	void set_first_view () {-/*//FIXA		IdleSource idle = new IdleSource ();-		idle.set_callback(() => {-			if (args.get_file () != "") {-				Supplement.get_current_font ().load (args.get_file ());-				MainWindow.get_toolbox ().select_tool_by_name ("available_characters");-			} else {-				MainWindow.get_tab_bar ().select_tab_name ("Menu");-			}-			-			return false;-		});-		-		idle.attach (null);		-*/-	}- 	internal void toggle_expanded_margin_bottom () { 		int w, h; 		margin_bottom.get_size_request (out w, out h);diff --git a/src/Main.vala b/src/Main.valaindex 188cf82..de2360d 100644--- a/src/Main.vala+++ b/src/Main.vala@@ -19,13 +19,19 @@ using Birdfont; using Supplement; 	 public static int main (string[] arg) {+	GtkWindow native_window;+	MainWindow window;+	 	Supplement.Supplement supplement = new Supplement.Supplement (); 	supplement.init (arg); 	 	Gtk.init (ref arg);-	MainWindow window = new MainWindow ();-	GtkWindow native_window = new GtkWindow ("birdfont");	+	native_window = new GtkWindow ("birdfont");	+	window = new MainWindow ();+	 	window.set_native (native_window);+	native_window.init ();+	 	Gtk.main ();  	return 0;diff --git a/src/wscript b/src/wscriptindex 3cbc135..0a2a452 100644--- a/src/wscript+++ b/src/wscript@@ -90,6 +90,7 @@ def build (bld): 	bld ( 		rule = 'valac -C ./src/birdfont.vapi ../src/Main.vala ../src/GtkInterface.vala -X ../build/src/libbirdfont.so -X ./birdfont.h --pkg gtk+-2.0 --pkg libxml-2.0 --pkg gdk-2.0 --pkg webkit-1.0', 		name = 'main_c',+		source  = ['../src/Main.vala', '../src/GtkInterface.vala'], 		target = '../Main.c', 		depends = 'libbirdfont' 	)