From 36ccb3786fa69009a63f14a498005b8d95449c72 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 16 Apr 2009 12:27:44 +0000 Subject: [PATCH] Convert glade files to GtkBuilder format From: Xavier Claessens svn path=/trunk/; revision=2840 --- ...im.glade => empathy-account-widget-aim.ui} | 109 +++--- ...lade => empathy-account-widget-generic.ui} | 44 +-- ...de => empathy-account-widget-groupwise.ui} | 109 +++--- ...cq.glade => empathy-account-widget-icq.ui} | 121 +++--- ...rc.glade => empathy-account-widget-irc.ui} | 231 ++++++----- ...glade => empathy-account-widget-jabber.ui} | 187 ++++----- ...sn.glade => empathy-account-widget-msn.ui} | 109 +++--- ....glade => empathy-account-widget-salut.ui} | 108 +++--- ...ip.glade => empathy-account-widget-sip.ui} | 118 +++--- ....glade => empathy-account-widget-yahoo.ui} | 149 ++++---- .../{empathy-chat.glade => empathy-chat.ui} | 47 ++- ...alogs.glade => empathy-contact-dialogs.ui} | 47 +-- ...widget.glade => empathy-contact-widget.ui} | 234 ++++++------ ...log-window.glade => empathy-log-window.ui} | 133 +++---- ...og.glade => empathy-new-message-dialog.ui} | 91 ++--- ...oser.glade => empathy-presence-chooser.ui} | 69 ++-- ...l-dialog.glade => empathy-spell-dialog.ui} | 65 ++-- ...ialog.glade => empathy-accounts-dialog.ui} | 200 +++++----- src/empathy-call-window.glade | 145 ------- src/empathy-call-window.ui | 140 +++++++ src/empathy-chat-window.glade | 359 ------------------ src/empathy-chat-window.ui | 326 ++++++++++++++++ ...ndow.glade => empathy-chatrooms-window.ui} | 142 ++++--- ...ft-manager.glade => empathy-ft-manager.ui} | 49 +-- ...-dialog.glade => empathy-import-dialog.ui} | 41 +- src/empathy-main-window.glade | 299 --------------- src/empathy-main-window.ui | 220 +++++++++++ ...g.glade => empathy-new-chatroom-dialog.ui} | 129 +++---- ...eferences.glade => empathy-preferences.ui} | 354 ++++++++--------- src/empathy-status-icon.glade | 59 --- src/empathy-status-icon.ui | 53 +++ 31 files changed, 2160 insertions(+), 2327 deletions(-) rename libempathy-gtk/{empathy-account-widget-aim.glade => empathy-account-widget-aim.ui} (72%) rename libempathy-gtk/{empathy-account-widget-generic.glade => empathy-account-widget-generic.ui} (75%) rename libempathy-gtk/{empathy-account-widget-groupwise.glade => empathy-account-widget-groupwise.ui} (73%) rename libempathy-gtk/{empathy-account-widget-icq.glade => empathy-account-widget-icq.ui} (73%) rename libempathy-gtk/{empathy-account-widget-irc.glade => empathy-account-widget-irc.ui} (73%) rename libempathy-gtk/{empathy-account-widget-jabber.glade => empathy-account-widget-jabber.ui} (74%) rename libempathy-gtk/{empathy-account-widget-msn.glade => empathy-account-widget-msn.ui} (73%) rename libempathy-gtk/{empathy-account-widget-salut.glade => empathy-account-widget-salut.ui} (75%) rename libempathy-gtk/{empathy-account-widget-sip.glade => empathy-account-widget-sip.ui} (72%) rename libempathy-gtk/{empathy-account-widget-yahoo.glade => empathy-account-widget-yahoo.ui} (75%) rename libempathy-gtk/{empathy-chat.glade => empathy-chat.ui} (82%) rename libempathy-gtk/{empathy-contact-dialogs.glade => empathy-contact-dialogs.ui} (76%) rename libempathy-gtk/{empathy-contact-widget.glade => empathy-contact-widget.ui} (79%) rename libempathy-gtk/{empathy-log-window.glade => empathy-log-window.ui} (78%) rename libempathy-gtk/{empathy-new-message-dialog.glade => empathy-new-message-dialog.ui} (77%) rename libempathy-gtk/{empathy-presence-chooser.glade => empathy-presence-chooser.ui} (75%) rename libempathy-gtk/{empathy-spell-dialog.glade => empathy-spell-dialog.ui} (77%) rename src/{empathy-accounts-dialog.glade => empathy-accounts-dialog.ui} (76%) delete mode 100644 src/empathy-call-window.glade create mode 100644 src/empathy-call-window.ui delete mode 100644 src/empathy-chat-window.glade create mode 100644 src/empathy-chat-window.ui rename src/{empathy-chatrooms-window.glade => empathy-chatrooms-window.ui} (76%) rename src/{empathy-ft-manager.glade => empathy-ft-manager.ui} (74%) rename src/{empathy-import-dialog.glade => empathy-import-dialog.ui} (75%) delete mode 100644 src/empathy-main-window.glade create mode 100644 src/empathy-main-window.ui rename src/{empathy-new-chatroom-dialog.glade => empathy-new-chatroom-dialog.ui} (75%) rename src/{empathy-preferences.glade => empathy-preferences.ui} (74%) delete mode 100644 src/empathy-status-icon.glade create mode 100644 src/empathy-status-icon.ui diff --git a/libempathy-gtk/empathy-account-widget-aim.glade b/libempathy-gtk/empathy-account-widget-aim.ui similarity index 72% rename from libempathy-gtk/empathy-account-widget-aim.glade rename to libempathy-gtk/empathy-account-widget-aim.ui index c12ea761..6536b903 100644 --- a/libempathy-gtk/empathy-account-widget-aim.glade +++ b/libempathy-gtk/empathy-account-widget-aim.ui @@ -1,190 +1,193 @@ - - + - - + + + 65555 + 0 + 10 + 1 + 0 + 5222 + + True ICQ account settings False - + True 6 - + True 2 3 12 6 - + True 0 Pass_word: True entry_password - + 1 2 GTK_FILL - + - + True 0 Screen _Name: True entry_screenname - + GTK_FILL - + - + True True - Forget password and clear the entry. - 0 + Forget password and clear the entry. - + True gtk-clear 1 - + - + 2 3 1 2 - - + + - + True True - + 1 3 - + - + True True False - + 1 2 1 2 - + - + False False - + True True - + True 2 2 12 6 - + True True - 5222 0 65555 1 10 0 + adjustment1 1 True - + 1 2 1 2 - + - + True 0 _Port: True spinbutton_port - + 1 2 GTK_FILL - + - + True True - + 1 2 - + - + True 0 _Server: True entry_server - + GTK_FILL - + - + - - + + True <b>Advanced</b> True - - - label_item - + - + False False 1 - + - - + + diff --git a/libempathy-gtk/empathy-account-widget-generic.glade b/libempathy-gtk/empathy-account-widget-generic.ui similarity index 75% rename from libempathy-gtk/empathy-account-widget-generic.glade rename to libempathy-gtk/empathy-account-widget-generic.ui index e0ac01a9..fd9a609f 100644 --- a/libempathy-gtk/empathy-account-widget-generic.glade +++ b/libempathy-gtk/empathy-account-widget-generic.ui @@ -1,17 +1,16 @@ - - + - - + + True generic account settings False - + True 6 - + True 3 12 @@ -25,30 +24,30 @@ - + False False - + True True - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_RESIZE_QUEUE - + True 3 12 @@ -62,28 +61,25 @@ - + - + - + - - + + True <b>Advanced</b> True - - - label_item - + - + 1 - + - - + + diff --git a/libempathy-gtk/empathy-account-widget-groupwise.glade b/libempathy-gtk/empathy-account-widget-groupwise.ui similarity index 73% rename from libempathy-gtk/empathy-account-widget-groupwise.glade rename to libempathy-gtk/empathy-account-widget-groupwise.ui index ef47f2d7..a782250f 100644 --- a/libempathy-gtk/empathy-account-widget-groupwise.glade +++ b/libempathy-gtk/empathy-account-widget-groupwise.ui @@ -1,192 +1,195 @@ - - + - - + + + 65535 + 0 + 10 + 1 + 0 + 0 + + True groupwise account settings False - + True 6 - + True 2 2 6 6 - + True 2 - + True True False - + - + True True - Forget password and clear the entry. - 0 + Forget password and clear the entry. - + True gtk-clear 1 - + - + False False 1 - + 1 2 1 2 - + - + True 0 Pass_word: True - + 1 2 GTK_FILL - + - + True 0 Login I_D: True entry_id - + GTK_FILL - + - + True True - + 1 2 - + - + False - + True True - + True 2 2 6 6 - + True 0 _Port: True spinbutton_port - + 1 2 GTK_FILL - + - + True 0 _Server: True entry_server - + GTK_FILL - + - + True True - + 1 2 - + - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 0 65535 1 10 0 + adjustment1 1 True - + 1 2 1 2 - + - + - - + + True <b>Advanced</b> True - - - label_item - + - + False False 1 - + - - + + diff --git a/libempathy-gtk/empathy-account-widget-icq.glade b/libempathy-gtk/empathy-account-widget-icq.ui similarity index 73% rename from libempathy-gtk/empathy-account-widget-icq.glade rename to libempathy-gtk/empathy-account-widget-icq.ui index 83613c39..1712466c 100644 --- a/libempathy-gtk/empathy-account-widget-icq.glade +++ b/libempathy-gtk/empathy-account-widget-icq.ui @@ -1,218 +1,221 @@ - - + - - + + + 65555 + 0 + 10 + 1 + 0 + 5222 + + True ICQ account settings False - + True 6 - + True 2 3 12 6 - + True 0 Pass_word: True entry_password - + 1 2 GTK_FILL - + - + True 0 ICQ _UIN: True entry_uin - + GTK_FILL - + - + True True - Forget password and clear the entry. - 0 + Forget password and clear the entry. - + True gtk-clear 1 - + - + 2 3 1 2 - - + + - + True True - + 1 3 - + - + True True False - + 1 2 1 2 - + - + False False - + True True - + True 3 2 12 6 - + True 0 _Charset: True entry_charset - + GTK_FILL - + - + True True - 5222 0 65555 1 10 0 + adjustment1 1 True - + 1 2 2 3 - + - + True True - + 1 2 1 2 - + - + True 0 _Port: True spinbutton_port - + 2 3 GTK_FILL - + - + True 0 _Server: True entry_server - + 1 2 GTK_FILL - + - + True True - + 1 2 - + - + - - + + True <b>Advanced</b> True - - - label_item - + - + False False 1 - + - - + + diff --git a/libempathy-gtk/empathy-account-widget-irc.glade b/libempathy-gtk/empathy-account-widget-irc.ui similarity index 73% rename from libempathy-gtk/empathy-account-widget-irc.glade rename to libempathy-gtk/empathy-account-widget-irc.ui index 3e9899f6..a3552852 100644 --- a/libempathy-gtk/empathy-account-widget-irc.glade +++ b/libempathy-gtk/empathy-account-widget-irc.ui @@ -1,147 +1,144 @@ - - + - - + + irc account settings False - + True 5 2 12 6 - + True True - + 1 2 4 5 - + - + True 0 Quit message: - + 4 5 GTK_FILL - + - + True True - + 1 2 3 4 - + - + True True False - + 1 2 2 3 - + - + True 0 Password: - + 2 3 GTK_FILL - + - + True 0 Real name: - + 3 4 GTK_FILL - + - + True True - + 1 2 1 2 - + - + True 0 Nickname: True entry_nick - + 1 2 GTK_FILL - + - + True 2 - + True - - + - + True True - Create a new IRC network - 0 + Create a new IRC network - + True gtk-add - + - + False False @@ -149,18 +146,17 @@ - + True True - Edit the selected IRC network - 0 + Edit the selected IRC network - + True gtk-edit - + - + False False @@ -168,25 +164,24 @@ - + True True - Remove the selected IRC network - 0 + Remove the selected IRC network - + True gtk-remove - + - + False False 3 - + 1 2 @@ -195,21 +190,21 @@ - + True 0 Network: True - + GTK_FILL - + - + - - + + True 5 Network @@ -220,65 +215,65 @@ True False - + True 2 - + True 0 GTK_SHADOW_NONE - + True 6 12 - + True 2 2 12 6 - + True 0 Network: - + GTK_FILL - + - + True 0 Charset: - + 1 2 GTK_FILL - + - + True True - + 1 2 - + - + True - + 1 2 @@ -288,162 +283,158 @@ GTK_FILL - + - + - - + + True <b>Network</b> True - - - label_item - + - + 1 - + True 0 GTK_SHADOW_NONE - + True 6 12 - + True 1 2 6 6 - + True True GTK_POLICY_NEVER GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - + True True False - + - + GTK_FILL - + True 6 GTK_BUTTONBOX_START - + True True True gtk-add True - 0 - + - + True True True gtk-remove True - 0 - + 1 - + True True True gtk-go-up True - 0 - + 2 - + True True True gtk-go-down True - 0 - + 3 - + 1 2 GTK_FILL - + - + - - + + True <b>Servers</b> True - - - label_item - + - + 2 - + True GTK_BUTTONBOX_END - + True True True gtk-close True - -7 - + - + False GTK_PACK_END - + - - + + button_add + button_remove + button_up + button_down + button_close + + + diff --git a/libempathy-gtk/empathy-account-widget-jabber.glade b/libempathy-gtk/empathy-account-widget-jabber.ui similarity index 74% rename from libempathy-gtk/empathy-account-widget-jabber.glade rename to libempathy-gtk/empathy-account-widget-jabber.ui index 6e221e38..9f52f689 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.glade +++ b/libempathy-gtk/empathy-account-widget-jabber.ui @@ -1,337 +1,342 @@ - - + - - + + + 127 + -128 + 10 + 1 + 0 + 0 + + + 65555 + 0 + 10 + 1 + 0 + 5222 + + True jabber account settings False - + True 6 - + True 2 3 12 6 - + True True False - + 1 2 1 2 - + - + True True - + 1 3 - + - + True 0 Login I_D: True entry_id - + GTK_FILL - + - + True True - Forget password and clear the entry. - 0 + Forget password and clear the entry. - + True gtk-clear 1 - + - + 2 3 1 2 GTK_FILL - + - + True 0 Pass_word: True entry_password - + 1 2 GTK_FILL - + - + False False - + True True - + True - + True 4 3 12 6 - + True True - + 1 3 2 3 - + - + True True - 0 -128 127 1 10 0 + adjustment1 1 - + 1 3 3 4 - + - + True True _Ignore SSL certificate errors True - 0 True - + 3 1 2 GTK_FILL - + - + True 0 Pri_ority: True spinbutton_priority - + 3 4 GTK_FILL - + - + True 0 Reso_urce: True entry_resource - + 2 3 GTK_FILL - + - + True True _Encryption required (TLS/SSL) True - 0 True - + 3 GTK_FILL - + - + - + True 0 GTK_SHADOW_NONE - + True 12 - + True 3 2 6 6 - + True True - 5222 0 65555 1 10 0 + adjustment2 1 True - + 1 2 1 2 - + - + True True - + 1 2 - + - + True True Use old SS_L True - 0 True - + 2 2 3 GTK_FILL - + - + True 0 _Port: True spinbutton_port - + 1 2 GTK_FILL - + - + True 0 _Server: True entry_server - + GTK_FILL - + - + - + - - + + True <b>Override server settings</b> True - - - label_item - + - + 1 - + - - + + True <b>Advanced</b> True - - - label_item - + - + False False 1 - + - - + + diff --git a/libempathy-gtk/empathy-account-widget-msn.glade b/libempathy-gtk/empathy-account-widget-msn.ui similarity index 73% rename from libempathy-gtk/empathy-account-widget-msn.glade rename to libempathy-gtk/empathy-account-widget-msn.ui index 81a02052..c91c3372 100644 --- a/libempathy-gtk/empathy-account-widget-msn.glade +++ b/libempathy-gtk/empathy-account-widget-msn.ui @@ -1,192 +1,195 @@ - - + - - + + + 65535 + 0 + 10 + 1 + 0 + 0 + + True msn account settings False - + True 6 - + True 2 2 6 6 - + True 2 - + True True False - + - + True True - Forget password and clear the entry. - 0 + Forget password and clear the entry. - + True gtk-clear 1 - + - + False False 1 - + 1 2 1 2 - + - + True 0 Pass_word: True - + 1 2 GTK_FILL - + - + True 0 Login I_D: True entry_id - + GTK_FILL - + - + True True - + 1 2 - + - + False - + True True - + True 2 2 6 6 - + True 0 _Port: True spinbutton_port - + 1 2 GTK_FILL - + - + True 0 _Server: True entry_server - + GTK_FILL - + - + True True - + 1 2 - + - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 0 65535 1 10 0 + adjustment1 1 True - + 1 2 1 2 - + - + - - + + True <b>Advanced</b> True - - - label_item - + - + False False 1 - + - - + + diff --git a/libempathy-gtk/empathy-account-widget-salut.glade b/libempathy-gtk/empathy-account-widget-salut.ui similarity index 75% rename from libempathy-gtk/empathy-account-widget-salut.glade rename to libempathy-gtk/empathy-account-widget-salut.ui index 57fd822e..6766a390 100644 --- a/libempathy-gtk/empathy-account-widget-salut.glade +++ b/libempathy-gtk/empathy-account-widget-salut.ui @@ -1,219 +1,215 @@ - - + - - + + True salut account settings False - + True 6 - + True 3 3 12 6 - + True True - + 1 3 2 3 - + - + True True - + 1 3 1 2 - + - + True True - + 1 3 - + - + True 0 _Nickname: True entry_nickname - + 2 3 GTK_FILL - + - + True 0 _Last Name: True entry_last_name - + 1 2 GTK_FILL - + - + True 0 _First Name: True entry_first_name - + GTK_FILL - + - + False False - + True True - + True 3 3 12 6 - + True True - + 1 3 - + - + True 0 _Published Name: True entry_published - + GTK_FILL - + - + True True - + 1 3 2 3 - + - + True True - + 1 3 1 2 - + - + True 0 _Jabber ID: True entry_jid - + 2 3 GTK_FILL - + - + True 0 _Email: True entry_email - + 1 2 GTK_FILL - + - + - - + + True <b>Advanced</b> True - - - label_item - + - + False False 1 - + - - + + diff --git a/libempathy-gtk/empathy-account-widget-sip.glade b/libempathy-gtk/empathy-account-widget-sip.ui similarity index 72% rename from libempathy-gtk/empathy-account-widget-sip.glade rename to libempathy-gtk/empathy-account-widget-sip.ui index 3d026de1..df25b843 100644 --- a/libempathy-gtk/empathy-account-widget-sip.glade +++ b/libempathy-gtk/empathy-account-widget-sip.ui @@ -1,122 +1,128 @@ - - + - - + + + 65535 + 0 + 10 + 1 + 0 + 0 + + False - + True - + True 2 2 12 6 - + True 0 Pass_word: True entry_password - + 1 2 GTK_FILL - + - + True True - + 1 2 - + - + True 0 _Username: True entry_password - + GTK_FILL - + - + True - + True True - + - + True True - Forget password and clear the entry. - 0 + Forget password and clear the entry. - + True gtk-clear 1 - + - + False 1 - + 1 2 1 2 - + - + False False - + True True - + True 0 12 - + True 3 2 6 6 - + True True - + 1 2 @@ -125,40 +131,40 @@ - + True 0 STUN port: spinbutton_stun-port - + 2 3 GTK_FILL - + - + True 0 STUN Server: entry_stun-server - + 1 2 GTK_FILL - + - + True True - 0 0 65535 1 10 0 + adjustment1 1 - + 1 2 @@ -167,42 +173,38 @@ - + True True - Discover STUN + Discover STUN True - 0 True - + 2 GTK_FILL - + - + - + - - + + True <b>Advanced</b> True - - - label_item - + - + False False 1 - + - - + + diff --git a/libempathy-gtk/empathy-account-widget-yahoo.glade b/libempathy-gtk/empathy-account-widget-yahoo.ui similarity index 75% rename from libempathy-gtk/empathy-account-widget-yahoo.glade rename to libempathy-gtk/empathy-account-widget-yahoo.ui index ca64533e..439ff91d 100644 --- a/libempathy-gtk/empathy-account-widget-yahoo.glade +++ b/libempathy-gtk/empathy-account-widget-yahoo.ui @@ -1,287 +1,288 @@ - - + - - + + + 65555 + 1 + 10 + 1 + 0 + 5050 + + True Yahoo! account settings False - + True 6 - + True 2 3 12 6 - + True 0 Pass_word: True entry_password - + 1 2 GTK_FILL - + - + True True - Forget password and clear the entry. - 0 + Forget password and clear the entry. - + True gtk-clear 1 - + - + 2 3 1 2 GTK_FILL - + - + True 0 Yahoo I_D: True entry_id - + GTK_FILL - + - + True True - + 1 3 - + - + True True False - + 1 2 1 2 - + - + False False - + True True - + True - + True 6 2 12 6 - + True True _Ignore conference and chatroom invitations True - 0 True - + 2 GTK_FILL - + - + True 0 _Room List locale: True entry_locale - + 1 2 GTK_FILL - + - + True 0 _Charset: True entry_charset - + 2 3 GTK_FILL - + - + True True - + 1 2 1 2 - + - + True True - + 1 2 2 3 - + - + True 0 _Server: True entry_server - + 3 4 GTK_FILL - + - + True 0 _Port: True spinbutton_port - + 4 5 GTK_FILL - + - + True True - + 1 2 3 4 - + - + True True - 5050 1 65555 1 10 0 + adjustment1 1 True - + 1 2 4 5 - + - + True True Use _Yahoo Japan True - 0 True - + 2 5 6 GTK_FILL - + - + - + - - + + True <b>Advanced</b> True - - - label_item - + - + False False 1 - + - - + + diff --git a/libempathy-gtk/empathy-chat.glade b/libempathy-gtk/empathy-chat.ui similarity index 82% rename from libempathy-gtk/empathy-chat.glade rename to libempathy-gtk/empathy-chat.ui index f313c2f5..6a5fc465 100644 --- a/libempathy-gtk/empathy-chat.glade +++ b/libempathy-gtk/empathy-chat.ui @@ -1,36 +1,35 @@ - - + - - + + True 6 Group Chat system-users - + True 4 6 - + True 6 - + True 0 0 <b>Topic:</b> True - + False False - + True True 0 @@ -39,12 +38,12 @@ True PANGO_ELLIPSIZE_END True - + 1 - + False False @@ -52,15 +51,15 @@ - + True True - + True 6 - + True True GTK_POLICY_AUTOMATIC @@ -68,10 +67,10 @@ - + - + True True GTK_POLICY_NEVER @@ -80,20 +79,20 @@ - + False 1 - + True True - + 200 True True @@ -103,18 +102,18 @@ - + False True - + 1 - + - - + + diff --git a/libempathy-gtk/empathy-contact-dialogs.glade b/libempathy-gtk/empathy-contact-dialogs.ui similarity index 76% rename from libempathy-gtk/empathy-contact-dialogs.glade rename to libempathy-gtk/empathy-contact-dialogs.ui index 75d8af6a..0986de1f 100644 --- a/libempathy-gtk/empathy-contact-dialogs.glade +++ b/libempathy-gtk/empathy-contact-dialogs.ui @@ -1,8 +1,7 @@ - - + - - + + 5 Subscription Request subscription_request @@ -11,21 +10,21 @@ GDK_WINDOW_TYPE_HINT_DIALOG False - + True 2 - + True 5 12 - + True 0 gtk-dialog-question 6 - + False False @@ -34,59 +33,61 @@ - + 1 - + True GTK_BUTTONBOX_END - + True True True Decide _Later True - -6 - + - + True True True gtk-no True - -9 - + 1 - + True True True True gtk-yes True - -8 - + 2 - + False GTK_PACK_END - + - - + + button19 + button20 + button21 + + + diff --git a/libempathy-gtk/empathy-contact-widget.glade b/libempathy-gtk/empathy-contact-widget.ui similarity index 79% rename from libempathy-gtk/empathy-contact-widget.glade rename to libempathy-gtk/empathy-contact-widget.ui index 721ebe3f..8d626628 100644 --- a/libempathy-gtk/empathy-contact-widget.glade +++ b/libempathy-gtk/empathy-contact-widget.ui @@ -1,43 +1,42 @@ - - + - - + + True Contact information - + 6 - + True 6 - + True 0 <b>Contact</b> True - + False False - + True 12 - + True 6 - + True 6 - + True 3 2 @@ -53,167 +52,166 @@ - + True 0 Account: - + GTK_FILL - + - + True 0 - Identifier: - + Identifier: + 1 2 GTK_FILL - + - + True 0 Alias: - + 2 3 GTK_FILL - + - + - + True 6 - + True gtk-missing-image - + False False - + True True 0 True True True - + 1 - + 1 - + - + True - + False False 1 - + - + False False 1 - + False - + 6 - + True 0 <b>Groups</b> True - + False False - + True 12 - + True 6 - + True 0 Select the groups you want this contact to appear in. Note that you can select more than one group or no groups. True True - + False False - + True 12 - + True True - + - + True False True _Add Group True - 0 - + False False 1 - + False False @@ -221,7 +219,7 @@ - + 100 True True @@ -229,55 +227,55 @@ GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - + True True False False - + - + 2 - + - + 1 - + 1 - + 6 - + True 0 <b>Contact Details</b> True - + False False - + True 12 - + True 6 - + 4 2 12 @@ -295,136 +293,136 @@ - + 0 Fullname: - + GTK_FILL - + - + 0 Email: - + 1 2 GTK_FILL - + - + 0 Web site: - + 2 3 GTK_FILL - + - + 0 Birthday: - + 3 4 GTK_FILL - + - + - + True 6 - + True gtk-dialog-info - + False False - + True 0 Information requested... True True - + 1 - + False False 1 - + - + False False 1 - + False 2 - + 6 - + True 0 <b>Client Information</b> True - + False False - + True 12 - + True 6 - + 3 2 12 6 - + 0 0 OS: - + 2 3 @@ -432,11 +430,11 @@ - + 0 0 Version: - + 1 2 @@ -444,115 +442,115 @@ - + 0 0 Client: - + GTK_FILL - + True 0 2 True True - + 1 2 - + - + True 0 2 True True - + 1 2 1 2 - + - + True 0 2 True True - + 1 2 2 3 - + - + False - + True 6 - + True gtk-dialog-info - + False False - + True 0 Information requested... True True - + 1 - + False False 1 - + - + False False 1 - + False 3 - + - - + + diff --git a/libempathy-gtk/empathy-log-window.glade b/libempathy-gtk/empathy-log-window.ui similarity index 78% rename from libempathy-gtk/empathy-log-window.glade rename to libempathy-gtk/empathy-log-window.ui index 4f0c55d3..d38618c2 100644 --- a/libempathy-gtk/empathy-log-window.glade +++ b/libempathy-gtk/empathy-log-window.ui @@ -1,52 +1,51 @@ - - + - - + + Previous Conversations log 640 450 document-open-recent - + True True 2 - + True 12 6 - + True 12 - + True - _For: + _For: True entry_find - + False False - + True True True True - + 1 - + True False True @@ -55,51 +54,50 @@ gtk-find True False - 0 - + False False 2 - + False False - + True True 120 - + True True GTK_POLICY_NEVER GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - + True True False - + - + False True - + True 6 - + True True GTK_POLICY_NEVER @@ -107,25 +105,24 @@ - + - + True 12 - + True False True gtk-go-back True False - 0 - + False False @@ -134,15 +131,14 @@ - + True False True gtk-go-forward True False - 0 - + False False @@ -150,38 +146,37 @@ 1 - + False False 1 - + True True - + 1 - + - - + + True - Search - + Search + - tab False - + True 12 2 @@ -189,20 +184,20 @@ 6 6 - + True 6 - + GTK_FILL GTK_FILL - + True True GTK_POLICY_NEVER @@ -210,7 +205,7 @@ - + 1 2 @@ -219,11 +214,11 @@ - + True 6 - + 150 True True @@ -231,26 +226,26 @@ GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - + True True False - + - + - + True True - + False False 1 - + 1 2 @@ -258,30 +253,30 @@ - + True 6 - + True gtk-find - + False False - + True True True - + 1 - + 1 2 @@ -289,23 +284,19 @@ GTK_FILL - - - 1 - + - - + + True - Conversations - + Conversations + - tab 1 False - + - - + + diff --git a/libempathy-gtk/empathy-new-message-dialog.glade b/libempathy-gtk/empathy-new-message-dialog.ui similarity index 77% rename from libempathy-gtk/empathy-new-message-dialog.glade rename to libempathy-gtk/empathy-new-message-dialog.ui index d6317f8d..e24095fb 100644 --- a/libempathy-gtk/empathy-new-message-dialog.glade +++ b/libempathy-gtk/empathy-new-message-dialog.ui @@ -1,8 +1,7 @@ - - + - - + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 New Conversation @@ -12,11 +11,11 @@ GDK_WINDOW_TYPE_HINT_DIALOG False - + True 2 - + True 2 2 @@ -26,34 +25,34 @@ - + True 0 Account: - + - + - + True 0 Contact ID: - + 1 2 - + - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - + 1 2 @@ -61,124 +60,126 @@ 2 - + 1 - + True GTK_BUTTONBOX_END - + True True gtk-cancel True - -6 - + - + True True True - 1 - + True 0 0 - + True 2 - + True audio-input-microphone - + False False - + True C_all True - + False False 1 - + - + - + 1 - + True True True True - 2 - + True 0 0 - + True 2 - + True im-message-new - + False False - + True C_hat True - + False False 1 - + - + - + 2 - + False GTK_PACK_END - + - - + + button1 + button_call + button_chat + + + diff --git a/libempathy-gtk/empathy-presence-chooser.glade b/libempathy-gtk/empathy-presence-chooser.ui similarity index 75% rename from libempathy-gtk/empathy-presence-chooser.glade rename to libempathy-gtk/empathy-presence-chooser.ui index ba79529f..32b34ad0 100644 --- a/libempathy-gtk/empathy-presence-chooser.glade +++ b/libempathy-gtk/empathy-presence-chooser.ui @@ -1,8 +1,7 @@ - - + - - + + True 5 Custom message @@ -10,10 +9,10 @@ GDK_WINDOW_TYPE_HINT_DIALOG False - + True - + True 5 3 @@ -21,9 +20,9 @@ 6 6 - + True - + 1 2 @@ -32,13 +31,13 @@ - + True - - + + - + 1 2 @@ -49,84 +48,86 @@ - + True True Save message True - 0 True - + 2 2 3 - + - + True 0 Message: - + 1 2 GTK_FILL - + - + True 0 Status: - + GTK_FILL - + - + 1 - + True GTK_BUTTONBOX_END - + True True True gtk-cancel True - -6 - + - + True True True gtk-apply True - -10 - + 1 - + False GTK_PACK_END - + - - + + checkbutton_save + closebutton1 + button1 + + + diff --git a/libempathy-gtk/empathy-spell-dialog.glade b/libempathy-gtk/empathy-spell-dialog.ui similarity index 77% rename from libempathy-gtk/empathy-spell-dialog.glade rename to libempathy-gtk/empathy-spell-dialog.ui index 3ce1d5b5..382346c1 100644 --- a/libempathy-gtk/empathy-spell-dialog.glade +++ b/libempathy-gtk/empathy-spell-dialog.ui @@ -1,8 +1,7 @@ - - + - - + + 5 Spell Checker True @@ -12,119 +11,121 @@ GDK_WINDOW_TYPE_HINT_DIALOG False - + True 2 - + True 5 6 - + True 0 Suggestions for the word: True True - + False False - + True True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - + True True False - + - + 1 - + 1 - + True GTK_BUTTONBOX_END - + True True True gtk-cancel True - -6 - + - + True False True True - -5 - + True 0 0 - + True 2 - + True gtk-convert - + False False - + True _Replace True - + False False 1 - + - + - + 1 - + False GTK_PACK_END - + - - + + button_cancel + button_replace + + + diff --git a/src/empathy-accounts-dialog.glade b/src/empathy-accounts-dialog.ui similarity index 76% rename from src/empathy-accounts-dialog.glade rename to src/empathy-accounts-dialog.ui index e81daa9b..67879f71 100644 --- a/src/empathy-accounts-dialog.glade +++ b/src/empathy-accounts-dialog.ui @@ -1,199 +1,192 @@ - - + - - + + 5 Accounts accounts GDK_WINDOW_TYPE_HINT_DIALOG False - + True 2 - + True 6 18 - + True 6 - + True True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - + 250 200 True True False - + - + - + True 6 True - + True 6 True - + True True gtk-add True - 0 - + - + True True gtk-remove True - 0 - + 1 - + False False - + True True Import Accounts... - 0 - + 1 - + False 1 - + False False - + 415 True 18 - + True 18 - + True 6 - + True True <big><b>Gmail</b></big> True True - + - + True 0 gtk-cut 6 - + False False 1 - + False False - + True 0 GTK_SHADOW_NONE - + True 6 20 - + - - + + True <b>Settings</b> True - - - label_item - + - + 1 - + - + 0 GTK_SHADOW_NONE - + True 6 20 - + True 12 - + True 6 - + True Type: - + False False @@ -202,67 +195,65 @@ - + - + True True I already have an account I want to use True - 0 True True - + 2 - + True 6 - + True True - 0 - + True 0 0 - + True 2 - + True gtk-new - + False False - + True Cr_eate True - + False False 1 - + - + - + False False @@ -271,20 +262,19 @@ - + True True gtk-cancel True - 0 - + False False GTK_PACK_END - + False False @@ -292,108 +282,110 @@ 1 - + - + - - + + True <b>New Account</b> True - - - label_item - + - + False 1 - + 0 GTK_SHADOW_NONE - + True 6 12 - + True To add a new account, you first have to install a backend for each protocol you want to use. True - + - + - - + + True <b>No protocol installed</b> True - - - label_item - + - + False False 2 - + 1 - + 1 - + True GTK_BUTTONBOX_END - + True True True gtk-help True - -11 - + True - + True True True gtk-close True - -7 - + 1 - + False GTK_PACK_END - + - - + + button_add + button_remove + button_import + checkbutton_register + button_create + button_back + button_help + button_close + + + diff --git a/src/empathy-call-window.glade b/src/empathy-call-window.glade deleted file mode 100644 index 712f1053..00000000 --- a/src/empathy-call-window.glade +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - True - - - True - - - True - _Call - True - - - True - - - True - Send video - True - - - - - True - Hang up - True - - - True - gtk-cancel - 1 - - - - - - - - - - - True - _View - True - - - True - - - True - Video preview - True - - - - - - - - - False - - - - - True - - - True - True - Hang up - gtk-cancel - - - True - - - - - True - - - True - - - - - True - Send Audio - gnome-stock-mic - - - True - - - - - True - Send video - camera-web - - - True - - - - - False - 1 - - - - - True - True - - - - - - - - - 2 - - - - - True - 2 - - - False - 3 - - - - - - diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui new file mode 100644 index 00000000..6d1bbf6e --- /dev/null +++ b/src/empathy-call-window.ui @@ -0,0 +1,140 @@ + + + + + + + + + menuitem1 + _Call + + + + + send_video + Send video + + + + + gtk-cancel + menuhangup + Hang up + + + + + menuitem3 + _View + + + + + show_preview + Video preview + + + + + + + + + + + + + + + + + + + + True + + + True + + + False + + + + + True + + + True + True + Hang up + gtk-cancel + + + True + + + + + True + + + True + + + + + True + Send Audio + gnome-stock-mic + + + True + + + + + True + Send video + camera-web + + + True + + + + + False + 1 + + + + + True + True + + + + + + + + + 2 + + + + + True + 2 + + + False + 3 + + + + + + diff --git a/src/empathy-chat-window.glade b/src/empathy-chat-window.glade deleted file mode 100644 index b62a5c21..00000000 --- a/src/empathy-chat-window.glade +++ /dev/null @@ -1,359 +0,0 @@ - - - - - - Chat - chat - 350 - 250 - - - True - - - True - - - True - _Conversation - True - - - - - True - C_lear - True - - - - True - gtk-clear - 1 - - - - - - - True - Insert _Smiley - True - - - True - 1 - face-smile - - - - - - - True - _Contact - True - - - - - True - _Favorite Chatroom - True - - - - - True - - - - - True - gtk-close - True - True - - - - - - - - - - True - _Edit - True - - - - - True - gtk-cut - True - True - - - - - - True - gtk-copy - True - True - - - - - - True - gtk-paste - True - True - - - - - - - - - - True - _Tabs - True - - - - - True - _Previous Tab - True - - - - - - True - _Next Tab - True - - - - - - True - - - - - True - Move Tab _Left - True - - - - - True - Move Tab _Right - True - - - - - True - _Detach Tab - True - - - - - - - - - True - _Help - True - - - - - True - _Contents - True - - - - True - gtk-help - 1 - - - - - - - True - gtk-about - True - True - - - - - - - - - False - False - - - - - - - - - - 5 - Invite - True - GTK_WIN_POS_CENTER_ON_PARENT - 275 - 225 - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - True - - - True - 5 - 18 - - - True - 6 - - - True - 0 - Select who would you like to invite: - True - True - - - False - False - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - False - - - - - 1 - - - - - - - True - 6 - - - True - 0 - Invitation _message: - True - True - True - entry - - - False - False - - - - - True - True - True - 40 - You have been invited to join a chat conference. - - - False - False - 1 - - - - - False - False - 1 - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - False - True - True - True - In_vite - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui new file mode 100644 index 00000000..741bfee4 --- /dev/null +++ b/src/empathy-chat-window.ui @@ -0,0 +1,326 @@ + + + + + + + + + menu_conv + _Conversation + + + + + gtk-clear + menu_conv_clear + C_lear + + + + + + menu_conv_insert_smiley + Insert _Smiley + + + + + menu_conv_contact + _Contact + + + + + menu_conv_favorite + _Favorite Chatroom + + + + + gtk-close + menu_conv_close + + + + + + menu_edit + _Edit + + + + + gtk-cut + menu_edit_cut + + + + + + gtk-copy + menu_edit_copy + + + + + + gtk-paste + menu_edit_paste + + + + + + menu_tabs + _Tabs + + + + + menu_tabs_prev + _Previous Tab + + + + + + menu_tabs_next + _Next Tab + + + + + + menu_tabs_left + Move Tab _Left + + + + + menu_tabs_right + Move Tab _Right + + + + + menu_tabs_detach + _Detach Tab + + + + + menu_help + _Help + + + + + gtk-help + menu_help_contents + _Contents + + + + + + gtk-about + menu_help_about + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Chat + chat + 350 + 250 + + + True + + + True + + + False + False + + + + + + + + + + 5 + Invite + True + GTK_WIN_POS_CENTER_ON_PARENT + 275 + 225 + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + True + + + True + 5 + 18 + + + True + 6 + + + True + 0 + Select who would you like to invite: + True + True + + + False + False + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + False + + + + + 1 + + + + + + + True + 6 + + + True + 0 + Invitation _message: + True + True + True + entry + + + False + False + + + + + True + True + True + 40 + You have been invited to join a chat conference. + + + False + False + 1 + + + + + False + False + 1 + + + + + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + + + + + True + False + True + True + True + In_vite + True + + + 1 + + + + + False + GTK_PACK_END + + + + + + button_cancel + button_invite + + + diff --git a/src/empathy-chatrooms-window.glade b/src/empathy-chatrooms-window.ui similarity index 76% rename from src/empathy-chatrooms-window.glade rename to src/empathy-chatrooms-window.ui index ccccc81b..e92de593 100644 --- a/src/empathy-chatrooms-window.glade +++ b/src/empathy-chatrooms-window.ui @@ -1,8 +1,7 @@ - - + - - + + True 5 Edit Favorite Room @@ -12,11 +11,11 @@ GDK_WINDOW_TYPE_HINT_DIALOG False - + True 2 - + True 5 5 @@ -27,197 +26,199 @@ - + True True - Join this chat room when Empathy starts and you are connected + Join this chat room when Empathy starts and you are connected Join room on start_up True - 0 True - + 1 2 4 5 GTK_FILL - + - + True True 25 - + 1 2 - + - + True 0 N_ame: True entry_name - + GTK_FILL - + - + True 0 _Nickname: True entry_nickname - + 1 2 GTK_FILL - + - + True 0 S_erver: True entry_server - + 2 3 GTK_FILL - + - + True 0 _Room: True entry_room - + 3 4 GTK_FILL - + - + True True - + 1 2 1 2 - + - + True True - + 1 2 2 3 - + - + True True - + 1 2 3 4 - + - + 1 - + True GTK_BUTTONBOX_END - + True True True gtk-cancel True - -6 - + - + True True True gtk-save True - -5 - + 1 - + False GTK_PACK_END - + - - + + checkbutton_auto_connect + button_cancel + button_save + + + True 12 Manage Favorite Rooms GTK_WIN_POS_CENTER_ON_PARENT - + True 12 - + True 18 - + True 12 - + True 0 Account: - + False @@ -225,13 +226,13 @@ - + False - + 150 True True @@ -239,69 +240,66 @@ GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - + True True True - + - + 1 - + - + True 6 GTK_BUTTONBOX_END - + True True True gtk-remove True - 0 - + - + True False True True gtk-edit True - 0 - + 1 - + True True True gtk-close True - 0 - + 2 - + False False 1 - + - - + + diff --git a/src/empathy-ft-manager.glade b/src/empathy-ft-manager.ui similarity index 74% rename from src/empathy-ft-manager.glade rename to src/empathy-ft-manager.ui index 2a386145..1e3c4af7 100644 --- a/src/empathy-ft-manager.glade +++ b/src/empathy-ft-manager.ui @@ -1,8 +1,7 @@ - - + - - + + 620 250 5 @@ -12,11 +11,11 @@ GDK_WINDOW_TYPE_HINT_NORMAL False - + True 2 - + 100 True True @@ -25,65 +24,67 @@ GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - + True True - + - + 1 - + True GTK_BUTTONBOX_END - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Remove completed, canceled and failed file transfers from the list + Remove completed, canceled and failed file transfers from the list gtk-clear True - 3 - + - + True True True gtk-open True - 1 - + 1 - + True True True gtk-stop True - 2 - + 2 - + False GTK_PACK_END - + - - + + clear_button + open_button + abort_button + + + diff --git a/src/empathy-import-dialog.glade b/src/empathy-import-dialog.ui similarity index 75% rename from src/empathy-import-dialog.glade rename to src/empathy-import-dialog.ui index 4521d2e8..38ba434e 100644 --- a/src/empathy-import-dialog.glade +++ b/src/empathy-import-dialog.ui @@ -1,8 +1,7 @@ - - + - - + + 5 Import Accounts True @@ -10,63 +9,65 @@ GDK_WINDOW_TYPE_HINT_DIALOG False - + True 2 - + True True GTK_POLICY_NEVER GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - + 200 True True False - + - + 1 - + True GTK_BUTTONBOX_END - + True True True gtk-cancel True - 0 - + - + True True True gtk-ok True - -5 - + 1 - + False GTK_PACK_END - + - - + + button_cancel + button_ok + + + diff --git a/src/empathy-main-window.glade b/src/empathy-main-window.glade deleted file mode 100644 index 737105d2..00000000 --- a/src/empathy-main-window.glade +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - Contact List - contact_list - 225 - 325 - - - True - - - True - - - True - _Chat - True - - - - - True - _New Conversation... - True - - - - True - 1 - im-message-new - - - - - - - True - _View Previous Conversations - True - - - - True - 1 - document-open-recent - - - - - - - True - - - - - True - _Add Contact... - True - - - True - gtk-add - 1 - - - - - - - True - - - - - True - Show _Offline Contacts - True - - - - - - True - - - - - True - gtk-quit - True - True - - - - - - - - - - True - _Edit - True - - - - - True - Context - True - - - - - True - - - - - True - _Accounts - True - - - - - - True - _Personal Information - True - - - True - 1 - user-info - - - - - - - True - - - - - True - _Preferences - True - - - True - gtk-preferences - 1 - - - - - - - - - - - True - _Room - True - - - - - True - Join _New... - True - - - - - True - Join _Favorites - True - - - - - - True - - - - - True - - - - - True - Manage Favorites - True - - - True - 1 - system-users - - - - - - - - - - - True - _Help - True - - - - - True - _Contents - True - - - - True - gtk-help - 1 - - - - - - - True - gtk-about - True - True - - - - - - - - - False - False - - - - - True - GTK_TOOLBAR_BOTH - - - False - False - 1 - - - - - - - - - - False - False - 2 - - - - - True - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - - - - 3 - - - - - - diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui new file mode 100644 index 00000000..76c6428c --- /dev/null +++ b/src/empathy-main-window.ui @@ -0,0 +1,220 @@ + + + + + + + + + chat + _Chat + + + + + chat_new_message + _New Conversation... + + + + + + chat_history + _View Previous Conversations + + + + + + gtk-add + chat_add_contact + _Add Contact... + + + + + chat_show_offline + Show _Offline Contacts + + + + + + gtk-quit + chat_quit + + + + + + edit + _Edit + + + + + edit_context + Context + + + + + edit_accounts + _Accounts + + + + + + edit_personal_information + _Personal Information + + + + + gtk-preferences + edit_preferences + _Preferences + + + + + room + _Room + + + + + room_join_new + Join _New... + + + + + room_join_favorites + Join _Favorites + + + + + + room_manage_favorites + Manage Favorites + + + + + help + _Help + + + + + gtk-help + help_contents + _Contents + + + + + + gtk-about + help_about + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Contact List + contact_list + 225 + 325 + + + True + + + True + + + False + False + + + + + True + GTK_TOOLBAR_BOTH + + + False + False + 1 + + + + + + + + + + False + False + 2 + + + + + True + True + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + + + + 3 + + + + + + diff --git a/src/empathy-new-chatroom-dialog.glade b/src/empathy-new-chatroom-dialog.ui similarity index 75% rename from src/empathy-new-chatroom-dialog.glade rename to src/empathy-new-chatroom-dialog.ui index 98984f7f..04927be2 100644 --- a/src/empathy-new-chatroom-dialog.glade +++ b/src/empathy-new-chatroom-dialog.ui @@ -1,8 +1,7 @@ - - + - - + + True 5 Join New @@ -12,16 +11,16 @@ GDK_WINDOW_TYPE_HINT_DIALOG False - + True 6 - + True 5 18 - + True 3 3 @@ -34,139 +33,138 @@ - + True True - Enter the room name to join here or click on one or more rooms in the list. + Enter the room name to join here or click on one or more rooms in the list. True 32 - + 1 3 2 3 - + - + True True Re_fresh True - 0 - + 2 3 1 2 GTK_FILL - + - + True True - Enter the server which hosts the room, or leave it empty if the room is on the current account's server + Enter the server which hosts the room, or leave it empty if the room is on the current account's server 25 - + 1 2 1 2 - + - + True 0 _Room: True entry_room - + 2 3 GTK_FILL - + - + True 0 _Server: True entry_server - + 1 2 GTK_FILL - + - + True 0 Account: - + GTK_FILL - + - + - + True 6 - + True 6 - + True 3 - + True 2 gtk-find - + False False - + True 0 Browse: True - + 1 - + - + - + 150 True True @@ -174,24 +172,24 @@ GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - + True True - This list represents all chat rooms hosted on the server you have entered. + This list represents all chat rooms hosted on the server you have entered. False - + - + 1 - + 1 - + False False @@ -199,74 +197,77 @@ - + True GTK_BUTTONBOX_END - + True True True gtk-close True - -7 - + - + True False True True True - -5 - + True 0 0 - + True 2 - + True gtk-execute - + False False - + True Join True - + False False 1 - + - + - + 1 - + False GTK_PACK_END - + - - + + togglebutton_refresh + button_cancel + button_join + + + diff --git a/src/empathy-preferences.glade b/src/empathy-preferences.ui similarity index 74% rename from src/empathy-preferences.glade rename to src/empathy-preferences.ui index c7c5ace4..afc294c5 100644 --- a/src/empathy-preferences.glade +++ b/src/empathy-preferences.ui @@ -1,8 +1,7 @@ - - + - - + + 5 Preferences preferences @@ -11,58 +10,56 @@ GDK_WINDOW_TYPE_HINT_DIALOG False - + True 2 - + True True 5 - + True 12 18 - + True 0 GTK_SHADOW_NONE - + True 6 12 - + True 6 - + True True Show co_mpact contact list True - 0 True - + False False - + True True - Avatars are user chosen images shown in the contact list + Avatars are user chosen images shown in the contact list Show _avatars True - 0 True True - + False False @@ -70,97 +67,88 @@ - + True True Show _smileys as images True - 0 True True - + False False 2 - + - + - - + + True <b>Appearance</b> True - - - label_item - + - + False False - + True 0 GTK_SHADOW_NONE - + True 6 12 - + True - + True True _Open new chats in separate windows True - 0 True - + False False - + True True Automatically _connect on startup True - 0 True True - + 1 - + - + - - + + True <b>Behavior</b> True - - - label_item - + - + False False @@ -168,485 +156,465 @@ - + True 0 GTK_SHADOW_NONE - + True 6 12 - + True - + True True Sort by _name True - 0 True - + False False - + True True Sort by s_tate True - 0 True radiobutton_contact_list_sort_by_name - + False False 1 - + - + - - + + True <b>Contact List</b> True - - - label_item - + - + 2 - + - - + + True General - + - tab False - + True 12 6 - + True True _Enable bubble notifications True - 0 True - + False False - + True 12 - + True 6 - + True True Disable notifications when _away or busy True - 0 True - + - + True True Enable notifications when the _chat is not focused True - 0 True - + 1 - + - + False 1 - - - 1 - + - - + + True Notifications - + - tab 4 False - + True 12 18 - + True 6 - + True True _Enable sound notifications True - 0 True - + False False - + True 12 - + True True Disable sounds when _away or busy True - 0 True - + - + 1 - + False - + True 6 - + True 0 <b>Play sound for events</b> True - + False False - + True 12 - + True True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - + True True False - + - + - + 1 - + 1 - - - 2 - + - - + + True Sounds - + - tab 2 False - + True 12 18 - + True 0 GTK_SHADOW_NONE - + True 6 12 - + True 6 - + True - + True 6 - + True False GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - + True True False - + - + - + - + - + True 6 - + True 0 gtk-dialog-info - + False - + True 0 <small>The list of languages reflects only the languages for which you have a dictionary installed.</small> True True - + 1 - + False 1 - + - + - - + + True <b>Enable spell checking for languages:</b> True - - - label_item - + - + - - - 3 - + - - + + True Spell Checking - + - tab 3 False - + True 12 18 - + True 0 GTK_SHADOW_NONE - + True 6 12 - + True 6 - + True 12 - + True Chat Th_eme: True combobox_chat_theme - + False False - + True - - + False False 1 - + - + - + - - + + True <b>Appearance</b> True - - - label_item - + - + False False - - - 4 - + - - + + True Themes - + - tab 4 False - + 1 - + True GTK_BUTTONBOX_END - + True True True gtk-close True - -6 - + - + False GTK_PACK_END - + - - + + checkbutton_compact_contact_list + checkbutton_show_avatars + checkbutton_show_smileys + checkbutton_separate_chat_windows + checkbutton_autoconnect + radiobutton_contact_list_sort_by_name + radiobutton_contact_list_sort_by_state + checkbutton_notifications_enabled + checkbutton_notifications_disabled_away + checkbutton_notifications_focus + checkbutton_sounds_enabled + checkbutton_sounds_disabled_away + button_close + + + diff --git a/src/empathy-status-icon.glade b/src/empathy-status-icon.glade deleted file mode 100644 index ab0f09f8..00000000 --- a/src/empathy-status-icon.glade +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - True - _Show Contact List - True - - - - - True - - - - - True - _New Conversation... - True - - - True - 1 - im-message-new - - - - - - - True - Status - True - - - - - True - - - - - True - _Quit - True - - - True - gtk-quit - 1 - - - - - - diff --git a/src/empathy-status-icon.ui b/src/empathy-status-icon.ui new file mode 100644 index 00000000..2cfff903 --- /dev/null +++ b/src/empathy-status-icon.ui @@ -0,0 +1,53 @@ + + + + + + + + + tray_show_list + _Show Contact List + + + + + tray_new_message + _New Conversation... + + + + + tray_status + Status + + + + + gtk-quit + tray_quit + _Quit + + + + + + + + + + + + + + + + + + + + + + + + -- 2.39.2