← Back to team overview

elementaryart team mailing list archive

[Merge] lp:~xapantu/granite/appmenu into lp:granite

 

xapantu has proposed merging lp:~xapantu/granite/appmenu into lp:granite.

Requested reviews:
  elementary desktop team (elementaryart)

For more details, see:
https://code.launchpad.net/~xapantu/granite/appmenu/+merge/69894
-- 
https://code.launchpad.net/~xapantu/granite/appmenu/+merge/69894
Your team elementary desktop team is requested to review the proposed merge of lp:~xapantu/granite/appmenu into lp:granite.
=== modified file 'lib/Widgets/AppMenu.vala'
--- lib/Widgets/AppMenu.vala	2011-06-25 13:28:08 +0000
+++ lib/Widgets/AppMenu.vala	2011-07-30 17:27:27 +0000
@@ -23,27 +23,31 @@
 	
 	public class AppMenu : ToolButtonWithMenu {
 	
-		public AppMenu (Menu menu) {
-			
-			var help_item = new MenuItem.with_label (_("Get Help Online..."));
-			var translate_item = new MenuItem.with_label (_("Translate This Application..."));
-			var report_item = new MenuItem.with_label (_("Report a Problem..."));
-			var about_item = new MenuItem.with_label (_("About"));
-			
-			if (menu.get_children ().length () > 0)
-				menu.append (new SeparatorMenuItem ());
-			menu.append (help_item);
-			menu.append (translate_item);
-			menu.append (report_item);
-			menu.append (new SeparatorMenuItem ());
-			menu.append (about_item);
+		public AppMenu (Menu menu, bool add_standard_items = false) {
+			
+            if(add_standard_items)
+            {
+			    var help_item = new MenuItem.with_label (_("Get Help Online..."));
+			    var translate_item = new MenuItem.with_label (_("Translate This Application..."));
+			    var report_item = new MenuItem.with_label (_("Report a Problem..."));
+			    var about_item = new MenuItem.with_label (_("About"));
+			
+                if (menu.get_children ().length () > 0)
+                    menu.append (new SeparatorMenuItem ());
+                menu.append (help_item);
+                menu.append (translate_item);
+                menu.append (report_item);
+                menu.append (new SeparatorMenuItem ());
+                menu.append (about_item);
+                
+                help_item.activate.connect(() => System.open_uri (AppFactory.app.help_url));
+                translate_item.activate.connect(() => System.open_uri (AppFactory.app.translate_url));
+                report_item.activate.connect(() => System.open_uri (AppFactory.app.bug_url));
+                about_item.activate.connect (AppFactory.app.show_about);
+            }
 			
 			base (new Image.from_stock (Stock.PROPERTIES, IconSize.MENU), _("Menu"), menu);
 			
-			help_item.activate.connect(() => System.open_uri (AppFactory.app.help_url));
-			translate_item.activate.connect(() => System.open_uri (AppFactory.app.translate_url));
-			report_item.activate.connect(() => System.open_uri (AppFactory.app.bug_url));
-			about_item.activate.connect (AppFactory.app.show_about);
 		}
 		
 	}


Follow ups