changeset 5e2745dc45d2 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=5e2745dc45d2
description: improve jingle audio GUI
diffstat:
data/gui/chat_control.ui | 1372 +++++++++++++++++++++++----------------------
src/chat_control.py | 33 +-
2 files changed, 728 insertions(+), 677 deletions(-)
diffs (truncated from 1591 to 300 lines):
diff -r 54f3f403023e -r 5e2745dc45d2 data/gui/chat_control.ui
--- a/data/gui/chat_control.ui Sun Jun 20 22:46:25 2010 +0200
+++ b/data/gui/chat_control.ui Sun Jun 20 22:48:49 2010 +0200
@@ -5,170 +5,114 @@
<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="GtkHBox" id="hbox3">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkAlignment" id="alignment">
<property name="visible">True</property>
+ <property name="left_padding">3</property>
+ <property name="right_padding">3</property>
<child>
- <object class="GtkAlignment" id="alignment">
+ <object class="GtkEventBox" id="banner_eventbox">
<property name="visible">True</property>
- <property name="left_padding">3</property>
- <property name="right_padding">3</property>
<child>
- <object class="GtkEventBox" id="banner_eventbox">
+ <object class="GtkHBox" id="hbox3004">
<property name="visible">True</property>
<child>
- <object class="GtkHBox" id="hbox3004">
+ <object class="GtkImage" id="banner_status_image">
<property name="visible">True</property>
+ <property name="ypad">5</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="banner_vbox">
+ <property name="visible">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="border_width">5</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkImage" id="banner_status_image">
+ <object class="GtkLabel" id="banner_name_label">
<property name="visible">True</property>
- <property name="ypad">5</property>
- <property name="stock">gtk-missing-image</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">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="banner_vbox">
+ <object class="GtkLabel" id="banner_label">
<property name="visible">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="border_width">5</property>
- <child>
- <object class="GtkLabel" id="banner_name_label">
- <property name="visible">True</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="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="banner_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">label</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- <signal name="populate_popup"
handler="on_banner_label_populate_popup"/>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">label</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ <signal name="populate_popup"
handler="on_banner_label_populate_popup"/>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkImage" id="mood_image">
+ <property name="no_show_all">True</property>
+ <property name="stock">None</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="activity_image">
+ <property name="no_show_all">True</property>
+ <property name="stock">None</property>
+ <property name="icon-size">1</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkImage" id="mood_image">
- <property name="no_show_all">True</property>
- <property name="stock">None</property>
- <property name="icon-size">1</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="activity_image">
- <property name="no_show_all">True</property>
- <property name="stock">None</property>
- <property name="icon-size">1</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="tune_image">
- <property name="no_show_all">True</property>
- <property name="stock">None</property>
- <property name="icon-size">1</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEventBox"
id="location_eventbox">
- <property name="visible">True</property>
- <property
name="visible_window">False</property>
- <child>
- <object class="GtkImage" id="location_image">
- <property
name="no_show_all">True</property>
- <property name="stock">None</property>
- <property name="icon-size">1</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="audio_banner_image">
- <property name="visible">True</property>
- <property name="stock">None</property>
- <property name="icon-size">1</property>
- </object>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="video_banner_image">
- <property name="visible">True</property>
- <property name="stock">None</property>
- <property name="icon-size">1</property>
- </object>
- <packing>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment3">
- <property name="width_request">11</property>
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">6</property>
- </packing>
- </child>
+ <object class="GtkImage" id="tune_image">
+ <property name="no_show_all">True</property>
+ <property name="stock">None</property>
+ <property name="icon-size">1</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkEventBox" id="avatar_eventbox">
+ <object class="GtkEventBox" id="location_eventbox">
<property name="visible">True</property>
<property name="visible_window">False</property>
<child>
- <object class="GtkImage" id="avatar_image">
- <property name="visible">True</property>
+ <object class="GtkImage" id="location_image">
+ <property name="no_show_all">True</property>
<property name="stock">None</property>
+ <property name="icon-size">1</property>
</object>
</child>
</object>
@@ -178,104 +122,109 @@
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkImage" id="audio_banner_image">
+ <property name="visible">True</property>
+ <property name="stock">None</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="video_banner_image">
+ <property name="visible">True</property>
+ <property name="stock">None</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="width_request">11</property>
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox106">
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
