Commits

commits@gajim.org

17632 discussions

gajim: add markedmsgcolor option to GUI. Fixes #7436
by Yann Leboulanger 25 Aug '13

25 Aug '13

changeset 3aaa9cd58e85 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3aaa9cd58e85 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 b62a55b8ab83 -r 3aaa9cd58e85 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 b62a55b8ab83 -r 3aaa9cd58e85 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 b62a55b8ab83 -r 3aaa9cd58e85 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: [Darlan] improve string
by Yann Leboulanger 25 Aug '13

25 Aug '13

changeset b62a55b8ab83 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b62a55b8ab83 description: [Darlan] improve string diffstat: src/gajim_themes_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 78959f10f68d -r b62a55b8ab83 src/gajim_themes_window.py --- a/src/gajim_themes_window.py Sat Aug 24 17:58:22 2013 +0200 +++ 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: Change history icon if theme have 'document-open-recent' ...
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 722fd632fd42 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=722fd632fd42 description: Change history icon if theme have 'document-open-recent' icon. Fixes #6893 diffstat: src/roster_window.py | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diffs (47 lines): diff -r b5cca6321af8 -r 722fd632fd42 src/roster_window.py --- a/src/roster_window.py Tue Aug 20 14:08:54 2013 +0400 +++ b/src/roster_window.py Fri Aug 23 11:26:48 2013 +0400 @@ -5241,6 +5241,12 @@ """ if not force and not self.actions_menu_needs_rebuild: return + history_menuitem = self.xml.get_object('history_menuitem') + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + history_icon = Gtk.Image() + history_icon.set_from_icon_name('document-open-recent', + Gtk.IconSize.MENU) + history_menuitem.set_image(history_icon) new_chat_menuitem = self.xml.get_object('new_chat_menuitem') single_message_menuitem = self.xml.get_object( 'send_single_message_menuitem') @@ -6173,8 +6179,13 @@ menu.append(item) history_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_('_History')) - history_icon = Gtk.Image.new_from_stock(Gtk.STOCK_JUSTIFY_FILL, \ - Gtk.IconSize.MENU) + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + history_icon = Gtk.Image() + history_icon.set_from_icon_name('document-open-recent', + Gtk.IconSize.MENU) + else: + history_icon = Gtk.Image.new_from_stock(Gtk.STOCK_JUSTIFY_FILL, \ + Gtk.IconSize.MENU) if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): history_icon = Gtk.Image() history_icon.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) @@ -6254,8 +6265,12 @@ # History manager item = Gtk.ImageMenuItem.new_with_mnemonic(_('History Manager')) - icon = Gtk.Image.new_from_stock(Gtk.STOCK_JUSTIFY_FILL, - Gtk.IconSize.MENU) + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + icon = Gtk.Image() + icon.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) + else: + icon = Gtk.Image.new_from_stock(Gtk.STOCK_JUSTIFY_FILL, + Gtk.IconSize.MENU) item.set_image(icon) menu.append(item) item.connect('activate', self.on_history_manager_menuitem_activate)

1 0

gajim: Coding standards
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 74ca6c6979e2 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=74ca6c6979e2 description: Coding standards diffstat: src/groupchat_control.py | 10 ++++------ src/gui_menu_builder.py | 4 +--- src/roster_window.py | 6 ++---- 3 files changed, 7 insertions(+), 13 deletions(-) diffs (51 lines): diff -r 722fd632fd42 -r 74ca6c6979e2 src/groupchat_control.py --- a/src/groupchat_control.py Fri Aug 23 11:26:48 2013 +0400 +++ b/src/groupchat_control.py Fri Aug 23 12:23:10 2013 +0400 @@ -833,13 +833,11 @@ request_voice_separator = xml.get_object('request_voice_separator') if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'): - img = Gtk.Image() - img.set_from_icon_name('bookmark-new', Gtk.IconSize.MENU) - bookmark_room_menuitem.set_image(img) + gtkgui_helpers.add_image_to_menuitem(bookmark_room_menuitem, + 'bookmark-new') if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - img = Gtk.Image() - img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) - history_menuitem.set_image(img) + gtkgui_helpers.add_image_to_menuitem(history_menuitem, + 'document-open-recent' if hide_buttonbar_items: change_nick_menuitem.hide() diff -r 722fd632fd42 -r 74ca6c6979e2 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Fri Aug 23 11:26:48 2013 +0400 +++ b/src/gui_menu_builder.py Fri Aug 23 12:23:10 2013 +0400 @@ -254,9 +254,7 @@ account) history_menuitem.connect('activate', roster.on_history, contact, account) if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - img = Gtk.Image() - img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) - history_menuitem.set_image(img) + gtkgui_helpers.add_image_to_menuitem(history_menuitem, 'bookmark-new') if control: convert_to_gc_menuitem.connect('activate', diff -r 722fd632fd42 -r 74ca6c6979e2 src/roster_window.py --- a/src/roster_window.py Fri Aug 23 11:26:48 2013 +0400 +++ b/src/roster_window.py Fri Aug 23 12:23:10 2013 +0400 @@ -5243,10 +5243,8 @@ return history_menuitem = self.xml.get_object('history_menuitem') if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - history_icon = Gtk.Image() - history_icon.set_from_icon_name('document-open-recent', - Gtk.IconSize.MENU) - history_menuitem.set_image(history_icon) + gtkgui_helpers.add_image_to_menuitem(history_menuitem, + 'document-open-recent') new_chat_menuitem = self.xml.get_object('new_chat_menuitem') single_message_menuitem = self.xml.get_object( 'send_single_message_menuitem')

1 0

gajim: Change history icon if theme have 'document-open-recent' ...
by Denis Fomin 24 Aug '13

24 Aug '13

changeset a3d71616e615 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=a3d71616e615 description: Change history icon if theme have 'document-open-recent' icon. diffstat: src/gui_menu_builder.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 74ca6c6979e2 -r a3d71616e615 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Fri Aug 23 12:23:10 2013 +0400 +++ b/src/gui_menu_builder.py Sat Aug 24 15:17:45 2013 +0400 @@ -254,7 +254,8 @@ account) history_menuitem.connect('activate', roster.on_history, contact, account) if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - gtkgui_helpers.add_image_to_menuitem(history_menuitem, 'bookmark-new') + gtkgui_helpers.add_image_to_menuitem(history_menuitem, + 'document-open-recent') if control: convert_to_gc_menuitem.connect('activate',

1 0

gajim: [Darlan] updated man pages. Fixes #7425
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset e84a5b5a5dcd in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e84a5b5a5dcd description: [Darlan] updated man pages. Fixes #7425 diffstat: data/gajim-history-manager.1 | 105 ++++++++++++++++++++++----- data/gajim-remote.1 | 152 +++++++++++++++++++++++++++++++++++++--- data/gajim.1 | 159 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 356 insertions(+), 60 deletions(-) diffs (truncated from 428 to 300 lines): diff -r a3d71616e615 -r e84a5b5a5dcd data/gajim-history-manager.1 --- a/data/gajim-history-manager.1 Sat Aug 24 15:17:45 2013 +0400 +++ b/data/gajim-history-manager.1 Sat Aug 24 17:58:22 2013 +0200 @@ -1,21 +1,84 @@ -.\" 20050901 -.TH "Gajim-history-manager" "1" "September 01, 2005" "Gajim dev team" "" -.SH "NAME" -Gajim-history-manager \- Tool to manage gajim logs -.SH "SYNOPSIS" -.B gajim-history-manager [\-c config-path] [\-h] -.SH "DESCRIPTION" -.B Gajim-history-manager -is a tool to manage (do some cleanup) log file of Gajim jabber client. -.PP -.SH "OPTIONS" -.TP -\fB\-c\fR, \fB\-\-config-path\fR path -Path where logs.db is located. ~/.gajim by default. -.TP -\fB\-h\fR, \fB\-\-help\fR -Print this help. -.SH "FEEDBACK" -You can report bugs or feature requests in http://trac.gajim.org or in the mailing list: http://lists.gajim.org/cgi\-bin/listinfo/gajim\-devel. You can also find us in our room gajim(a)conference.gajim.org -.SH "AUTHORS" -Written by Yann Le Boulanger <asterix(a)lagaule.org>, Nikos Kouremenos <kourem(a)gmail.com> and Dimitur Kirov <dkirov(a)gmail.com>. +.Dd August 11, 2013 +.Dt GAJIM-HISTORY-MANAGER 1 URM +.Os UNIX +.Sh NAME +.Nm gajim-history-manager +.Nd a tool to manage +.Xr gajim 1 +logs +.Sh SYNOPSIS +.Nm +.Fl h +.Nm +.Op Fl c Ar directory +.Sh DESCRIPTION +.Nm +is a tool to manage +.Po do some cleanup Pc log file of +.Xr gajim 1 . +Use this program to delete or export logs. +For more information on database logs see <https://trac.gajim.org/wiki/LogsDatabase>. +.Sh OPTIONS +.Bl -tag -width Ds +.It Fl h Fl Fl help +Show help options +.It Fl c Fl Fl config-path Em directory +Where to look for logs file +.Sh FILES +.Bl -tag -width Ds +.It ~/.local/share/gajim/logs.db +The history database log file used when +.Op Fl c +is not specified. +.Sh AUTHORS +.An -nosplit +.Nm +is written and maintained by +.An Yann Leboulanger , +and +.An Denis Fomin , +with contributions and patches merged from many individuals around the world. +See files +.Pa AUTHORS +and +.Pa THANKS , +for a complete list. +.Sh COPYRIGHT +Copyright (C) 2003-2013 Gajim Team +.Pp +.Nm +is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. +.Pp +.Nm +is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +.Pp +You should have received a copy of the GNU General Public License along with +.Nm . +If not, see <http://www.gnu.org/licenses/>. +.Sh FEEDBACK +You can report bugs or feature requests in our bug tracker at +.Em trac.gajim.org +or in the +.Em gajim-devel +mailing list; if you want to send us a patch, please do so in our bug tracker. +You can also find us in our chat room. +.Sh WWW +http://www.gajim.org/ +.Sh XMPP +You are welcome to join us at gajim(a)conference.gajim.org +.Sh MAILING LIST +Below are public mailing lists on lists.gajim.org +.Bd -literal -offset indent +http://lists.gajim.org/cgi-bin/listinfo/gajim-devel +http://lists.gajim.org/cgi-bin/listinfo/translators +.Ed +.Pp +More mailing lists at +.Bd -literal -offset indent +http://lists.gajim.org/cgi-bin/listinfo +.Ed +.Sh BUGS +Please submit bugs at https://trac.gajim.org/ +.Sh SEE ALSO +.Xr gajim 1 +.Xr gajim-remote 1 diff -r a3d71616e615 -r e84a5b5a5dcd data/gajim-remote.1 --- a/data/gajim-remote.1 Sat Aug 24 15:17:45 2013 +0400 +++ b/data/gajim-remote.1 Sat Aug 24 17:58:22 2013 +0200 @@ -1,14 +1,138 @@ -.\" 20050818 -.TH "Gajim-remote" "1" "August 18, 2005" "Gajim dev team" "" -.SH "NAME" -Gajim-remote \- tool to communicate with a running instance of Gajim -.SH "SYNOPSIS" -.B gajim-remote [help] [toggle_roster_appearance] [show_next_unread] [list_contacts] [list_accounts] [change_status] [open_chat] [send_message] [send_file] [contact_info] [account_info] [send_file] [prefs_list] [prefs_put] [prefs_del] [prefs_store] [remove_contact] [add_contact] [get_status] [get_status_message] [get_unread_msgs_number] [start_chat] -.SH "DESCRIPTION" -.B Gajim-remote -is a script to control Gajim by D-Bus -.PP -.SH "FEEDBACK" -You can report bugs or feature requests in http://trac.gajim.org or in the mailing list: https://lists.gajim.org/cgi\-bin/listinfo/gajim\-devel. You can also find us in our room gajim(a)conference.jabber.no -.SH "AUTHORS" -Written by Yann Le Boulanger <asterix(a)lagaule.org>, Nikos Kouremenos <kourem(a)gmail.com> and Dimitur Kirov <dkirov(a)gmail.com>. +.Dd August 11, 2013 +.Dt GAJIM-REMOTE 1 URM +.Os UNIX +.Sh NAME +.Nm gajim-remote +.Nd a remote control utility for +.Xr gajim 1 +.Sh SYNOPSIS +.Nm +.Ar command +.Sh DESCRIPTION +.Nm +is a script to control and communicate with a running instance of +.Xr gajim 1 +by D-Bus. +.Sh OPTIONS +.Bl -tag -width Ds +.It Available commands +.Ss account_info Aq account +Gets detailed info on a account +.Ss add_contact Ao jid Ac Bq account +Adds contact to roster +.Ss change_avatar Ao picture Ac Bq account +Change the avatar +.Ss change_status Bo status Bc Bo message Bc Bq account +Changes the status of account or accounts +.Ss check_gajim_running +Check if Gajim is running +.Ss contact_info Aq jid +Gets detailed info on a contact +.Ss get_status Bq account +Returns current status (the global one unless account is specified) +.Ss get_status_message Bq account +Returns current status message (the global one unless account is specified) +.Ss get_unread_msgs_number +Returns number of unread messages +.Ss handle_uri Ao uri Ac Bo account Bc Bq message +Handle a xmpp:/ uri +.Ss help Bq command +Shows a help on specific command +.Ss join_room Ao room Ac Bo nick Bc Bo password Bc Bq account +Join a MUC room +.Ss list_accounts +Prints a list of registered accounts +.Ss list_contacts Bq account +Prints a list of all contacts in the roster. Each contact appears on a separate line +.Ss open_chat Ao jid Ac Bo account Bc Bq message +Shows the chat dialog so that you can send messages to a contact +.Ss prefs_del Aq key +Deletes a preference item +.Ss prefs_list +Lists all preferences and their values +.Ss prefs_put Aq key=value +Sets value of 'key' to 'value'. +.Ss prefs_store +Writes the current state of Gajim preferences to the .config file +.Ss remove_contact Ao jid Ac Bq account +Removes contact from roster +.Ss send_chat_message Ao jid Ac Ao message Ac Bo pgp key Bc Bq account +Sends new chat message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''. +.Ss send_file Ao file Ac Ao jid Ac Bq account +Sends file to a contact +.Ss send_groupchat_message Ao room_jid Ac Ao message Ac Bq account +Sends new message to a groupchat you've joined. +.Ss send_single_message Ao jid subject Ac Ao message Ac Bo pgp key Bc Bq account +Sends new single message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''. +.Ss send_xml Ao xml Ac Bq account +Sends custom XML +.Ss set_priority Ao priority Ac Bq account +Changes the priority of account or accounts +.Ss show_next_pending_event +Pops up a window with the next pending event +.Ss start_chat Aq account +Opens 'Start Chat' dialog +.Ss toggle_ipython +Shows or hides the ipython window +.Ss toggle_roster_appearance +Shows or hides the roster window +.Sh EXAMPLES +Open a URI of group chat gajim +.Pp +.Dl $ gajim-remote handle_uri xmpp:gajim@conferenc.gajim.org?join +.Pp +Send custom XML +.Pp +.Dl $ gajim-remote send_xml $(cat Pa filename.xml ) Qq your(a)jabber.id +.Sh AUTHORS +.An -nosplit +.Nm +is written and maintained by +.An Yann Leboulanger , +and +.An Denis Fomin , +with contributions and patches merged from many individuals around the world. +See files +.Pa AUTHORS +and +.Pa THANKS , +for a complete list. +.Sh COPYRIGHT +Copyright (C) 2003-2013 Gajim Team +.Pp +.Nm +is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. +.Pp +.Nm +is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +.Pp +You should have received a copy of the GNU General Public License along with +.Nm . +If not, see <http://www.gnu.org/licenses/>. +.Sh FEEDBACK +You can report bugs or feature requests in our bug tracker at +.Em trac.gajim.org +or in the +.Em gajim-devel +mailing list; if you want to send us a patch, please do so in our bug tracker. +You can also find us in our chat room. +.Sh WWW +http://www.gajim.org/ +.Sh XMPP +You are welcome to join us at gajim(a)conference.gajim.org +.Sh MAILING LIST +Below are public mailing lists on lists.gajim.org +.Bd -literal -offset indent +http://lists.gajim.org/cgi-bin/listinfo/gajim-devel +http://lists.gajim.org/cgi-bin/listinfo/translators +.Ed +.Pp +More mailing lists at +.Bd -literal -offset indent +http://lists.gajim.org/cgi-bin/listinfo +.Ed +.Sh BUGS +Please submit bugs at https://trac.gajim.org/ +.Sh SEE ALSO +.Xr gajim 1 +.Xr gajim-history-manager 1 diff -r a3d71616e615 -r e84a5b5a5dcd data/gajim.1 --- a/data/gajim.1 Sat Aug 24 15:17:45 2013 +0400 +++ b/data/gajim.1 Sat Aug 24 17:58:22 2013 +0200 @@ -1,25 +1,134 @@ -.\" 20050901 -.TH "Gajim" "1" "September 01, 2005" "Gajim dev team" "" -.SH "NAME" -Gajim \- a jabber client -.SH "SYNOPSIS" -.B gajim [\-v] [\-p] [\-h] -.SH "DESCRIPTION" -.B Gajim -is a jabber client written in PyGTK and released under the GNU GPL. For more information on jabber, see -http://www.jabber.org and on Gajim see http://www.gajim.org -.PP -.SH "OPTIONS" -.TP -\fB\-p\fR, \fB\-\-profile\fR name -Run Gajim using ~/.gajim/config.name -.TP -\fB\-v\fR, \fB\-\-verbose\fR -Print xml stanzas and other debug information. -.TP -\fB\-h\fR, \fB\-\-help\fR -Print this help. -.SH "FEEDBACK" -You can report bugs or feature requests in http://trac.gajim.org or in the mailing list: https://lists.gajim.org/cgi\-bin/listinfo/gajim\-devel. You can also find us in our room gajim(a)conference.gajim.org -.SH "AUTHORS" -Written by Yann Le Boulanger <asterix(a)lagaule.org>, Nikos Kouremenos <kourem(a)gmail.com> and Dimitur Kirov <dkirov(a)gmail.com>. +.Dd August 11, 2013 +.Dt GAJIM 1 URM +.Os UNIX +.Sh NAME +.Nm gajim +.Nd a Jabber/XMPP client

1 0

gajim: add ability to handle urls in htmltextview.
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 88f3c2f92e51 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=88f3c2f92e51 description: add ability to handle urls in htmltextview. diffstat: src/conversation_textview.py | 37 +------ src/htmltextview.py | 190 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 179 insertions(+), 48 deletions(-) diffs (truncated from 303 to 300 lines): diff -r d725d13a1069 -r 88f3c2f92e51 src/conversation_textview.py --- a/src/conversation_textview.py Fri Aug 16 09:55:55 2013 +0200 +++ b/src/conversation_textview.py Fri Aug 16 14:06:52 2013 +0200 @@ -303,32 +303,8 @@ color = gajim.config.get('restored_messages_color') tag.set_property('foreground', color) - self.tagURL = buffer_.create_tag('url') - color = gajim.config.get('urlmsgcolor') - self.tagURL.set_property('foreground', color) - self.tagURL.set_property('underline', Pango.Underline.SINGLE) - id_ = self.tagURL.connect('event', self.hyperlink_handler, 'url') - self.handlers[id_] = self.tagURL - - self.tagMail = buffer_.create_tag('mail') - self.tagMail.set_property('foreground', color) - self.tagMail.set_property('underline', Pango.Underline.SINGLE) - id_ = self.tagMail.connect('event', self.hyperlink_handler, 'mail') - self.handlers[id_] = self.tagMail - - self.tagXMPP = buffer_.create_tag('xmpp') - self.tagXMPP.set_property('foreground', color) - self.tagXMPP.set_property('underline', Pango.Underline.SINGLE) - id_ = self.tagXMPP.connect('event', self.hyperlink_handler, 'xmpp') - self.handlers[id_] = self.tagXMPP - - self.tagSthAtSth = buffer_.create_tag('sth_at_sth') - self.tagSthAtSth.set_property('foreground', color) - self.tagSthAtSth.set_property('underline', Pango.Underline.SINGLE) - id_ = self.tagSthAtSth.connect('event', self.hyperlink_handler, - 'sth_at_sth') - self.handlers[id_] = self.tagSthAtSth - + self.tv.create_tags() + tag = buffer_.create_tag('bold') tag.set_property('weight', Pango.Weight.BOLD) @@ -374,8 +350,11 @@ self.tagOut.set_property('foreground', gajim.config.get('outmsgcolor')) self.tagStatus.set_property('foreground', gajim.config.get('statusmsgcolor')) - self.tagURL.set_property('foreground', gajim.config.get('urlmsgcolor')) - self.tagMail.set_property('foreground', gajim.config.get('urlmsgcolor')) + color = gajim.config.get('urlmsgcolor') + self.tv.tagURL.set_property('foreground', color) + self.tv.tagMail.set_property('foreground', color) + self.tv.tagXMPP.set_property('foreground', color) + self.tv.tagSthAtSth.set_property('foreground', color) def at_the_end(self): buffer_ = self.tv.get_buffer() @@ -1479,7 +1458,7 @@ try: if name and (text.startswith('/me ') or text.startswith('/me\n')): xhtml = xhtml.replace('/me', '* %s' % (name,), 1) - self.tv.display_html(xhtml, self) + self.tv.display_html(xhtml, self.tv, self) return except Exception as e: gajim.log.debug('Error processing xhtml: ' + str(e)) diff -r d725d13a1069 -r 88f3c2f92e51 src/htmltextview.py --- a/src/htmltextview.py Fri Aug 16 09:55:55 2013 +0200 +++ b/src/htmltextview.py Fri Aug 16 14:06:52 2013 +0200 @@ -213,10 +213,10 @@ It keeps a stack of "style spans" (start/end element pairs) and a stack of list counters, for nested lists. """ - def __init__(self, conv_textview, startiter): + def __init__(self, textview, conv_textview, startiter): xml.sax.handler.ContentHandler.__init__(self) - self.textbuf = conv_textview.tv.get_buffer() - self.textview = conv_textview.tv + self.textbuf = textview.get_buffer() + self.textview = textview self.iter = startiter self.conv_textview = conv_textview self.text = '' @@ -546,15 +546,16 @@ (mem, alt, replace_mark) = loaded update = True else: - img_mark = self.textbuf.create_mark(None, self.iter, True) - gajim.thread_interface(helpers.download_image, [ - self.conv_textview.account, attrs], self._update_img, - [attrs, img_mark]) - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Loading') - pixbuf = get_icon_pixmap('gajim-receipt_missing') + if self.conv_textview: + img_mark = self.textbuf.create_mark(None, self.iter, True) + gajim.thread_interface(helpers.download_image, [ + self.conv_textview.account, attrs], self._update_img, + [attrs, img_mark]) + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Loading') + pixbuf = get_icon_pixmap('gajim-receipt_missing') if mem: # Caveat: GdkPixbuf is known not to be safe to load # images from network... this program is now potentially @@ -687,8 +688,11 @@ return False def handle_specials(self, text): - self.iter = self.conv_textview.detect_and_print_special_text(text, - self._get_style_tags()) + if self.conv_textview: + self.iter = self.conv_textview.detect_and_print_special_text(text, + self._get_style_tags()) + else: + self._insert_text(text) def characters(self, content): if self.preserve: @@ -792,9 +796,11 @@ #FIXME: plenty of unused attributes (width, height,...) :) self._jump_line() try: - self.textbuf.insert_pixbuf(self.iter, - self.textview.focus_out_line_pixbuf) - #self._insert_text('\u2550'*40) + if self.conv_textbuf: + self.textbuf.insert_pixbuf(self.iter, + self.textview.focus_out_line_pixbuf) + else: + self._insert_text('\u2550'*40) self._jump_line() except Exception as e: log.debug('Error in hr' + str(e)) @@ -854,6 +860,30 @@ self.interface = gajim.interface # end big hack + def create_tags(self): + buffer_ = self.get_buffer() + + self.tagURL = buffer_.create_tag('url') + color = gajim.config.get('urlmsgcolor') + self.tagURL.set_property('foreground', color) + self.tagURL.set_property('underline', Pango.Underline.SINGLE) + self.tagURL.connect('event', self.hyperlink_handler, 'url') + + self.tagMail = buffer_.create_tag('mail') + self.tagMail.set_property('foreground', color) + self.tagMail.set_property('underline', Pango.Underline.SINGLE) + self.tagMail.connect('event', self.hyperlink_handler, 'mail') + + self.tagXMPP = buffer_.create_tag('xmpp') + self.tagXMPP.set_property('foreground', color) + self.tagXMPP.set_property('underline', Pango.Underline.SINGLE) + self.tagXMPP.connect('event', self.hyperlink_handler, 'xmpp') + + self.tagSthAtSth = buffer_.create_tag('sth_at_sth') + self.tagSthAtSth.set_property('foreground', color) + self.tagSthAtSth.set_property('underline', Pango.Underline.SINGLE) + self.tagSthAtSth.connect('event', self.hyperlink_handler, 'sth_at_sth') + def __destroy_event(self, widget): if self.tooltip.timeout != 0: self.tooltip.hide_tooltip() @@ -907,14 +937,136 @@ self._changed_cursor = False return False - def display_html(self, html, conv_textview): + def on_open_link_activate(self, widget, kind, text): + helpers.launch_browser_mailer(kind, text) + + def on_copy_link_activate(self, widget, text): + clip = gtk.clipboard_get() + clip.set_text(text) + +# def on_start_chat_activate(self, widget, jid): +# gajim.interface.new_chat_from_jid(self.account, jid) + + def on_join_group_chat_menuitem_activate(self, widget, room_jid): + try: + dialogs.JoinGroupchatWindow(room_jid=room_jid) + except GajimGeneralException: + pass + + def on_add_to_roster_activate(self, widget, jid): + dialogs.AddNewContactWindow(self.account, jid) + + def make_link_menu(self, event, kind, text): + xml = gtkgui_helpers.get_gtk_builder('chat_context_menu.ui') + menu = xml.get_object('chat_context_menu') + childs = menu.get_children() + if kind == 'url': + childs[0].connect('activate', self.on_copy_link_activate, text) + childs[1].connect('activate', self.on_open_link_activate, kind, + text) + childs[2].hide() # copy mail address + childs[3].hide() # open mail composer + childs[4].hide() # jid section separator + childs[5].hide() # start chat + childs[6].hide() # join group chat + childs[7].hide() # add to roster + else: # It's a mail or a JID + # load muc icon + join_group_chat_menuitem = xml.get_object('join_group_chat_menuitem') + muc_icon = gtkgui_helpers.load_icon('muc_active') + if muc_icon: + join_group_chat_menuitem.set_image(muc_icon) + + text = text.lower() + if text.startswith('xmpp:'): + text = text[5:] + childs[2].connect('activate', self.on_copy_link_activate, text) + childs[3].connect('activate', self.on_open_link_activate, kind, + text) +# childs[5].connect('activate', self.on_start_chat_activate, text) + childs[6].connect('activate', + self.on_join_group_chat_menuitem_activate, text) + +# if self.account and gajim.connections[self.account].\ +# roster_supported: +# childs[7].connect('activate', +# self.on_add_to_roster_activate, text) +# childs[7].show() # show add to roster menuitem +# else: +# childs[7].hide() # hide add to roster menuitem + + if kind == 'xmpp': + childs[0].connect('activate', self.on_copy_link_activate, + 'xmpp:' + text) + childs[2].hide() # copy mail address + childs[3].hide() # open mail composer + elif kind == 'mail': + childs[6].hide() # join group chat + + if kind != 'xmpp': + childs[0].hide() # copy link location + childs[1].hide() # open link in browser + childs[4].hide() # jid section separator + childs[5].hide() # start chat + childs[7].hide() # add to roster + + menu.popup(None, None, None, event.button, event.time) + + def hyperlink_handler(self, texttag, widget, event, iter_, kind): + if event.type == gtk.gdk.BUTTON_PRESS: + begin_iter = iter_.copy() + # we get the begining of the tag + while not begin_iter.begins_tag(texttag): + begin_iter.backward_char() + end_iter = iter_.copy() + # we get the end of the tag + while not end_iter.ends_tag(texttag): + end_iter.forward_char() + + # Detect XHTML-IM link + word = getattr(texttag, 'href', None) + if word: + if word.startswith('xmpp'): + kind = 'xmpp' + elif word.startswith('mailto:'): + kind = 'mail' + elif gajim.interface.sth_at_sth_dot_sth_re.match(word): + # it's a JID or mail + kind = 'sth_at_sth' + else: + word = self.textview.get_buffer().get_text(begin_iter, + end_iter).decode('utf-8') + + if event.button == 3: # right click + self.make_link_menu(event, kind, word) + return True + else: + # we launch the correct application + if kind == 'xmpp': + word = word[5:] + if '?' in word: + (jid, action) = word.split('?') + if action == 'join': + self.on_join_group_chat_menuitem_activate(None, jid) + else: + self.on_start_chat_activate(None, jid) + else: + self.on_start_chat_activate(None, word) + else: + helpers.launch_browser_mailer(kind, word) + + def _hyperlink_handler(self, texttag, widget, event, iter_, kind): + # self.hyperlink_handler can be overwritten, so call it when needed + self.hyperlink_handler(texttag, widget, event, iter_, kind) + + def display_html(self, html, textview, conv_textview): buffer_ = self.get_buffer() eob = buffer_.get_end_iter() ## this works too if libxml2 is not available # parser = xml.sax.make_parser(['drv_libxml2']) # parser.setFeature(xml.sax.handler.feature_validation, True) parser = xml.sax.make_parser() - parser.setContentHandler(HtmlHandler(conv_textview, eob)) + parser.setContentHandler(HtmlHandler(textview, conv_textview, eob))

1 0

gajim: fix some GTK3 things
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 38a53526df2a in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=38a53526df2a description: fix some GTK3 things diffstat: src/htmltextview.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (32 lines): diff -r 88f3c2f92e51 -r 38a53526df2a src/htmltextview.py --- a/src/htmltextview.py Fri Aug 16 14:06:52 2013 +0200 +++ b/src/htmltextview.py Sat Aug 24 19:14:58 2013 +0200 @@ -941,8 +941,8 @@ helpers.launch_browser_mailer(kind, text) def on_copy_link_activate(self, widget, text): - clip = gtk.clipboard_get() - clip.set_text(text) + clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clip.set_text(text, -1) # def on_start_chat_activate(self, widget, jid): # gajim.interface.new_chat_from_jid(self.account, jid) @@ -1013,7 +1013,7 @@ menu.popup(None, None, None, event.button, event.time) def hyperlink_handler(self, texttag, widget, event, iter_, kind): - if event.type == gtk.gdk.BUTTON_PRESS: + if event.type == Gdk.EventType.BUTTON_PRESS: begin_iter = iter_.copy() # we get the begining of the tag while not begin_iter.begins_tag(texttag): @@ -1035,7 +1035,7 @@ kind = 'sth_at_sth' else: word = self.textview.get_buffer().get_text(begin_iter, - end_iter).decode('utf-8') + end_iter) if event.button == 3: # right click self.make_link_menu(event, kind, word)

1 0

gajim: ability to show HTML in plugin descriptions
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 88b02a1c79b3 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=88b02a1c79b3 description: ability to show HTML in plugin descriptions diffstat: data/gui/plugins_window.ui | 15 ++------------- src/plugins/gui.py | 27 ++++++++++++++++++--------- 2 files changed, 20 insertions(+), 22 deletions(-) diffs (87 lines): diff -r 38a53526df2a -r 88b02a1c79b3 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Sat Aug 24 19:14:58 2013 +0200 +++ b/data/gui/plugins_window.ui Fri Aug 16 14:53:17 2013 +0200 @@ -296,23 +296,12 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> + <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="shadow_type">in</property> <child> - <object class="GtkTextView" id="plugin_description_textview"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="pixels_above_lines">6</property> - <property name="editable">False</property> - <property name="wrap_mode">word</property> - <property name="left_margin">6</property> - <property name="right_margin">6</property> - <property name="indent">1</property> - <property name="buffer">textbuffer1</property> - </object> + <placeholder/> </child> </object> <packing> diff -r 38a53526df2a -r 88b02a1c79b3 src/plugins/gui.py --- a/src/plugins/gui.py Sat Aug 24 19:14:58 2013 +0200 +++ b/src/plugins/gui.py Fri Aug 16 14:53:17 2013 +0200 @@ -34,6 +34,7 @@ import gtkgui_helpers from dialogs import WarningDialog, YesNoDialog, ArchiveChooserDialog +from htmltextview import HtmlTextView from common import gajim from plugins.helpers import log_calls, log from conversation_textview import ConversationTextview @@ -61,13 +62,15 @@ widgets_to_extract = ('plugins_notebook', 'plugin_name_label', 'plugin_version_label', 'plugin_authors_label', - 'plugin_homepage_linkbutton', 'plugin_description_textview', - 'uninstall_plugin_button', 'configure_plugin_button', - 'installed_plugins_treeview') + 'plugin_homepage_linkbutton', 'uninstall_plugin_button', + 'configure_plugin_button', 'installed_plugins_treeview') for widget_name in widgets_to_extract: setattr(self, widget_name, self.xml.get_object(widget_name)) + self.plugin_description_textview = HtmlTextView() + sw = self.xml.get_object('scrolledwindow2') + sw.add(self.plugin_description_textview) self.installed_plugins_model = Gtk.ListStore(object, str, bool, bool, GdkPixbuf.Pixbuf) self.installed_plugins_treeview.set_model(self.installed_plugins_model) @@ -146,15 +149,21 @@ label.set_ellipsize(Pango.EllipsizeMode.END) self.plugin_homepage_linkbutton.set_property('sensitive', True) + sw = self.xml.get_object('scrolledwindow2') + old_tv = sw.get_children()[0] + old_tv.destroy() + self.plugin_description_textview = HtmlTextView() + sw.add(self.plugin_description_textview) + sw.show_all() txt = plugin.description + txt.replace('</body>', '') if plugin.available_text: - txt += '\n\n' + _('Warning: %s') % plugin.available_text + txt += ' ' + _('Warning: %s') % plugin.available_text if not txt.startswith('<body '): - txt = '<body xmlns=\'http://www.w3.org/1999/xhtml\'>' + \ - txt + ' </body>' - txt = txt.replace('\n', ' ') - self.plugin_description_textview.tv.display_html( - txt, self.plugin_description_textview) + txt = '<body xmlns=\'http://www.w3.org/1999/xhtml\'>' + txt + txt += ' </body>' + self.plugin_description_textview.tv.display_html(txt, + self.plugin_description_textview, None) self.plugin_description_textview.tv.set_property('sensitive', True) self.uninstall_plugin_button.set_property('sensitive',

1 0

gajim: translate plugins descriptions
by Denis Fomin 24 Aug '13

24 Aug '13

changeset b2e34a50828c in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b2e34a50828c description: translate plugins descriptions diffstat: src/plugins/pluginmanager.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 88b02a1c79b3 -r b2e34a50828c src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Fri Aug 16 14:53:17 2013 +0200 +++ b/src/plugins/pluginmanager.py Fri Aug 16 23:29:48 2013 +0400 @@ -492,6 +492,9 @@ for option in fields: if conf.get('info', option) is '': raise configparser.NoOptionError('field empty') + if option == 'description': + setattr(module_attr, option, _(conf.get('info', option))) + continue setattr(module_attr, option, conf.get('info', option)) plugins_found.append(module_attr)

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