copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more GTK3 fixes

This commit is contained in:
Yann Leboulanger 2012-12-27 21:58:52 +01:00
parent d033e9f600
commit a8d946bc96
21 changed files with 627 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
data/gui/add_new_contact_window.ui
View File

@ -1,22 +1,23 @@
<?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="GtkWindow" id="add_new_contact_window">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Add New Contact</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="on_add_new_contact_window_destroy"/>
<signal name="key_press_event" handler="on_add_new_contact_window_key_press_event"/>
<signal name="destroy" handler="on_add_new_contact_window_destroy" swapped="no"/>
<signal name="key-press-event" handler="on_add_new_contact_window_key_press_event" swapped="no"/>
<child>
<object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="prompt_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@ -27,10 +28,12 @@
<child>
<object class="GtkHBox" id="account_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="account_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">A_ccount:</property>
<property name="use_underline">True</property>
@ -44,8 +47,9 @@
<child>
<object class="GtkComboBox" id="account_combobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststore3</property>
<signal name="changed" handler="on_account_combobox_changed"/>
<signal name="changed" handler="on_account_combobox_changed" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext3"/>
<attributes>
@ -64,16 +68,20 @@
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="protocol_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="protocol_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Protocol:</property>
<property name="use_underline">True</property>
@ -88,7 +96,8 @@
<child>
<object class="GtkComboBox" id="protocol_combobox">
<property name="visible">True</property>
<signal name="changed" handler="on_protocol_combobox_changed"/>
<property name="can_focus">False</property>
<signal name="changed" handler="on_protocol_combobox_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -99,9 +108,10 @@
<child>
<object class="GtkComboBox" id="protocol_jid_combobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="model">liststore2</property>
<signal name="changed" handler="on_protocol_jid_combobox_changed"/>
<signal name="changed" handler="on_protocol_jid_combobox_changed" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
@ -110,17 +120,22 @@
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkTable" id="subscription_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="border_width">6</property>
<property name="n_rows">3</property>
@ -130,6 +145,7 @@
<child>
<object class="GtkLabel" id="uid_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_User ID:</property>
<property name="use_underline">True</property>
@ -137,7 +153,7 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="y_options"/>
</packing>
</child>
<child>
@ -145,16 +161,18 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="placeholder_text">Type User ID</property>
</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="label188">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Nickname:</property>
<property name="use_underline">True</property>
@ -164,7 +182,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="y_options"/>
</packing>
</child>
<child>
@ -172,18 +190,20 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="placeholder_text">Type Nickname</property>
</object>
<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="y_options"></property>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label223">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Group:</property>
<property name="use_underline">True</property>
@ -192,37 +212,48 @@
<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="GtkComboBoxEntry" id="group_comboboxentry">
<object class="GtkComboBoxText" id="group_comboboxentry">
<property name="visible">True</property>
<property name="model">groups_liststore</property>
<property name="text_column">0</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="placeholder_text">Choose a group of type a new group</property>
</object>
</child>
</object>
<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="x_options">GTK_FILL</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="auto_authorize_checkbutton">
<property name="label" translatable="yes">A_llow this contact to view my status</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="no_show_all">True</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@ -238,9 +269,8 @@
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="border_width">6</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">etched-in</property>
<property name="min_content_height">5</property>
<child>
<object class="GtkTextView" id="message_textview">
<property name="visible">True</property>
@ -251,30 +281,39 @@
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="save_message_checkbutton">
<property name="label" translatable="yes">_Save subscription message</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>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="register_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label224">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">You have to register with this transport
to be able to add a contact from this
@ -283,18 +322,22 @@ proceed.</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="register_button">
<property name="label" translatable="yes">_Register</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_register_button_clicked"/>
<signal name="clicked" handler="on_register_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -304,12 +347,15 @@ proceed.</property>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">7</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="connected_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="label" translatable="yes">You must be connected to the transport to be able
to add a contact from this protocol.</property>
@ -323,18 +369,21 @@ to add a contact from this protocol.</property>
<child>
<object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="spacing">12</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_cancel_button_clicked"/>
<signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -345,13 +394,15 @@ to add a contact from this protocol.</property>
<child>
<object class="GtkButton" id="add_button">
<property name="label">gtk-add</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_add_button_clicked"/>
<signal name="clicked" handler="on_add_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -369,9 +420,6 @@ to add a contact from this protocol.</property>
</object>
</child>
</object>
<object class="GtkTextBuffer" id="textbuffer1">
<property name="text" translatable="yes">I would like to add you to my contact list.</property>
</object>
<object class="GtkListStore" id="groups_liststore">
<columns>
<!-- column-name item -->
@ -390,4 +438,7 @@ to add a contact from this protocol.</property>
<column type="gchararray"/>
</columns>
</object>
<object class="GtkTextBuffer" id="textbuffer1">
<property name="text" translatable="yes">I would like to add you to my contact list.</property>
</object>
</interface>

