Commits

commits@gajim.org

17632 discussions

gajim: Fix layout in AddNewContact window
by Gajim 05 Oct '16

05 Oct '16

changeset 69a75c4d8049 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=69a75c4d8049 description: Fix layout in AddNewContact window diffstat: data/gui/add_new_contact_window.ui | 15 +++++++++------ src/dialogs.py | 10 +++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diffs (126 lines): diff -r 5850bb0c8922 -r 69a75c4d8049 data/gui/add_new_contact_window.ui --- a/data/gui/add_new_contact_window.ui Wed Oct 05 21:34:00 2016 +0200 +++ b/data/gui/add_new_contact_window.ui Wed Oct 05 22:51:06 2016 +0200 @@ -41,6 +41,8 @@ <object class="GtkLabel" id="prompt_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="use_markup">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -57,9 +59,9 @@ <object class="GtkLabel" id="account_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">A_ccount:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -105,9 +107,9 @@ <object class="GtkLabel" id="protocol_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Protocol:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -164,9 +166,9 @@ <object class="GtkLabel" id="uid_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_User ID:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -177,9 +179,9 @@ <object class="GtkLabel" id="label188"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Nickname:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -190,9 +192,9 @@ <object class="GtkLabel" id="label223"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Group:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -271,6 +273,7 @@ </child> <child> <object class="GtkScrolledWindow" id="message_scrolledwindow"> + <property name="height_request">60</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="no_show_all">True</property> @@ -319,12 +322,12 @@ <object class="GtkLabel" id="label224"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">You have to register with this transport to be able to add a contact from this protocol. Click on Register button to proceed.</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> diff -r 5850bb0c8922 -r 69a75c4d8049 src/dialogs.py --- a/src/dialogs.py Wed Oct 05 21:34:00 2016 +0200 +++ b/src/dialogs.py Wed Oct 05 22:51:06 2016 +0200 @@ -890,12 +890,12 @@ 'group_comboboxentry', 'auto_authorize_checkbutton'): self.__dict__[w] = self.xml.get_object(w) if account and len(gajim.connections) >= 2: - self.default_desc = _('Please fill in the data of the contact you ' - 'want to add in account %s') % account + self.default_desc = _('Please fill in the data of the contact you want\n' + 'to add to your account <b>%s</b>') % account else: self.default_desc = _('Please fill in the data of the contact you ' 'want to add') - self.xml.get_object('prompt_label').set_text(self.default_desc) + self.xml.get_object('prompt_label').set_markup(self.default_desc) self.agents = {'jabber': []} self.gateway_prompt = {} # types to which we are not subscribed but account has an agent for it @@ -1161,7 +1161,7 @@ desc = self.gateway_prompt[jid_]['desc'] if not desc: desc = self.default_desc - self.xml.get_object('prompt_label').set_text(desc) + self.xml.get_object('prompt_label').set_markup(desc) prompt = None if self.agents[type_] and jid_ in self.gateway_prompt: @@ -1190,7 +1190,7 @@ desc = self.gateway_prompt[jid_]['desc'] if not desc: desc = self.default_desc - self.xml.get_object('prompt_label').set_text(desc) + self.xml.get_object('prompt_label').set_markup(desc) if len(self.agents[type_]) > 1: self.protocol_jid_combobox.show() else:

1 0

gajim: Make JoinGroupChat dialog not resizeable
by Gajim 05 Oct '16

05 Oct '16

