[gnome-maps/wip/mlundblad/remove-app-menu: 2/2] application: Remove app menu



commit d0f4015b7d23ed51994249046597d8d4bf1b4437
Author: Marcus Lundblad <ml update uu se>
Date:   Thu Oct 11 21:18:47 2018 +0200

    application: Remove app menu
    
    Closes #128

 data/org.gnome.Maps.data.gresource.xml |  1 -
 data/ui/app-menu.ui                    | 26 --------------------------
 src/application.js                     | 14 --------------
 3 files changed, 41 deletions(-)
---
diff --git a/data/org.gnome.Maps.data.gresource.xml b/data/org.gnome.Maps.data.gresource.xml
index 03f3858..0bc61f7 100644
--- a/data/org.gnome.Maps.data.gresource.xml
+++ b/data/org.gnome.Maps.data.gresource.xml
@@ -2,7 +2,6 @@
 <gresources>
   <gresource prefix="/org/gnome/Maps">
     <file preprocess="xml-stripblanks">ui/account-row.ui</file>
-    <file preprocess="xml-stripblanks">ui/app-menu.ui</file>
     <file preprocess="xml-stripblanks">ui/check-in-dialog.ui</file>
     <file preprocess="xml-stripblanks">ui/context-menu.ui</file>
     <file preprocess="xml-stripblanks">ui/export-view-dialog.ui</file>
diff --git a/src/application.js b/src/application.js
index 5bb079a..80dbe40 100644
--- a/src/application.js
+++ b/src/application.js
@@ -150,10 +150,6 @@ var Application = GObject.registerClass({
         }
     }
 
-    _onQuitActivate() {
-        this._mainWindow.destroy();
-    }
-
     _onOsmAccountSetupActivate() {
         let dialog = osmEdit.createAccountDialog(this._mainWindow, false);
 
@@ -199,14 +195,6 @@ var Application = GObject.registerClass({
         }
     }
 
-    _initAppMenu() {
-        let builder = new Gtk.Builder();
-        builder.add_from_resource('/org/gnome/Maps/ui/app-menu.ui');
-
-        let menu = builder.get_object('app-menu');
-        this.set_app_menu(menu);
-    }
-
     vfunc_startup() {
         super.vfunc_startup();
 
@@ -218,7 +206,6 @@ var Application = GObject.registerClass({
         this._initServices();
 
         Utils.addActions(this, {
-            'quit': { onActivate: this._onQuitActivate.bind(this) },
             'show-contact': {
                 paramType: 's',
                 onActivate: this._onShowContactActivate.bind(this)
@@ -231,7 +218,6 @@ var Application = GObject.registerClass({
         Gtk.IconTheme.get_default().append_search_path(GLib.build_filenamev([pkg.pkgdatadir,
                                                                              'icons']));
         this._initPlaceStore();
-        this._initAppMenu();
     }
 
     _initServices() {


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