114
data/gui/dubbleinput_dialog.ui
View File

@ -1,50 +1,105 @@
<?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="GtkDialog" id="dubbleinput_dialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<signal name="destroy" handler="on_dubbleinput_dialog_destroy"/>
<signal name="destroy" handler="on_dubbleinput_dialog_destroy" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox10">
<object class="GtkBox" id="dialog-vbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox76">
<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="GtkHBox" id="hbox2960">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image507">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@ -63,6 +118,7 @@
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@ -82,50 +138,10 @@
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area9">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>

142
data/gui/esession_info_window.ui
View File

@ -1,93 +1,46 @@
<?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="GtkDialog" id="esession_info_window">
<property name="can_focus">False</property>
<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">5</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkHBox" id="title-hbox">
<property name="visible">True</property>
<child>
<object class="GtkImage" id="security_image">
<property name="width_request">32</property>
<property name="height_request">32</property>
<property name="visible">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="verification_status_label">
<property name="visible">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="spacing">4</property>
<child>
<object class="GtkLabel" id="info_display">
<property name="visible">True</property>
<property name="label" translatable="yes">(&lt;b&gt;ESession&lt;/b&gt; info)</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">10</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="verify_now_button">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<signal name="clicked" handler="on_verify_now_button_clicked"/>
<property name="use_action_appearance">False</property>
<signal name="clicked" handler="on_verify_now_button_clicked" swapped="no"/>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-apply</property>
</object>
<packing>
@ -99,6 +52,7 @@
<child>
<object class="GtkLabel" id="button_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Verify</property>
<property name="use_underline">True</property>
</object>
@ -122,11 +76,13 @@
<child>
<object class="GtkButton" id="close_button3">
<property name="label">gtk-close</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_stock">True</property>
<signal name="clicked" handler="on_close_button_clicked"/>
<signal name="clicked" handler="on_close_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -137,10 +93,74 @@
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="title-hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="security_image">
<property name="width_request">32</property>
<property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="verification_status_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
<object class="GtkLabel" id="info_display">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">(&lt;b&gt;ESession&lt;/b&gt; info)</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">10</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<action-widgets>

115
data/gui/input_dialog.ui
View File

@ -1,51 +1,106 @@
<?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="GtkDialog" id="input_dialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<signal name="destroy" handler="on_input_dialog_destroy"/>
<signal name="delete_event" handler="on_input_dialog_delete_event"/>
<signal name="destroy" handler="on_input_dialog_destroy" swapped="no"/>
<signal name="delete-event" handler="on_input_dialog_delete_event" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox10">
<object class="GtkBox" id="dialog-vbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="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">6</property>
<child>
<object class="GtkHBox" id="hbox2960">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image507">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@ -62,50 +117,10 @@
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area9">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>

150
data/gui/input_text_dialog.ui
View File

@ -1,89 +1,32 @@
<?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="GtkDialog" id="input_dialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="default_width">400</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<signal name="destroy" handler="on_input_dialog_destroy"/>
<signal name="destroy" handler="on_input_dialog_destroy" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox10">
<object class="GtkBox" id="dialog-vbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkVBox" id="vbox76">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox2960">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image507">
<property name="visible">True</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label">
<property name="visible">True</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="input_textview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="wrap_mode">word</property>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area9">
<object class="GtkButtonBox" id="dialog-action_area9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@ -95,11 +38,13 @@
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@ -111,10 +56,81 @@
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox76">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox2960">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image507">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="vscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="input_textview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="wrap_mode">word</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>

313
data/gui/roster_window.ui
View File

