changeset 193bd037c983 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=193bd037c983 description: start porting Gajim to gobject introspection and GTK3
diffstat:
data/gui/account_creation_wizard_window.ui | 245 +++++++-- data/gui/message_window.ui | 1 - setup_win32.py | 2 +- src/adhoc_commands.py | 20 +- src/advanced_configuration_window.py | 20 +- src/atom_window.py | 18 +- src/cell_renderer_image.py | 73 +- src/chat_control.py | 342 +++++++------ src/command_system/implementation/middleware.py | 4 +- src/command_system/tools.py | 12 +- src/common/config.py | 4 +- src/common/gajim.py | 2 + src/common/jingle_rtp.py | 6 +- src/common/jingle_transport.py | 1 + src/common/logger.py | 4 +- src/common/pep.py | 27 +- src/common/protocol/bytestream.py | 6 +- src/common/resolver.py | 22 +- src/common/zeroconf/connection_zeroconf.py | 4 +- src/config.py | 308 ++++++------ src/conversation_textview.py | 189 ++++--- src/dataforms_widget.py | 102 ++-- src/dialogs.py | 485 ++++++++++--------- src/disco.py | 217 ++++---- src/features_window.py | 20 +- src/filetransfers_window.py | 147 +++--- src/gajim.py | 103 ++- src/gajim_themes_window.py | 34 +- src/groupchat_control.py | 153 +++--- src/groups.py | 2 +- src/gtkexcepthook.py | 28 +- src/gtkgui_helpers.py | 146 +++-- src/gui_interface.py | 98 ++- src/gui_menu_builder.py | 24 +- src/history_manager.py | 86 +- src/history_window.py | 34 +- src/htmltextview.py | 182 +++--- src/ipython_view.py | 55 +- src/message_control.py | 4 +- src/message_textview.py | 147 +++--- src/message_window.py | 160 +++--- src/music_track_listener.py | 8 +- src/negotiation.py | 2 +- src/notify.py | 20 +- src/plugins/gui.py | 59 +- src/profile_window.py | 45 +- src/remote_control.py | 22 +- src/roster_window.py | 582 ++++++++++++----------- src/search_window.py | 36 +- src/statusicon.py | 67 +- src/tooltips.py | 129 ++-- src/vcard.py | 44 +- 52 files changed, 2372 insertions(+), 2179 deletions(-)
diffs (truncated from 13129 to 300 lines):
diff -r 21ba342ff001 -r 193bd037c983 data/gui/account_creation_wizard_window.ui --- a/data/gui/account_creation_wizard_window.ui Sun Dec 16 23:53:32 2012 +0100 +++ b/data/gui/account_creation_wizard_window.ui Sun Dec 23 16:23:43 2012 +0100 @@ -1,31 +1,51 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name item --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">None</col> + </row> + </data> + </object> + <object class="GtkEntryCompletion" id="server_entrycompletion"> + <property name="model">server_liststore</property> + <property name="text_column">0</property> + </object> + <object class="GtkEntryCompletion" id="server_entrycompletion1"> + <property name="model">server_liststore</property> + <property name="text_column">0</property> + </object> <object class="GtkWindow" id="account_creation_wizard_window"> + <property name="can_focus">False</property> <property name="border_width">12</property> <property name="title" translatable="yes">Gajim: Account Creation Wizard</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_wizard_window_destroy"/> + <signal name="destroy" handler="on_wizard_window_destroy" swapped="no"/> <child> <object class="GtkVBox" id="vbox77"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> - <property name="show_tabs">False</property> + <property name="can_focus">False</property> <property name="show_border">False</property> <child> <object class="GtkVBox" id="vbox78"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label256"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">You need to have an account in order to connect to the Jabber network.</property> @@ -39,26 +59,31 @@ <child> <object class="GtkFrame" id="frame33"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment68"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">5</property> <property name="left_padding">12</property> <child> <object class="GtkVBox" id="vbox83"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="use_existing_account_radiobutton"> <property name="label" translatable="yes">I already have an account I want to _use</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -70,10 +95,13 @@ <child> <object class="GtkRadioButton" id="register_new_account_radiobutton"> <property name="label" translatable="yes">I want to _register for a new account</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">use_existing_account_radiobutton</property> </object> @@ -90,6 +118,7 @@ <child type="label"> <object class="GtkLabel" id="label269"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes"><b>Please choose one of the options below:</b></property> <property name="use_markup">True</property> </object> @@ -106,6 +135,7 @@ <child type="tab"> <object class="GtkLabel" id="label259"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="tab_fill">False</property> @@ -114,12 +144,13 @@ <child> <object class="GtkVBox" id="register_vbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label270"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Please fill in the data for your existing account</b></property> <property name="use_markup">True</property> @@ -133,25 +164,30 @@ <child> <object class="GtkTable" id="table27"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">4</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> + <placeholder/> + </child> + <child> <object class="GtkEntry" id="username_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="key_press_event" handler="on_username_entry_key_press_event"/> + <signal name="key-press-event" handler="on_username_entry_key_press_event" swapped="no"/> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label263"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> @@ -161,21 +197,24 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkCheckButton" id="save_password_checkbutton"> <property name="label" translatable="yes">Save pass_word</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will remember the password for this account</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="focus_on_click">False</property> + <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_save_password_checkbutton_toggled"/> + <signal name="toggled" handler="on_save_password_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="left_attach">2</property> @@ -183,7 +222,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -198,12 +237,13 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label262"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Jabber ID:</property> <property name="use_underline">True</property> @@ -211,41 +251,34 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">@</property> </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="x_options"></property> - </packing> - </child> - <child> - <object class="GtkComboBoxEntry" id="server_comboboxentry"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="x_options"/> </packing> </child> <child> <object class="GtkCheckButton" id="anonymous_checkbutton1"> <property name="label" translatable="yes">Anon_ymous authentication</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_anonymous_checkbutton1_toggled"/> + <signal name="toggled" handler="on_anonymous_checkbutton1_toggled" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -255,11 +288,29 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkComboBoxText" id="server_comboboxentry"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="completion">server_entrycompletion</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + </packing> </child> </object> <packing> <property name="expand">False</property>
-
Yann Leboulanger