From 3f5dd97736c34c40cbb1cf762869aa3901dc24a1 Mon Sep 17 00:00:00 2001
From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Wed, 23 May 2012 17:11:05 +1000
Subject: account-widget-irc: remove colons

The advanced settings for IRC look different to XMPP/SIP. They should
probably be changed to be contained within a scrolled window/viewport
for consistency.
---
 libempathy-gtk/empathy-account-widget-irc.ui | 61 ++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 18 deletions(-)

(limited to 'libempathy-gtk')

diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui
index 95f30a2f6..fc72974b3 100644
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -66,8 +66,11 @@
                       <object class="GtkLabel" id="label_network">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Network:</property>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">Network</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -80,8 +83,11 @@
                       <object class="GtkLabel" id="label_charset">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Character set:</property>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">Character set</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -159,6 +165,7 @@
 	                <property name="spacing">0</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow_network_server">
+                        <property name="height_request">120</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">never</property>
@@ -238,7 +245,7 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
@@ -331,9 +338,12 @@
           <object class="GtkLabel" id="label_network2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Network:</property>
-            <property name="use_underline">True</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Network</property>
+            <property name="use_underline">True</property>A
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -346,10 +356,13 @@
           <object class="GtkLabel" id="label_nick">
             <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="xalign">1</property>
+            <property name="label" translatable="yes">Nickname</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_nick</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -362,8 +375,11 @@
           <object class="GtkLabel" id="label_password">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Password:</property>
+            <property name="xalign">1</property>
+            <property name="label" translatable="yes">Password</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -405,8 +421,11 @@
               <object class="GtkLabel" id="label_quit_message">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Quit message:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Quit message</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -431,10 +450,13 @@
               <object class="GtkLabel" id="label_fullname">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Real name:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Real name</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">entry_nick</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -447,9 +469,12 @@
               <object class="GtkLabel" id="label_username">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Username:</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Username</property>
                 <property name="use_underline">True</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-- 
cgit v1.2.3