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

Fix not working ManagePEPServicesWindow Dialog

This commit is contained in:
Philipp Hörist 2017-07-16 22:49:34 +02:00
parent 0877364214
commit 4ba143fd68
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/gui/data_form_window.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 --> <!-- Generated with glade 3.20.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.12"/> <requires lib="gtk+" version="3.12"/>
<object class="GtkWindow" id="data_form_fake_window"> <object class="GtkWindow" id="data_form_fake_window">
@ -35,6 +35,7 @@
<object class="GtkScrolledWindow" id="single_form_scrolledwindow"> <object class="GtkScrolledWindow" id="single_form_scrolledwindow">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="vexpand">True</property>
<child> <child>
<object class="GtkViewport" id="single_form_viewport"> <object class="GtkViewport" id="single_form_viewport">
<property name="visible">True</property> <property name="visible">True</property>
@ -307,8 +308,8 @@
<object class="GtkLabel" id="title_label"> <object class="GtkLabel" id="title_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

4
data/gui/manage_pep_services_window.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 --> <!-- Generated with glade 3.20.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.12"/> <requires lib="gtk+" version="3.12"/>
<object class="GtkImage" id="image1"> <object class="GtkImage" id="image1">
@ -37,7 +37,7 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>

2
gajim/config.py
View File

@ -4146,7 +4146,7 @@ class ManagePEPServicesWindow:
self.treeview.append_column(col) self.treeview.append_column(col)
cellrenderer_text = Gtk.CellRendererText() cellrenderer_text = Gtk.CellRendererText()
col.pack_start(cellrenderer_text, True, True, 0) col.pack_start(cellrenderer_text, True)
col.add_attribute(cellrenderer_text, 'text', 0) col.add_attribute(cellrenderer_text, 'text', 0)
our_jid = gajim.get_jid_from_account(self.account) our_jid = gajim.get_jid_from_account(self.account)

6
gajim/dialogs.py
View File

@ -1384,8 +1384,8 @@ class AboutDialog(Gtk.AboutDialog):
class Dialog(Gtk.Dialog): class Dialog(Gtk.Dialog):
def __init__(self, parent, title, buttons, default=None, def __init__(self, parent, title, buttons, default=None,
on_response_ok=None, on_response_cancel=None): on_response_ok=None, on_response_cancel=None):
GObject.GObject.__init__(self, title, parent, Gtk.Dialog.__init__(self, title, parent,
Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.NO_SEPARATOR) Gtk.DialogFlags.DESTROY_WITH_PARENT)
self.user_response_ok = on_response_ok self.user_response_ok = on_response_ok
self.user_response_cancel = on_response_cancel self.user_response_cancel = on_response_cancel
@ -5296,7 +5296,7 @@ class DataFormWindow(Dialog):
def __init__(self, form, on_response_ok): def __init__(self, form, on_response_ok):
self.df_response_ok = on_response_ok self.df_response_ok = on_response_ok
Dialog.__init__(self, None, 'test', [(Gtk.STOCK_CANCEL, Dialog.__init__(self, None, 'test', [(Gtk.STOCK_CANCEL,
Gtk.ResponseType.REJECT), (Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT)], Gtk.ResponseType.CANCEL), (Gtk.STOCK_OK, Gtk.ResponseType.OK)],
on_response_ok=self.on_ok) on_response_ok=self.on_ok)
self.set_resizable(True) self.set_resizable(True)
gtkgui_helpers.resize_window(self, 600, 400) gtkgui_helpers.resize_window(self, 600, 400)