@ -1,10 +1,95 @@
<?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="GtkAccelGroup" id="accelgroup1"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-jump-to</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-help</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-properties</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-disconnect</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-info</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-new</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-connect</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-find</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-network</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-properties</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-justify-fill</property>
<property name="icon-size">1</property>
</object>
<object class="GtkWindow" id="roster_window">
<property name="width_request">85</property>
<property name="height_request">200</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Gajim</property>
<property name="role">roster</property>
<property name="default_width">250</property>
@ -12,30 +97,36 @@
<accel-groups>
<group name="accelgroup1"/>
</accel-groups>
<signal name="key_press_event" handler="on_roster_window_key_press_event"/>
<signal name="delete_event" handler="on_roster_window_delete_event"/>
<signal name="focus_in_event" handler="on_roster_window_focus_in_event"/>
<signal name="focus_out_event" handler="on_roster_window_focus_out_event"/>
<signal name="popup_menu" handler="on_roster_window_popup_menu"/>
<signal name="key-press-event" handler="on_roster_window_key_press_event" swapped="no"/>
<signal name="delete-event" handler="on_roster_window_delete_event" swapped="no"/>
<signal name="focus-in-event" handler="on_roster_window_focus_in_event" swapped="no"/>
<signal name="focus-out-event" handler="on_roster_window_focus_out_event" swapped="no"/>
<signal name="popup-menu" handler="on_roster_window_popup_menu" swapped="no"/>
<child>
<object class="GtkVBox" id="roster_vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="can_focus">False</property>
<child>
<object class="GtkMenuBar" id="menubar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="actions_menu">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Actions</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_actions_menuitem_activate"/>
<signal name="activate" handler="on_actions_menuitem_activate" swapped="no"/>
<child type="submenu">
<object class="GtkMenu" id="actions_menu_menu">
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="new_chat_menuitem">
<property name="label" translatable="yes">_Start Chat...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image1</property>
<property name="use_stock">False</property>
@ -45,6 +136,8 @@
<child>
<object class="GtkImageMenuItem" id="send_single_message_menuitem">
<property name="label" translatable="yes">Send Single _Message...</property>
<property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image2</property>
<property name="use_stock">False</property>
@ -54,7 +147,9 @@
<child>
<object class="GtkImageMenuItem" id="join_gc_menuitem">
<property name="label" translatable="yes">Join _Group Chat...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image3</property>
<property name="use_stock">False</property>
@ -64,12 +159,15 @@
<child>
<object class="GtkSeparatorMenuItem" id="separatormenuitem1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="add_new_contact_menuitem">
<property name="label" translatable="yes">Add _Contact...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image4</property>
<property name="use_stock">False</property>
@ -79,7 +177,9 @@
<child>
<object class="GtkImageMenuItem" id="service_disco_menuitem">
<property name="label" translatable="yes">_Discover Services</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image5</property>
<property name="use_stock">False</property>
@ -88,7 +188,9 @@
</child>
<child>
<object class="GtkMenuItem" id="advanced_menuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Advanced</property>
<property name="use_underline">True</property>
</object>
@ -96,17 +198,20 @@
<child>
<object class="GtkSeparatorMenuItem" id="separator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="quit_menuitem">
<property name="label">gtk-quit</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<accelerator key="Q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="on_quit_request"/>
<signal name="activate" handler="on_quit_request" swapped="no"/>
</object>
</child>
</object>
@ -115,28 +220,35 @@
</child>
<child>
<object class="GtkMenuItem" id="edit_menu">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Edit</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_edit_menuitem_activate"/>
<signal name="activate" handler="on_edit_menuitem_activate" swapped="no"/>
<child type="submenu">
<object class="GtkMenu" id="edit_menu_menu">
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="accounts_menuitem">
<property name="label" translatable="yes">_Accounts</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image6</property>
<property name="use_stock">False</property>
<property name="accel_group">accelgroup1</property>
<accelerator key="A" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
<signal name="activate" handler="on_accounts_menuitem_activate"/>
<signal name="activate" handler="on_accounts_menuitem_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="profile_avatar_menuitem">
<property name="label" translatable="yes">Profile, A_vatar</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image7</property>
<property name="use_stock">False</property>
@ -146,27 +258,32 @@
<child>
<object class="GtkSeparatorMenuItem" id="separator2">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="preferences_menuitem">
<property name="label">gtk-preferences</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="on_preferences_menuitem_activate"/>
<signal name="activate" handler="on_preferences_menuitem_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="plugins_menuitem">
<property name="label" translatable="yes">P_lugins</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image13</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_plugins_menuitem_activate"/>
<signal name="activate" handler="on_plugins_menuitem_activate" swapped="no"/>
</object>
</child>
</object>
@ -175,76 +292,92 @@
</child>
<child>
<object class="GtkMenuItem" id="view_menu">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_View</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_view_menu_activate"/>
<signal name="activate" handler="on_view_menu_activate" swapped="no"/>
<child type="submenu">
<object class="GtkMenu" id="view_menu_menu">
<property name="can_focus">False</property>
<child>
<object class="GtkCheckMenuItem" id="show_offline_contacts_menuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Show _Offline Contacts</property>
<property name="use_underline">True</property>
<accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="on_show_offline_contacts_menuitem_activate"/>
<signal name="activate" handler="on_show_offline_contacts_menuitem_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="show_only_active_contacts_menuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Show Only _Active Contacts</property>
<property name="use_underline">True</property>
<accelerator key="Y" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="on_show_only_active_contacts_menuitem_activate"/>
<signal name="activate" handler="on_show_only_active_contacts_menuitem_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="show_transports_menuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Show T_ransports</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_show_transports_menuitem_activate"/>
<signal name="activate" handler="on_show_transports_menuitem_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="show_roster_menuitem">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</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">Show _Roster</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<accelerator key="R" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="toggled" handler="on_show_roster_menuitem_toggled"/>
<signal name="toggled" handler="on_show_roster_menuitem_toggled" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="separator3">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="file_transfers_menuitem">
<property name="label" translatable="yes">File _Transfers</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image8</property>
<property name="use_stock">False</property>
<property name="accel_group">accelgroup1</property>
<accelerator key="T" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="on_file_transfers_menuitem_activate"/>
<signal name="activate" handler="on_file_transfers_menuitem_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="history_menuitem">
<property name="label" translatable="yes">_History</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_underline">True</property>
<property name="image">image9</property>
<property name="use_stock">False</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_history_menuitem_activate"/>
<signal name="activate" handler="on_history_menuitem_activate" swapped="no"/>
</object>
</child>
</object>
@ -253,70 +386,84 @@
</child>
<child>
<object class="GtkMenuItem" id="help_menu">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="help_menu_menu">
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="contents_menuitem">
<property name="label" translatable="yes">_Contents</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Help online</property>
<property name="use_underline">True</property>
<property name="image">image10</property>
<property name="use_stock">False</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_contents_menuitem_activate"/>
<signal name="activate" handler="on_contents_menuitem_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="faq_menuitem">
<property name="label" translatable="yes">_FAQ</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Frequently Asked Questions (online)</property>
<property name="use_underline">True</property>
<property name="image">image11</property>
<property name="use_stock">False</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_faq_menuitem_activate"/>
<signal name="activate" handler="on_faq_menuitem_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="keyboard_shortcuts_menuitem">
<property name="label" translatable="yes">Keyboard Shortcuts</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image14</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_keyboard_shortcuts_menuitem_activate"/>
<signal name="activate" handler="on_keyboard_shortcuts_menuitem_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="menuitem1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="features_menuitem">
<property name="label" translatable="yes">Fea_tures</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_underline">True</property>
<property name="image">image12</property>
<property name="use_stock">False</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_features_menuitem_activate"/>
<signal name="activate" handler="on_features_menuitem_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="about_menuitem">
<property name="label">gtk-about</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_about_menuitem_activate"/>
<signal name="activate" handler="on_about_menuitem_activate" swapped="no"/>
</object>
</child>
</object>
@ -335,24 +482,24 @@
<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>
<signal name="notify" handler="on_roster_hpaned_notify"/>
<signal name="notify" handler="on_roster_hpaned_notify" swapped="no"/>
<child>
<object class="GtkVBox" id="roster_vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkEntry" id="rfilter_entry">
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="editable">False</property>
<property name="primary_icon_stock">gtk-clear</property>
<property name="primary_icon_activatable">True</property>
<signal name="changed" handler="on_rfilter_entry_changed"/>
<signal name="icon_press" handler="on_rfilter_entry_icon_press"/>
<signal name="changed" handler="on_rfilter_entry_changed" swapped="no"/>
<signal name="icon-press" handler="on_rfilter_entry_icon_press" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@ -361,36 +508,43 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView" id="roster_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
<property name="headers_visible">False</property>
<property name="reorderable">True</property>
<signal name="row_expanded" handler="on_roster_treeview_row_expanded"/>
<signal name="key_press_event" handler="on_roster_treeview_key_press_event"/>
<signal name="scroll_event" handler="on_roster_treeview_scroll_event"/>
<signal name="leave_notify_event" handler="on_roster_treeview_leave_notify_event"/>
<signal name="button_press_event" handler="on_roster_treeview_button_press_event"/>
<signal name="row_activated" handler="on_roster_treeview_row_activated"/>
<signal name="row_collapsed" handler="on_roster_treeview_row_collapsed"/>
<signal name="motion_notify_event" handler="on_roster_treeview_motion_notify_event"/>
<signal name="button_release_event" handler="on_roster_treeview_button_release_event"/>
<signal name="row-expanded" handler="on_roster_treeview_row_expanded" swapped="no"/>
<signal name="key-press-event" handler="on_roster_treeview_key_press_event" swapped="no"/>
<signal name="scroll-event" handler="on_roster_treeview_scroll_event" swapped="no"/>
<signal name="leave-notify-event" handler="on_roster_treeview_leave_notify_event" swapped="no"/>
<signal name="button-press-event" handler="on_roster_treeview_button_press_event" swapped="no"/>
<signal name="row-activated" handler="on_roster_treeview_row_activated" swapped="no"/>
<signal name="row-collapsed" handler="on_roster_treeview_row_collapsed" swapped="no"/>
<signal name="motion-notify-event" handler="on_roster_treeview_motion_notify_event" swapped="no"/>
<signal name="button-release-event" handler="on_roster_treeview_button_release_event" swapped="no"/>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="status_combobox">
<property name="visible">True</property>
<signal name="changed" handler="on_status_combobox_changed"/>
<property name="can_focus">False</property>
<signal name="changed" handler="on_status_combobox_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@ -405,81 +559,12 @@
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkAccelGroup" id="accelgroup1"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="stock">gtk-connect</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="stock">gtk-find</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="stock">gtk-network</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image7">
<property name="visible">True</property>
<property name="stock">gtk-properties</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image9">
<property name="visible">True</property>
<property name="stock">gtk-justify-fill</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image10">
<property name="visible">True</property>
<property name="stock">gtk-help</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image11">
<property name="visible">True</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image12">
<property name="visible">True</property>
<property name="stock">gtk-properties</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image13">
<property name="visible">True</property>
<property name="stock">gtk-disconnect</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image14">
<property name="visible">True</property>
<property name="stock">gtk-info</property>
<property name="icon-size">1</property>
</object>
</interface>