changeset 015eb5fa57d9 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=015eb5fa57d9 description: Make JoinGroupChat dialog not resizeable diffstat: data/gui/join_groupchat_window.ui | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diffs (71 lines): diff -r 69a75c4d8049 -r 015eb5fa57d9 data/gui/join_groupchat_window.ui --- a/data/gui/join_groupchat_window.ui Wed Oct 05 22:51:06 2016 +0200 +++ b/data/gui/join_groupchat_window.ui Wed Oct 05 23:05:34 2016 +0200 @@ -16,6 +16,7 @@ <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Join Group Chat</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_join_groupchat_window_destroy" swapped="no"/> <signal name="key-press-event" handler="on_join_groupchat_window_key_press_event" swapped="no"/> @@ -47,8 +48,8 @@ <object class="GtkLabel" id="account_label"> <property name="can_focus">False</property> <property name="no_show_all">True</property> + <property name="label" translatable="yes">Account</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Account</property> </object> <packing> <property name="left_attach">0</property> @@ -70,8 +71,8 @@ <object class="GtkLabel" id="label225"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Recently:</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Recently:</property> </object> <packing> <property name="left_attach">0</property> @@ -93,8 +94,8 @@ <object class="GtkLabel" id="label142"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Nickname:</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Nickname:</property> </object> <packing> <property name="left_attach">0</property> @@ -117,8 +118,8 @@ <object class="GtkLabel" id="label143"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Room:</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Room:</property> </object> <packing> <property name="left_attach">0</property> @@ -129,8 +130,8 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Server:</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Server:</property> </object> <packing> <property name="left_attach">0</property> @@ -141,8 +142,8 @@ <object class="GtkLabel" id="label145"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Password:</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Password:</property> </object> <packing> <property name="left_attach">0</property>

1 0

gajim: Fix layout in Plugins Window
by Gajim 05 Oct '16

05 Oct '16

changeset 5850bb0c8922 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5850bb0c8922 description: Fix layout in Plugins Window diffstat: data/gui/plugins_window.ui | 41 +++++++++++++++++------------------------ src/dialogs.py | 6 ++++-- src/plugins/gui.py | 4 +++- src/plugins/pluginmanager.py | 2 +- 4 files changed, 25 insertions(+), 28 deletions(-) diffs (168 lines): diff -r 6f69192b6bc8 -r 5850bb0c8922 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Wed Oct 05 20:26:25 2016 +0200 +++ b/data/gui/plugins_window.ui Wed Oct 05 21:34:00 2016 +0200 @@ -45,14 +45,16 @@ <property name="position">250</property> <child> <object class="GtkBox" id="vbox6"> + <property name="width_request">150</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">6</property> <property name="hscrollbar_policy">never</property> <child> <object class="GtkTreeView" id="installed_plugins_treeview"> @@ -71,34 +73,25 @@ </packing> </child> <child> - <object class="GtkAspectFrame" id="aspectframe1"> + <object class="GtkButton" id="install_plugin_button"> + <property name="label" translatable="yes">Install from zip</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <property name="xalign">0</property> - <child> - <object class="GtkButton" id="install_plugin_button"> - <property name="label" translatable="yes">Install from zip</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image1</property> - <signal name="clicked" handler="on_install_plugin_button_clicked" swapped="no"/> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + <property name="image">image1</property> + <signal name="clicked" handler="on_install_plugin_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">5</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="resize">False</property> - <property name="shrink">True</property> + <property name="shrink">False</property> </packing> </child> <child> @@ -112,9 +105,9 @@ <object class="GtkLabel" id="plugin_name_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">&lt;empty&gt;</property> <property name="selectable">True</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -146,9 +139,9 @@ <object class="GtkLabel" id="plugin_version_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label"><empty></property> <property name="selectable">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -172,8 +165,8 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Authors:</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Authors:</property> </object> <packing> <property name="expand">False</property> @@ -185,12 +178,12 @@ <object class="GtkLabel" id="plugin_authors_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="yalign">0</property> <property name="label"><empty></property> <property name="wrap_mode">word-char</property> <property name="selectable">True</property> <property name="ellipsize">end</property> + <property name="xalign">0</property> + <property name="yalign">0</property> </object> <packing> <property name="expand">True</property> diff -r 6f69192b6bc8 -r 5850bb0c8922 src/dialogs.py --- a/src/dialogs.py Wed Oct 05 20:26:25 2016 +0200 +++ b/src/dialogs.py Wed Oct 05 21:34:00 2016 +0200 @@ -4875,7 +4875,8 @@ class ArchiveChooserDialog(FileChooserDialog): - def __init__(self, on_response_ok=None, on_response_cancel=None): + def __init__(self, on_response_ok=None, on_response_cancel=None, + transient_for=None): def on_ok(widget, callback): '''check if file exists and call callback''' @@ -4899,7 +4900,8 @@ default_response=Gtk.ResponseType.OK, current_folder=path, on_response_ok=(on_ok, on_response_ok), - on_response_cancel=on_response_cancel) + on_response_cancel=on_response_cancel, + transient_for=transient_for) if on_response_cancel: self.connect('destroy', on_response_cancel) diff -r 6f69192b6bc8 -r 5850bb0c8922 src/plugins/gui.py --- a/src/plugins/gui.py Wed Oct 05 20:26:25 2016 +0200 +++ b/src/plugins/gui.py Wed Oct 05 21:34:00 2016 +0200 @@ -69,6 +69,7 @@ setattr(self, widget_name, self.xml.get_object(widget_name)) self.plugin_description_textview = HtmlTextView() + self.plugin_description_textview.set_wrap_mode(Gtk.WrapMode.WORD) sw = self.xml.get_object('scrolledwindow2') sw.add(self.plugin_description_textview) self.installed_plugins_model = Gtk.ListStore(object, str, bool, bool, @@ -303,7 +304,8 @@ sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) - self.dialog = ArchiveChooserDialog(on_response_ok=_try_install) + self.dialog = ArchiveChooserDialog( + on_response_ok=_try_install, transient_for=self.window) class GajimPluginConfigDialog(Gtk.Dialog): diff -r 6f69192b6bc8 -r 5850bb0c8922 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Wed Oct 05 20:26:25 2016 +0200 +++ b/src/plugins/pluginmanager.py Wed Oct 05 21:34:00 2016 +0200 @@ -447,7 +447,7 @@ # read metadata from manifest.ini conf.remove_section('info') - conf_file = open(manifest_path) + conf_file = open(manifest_path, encoding='utf-8') conf.read_file(conf_file) conf_file.close()

