changeset ffc9d25174bf in /home/hg/repos/gajim
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=ffc9d25174bf
description: more tooltips in chat control
diffstat:
data/gui/chat_control.ui | 168 +++++++++-------------------------------------
src/chat_control.py | 2 +-
2 files changed, 36 insertions(+), 134 deletions(-)
diffs (truncated from 783 to 300 lines):
diff -r 18dad9eb4f83 -r ffc9d25174bf data/gui/chat_control.ui
--- a/data/gui/chat_control.ui Tue Jul 23 20:12:55 2013 +0400
+++ b/data/gui/chat_control.ui Wed Jul 24 10:06:58 2013 +0200
@@ -1,18 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">110</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="upper">110</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy project-wide -->
<object class="GtkHBox" id="chat_control_hbox">
<property name="can_focus">True</property>
<property name="spacing">1</property>
@@ -20,6 +9,7 @@
<object class="GtkVBox" id="chat_control_vbox">
<property name="can_focus">True</property>
<property name="border_width">3</property>
+ <property name="orientation">vertical</property>
<property name="spacing">1</property>
<child>
<object class="GtkHPaned" id="hpaned1">
@@ -28,25 +18,21 @@
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkAlignment" id="alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="left_padding">3</property>
<property name="right_padding">3</property>
<child>
<object class="GtkEventBox" id="banner_eventbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkHBox" id="hbox3004">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkImage"
id="banner_status_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="ypad">5</property>
<property
name="stock">gtk-missing-image</property>
</object>
@@ -60,98 +46,78 @@
<child>
<object class="GtkVBox" id="banner_vbox">
<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="border_width">5</property>
+ <property
name="orientation">vertical</property>
<child>
<object class="GtkLabel"
id="banner_name_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label"><span
weight="heavy" size="large">Contact name</span></property>
<property name="use_markup">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="banner_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label">label</property>
<property name="use_markup">True</property>
<property name="selectable">True</property>
- <signal name="populate-popup"
handler="on_banner_label_populate_popup" swapped="no"/>
+ <signal name="populate_popup"
handler="on_banner_label_populate_popup"/>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</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="hbox2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
<object class="GtkImage" id="mood_image">
- <property name="can_focus">False</property>
<property
name="no_show_all">True</property>
<property name="stock">None</property>
<property name="icon-size">1</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkImage" id="activity_image">
- <property name="can_focus">False</property>
<property
name="no_show_all">True</property>
<property name="stock">None</property>
<property name="icon-size">1</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkImage" id="tune_image">
- <property name="can_focus">False</property>
<property
name="no_show_all">True</property>
<property name="stock">None</property>
<property name="icon-size">1</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkEventBox"
id="location_eventbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property
name="visible_window">False</property>
<child>
<object class="GtkImage"
id="location_image">
- <property
name="can_focus">False</property>
<property
name="no_show_all">True</property>
<property name="stock">None</property>
<property name="icon-size">1</property>
@@ -167,26 +133,20 @@
<child>
<object class="GtkImage"
id="audio_banner_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">None</property>
<property name="icon-size">1</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkImage"
id="video_banner_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">None</property>
<property name="icon-size">1</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
@@ -194,14 +154,11 @@
<object class="GtkAlignment" id="alignment3">
<property
name="width_request">11</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
@@ -215,12 +172,10 @@
<child>
<object class="GtkEventBox" id="avatar_eventbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property
name="visible_window">False</property>
<child>
<object class="GtkImage" id="avatar_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">None</property>
</object>
</child>
@@ -245,27 +200,26 @@
<child>
<object class="GtkVBox" id="vbox106">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow"
id="conversation_scrolledwindow">
<property name="height_request">60</property>
<property name="can_focus">True</property>
<property name="border_width">3</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox">
<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>
<child>
<object class="GtkButton" id="authentication_button">
@@ -277,7 +231,6 @@
<property name="focus_on_click">False</property>
<child>
<object class="GtkImage" id="lock_image">
- <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="stock">gtk-dialog-authentication</property>
<property name="icon-size">1</property>
@@ -286,7 +239,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -303,43 +255,36 @@
</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>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="actions_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkButton" id="emoticons_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Show
a list of emoticons (Alt+M)</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<child>
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
