copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Port ipython command from gajim-remote

Browse source
This commit is contained in:
Philipp Hörist 2018-02-02 00:18:10 +01:00
parent aec3a6df6a
commit 9ed0edf331
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gajim/app_actions.py
View file

@ -274,3 +274,15 @@ class AppActions():
app.interface.handle_event(dict_['account'], dict_['jid'], app.interface.handle_event(dict_['account'], dict_['jid'],
dict_['type_']) dict_['type_'])
# Other Actions
def toggle_ipython(self, action, param):
"""
Show/hide the ipython window
"""
win = app.ipython_window
if win and win.window.is_visible():
win.present()
else:
app.interface.create_ipython_window()

12
gajim/gajim.py
View file

@ -91,6 +91,9 @@ class GajimApplication(Gtk.Application):
self.add_main_option('warnings', ord('w'), GLib.OptionFlags.NONE, self.add_main_option('warnings', ord('w'), GLib.OptionFlags.NONE,
GLib.OptionArg.NONE, GLib.OptionArg.NONE,
_('Show all warnings')) _('Show all warnings'))
self.add_main_option('ipython', ord('i'), GLib.OptionFlags.NONE,
GLib.OptionArg.NONE,
_('open ipython shell'))
self.connect('handle-local-options', self._handle_local_options) self.connect('handle-local-options', self._handle_local_options)
self.connect('startup', self._startup) self.connect('startup', self._startup)
@ -294,6 +297,11 @@ class GajimApplication(Gtk.Application):
app_id = '%s.%s' % (self.get_application_id(), profile) app_id = '%s.%s' % (self.get_application_id(), profile)
self.set_application_id(app_id) self.set_application_id(app_id)
self.profile = profile self.profile = profile
# Register the Application, so it knows if its primary or not
# This is needed so we can execute actions on the remote instance
self.register(None)
if options.contains('separate'): if options.contains('separate'):
self.profile_separation = True self.profile_separation = True
if options.contains('config-path'): if options.contains('config-path'):
@ -311,6 +319,9 @@ class GajimApplication(Gtk.Application):
logging_helpers.set_loglevels(loglevel) logging_helpers.set_loglevels(loglevel)
if options.contains('warnings'): if options.contains('warnings'):
self.show_warnings() self.show_warnings()
if options.contains('ipython'):
self.activate_action('ipython')
return 0
return -1 return -1
def show_warnings(self): def show_warnings(self):
@ -386,6 +397,7 @@ class GajimApplication(Gtk.Application):
('content', action.on_contents), ('content', action.on_contents),
('about', action.on_about), ('about', action.on_about),
('faq', action.on_faq), ('faq', action.on_faq),
('ipython', action.toggle_ipython),
] ]
act = Gio.SimpleAction.new('add-contact', GLib.VariantType.new('s')) act = Gio.SimpleAction.new('add-contact', GLib.VariantType.new('s'))