Commits August 2013

commits@gajim.org

3 participants
325 discussions

gajim: add markedmsgcolor option to GUI. Fixes #7436
by Gajim 28 Aug '13

28 Aug '13

changeset 4add55fe304e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4add55fe304e description: add markedmsgcolor option to GUI. Fixes #7436 diffstat: data/gui/preferences_window.ui | 57 +++++++++++++++++++++++++++++++++++++++-- src/config.py | 9 +++++- src/gui_interface.py | 1 + 3 files changed, 62 insertions(+), 5 deletions(-) diffs (125 lines): diff -r caddcd3cae91 -r 4add55fe304e data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Sun Aug 25 14:07:49 2013 +0200 +++ b/data/gui/preferences_window.ui Sun Aug 25 15:23:22 2013 +0200 @@ -1880,7 +1880,7 @@ <object class="GtkTable" id="table25"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">4</property> + <property name="n_rows">5</property> <property name="n_columns">4</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> @@ -2021,8 +2021,8 @@ </object> <packing> <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -2287,6 +2287,57 @@ <property name="y_options"/> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkColorButton" id="muc_highlight_colorbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="xalign">0</property> + <property name="color">#000000000000</property> + <signal name="color_set" handler="on_muc_highlight_colorbutton_color_set"/> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkLabel" id="label30"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Group chat highlight:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> </object> </child> </object> diff -r caddcd3cae91 -r 4add55fe304e src/config.py --- a/src/config.py Sun Aug 25 14:07:49 2013 +0200 +++ b/src/config.py Sun Aug 25 15:23:22 2013 +0200 @@ -926,6 +926,9 @@ def on_status_msg_colorbutton_color_set(self, widget): self.on_preference_widget_color_set(widget, 'statusmsgcolor') + def on_muc_highlight_colorbutton_color_set(self, widget): + self.on_preference_widget_color_set(widget, 'markedmsgcolor') + def on_conversation_fontbutton_font_set(self, widget): self.on_preference_widget_font_set(widget, 'conversation_font') @@ -946,7 +949,8 @@ 'outmsgtxtcolor': ['outgoing_msg_colorbutton', 'outgoing_msg_checkbutton'], 'statusmsgcolor': 'status_msg_colorbutton', - 'urlmsgcolor': 'url_msg_colorbutton'} + 'urlmsgcolor': 'url_msg_colorbutton', + 'markedmsgcolor': 'muc_highlight_colorbutton'} for c in col_to_widget: col = gajim.config.get(c) if col: @@ -974,7 +978,8 @@ 'inmsgtxtcolor': 'incoming_msg_colorbutton', 'outmsgtxtcolor': 'outgoing_msg_colorbutton', 'statusmsgcolor': 'status_msg_colorbutton', - 'urlmsgcolor': 'url_msg_colorbutton'} + 'urlmsgcolor': 'url_msg_colorbutton', + 'markedmsgcolor': 'muc_highlight_colorbutton'} for c in col_to_widget: gajim.config.set(c, gajim.interface.default_colors[c]) self.draw_color_widgets() diff -r caddcd3cae91 -r 4add55fe304e src/gui_interface.py --- a/src/gui_interface.py Sun Aug 25 14:07:49 2013 +0200 +++ b/src/gui_interface.py Sun Aug 25 15:23:22 2013 +0200 @@ -2665,6 +2665,7 @@ 'outmsgtxtcolor': gajim.config.get('outmsgtxtcolor'), 'statusmsgcolor': gajim.config.get('statusmsgcolor'), 'urlmsgcolor': gajim.config.get('urlmsgcolor'), + 'markedmsgcolor': gajim.config.get('markedmsgcolor'), } self.handlers = {}

1 0

gajim: [Darlan] Update Hebrew translation
by Gajim 28 Aug '13

28 Aug '13