1 0

gajim: Move status message TreeView code into glade file, fix la...
by Gajim 05 Oct '16

05 Oct '16

changeset 2a3c0eeeed40 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2a3c0eeeed40 description: Move status message TreeView code into glade file, fix layout diffstat: data/gui/preferences_window.ui | 113 ++++++++++++++++++++++++++++++---------- src/config.py | 31 ----------- 2 files changed, 84 insertions(+), 60 deletions(-) diffs (truncated from 443 to 300 lines): diff -r e13c9eeb3d4c -r 2a3c0eeeed40 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Wed Oct 05 12:10:11 2016 +0200 +++ b/data/gui/preferences_window.ui Wed Oct 05 20:20:42 2016 +0200 @@ -16,6 +16,18 @@ <property name="step_increment">1</property> <property name="page_increment">10</property> </object> + <object class="GtkListStore" id="default_message_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gboolean"/> + </columns> + </object> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -374,10 +386,10 @@ <object class="GtkLabel" id="label381"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="xpad">1</property> <property name="label" translatable="yes">_Emoticons:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> </child> </object> @@ -390,10 +402,10 @@ <object class="GtkLabel" id="label379"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="xpad">1</property> <property name="label" translatable="yes">_Window behavior:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -404,10 +416,10 @@ <object class="GtkLabel" id="label28"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="xpad">1</property> <property name="label" translatable="yes">_Show roster on startup:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -609,8 +621,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">When new event is received:</property> <property name="xalign">0</property> - <property name="label" translatable="yes">When new event is received:</property> </object> <packing> <property name="expand">False</property> @@ -987,9 +999,9 @@ <object class="GtkLabel" id="label33"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Display chat state notifications:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> </child> </object> @@ -1043,9 +1055,9 @@ <object class="GtkLabel" id="label34"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Send chat state notifications:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> </child> </object> @@ -1150,8 +1162,8 @@ <object class="GtkLabel" id="label77"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">minutes</property> <property name="xalign">0</property> - <property name="label" translatable="yes">minutes</property> </object> <packing> <property name="left_attach">2</property> @@ -1162,8 +1174,8 @@ <object class="GtkLabel" id="label78"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">minutes</property> <property name="xalign">0</property> - <property name="label" translatable="yes">minutes</property> </object> <packing> <property name="left_attach">2</property> @@ -1342,9 +1354,49 @@ <object class="GtkTreeView" id="default_msg_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="model">default_message_liststore</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> + <child> + <object class="GtkTreeViewColumn" id="status"> + <property name="title" translatable="yes">Status</property> + <child> + <object class="GtkCellRendererText" id="statustext"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="defaultmsg"> + <property name="title" translatable="yes">Default Message</property> + <property name="expand">True</property> + <child> + <object class="GtkCellRendererText" id="defaultmessage"> + <property name="editable">True</property> + <signal name="edited" handler="on_default_msg_cell_edited" swapped="no"/> + </object> + <attributes> + <attribute name="text">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="enabled"> + <property name="title" translatable="yes">Enabled</property> + <child> + <object class="GtkCellRendererToggle" id="enable"> + <signal name="toggled" handler="default_msg_toggled_cb" swapped="no"/> + </object> + <attributes> + <attribute name="active">3</attribute> + </attributes> + </child> + </object> + </child> </object> </child> </object> @@ -1390,6 +1442,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="msg_treeview"> @@ -1438,6 +1491,8 @@ <object class="GtkButtonBox" id="vbuttonbox3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="vexpand">False</property> <property name="spacing">5</property> <property name="layout_style">start</property> <child> @@ -1540,9 +1595,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Chat message:</property> <property name="ellipsize">start</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -1618,9 +1673,9 @@ <object class="GtkLabel" id="label249"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">T_heme:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -1631,9 +1686,9 @@ <object class="GtkLabel" id="label174"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Status _iconset:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -1740,10 +1795,10 @@ <object class="GtkLabel" id="label72"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Contact's nickname:</property> <property name="use_underline">True</property> <property name="justify">center</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -1754,8 +1809,8 @@ <object class="GtkLabel" id="label13"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Contact's message:</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Contact's message:</property> </object> <packing> <property name="left_attach">0</property> @@ -1766,10 +1821,10 @@ <object class="GtkLabel" id="label71"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Status message:</property> <property name="use_underline">True</property> <property name="justify">center</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -1780,9 +1835,9 @@ <object class="GtkLabel" id="label30"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Group chat highlight:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -1918,10 +1973,10 @@ <object class="GtkLabel" id="label70"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Your nickname:</property> <property name="use_underline">True</property> <property name="justify">center</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -1932,8 +1987,8 @@ <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Your message:</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Your message:</property> </object> <packing> <property name="left_attach">2</property> @@ -1944,9 +1999,9 @@ <object class="GtkLabel" id="label371"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_URL highlight:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -2156,8 +2211,8 @@ <object class="GtkLabel" id="label18"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Audio input device</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Audio input device</property> </object> <packing> <property name="left_attach">0</property> @@ -2168,8 +2223,8 @@ <object class="GtkLabel" id="label19">

1 0

gajim: Add transient to overwrite status message dialog
by Gajim 05 Oct '16

05 Oct '16

changeset 6f69192b6bc8 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6f69192b6bc8 description: Add transient to overwrite status message dialog diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2a3c0eeeed40 -r 6f69192b6bc8 src/dialogs.py --- a/src/dialogs.py Wed Oct 05 20:20:42 2016 +0200 +++ b/src/dialogs.py Wed Oct 05 20:26:25 2016 +0200 @@ -813,7 +813,7 @@ if msg_name in self.preset_messages_dict: ConfirmationDialog(_('Overwrite Status Message?'), _('This name is already used. Do you want to overwrite this ' - 'status message?'), on_response_ok=on_ok2) + 'status message?'), on_response_ok=on_ok2, transient_for=self.dialog) return gajim.config.add_per('statusmsg', msg_name) on_ok2()

1 0

gajim: Fix layout in gajim themes window
by Gajim 05 Oct '16

05 Oct '16

changeset 3044b896fec7 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3044b896fec7 description: Fix layout in gajim themes window diffstat: data/gui/gajim_themes_window.ui | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diffs (93 lines): diff -r 8ee178fc1bdb -r 3044b896fec7 data/gui/gajim_themes_window.ui --- a/data/gui/gajim_themes_window.ui Wed Oct 05 11:30:18 2016 +0200 +++ b/data/gui/gajim_themes_window.ui Wed Oct 05 11:43:23 2016 +0200 @@ -26,6 +26,7 @@ <property name="can_focus">False</property> <property name="border_width">12</property> <property name="title" translatable="yes">Gajim Themes Customization</property> + <property name="resizable">False</property> <property name="window_position">center-on-parent</property> <property name="type_hint">dialog</property> <child> @@ -63,7 +64,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -203,9 +204,9 @@ <object class="GtkLabel" id="label334"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Font style:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -359,8 +360,8 @@ <object class="GtkLabel" id="label389"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Inactive</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Inactive</property> </object> <packing> <property name="left_attach">0</property> @@ -371,8 +372,8 @@ <object class="GtkLabel" id="label390"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Composing</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Composing</property> </object> <packing> <property name="left_attach">0</property> @@ -383,8 +384,8 @@ <object class="GtkLabel" id="label391"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Paused</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Paused</property> </object> <packing> <property name="left_attach">0</property> @@ -395,8 +396,8 @@ <object class="GtkLabel" id="label394"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Gone</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Gone</property> </object> <packing> <property name="left_attach">0</property> @@ -407,9 +408,9 @@ <object class="GtkLabel" id="label392"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">MUC Messages</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -420,9 +421,9 @@ <object class="GtkLabel" id="label395"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">MUC Directed Messages</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property>

1 0

gajim: Fix layout in manage proxy window
by Gajim 05 Oct '16

05 Oct '16

changeset e13c9eeb3d4c in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e13c9eeb3d4c description: Fix layout in manage proxy window diffstat: data/gui/manage_proxies_window.ui | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diffs (123 lines): diff -r 3044b896fec7 -r e13c9eeb3d4c data/gui/manage_proxies_window.ui --- a/data/gui/manage_proxies_window.ui Wed Oct 05 11:43:23 2016 +0200 +++ b/data/gui/manage_proxies_window.ui Wed Oct 05 12:10:11 2016 +0200 @@ -23,6 +23,7 @@ <property name="can_focus">False</property> <property name="border_width">12</property> <property name="title" translatable="yes">Manage Proxy Profiles</property> + <property name="resizable">False</property> <property name="window_position">center-on-parent</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_manage_proxies_window_destroy" swapped="no"/> @@ -41,6 +42,7 @@ <object class="GtkBox" id="vbox89"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_bottom">6</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -62,7 +64,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -142,9 +144,10 @@ <object class="GtkLabel" id="label320"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> + <property name="halign">start</property> <property name="label" translatable="yes">_Name:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -155,9 +158,9 @@ <object class="GtkLabel" id="label321"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Type:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -214,7 +217,6 @@ <object class="GtkFrame" id="frame23"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> @@ -229,9 +231,9 @@ <object class="GtkLabel" id="boshuri_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_BOSH URL:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -253,9 +255,9 @@ <object class="GtkLabel" id="label135"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Proxy _Host:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -283,9 +285,9 @@ <object class="GtkLabel" id="label136"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Proxy _Port:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -313,9 +315,9 @@ <object class="GtkLabel" id="label253"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Username:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -326,9 +328,9 @@ <object class="GtkLabel" id="label254"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Pass_word:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -415,7 +417,7 @@ <object class="GtkButtonBox" id="hbuttonbox22"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">7</property> + <property name="margin_right">6</property> <property name="spacing">12</property> <property name="layout_style">end</property> <child>

1 0

gajim: Fix layout in manage sounds window and add transient
by Gajim 05 Oct '16

05 Oct '16

