Commit 2635f3e5 authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge branch 'wip/sadiq/byzantium' into 'pureos/byzantium'

Make gnome-bluetoth a proper package and release to byznatium

See merge request Librem5/gnome-bluetooth!1
parents 2894a8b0 97c6b512
Pipeline #75368 passed with stages
in 4 minutes and 36 seconds
[DEFAULT]
pristine-tar = True
debian-branch = debian/master
debian-branch = pureos/byzantium
debian-tag = pureos/%(version)s
debian-tag-msg = %(pkg)s %(version)s
upstream-branch = upstream/latest
[buildpackage]
......
include:
- 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
- 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-byzantium-jobs.yml'
- 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-common-jobs.yml'
stages:
- package
- test-package
From 7019e38fc16abf3379c33e9d80601d5e41228977 Mon Sep 17 00:00:00 2001
From: Mohammed Sadiq <sadiq@sadiqpk.org>
Date: Thu, 21 Nov 2019 18:58:33 +0530
Subject: [PATCH 1/3] pairing-dialog: Reduce margins around label
and allow the label to be wrapped early, so that
they fits fine on smaller screens
---
lib/bluetooth-pairing-dialog.ui | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/bluetooth-pairing-dialog.ui b/lib/bluetooth-pairing-dialog.ui
index 74043d67..7f0f7b00 100644
--- a/lib/bluetooth-pairing-dialog.ui
+++ b/lib/bluetooth-pairing-dialog.ui
@@ -31,8 +31,8 @@
<object class="GtkBox" id="pairing_dialog_box">
<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_start">6</property>
+ <property name="margin_end">6</property>
<property name="margin_top">24</property>
<property name="margin_bottom">30</property>
<property name="orientation">vertical</property>
@@ -43,8 +43,8 @@
<property name="label">Please enter the following PIN on 'Foobar':</property>
<property name="justify">center</property>
<property name="wrap">True</property>
- <property name="width_chars">40</property>
- <property name="max_width_chars">40</property>
+ <property name="width_chars">35</property>
+ <property name="max_width_chars">35</property>
</object>
<packing>
<property name="expand">False</property>
--
2.33.0
From cabfc970188a3f54ec9e7f8a356f8fd293d942a9 Mon Sep 17 00:00:00 2001
From: Mohammed Sadiq <sadiq@sadiqpk.org>
Date: Fri, 24 Sep 2021 21:27:26 +0530
Subject: [PATCH 2/3] pairing-dialog: Reduce minimum dialog width
And make it resizable so that it works fine on Librem5
---
lib/bluetooth-pairing-dialog.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/bluetooth-pairing-dialog.c b/lib/bluetooth-pairing-dialog.c
index 4565eeb0..d1130b0d 100644
--- a/lib/bluetooth-pairing-dialog.c
+++ b/lib/bluetooth-pairing-dialog.c
@@ -258,8 +258,8 @@ bluetooth_pairing_dialog_init (BluetoothPairingDialog *self)
gtk_widget_init_template (GTK_WIDGET (self));
- gtk_widget_set_size_request (GTK_WIDGET (self), 380, -1);
- gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
+ gtk_widget_set_size_request (GTK_WIDGET (self), 360, -1);
+ gtk_window_set_resizable (GTK_WINDOW (self), TRUE);
provider = gtk_css_provider_new ();
gtk_css_provider_load_from_resource (provider, "/org/gnome/bluetooth/bluetooth-settings.css");
--
2.33.0
From b528c5686543cd4b507947be51ddede8bc642e82 Mon Sep 17 00:00:00 2001
From: Mohammed Sadiq <sadiq@sadiqpk.org>
Date: Fri, 24 Sep 2021 21:27:57 +0530
Subject: [PATCH 3/3] settings-widget: Reduce minimum dialog width
And make it resizable so that it works fine on Librem5
---
lib/bluetooth-settings-widget.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/bluetooth-settings-widget.c b/lib/bluetooth-settings-widget.c
index d3a54b54..7d054296 100644
--- a/lib/bluetooth-settings-widget.c
+++ b/lib/bluetooth-settings-widget.c
@@ -1770,8 +1770,8 @@ setup_properties_dialog (BluetoothSettingsWidget *self)
GtkStyleContext *context;
priv->properties_dialog = g_object_new (GTK_TYPE_DIALOG, "use-header-bar", TRUE, NULL);
- gtk_widget_set_size_request (priv->properties_dialog, 380, -1);
- gtk_window_set_resizable (GTK_WINDOW (priv->properties_dialog), FALSE);
+ gtk_widget_set_size_request (priv->properties_dialog, 360, -1);
+ gtk_window_set_resizable (GTK_WINDOW (priv->properties_dialog), TRUE);
container = gtk_dialog_get_content_area (GTK_DIALOG (priv->properties_dialog));
gtk_container_add (GTK_CONTAINER (container), WID ("properties_vbox"));
--
2.33.0
0001-pairing-dialog-Reduce-margins-around-label.patch
0002-pairing-dialog-Reduce-minimum-dialog-width.patch
0003-settings-widget-Reduce-minimum-dialog-width.patch
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment