[fractal: 1/2] account_settings: Remove revealer boxes
- From: Daniel Garcia Moreno <danigm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal: 1/2] account_settings: Remove revealer boxes
- Date: Wed, 13 Mar 2019 09:42:18 +0000 (UTC)
commit b2135efac2f045033960ac950b15556fe467c1ea
Author: Xiang Fan <sfanxiang gmail com>
Date: Wed Feb 27 20:22:20 2019 +0800
account_settings: Remove revealer boxes
fractal-gtk/res/app.css | 18 --
fractal-gtk/res/ui/account_settings.ui | 414 +++++++++++++--------------------
fractal-gtk/src/app/connect/account.rs | 66 ------
fractal-gtk/src/appop/account.rs | 42 ----
4 files changed, 167 insertions(+), 373 deletions(-)
---
diff --git a/fractal-gtk/res/app.css b/fractal-gtk/res/app.css
index 02a8ec1c..87b75e06 100644
--- a/fractal-gtk/res/app.css
+++ b/fractal-gtk/res/app.css
@@ -224,24 +224,6 @@ row .timestamp {
background-color: @theme_bg_color;
}
-.advanced_revealer {
- border-radius: 3px;
- border: 1px solid @borders;
- background-color: @theme_base_color;
-}
-
-.advanced_revealer_header {
- padding: 18px;
-}
-
-.advanced_revealer_divider {
- border-radius: 0px;
- border-bottom: 1px solid @borders;
-}
-.advanced_revealer_body {
- padding: 18px;
-}
-
.no_member_search {
padding: 12px;
background: @theme_base_color;
diff --git a/fractal-gtk/res/ui/account_settings.ui b/fractal-gtk/res/ui/account_settings.ui
index 4ce98170..fad95c6f 100644
--- a/fractal-gtk/res/ui/account_settings.ui
+++ b/fractal-gtk/res/ui/account_settings.ui
@@ -266,164 +266,127 @@
<object class="GtkBox" id="account_settings_advanced_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">24</property>
+ <property name="margin_top">36</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkEventBox" id="account_settings_advanced_toggle">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Advanced Information</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkBox">
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Advanced Information</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="label" translatable="yes">Homeserver</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkImage">
+ <object class="GtkLabel" id="account_settings_homeserver">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">None</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">pan-end-symbolic</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="label" translatable="yes">Matrix ID</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
- <style>
- <class name="advanced_revealer_header"/>
- </style>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRevealer" id="account_settings_advanced">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkLabel" id="account_settings_uid">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">None</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">Homeserver</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="account_settings_homeserver">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">None</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">Matrix ID</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="account_settings_uid">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">None</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">Device ID</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="account_settings_device_id">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">None</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="label" translatable="yes">Device ID</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="account_settings_device_id">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">None</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
- <style>
- <class name="advanced_revealer_body"/>
- </style>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -432,9 +395,6 @@
<property name="position">1</property>
</packing>
</child>
- <style>
- <class name="advanced_revealer"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
@@ -446,21 +406,43 @@
<object class="GtkBox" id="account_settings_delete_box">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="margin_top">12</property>
+ <property name="margin_top">36</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkEventBox" id="account_settings_delete_toggle">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Deactivate Account</property>
+ <property name="xalign">2.2351741291171123e-10</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Deactivate Account</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Deactivating your account
means that you will lose all your messages, contacts, and files.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">35</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -469,129 +451,70 @@
</packing>
</child>
<child>
- <object class="GtkImage">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">pan-end-symbolic</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">To confirm that you really
want to deactivate this account type in your password:</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">35</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
- <style>
- <class name="advanced_revealer_header"/>
- </style>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRevealer" id="account_settings_delete">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="transition-duration">300</property>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="GtkBox">
+ <object class="GtkEntry" id="account_settings_delete_password_confirm">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Deactivating your account
means that you will lose all your messages, contacts, and files.</property>
- <property name="wrap">True</property>
- <property name="max_width_chars">35</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">To confirm that you really
want to deactivate this account type in your password:</property>
- <property name="wrap">True</property>
- <property name="max_width_chars">35</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="account_settings_delete_password_confirm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="account_settings_delete_check">
- <property name="label" translatable="yes">Also erase all
messages</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="account_settings_delete_btn">
- <property name="label" translatable="yes">Deactivate
Account</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">end</property>
- <style>
- <class name="destructive-action"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="account_settings_delete_check">
+ <property name="label" translatable="yes">Also erase all
messages</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="account_settings_delete_btn">
+ <property name="label" translatable="yes">Deactivate Account</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <style>
+ <class name="destructive-action"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
</packing>
</child>
- <style>
- <class name="advanced_revealer_body"/>
- </style>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -600,9 +523,6 @@
<property name="position">1</property>
</packing>
</child>
- <style>
- <class name="advanced_revealer"/>
- </style>
</object>
<packing>
<property name="expand">False</property>
diff --git a/fractal-gtk/src/app/connect/account.rs b/fractal-gtk/src/app/connect/account.rs
index f2e9da74..546efebb 100644
--- a/fractal-gtk/src/app/connect/account.rs
+++ b/fractal-gtk/src/app/connect/account.rs
@@ -27,26 +27,6 @@ impl App {
.builder
.get_object::<gtk::Dialog>("password_dialog")
.expect("Can't find password_dialog in ui file.");
- let advanced_toggle = self
- .ui
- .builder
- .get_object::<gtk::EventBox>("account_settings_advanced_toggle")
- .expect("Can't find account_settings_advanced_toggle in ui file.");
- let delete_toggle = self
- .ui
- .builder
- .get_object::<gtk::EventBox>("account_settings_delete_toggle")
- .expect("Can't find account_settings_delete_toggle in ui file.");
- let delete_revealer = self
- .ui
- .builder
- .get_object::<gtk::Revealer>("account_settings_delete")
- .expect("Can't find account_settings_delete in ui file.");
- let advanced_revealer = self
- .ui
- .builder
- .get_object::<gtk::Revealer>("account_settings_advanced")
- .expect("Can't find account_settings_advanced in ui file.");
let avatar_btn = self
.ui
.builder
@@ -244,36 +224,6 @@ impl App {
validate_password_input(&builder)
}));
- advanced_toggle.connect_button_press_event(clone!(builder => move |this, _| {
- let widget = builder
- .get_object::<gtk::Revealer>("account_settings_advanced")
- .expect("Can't find account_settings_advanced in ui file.");
- if widget.get_reveal_child() {
- this.get_style_context().unwrap().remove_class("advanced_revealer_divider");
- widget.set_reveal_child(false);
- }
- else {
- this.get_style_context().unwrap().add_class("advanced_revealer_divider");
- widget.set_reveal_child(true);
- }
- glib::signal::Inhibit(false)
- }));
-
- delete_toggle.connect_button_press_event(clone!(builder => move |this, _| {
- let widget = builder
- .get_object::<gtk::Revealer>("account_settings_delete")
- .expect("Can't find account_settings_delete in ui file.");
- if widget.get_reveal_child() {
- this.get_style_context().unwrap().remove_class("advanced_revealer_divider");
- widget.set_reveal_child(false);
- }
- else {
- this.get_style_context().unwrap().add_class("advanced_revealer_divider");
- widget.set_reveal_child(true);
- }
- glib::signal::Inhibit(false)
- }));
-
destruction_entry.connect_property_text_notify(clone!(destruction_btn => move |w| {
if let Some(text) = w.get_text() {
if text != "" {
@@ -287,21 +237,5 @@ impl App {
destruction_btn.connect_clicked(clone!(op => move |_| {
op.lock().unwrap().account_destruction();
}));
-
- let scroll = builder
- .get_object::<gtk::ScrolledWindow>("account_settings_scroll")
- .expect("Can't find account_settings_scroll in ui file.");
- delete_revealer.connect_size_allocate(clone!(scroll => move |_, _| {
- if let Some(adj) = scroll.get_vadjustment() {
- let bottom = adj.get_upper() - adj.get_page_size();
- adj.set_value(bottom);
- }
- }));
- advanced_revealer.connect_size_allocate(clone!(scroll => move |_, _| {
- if let Some(adj) = scroll.get_vadjustment() {
- let bottom = adj.get_upper() - adj.get_page_size();
- adj.set_value(bottom);
- }
- }));
}
}
diff --git a/fractal-gtk/src/appop/account.rs b/fractal-gtk/src/appop/account.rs
index 5cf316cc..9116420c 100644
--- a/fractal-gtk/src/appop/account.rs
+++ b/fractal-gtk/src/appop/account.rs
@@ -243,16 +243,6 @@ impl AppOp {
.builder
.get_object::<gtk::Stack>("account_settings_stack")
.expect("Can't find account_settings_delete_box in ui file.");
- let advanced = self
- .ui
- .builder
- .get_object::<gtk::Revealer>("account_settings_advanced")
- .expect("Can't find account_settings_advanced in ui file.");
- let delete = self
- .ui
- .builder
- .get_object::<gtk::Revealer>("account_settings_delete")
- .expect("Can't find account_settings_delete in ui file.");
let destruction_btn = self
.ui
.builder
@@ -302,8 +292,6 @@ impl AppOp {
password_btn_stack.set_visible_child_name("label");
password_btn.set_sensitive(true);
- advanced.set_reveal_child(false);
- delete.set_reveal_child(false);
destruction_flag.set_active(false);
destruction_btn.set_sensitive(false);
destruction_entry.set_text("");
@@ -529,26 +517,6 @@ impl AppOp {
}
pub fn close_account_settings_dialog(&self) {
- let advanced = self
- .ui
- .builder
- .get_object::<gtk::Revealer>("account_settings_advanced")
- .expect("Can't find account_settings_advanced in ui file.");
- let delete = self
- .ui
- .builder
- .get_object::<gtk::Revealer>("account_settings_delete")
- .expect("Can't find account_settings_delete in ui file.");
- let advanced_toggle = self
- .ui
- .builder
- .get_object::<gtk::EventBox>("account_settings_advanced_toggle")
- .expect("Can't find account_settings_advanced_toggle in ui file.");
- let delete_toggle = self
- .ui
- .builder
- .get_object::<gtk::EventBox>("account_settings_delete_toggle")
- .expect("Can't find account_settings_delete_toggle in ui file.");
let advanced_box = self
.ui
.builder
@@ -565,16 +533,6 @@ impl AppOp {
.get_object::<gtk::Box>("account_settings_box")
.expect("Can't find account_settings_delete_box in ui file.");
- advanced_toggle
- .get_style_context()
- .unwrap()
- .remove_class("advanced_revealer_divider");
- delete_toggle
- .get_style_context()
- .unwrap()
- .remove_class("advanced_revealer_divider");
- advanced.set_reveal_child(false);
- delete.set_reveal_child(false);
advanced_box.queue_draw();
delete_box.queue_draw();
b.queue_draw();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
