=== modified file 'debian/patches/series' --- debian/patches/series 2013-05-26 13:46:28 +0000 +++ debian/patches/series 2013-06-05 11:35:43 +0000 @@ -0,0 +1,1 @@ +unity_menus.diff === added file 'debian/patches/unity_menus.diff' --- debian/patches/unity_menus.diff 1970-01-01 00:00:00 +0000 +++ debian/patches/unity_menus.diff 2013-06-05 18:33:41 +0000 @@ -0,0 +1,141 @@ +Index: gnome-calculator-3.8.2/src/gnome-calculator.vala +=================================================================== +--- gnome-calculator-3.8.2.orig/src/gnome-calculator.vala 2013-06-05 20:19:30.044175344 +0200 ++++ gnome-calculator-3.8.2/src/gnome-calculator.vala 2013-06-05 20:31:24.052186919 +0200 +@@ -74,33 +74,110 @@ + buttons.notify["mode"].connect ((pspec) => { mode_cb (); }); + mode_cb (); + +- var menu = new Menu (); ++ if (Environment.get_variable("XDG_CURRENT_DESKTOP") == "Unity") ++ { ++ var menubar = new Menu (); + +- var section = new Menu (); +- section.append (_("Basic"), "app.mode::basic"); +- section.append (_("Advanced"), "app.mode::advanced"); +- section.append (_("Financial"), "app.mode::financial"); +- section.append (_("Programming"), "app.mode::programming"); +- menu.append_section (_("Mode"), section); +- +- section = new Menu (); +- section.append (_("Preferences"), "app.preferences"); +- menu.append_section (null, section); +- +- section = new Menu (); +- section.append (_("About Calculator"), "app.about"); +- section.append (_("Help"), "app.help"); +- section.append (_("Quit"), "app.quit"); +- menu.append_section (null, section); +- +- set_app_menu (menu); +- +- add_accelerator ("Q", "app.quit", null); +- add_accelerator ("F1", "app.help", null); +- add_accelerator ("C", "app.copy", null); +- add_accelerator ("V", "app.paste", null); +- add_accelerator ("Z", "app.undo", null); +- add_accelerator ("Z", "app.redo", null); ++ // Edit menu ++ var menu = new Menu (); ++ ++ var section = new Menu (); ++ ++ var item = new MenuItem (_("Copy"), "app.copy"); ++ item.set_attribute ("accel", "s", "C"); ++ section.append_item (item); ++ ++ item = new MenuItem (_("Paste"), "app.paste"); ++ item.set_attribute ("accel", "s", "V"); ++ section.append_item (item); ++ ++ menu.append_section (null, section); ++ ++ section = new Menu (); ++ ++ item = new MenuItem (_("Undo"), "app.undo"); ++ item.set_attribute ("accel", "s", "Z"); ++ section.append_item (item); ++ ++ item = new MenuItem (_("Redo"), "app.redo"); ++ item.set_attribute ("accel", "s", "Z"); ++ section.append_item (item); ++ ++ menu.append_section (null, section); ++ ++ section = new Menu (); ++ section.append (_("Preferences"), "app.preferences"); ++ menu.append_section (null, section); ++ ++ section = new Menu(); ++ ++ item = new MenuItem (_("Close"), "app.quit"); ++ item.set_attribute ("accel", "s", "Q"); ++ section.append_item (item); ++ ++ menu.append_section (null, section); ++ ++ menubar.append_submenu (_("Edit"), menu); ++ ++ // Mode menu ++ menu = new Menu (); ++ ++ section = new Menu (); ++ section.append (_("Basic"), "app.mode::basic"); ++ section.append (_("Advanced"), "app.mode::advanced"); ++ section.append (_("Financial"), "app.mode::financial"); ++ section.append (_("Programming"), "app.mode::programming"); ++ menu.append_section (null, section); ++ ++ menubar.append_submenu(_("Mode"), menu); ++ ++ // Help menu ++ menu = new Menu (); ++ ++ section = new Menu (); ++ ++ item = new MenuItem (_("Contents"), "app.help"); ++ item.set_attribute ("accel", "s", "F11"); ++ section.append_item (item); ++ ++ section.append (_("About"), "app.about"); ++ menu.append_section (null, section); ++ ++ menubar.append_submenu(_("Help"), menu); ++ ++ set_menubar (menubar); ++ } ++ else ++ { ++ ++ var menu = new Menu (); ++ ++ var section = new Menu (); ++ section.append (_("Basic"), "app.mode::basic"); ++ section.append (_("Advanced"), "app.mode::advanced"); ++ section.append (_("Financial"), "app.mode::financial"); ++ section.append (_("Programming"), "app.mode::programming"); ++ menu.append_section (_("Mode"), section); ++ ++ section = new Menu (); ++ section.append (_("Preferences"), "app.preferences"); ++ menu.append_section (null, section); ++ ++ section = new Menu (); ++ section.append (_("About Calculator"), "app.about"); ++ section.append (_("Help"), "app.help"); ++ section.append (_("Quit"), "app.quit"); ++ menu.append_section (null, section); ++ ++ set_app_menu (menu); ++ ++ add_accelerator ("Q", "app.quit", null); ++ add_accelerator ("F1", "app.help", null); ++ add_accelerator ("C", "app.copy", null); ++ add_accelerator ("V", "app.paste", null); ++ add_accelerator ("Z", "app.undo", null); ++ add_accelerator ("Z", "app.redo", null); ++ } + } + + protected override void activate ()