12
src/chat_control.py
View File

@ -255,7 +255,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
Derives types SHOULD implement this, rather than connection to the even
itself
"""
event = Gdk.Event(Gdk.KEY_PRESS)
event = Gdk.Event(Gdk.EventType.KEY_PRESS)
event.keyval = event_keyval
event.state = event_keymod
event.time = 0
@ -709,7 +709,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
def set_emoticons_menu_position(w, msg_tv=self.msg_textview):
window = msg_tv.get_window(Gtk.TextWindowType.WIDGET)
# get the window position
origin = window.get_origin()
origin = window.get_origin()[1:]
size = window.get_size()
buf = msg_tv.get_buffer()
# get the cursor position
@ -734,7 +734,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
return (x, y, True) # push_in True
gajim.interface.emoticon_menuitem_clicked = self.append_emoticon
gajim.interface.emoticons_menu.popup(None, None,
set_emoticons_menu_position, 1, 0)
set_emoticons_menu_position, None, 1, 0)
def _on_message_textview_key_press_event(self, widget, event):
if event.keyval == Gdk.KEY_space:
@ -788,7 +788,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
xhtml = self.msg_textview.get_xhtml()
# construct event instance from binding
event = Gdk.Event(Gdk.KEY_PRESS) # it's always a key-press here
event = Gdk.Event(Gdk.EventType.KEY_PRESS) # it's always a key-press here
event.keyval = event_keyval
event.state = event_keymod
event.time = 0 # assign current time
@ -1981,7 +1981,7 @@ class ChatControl(ChatControlBase):
menu.connect('selection-done', lambda w: w.destroy())
# show the menu
menu.show_all()
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
return True
def on_location_eventbox_button_release_event(self, widget, event):
@ -3049,7 +3049,7 @@ class ChatControl(ChatControlBase):
window.window.shape_combine_mask(mask, 0, 0)
# make the bigger avatar window show up centered
x0, y0 = small_avatar.window.get_origin()
x0, y0 = small_avatar.window.get_origin()[1:]
x0 += small_avatar.allocation.x
y0 += small_avatar.allocation.y
center_x= x0 + (small_avatar.allocation.width / 2)

6
src/conversation_textview.py
View File

@ -600,7 +600,7 @@ class ConversationTextview(GObject.GObject):
break
if xep0184_warning and not self.xep0184_warning_tooltip.win:
# check if the current pointer is still over the line
position = self.tv.get_window(Gtk.TextWindowType.TEXT).get_origin()
position = self.tv.get_window(Gtk.TextWindowType.TEXT).get_origin()[1:]
self.xep0184_warning_tooltip.show_tooltip(_('This icon indicates that '
'this message has not yet\nbeen received by the remote end. '
"If this icon stays\nfor a long time, it's likely the message got "
@ -619,7 +619,7 @@ class ConversationTextview(GObject.GObject):
break
if over_line and not self.line_tooltip.win:
# check if the current pointer is still over the line
position = self.tv.get_window(Gtk.TextWindowType.TEXT).get_origin()
position = self.tv.get_window(Gtk.TextWindowType.TEXT).get_origin()[1:]
self.line_tooltip.show_tooltip(_('Text below this line is what has '
'been said since the\nlast time you paid attention to this group '
'chat'), 8, position[1] + pointer[2])
@ -945,7 +945,7 @@ class ConversationTextview(GObject.GObject):
childs[0].hide() # copy link location
childs[1].hide() # open link in browser
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
def hyperlink_handler(self, texttag, widget, event, iter_, kind):
if event.type == Gdk.EventType.BUTTON_PRESS:

8
src/dialogs.py
View File

@ -30,6 +30,7 @@
##
from gi.repository import Gtk
from gi.repository import Gdk
from gi.repository import GdkPixbuf
from gi.repository import GObject
import os
@ -915,11 +916,11 @@ class AddNewContactWindow:
# Combobox with transport/jabber icons
liststore = Gtk.ListStore(str, GdkPixbuf.Pixbuf, str)
cell = Gtk.CellRendererPixbuf()
self.protocol_combobox.pack_start(cell, False, True, 0)
self.protocol_combobox.pack_start(cell, False)
self.protocol_combobox.add_attribute(cell, 'pixbuf', 1)
cell = Gtk.CellRendererText()
cell.set_property('xpad', 5)
self.protocol_combobox.pack_start(cell, True, True, 0)
self.protocol_combobox.pack_start(cell, True)
self.protocol_combobox.add_attribute(cell, 'text', 0)
self.protocol_combobox.set_model(liststore)
uf_type = {'jabber': 'Jabber', 'aim': 'AIM', 'gadu-gadu': 'Gadu Gadu',
@ -996,7 +997,7 @@ class AddNewContactWindow:
self.group_comboboxentry.set_active(i)
i += 1
self.set_transient_for(gajim.interface.roster.window)
self.window.set_transient_for(gajim.interface.roster.window)
self.window.show_all()
if self.account:
@ -2703,6 +2704,7 @@ class NewChatDialog(InputDialog):
title = _('Start Chat')
prompt_text = _('Fill in the nickname or the Jabber ID of the contact you would like\nto send a chat message to:')
InputDialog.__init__(self, title, prompt_text, is_modal=False)
self.input_entry.set_placeholder_text(_('Nickname / Jabber ID'))
self.completion_dict = {}
liststore = gtkgui_helpers.get_completion_liststore(self.input_entry)

2
src/disco.py
View File

@ -1244,7 +1244,7 @@ class ToplevelAgentBrowser(AgentBrowser):
# bounding rectangle of coordinates for the cell within the treeview
rect = view.get_cell_area(props[0], props[1])
# position of the treeview on the screen
position = view.window.get_origin()
position = view.get_window().get_origin()[1:]
self.tooltip.show_tooltip(state, rect.height, position[1] + rect.y)
else:
self.tooltip.hide_tooltip()

4
src/filetransfers_window.py
View File

@ -963,7 +963,7 @@ class FileTransfersWindow:
# bounding rectangle of coordinates for the cell within the treeview
rect = self.tree.get_cell_area(props[0], props[1])
# position of the treeview on the screen
position = widget.window.get_origin()
position = widget.get_window().get_origin()[1:]
self.tooltip.show_tooltip(file_props, rect.height,
position[1] + rect.y + self.height_diff)
else:
@ -989,7 +989,7 @@ class FileTransfersWindow:
event_button = gtkgui_helpers.get_possible_button_event(event)
self.file_transfers_menu.show_all()
self.file_transfers_menu.popup(None, self.tree, None,
self.file_transfers_menu.popup(None, self.tree, None, None,
event_button, event.time)
def on_transfers_list_key_press_event(self, widget, event):

6
src/groupchat_control.py
View File

@ -2151,7 +2151,7 @@ class GroupchatControl(ChatControlBase):
# Textview is not sensitive, don't handle keypress
return
# construct event instance from binding
event = Gdk.Event(Gdk.KEY_PRESS) # it's always a key-press here
event = Gdk.Event(Gdk.EventType.KEY_PRESS) # it's always a key-press here
event.keyval = event_keyval
event.state = event_keymod
event.time = 0 # assign current time
@ -2452,7 +2452,7 @@ class GroupchatControl(ChatControlBase):
# show the popup now!
menu = xml.get_object('gc_occupants_menu')
menu.show_all()
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
def _start_private_message(self, nick):
gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick)
@ -2591,7 +2591,7 @@ class GroupchatControl(ChatControlBase):
# as it was before setting the timeout
if props and self.tooltip.id == props[0]:
rect = self.list_treeview.get_cell_area(props[0], props[1])
position = self.list_treeview.window.get_origin()
position = self.list_treeview.get_window().get_origin()[1:]
self.tooltip.show_tooltip(contact, rect.height,
position[1] + rect.y)
else:

21
src/gtkgui_helpers.py
View File

@ -109,12 +109,9 @@ def get_completion_liststore(entry):
liststore = Gtk.ListStore(GdkPixbuf.Pixbuf, str)
render_pixbuf = Gtk.CellRendererPixbuf()
completion.pack_start(render_pixbuf, False, True, 0)
completion.pack_start(render_pixbuf, False)
completion.add_attribute(render_pixbuf, 'pixbuf', 0)
render_text = Gtk.CellRendererText()
completion.pack_start(render_text, True, True, 0)
completion.add_attribute(render_text, 'text', 1)
completion.set_property('text_column', 1)
completion.set_model(liststore)
entry.set_completion(completion)
@ -125,10 +122,11 @@ def popup_emoticons_under_button(menu, button, parent_win):
"""
Popup the emoticons menu under button, which is in parent_win
"""
window_x1, window_y1 = parent_win.get_origin()
def position_menu_under_button(menu):
window_x1, window_y1 = parent_win.get_origin()[1:]
def position_menu_under_button(menu, data):
# inline function, which will not keep refs, when used as CB
button_x, button_y = button.allocation.x, button.allocation.y
alloc = button.get_allocation()
button_x, button_y = alloc.x, alloc.y
# now convert them to X11-relative
window_x, window_y = window_x1, window_y1
@ -138,10 +136,9 @@ def popup_emoticons_under_button(menu, button, parent_win):
menu_height = menu.size_request()[1]
## should we pop down or up?
if (y + button.allocation.height + menu_height
< Gdk.Screen.height()):
if (y + alloc.height + menu_height < Gdk.Screen.height()):
# now move the menu below the button
y += button.allocation.height
y += alloc.height
else:
# now move the menu above the button
y -= menu_height
@ -150,7 +147,7 @@ def popup_emoticons_under_button(menu, button, parent_win):
push_in = True
return (x, y, push_in)
menu.popup(None, None, position_menu_under_button, 1, 0)
menu.popup(None, None, position_menu_under_button, None, 1, 0)
def get_theme_font_for_option(theme, option):
"""
@ -806,7 +803,7 @@ def get_possible_button_event(event):
"""
Mouse or keyboard caused the event?
"""
if event.type == Gdk.KEY_PRESS:
if event.type == Gdk.EventType.KEY_PRESS:
return 0 # no event.button so pass 0
# BUTTON_PRESS event, so pass event.button
return event.button

2
src/history_manager.py
View File

@ -464,7 +464,7 @@ class HistoryManager:
self.on_delete_menuitem_activate, widget)
xml.connect_signals(self)
xml.get_object('context_menu').popup(None, None, None,
xml.get_object('context_menu').popup(None, None, None, None,
event.button, event.time)
return True

2
src/htmltextview.py
View File

@ -843,7 +843,7 @@ class HtmlTextView(Gtk.TextView):
text = getattr(tag, 'title', False)
if text:
pointer = self.get_pointer()
position = self.get_window(Gtk.TextWindowType.TEXT).get_origin()
position = self.get_window(Gtk.TextWindowType.TEXT).get_origin()[1:]
self.tooltip.show_tooltip(text, 8, position[1] + pointer[2])
def __motion_notify_event(self, widget, event):

8
src/message_window.py
View File

@ -325,7 +325,7 @@ class MessageWindow(object):
# NOTE: handles mykeypress which is custom signal; see message_textview.py
# construct event instance from binding
event = Gdk.Event(Gdk.KEY_PRESS) # it's always a key-press here
event = Gdk.Event(Gdk.EventType.KEY_PRESS) # it's always a key-press here
event.keyval = event_keyval
event.state = event_keymod
event.time = 0 # assign current time
@ -395,7 +395,7 @@ class MessageWindow(object):
elif keyval in (Gdk.KEY_Page_Up, Gdk.KEY_Page_Down):
# CTRL + PageUp | PageDown
# Create event and send it to notebook
event = Gdk.Event(Gdk.KEY_PRESS)
event = Gdk.Event(Gdk.EventType.KEY_PRESS)
event.window = self.window.window
event.time = int(time.time())
event.state = Gdk.ModifierType.CONTROL_MASK
@ -686,7 +686,7 @@ class MessageWindow(object):
return self.window.is_active()
def get_origin(self):
return self.window.window.get_origin()
return self.window.get_window().get_origin()
def get_control(self, key, acct):
"""
@ -791,7 +791,7 @@ class MessageWindow(object):
def popup_menu(self, event):
menu = self.get_active_control().prepare_context_menu()
# show the menu
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
menu.show_all()
def _on_notebook_switch_page(self, notebook, page, page_num):

2
src/profile_window.py
View File

@ -219,7 +219,7 @@ class ProfileWindow:
menu.connect('selection-done', lambda w:w.destroy())
# show the menu
menu.show_all()
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
elif event.button == 1: # left click
self.on_set_avatar_button_clicked(widget)

20
src/roster_window.py
View File

@ -2392,7 +2392,7 @@ class RosterWindow:
if isinstance(w, dict):
self.close_all_from_dict(w)
else:
w.window.destroy()
w.window().destroy()
def close_all(self, account, force=False):
"""
@ -2403,7 +2403,7 @@ class RosterWindow:
self.close_all_from_dict(gajim.interface.instances[account])
for ctrl in gajim.interface.msg_win_mgr.get_controls(acct=account):
ctrl.parent_win.remove_tab(ctrl, ctrl.parent_win.CLOSE_CLOSE_BUTTON,
force = force)
force=force)
def on_roster_window_delete_event(self, widget, event):
"""
@ -4113,7 +4113,7 @@ class RosterWindow:
self.on_history(widget, contact, account)
def on_roster_window_popup_menu(self, widget):
event = Gdk.Event(Gdk.KEY_PRESS)
event = Gdk.Event(Gdk.EventType.KEY_PRESS)
self.show_treeview_menu(event)
def on_row_activated(self, widget, path):
@ -4909,7 +4909,7 @@ class RosterWindow:
menu.attach_to_widget(self.tree, None)
menu.connect('selection-done', gtkgui_helpers.destroy_widget)
menu.show_all()
menu.popup(None, None, None, 1, etime)
menu.popup(None, None, None, None, 1, etime)
################################################################################
### Everything about images and icons....
@ -5751,7 +5751,7 @@ class RosterWindow:
menu.attach_to_widget(self.tree, None)
menu.connect('selection-done', gtkgui_helpers.destroy_widget)
menu.show_all()
menu.popup(None, None, None, event_button, event.time)
menu.popup(None, None, None, None, event_button, event.time)
def make_group_menu(self, event, titer):
"""
@ -5913,7 +5913,7 @@ class RosterWindow:
menu.attach_to_widget(self.tree, None)
menu.connect('selection-done', gtkgui_helpers.destroy_widget)
menu.show_all()
menu.popup(None, None, None, event_button, event.time)
menu.popup(None, None, None, None, event_button, event.time)
def make_contact_menu(self, event, titer):
"""
@ -5926,7 +5926,7 @@ class RosterWindow:
menu = gui_menu_builder.get_contact_menu(contact, account)
event_button = gtkgui_helpers.get_possible_button_event(event)
menu.attach_to_widget(self.tree, None)
menu.popup(None, None, None, event_button, event.time)
menu.popup(None, None, None, None, event_button, event.time)
def make_multiple_contact_menu(self, event, iters):
"""
@ -6030,7 +6030,7 @@ class RosterWindow:
menu.attach_to_widget(self.tree, None)
menu.connect('selection-done', gtkgui_helpers.destroy_widget)
menu.show_all()
menu.popup(None, None, None, event_button, event.time)
menu.popup(None, None, None, None, event_button, event.time)
def make_transport_menu(self, event, titer):
"""
@ -6169,7 +6169,7 @@ class RosterWindow:
menu.attach_to_widget(self.tree, None)
menu.connect('selection-done', gtkgui_helpers.destroy_widget)
menu.show_all()
menu.popup(None, None, None, event_button, event.time)
menu.popup(None, None, None, None, event_button, event.time)
def make_groupchat_menu(self, event, titer):
model = self.modelfilter
@ -6219,7 +6219,7 @@ class RosterWindow:
menu.attach_to_widget(self.tree, None)
menu.connect('selection-done', gtkgui_helpers.destroy_widget)
menu.show_all()
menu.popup(None, None, None, event_button, event.time)
menu.popup(None, None, None, None, event_button, event.time)
def get_and_connect_advanced_menuitem_menu(self, account):
"""

