changeset c7a0c3a59a3d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c7a0c3a59a3d description: add an enable checkbutton in accounts window for normal accounts too. Fixes #4489
diffstat: configure.ac | 2 +- data/glade/accounts_window.glade | 1443 +++++++++++++++++++++--------------------- src/common/config.py | 3 +- src/common/defs.py | 2 +- src/common/optparser.py | 12 + src/config.py | 216 ++++-- src/gajim.py | 6 +- 7 files changed, 878 insertions(+), 806 deletions(-) diffs (truncated from 2161 to 300 lines): diff -r d79604697880 -r c7a0c3a59a3d configure.ac --- a/configure.ac Mon Oct 05 19:19:03 2009 +0300 +++ b/configure.ac Tue Oct 06 11:23:31 2009 +0200 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.12.5.2-dev],[http://trac.gajim.org/],[gajim]) + [0.12.5.3-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r d79604697880 -r c7a0c3a59a3d data/glade/accounts_window.glade --- a/data/glade/accounts_window.glade Mon Oct 05 19:19:03 2009 +0300 +++ b/data/glade/accounts_window.glade Tue Oct 06 11:23:31 2009 +0200 @@ -1,14 +1,14 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<!--Generated with glade3 3.4.5 on Tue Oct 6 11:00:58 2009 --> <glade-interface> - <!-- interface-requires gtk+ 2.12 --> - <!-- interface-naming-policy toplevel-contextual --> <widget class="GtkWindow" id="accounts_window"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">12</property> <property name="title" translatable="yes">Accounts</property> <property name="default_width">800</property> + <signal name="key_press_event" handler="on_accounts_window_key_press_event"/> <signal name="destroy" handler="on_accounts_window_destroy"/> - <signal name="key_press_event" handler="on_accounts_window_key_press_event"/> <child> <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> @@ -30,9 +30,9 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> <child> <widget class="GtkTreeView" id="accounts_treeview"> <property name="visible">True</property> @@ -43,18 +43,16 @@ </widget> </child> </widget> - <packing> - <property name="position">0</property> - </packing> </child> <child> <widget class="GtkButton" id="add_button"> - <property name="label" translatable="yes">gtk-add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">gtk-add</property> <property name="use_stock">True</property> + <property name="response_id">0</property> <signal name="clicked" handler="on_add_button_clicked"/> </widget> <packing> @@ -64,12 +62,13 @@ </child> <child> <widget class="GtkButton" id="remove_button"> - <property name="label" translatable="yes">gtk-remove</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">gtk-remove</property> <property name="use_stock">True</property> + <property name="response_id">0</property> <signal name="clicked" handler="on_remove_button_clicked"/> </widget> <packing> @@ -83,6 +82,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="response_id">0</property> <signal name="clicked" handler="on_rename_button_clicked"/> <child> <widget class="GtkHBox" id="hbox8"> @@ -96,7 +96,6 @@ </widget> <packing> <property name="fill">False</property> - <property name="position">0</property> </packing> </child> <child> @@ -166,436 +165,710 @@ </packing> </child> <child> - <widget class="GtkNotebook" id="normal_notebook1"> + <widget class="GtkVBox" id="vbox3"> <property name="visible">True</property> - <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table1"> + <widget class="GtkCheckButton" id="enable_checkbutton1"> <property name="visible">True</property> - <property name="border_width">6</property> - <property name="n_rows">5</property> - <property name="n_columns">3</property> - <property name="column_spacing">6</property> - <property name="row_spacing">6</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Enable</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_enable_checkbutton1_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkNotebook" id="normal_notebook1"> + <property name="visible">True</property> + <property name="can_focus">True</property> <child> - <widget class="GtkLabel" id="jid_label1"> + <widget class="GtkTable" id="table1"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Jabber ID:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">jid_entry1</property> + <property name="border_width">6</property> + <property name="n_rows">5</property> + <property name="n_columns">3</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <widget class="GtkCheckButton" id="anonymous_checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Anonymous authentication</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_anonymous_checkbutton1_toggled"/> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="resource_entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)</property> + <property name="text" translatable="yes">Gajim</property> + <signal name="focus_out_event" handler="on_resource_entry1_focus_out_event"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="jid_entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <signal name="focus_out_event" handler="on_jid_entry1_focus_out_event"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkExpander" id="expander1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="spacing">11</property> + <property name="homogeneous">True</property> + <child> + <widget class="GtkButton" id="synchronise_contacts_button1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Click to request authorization to all contacts of another account</property> + <property name="label" translatable="yes">Synchronise contacts</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_synchronise_contacts_button1_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="change_password_button1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Click to change account's password</property> + <property name="label" translatable="yes">Chan_ge Password</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_change_password_button1_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="label" translatable="yes">Administration operations</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="right_attach">3</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkSpinButton" id="priority_spinbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events</property> + <property name="adjustment">5 0 127 1 5 0</property> + <property name="climb_rate">1</property> + <property name="numeric">True</property> + <signal name="value_changed" handler="on_priority_spinbutton1_value_changed"/> + </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">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="adjust_priority_with_status_checkbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Priority will change automatically according to your status.</property> + <property name="label" translatable="yes">A_djust to status</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_adjust_priority_with_status_checkbutton1_toggled"/> + </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">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Priori_ty:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">priority_spinbutton1</property> + </widget> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> _______________________________________________ Commits mailing list [email protected] http://lists.gajim.org/cgi-bin/listinfo/commits
