[gnome-control-center/wip/benzea/wifi-panel-with-editor-changes: 9/19] connection-editor: Drop page margins
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/benzea/wifi-panel-with-editor-changes: 9/19] connection-editor: Drop page margins
- Date: Thu, 13 Dec 2018 17:10:02 +0000 (UTC)
commit c89bfa5c601e2df8f261baf7b475acf92e510b98
Author: Adrien Plazas <kekun plazas laposte net>
Date: Wed Dec 5 12:58:26 2018 +0100
connection-editor: Drop page margins
Margins are added to the page's parent depending on how they are added
to the connection editor, allowing finer grained margin handling.
panels/network/connection-editor/8021x-security-page.ui | 12 ++----------
panels/network/connection-editor/details-page.ui | 9 +++------
panels/network/connection-editor/ethernet-page.ui | 6 +-----
panels/network/connection-editor/ip4-page.ui | 4 ----
panels/network/connection-editor/ip6-page.ui | 4 ----
panels/network/connection-editor/security-page.ui | 4 ++--
panels/network/connection-editor/vpn-page.ui | 6 +-----
panels/network/connection-editor/wifi-page.ui | 8 +++-----
8 files changed, 12 insertions(+), 41 deletions(-)
---
diff --git a/panels/network/connection-editor/8021x-security-page.ui
b/panels/network/connection-editor/8021x-security-page.ui
index bfabda937..9b3d8116d 100644
--- a/panels/network/connection-editor/8021x-security-page.ui
+++ b/panels/network/connection-editor/8021x-security-page.ui
@@ -10,13 +10,9 @@
<object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_start">50</property>
- <property name="margin_end">50</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">10</property>
+ <property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="heading_sec">
@@ -83,11 +79,7 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_start">50</property>
- <property name="margin_end">50</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
- <property name="row_spacing">10</property>
+ <property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkEntry" id="entry1">
diff --git a/panels/network/connection-editor/details-page.ui
b/panels/network/connection-editor/details-page.ui
index 5c3891e70..db719a247 100644
--- a/panels/network/connection-editor/details-page.ui
+++ b/panels/network/connection-editor/details-page.ui
@@ -4,12 +4,9 @@
<object class="GtkGrid" id="page">
<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="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="halign">center</property>
<child>
<object class="GtkLabel" id="heading_strength">
<property name="visible">True</property>
diff --git a/panels/network/connection-editor/ethernet-page.ui
b/panels/network/connection-editor/ethernet-page.ui
index 63c2d775b..8de8f3a7c 100644
--- a/panels/network/connection-editor/ethernet-page.ui
+++ b/panels/network/connection-editor/ethernet-page.ui
@@ -55,13 +55,9 @@
<object class="GtkGrid" id="page">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_start">50</property>
- <property name="margin_end">50</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">10</property>
+ <property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="heading_name">
diff --git a/panels/network/connection-editor/ip4-page.ui b/panels/network/connection-editor/ip4-page.ui
index fe5d407c9..c5dccd261 100644
--- a/panels/network/connection-editor/ip4-page.ui
+++ b/panels/network/connection-editor/ip4-page.ui
@@ -13,10 +13,6 @@
<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="orientation">vertical</property>
<property name="row-spacing">6</property>
<property name="column-spacing">6</property>
diff --git a/panels/network/connection-editor/ip6-page.ui b/panels/network/connection-editor/ip6-page.ui
index 6d39bd0ec..701badb7f 100644
--- a/panels/network/connection-editor/ip6-page.ui
+++ b/panels/network/connection-editor/ip6-page.ui
@@ -13,10 +13,6 @@
<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="orientation">vertical</property>
<property name="row-spacing">6</property>
<property name="column-spacing">6</property>
diff --git a/panels/network/connection-editor/security-page.ui
b/panels/network/connection-editor/security-page.ui
index fdfad3474..1d01f2df3 100644
--- a/panels/network/connection-editor/security-page.ui
+++ b/panels/network/connection-editor/security-page.ui
@@ -11,7 +11,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">10</property>
+ <property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="heading_sec">
@@ -67,7 +67,7 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">10</property>
+ <property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkEntry" id="entry1">
diff --git a/panels/network/connection-editor/vpn-page.ui b/panels/network/connection-editor/vpn-page.ui
index 1d8118f69..ac1a4a9f4 100644
--- a/panels/network/connection-editor/vpn-page.ui
+++ b/panels/network/connection-editor/vpn-page.ui
@@ -4,12 +4,8 @@
<object class="GtkBox" id="page">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_start">50</property>
- <property name="margin_end">50</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
<property name="orientation">vertical</property>
- <property name="spacing">10</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
diff --git a/panels/network/connection-editor/wifi-page.ui b/panels/network/connection-editor/wifi-page.ui
index 344ee21dc..f26305201 100644
--- a/panels/network/connection-editor/wifi-page.ui
+++ b/panels/network/connection-editor/wifi-page.ui
@@ -4,13 +4,9 @@
<object class="GtkGrid" id="page">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_start">50</property>
- <property name="margin_end">50</property>
- <property name="margin_top">12</property>
- <property name="margin_bottom">12</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">10</property>
+ <property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="heading_ssid">
@@ -55,6 +51,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="width_chars">0</property>
<property name="invisible_char">●</property>
<property name="invisible_char_set">True</property>
</object>
@@ -89,6 +86,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="width_chars">0</property>
<property name="invisible_char">●</property>
<property name="invisible_char_set">True</property>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]