3
src/statusicon.py
View File

@ -369,8 +369,7 @@ class StatusIcon:
self.added_hide_menuitem = True
self.systray_context_menu.show_all()
self.systray_context_menu.popup(None, None, None, 0,
event_time)
self.systray_context_menu.popup(None, None, None, None, 0, event_time)
def on_show_all_events_menuitem_activate(self, widget):
events = gajim.events.get_systray_events()

16
src/tooltips.py
View File

@ -93,8 +93,8 @@ class BaseTooltip:
self.win.set_type_hint(Gdk.WindowTypeHint.TOOLTIP)
self.win.set_events(Gdk.EventMask.POINTER_MOTION_MASK)
self.win.connect_after('expose_event', self.expose)
self.win.connect('size-request', self.on_size_request)
# self.win.connect_after('draw', self.on_draw)
# self.win.connect('size-request', self.on_size_request)
self.win.connect('motion-notify-event', self.motion_notify_event)
self.screen = self.win.get_screen()
@ -133,12 +133,12 @@ class BaseTooltip:
self.preferred_position[1] = 0
self.win.move(self.preferred_position[0], self.preferred_position[1])
def expose(self, widget, event):
style = self.win.get_style()
size = self.win.get_size()
style.paint_shadow(self.win.window, Gtk.StateType.NORMAL, Gtk.ShadowType.OUT,
None, self.win, 'tooltip', 0, 0, size[0], size[1])
return True
# def expose(self, widget, event):
# style = self.win.get_style()
# size = self.win.get_size()
# style.paint_shadow(self.win.window, Gtk.StateType.NORMAL, Gtk.ShadowType.OUT,
# None, self.win, 'tooltip', 0, 0, size[0], size[1])
# return True
def show_tooltip(self, data, widget_height, widget_y_position):
"""

4
src/vcard.py
View File

@ -190,7 +190,7 @@ class VcardWindow:
menu.connect('selection-done', lambda w:w.destroy())
# show the menu
menu.show_all()
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
def set_value(self, entry_name, value):
try:
@ -533,7 +533,7 @@ class ZeroconfVcardWindow:
menu.connect('selection-done', lambda w:w.destroy())
# show the menu
menu.show_all()
menu.popup(None, None, None, event.button, event.time)
menu.popup(None, None, None, None, event.button, event.time)
def set_value(self, entry_name, value):
try: