Commit 7a429701 authored by Philipp Hörist's avatar Philipp Hörist

Merge branch 'shortcuts-window' into 'master'

Use GtkShortcutsWindow to display keyboard shortcuts.

See merge request !44
parents d2cfa9bb 058562b9
This diff is collapsed.
......@@ -56,6 +56,7 @@ import tooltips
import message_control
import adhoc_commands
import features_window
import shortcuts_window
import plugins
import plugins.gui
......@@ -3852,8 +3853,7 @@ class RosterWindow:
'http://trac.gajim.org/wiki/GajimFaq')
def on_keyboard_shortcuts_menuitem_activate(self, widget):
helpers.launch_browser_mailer('url',
'http://trac.gajim.org/wiki/KeyboardShortcuts')
shortcuts_window.show(self.window)
def on_features_menuitem_activate(self, widget):
features_window.FeaturesWindow()
......
# -*- coding:utf-8 -*-
## src/shortcuts_window.py
##
## This file is part of Gajim.
##
## Gajim is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published
## by the Free Software Foundation; version 3 only.
##
## Gajim is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
##
from gi.repository import Gtk
import gtkgui_helpers
from common import helpers
__all__ = ['show']
class ShortcutsWindow:
def __init__(self):
self.window = None
def show(self, parent=None):
if self.window is None:
builder = gtkgui_helpers.get_gtk_builder('shortcuts_window.ui')
self.window = builder.get_object('shortcuts_window')
self.window.connect('destroy', self._on_window_destroy)
self.window.set_transient_for(parent)
self.window.show_all()
self.window.present()
def _on_window_destroy(self, widget):
self.window = None
def show_shortcuts_webpage(self, parent=None):
helpers.launch_browser_mailer('url',
'https://dev.gajim.org/gajim/gajim/wikis/help/keyboardshortcuts')
if (3, 19) <= (Gtk.get_major_version(), Gtk.get_minor_version()):
show = ShortcutsWindow().show
else:
show = show_shortcuts_webpage
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment