Commits

commits@gajim.org

17632 discussions

[commit-gajim] r6328 - trunk/src
by jim++＠gajim.org 14 May '06

14 May '06

Author: jim++ Date: 2006-05-14 18:28:09 +0200 (Sun, 14 May 2006) New Revision: 6328 Modified: trunk/src/roster_window.py Log: Sorted merged account line right click -> account_list Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-05-14 16:19:04 UTC (rev 6327) +++ trunk/src/roster_window.py 2006-05-14 16:28:09 UTC (rev 6328) @@ -1578,7 +1578,11 @@ if not iconset: iconset = DEFAULT_ICONSET path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16') + accounts = [] # Put accounts in a list to sort them for account in gajim.connections: + accounts.append(account) + accounts.sort() + for account in accounts: state_images = self.load_iconset(path) item = gtk.ImageMenuItem(account) show = gajim.SHOW_LIST[gajim.connections[account].connected]

1 0

[commit-gajim] r6327 - in trunk: data/glade src
by jim++＠gajim.org 14 May '06

14 May '06

Author: jim++ Date: 2006-05-14 18:19:04 +0200 (Sun, 14 May 2006) New Revision: 6327 Modified: trunk/data/glade/edit_groups_dialog.glade trunk/src/dialogs.py Log: Sort groups in edit group dialog, even when adding one. Note that it doesn't lower groupname before sort. Make edit group window longer but with no vscroolbar if necessary. Modified: trunk/data/glade/edit_groups_dialog.glade =================================================================== --- trunk/data/glade/edit_groups_dialog.glade 2006-05-14 15:12:17 UTC (rev 6326) +++ trunk/data/glade/edit_groups_dialog.glade 2006-05-14 16:19:04 UTC (rev 6327) @@ -159,7 +159,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> <property name="shadow_type">GTK_SHADOW_IN</property> <property name="window_placement">GTK_CORNER_TOP_LEFT</property> Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-05-14 15:12:17 UTC (rev 6326) +++ trunk/src/dialogs.py 2006-05-14 16:19:04 UTC (rev 6327) @@ -140,6 +140,7 @@ model.append((group, True)) self.add_group(group) self.update_contact() + self.init_list() # Re-draw list to sort new item def group_toggled_cb(self, cell, path): self.changes_made = True @@ -155,15 +156,21 @@ def init_list(self): store = gtk.ListStore(str, bool) self.list.set_model(store) + for column in self.list.get_columns(): # Clear treeview when re-drawing + self.list.remove_column(column) + groups = [] # Store accounts in a list so we can sort them for g in gajim.groups[self.account].keys(): if g in helpers.special_groups: continue + in_group = False + if g in self.user.groups: + in_group = True + groups.append([g, in_group]) + groups.sort() + for group in groups: iter = store.append() - store.set(iter, 0, g) - if g in self.user.groups: - store.set(iter, 1, True) - else: - store.set(iter, 1, False) + store.set(iter, 0, group[0]) # Group name + store.set(iter, 1, group[1]) # In group boolean column = gtk.TreeViewColumn(_('Group')) column.set_expand(True) self.list.append_column(column)

1 0

[commit-gajim] r6326 - trunk/src
by jim++＠gajim.org 14 May '06

14 May '06

Author: jim++ Date: 2006-05-14 17:12:17 +0200 (Sun, 14 May 2006) New Revision: 6326 Modified: trunk/src/roster_window.py Log: When in merged account mode, if we drag and drop contacts from one account to another, show drop menu, allow to change group, inform user why creation of metacontact is not possible. Fixes #1383. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-05-13 18:43:48 UTC (rev 6325) +++ trunk/src/roster_window.py 2006-05-14 15:12:17 UTC (rev 6326) @@ -3116,10 +3116,12 @@ if type_source != 'contact': # source is not a contact return source_account = model[iter_source][C_ACCOUNT].decode('utf-8') + disable_meta = False if account != source_account: # dropped in another account - if self.regroup and type_dest == 'group': - # on a group in merge mode is ok + if self.regroup: + # in merge mode it is ok to change group, but disable meta account = source_account + disable_meta = True else: return it = iter_source @@ -3188,15 +3190,21 @@ item.connect('activate', self.on_drop_in_group, account, c_source, grp_dest, context, etime, grp_source) menu.append(item) - c_dest = gajim.contacts.get_contact_with_highest_priority(account, - jid_dest) - item = gtk.MenuItem(_('Make %s and %s metacontacts') % (c_source.name, - c_dest.name)) - is_big_brother = False - if model.iter_has_child(iter_source): - is_big_brother = True - item.connect('activate', self.on_drop_in_contact, account, c_source, - c_dest, is_big_brother, context, etime) + if not disable_meta: + # source and dest account are the same, enable metacontacts + c_dest = gajim.contacts.get_contact_with_highest_priority(account, + jid_dest) + item = gtk.MenuItem(_('Make %s and %s metacontacts') % (c_source.name, + c_dest.name)) + is_big_brother = False + if model.iter_has_child(iter_source): + is_big_brother = True + item.connect('activate', self.on_drop_in_contact, account, c_source, + c_dest, is_big_brother, context, etime) + else: #source and dest account are not the same, disable meta + item = gtk.MenuItem(_('Can\'t create a metacontact with contacts from two different accounts')) + item.set_sensitive(False) + menu.append(item) menu.attach_to_widget(self.tree, None)

1 0

[commit-gajim] r6325 - trunk/po
by dkirov＠gajim.org 13 May '06

13 May '06

Author: dkirov Date: 2006-05-13 20:43:48 +0200 (Sat, 13 May 2006) New Revision: 6325 Modified: trunk/po/Makefile Log: fix #1960 Modified: trunk/po/Makefile =================================================================== --- trunk/po/Makefile 2006-05-11 21:46:55 UTC (rev 6324) +++ trunk/po/Makefile 2006-05-13 18:43:48 UTC (rev 6325) @@ -63,4 +63,4 @@ done clean: - rm *.mo + rm -f *.mo

1 0

[commit-gajim] r6324 - trunk/src
by jim++＠gajim.org 11 May '06

11 May '06

Author: jim++ Date: 2006-05-11 23:46:55 +0200 (Thu, 11 May 2006) New Revision: 6324 Modified: trunk/src/gajim.py Log: For GC, draw banner AFTER we change status of control Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-05-11 20:51:39 UTC (rev 6323) +++ trunk/src/gajim.py 2006-05-11 21:46:55 UTC (rev 6324) @@ -831,17 +831,6 @@ fjid = room_jid + '/' + nick show = array[1] status = array[2] - # print status in chat window and update status/GPG image - if self.msg_win_mgr.has_window(fjid, account): - ctrl = self.msg_win_mgr.get_control(fjid, account) - contact = ctrl.contact - contact.show = show - contact.status = status - ctrl.update_ui() - uf_show = helpers.get_uf_show(show) - ctrl.print_conversation(_('%s is now %s (%s)') % (nick, uf_show, status), - 'status') - ctrl.draw_banner() # Get the window and control for the updated status, this may be a PrivateChatControl control = self.msg_win_mgr.get_control(room_jid, account) @@ -855,6 +844,19 @@ if self.remote_ctrl: self.remote_ctrl.raise_signal('GCPresence', (account, array)) + # print status in chat window and update status/GPG image + if self.msg_win_mgr.has_window(fjid, account): + ctrl = self.msg_win_mgr.get_control(fjid, account) + contact = ctrl.contact + contact.show = show + contact.status = status + ctrl.update_ui() + uf_show = helpers.get_uf_show(show) + ctrl.print_conversation(_('%s is now %s (%s)') % (nick, uf_show, status), + 'status') + ctrl.draw_banner() + + def handle_event_gc_msg(self, account, array): # ('GC_MSG', account, (jid, msg, time)) jids = array[0].split('/', 1)

1 0

[commit-gajim] r6323 - trunk/src/common
by dkirov＠gajim.org 11 May '06

11 May '06

Author: dkirov Date: 2006-05-11 22:51:39 +0200 (Thu, 11 May 2006) New Revision: 6323 Modified: trunk/src/common/connection.py Log: make sure we are disconnected after connection is lost ??? #1955 by j(a)bootlab.org Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-05-11 20:34:37 UTC (rev 6322) +++ trunk/src/common/connection.py 2006-05-11 20:51:39 UTC (rev 6323) @@ -159,6 +159,8 @@ # END disconenctedReconnCB def _connection_lost(self): + self.disconnect(on_purpose = False) + self.dispatch('STATUS', 'offline') self.dispatch('ERROR', (_('Connection with account "%s" has been lost') % self.name, _('To continue sending and receiving messages, you will need to reconnect.')))

1 0

[commit-gajim] r6322 - trunk/data/glade
by dkirov＠gajim.org 11 May '06

11 May '06

Author: dkirov Date: 2006-05-11 22:34:37 +0200 (Thu, 11 May 2006) New Revision: 6322 Modified: trunk/data/glade/preferences_window.glade Log: fixed accel Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2006-05-11 18:28:05 UTC (rev 6321) +++ trunk/data/glade/preferences_window.glade 2006-05-11 20:34:37 UTC (rev 6322) @@ -926,7 +926,7 @@ <widget class="GtkCheckButton" id="default_chat_font"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Use system default</property> + <property name="label" translatable="yes">Use system _default</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property>

1 0

[commit-gajim] r6321 - in trunk: data/glade src
by dkirov＠gajim.org 11 May '06

11 May '06

Author: dkirov Date: 2006-05-11 20:28:05 +0200 (Thu, 11 May 2006) New Revision: 6321 Modified: trunk/data/glade/preferences_window.glade trunk/src/config.py Log: add checkbutton for default chat font Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2006-05-11 06:02:36 UTC (rev 6320) +++ trunk/data/glade/preferences_window.glade 2006-05-11 18:28:05 UTC (rev 6321) @@ -17,6 +17,7 @@ <property name="skip_pager_hint">False</property> <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> <signal name="key_press_event" handler="on_preferences_window_key_press_event" last_modification_time="Fri, 08 Apr 2005 01:08:08 GMT"/> <signal name="destroy" handler="on_preferences_window_destroy" last_modification_time="Sun, 05 Mar 2006 11:50:52 GMT"/> @@ -191,6 +192,10 @@ <property name="xpad">0</property> <property name="ypad">0</property> <property name="mnemonic_widget">iconset_combobox</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -202,6 +207,8 @@ <child> <widget class="GtkComboBox" id="iconset_combobox"> <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> <signal name="changed" handler="on_iconset_combobox_changed" last_modification_time="Tue, 21 Jun 2005 15:36:21 GMT"/> </widget> <packing> @@ -259,6 +266,10 @@ <property name="xpad">0</property> <property name="ypad">0</property> <property name="mnemonic_widget">theme_combobox</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -270,6 +281,8 @@ <child> <widget class="GtkComboBox" id="theme_combobox"> <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> <signal name="changed" handler="on_theme_combobox_changed" last_modification_time="Fri, 29 Apr 2005 11:44:52 GMT"/> </widget> <packing> @@ -320,6 +333,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="type">label_item</property> @@ -375,6 +392,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -415,6 +436,10 @@ <property name="xpad">1</property> <property name="ypad">0</property> <property name="mnemonic_widget">one_window_type_combobox</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -430,6 +455,8 @@ Always Per account Per type</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> <signal name="changed" handler="on_one_window_type_combo_changed" last_modification_time="Thu, 29 Dec 2005 02:04:46 GMT"/> </widget> <packing> @@ -491,6 +518,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> </child> </widget> @@ -504,6 +535,8 @@ <child> <widget class="GtkComboBox" id="emoticons_combobox"> <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> <signal name="changed" handler="on_emoticons_combobox_changed" last_modification_time="Fri, 28 Apr 2006 15:39:32 GMT"/> </widget> <packing> @@ -565,6 +598,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -646,88 +683,129 @@ <child> <widget class="GtkTable" id="table25"> <property name="visible">True</property> - <property name="n_rows">2</property> + <property name="n_rows">6</property> <property name="n_columns">4</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <widget class="GtkLabel" id="after_time_label"> + <widget class="GtkLabel" id="label72"> <property name="visible">True</property> - <property name="label" translatable="yes">_After time:</property> + <property name="label" translatable="yes">_Incoming message:</property> <property name="use_underline">True</property> <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</property> <property name="selectable">False</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">after_time_entry</property> + <property name="mnemonic_widget">incoming_msg_colorbutton</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options"></property> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label231"> + <widget class="GtkLabel" id="label70"> <property name="visible">True</property> - <property name="label" translatable="yes">A_fter nickname:</property> + <property name="label" translatable="yes">_Outgoing message:</property> <property name="use_underline">True</property> <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</property> <property name="selectable">False</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">after_nickname_entry</property> + <property name="mnemonic_widget">outgoing_msg_colorbutton</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label230"> + <widget class="GtkLabel" id="label71"> <property name="visible">True</property> - <property name="label" translatable="yes">B_efore nickname:</property> + <property name="label" translatable="yes">_Status message:</property> <property name="use_underline">True</property> <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</property> <property name="selectable">False</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">before_nickname_entry</property> + <property name="mnemonic_widget">status_msg_colorbutton</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> + <widget class="GtkLabel" id="label371"> + <property name="visible">True</property> + <property name="label" translatable="yes">_URL:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">url_msg_colorbutton</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> <widget class="GtkLabel" id="before_time_label"> <property name="visible">True</property> <property name="label" translatable="yes">_Before time:</property> @@ -736,152 +814,195 @@ <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> <property name="mnemonic_widget">before_time_entry</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> <property name="top_attach">0</property> <property name="bottom_attach">1</property> - <property name="x_options"></property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="before_time_entry"> - <property name="width_request">40</property> + <widget class="GtkLabel" id="label231"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - <signal name="focus_out_event" handler="on_before_time_entry_focus_out_event" last_modification_time="Fri, 01 Apr 2005 15:54:51 GMT"/> + <property name="label" translatable="yes">A_fter nickname:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">after_nickname_entry</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options"></property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="before_nickname_entry"> - <property name="width_request">40</property> + <widget class="GtkHBox" id="hbox3021"> <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkLabel" id="font_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Font:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">conversation_fontbutton</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFontButton" id="conversation_fontbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="show_style">True</property> + <property name="show_size">True</property> + <property name="use_font">False</property> + <property name="use_size">False</property> + <property name="focus_on_click">True</property> + <signal name="font_set" handler="on_conversation_fontbutton_font_set" last_modification_time="Sun, 07 Aug 2005 18:04:12 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="default_chat_font"> + <property name="visible">True</property> <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - <signal name="focus_out_event" handler="on_before_nickname_entry_focus_out_event" last_modification_time="Fri, 01 Apr 2005 15:57:44 GMT"/> + <property name="label" translatable="yes">_Use system default</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_default_chat_font_toggled" last_modification_time="Thu, 11 May 2006 18:15:34 GMT"/> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> + <property name="left_attach">2</property> + <property name="right_attach">4</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="after_nickname_entry"> - <property name="width_request">40</property> + <widget class="GtkColorButton" id="outgoing_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - <signal name="focus_out_event" handler="on_after_nickname_entry_focus_out_event" last_modification_time="Fri, 01 Apr 2005 15:58:07 GMT"/> + <property name="use_alpha">False</property> + <property name="focus_on_click">True</property> + <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set" last_modification_time="Sun, 06 Mar 2005 14:07:56 GMT"/> </widget> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="after_time_entry"> - <property name="width_request">39</property> + <widget class="GtkColorButton" id="url_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - <signal name="focus_out_event" handler="on_after_time_entry_focus_out_event" last_modification_time="Fri, 01 Apr 2005 15:57:17 GMT"/> + <property name="use_alpha">False</property> + <property name="focus_on_click">True</property> + <signal name="color_set" handler="on_url_msg_colorbutton_color_set" last_modification_time="Sun, 25 Dec 2005 15:22:17 GMT"/> </widget> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options"></property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - <child> - <widget class="GtkTable" id="table18"> - <property name="visible">True</property> - <property name="n_rows">6</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">20</property> - <child> - <widget class="GtkLabel" id="label72"> + <widget class="GtkLabel" id="after_time_label"> <property name="visible">True</property> - <property name="label" translatable="yes">_Incoming message:</property> + <property name="label" translatable="yes">_After time:</property> <property name="use_underline">True</property> <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> <property name="selectable">False</property> <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">incoming_msg_colorbutton</property> + <property name="mnemonic_widget">after_time_entry</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">0</property> <property name="bottom_attach">1</property> <property name="x_options">fill</property> @@ -890,19 +1011,23 @@ </child> <child> - <widget class="GtkLabel" id="label70"> + <widget class="GtkLabel" id="label230"> <property name="visible">True</property> - <property name="label" translatable="yes">_Outgoing message:</property> + <property name="label" translatable="yes">B_efore nickname:</property> <property name="use_underline">True</property> <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> <property name="selectable">False</property> <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">outgoing_msg_colorbutton</property> + <property name="mnemonic_widget">before_nickname_entry</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="left_attach">0</property> @@ -915,31 +1040,54 @@ </child> <child> - <widget class="GtkLabel" id="label71"> + <widget class="GtkEntry" id="after_time_entry"> + <property name="width_request">39</property> <property name="visible">True</property> - <property name="label" translatable="yes">_Status message:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">status_msg_colorbutton</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + <signal name="focus_out_event" handler="on_after_time_entry_focus_out_event" last_modification_time="Fri, 01 Apr 2005 15:57:17 GMT"/> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> + <widget class="GtkEntry" id="after_nickname_entry"> + <property name="width_request">40</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + <signal name="focus_out_event" handler="on_after_nickname_entry_focus_out_event" last_modification_time="Fri, 01 Apr 2005 15:58:07 GMT"/> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + + <child> <widget class="GtkColorButton" id="incoming_msg_colorbutton"> <property name="visible">True</property> <property name="can_default">True</property> @@ -953,24 +1101,48 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkColorButton" id="outgoing_msg_colorbutton"> + <widget class="GtkColorButton" id="status_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="use_alpha">False</property> <property name="focus_on_click">True</property> - <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set" last_modification_time="Sun, 06 Mar 2005 14:07:56 GMT"/> + <signal name="color_set" handler="on_status_msg_colorbutton_color_set" last_modification_time="Sun, 06 Mar 2005 14:08:04 GMT"/> </widget> <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"></property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="before_nickname_entry"> + <property name="width_request">40</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + <signal name="focus_out_event" handler="on_before_nickname_entry_focus_out_event" last_modification_time="Fri, 01 Apr 2005 15:57:44 GMT"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options"></property> @@ -979,189 +1151,147 @@ </child> <child> - <widget class="GtkColorButton" id="status_msg_colorbutton"> + <widget class="GtkEntry" id="before_time_entry"> + <property name="width_request">40</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="use_alpha">False</property> - <property name="focus_on_click">True</property> - <signal name="color_set" handler="on_status_msg_colorbutton_color_set" last_modification_time="Sun, 06 Mar 2005 14:08:04 GMT"/> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + <signal name="focus_out_event" handler="on_before_time_entry_focus_out_event" last_modification_time="Fri, 01 Apr 2005 15:54:51 GMT"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkButton" id="reset_colors_button"> + <widget class="GtkHBox" id="hbox3022"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <signal name="clicked" handler="on_reset_colors_button_clicked" last_modification_time="Mon, 07 Mar 2005 23:17:44 GMT"/> + <property name="homogeneous">False</property> + <property name="spacing">0</property> <child> - <widget class="GtkAlignment" id="alignment52"> + <widget class="GtkLabel" id="label383"> <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="reset_colors_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <signal name="clicked" handler="on_reset_colors_button_clicked" last_modification_time="Mon, 07 Mar 2005 23:17:44 GMT"/> + <child> - <widget class="GtkHBox" id="hbox2936"> + <widget class="GtkAlignment" id="alignment52"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> - <widget class="GtkImage" id="image439"> + <widget class="GtkHBox" id="hbox2936"> <property name="visible">True</property> - <property name="stock">gtk-revert-to-saved</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <property name="homogeneous">False</property> + <property name="spacing">2</property> - <child> - <widget class="GtkLabel" id="label217"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Reset to Default Colors</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> + <child> + <widget class="GtkImage" id="image439"> + <property name="visible">True</property> + <property name="stock">gtk-revert-to-saved</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label217"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Reset to Default Colors</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> </child> </widget> </child> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> </child> </widget> <packing> <property name="left_attach">0</property> - <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="font_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Font:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">conversation_fontbutton</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> + <property name="right_attach">4</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">fill</property> - <property name="y_options"></property> </packing> </child> - - <child> - <widget class="GtkFontButton" id="conversation_fontbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_style">True</property> - <property name="show_size">True</property> - <property name="use_font">False</property> - <property name="use_size">False</property> - <property name="focus_on_click">True</property> - <signal name="font_set" handler="on_conversation_fontbutton_font_set" last_modification_time="Sun, 07 Aug 2005 18:04:12 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label371"> - <property name="visible">True</property> - <property name="label" translatable="yes">_URL:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">url_msg_colorbutton</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkColorButton" id="url_msg_colorbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="use_alpha">False</property> - <property name="focus_on_click">True</property> - <signal name="color_set" handler="on_url_msg_colorbutton_color_set" last_modification_time="Sun, 25 Dec 2005 15:22:17 GMT"/> - </widget> - <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"></property> - <property name="y_options"></property> - </packing> - </child> </widget> <packing> <property name="padding">0</property> @@ -1187,6 +1317,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="type">label_item</property> @@ -1242,6 +1376,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -1404,6 +1542,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> </child> </widget> @@ -1438,6 +1580,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -1577,6 +1723,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -1628,6 +1778,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="type">label_item</property> @@ -1689,6 +1843,10 @@ <property name="xpad">0</property> <property name="ypad">0</property> <property name="mnemonic_widget">chat_states_combobox</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> </child> </widget> @@ -1705,6 +1863,8 @@ <property name="items" translatable="yes">All chat states Composing only Disabled</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> <signal name="changed" handler="on_chat_states_combobox_changed" last_modification_time="Sun, 07 Aug 2005 19:15:49 GMT"/> </widget> <packing> @@ -1792,6 +1952,10 @@ <property name="xpad">0</property> <property name="ypad">0</property> <property name="mnemonic_widget">soundplayer_entry</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -1851,6 +2015,9 @@ <property name="rules_hint">False</property> <property name="reorderable">False</property> <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> <signal name="cursor_changed" handler="on_treeview_sounds_cursor_changed" last_modification_time="Wed, 09 Feb 2005 22:51:36 GMT"/> </widget> </child> @@ -1956,6 +2123,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="type">label_item</property> @@ -2011,6 +2182,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -2099,6 +2274,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="left_attach">2</property> @@ -2123,6 +2302,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="left_attach">2</property> @@ -2282,6 +2465,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -2400,6 +2587,9 @@ <property name="rules_hint">False</property> <property name="reorderable">False</property> <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> <signal name="cursor_changed" handler="on_msg_treeview_cursor_changed" last_modification_time="Sun, 24 Oct 2004 21:46:28 GMT"/> <signal name="key_press_event" handler="on_msg_treeview_key_press_event" last_modification_time="Wed, 02 Feb 2005 21:04:34 GMT"/> </widget> @@ -2514,6 +2704,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="type">label_item</property> @@ -2569,6 +2763,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -2622,6 +2820,8 @@ Always use GNOME default applications Always use KDE default applications Custom</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> <signal name="changed" handler="on_applications_combobox_changed" last_modification_time="Tue, 09 Aug 2005 15:12:31 GMT"/> </widget> <packing> @@ -2673,6 +2873,10 @@ <property name="xpad">0</property> <property name="ypad">0</property> <property name="mnemonic_widget">custom_browser_entry</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="left_attach">0</property> @@ -2698,6 +2902,10 @@ <property name="xpad">0</property> <property name="ypad">0</property> <property name="mnemonic_widget">custom_mail_client_entry</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="left_attach">0</property> @@ -2767,6 +2975,10 @@ <property name="xpad">0</property> <property name="ypad">0</property> <property name="mnemonic_widget">custom_file_manager_entry</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="left_attach">0</property> @@ -2817,6 +3029,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="type">label_item</property> @@ -2847,6 +3063,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="type">label_item</property> @@ -2962,6 +3182,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="type">label_item</property> @@ -3051,6 +3275,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> @@ -3080,6 +3308,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="type">label_item</property> @@ -3135,6 +3367,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="padding">0</property> Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2006-05-11 06:02:36 UTC (rev 6320) +++ trunk/src/config.py 2006-05-11 18:28:05 UTC (rev 6321) @@ -254,12 +254,17 @@ #Font for messages font = gajim.config.get('conversation_font') # try to set default font for the current desktop env + fontbutton = self.xml.get_widget('conversation_fontbutton') if font == '': font = gtkgui_helpers.get_default_font() - if font is None: + if font is not None: font = 'Sans 10' - gajim.config.set('conversation_font', font) - self.xml.get_widget('conversation_fontbutton').set_font_name(font) + gajim.config.set('conversation_font', font) + fontbutton.set_font_name(font) + fontbutton.set_sensitive(False) + self.xml.get_widget('default_chat_font').set_active(True) + else: + fontbutton.set_font_name(font) # on new message only_in_roster = True @@ -647,7 +652,10 @@ gajim.interface.save_config() def on_preference_widget_font_set(self, widget, text): - font = widget.get_font_name() + if widget: + font = widget.get_font_name() + else: + font = '' gajim.config.set(text, font) self.update_text_font() gajim.interface.save_config() @@ -671,6 +679,15 @@ def on_conversation_fontbutton_font_set(self, widget): self.on_preference_widget_font_set(widget, 'conversation_font') + + def on_default_chat_font_toggled(self, widget): + font_widget = self.xml.get_widget('conversation_fontbutton') + if widget.get_active(): + font_widget.set_sensitive(False) + font_widget = None + else: + font_widget.set_sensitive(True) + self.on_preference_widget_font_set(font_widget, 'conversation_font') def on_reset_colors_button_clicked(self, widget): for i in ('inmsgcolor', 'outmsgcolor', 'statusmsgcolor', 'urlmsgcolor'):

1 0

[commit-gajim] r6320 - trunk/po
by asterix＠gajim.org 11 May '06

11 May '06

Author: asterix Date: 2006-05-11 08:02:36 +0200 (Thu, 11 May 2006) New Revision: 6320 Removed: trunk/po/fr/ Log: remove missing fr folder

1 0

[commit-gajim] r6319 - trunk/src
by jim++＠gajim.org 10 May '06

10 May '06

Author: jim++ Date: 2006-05-10 22:29:17 +0200 (Wed, 10 May 2006) New Revision: 6319 Modified: trunk/src/dialogs.py trunk/src/notify.py Log: Missing upcase letter Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-05-10 20:25:51 UTC (rev 6318) +++ trunk/src/dialogs.py 2006-05-10 20:29:17 UTC (rev 6319) @@ -1114,7 +1114,7 @@ bg_color = 'yellowgreen' elif event_type == _('Groupchat Invitation'): bg_color = 'tan1' - elif event_type == _('Contact Changed status'): + elif event_type == _('Contact Changed Status'): bg_color = 'thistle2' else: # Unknown event ! Shouldn't happen but deal with it bg_color = 'white' Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2006-05-10 20:25:51 UTC (rev 6318) +++ trunk/src/notify.py 2006-05-10 20:29:17 UTC (rev 6319) @@ -94,7 +94,7 @@ 'status': helpers.get_uf_show(gajim.SHOW_LIST[new_show])} if status_message: text = text + " : " + status_message - popup(_('Contact Changed status'), jid, account, + popup(_('Contact Changed Status'), jid, account, path_to_image = path, title = title, text = text) elif (event == 'contact_connected'): title = _('%(nickname)s Signed In') % \ @@ -229,7 +229,7 @@ ntype = 'email.arrived' elif event_type == _('Groupchat Invitation'): ntype = 'im.invitation' - elif event_type == _('Contact Changed status'): + elif event_type == _('Contact Changed Status'): ntype = 'presence.status' else: # default failsafe values

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