Merge lp:~janez-troha/nuvola-player/8tracks into lp:nuvola-player/2.5.x

[dz0ny]

Global menu

[Jiří Janoušek (fenryxo)]

I've already started to transform toolbar to menu, but I wil definitely combine my and your code. Thanks.

=== modified file 'data/google-music-frame/scripts/eighttracks.js'
--- data/google-music-frame/scripts/eighttracks.js	2011-11-19 17:31:18 +0000
+++ data/google-music-frame/scripts/eighttracks.js	2011-11-20 21:53:25 +0000
@@ -208,7 +208,7 @@
 
 	$GMF.prototype.thumbsUp = function(){
 		try{
-			window.Grooveshark.voteCurrentSong(1);
+			
 		}
 		catch(e){
 			$throw_exception(e.message);
@@ -217,7 +217,7 @@
 
 	$GMF.prototype.thumbsDown = function(){
 	    try{
-			window.Grooveshark.voteCurrentSong(-1);
+			
 		}
 		catch(e){
 			$throw_exception(e.message);
 
=== modified file 'src/application.vala'
--- src/application.vala	2011-11-19 23:27:27 +0000
+++ src/application.vala	2011-11-20 21:53:25 +0000
@@ -274,7 +274,7 @@
 				this.media_keys.handle_multimedia_keys();
 			else
 				this.media_keys.release_multimedia_keys();
-			
+			//TODO: handle change for toolbar
 		}
 		
 		/**
 
=== modified file 'src/settings.vala'
--- src/settings.vala	2011-11-08 20:52:13 +0000
+++ src/settings.vala	2011-11-20 21:53:25 +0000
@@ -70,6 +70,8 @@
 			box.pack_start(this.create_bool_entry("pause_key", _("Use Pause (break) key to toggle play/pause"), false), false, false);
 			/// Settings dialog - tab General
 			box.pack_start(this.create_bool_entry("hide_when_playing", _("Hide window if close button is clicked while playing."), true), false, false);
+			/// Settings dialog - tab General
+			box.pack_start(this.tool_bar("show_control_toolbar", _("Show controll bar in main window."), true), false, false);
 			// TODO: option "Show tray icon or sound menu entry"
 			
 			
@@ -151,7 +153,13 @@
 			entry.toggled.connect(() => { this.set_bool(key, entry.active); });
 			return entry;
 		}
-		
+
+		private CheckButton tool_bar(string key, string label, bool default){
+			var entry = new CheckButton.with_label(label);
+			entry.active = this.app.config.bool(key, default);
+			entry.toggled.connect(() => { this.set_bool(key, entry.active); });
+			return entry;
+		}		
 		
 		private void proxy_toggled(ToggleButton button){
 			log_debug("Proxy button toggled");
 
=== modified file 'src/window.vala'
--- src/window.vala	2011-11-19 23:27:27 +0000
+++ src/window.vala	2011-11-20 21:53:25 +0000
@@ -27,6 +27,7 @@
 	public class MainWindow : Gtk.Window{
 		private Application app;
 		private Toolbar bar;
+		private MenuBar menubar;
 		private Box box;
 		private ScrolledWindow win;
 		
@@ -53,6 +54,70 @@
 				log_warning("Unable to load application icon.");
 			}
 			
+			//Globalmenu
+			this.menubar = new MenuBar();
+
+
+			//Nuvola
+			var nuvola_group = new Menu();
+			var nuvola = new MenuItem.with_mnemonic("_Nuvola");
+			nuvola.set_submenu(nuvola_group);
+			this.menubar.add(nuvola);
+
+			//actions for nuvola group
+ 			var go_home_action = new Gtk.Action("home",null,null,Gtk.Stock.HOME);
+            go_home_action.activate.connect(() => { this.go_home_action(); });
+            nuvola_group.add(go_home_action.create_menu_item());
+
+            var refresh_action = new Gtk.Action("refresh",null,null,Gtk.Stock.REFRESH);
+            refresh_action.activate.connect(() => { this.refresh_action(); });
+            nuvola_group.add(refresh_action.create_menu_item());
+            
+            var quit_action = new Gtk.Action("quit", null, null, Gtk.Stock.QUIT);
+            quit_action.activate.connect(() => {
+				try{
+					this.hide();
+					this.app.quit();
+				}
+				catch(Fenryxo.AppError e){
+					log_critical("Unable to quit: %s", e.message);
+				}
+			});
+            nuvola_group.add(quit_action.create_menu_item()); 
+            
+            //Options
+			var options_group = new Menu();
+			var options = new MenuItem.with_mnemonic("_Options");
+			options.set_submenu(options_group);
+			this.menubar.add(options);
+
+            var troubleshooting_action = new Gtk.Action("istrouble",_("Troubleshooting"),null,null);
+            troubleshooting_action.activate.connect(() => { this.troubleshooting_action(); });
+            options_group.add(troubleshooting_action.create_menu_item());
+
+            var settings_action = new Gtk.Action("pref", null, null, Gtk.Stock.PREFERENCES);
+            settings_action.activate.connect(() => { this.settings_action(); });
+            options_group.add(settings_action.create_menu_item()); 
+
+            var switch_service_action = new Gtk.Action("switch",_("Switch service"),null,null);
+            switch_service_action.activate.connect(() => { this.switch_service_action(); });
+            options_group.add(switch_service_action.create_menu_item());             
+ 
+             //Help
+			var help_group = new Menu();
+			var help = new MenuItem.with_mnemonic("_Help");
+			help.set_submenu(help_group);
+			this.menubar.add(help);
+
+            var visit_action = new Gtk.Action("help",_("Visit site"),null,Gtk.Stock.HELP);
+            visit_action.activate.connect(() => {  });
+            help_group.add(visit_action.create_menu_item());
+
+            var show_about_dialog = new Gtk.Action("about", null, null, Gtk.Stock.ABOUT);
+            show_about_dialog.activate.connect(() => { this.show_about_dialog(); });
+            help_group.add(show_about_dialog.create_menu_item());             
+                             	 
+			//other menu
 			this.bar = new Toolbar();
 			this.bar.toolbar_style = ToolbarStyle.TEXT;
 			ToolButton item;
@@ -97,13 +162,23 @@
 			this.bar.add(item);
 			
 			this.box = new Gtk.VBox(false, 2);
+<<<<<<< TREE
 			this.box.pack_start(this.bar, false);
 			this.win = new ScrolledWindow(null, null);
 			this.win.set_policy (PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
 			this.box.pack_start(this.win);
 			this.add(this.box);
+=======
+			this.box.pack_start(this.menubar, false);
+			if(this.app.config.bool("show_control_toolbar", true)){
+				this.box.pack_start(this.bar, false);
+			}			
+			base.add(this.box);
+>>>>>>> MERGE-SOURCE
 			this.box.show_all();
 			
+
+
 			
 			/* Restore last window dimensions */
 			int w = 0;