[epiphany/wip/sync-rebase: 79/86] prefs-dialog.ui: Use one vertical box instead of two
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/sync-rebase: 79/86] prefs-dialog.ui: Use one vertical box instead of two
- Date: Fri, 7 Oct 2016 22:55:22 +0000 (UTC)
commit 5480f10402654be801da1de808cce7ca2104af9b
Author: Gabriel Ivascu <ivascu gabriel59 gmail com>
Date: Thu Sep 1 11:31:09 2016 +0300
prefs-dialog.ui: Use one vertical box instead of two
src/resources/prefs-dialog.ui | 144 ++++++++++++++++++----------------------
1 files changed, 65 insertions(+), 79 deletions(-)
---
diff --git a/src/resources/prefs-dialog.ui b/src/resources/prefs-dialog.ui
index 863a801..d2b5cfe 100644
--- a/src/resources/prefs-dialog.ui
+++ b/src/resources/prefs-dialog.ui
@@ -737,49 +737,42 @@
<property name="visible">True</property>
<property name="border-width">12</property>
<property name="orientation">vertical</property>
- <property name="spacing">18</property>
+ <property name="spacing">8</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">18</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Sync</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="spacing">8</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Sync</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="use-markup">True</property>
+ <property name="label" translatable="yes">Sign in with your Firefox account and
have your bookmarks synced across all your devices.</property>
</object>
</child>
<child>
- <object class="GtkBox" id="sync_top_box">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="margin-start">12</property>
- <property name="spacing">8</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="halign">start</property>
- <property name="use-markup">True</property>
- <property name="label" translatable="yes">Sign in with your Firefox account
and have your bookmarks synced across all your devices.</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="halign">start</property>
- <property name="use-markup">True</property>
- <property name="label" translatable="yes">Note that you must own an already
verified account to be able to login.</property>
- </object>
- </child>
+ <property name="halign">start</property>
+ <property name="use-markup">True</property>
+ <property name="label" translatable="yes">Note that you must own an already
verified account to be able to login.</property>
</object>
</child>
</object>
@@ -790,74 +783,67 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">18</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Authenticate</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="sync_authenticate_box">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="margin-start">12</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkBox" id="sync_sign_in_box">
<property name="visible">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Authenticate</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="orientation">vertical</property>
+ <property name="halign">center</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="sync_sign_in_details">
+ <property name="visible">False</property>
+ <property name="halign">start</property>
+ </object>
+ </child>
</object>
</child>
<child>
- <object class="GtkBox" id="sync_authenticate_box">
+ <object class="GtkBox" id="sync_sign_out_box">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="margin-start">12</property>
+ <property name="spacing">8</property>
<child>
- <object class="GtkBox" id="sync_sign_in_box">
+ <object class="GtkLabel" id="sync_sign_out_details">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="halign">center</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="sync_sign_in_details">
- <property name="visible">False</property>
- <property name="halign">start</property>
- </object>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"></property>
</object>
</child>
<child>
- <object class="GtkBox" id="sync_sign_out_box">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">8</property>
- <child>
- <object class="GtkLabel" id="sync_sign_out_details">
- <property name="visible">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"></property>
- </object>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Sign out if you wish to stop
syncing.</property>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="sync_sign_out_button">
- <property name="label" translatable="yes">Sign _out</property>
- <property name="visible">True</property>
- <property name="use-underline">True</property>
- <property name="halign">start</property>
- <property name="width-request">100</property>
- <signal name="clicked" handler="on_sync_sign_out_button_clicked"/>
- <style>
- <class name="destructive-action"/>
- <class name="text-button"/>
- </style>
- </object>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Sign out if you wish to stop
syncing.</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="sync_sign_out_button">
+ <property name="label" translatable="yes">Sign _out</property>
+ <property name="visible">True</property>
+ <property name="use-underline">True</property>
+ <property name="halign">start</property>
+ <property name="width-request">100</property>
+ <signal name="clicked" handler="on_sync_sign_out_button_clicked"/>
+ <style>
+ <class name="destructive-action"/>
+ <class name="text-button"/>
+ </style>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
