[gnome-calculator] Re-enable primary menu (#80)



commit 6d88f826ada9f3efdceca04da2d834870f39c705
Author: Robert Roth <robert roth off gmail com>
Date:   Thu Oct 4 20:57:48 2018 +0300

    Re-enable primary menu (#80)

 src/gnome-calculator.vala | 3 ---
 src/math-window.ui        | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/gnome-calculator.vala b/src/gnome-calculator.vala
index 059c6674..a8195b7d 100644
--- a/src/gnome-calculator.vala
+++ b/src/gnome-calculator.vala
@@ -93,9 +93,6 @@ public class Calculator : Gtk.Application
         buttons.programming_base = number_base;
         buttons.mode = button_mode; // FIXME: We load the basic buttons even if we immediately switch to the 
next type
 
-        /* Remove when https://wiki.gnome.org/Initiatives/GnomeGoals/AppMenuRetirement is confirmed */
-        set_app_menu (current_window.primary_menu_button.menu_model);
-
         set_accels_for_action ("win.mode::basic", {"<alt>B"});
         set_accels_for_action ("win.mode::advanced", {"<alt>A"});
         set_accels_for_action ("win.mode::financial", {"<alt>F"});
diff --git a/src/math-window.ui b/src/math-window.ui
index 38aacb53..8c7b5e6c 100644
--- a/src/math-window.ui
+++ b/src/math-window.ui
@@ -155,7 +155,7 @@
         </child>
         <child>
           <object class="GtkMenuButton" id="primary_menu_button">
-            <property name="visible">False</property> <!-- Disabled until 
https://wiki.gnome.org/Initiatives/GnomeGoals/AppMenuRetirement is confirmed -->
+            <property name="visible">True</property> <!-- Disabled until 
https://wiki.gnome.org/Initiatives/GnomeGoals/AppMenuRetirement is confirmed -->
             <property name="can_focus">False</property>
             <property name="receives_default">False</property>
             <property name="menu_model">primary_menu</property>
@@ -179,3 +179,4 @@
     </child>
   </template>
 </interface>
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]