forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

temp/gnome-control-center: drop (MR 3072)

Browse source 
See https://gitlab.com/postmarketOS/pmaports/issues/1479
This commit is contained in:
Newbyte 2022-04-13 08:54:19 +02:00
parent 5030271e74
commit 664c7ac2e7
No known key found for this signature in database
GPG key ID: 5873C171C9429CFA
12 changed files with 0 additions and 6210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
temp/gnome-control-center/0001-shell-Mirror-the-main-leaflet-s-folded-property.patch
View file

@ -1,87 +0,0 @@
From 2f6f14c45ed891ee215f408ce428aab6508b9b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Tue, 24 Aug 2021 18:23:51 +0200
Subject: [PATCH 1/8] shell: Mirror the main leaflet's 'folded' property
This makes it simpler for panels to check whether g-c-c
is in folded state.
---
shell/cc-window.c | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/shell/cc-window.c b/shell/cc-window.c
index de4eccc04..c9a7bf0b0 100644
--- a/shell/cc-window.c
+++ b/shell/cc-window.c
@@ -81,6 +81,8 @@ struct _CcWindow
CcPanel *active_panel;
GSettings *settings;
+ gboolean folded;
+
CcPanelListView previous_list_view;
};
@@ -93,7 +95,8 @@ enum
{
PROP_0,
PROP_ACTIVE_PANEL,
- PROP_MODEL
+ PROP_MODEL,
+ PROP_FOLDED,
};
/* Auxiliary methods */
@@ -766,6 +769,10 @@ cc_window_get_property (GObject *object,
g_value_set_object (value, self->store);
break;
+ case PROP_FOLDED:
+ g_value_set_boolean (value, self->folded);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -790,6 +797,10 @@ cc_window_set_property (GObject *object,
self->store = g_value_dup_object (value);
break;
+ case PROP_FOLDED:
+ self->folded = g_value_get_boolean (value);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -876,6 +887,14 @@ cc_window_class_init (CcWindowClass *klass)
CC_TYPE_SHELL_MODEL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (object_class,
+ PROP_FOLDED,
+ g_param_spec_boolean ("folded",
+ "Folded",
+ "Whether the window is foled",
+ FALSE,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/cc-window.ui");
gtk_widget_class_bind_template_child (widget_class, CcWindow, back_revealer);
@@ -921,6 +940,12 @@ cc_window_init (CcWindow *self)
self->previous_panels = g_queue_new ();
self->previous_list_view = cc_panel_list_get_view (self->panel_list);
+ g_object_bind_property (self->main_leaflet,
+ "folded",
+ self,
+ "folded",
+ G_BINDING_SYNC_CREATE);
+
/* Add a custom CSS class on development builds */
if (in_flatpak_sandbox ())
gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (self)), "devel");
--
2.25.1

210
temp/gnome-control-center/0002-display-Use-ComboBox-when-folded.patch
View file

@ -1,210 +0,0 @@
From 7611eb809fee7da48b255535695836f91b14e8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Tue, 24 Aug 2021 18:25:05 +0200
Subject: [PATCH 2/8] display: Use ComboBox when folded
On small window sizes the ButtonBox can overflow the panel. This is
especially true in single display mode when no other elemnts prevent
shrinking to e.g. 360px width on phones. Use the ComboBox introduced in
632cb3c907922d4449e5758d218612ad5d8735c6 in these cases.
For that we introduce cc_display_settings_refresh_layout() to refresh
the layout when the folded state changes. This can later on be used for
more tweaks to shrink to smaller sizes.
---
panels/display/cc-display-panel.c | 19 ++++++-
panels/display/cc-display-settings.c | 84 +++++++++++++++-------------
panels/display/cc-display-settings.h | 2 +
3 files changed, 65 insertions(+), 40 deletions(-)
diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
index f9d4ae044..91b3f3387 100644
--- a/panels/display/cc-display-panel.c
+++ b/panels/display/cc-display-panel.c
@@ -457,6 +457,7 @@ static void
cc_display_panel_dispose (GObject *object)
{
CcDisplayPanel *self = CC_DISPLAY_PANEL (object);
+ GtkWidget *toplevel = cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (self)));
reset_titlebar (CC_DISPLAY_PANEL (object));
@@ -474,6 +475,8 @@ cc_display_panel_dispose (GObject *object)
g_clear_pointer ((GtkWidget **) &self->night_light_dialog, gtk_widget_destroy);
+ g_signal_handlers_disconnect_by_data (toplevel, self);
+
G_OBJECT_CLASS (cc_display_panel_parent_class)->dispose (object);
}
@@ -645,12 +648,26 @@ on_primary_display_selected_index_changed_cb (CcDisplayPanel *panel)
update_apply_button (panel);
}
+static void
+on_toplevel_folded (CcDisplayPanel *panel, GParamSpec *pspec, GtkWidget *toplevel)
+{
+ gboolean folded;
+
+ g_object_get (toplevel, "folded", &folded, NULL);
+ cc_display_settings_refresh_layout (panel->settings, folded);
+}
+
static void
cc_display_panel_constructed (GObject *object)
{
+ GtkWidget *toplevel = cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (object)));
+
g_signal_connect_object (cc_panel_get_shell (CC_PANEL (object)), "notify::active-panel",
G_CALLBACK (active_panel_changed), object, G_CONNECT_SWAPPED);
+ g_signal_connect_swapped (toplevel, "notify::folded", G_CALLBACK (on_toplevel_folded), object);
+ on_toplevel_folded (CC_DISPLAY_PANEL (object), NULL, toplevel);
+
G_OBJECT_CLASS (cc_display_panel_parent_class)->constructed (object);
}
@@ -928,7 +945,7 @@ reset_current_config (CcDisplayPanel *panel)
if (!current)
return;
-
+
cc_display_config_set_minimum_size (current, MINIMUM_WIDTH, MINIMUM_HEIGHT);
panel->current_config = current;
diff --git a/panels/display/cc-display-settings.c b/panels/display/cc-display-settings.c
index a4f914ecd..efda19473 100644
--- a/panels/display/cc-display-settings.c
+++ b/panels/display/cc-display-settings.c
@@ -35,6 +35,8 @@ struct _CcDisplaySettings
GtkDrawingArea object;
gboolean updating;
+ gboolean num_scales;
+ gboolean folded;
guint idle_udpate_id;
gboolean has_accelerometer;
@@ -393,57 +395,49 @@ cc_display_settings_rebuild_ui (CcDisplaySettings *self)
/* Scale row is usually shown. */
gtk_container_foreach (GTK_CONTAINER (self->scale_bbox), (GtkCallback) gtk_widget_destroy, NULL);
g_list_store_remove_all (self->scale_list);
- gtk_widget_set_visible (self->scale_buttons_row, FALSE);
- gtk_widget_set_visible (self->scale_combo_row, FALSE);
scales = cc_display_mode_get_supported_scales (current_mode);
+ self->num_scales = scales->len;
for (i = 0; i < scales->len; i++)
{
g_autofree gchar *scale_str = NULL;
+ g_autoptr(HdyValueObject) value_object = NULL;
double scale = g_array_index (scales, double, i);
+ GtkWidget *scale_btn;
gboolean is_selected;
+ /* ComboRow */
scale_str = make_scale_string (scale);
is_selected = G_APPROX_VALUE (cc_display_monitor_get_scale (self->selected_output),
scale, DBL_EPSILON);
- if (scales->len > MAX_SCALE_BUTTONS)
- {
- g_autoptr(HdyValueObject) value_object = NULL;
-
- value_object = hdy_value_object_new_collect (G_TYPE_STRING, scale_str);
- g_list_store_append (self->scale_list, value_object);
- g_object_set_data_full (G_OBJECT (value_object), "scale",
- g_memdup2 (&scale, sizeof (double)), g_free);
- if (is_selected)
- hdy_combo_row_set_selected_index (HDY_COMBO_ROW (self->scale_combo_row),
- g_list_model_get_n_items (G_LIST_MODEL (self->scale_list)) - 1);
- }
- else
- {
- GtkWidget *scale_btn = gtk_radio_button_new_with_label_from_widget (group, scale_str);
- g_object_set_data_full (G_OBJECT (scale_btn), "scale",
- g_memdup2 (&scale, sizeof (double)), g_free);
-
- if (!group)
- group = GTK_RADIO_BUTTON (scale_btn);
- gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (scale_btn), FALSE);
- gtk_widget_show (scale_btn);
- gtk_container_add (GTK_CONTAINER (self->scale_bbox), scale_btn);
- /* Set active before connecting the signal */
- if (is_selected)
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (scale_btn), TRUE);
-
- g_signal_connect_object (scale_btn,
- "notify::active",
- G_CALLBACK (on_scale_btn_active_changed_cb),
- self, 0);
- }
+ value_object = hdy_value_object_new_collect (G_TYPE_STRING, scale_str);
+ g_list_store_append (self->scale_list, value_object);
+ g_object_set_data_full (G_OBJECT (value_object), "scale",
+ g_memdup2 (&scale, sizeof (double)), g_free);
+ if (is_selected)
+ hdy_combo_row_set_selected_index (HDY_COMBO_ROW (self->scale_combo_row),
+ g_list_model_get_n_items (G_LIST_MODEL (self->scale_list)) - 1);
+
+ /* ButtonBox */
+ scale_btn = gtk_radio_button_new_with_label_from_widget (group, scale_str);
+ g_object_set_data_full (G_OBJECT (scale_btn), "scale",
+ g_memdup2 (&scale, sizeof (double)), g_free);
+
+ if (!group)
+ group = GTK_RADIO_BUTTON (scale_btn);
+ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (scale_btn), FALSE);
+ gtk_widget_show (scale_btn);
+ gtk_container_add (GTK_CONTAINER (self->scale_bbox), scale_btn);
+ /* Set active before connecting the signal */
+ if (is_selected)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (scale_btn), TRUE);
+
+ g_signal_connect_object (scale_btn,
+ "notify::active",
+ G_CALLBACK (on_scale_btn_active_changed_cb),
+ self, 0);
}
-
- if (scales->len > MAX_SCALE_BUTTONS)
- gtk_widget_set_visible (self->scale_combo_row, TRUE);
- else
- gtk_widget_set_visible (self->scale_buttons_row, scales->len > 1);
+ cc_display_settings_refresh_layout (self, self->folded);
gtk_widget_set_visible (self->underscanning_row,
cc_display_monitor_supports_underscanning (self->selected_output) &&
@@ -843,3 +837,15 @@ cc_display_settings_set_selected_output (CcDisplaySettings *self,
g_object_notify_by_pspec (G_OBJECT (self), props[PROP_SELECTED_OUTPUT]);
}
+void
+cc_display_settings_refresh_layout (CcDisplaySettings *self,
+ gboolean folded)
+{
+ gboolean use_combo;
+
+ self->folded = folded;
+ use_combo = self->num_scales > MAX_SCALE_BUTTONS || (self->num_scales > 2 && folded);
+
+ gtk_widget_set_visible (self->scale_combo_row, use_combo);
+ gtk_widget_set_visible (self->scale_buttons_row, self->num_scales > 1 && !use_combo);
+}
diff --git a/panels/display/cc-display-settings.h b/panels/display/cc-display-settings.h
index 58709ddf7..de3c88d48 100644
--- a/panels/display/cc-display-settings.h
+++ b/panels/display/cc-display-settings.h
@@ -39,6 +39,8 @@ void cc_display_settings_set_config (CcDisplaySettings
CcDisplayMonitor* cc_display_settings_get_selected_output (CcDisplaySettings *settings);
void cc_display_settings_set_selected_output (CcDisplaySettings *settings,
CcDisplayMonitor *output);
+void cc_display_settings_refresh_layout (CcDisplaySettings *settings,
+ gboolean folded);
G_END_DECLS
--
2.25.1

58
temp/gnome-control-center/0003-Wrap-long-labels-on-small-screens.patch
View file

@ -1,58 +0,0 @@
From 77cff5ed952d20a7d29ae844926a76d75b26e13d Mon Sep 17 00:00:00 2001
From: undef <gitlab@undef.tools>
Date: Tue, 21 Sep 2021 08:56:22 +0000
Subject: [PATCH 3/8] Wrap long labels on small screens
Both the keyboard and region panels contain long GtkLabels. These labels
cause gnome-control-center overflow the screen, especially on small
screens like those on phones.
From https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1057
---
panels/keyboard/cc-keyboard-panel.ui | 2 ++
panels/region/cc-region-panel.ui | 2 ++
2 files changed, 4 insertions(+)
diff --git a/panels/keyboard/cc-keyboard-panel.ui b/panels/keyboard/cc-keyboard-panel.ui
index 9b0952e88..b8e8194d9 100644
--- a/panels/keyboard/cc-keyboard-panel.ui
+++ b/panels/keyboard/cc-keyboard-panel.ui
@@ -128,6 +128,7 @@
<property name="visible">True</property>
<property name="margin_left">6</property>
<property name="use_underline">True</property>
+ <property name="wrap">True</property>
<property name="label" translatable="yes">Use the _same source for all windows</property>
</object>
</child>
@@ -155,6 +156,7 @@
<property name="visible">True</property>
<property name="margin_left">6</property>
<property name="use_underline">True</property>
+ <property name="wrap">True</property>
<property name="label" translatable="yes">Switch input sources _individually for each window</property>
</object>
</child>
diff --git a/panels/region/cc-region-panel.ui b/panels/region/cc-region-panel.ui
index fc698f0af..d3a4801fb 100644
--- a/panels/region/cc-region-panel.ui
+++ b/panels/region/cc-region-panel.ui
@@ -86,6 +86,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
+ <property name="wrap">True</property>
<property name="label" translatable="yes">The language used for text in windows and web pages.</property>
<style>
<class name="dim-label"/>
@@ -211,6 +212,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
+ <property name="wrap">True</property>
<property name="label" translatable="yes">The format used for numbers, dates, and currencies.</property>
<style>
<class name="dim-label"/>
--
2.25.1

48
temp/gnome-control-center/0004-WiFi-Reduce-width-of-connection-row-for-mobile.patch
View file

@ -1,48 +0,0 @@
From 196a16e30948251efeec1905546c37a698526327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Sun, 3 Oct 2021 17:48:29 +0200
Subject: [PATCH 4/8] WiFi: Reduce width of connection row for mobile
The current WiFi panel is not adaptive on small screens. This results in
the panel being partially off the screen, blocking users from (for
example) editing connection settings.
This patch was developed for Mobian to shrink the minimum required space
for each connection row and the Airplane mode toggle. This allows the
panel to be used on thin screens.
Adapted from https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1029
to avoid modifying strings and breaking translations
---
panels/common/cc-list-row.ui | 1 +
panels/network/cc-wifi-connection-row.ui | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/panels/common/cc-list-row.ui b/panels/common/cc-list-row.ui
index 730b8d91a..ce14e7945 100644
--- a/panels/common/cc-list-row.ui
+++ b/panels/common/cc-list-row.ui
@@ -30,6 +30,7 @@
<property name="visible">0</property>
<property name="hexpand">1</property>
<property name="xalign">0.0</property>
+ <property name="wrap">True</property>
<property name="wrap-mode">word</property>
<property name="max-width-chars">42</property>
<style>
diff --git a/panels/network/cc-wifi-connection-row.ui b/panels/network/cc-wifi-connection-row.ui
index 39bb6db8b..dd8a90ac0 100644
--- a/panels/network/cc-wifi-connection-row.ui
+++ b/panels/network/cc-wifi-connection-row.ui
@@ -65,7 +65,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_end">6</property>
- <property name="label" translatable="yes">Connected</property>
+ <property name="label" translatable="no">✓</property>
<style>
<class name="dim-label"/>
</style>
--
2.25.1

5287
temp/gnome-control-center/0005-Add-new-connection-editor.patch
View file

File diff suppressed because it is too large Load diff

62
temp/gnome-control-center/0006-Wifi-Use-Purism-connection-editor.patch
View file

@ -1,62 +0,0 @@
From 5f8efaf6961ed1e9c0bdd1d823aa2e4a05f2a676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Sun, 3 Oct 2021 17:56:45 +0200
Subject: [PATCH 6/8] Wifi: Use Purism connection editor
Build for adaptability.
Based on
https://source.puri.sm/pureos/packages/gnome-control-center/-/blob/pureos/master/debian/patches/pureos/Add-helper-for-new-connection-editor.patch
and
https://source.puri.sm/pureos/packages/gnome-control-center/-/blob/pureos/master/debian/patches/pureos/wifi-Use-new-connection-editor.patch
avoiding conditional use depending on Phosh.
---
panels/network/net-device-wifi.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index 69fe2e122..e9be21889 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -36,7 +36,7 @@
#include "panel-common.h"
#include "cc-list-row.h"
-#include "connection-editor/net-connection-editor.h"
+#include "connection-editor/cc-connection-editor.h"
#include "net-device-wifi.h"
#include "cc-wifi-connection-list.h"
@@ -967,14 +967,25 @@ show_details_for_row (NetDeviceWifi *self, CcWifiConnectionRow *row, CcWifiConne
{
NMConnection *connection;
NMAccessPoint *ap;
- NetConnectionEditor *editor;
+ CcConnectionEditor *new_editor;
connection = cc_wifi_connection_row_get_connection (row);
ap = cc_wifi_connection_row_best_access_point (row);
- editor = net_connection_editor_new (connection, self->device, ap, self->client);
- gtk_window_set_transient_for (GTK_WINDOW (editor), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (row))));
- gtk_window_present (GTK_WINDOW (editor));
+ new_editor = g_object_get_data (G_OBJECT (self), "network-editor");
+ if (!new_editor) {
+ GtkWindow *parent;
+
+ parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (row)));
+ new_editor = CC_CONNECTION_EDITOR (cc_connection_editor_new (parent, self->client));
+ g_object_set_data (G_OBJECT (self), "network-editor", new_editor);
+ }
+
+ cc_connection_editor_set_connection (new_editor, connection, self->device);
+ cc_connection_editor_set_ap (new_editor, ap);
+
+ gtk_dialog_run (GTK_DIALOG (new_editor));
+ gtk_widget_hide (GTK_WIDGET (new_editor));
}
static void
--
2.25.1

246
temp/gnome-control-center/0007-Users-Adapt-panel-to-make-it-usable-in-small-screens.patch
View file

@ -1,246 +0,0 @@
From 5580d36bb63ecec8613c00972614a3c527709333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Sun, 3 Oct 2021 18:13:38 +0200
Subject: [PATCH 7/8] Users: Adapt panel to make it usable in small screens
---
panels/common/cc-permission-infobar.ui | 6 ++++++
panels/user-accounts/cc-add-user-dialog.ui | 22 +++++++---------------
panels/user-accounts/cc-password-dialog.ui | 15 ++++++++-------
3 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/panels/common/cc-permission-infobar.ui b/panels/common/cc-permission-infobar.ui
index 770765e08..e77e759b4 100644
--- a/panels/common/cc-permission-infobar.ui
+++ b/panels/common/cc-permission-infobar.ui
@@ -44,6 +44,9 @@
<property name="halign">start</property>
<!-- Actual string set in code -->
<property name="label"></property>
+ <property name="justify">center</property>
+ <property name="wrap">True</property>
+ <property name="wrap-mode">word</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -54,6 +57,9 @@
<property name="visible">True</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Some settings must be unlocked before they can be changed.</property>
+ <property name="justify">center</property>
+ <property name="wrap">True</property>
+ <property name="wrap-mode">word</property>
</object>
</child>
</object>
diff --git a/panels/user-accounts/cc-add-user-dialog.ui b/panels/user-accounts/cc-add-user-dialog.ui
index 12a253ac4..2db2031e0 100644
--- a/panels/user-accounts/cc-add-user-dialog.ui
+++ b/panels/user-accounts/cc-add-user-dialog.ui
@@ -121,7 +121,7 @@
<property name="yalign">0</property>
<property name="xalign">0</property>
<property name="label"></property>
- <property name="width-chars">35</property>
+ <property name="width-chars">20</property>
<property name="max-width-chars">35</property>
<property name="height-request">50</property>
<property name="wrap">True</property>
@@ -146,7 +146,6 @@
<property name="label" translatable="yes">_Username</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">local_username_combo</property>
- <property name="margin_start">20</property>
<style>
<class name="dim-label"/>
</style>
@@ -180,7 +179,6 @@
<property name="label" translatable="yes">_Full Name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">local_name_entry</property>
- <property name="margin_start">20</property>
<style>
<class name="dim-label"/>
</style>
@@ -232,7 +230,6 @@
<property name="label" translatable="yes">Account _Type</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">local_account_type_box</property>
- <property name="margin_start">20</property>
<style>
<class name="dim-label"/>
</style>
@@ -249,7 +246,6 @@
<property name="label" translatable="yes">Password</property>
<property name="margin_top">12</property>
<property name="halign">start</property>
- <property name="margin_start">20</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -263,7 +259,6 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="margin_start">20</property>
<child>
<object class="GtkRadioButton" id="local_password_login_radio">
<property name="label" translatable="yes">Allow user to set a password when they next _login</property>
@@ -310,7 +305,6 @@
<property name="label" translatable="yes">_Password</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">local_password_entry</property>
- <property name="margin_start">20</property>
<style>
<class name="dim-label"/>
</style>
@@ -377,7 +371,7 @@
<property name="yalign">0</property>
<property name="xalign">0</property>
<property name="label"></property>
- <property name="width-chars">35</property>
+ <property name="width-chars">20</property>
<property name="max-width-chars">35</property>
<property name="height-request">50</property>
<property name="wrap">True</property>
@@ -405,7 +399,6 @@
<property name="label" translatable="yes">_Confirm</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">local_verify_entry</property>
- <property name="margin_start">20</property>
<style>
<class name="dim-label"/>
</style>
@@ -445,7 +438,7 @@
<property name="yalign">0</property>
<property name="xalign">0</property>
<property name="label"></property>
- <property name="width-chars">35</property>
+ <property name="width-chars">20</property>
<property name="max-width-chars">35</property>
<property name="wrap">True</property>
<property name="wrap_mode">word-char</property>
@@ -507,7 +500,6 @@
<property name="label" translatable="yes">_Domain</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">enterprise_domain_combo</property>
- <property name="margin_start">20</property>
<style>
<class name="dim-label"/>
</style>
@@ -527,7 +519,6 @@
<property name="label" translatable="yes">_Username</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">enterprise_login_entry</property>
- <property name="margin_start">20</property>
<style>
<class name="dim-label"/>
</style>
@@ -547,7 +538,6 @@
<property name="label" translatable="yes">_Password</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">enterprise_password_entry</property>
- <property name="margin_start">20</property>
<style>
<class name="dim-label"/>
</style>
@@ -566,7 +556,7 @@
<property name="yalign">0</property>
<property name="xalign">0</property>
<property name="label"></property>
- <property name="width-chars">35</property>
+ <property name="width-chars">20</property>
<property name="max-width-chars">35</property>
<property name="height-request">50</property>
<property name="wrap">True</property>
@@ -616,7 +606,7 @@
<property name="yalign">0</property>
<property name="xalign">0</property>
<property name="label"></property>
- <property name="width-chars">35</property>
+ <property name="width-chars">20</property>
<property name="max-width-chars">35</property>
<property name="height-request">50</property>
<property name="wrap">True</property>
@@ -751,6 +741,8 @@
<property name="label" translatable="yes">You must be online in order to add enterprise users.</property>
<property name="yalign">0</property>
<property name="justify">center</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
<property name="vexpand">True</property>
<property name="hexpand">True</property>
<attributes>
diff --git a/panels/user-accounts/cc-password-dialog.ui b/panels/user-accounts/cc-password-dialog.ui
index bfcc7585b..ed781c8e8 100644
--- a/panels/user-accounts/cc-password-dialog.ui
+++ b/panels/user-accounts/cc-password-dialog.ui
@@ -5,7 +5,7 @@
<template class="CcPasswordDialog" parent="GtkDialog">
<property name="border_width">6</property>
<property name="title" translatable="yes">Change Password</property>
- <property name="resizable">False</property>
+ <property name="resizable">True</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="icon_name">system-users</property>
@@ -45,6 +45,7 @@
<style>
<class name="text-button"/>
<class name="suggested-action"/>
+ <class name="default"/>
</style>
</object>
<packing>
@@ -96,7 +97,7 @@
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes"></property>
- <property name="width-chars">35</property>
+ <property name="width-chars">20</property>
<property name="max-width-chars">35</property>
<property name="height-request">50</property>
<property name="wrap">True</property>
@@ -121,7 +122,7 @@
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes"></property>
- <property name="width-chars">35</property>
+ <property name="width-chars">20</property>
<property name="max-width-chars">35</property>
<property name="wrap">True</property>
<property name="hexpand">True</property>
@@ -142,10 +143,10 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Confirm New Password</property>
+ <property name="label" translatable="yes">_Confirm</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">verify_entry</property>
- <property name="margin_start">25</property>
+ <property name="margin_start">12</property>
<style>
<class name="dim-label"/>
</style>
@@ -162,7 +163,7 @@
<property name="label" translatable="yes">_New Password</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">password_entry</property>
- <property name="margin_start">25</property>
+ <property name="margin_start">12</property>
<style>
<class name="dim-label"/>
</style>
@@ -216,7 +217,7 @@
<property name="label" translatable="yes">Current _Password</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">old_password_entry</property>
- <property name="margin_start">25</property>
+ <property name="margin_start">12</property>
<property name="margin_bottom">12</property>
<style>
<class name="dim-label"/>
--
2.25.1

36
temp/gnome-control-center/0008-Added-some-more-reasonable-suspend-time-options-for-.patch
View file

@ -1,36 +0,0 @@
From 6756ee55e44754b68f13c0d4690eaed7641fa6f8 Mon Sep 17 00:00:00 2001
From: silver <silver@silvermag.net>
Date: Fri, 23 Oct 2020 21:56:44 +0000
Subject: [PATCH 8/8] Added some more reasonable suspend time options for
mobile
---
panels/power/cc-power-panel.ui | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/panels/power/cc-power-panel.ui b/panels/power/cc-power-panel.ui
index 9880f6b7e..6eb6c379a 100644
--- a/panels/power/cc-power-panel.ui
+++ b/panels/power/cc-power-panel.ui
@@ -9,6 +9,18 @@
<column type="gint"/>
</columns>
<data>
+ <row>
+ <col id="0" translatable="yes" context="automatic_suspend" comments="Translators: Option for &quot;Delay&quot; in &quot;Automatic suspend&quot; dialog.">2 minutes</col>
+ <col id="1">120</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes" context="automatic_suspend" comments="Translators: Option for &quot;Delay&quot; in &quot;Automatic suspend&quot; dialog.">5 minutes</col>
+ <col id="1">300</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes" context="automatic_suspend" comments="Translators: Option for &quot;Delay&quot; in &quot;Automatic suspend&quot; dialog.">10 minutes</col>
+ <col id="1">600</col>
+ </row>
<row>
<col id="0" translatable="yes" context="automatic_suspend" comments="Translators: Option for &quot;Delay&quot; in &quot;Automatic suspend&quot; dialog.">15 minutes</col>
<col id="1">900</col>
--
2.25.1

140
temp/gnome-control-center/APKBUILD
View file

@ -1,140 +0,0 @@
# Forked from Alpine to apply adaptability patches
pkgname=gnome-control-center
pkgver=9999_git20210917
pkgrel=6
_pkgver=41.4
pkgdesc="GNOME control center"
url="https://gitlab.gnome.org/GNOME/gnome-control-center"
# s390x, mips64 and riscv64 blocked by polkit
arch="all !s390x !mips64 !riscv64"
license="GPL-2.0-or-later"
depends="
accountsservice
dbus:org.freedesktop.Secrets
colord
cups-pk-helper
openrc-settingsd
"
makedepends="
accountsservice-dev
cheese-dev
clutter-dev
clutter-gtk-dev
colord-gtk-dev
cups-dev
docbook-xml
docbook-xsl
gnome-bluetooth-dev
gnome-desktop-dev
gnome-online-accounts-dev
gnome-settings-daemon-dev
grilo-dev
gsound-dev
ibus-dev
itstool
krb5-dev
libgtop-dev
libgudev-dev
libhandy1-dev
libnma-dev
libpwquality-dev
libsecret-dev
libwacom-dev
libxml2-utils
libxslt
meson
modemmanager-dev
networkmanager-dev
polkit-dev
pulseaudio-dev
samba-dev
udisks2-dev
"
options="!check" # needs unpackaged py-dbusmock
install="$pkgname.pre-install $pkgname.pre-upgrade"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-lang $pkgname-doc $pkgname-bash-completion"
_assets_location="https://gitlab.com/pabloyoyoista/g-c-c-assets/-/raw/master"
_purism_commit="d2c36cb86195d75a6975bc3ad369ee7a0a8f1352"
_purism_patches="https://source.puri.sm/pureos/packages/gnome-control-center/-/raw/$_purism_commit/debian/patches"
source="https://download.gnome.org/sources/gnome-control-center/${_pkgver%.*}/gnome-control-center-$_pkgver.tar.xz
0001-shell-Mirror-the-main-leaflet-s-folded-property.patch
0002-display-Use-ComboBox-when-folded.patch
0003-Wrap-long-labels-on-small-screens.patch
0004-WiFi-Reduce-width-of-connection-row-for-mobile.patch
0005-Add-new-connection-editor.patch
0006-Wifi-Use-Purism-connection-editor.patch
0007-Users-Adapt-panel-to-make-it-usable-in-small-screens.patch
0008-Added-some-more-reasonable-suspend-time-options-for-.patch
$_assets_location/multitasking/active-screen-edges.svg
$_assets_location/multitasking/hot-corner.svg
$_assets_location/multitasking/workspaces-primary-display.svg
$_assets_location/multitasking/workspaces-span-displays.svg
$_purism_patches/pureos/avatar-chooser-Adapt-to-work-on-librem5.patch
$_purism_patches/pureos/datetime-Fix-timezone-selection-map.patch
$_purism_patches/pureos/display-Request-a-smaller-size-for-arrangment-widget.patch
$_purism_patches/pureos/online-accounts-Make-edit-account-dialog-resizable.patch
$_purism_patches/pureos/sound-fix-test-dialog-on-small-screen.patch
$_purism_patches/pureos/wifi-Fix-a-crash-when-wifi-device-is-removed.patch
README.alpine
"
builddir="$srcdir/$pkgname-$_pkgver"
prepare() {
default_prepare
cp "$srcdir"/*.svg "$builddir"/panels/multitasking/assets
}
build() {
abuild-meson \
-Dcheese=true \
-Dibus=true \
. output
# Bad dep file -> blows up when compiling with multiple build jobs otherwise
ninja -C output panels/network/cc-network-resources.c
ninja -C output panels/network/cc-network-resources.h
meson compile ${JOBS:+-j ${JOBS}} -C output
}
check() {
meson test --no-rebuild -v -C output
}
package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C output
mkdir -p "$pkgdir"/usr/lib/pkgconfig
mv "$pkgdir"/usr/share/pkgconfig/* "$pkgdir"/usr/lib/pkgconfig
rmdir "$pkgdir"/usr/share/pkgconfig
install -Dm0644 "$srcdir"/README.alpine -t "$pkgdir"/usr/share/doc/"$pkgname"
}
sha512sums="
63fa20041a06f5075d172b543176b4f037fcd623d9fa5ca5f785e047a9b95ccd002c423d29de673dcb28b7d99a83157b39d7bd65ef77fe70065e9a03b5ae38a4 gnome-control-center-41.4.tar.xz
429c9e084d859ab396ea390d047a2f0f22b6199af4ad3d55455af615331a7b5ac0264a7e1f38c7458478a41b8a38b429f3ed3e81e8d85d6d253085519c5ced49 0001-shell-Mirror-the-main-leaflet-s-folded-property.patch
59e27e52420c80ac4215833962169dcd8315c5cbe5270baef25cd2f24bbecd6298a8812e28dd9bab8c5992d62826bc288993f3cb6ccce39f22d09874ce6e7a2b 0002-display-Use-ComboBox-when-folded.patch
a6b4cea1d6efe4c211f0b2575a6a84ba4a4c825501f288b82bee2a0d1391f8dd4fca26849a89be2d7c4f8a423cea2c93b2b3c3dc19f028e4c7f9fb13c00c581b 0003-Wrap-long-labels-on-small-screens.patch
7d91a35c7e86035cdfffd6929a8701ffe4979b869fe7576f8f44d0a6bdb148d2d008b771decdb249b286373842711fc3698904224b6c8c94b29ba095e6aa38ec 0004-WiFi-Reduce-width-of-connection-row-for-mobile.patch
7584afa92f907a3dc55e8eb53b7b43feb7309b384890e9841b78d63c7873bea8c4c2712d0c445bf2fa88d207dbd37e6a2a33a1dc56623db7884ca567c5fdff0a 0005-Add-new-connection-editor.patch
f1368dcf7acbb64838dcc47922ee4fbf01cd9206f521d8002da53295ed7e30b40a1c0cd56bea217636e3f1c4b6e1f6e61d84bd42dd4396bd14b6056fa6930b25 0006-Wifi-Use-Purism-connection-editor.patch
e96594fecaa2334d035acd2076bffd4adedf6eb89757472e7a4e6ba9dfebef1c170005bf519e359c27e8f749c4fcdf7c432fca945dcca05eab287fe0c288117c 0007-Users-Adapt-panel-to-make-it-usable-in-small-screens.patch
240da7c2350ec1ed0058a614cd1766fae003cf1637473d035bea100585a57500d2002889de485f6f0395bc2a4b686d8ea963b06a5cf1e4b957242142fadb2166 0008-Added-some-more-reasonable-suspend-time-options-for-.patch
a14d99eb128b04d6c1744c5599cb88a78c26c6aaa5a02b00970095c1107dbac9002dd985c9d0ef313bea13db79ed6bd672f247f00d4fb3c31b7dc1e9565627da active-screen-edges.svg
4ccc3cbce817381e0780f518ab8e6877f8169ad0ffefb89ae331703be5c4630f5f533ef73a978b093f0f4a0005b488aaf0bd637db11f5efacd5e0fe8c703d863 hot-corner.svg
6d17793ceb312ec9b3bf32c5ace90c0515aa874ed654ab0a18fa822bfc3c5fdfbfc6e752eb3c6e43f2abfbfd61c1e8ee6eca61fa721e8503a19a061a748c69ae workspaces-primary-display.svg
49fd807338e6d47e7f59cc592dd859c8fb93f73b0c035827f6d1c4f877afcca72aa24068adacf025f9f8c13d35ae8090bcc9a0f06a760915c53453cae870f20f workspaces-span-displays.svg
d7475a4d021ccaec1b380484cc045fba5ae43e36460bcba8f940fced3690148377f58e78fd57b7de0e3675671246dc4f28dc1611e2f2c1cdaf51495ee8ddb3d5 avatar-chooser-Adapt-to-work-on-librem5.patch
3c49081f364033d1d84a4b7594c39940da6f33d0eff2000ec04aea7f590876cf1a586dad4de9cb34f1bbb2e778a137bc5e38ecb9fa9c6121e1fa1ce21f74298f datetime-Fix-timezone-selection-map.patch
b07796c5d5424fe26f3c773750bd248b60a30d9ccccd7976fbf2626732216eb2a5813497c90f8c7a29074531cf5378cddb7cec4809df221ec9214f3191214b0a display-Request-a-smaller-size-for-arrangment-widget.patch
a4f34dfb11d676503991d5feb79f0f0551d5c067ce669091b195ac44518a09349db0178d3e7c13dfd5080acdfb24e2515f86c50c3d67fd15015ce20951ff9889 online-accounts-Make-edit-account-dialog-resizable.patch
24cc550021ba7fe7103d031411a2cc50f6d8b9522d37d19a84133a3da0a032a2c7b5a711f730bbd77c50a7ea7ff67fabb12ffecd15622094af39de802e576c86 sound-fix-test-dialog-on-small-screen.patch
6cce02774a0e755c9cd55af5a3baf4cc16f5e8c125cd6d83980dcfd9e7eabe0e884fa2a797d43f9741eb795e71fed7169b93e02bdd315aa96c0bedb5b42f0a50 wifi-Fix-a-crash-when-wifi-device-is-removed.patch
350aa443149c71851ad4de0976c7fc5cb626ba0c57a8d41e6ef80da1c65ed84a4dfa2483ae92630a3b611c4bfa9360ded82b55e8cd0e3907294c025e4f6b1671 README.alpine
"

14
temp/gnome-control-center/README.alpine
View file

@ -1,14 +0,0 @@
Note that the privacy settings in GNOME settings isn't respected by geoclue
for applications that are not sandboxed (running in flatpak), so it will
provide location information to any application that asks it, and will not
show any applications BUT ones run via flatpak
This is working as intended by geoclue upstream[1] and applications that
are not sandboxed have other methods of acquiring information provided
by geoclue
GNOME settings also tracks what they want to do with their privacy panel
in regards to the problem above here[2]
[1] https://gitlab.freedesktop.org/geoclue/geoclue/issues/111
[2] https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/805

21
temp/gnome-control-center/gnome-control-center.pre-install
View file

@ -1,21 +0,0 @@
#!/bin/sh
cat << __EOF__
*
* Note that the privacy settings in GNOME settings isn't respected by geoclue
* for applications that are not sandboxed (running in flatpak), so it will
* provide location information to any application that asks it, and will not
* show any applications BUT ones run via flatpak
*
* This is working as intended by geoclue upstream[1] and applications that
* are not sandboxed have other methods of acquiring information provided
* by geoclue
*
* GNOME settings also tracks what they want to do with their privacy panel
* in regards to the problem above here[2]
*
* [1] https://gitlab.freedesktop.org/geoclue/geoclue/issues/111
* [2] https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/805
*
__EOF__
exit 0

1
temp/gnome-control-center/gnome-control-center.pre-upgrade
View file

@ -1 +0,0 @@
gnome-control-center.pre-install