Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlovetox <philipp@hoerist.com>2020-08-12 19:01:06 +0300
committerlovetox <philipp@hoerist.com>2020-08-14 23:30:43 +0300
commit0763f8a8a8dd243b560e8370f7dd3b39f97c341d (patch)
tree90290932b8c40b41e4e9ea944930d6fee960d958
parentbcf9cf403a4beb013e594912989ddcdb1e6bc762 (diff)
StatusChange: Show dialog correctly on sign-in/out
Also fix some layout issues
-rw-r--r--gajim/data/gui/status_change_window.ui4
-rw-r--r--gajim/gtk/status_change.py13
2 files changed, 6 insertions, 11 deletions
diff --git a/gajim/data/gui/status_change_window.ui b/gajim/data/gui/status_change_window.ui
index 7a5ff92c9..1a8dc7537 100644
--- a/gajim/data/gui/status_change_window.ui
+++ b/gajim/data/gui/status_change_window.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.22"/>
<object class="GtkPopover" id="preset_popover">
@@ -116,7 +116,7 @@
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="pep_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
diff --git a/gajim/gtk/status_change.py b/gajim/gtk/status_change.py
index 499c38444..be389ff2f 100644
--- a/gajim/gtk/status_change.py
+++ b/gajim/gtk/status_change.py
@@ -57,6 +57,7 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow):
self.set_name('StatusChange')
self.set_application(app.app)
self.set_position(Gtk.WindowPosition.CENTER)
+ self.set_default_size(400, 350)
self.set_show_menubar(False)
self.set_transient_for(app.interface.roster.window)
self.title_text = _('Status Message') # TimeoutWindow
@@ -96,14 +97,8 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow):
self._draw_mood()
self._init_moods()
else:
- self._ui.activity_label.set_no_show_all(True)
- self._ui.activity_button.set_no_show_all(True)
- self._ui.mood_label.set_no_show_all(True)
- self._ui.mood_button.set_no_show_all(True)
- self._ui.activity_label.hide()
- self._ui.activity_button.hide()
- self._ui.mood_label.hide()
- self._ui.mood_button.hide()
+ self._ui.pep_grid.set_no_show_all(True)
+ self._ui.pep_grid.hide()
self._message_buffer.connect('changed', self._stop_timeout)
self.connect('key-press-event', self._on_key_press)
@@ -161,7 +156,7 @@ class StatusChange(Gtk.ApplicationWindow, TimeoutWindow):
activities = []
subactivities = []
moods = []
- for account in app.get_connected_accounts():
+ for account in app.connections:
status_messages.append(app.connections[account].status_message)
activity_data = app.connections[account].pep.get(
PEPEventType.ACTIVITY)