changeset 8ee178fc1bdb in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8ee178fc1bdb description: Fix layout in manage sounds window and add transient diffstat: data/gui/manage_sounds_window.ui | 7 ++++--- src/config.py | 2 +- src/dialogs.py | 20 +++++++++++--------- 3 files changed, 16 insertions(+), 13 deletions(-) diffs (81 lines): diff -r cfa08bbe4915 -r 8ee178fc1bdb data/gui/manage_sounds_window.ui --- a/data/gui/manage_sounds_window.ui Tue Oct 04 23:54:52 2016 +0200 +++ b/data/gui/manage_sounds_window.ui Wed Oct 05 11:30:18 2016 +0200 @@ -4,9 +4,9 @@ <requires lib="gtk+" version="3.12"/> <object class="GtkWindow" id="manage_sounds_window"> <property name="width_request">400</property> - <property name="height_request">350</property> + <property name="height_request">370</property> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="border_width">12</property> <property name="title" translatable="yes">Manage sounds</property> <property name="window_position">center-on-parent</property> <property name="type_hint">dialog</property> @@ -34,7 +34,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -123,6 +123,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> diff -r cfa08bbe4915 -r 8ee178fc1bdb src/config.py --- a/src/config.py Tue Oct 04 23:54:52 2016 +0200 +++ b/src/config.py Wed Oct 05 11:30:18 2016 +0200 @@ -4341,7 +4341,7 @@ path_to_snd_file = model[iter_][2] self.dialog = dialogs.SoundChooserDialog(path_to_snd_file, on_ok, - on_cancel) + on_cancel, transient_for=self.window) def on_sounds_entry_changed(self, widget): path_to_snd_file = widget.get_text() diff -r cfa08bbe4915 -r 8ee178fc1bdb src/dialogs.py --- a/src/dialogs.py Tue Oct 04 23:54:52 2016 +0200 +++ b/src/dialogs.py Wed Oct 05 11:30:18 2016 +0200 @@ -4740,7 +4740,7 @@ class SoundChooserDialog(FileChooserDialog): def __init__(self, path_to_snd_file='', on_response_ok=None, - on_response_cancel=None): + on_response_cancel=None, transient_for=None): """ Optionally accepts path_to_snd_file so it has that as selected """ @@ -4752,14 +4752,16 @@ if os.path.exists(path_to_snd_file): callback(widget, path_to_snd_file) - FileChooserDialog.__init__(self, title_text = _('Choose Sound'), - action = Gtk.FileChooserAction.OPEN, - buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, - Gtk.STOCK_OPEN, Gtk.ResponseType.OK), - default_response = Gtk.ResponseType.OK, - current_folder = gajim.config.get('last_sounds_dir'), - on_response_ok = (on_ok, on_response_ok), - on_response_cancel = on_response_cancel) + FileChooserDialog.__init__( + self, title_text=_('Choose Sound'), + action=Gtk.FileChooserAction.OPEN, + buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, + Gtk.STOCK_OPEN, Gtk.ResponseType.OK), + default_response=Gtk.ResponseType.OK, + current_folder=gajim.config.get('last_sounds_dir'), + on_response_ok=(on_ok, on_response_ok), + on_response_cancel=on_response_cancel, + transient_for=transient_for) filter_ = Gtk.FileFilter() filter_.set_name(_('All files'))

1 0

gajim: Align buttons in InputDialog
by Gajim 04 Oct '16

04 Oct '16

changeset 42de8d86d0ab in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=42de8d86d0ab description: Align buttons in InputDialog diffstat: data/gui/input_dialog.ui | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (24 lines): diff -r 1cfe2d62f639 -r 42de8d86d0ab data/gui/input_dialog.ui --- a/data/gui/input_dialog.ui Tue Oct 04 22:25:44 2016 +0200 +++ b/data/gui/input_dialog.ui Tue Oct 04 23:50:41 2016 +0200 @@ -4,7 +4,7 @@ <requires lib="gtk+" version="3.12"/> <object class="GtkDialog" id="input_dialog"> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="border_width">12</property> <property name="type_hint">dialog</property> <signal name="delete-event" handler="on_input_dialog_delete_event" swapped="no"/> <signal name="destroy" handler="on_input_dialog_destroy" swapped="no"/> @@ -64,9 +64,9 @@ <object class="GtkBox" id="vbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="valign">end</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkBox" id="hbox2960"> <property name="visible">True</property>

1 0

gajim: Format ChangeNick message
by Gajim 04 Oct '16

04 Oct '16

changeset cfa08bbe4915 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cfa08bbe4915 description: Format ChangeNick message without \newlines the input dialog gets really big diffstat: src/gui_interface.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (17 lines): diff -r 42de8d86d0ab -r cfa08bbe4915 src/gui_interface.py --- a/src/gui_interface.py Tue Oct 04 23:50:41 2016 +0200 +++ b/src/gui_interface.py Tue Oct 04 23:54:52 2016 +0200 @@ -135,9 +135,10 @@ def handle_ask_new_nick(self, account, room_jid, parent_win): title = _('Unable to join group chat') - prompt = _('Your desired nickname in group chat %s is in use or ' - 'registered by another occupant.\nPlease specify another nickname ' - 'below:') % room_jid + prompt = _('Your desired nickname in group chat\n' + '<b>%s</b>\n' + 'is in use or registered by another occupant.\n' + 'Please specify another nickname below:') % room_jid check_text = _('Always use this nickname when there is a conflict') if 'change_nick_dialog' in self.instances: self.instances['change_nick_dialog'].add_room(account, room_jid,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits