[polari] data: Clean up .ui files
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] data: Clean up .ui files
- Date: Sat, 6 Feb 2016 20:45:51 +0000 (UTC)
commit 8a6f8d43364ee7b14c66a2c17375d75e4ed219b7
Author: Florian Müllner <fmuellner gnome org>
Date: Sat Feb 6 02:32:43 2016 +0100
data: Clean up .ui files
Some of our .ui files have very clearly been generated with glade. Which
would be fine if we used glade for all editing, but as we need to hand-edit
files more often than not, clean them up to be a bit more human readable.
Namely:
- bring children into a more reasonable order
(left-to-right and top-to-bottom in the UI)
- remove properties that aren't necessary
- use dashes instead of underscores consistently
for property names
data/resources/connection-details.ui | 142 ++++++++----------------
data/resources/entry-area.ui | 58 ++++------
data/resources/join-room-dialog.ui | 196 +++++++++++----------------------
data/resources/main-window.ui | 83 +++++---------
data/resources/message-user-dialog.ui | 129 +++++++---------------
data/resources/user-list-details.ui | 10 +-
6 files changed, 208 insertions(+), 410 deletions(-)
---
diff --git a/data/resources/connection-details.ui b/data/resources/connection-details.ui
index cf72e39..2f43c72 100644
--- a/data/resources/connection-details.ui
+++ b/data/resources/connection-details.ui
@@ -2,153 +2,110 @@
<interface>
<template class="Gjs_ConnectionDetails" parent="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkGrid" id="grid">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">24</property>
- <property name="margin_end">24</property>
- <property name="margin_top">24</property>
- <property name="margin_bottom">24</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">12</property>
+ <property name="margin">24</property>
+ <property name="row-spacing">12</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="margin">
<property name="visible">True</property>
- <property name="width_request">24</property>
+ <property name="width-request">24</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="server_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">_Address</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">serverEntry</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">serverEntry</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
</child>
<child>
- <object class="GtkLabel" id="description_label">
+ <object class="GtkEntry" id="serverEntry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">_Description</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">descEntry</property>
+ <property name="hexpand">True</property>
+ <property name="activates-default">True</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
</child>
<child>
- <object class="GtkLabel" id="nickname_label">
+ <object class="GtkLabel" id="description_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="margin_top">24</property>
- <property name="label" translatable="yes">_Nickname</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">nickEntry</property>
+ <property name="label" translatable="yes">_Description</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">descEntry</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="realname_label">
+ <object class="GtkEntry" id="descEntry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">_Real Name</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">realnameEntry</property>
+ <property name="hexpand">True</property>
+ <property name="activates-default">True</property>
+ <property name="placeholder-text" translatable="yes">optional</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="realnameEntry">
+ <object class="GtkLabel" id="nickname_label">
<property name="visible">True</property>
- <property name="hexpand">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="placeholder_text" translatable="yes">optional</property>
+ <property name="halign">end</property>
+ <property name="margin-top">24</property>
+ <property name="label" translatable="yes">_Nickname</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">nickEntry</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="nickEntry">
<property name="visible">True</property>
<property name="hexpand">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="margin_top">24</property>
- <property name="activates_default">True</property>
+ <property name="can-default">True</property>
+ <property name="margin-top">24</property>
+ <property name="activates-default">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="descEntry">
+ <object class="GtkLabel" id="realname_label">
<property name="visible">True</property>
- <property name="hexpand">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="placeholder_text" translatable="yes">optional</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_Real Name</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">realnameEntry</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="serverEntry">
+ <object class="GtkEntry" id="realnameEntry">
<property name="visible">True</property>
<property name="hexpand">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
+ <property name="activates-default">True</property>
+ <property name="placeholder-text" translatable="yes">optional</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">3</property>
</packing>
</child>
</object>
@@ -156,7 +113,6 @@
<child>
<object class="GtkBox" id="errorBox">
<property name="visible">False</property>
- <property name="can_focus">False</property>
<property name="orientation">horizontal</property>
<property name="spacing">12</property>
<property name="sensitive">False</property>
@@ -167,16 +123,14 @@
<child>
<object class="GtkImage" id="errorIcon">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">dialog-error-symbolic</property>
- <property name="icon_size">5</property>
+ <property name="icon-name">dialog-error-symbolic</property>
+ <property name="icon-size">5</property>
<property name="margin">12</property>
</object>
</child>
<child>
<object class="GtkLabel" id="errorLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="wrap">true</property>
<property name="vexpand">true</property>
diff --git a/data/resources/entry-area.ui b/data/resources/entry-area.ui
index 75bece4..40af1e0 100644
--- a/data/resources/entry-area.ui
+++ b/data/resources/entry-area.ui
@@ -1,21 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
<interface>
- <requires lib="gtk+" version="3.16"/>
<object class="GtkPopover" id="nickPopover">
- <property name="can_focus">False</property>
<property name="position">top</property>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="margin">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Change nickname:</property>
@@ -24,20 +19,18 @@
<child>
<object class="GtkEntry" id="nickEntry">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
+ <property name="activates-default">True</property>
</object>
</child>
<child>
<object class="GtkButton" id="changeButton">
<property name="label" translatable="yes">_Change</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="can_default">True</property>
+ <property name="receives-default">True</property>
+ <property name="can-default">True</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<style>
<class name="suggested-action"/>
</style>
@@ -48,49 +41,44 @@
</object>
<template class="Gjs_EntryArea" parent="GtkStack">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="valign">end</property>
- <property name="transition_type">crossfade</property>
+ <property name="transition-type">crossfade</property>
<style>
<class name="view"/>
</style>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="margin">6</property>
<property name="margin-end">14</property>
<child>
<object class="GtkMenuButton" id="nickButton">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="focus_on_click">False</property>
+ <property name="receives-default">True</property>
+ <property name="focus-on-click">False</property>
<property name="popover">nickPopover</property>
+ <style>
+ <class name="flat"/>
+ <class name="polari-nick-button"/>
+ </style>
<child>
<object class="GtkLabel" id="nickLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
</child>
<child internal-child="accessible">
- <object class="AtkObject" id="menubutton1-atkobject">
+ <object class="AtkObject">
<property name="AtkObject::accessible-name"
translatable="yes">Change nickname</property>
</object>
</child>
- <style>
- <class name="flat"/>
- <class name="polari-nick-button"/>
- </style>
</object>
</child>
<child>
<object class="Gjs_ChatEntry" id="chatEntry">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="hexpand">True</property>
</object>
</child>
@@ -102,7 +90,7 @@
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="shadow_type">none</property>
+ <property name="shadow-type">none</property>
<style>
<class name="background"/>
<class name="polari-paste-confirmation"/>
@@ -110,14 +98,12 @@
<child>
<object class="GtkBox" id="multiLineBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="margin">6</property>
<property name="margin-end">14</property>
<child>
<object class="GtkLabel" id="multiLineLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="ellipsize">end</property>
@@ -128,19 +114,17 @@
<object class="GtkButton" id="cancelButton">
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child>
<object class="GtkButton" id="pasteButton">
<property name="label" translatable="yes">_Paste</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="action_name">app.paste-text</property>
- <property name="use_underline">True</property>
+ <property name="receives-default">True</property>
+ <property name="action-name">app.paste-text</property>
+ <property name="use-underline">True</property>
<style>
<class name="suggested-action"/>
</style>
diff --git a/data/resources/join-room-dialog.ui b/data/resources/join-room-dialog.ui
index 1d05de1..4eb5086 100644
--- a/data/resources/join-room-dialog.ui
+++ b/data/resources/join-room-dialog.ui
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.10 -->
- <object class="GtkListStore" id="liststore1">
+ <object class="GtkListStore" id="liststore">
<columns>
<!-- column-name name -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkEntryCompletion" id="name_completion">
- <property name="model">liststore1</property>
- <property name="text_column">0</property>
- <property name="inline_completion">True</property>
+ <property name="model">liststore</property>
+ <property name="text-column">0</property>
+ <property name="inline-completion">True</property>
<child>
- <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -20,217 +19,152 @@
</object>
<object class="GtkDialog" id="join_room_dialog">
<property name="title" translatable="yes">Join Chat Room</property>
- <property name="can_focus">False</property>
<property name="modal">True</property>
- <property name="destroy_with_parent">True</property>
- <property name="type_hint">dialog</property>
- <property name="default_width">500</property>
- <property name="use_header_bar">1</property>
+ <property name="destroy-with-parent">True</property>
+ <property name="default-width">500</property>
+ <property name="use-header-bar">1</property>
<child type="action">
<object class="GtkButton" id="cancel_button">
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child type="action">
<object class="GtkButton" id="confirm_button">
<property name="label" translatable="yes">_Join</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
+ <object class="GtkBox">
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkStack" id="stack">
<property name="visible">True</property>
- <property name="transition_type">slide-left-right</property>
+ <property name="transition-type">slide-left-right</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">24</property>
- <property name="margin_end">24</property>
- <property name="margin_top">24</property>
- <property name="margin_bottom">24</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">12</property>
+ <property name="margin">24</property>
+ <property name="row-spacing">12</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="margin">
<property name="visible">True</property>
- <property name="width_request">24</property>
+ <property name="width-request">24</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
</child>
<child>
- <object class="GtkEntry" id="password_entry">
+ <object class="GtkLabel" id="connection_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="visibility">False</property>
- <property name="activates_default">True</property>
- <property name="placeholder_text" translatable="yes">optional</property>
- <property name="input_purpose">password</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">C_onnection</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">connection_combo</property>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">2</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
</child>
<child>
- <object class="GtkEntry" id="name_entry">
+ <object class="GtkComboBoxText" id="connection_combo">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="margin_top">24</property>
- <property name="activates_default">True</property>
- <property name="completion">name_completion</property>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
</child>
<child>
<object class="GtkButton" id="add_connection_button">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="receives-default">True</property>
<property name="focus-on-click">False</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkImage" id="image1">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">list-add-symbolic</property>
+ <property name="icon-name">list-add-symbolic</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">_Add Connection</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">add_connection_button</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">add_connection_button</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
</object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
</child>
<child>
- <object class="GtkComboBoxText" id="connection_combo">
+ <object class="GtkLabel" id="name_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="halign">end</property>
+ <property name="margin-top">24</property>
+ <property name="label" translatable="yes">Room _Name</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">name_entry</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="connection_label">
+ <object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">C_onnection</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">connection_combo</property>
+ <property name="hexpand">True</property>
+ <property name="margin-top">24</property>
+ <property name="activates-default">True</property>
+ <property name="completion">name_completion</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="name_label">
+ <object class="GtkLabel" id="password_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="margin_top">24</property>
- <property name="label" translatable="yes">Room _Name</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">name_entry</property>
+ <property name="label" translatable="yes">_Password</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">password_entry</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="password_label">
+ <object class="GtkEntry" id="password_entry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">_Password</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">password_entry</property>
+ <property name="hexpand">True</property>
+ <property name="visibility">False</property>
+ <property name="activates-default">True</property>
+ <property name="placeholder-text" translatable="yes">optional</property>
+ <property name="input-purpose">password</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
<packing>
<property name="name">main</property>
- <property name="position">0</property>
</packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
diff --git a/data/resources/main-window.ui b/data/resources/main-window.ui
index 9bad098..801f021 100644
--- a/data/resources/main-window.ui
+++ b/data/resources/main-window.ui
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.10 -->
<menu id="join_menu">
<section>
<item>
@@ -14,53 +13,48 @@
</section>
</menu>
<object class="GtkApplicationWindow" id="main_window">
- <property name="can_focus">False</property>
<property name="title" translatable="yes">Polari</property>
- <property name="icon_name">polari</property>
- <property name="show_menubar">false</property>
+ <property name="icon-name">polari</property>
+ <property name="show-menubar">false</property>
<child type="titlebar">
- <object class="GtkBox" id="box1">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkHeaderBar" id="titlebar_left">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="hexpand">False</property>
- <property name="show_close_button">True</property>
+ <property name="show-close-button">True</property>
<style>
<class name="polari-titlebar-left"/>
</style>
<child>
<object class="GtkMenuButton" id="join_menu_button">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
- <property name="menu_model">join_menu</property>
- <property name="action_name">app.room-menu</property>
+ <property name="menu-model">join_menu</property>
+ <property name="action-name">app.room-menu</property>
<style>
<class name="image-button"/>
</style>
<child>
- <object class="GtkImage" id="image1">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">list-add-symbolic</property>
- <property name="icon_size">1</property>
+ <property name="icon-name">list-add-symbolic</property>
+ <property name="icon-size">1</property>
</object>
</child>
<child internal-child="accessible">
- <object class="AtkObject" id="menubutton1-atkobject">
+ <object class="AtkObject">
<property name="AtkObject::accessible-name"
translatable="yes">Join room</property>
</object>
</child>
</object>
<packing>
- <property name="pack_type">start</property>
+ <property name="pack-type">start</property>
</packing>
</child>
<child>
@@ -71,7 +65,7 @@
</style>
</object>
<packing>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
</packing>
</child>
</object>
@@ -80,7 +74,7 @@
<object class="GtkHeaderBar" id="titlebar_right">
<property name="visible">True</property>
<property name="hexpand">True</property>
- <property name="show_close_button">True</property>
+ <property name="show-close-button">True</property>
<style>
<class name="polari-titlebar-right"/>
</style>
@@ -103,7 +97,7 @@
<child>
<object class="GtkLabel" id="title_label">
<property name="visible">True</property>
- <property name="single_line_mode">True</property>
+ <property name="single-line-mode">True</property>
<property name="ellipsize">end</property>
<style>
<class name="title"/>
@@ -113,9 +107,9 @@
<child>
<object class="GtkLabel" id="subtitle_label">
<property name="visible">True</property>
- <property name="single_line_mode">True</property>
+ <property name="single-line-mode">True</property>
<property name="ellipsize">end</property>
- <property name="use_markup">True</property>
+ <property name="use-markup">True</property>
<style>
<class name="subtitle"/>
<class name="dim-label"/>
@@ -125,13 +119,13 @@
</object>
</child>
<child>
- <object class="GtkBox" id="box7">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="single_line_mode">True</property>
+ <property name="single-line-mode">True</property>
<property name="ellipsize">end</property>
<style>
<class name="title"/>
@@ -139,11 +133,11 @@
</object>
</child>
<child>
- <object class="GtkLabel" id="label4">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="single_line_mode">True</property>
+ <property name="single-line-mode">True</property>
<property name="ellipsize">end</property>
- <property name="use_markup">True</property>
+ <property name="use-markup">True</property>
<style>
<class name="subtitle"/>
<class name="dim-label"/>
@@ -157,16 +151,15 @@
<child>
<object class="GtkToggleButton" id="show_user_list_button">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="action_name">app.user-list</property>
+ <property name="focus-on-click">False</property>
+ <property name="action-name">app.user-list</property>
<style>
<class name="polari-user-list-button"/>
<class name="text-button"/>
</style>
</object>
<packing>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
</packing>
</child>
</object>
@@ -174,29 +167,26 @@
</object>
</child>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkRevealer" id="room_list_revealer">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="hexpand">False</property>
- <property name="transition_type">slide-right</property>
+ <property name="transition-type">slide-right</property>
<child>
- <object class="Gjs_FixedSizeFrame" id="frame1">
+ <object class="Gjs_FixedSizeFrame" id="room_sidebar">
<property name="visible">True</property>
<property name="hexpand">False</property>
<property name="width">200</property>
- <property name="shadow_type">none</property>
+ <property name="shadow-type">none</property>
<style>
<class name="polari-room-list"/>
</style>
<child>
<object class="GtkScrolledWindow" id="room_list_scrollview">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
+ <property name="hscrollbar-policy">never</property>
<property name="vexpand">True</property>
<property name="hexpand">True</property>
<child>
@@ -207,26 +197,15 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
<object class="GtkOverlay" id="overlay">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="vexpand">True</property>
<child>
<placeholder/>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
@@ -235,7 +214,7 @@
<property name="mode">horizontal</property>
<widgets>
<widget name="titlebar_left"/>
- <widget name="frame1"/>
+ <widget name="room_sidebar"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="bottom_size_group">
diff --git a/data/resources/message-user-dialog.ui b/data/resources/message-user-dialog.ui
index 2ad723b..be68b21 100644
--- a/data/resources/message-user-dialog.ui
+++ b/data/resources/message-user-dialog.ui
@@ -1,185 +1,132 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.15.4 on Sat Sep 28 22:12:51 2013 -->
<interface>
- <!-- interface-requires gtk+ 3.10 -->
- <object class="GtkListStore" id="liststore1">
+ <object class="GtkListStore" id="liststore">
<columns>
<!-- column-name name -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkEntryCompletion" id="name_completion">
- <property name="model">liststore1</property>
- <property name="text_column">0</property>
- <property name="inline_completion">True</property>
- <property name="popup_single_match">False</property>
+ <property name="model">liststore</property>
+ <property name="text-column">0</property>
+ <property name="inline-completion">True</property>
+ <property name="popup-single-match">False</property>
<child>
- <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<object class="GtkDialog" id="message_user_dialog">
- <property name="can_focus">False</property>
<property name="modal">True</property>
- <property name="type_hint">dialog</property>
- <property name="use_header_bar">1</property>
+ <property name="use-header-bar">1</property>
<child type="action">
<object class="GtkButton" id="cancel_button">
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child type="action">
<object class="GtkButton" id="message_button">
<property name="label" translatable="yes">_Message</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
</object>
</child>
<child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
+ <object class="GtkBox">
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">24</property>
- <property name="margin_end">24</property>
- <property name="margin_top">24</property>
- <property name="margin_bottom">24</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">12</property>
+ <property name="margin">24</property>
+ <property name="row-spacing">12</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="margin">
<property name="visible">True</property>
- <property name="width_request">24</property>
+ <property name="width-request">24</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="connection_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">C_onnection</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">connection_combo</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">connection_combo</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
</child>
<child>
<object class="GtkComboBoxText" id="connection_combo">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="recent_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">start</property>
- <property name="margin_top">24</property>
+ <property name="margin-top">24</property>
<property name="label" translatable="yes">_Recent</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">recent_list</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">recent_list</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="margin_top">24</property>
- <property name="shadow_type">in</property>
+ <property name="margin-top">24</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkListBox" id="recent_list">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="selection_mode">none</property>
+ <property name="selection-mode">none</property>
</object>
</child>
- <child type="label_item">
- <placeholder/>
- </child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="name_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">_Name</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">name_entry</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">name_entry</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
+ <property name="activates-default">True</property>
<property name="completion">name_completion</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">2</property>
</packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
diff --git a/data/resources/user-list-details.ui b/data/resources/user-list-details.ui
index 7214d7d..2ff4eb3 100644
--- a/data/resources/user-list-details.ui
+++ b/data/resources/user-list-details.ui
@@ -31,8 +31,8 @@
</child>
<child>
<object class="GtkGrid" id="detailsGrid">
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">6</property>
<property name="hexpand">True</property>
<property name="visible">True</property>
<child>
@@ -51,7 +51,7 @@
<object class="GtkLabel" id="lastHeader">
<property name="label" translatable="yes">Last Activity:</property>
<property name="valign">start</property>
- <property name="use_markup">True</property>
+ <property name="use-markup">True</property>
<property name="visible">True</property>
</object>
<packing>
@@ -62,7 +62,7 @@
<child>
<object class="GtkLabel" id="lastLabel">
<property name="valign">end</property>
- <property name="use_markup">True</property>
+ <property name="use-markup">True</property>
<property name="wrap">True</property>
<property name="hexpand">True</property>
<property name="visible">True</property>
@@ -77,7 +77,7 @@
<child>
<object class="GtkButton" id="messageButton">
<property name="label" translatable="yes">Message</property>
- <property name="margin_top">12</property>
+ <property name="margin-top">12</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
<property name="visible">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
