[epiphany/wip/sync: 49/74] prefs-dialog: Prettify sync tab
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/sync: 49/74] prefs-dialog: Prettify sync tab
- Date: Sun, 6 Aug 2017 14:31:12 +0000 (UTC)
commit f1f0ea42526b1c84fa241d977c79d421f5c0ce43
Author: Gabriel Ivascu <ivascu gabriel59 gmail com>
Date: Thu Jun 8 16:25:41 2017 +0300
prefs-dialog: Prettify sync tab
src/prefs-dialog.c | 4 +-
src/resources/gtk/prefs-dialog.ui | 180 ++++++++++++++++---------------
src/resources/gtk/synced-tabs-dialog.ui | 2 +-
3 files changed, 98 insertions(+), 88 deletions(-)
---
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 7b0cb00..39b05e2 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -282,7 +282,7 @@ sync_secrets_store_finished_cb (EphySyncService *service,
/* Show sync options panel. */
user = g_strdup_printf ("<b>%s</b>", ephy_sync_utils_get_sync_user ());
/* Translators: the %s refers to the email of the currently logged in user. */
- text = g_strdup_printf (_("Currently logged in as %s"), user);
+ text = g_strdup_printf (_("Logged in as %s"), user);
gtk_label_set_markup (GTK_LABEL (dialog->sync_firefox_account_label), text);
gtk_container_remove (GTK_CONTAINER (dialog->sync_page_box),
dialog->sync_firefox_iframe_box);
@@ -1784,7 +1784,7 @@ setup_sync_page (PrefsDialog *dialog)
} else {
char *email = g_strdup_printf ("<b>%s</b>", user);
/* Translators: the %s refers to the email of the currently logged in user. */
- char *text = g_strdup_printf (_("Currently logged in as %s"), email);
+ char *text = g_strdup_printf (_("Logged in as %s"), email);
gtk_label_set_markup (GTK_LABEL (dialog->sync_firefox_account_label), text);
gtk_container_remove (GTK_CONTAINER (dialog->sync_page_box),
diff --git a/src/resources/gtk/prefs-dialog.ui b/src/resources/gtk/prefs-dialog.ui
index dbbc7ae..2dd7ed8 100644
--- a/src/resources/gtk/prefs-dialog.ui
+++ b/src/resources/gtk/prefs-dialog.ui
@@ -774,7 +774,7 @@
<property name="visible">True</property>
<property name="border-width">12</property>
<property name="orientation">vertical</property>
- <property name="spacing">18</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@@ -784,7 +784,7 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Sync</property>
+ <property name="label" translatable="yes">Firefox Sync</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -800,7 +800,7 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="halign">start</property>
- <property name="max-width-chars">60</property>
+ <property name="max-width-chars">48</property>
<property name="wrap">True</property>
<property name="label" translatable="yes">Sign in with your Firefox account to
sync your data with Web and Firefox on other computers. Web is not produced or endorsed by Mozilla.</property>
</object>
@@ -829,13 +829,27 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Firefox Account</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Firefox Account</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </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>
+ <signal name="clicked" handler="on_sync_sign_out_button_clicked"/>
+ </object>
+ </child>
</object>
</child>
<child>
@@ -851,15 +865,6 @@
<property name="label" translatable="yes"/>
</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>
- <signal name="clicked" handler="on_sync_sign_out_button_clicked"/>
- </object>
- </child>
</object>
</child>
</object>
@@ -883,7 +888,7 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">4</property>
<property name="margin-start">12</property>
<child>
<object class="GtkCheckButton" id="sync_with_firefox_checkbutton">
@@ -893,13 +898,27 @@
</object>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Collections</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Collections</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="synced_tabs_button">
+ <property name="label" translatable="yes">S_ynced tabs</property>
+ <property name="visible">True</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="on_sync_synced_tabs_button_clicked"/>
+ </object>
+ </child>
</object>
</child>
<child>
@@ -939,13 +958,27 @@
</object>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Frequency</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Frequency</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="sync_now_button">
+ <property name="label" translatable="yes">Sync _now</property>
+ <property name="visible">True</property>
+ <property name="use-underline">True</property>
+ <signal name="clicked" handler="on_sync_sync_now_button_clicked"/>
+ </object>
+ </child>
</object>
</child>
<child>
@@ -990,67 +1023,21 @@
</child>
</object>
</child>
- <child>
- <object class="GtkButton" id="sync_now_button">
- <property name="label" translatable="yes">Sync _now</property>
- <property name="visible">True</property>
- <property name="use-underline">True</property>
- <property name="halign">start</property>
- <signal name="clicked" handler="on_sync_sync_now_button_clicked"/>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Misc</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>
<child>
- <object class="GtkButton" id="synced_tabs_button">
- <property name="label" translatable="yes">_View synced tabs</property>
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="use-underline">True</property>
<property name="halign">start</property>
- <signal name="clicked" handler="on_sync_synced_tabs_button_clicked"/>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Device name</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">6</property>
- <property name="margin-start">12</property>
- <child>
- <object class="GtkEntry" id="sync_device_name_entry">
- <property name="visible">True</property>
<property name="hexpand">True</property>
- <property name="halign">start</property>
- <property name="width-request">250</property>
- <property name="sensitive">False</property>
+ <property name="label" translatable="yes">Device name</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
<child>
@@ -1058,7 +1045,6 @@
<property name="label" translatable="yes">_Change</property>
<property name="visible">True</property>
<property name="use-underline">True</property>
- <property name="halign">start</property>
<signal name="clicked" handler="on_sync_device_name_change_button_clicked"/>
</object>
</child>
@@ -1067,7 +1053,6 @@
<property name="label" translatable="yes">_Save</property>
<property name="visible">False</property>
<property name="use-underline">True</property>
- <property name="halign">start</property>
<signal name="clicked" handler="on_sync_device_name_save_button_clicked"/>
</object>
</child>
@@ -1076,12 +1061,28 @@
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">False</property>
<property name="use-underline">True</property>
- <property name="halign">start</property>
<signal name="clicked" handler="on_sync_device_name_cancel_button_clicked"/>
</object>
</child>
</object>
</child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="spacing">6</property>
+ <property name="margin-start">12</property>
+ <child>
+ <object class="GtkEntry" id="sync_device_name_entry">
+ <property name="visible">True</property>
+ <property name="hexpand">True</property>
+ <property name="halign">start</property>
+ <property name="width-request">250</property>
+ <property name="sensitive">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -1113,4 +1114,13 @@
<widget name="clear_personal_data_button"/>
</widgets>
</object>
+ <object class="GtkSizeGroup">
+ <property name="mode">horizontal</property>
+ <widgets>
+ <widget name="sync_sign_out_button"/>
+ <widget name="synced_tabs_button"/>
+ <widget name="sync_now_button"/>
+ <widget name="sync_device_name_change_button"/>
+ </widgets>
+ </object>
</interface>
diff --git a/src/resources/gtk/synced-tabs-dialog.ui b/src/resources/gtk/synced-tabs-dialog.ui
index 86410f2..c8137e2 100644
--- a/src/resources/gtk/synced-tabs-dialog.ui
+++ b/src/resources/gtk/synced-tabs-dialog.ui
@@ -35,7 +35,7 @@
<property name="halign">start</property>
<property name="wrap">True</property>
<property name="max-width-chars">50</property>
- <property name="label" translatable="yes">Below are the synced open tabs of your other devices
that use Firefox Sync with this account. Except for the tabs under Local Tabs, all the other tabs can be
opened by double clicking on their name.</property>
+ <property name="label" translatable="yes">Below are the synced open tabs of your other devices
that use Firefox Sync with this account. Open a tab by double clicking its name (tabs under Local Tabs cannot
be opened).</property>
</object>
</child>
<child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
