hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[triggers] Remove compatibility code

Browse Source
This commit is contained in:
Philipp Hörist
2019-01-31 20:08:09 +01:00
parent 459f0d27e7
commit f64e4e99f5
1 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
triggers/triggers.py
View File

@@ -31,27 +31,15 @@ from gajim.plugins import GajimPlugin
from gajim.plugins.helpers import log_calls from gajim.plugins.helpers import log_calls
from gajim.plugins.helpers import get_builder from gajim.plugins.helpers import get_builder
from gajim.plugins.gui import GajimPluginConfigDialog from gajim.plugins.gui import GajimPluginConfigDialog
from gajim.plugins.plugins_i18n import _
# Since Gajim 1.1.0 _() has to be imported from gajim.gtk.filechoosers import NativeFileChooserDialog, Filter
try:
from gajim.common.i18n import _
except ImportError:
pass
try: class SoundChooserDialog(NativeFileChooserDialog):
from gajim.gtk.filechoosers import NativeFileChooserDialog, Filter
NEW_FILECHOOSER = True _title = _('Choose Sound')
_filters = [Filter(_('All files'), '*', False),
class SoundChooserDialog(NativeFileChooserDialog): Filter(_('WAV files'), '*.wav', True)]
_title = _('Choose Sound')
_filters = [Filter(_('All files'), '*', False),
Filter(_('WAV files'), '*.wav', True)]
except ImportError:
from gajim.dialogs import SoundChooserDialog
NEW_FILECHOOSER = False
class Triggers(GajimPlugin): class Triggers(GajimPlugin):
@@ -717,10 +705,7 @@ class TriggersPluginConfigDialog(GajimPluginConfigDialog):
self._ui.sound_file_box.set_sensitive(False) self._ui.sound_file_box.set_sensitive(False)
def on_browse_for_sounds_button_clicked(self, widget, data=None): def on_browse_for_sounds_button_clicked(self, widget, data=None):
if NEW_FILECHOOSER: self._new_filechooser()
self._new_filechooser()
else:
self._old_filechooser(widget, data)
def _new_filechooser(self): def _new_filechooser(self):
if self.active_num < 0: if self.active_num < 0:
@@ -736,21 +721,6 @@ class TriggersPluginConfigDialog(GajimPluginConfigDialog):
path=path_to_snd_file, path=path_to_snd_file,
transient_for=self) transient_for=self)
def _old_filechooser(self, widget, data=None):
if self.active_num < 0:
return
def on_ok(widget, path_to_snd_file):
dialog.destroy()
if not path_to_snd_file:
path_to_snd_file = ''
self.config[self.active_num]['sound_file'] = path_to_snd_file
self._ui.sound_entry.set_text(path_to_snd_file)
path_to_snd_file = self._ui.sound_entry.get_text()
path_to_snd_file = os.path.join(os.getcwd(), path_to_snd_file)
dialog = SoundChooserDialog(path_to_snd_file, on_ok)
def on_play_button_clicked(self, widget): def on_play_button_clicked(self, widget):
helpers.play_sound_file(self._ui.sound_entry.get_text()) helpers.play_sound_file(self._ui.sound_entry.get_text())