← Back to branch summary

~ubuntu-branches/ubuntu/wily/gramps/wily

« back to all changes in this revision

Viewing changes to gramps/gui/viewmanager.py

  • Committer: Package Import Robot
  • Author(s): Ross Gammon
  • Date: 2015-05-16 11:49:41 UTC
  • mfrom: (39.1.17 sid)
  • Revision ID: package-import@ubuntu.com-20150516114941-hiku87mi6p7wbjba
Tags: 4.1.3~dfsg-1
https://launchpad.net/bugs/1427444
http://bugs.debian.org/785393
* New upstream release
* Fixes manpage desription of import function (LP: #1427444)
* Fixes crash when closing detatched gramplet (Closes: #785393)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gramps/gui/viewmanager.py
386
386
        hpane.add2(self.notebook)
387
387
        self.menubar = self.uimanager.get_widget('/MenuBar')
388
388
        self.toolbar = self.uimanager.get_widget('/ToolBar')
389
 
        vbox.pack_start(self.menubar, False, True, 0)
 
389
        self.__attach_menubar(vbox)
390
390
        vbox.pack_start(self.toolbar, False, True, 0)
391
391
        vbox.add(hpane)
392
392
        self.statusbar = Statusbar()
834
834
 
835
835
        self.uimanager.add_ui_from_string(UIDEFAULT)
836
836
        self.uimanager.ensure_update()
 
837
 
 
838
    def __attach_menubar(self, vbox):
 
839
        vbox.pack_start(self.menubar, False, True, 0)
837
840
        if _GTKOSXAPPLICATION:
838
 
            menubar = self.uimanager.get_widget("/MenuBar")
839
 
            menubar.hide()
 
841
            self.menubar.hide()
840
842
            quit_item = self.uimanager.get_widget("/MenuBar/FileMenu/Quit")
841
843
            about_item = self.uimanager.get_widget("/MenuBar/HelpMenu/About")
842
844
            prefs_item = self.uimanager.get_widget("/MenuBar/EditMenu/Preferences")
843
 
            self.macapp.set_menu_bar(menubar)
 
845
            self.macapp.set_menu_bar(self.menubar)
844
846
            self.macapp.insert_app_menu_item(about_item, 0)
845
847
            self.macapp.insert_app_menu_item(prefs_item, 1)
846
848
 
1306
1308
                    _("Backup file already exists! Overwrite?"),
1307
1309
                    _("The file '%s' exists.") % filename,
1308
1310
                    _("Proceed and overwrite"),
1309
 
                    _("Cancel the backup"))
 
1311
                    _("Cancel the backup"),
 
1312
                    parent=self.window)
1310
1313
                yes_no = question.run()
1311
1314
                if not yes_no:
1312
1315
                    return
1337
1340
        right pane, otherwise FileChooserDialog will hang.
1338
1341
        """
1339
1342
        f = Gtk.FileChooserDialog(
1340
 
            _("Select backup directory"),
1341
 
            action=Gtk.FileChooserAction.SELECT_FOLDER,
1342
 
            buttons=(Gtk.STOCK_CANCEL,
1343
 
                     Gtk.ResponseType.CANCEL,
1344
 
                     Gtk.STOCK_APPLY,
1345
 
                     Gtk.ResponseType.OK))
 
1343
                title=_("Select backup directory"),
 
1344
                parent=self.window,
 
1345
                action=Gtk.FileChooserAction.SELECT_FOLDER,
 
1346
                buttons=(Gtk.STOCK_CANCEL,
 
1347
                    Gtk.ResponseType.CANCEL,
 
1348
                    Gtk.STOCK_APPLY,
 
1349
                    Gtk.ResponseType.OK))
1346
1350
        mpath = path_entry.get_text()
1347
1351
        if not mpath:
1348
1352
            mpath = HOME_DIR