changeset 5eae49e90205 in /home/hg/repos/gajim

author: Denis Fomin <[email protected]>
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=5eae49e90205
description: fix different background color for Chat state notifications 
entries and Emoticons entry. See #7239

diffstat:

 data/gui/preferences_window.ui |  39 +++++++++++++++++++++------------------
 1 файлов изменено, 21 вставок(+), 18 удалений(-)

различия (70 строк):

diff -r 1ebd4fcace5a -r 5eae49e90205 data/gui/preferences_window.ui
--- a/data/gui/preferences_window.ui    Tue Sep 03 22:26:35 2013 +0400
+++ b/data/gui/preferences_window.ui    Tue Sep 03 23:29:20 2013 +0400
@@ -354,24 +354,6 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEventBox" id="eventbox5">
-                                <property name="visible">True</property>
-                                <property name="tooltip_text" 
translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' 
with equivalent animated or static graphical emoticons</property>
-                                <child>
-                                  <object class="GtkLabel" id="label381">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="xpad">1</property>
-                                    <property name="label" 
translatable="yes">_Emoticons:</property>
-                                    <property 
name="use_underline">True</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="x_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
                               <object class="GtkCheckButton" 
id="compact_view_checkbutton">
                                 <property name="label" 
translatable="yes">Ma_ke message windows compact</property>
                                 <property name="can_focus">True</property>
@@ -493,6 +475,25 @@
                                 <property name="bottom_attach">7</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkEventBox" id="eventbox5">
+                                <property name="visible">True</property>
+                                <property name="tooltip_text" 
translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' 
with equivalent animated or static graphical emoticons</property>
+                                <property 
name="visible_window">False</property>
+                                <child>
+                                  <object class="GtkLabel" id="label381">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="xpad">1</property>
+                                    <property name="label" 
translatable="yes">_Emoticons:</property>
+                                    <property 
name="use_underline">True</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -903,6 +904,7 @@
                               <object class="GtkEventBox" id="eventbox8">
                                 <property name="visible">True</property>
                                 <property name="tooltip_text" 
translatable="yes">Gajim can send and receive meta-information related to a 
conversation you may have with a contact. Here you can specify which chatstates 
you want to display in chat windows.</property>
+                                <property 
name="visible_window">False</property>
                                 <child>
                                   <object class="GtkLabel" id="label33">
                                     <property name="visible">True</property>
@@ -922,6 +924,7 @@
                               <object class="GtkEventBox" id="eventbox9">
                                 <property name="visible">True</property>
                                 <property name="tooltip_text" 
translatable="yes">Gajim can send and receive meta-information related to a 
conversation you may have with a contact. Here you can specify which chatstates 
you want to send to the other party.</property>
+                                <property 
name="visible_window">False</property>
                                 <child>
                                   <object class="GtkLabel" id="label34">
                                     <property name="visible">True</property>
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to