changeset 6dfdc6f2fb16 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=6dfdc6f2fb16 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 491 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 267 insertions(+), 224 deletions(-) diffs (truncated from 1366 to 300 lines): diff -r 579592319122 -r 6dfdc6f2fb16 po/he.po --- a/po/he.po Mon Aug 26 20:34:58 2013 +0200 +++ b/po/he.po Tue Aug 27 15:49:08 2013 +0400 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-24 08:22+0300\n" -"PO-Revision-Date: 2013-08-24 08:34+0200\n" +"POT-Creation-Date: 2013-08-27 10:18+0300\n" +"PO-Revision-Date: 2013-08-27 10:25+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -184,10 +184,10 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1248 ../src/config.py:1262 ../src/config.py:1267 -#: ../src/config.py:1315 ../src/config.py:1418 ../src/config.py:1737 -#: ../src/config.py:1742 ../src/config.py:2334 ../src/config.py:2415 -#: ../src/config.py:2430 ../src/config.py:3711 ../src/config.py:3786 +#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272 +#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742 +#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420 +#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791 #: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 #: ../src/dialogs.py:536 ../src/roster_window.py:3149 #: ../src/roster_window.py:3155 ../src/roster_window.py:3160 @@ -390,7 +390,7 @@ msgid "_use HTTP__PROXY environment variable" msgstr "השתמש במשת_ני סביבת HTTP__PROXY" -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:133 +#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134 msgid "_Manage..." msgstr " ניהו_ל... " @@ -436,7 +436,7 @@ msgid "_Port: " msgstr "_פורט: " -#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:137 +#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138 msgid "Miscellaneous" msgstr "שונות" @@ -444,8 +444,8 @@ msgid "Connection" msgstr "חיבור" -#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1835 -#: ../src/config.py:2431 +#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840 +#: ../src/config.py:2436 msgid "No key selected" msgstr "לא נבחר מפתח" @@ -522,7 +522,7 @@ msgstr "דוא״ל:" #: ../data/gui/accounts_window.ui.h:67 -#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1862 +#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867 #: ../src/dialogs.py:841 msgid "Jabber ID:" msgstr "מזהה Jabber:" @@ -1002,12 +1002,9 @@ msgstr "הפעל הצפנת Open_PGP" # BUG: No _underline -# I need another word for Toggle -# [ x ] Activate -# קצה אל קצה #: ../data/gui/contact_context_menu.ui.h:7 msgid "Toggle End to End Encryption" -msgstr "הפעל הצפנת E2E" +msgstr "הפעל הצפנת קצה אל קצה" #: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5759 #: ../src/roster_window.py:5997 @@ -1403,8 +1400,8 @@ "Generally avoid deletions with contacts you currently chat with." msgstr "" "אזהרה:\n" -"אם בכוונתך לבצע מחיקה בקנה מידה גדול, אנא ודא כי היישום Gajim אינו מורץ. " -"באופן כללי מוטב להימנע ממחיקות עם אנשי קשר אשר משוחחים עמך כעת." +"אם בכוונתך לבצע מחיקה בקנה מידה גדול, אנא ודא כי Gajim אינו מורץ. באופן כללי " +"מוטב להימנע ממחיקות עם אנשי קשר אשר משוחחים עמך כעת." #: ../data/gui/history_manager.ui.h:8 msgid "_Search Database" @@ -1543,7 +1540,7 @@ msgid "_Bookmark this room" msgstr "_סמן את חדר זה" -#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1852 +#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857 msgid "Server:" msgstr "שרת:" @@ -2204,59 +2201,63 @@ msgstr "הודעתך:" #: ../data/gui/preferences_window.ui.h:100 +msgid "Group chat highlight:" +msgstr "הבלטת שיחת קבוצה:" + +#: ../data/gui/preferences_window.ui.h:101 msgid "Chat Line Colors" msgstr "צבעי שורות שיחה" -#: ../data/gui/preferences_window.ui.h:101 +#: ../data/gui/preferences_window.ui.h:102 msgid "Style" msgstr "סגנון" # התקן -#: ../data/gui/preferences_window.ui.h:102 +#: ../data/gui/preferences_window.ui.h:103 msgid "Audio input device" msgstr "מכשיר קלט שמע" -#: ../data/gui/preferences_window.ui.h:103 +#: ../data/gui/preferences_window.ui.h:104 msgid "Audio output device" msgstr "מכשיר פלט שמע" -#: ../data/gui/preferences_window.ui.h:104 +#: ../data/gui/preferences_window.ui.h:105 msgid "Audio" msgstr "שמע" -#: ../data/gui/preferences_window.ui.h:105 +#: ../data/gui/preferences_window.ui.h:106 msgid "Video input device" msgstr "מכשיר קלט וידאו" -#: ../data/gui/preferences_window.ui.h:106 +#: ../data/gui/preferences_window.ui.h:107 msgid "Video output device" msgstr "מכשיר פלט וידאו" -#: ../data/gui/preferences_window.ui.h:107 +#: ../data/gui/preferences_window.ui.h:108 msgid "Video framerate" msgstr "תדר וידאו" -#: ../data/gui/preferences_window.ui.h:108 +#: ../data/gui/preferences_window.ui.h:109 msgid "Video size" msgstr "גודל וידאו" -#: ../data/gui/preferences_window.ui.h:109 +#: ../data/gui/preferences_window.ui.h:110 msgid "View own video source" msgstr "הצג מקור וידאו עצמי" -#: ../data/gui/preferences_window.ui.h:110 +#: ../data/gui/preferences_window.ui.h:111 msgid "Video" msgstr "וידאו" -#: ../data/gui/preferences_window.ui.h:111 +#: ../data/gui/preferences_window.ui.h:112 msgid "STUN server:" msgstr "שרת STUN:" -#: ../data/gui/preferences_window.ui.h:112 +#: ../data/gui/preferences_window.ui.h:113 msgid "(example: stunserver.org)" msgstr "(דוגמא: stunserver.org)" -#: ../data/gui/preferences_window.ui.h:113 +#: ../data/gui/preferences_window.ui.h:114 msgid "" "STUN server hostname. If none given, Gajim will try\n" "to discover one from server." @@ -2264,41 +2265,41 @@ "שם מארח של שרת STUN. במידה ולא ניתן, Gajim ינסה\n" "למצוא אחד מתוך שרת." -#: ../data/gui/preferences_window.ui.h:115 +#: ../data/gui/preferences_window.ui.h:116 msgid "Connection" msgstr "חיבור" -#: ../data/gui/preferences_window.ui.h:116 ../src/features_window.py:102 +#: ../data/gui/preferences_window.ui.h:117 ../src/features_window.py:102 msgid "Audio / Video" msgstr "שמע \\ וידאו" -#: ../data/gui/preferences_window.ui.h:117 +#: ../data/gui/preferences_window.ui.h:118 msgid "_File manager:" msgstr "מנהל _קבצים:" -#: ../data/gui/preferences_window.ui.h:118 +#: ../data/gui/preferences_window.ui.h:119 msgid "_Mail client:" msgstr "לקוח _דואר:" -#: ../data/gui/preferences_window.ui.h:119 +#: ../data/gui/preferences_window.ui.h:120 msgid "_Browser:" msgstr "דפדפן:" #. a header for custom browser/client/file manager. so translate sth like: Custom Settings -#: ../data/gui/preferences_window.ui.h:121 +#: ../data/gui/preferences_window.ui.h:122 msgid "Custom" msgstr "התאמה אישית" -#: ../data/gui/preferences_window.ui.h:122 +#: ../data/gui/preferences_window.ui.h:123 msgid "Applications" msgstr "יישומים" -#: ../data/gui/preferences_window.ui.h:123 +#: ../data/gui/preferences_window.ui.h:124 msgid "_Ignore events from contacts not in the roster" msgstr "הת_עלם מן אירועים מאת אנשי קשר אשר לא נוכחים ברשימה" # BUG: a dot at the end -#: ../data/gui/preferences_window.ui.h:124 +#: ../data/gui/preferences_window.ui.h:125 msgid "" "If checked, Gajim will ignore incoming events from unauthorized contacts. " "Use with caution, because it blocks all messages from any contact that is " @@ -2308,13 +2309,13 @@ "מורשים. יש לעשות שימוש זהיר באפשרות זו, משום שזו חוסמת את כל ההודעות מכל איש " "קשר אשר לא מצוי ברשימה" -#: ../data/gui/preferences_window.ui.h:125 +#: ../data/gui/preferences_window.ui.h:126 msgid "Allow client / _OS information to be sent" msgstr "התר שליחת _מידע לקוח \\ מערכת הפעלה" # BUG: a dot at the end # BUG: add Client too -#: ../data/gui/preferences_window.ui.h:126 +#: ../data/gui/preferences_window.ui.h:127 msgid "" "If checked, Gajim will allow others to detect the operation system you are " "using" @@ -2322,61 +2323,61 @@ "במידה ואפשרות זו מסומנת, Gajim יתיר לאחרים לאתר את מערכת ההפעלה אשר מצויה " "תחת שימושך" -#: ../data/gui/preferences_window.ui.h:127 +#: ../data/gui/preferences_window.ui.h:128 msgid "Allow local system time information to be sent" msgstr "התר שליחת _זמן מערכת מקומי" # BUG: a dot at the end -#: ../data/gui/preferences_window.ui.h:128 +#: ../data/gui/preferences_window.ui.h:129 msgid "If checked, Gajim will allow others to detect the time on your system" msgstr "במידה ואפשרות זו מסומנת, Gajim יתיר לאחרים לאתר את הזמן של המערכת שלך" -#: ../data/gui/preferences_window.ui.h:129 +#: ../data/gui/preferences_window.ui.h:130 msgid "Log _encrypted chat session" msgstr "רשום סשן שיחה מו_צפן ברשומות ההיסטוריה" # BUG: encryption, the # אלמלא כן -#: ../data/gui/preferences_window.ui.h:130 +#: ../data/gui/preferences_window.ui.h:131 msgid "" "If checked, Gajim will keep logs for encrypted messages. Please note that " "when using E2E encryption the remote party has to agree on logging, else the " "messages will not be logged." msgstr "" "במידה ואפשרות זו מסומנת, Gajim ישמור רשומות עבור הודעות מוצפנות. אנא קח " -"לתשומת לבך כי כאשר הצפנת קצה אל קצה (E2E) נמצאת בשימוש, הצד המרוחק מוכרח " +"לתשומת לבך כי כאשר הצפנת E2E (קצה אל קצה) נמצאת בשימוש, הצד המרוחק מוכרח " "להסכים לרישום השיחה, אחרת ההודעות לא יירשמו." # חוסר מעש -#: ../data/gui/preferences_window.ui.h:131 +#: ../data/gui/preferences_window.ui.h:132 msgid "Allow my _idle time to be sent" msgstr "התר שליחת משך זמן _חוסר פעילות" -#: ../data/gui/preferences_window.ui.h:132 +#: ../data/gui/preferences_window.ui.h:133 msgid "Global proxy:" msgstr "ציר גלובלי:" -#: ../data/gui/preferences_window.ui.h:134 +#: ../data/gui/preferences_window.ui.h:135 msgid "Privacy" msgstr "פרטיות" -#: ../data/gui/preferences_window.ui.h:135 +#: ../data/gui/preferences_window.ui.h:136 msgid "_Log status changes of contacts" msgstr "רשום _שינויים של מצב חיבור של אנשי קשר"

1 0

gajim: don't create a new session when we get an error message i...
by Gajim 28 Aug '13

28 Aug '13

changeset 323692ada574 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=323692ada574 description: don't create a new session when we get an error message in a pm. Fixes #7435 diffstat: src/common/connection_handlers.py | 11 +++++++++++ src/common/connection_handlers_events.py | 13 +++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diffs (44 lines): diff -r 6dfdc6f2fb16 -r 323692ada574 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Aug 27 15:49:08 2013 +0400 +++ b/src/common/connection_handlers.py Tue Aug 27 17:24:41 2013 +0200 @@ -1367,6 +1367,17 @@ else: return None + def get_latest_session(self, jid): + """ + Get the session that we last sent a message to + """ + if jid not in self.sessions: + return None + sessions = self.sessions[jid].values() + if not sessions: + return None + return sorted(sessions, key=operator.attrgetter('last_send'))[-1] + def find_controlless_session(self, jid, resource=None): """ Find an active session that doesn't have a control attached diff -r 6dfdc6f2fb16 -r 323692ada574 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Aug 27 15:49:08 2013 +0400 +++ b/src/common/connection_handlers_events.py Tue Aug 27 17:24:41 2013 +0200 @@ -1109,8 +1109,17 @@ self.session = None if self.mtype != 'groupchat': - self.session = self.conn.get_or_create_session(self.fjid, - self.thread_id) + if gajim.interface.is_pm_contact(self.fjid, account) and \ + self.mtype == 'error': + self.session = self.conn.find_session(self.fjid, self.thread_id) + if not self.session: + self.session = self.conn.get_latest_session(self.fjid) + if not self.session: + self.session = self.conn.make_new_session(self.fjid, + self.thread_id, type_='pm') + else: + self.session = self.conn.get_or_create_session(self.fjid, + self.thread_id) if self.thread_id and not self.session.received_thread_id: self.session.received_thread_id = True

1 0

gajim: [Darlan] Update Hebrew translation
by Gajim 28 Aug '13

28 Aug '13

changeset cc827e2e724e in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=cc827e2e724e description: [Darlan] Update Hebrew translation diffstat: po/he.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (39 lines): diff -r 323692ada574 -r cc827e2e724e po/he.po --- a/po/he.po Tue Aug 27 17:24:41 2013 +0200 +++ b/po/he.po Tue Aug 27 20:22:20 2013 +0400 @@ -9,7 +9,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-08-27 10:18+0300\n" -"PO-Revision-Date: 2013-08-27 10:25+0200\n" +"PO-Revision-Date: 2013-08-27 19:26+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -3246,7 +3246,7 @@ #: ../src/chat_control.py:2283 msgid "is NOT" -msgstr "*אינה*" +msgstr "אינה" #. chat session %s be logged #: ../src/chat_control.py:2285 @@ -3255,7 +3255,7 @@ #: ../src/chat_control.py:2285 msgid "will NOT" -msgstr "*לא* יירשם" +msgstr "לא יירשם" #. About encrypted chat session #: ../src/chat_control.py:2289 @@ -3265,7 +3265,7 @@ #. About encrypted chat session #: ../src/chat_control.py:2293 msgid "and NOT authenticated" -msgstr "ו*אינה* מאומתת" +msgstr "ואינה מאומתת" #. status will become 'is' or 'is not', authentificaed will become #. 'and authentificated' or 'and not authentificated', logged will become

1 0

gajim: [Darlan] Set title for ssl error dialogs
by Gajim 28 Aug '13

28 Aug '13

changeset 62a3be1a92c7 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=62a3be1a92c7 description: [Darlan] Set title for ssl error dialogs diffstat: src/dialogs.py | 1 + src/gui_interface.py | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diffs (20 lines): diff -r cc827e2e724e -r 62a3be1a92c7 src/dialogs.py --- a/src/dialogs.py Tue Aug 27 20:22:20 2013 +0400 +++ b/src/dialogs.py Tue Aug 27 23:21:16 2013 +0400 @@ -5433,3 +5433,4 @@ def on_cert_clicked(self, button): d = CertificatDialog(self, self.account, self.cert) + d.set_title(_('Certificate')) diff -r cc827e2e724e -r 62a3be1a92c7 src/gui_interface.py --- a/src/gui_interface.py Tue Aug 27 20:22:20 2013 +0400 +++ b/src/gui_interface.py Tue Aug 27 23:21:16 2013 +0400 @@ -1351,6 +1351,8 @@ dialogs.SSLErrorDialog(obj.conn.name, obj.certificate, pritext, sectext, checktext1, checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel) + self.instances[account]['online_dialog']['ssl_error'].set_title( + _('SSL Certificate Verification')) def handle_event_fingerprint_error(self, obj): # ('FINGERPRINT_ERROR', account, (new_fingerprint,))

1 0

gajim: Add account name to SSL Certificate Verification dialog t...
by Gajim 28 Aug '13

28 Aug '13

changeset 11d95fd2eacc in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=11d95fd2eacc description: Add account name to SSL Certificate Verification dialog title diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 62a3be1a92c7 -r 11d95fd2eacc src/gui_interface.py --- a/src/gui_interface.py Tue Aug 27 23:21:16 2013 +0400 +++ b/src/gui_interface.py Tue Aug 27 23:35:11 2013 +0400 @@ -1352,7 +1352,7 @@ sectext, checktext1, checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel) self.instances[account]['online_dialog']['ssl_error'].set_title( - _('SSL Certificate Verification')) + _('SSL Certificate Verification for %s') % account) def handle_event_fingerprint_error(self, obj): # ('FINGERPRINT_ERROR', account, (new_fingerprint,))

1 0

gajim: Fix merged accounts.See [574655470339]
by Gajim 28 Aug '13

28 Aug '13

changeset 8ceff19492aa in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=8ceff19492aa description: Fix merged accounts.See [574655470339] diffstat: src/roster_window.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diffs (17 lines): diff -r 11d95fd2eacc -r 8ceff19492aa src/roster_window.py --- a/src/roster_window.py Tue Aug 27 23:35:11 2013 +0400 +++ b/src/roster_window.py Wed Aug 28 10:06:57 2013 +0400 @@ -1456,12 +1456,10 @@ for acct in gajim.contacts.get_accounts(): self._iters[acct] = {'account': None, 'groups': {}, 'contacts': {}} - self._before_fill() for acct in gajim.contacts.get_accounts(): self.add_account(acct) - self.add_account_contacts(acct, improve_speed=False, + self.add_account_contacts(acct, improve_speed=True, draw_contacts=False) - self._after_fill() # Recalculate column width for ellipsizing self.tree.columns_autosize()

1 0

gajim: [Darlan] improve string
by Gajim 28 Aug '13

28 Aug '13

changeset 20066547330e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=20066547330e description: [Darlan] improve string diffstat: src/gajim_themes_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 6f7bf6317455 -r 20066547330e src/gajim_themes_window.py --- a/src/gajim_themes_window.py Fri Aug 23 18:46:35 2013 +0400 +++ b/src/gajim_themes_window.py Sun Aug 25 14:07:49 2013 +0200 @@ -183,8 +183,8 @@ return if self.current_theme == gajim.config.get('roster_theme'): dialogs.ErrorDialog( - _('You cannot delete your current theme'), - _('Please first choose another for your current theme.')) + _('You cannot delete your current theme'), + _('Please first choose another theme as your current theme.')) return self.theme_options_vbox.set_sensitive(False) self.theme_options_table.set_sensitive(False)

1 0

gajim: add markedmsgcolor option to GUI. Fixes #7436
by Gajim 28 Aug '13

28 Aug '13

changeset f012fc8afd48 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f012fc8afd48 description: add markedmsgcolor option to GUI. Fixes #7436 diffstat: data/gui/preferences_window.ui | 57 +++++++++++++++++++++++++++++++++++++++-- src/config.py | 9 +++++- src/gui_interface.py | 1 + 3 files changed, 62 insertions(+), 5 deletions(-) diffs (125 lines): diff -r 20066547330e -r f012fc8afd48 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Sun Aug 25 14:07:49 2013 +0200 +++ b/data/gui/preferences_window.ui Sun Aug 25 15:23:22 2013 +0200 @@ -1650,7 +1650,7 @@ <child> <object class="GtkTable" id="table25"> <property name="visible">True</property> - <property name="n_rows">4</property> + <property name="n_rows">5</property> <property name="n_columns">4</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> @@ -1778,8 +1778,8 @@ </object> <packing> <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -2011,6 +2011,57 @@ <property name="y_options"/> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkColorButton" id="muc_highlight_colorbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="xalign">0</property> + <property name="color">#000000000000</property> + <signal name="color_set" handler="on_muc_highlight_colorbutton_color_set"/> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkLabel" id="label30"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Group chat highlight:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> </object> </child> </object> diff -r 20066547330e -r f012fc8afd48 src/config.py --- a/src/config.py Sun Aug 25 14:07:49 2013 +0200 +++ b/src/config.py Sun Aug 25 15:23:22 2013 +0200 @@ -923,6 +923,9 @@ def on_status_msg_colorbutton_color_set(self, widget): self.on_preference_widget_color_set(widget, 'statusmsgcolor') + def on_muc_highlight_colorbutton_color_set(self, widget): + self.on_preference_widget_color_set(widget, 'markedmsgcolor') + def on_conversation_fontbutton_font_set(self, widget): self.on_preference_widget_font_set(widget, 'conversation_font') @@ -943,7 +946,8 @@ 'outmsgtxtcolor': ['outgoing_msg_colorbutton', 'outgoing_msg_checkbutton'], 'statusmsgcolor': 'status_msg_colorbutton', - 'urlmsgcolor': 'url_msg_colorbutton'} + 'urlmsgcolor': 'url_msg_colorbutton', + 'markedmsgcolor': 'muc_highlight_colorbutton'} for c in col_to_widget: col = gajim.config.get(c) if col: @@ -971,7 +975,8 @@ 'inmsgtxtcolor': 'incoming_msg_colorbutton', 'outmsgtxtcolor': 'outgoing_msg_colorbutton', 'statusmsgcolor': 'status_msg_colorbutton', - 'urlmsgcolor': 'url_msg_colorbutton'} + 'urlmsgcolor': 'url_msg_colorbutton', + 'markedmsgcolor': 'muc_highlight_colorbutton'} for c in col_to_widget: gajim.config.set(c, gajim.interface.default_colors[c]) self.draw_color_widgets() diff -r 20066547330e -r f012fc8afd48 src/gui_interface.py --- a/src/gui_interface.py Sun Aug 25 14:07:49 2013 +0200 +++ b/src/gui_interface.py Sun Aug 25 15:23:22 2013 +0200 @@ -2723,6 +2723,7 @@ 'outmsgtxtcolor': gajim.config.get('outmsgtxtcolor'), 'statusmsgcolor': gajim.config.get('statusmsgcolor'), 'urlmsgcolor': gajim.config.get('urlmsgcolor'), + 'markedmsgcolor': gajim.config.get('markedmsgcolor'), } self.handlers = {}

1 0

gajim: handle config-path instead of config_path
by Gajim 28 Aug '13

28 Aug '13

changeset f1029ec8ffe1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f1029ec8ffe1 description: handle config-path instead of config_path diffstat: src/gajim.py | 2 +- src/history_manager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r f012fc8afd48 -r f1029ec8ffe1 src/gajim.py --- a/src/gajim.py Sun Aug 25 15:23:22 2013 +0200 +++ b/src/gajim.py Sun Aug 25 16:14:38 2013 +0200 @@ -122,7 +122,7 @@ try: shortargs = 'hqvl:p:c:' # add gtk/gnome session option as gtk_get_option_group is not wrapped - longargs = 'help quiet verbose loglevel= profile= config_path=' + longargs = 'help quiet verbose loglevel= profile= config-path=' longargs += ' class= name= screen= gtk-module= sync g-fatal-warnings' longargs += ' sm-client-id= sm-client-state-file= sm-disable' opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] diff -r f012fc8afd48 -r f1029ec8ffe1 src/history_manager.py --- a/src/history_manager.py Sun Aug 25 15:23:22 2013 +0200 +++ b/src/history_manager.py Sun Aug 25 16:14:38 2013 +0200 @@ -62,7 +62,7 @@ try: shortargs = 'hc:' - longargs = 'help config_path=' + longargs = 'help config-path=' opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] except getopt.error, msg: print str(msg)

1 0

← Newer
1
2
3
4
5
6
7
8
...
33
Older →

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 August 2013