Philipp Hörist pushed to branch master at gajim / gajim
Commits: 160d6c8a by wurstsalat at 2020-08-25T17:06:19+02:00 ManageSounds: Migrate to Gtk.ApplicationWindow
- - - - -
5 changed files:
- + gajim/data/gui/manage_sounds.ui - − gajim/data/gui/manage_sounds_window.ui - gajim/gtk/const.py - gajim/gtk/sounds.py → gajim/gtk/manage_sounds.py - gajim/gtk/preferences.py
Changes:
===================================== gajim/data/gui/manage_sounds.ui ===================================== @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.36.0 --> +<interface> + <requires lib="gtk+" version="3.22"/> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name enabled --> + <column type="gboolean"/> + <!-- column-name name --> + <column type="gchararray"/> + <!-- column-name path --> + <column type="gchararray"/> + <!-- column-name config --> + <column type="gchararray"/> + </columns> + <signal name="row-changed" handler="_on_row_changed" swapped="no"/> + </object> + <object class="GtkBox" id="manage_sounds"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="sounds_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">liststore1</property> + <signal name="cursor-changed" handler="_on_cursor_changed" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="title" translatable="yes">Active</property> + <property name="clickable">True</property> + <child> + <object class="GtkCellRendererToggle"> + <signal name="toggled" handler="_on_toggle" swapped="no"/> + </object> + <attributes> + <attribute name="active">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="title" translatable="yes">Event</property> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkFileChooserButton" id="filechooser"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="preview_widget_active">False</property> + <property name="use_preview_label">False</property> + <property name="title" translatable="yes">Choose Sound</property> + <signal name="file-set" handler="_on_file_set" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Clear Sound</property> + <signal name="clicked" handler="_on_clear" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">edit-clear-all-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Play Sound</property> + <signal name="clicked" handler="_on_play" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">media-playback-start-symbolic</property> + <property name="use_fallback">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> +</interface>
===================================== gajim/data/gui/manage_sounds_window.ui deleted ===================================== @@ -1,160 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkListStore" id="liststore1"> - <columns> - <!-- column-name enabled --> - <column type="gboolean"/> - <!-- column-name name --> - <column type="gchararray"/> - <!-- column-name path --> - <column type="gchararray"/> - <!-- column-name config --> - <column type="gchararray"/> - </columns> - <signal name="row-changed" handler="_on_row_changed" swapped="no"/> - </object> - <object class="GtkWindow" id="manage_sounds_window"> - <property name="width_request">400</property> - <property name="height_request">370</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="title" translatable="yes">Manage sounds</property> - <property name="window_position">center-on-parent</property> - <property name="default_width">400</property> - <property name="default_height">370</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="_on_destroy" swapped="no"/> - <signal name="key-press-event" handler="_on_key_press" swapped="no"/> - <child> - <placeholder/> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkScrolledWindow" id="sounds_scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="sounds_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">liststore1</property> - <signal name="cursor-changed" handler="_on_cursor_changed" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="title" translatable="yes">Active</property> - <property name="clickable">True</property> - <child> - <object class="GtkCellRendererToggle"> - <signal name="toggled" handler="_on_toggle" swapped="no"/> - </object> - <attributes> - <attribute name="active">0</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="title" translatable="yes">Event</property> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="browse_sounds_hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkFileChooserButton" id="filechooser"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="preview_widget_active">False</property> - <property name="use_preview_label">False</property> - <property name="title" translatable="yes">Choose Sound</property> - <signal name="file-set" handler="_on_file_set" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Clear Sound</property> - <signal name="clicked" handler="_on_clear" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">edit-clear-all-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="play_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Play Sound</property> - <signal name="clicked" handler="_on_play" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">media-playback-start-symbolic</property> - <property name="use_fallback">True</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> -</interface>
===================================== gajim/gtk/const.py ===================================== @@ -104,6 +104,7 @@ WINDOW_MODULES = { 'AccountWizard': 'gajim.gtk.account_wizard', 'HistoryWindow': 'gajim.gtk.history', 'ManageProxies': 'gajim.gtk.proxies', + 'ManageSounds': 'gajim.gtk.manage_sounds', 'ServiceDiscoveryWindow': 'gajim.gtk.discovery', 'BlockingList': 'gajim.gtk.blocking', 'XMLConsoleWindow': 'gajim.gtk.xml_console',
===================================== gajim/gtk/sounds.py → gajim/gtk/manage_sounds.py ===================================== @@ -18,18 +18,29 @@ from gi.repository import Gdk from gi.repository import Gtk
from gajim.common import app -from gajim.common import helpers +from gajim.common.helpers import play_sound +from gajim.common.helpers import check_soundfile_path +from gajim.common.helpers import strip_soundfile_path from gajim.common.i18n import _
from gajim.gtk.util import get_builder -from gajim.gtk.util import get_app_window
-class ManageSounds: - def __init__(self): - self._ui = get_builder('manage_sounds_window.ui') - self.window = self._ui.manage_sounds_window - self.window.set_transient_for(app.app.get_active_window()) +class ManageSounds(Gtk.ApplicationWindow): + def __init__(self, transient_for): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_name('ManageSounds') + self.set_default_size(400, 400) + self.set_resizable(True) + self.set_transient_for(transient_for) + self.set_modal(True) + self.set_title(_('Manage Sounds')) + + self._ui = get_builder('manage_sounds.ui') + self.add(self._ui.manage_sounds)
filter_ = Gtk.FileFilter() filter_.set_name(_('All files')) @@ -44,9 +55,10 @@ class ManageSounds:
self._fill_sound_treeview()
+ self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self)
- self.window.show_all() + self.show_all()
@staticmethod def _on_row_changed(model, path, iter_): @@ -91,7 +103,7 @@ class ManageSounds:
def _on_cursor_changed(self, treeview): model, iter_ = treeview.get_selection().get_selected() - path_to_snd_file = helpers.check_soundfile_path(model[iter_][2]) + path_to_snd_file = check_soundfile_path(model[iter_][2]) if path_to_snd_file is None: self._ui.filechooser.unselect_all() else: @@ -103,7 +115,7 @@ class ManageSounds: filename = button.get_filename() directory = os.path.dirname(filename) app.settings.set('last_sounds_dir', directory) - path_to_snd_file = helpers.strip_soundfile_path(filename) + path_to_snd_file = strip_soundfile_path(filename)
# set new path to sounds_model model[iter_][2] = path_to_snd_file @@ -119,14 +131,8 @@ class ManageSounds: def _on_play(self, *args): model, iter_ = self._ui.sounds_treeview.get_selection().get_selected() snd_event_config_name = model[iter_][3] - helpers.play_sound(snd_event_config_name) + play_sound(snd_event_config_name)
def _on_key_press(self, _widget, event): if event.keyval == Gdk.KEY_Escape: - self.window.destroy() - - @staticmethod - def _on_destroy(*args): - window = get_app_window('Preferences') - if window is not None: - window.sounds_preferences = None + self.destroy()
===================================== gajim/gtk/preferences.py ===================================== @@ -44,7 +44,6 @@ from gajim.gtk.util import get_builder from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_available_iconsets from gajim.gtk.util import open_window -from gajim.gtk.sounds import ManageSounds from gajim.gtk.const import ControlType from gajim.gtk import gstreamer
@@ -411,9 +410,6 @@ class Preferences(Gtk.ApplicationWindow): self._ui.connect_signals(self) self.connect('key-press-event', self._on_key_press)
- self.sounds_preferences = None - self.theme_preferences = None - self.show_all()
def _on_key_press(self, widget, event): @@ -592,11 +588,8 @@ class Preferences(Gtk.ApplicationWindow): self.on_checkbutton_toggled(widget, 'sounds_on', [self._ui.manage_sounds_button])
- def on_manage_sounds_button_clicked(self, widget): - if self.sounds_preferences is None: - self.sounds_preferences = ManageSounds() - else: - self.sounds_preferences.window.present() + def on_manage_sounds_button_clicked(self, _widget): + open_window('ManageSounds', transient_for=self)
def on_sound_dnd_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sounddnd')
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/160d6c8a5d8a7b3eda9b3278e6eb8d54d...
-
Philipp Hörist