From 0c499f7f6640cdcc5eaee31116330b991010555e Mon Sep 17 00:00:00 2001 From: Roberto Leinardi <leinardi@gmail.com> Date: Sun, 2 Feb 2020 22:01:22 +0100 Subject: [PATCH 1/4] Fixed GST not starting with 2 columns for some users --- CHANGELOG.md | 6 ++++++ data/com.leinardi.gst.appdata.xml | 7 +++++++ data/ui/main.glade | 4 +--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01145f6..400458c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Version 0.7.1 +============= +Released: 2020-02-02 + + * Fixed GST not starting with 2 columns for some users + Version 0.7.0 ============= Released: 2020-02-02 diff --git a/data/com.leinardi.gst.appdata.xml b/data/com.leinardi.gst.appdata.xml index c351f2a..69dc93c 100644 --- a/data/com.leinardi.gst.appdata.xml +++ b/data/com.leinardi.gst.appdata.xml @@ -26,6 +26,13 @@ <url type="bugtracker">https://gitlab.com/leinardi/gst/issues</url> <update_contact>roberto@leinardi.com</update_contact> <releases> + <release date="2020-02-02" version="0.7.1"> + <description> + <ul> + <li>Fixed GST not starting with 2 columns for some users</li> + </ul> + </description> + </release> <release date="2020-02-02" version="0.7.0"> <description> <ul> diff --git a/data/ui/main.glade b/data/ui/main.glade index d662424..4972336 100644 --- a/data/ui/main.glade +++ b/data/ui/main.glade @@ -137,7 +137,7 @@ along with gst. If not, see <http://www.gnu.org/licenses/>. <property name="width_request">640</property> <property name="height_request">700</property> <property name="can_focus">False</property> - <property name="default_width">1200</property> + <property name="default_width">1280</property> <property name="default_height">940</property> <property name="icon_name">com.leinardi.gst</property> <property name="gravity">north</property> @@ -2357,7 +2357,6 @@ along with gst. If not, see <http://www.gnu.org/licenses/>. <property name="hexpand">True</property> <property name="shadow_type">in</property> <property name="min_content_height">80</property> - <property name="propagate_natural_width">True</property> <property name="propagate_natural_height">True</property> <child> <object class="GtkTreeView" id="cpu_clocks_tree_view"> @@ -2493,7 +2492,6 @@ along with gst. If not, see <http://www.gnu.org/licenses/>. <property name="hexpand">True</property> <property name="shadow_type">in</property> <property name="min_content_height">80</property> - <property name="propagate_natural_width">True</property> <property name="propagate_natural_height">True</property> <child> <object class="GtkTreeView" id="hwmon_tree_view"> -- GitLab From 68f861133cc7280edc1601982f1537296a0a5287 Mon Sep 17 00:00:00 2001 From: Roberto Leinardi <leinardi@gmail.com> Date: Sun, 2 Feb 2020 22:06:18 +0100 Subject: [PATCH 2/4] Prepare for release 0.7.1 --- gst/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gst/conf.py b/gst/conf.py index 29a82b1..b3b77c6 100644 --- a/gst/conf.py +++ b/gst/conf.py @@ -19,7 +19,7 @@ from typing import Dict, Any APP_PACKAGE_NAME = "gst" APP_NAME = "GST" APP_ID = "com.leinardi.gst" -APP_VERSION = "0.7.0" +APP_VERSION = "0.7.1" APP_ICON_NAME = APP_ID APP_ICON_NAME_SYMBOLIC = APP_ID + "-symbolic" APP_DB_NAME = APP_PACKAGE_NAME + ".db" -- GitLab From 4816fe804a17f2059618548f0f931ef3e551d532 Mon Sep 17 00:00:00 2001 From: Roberto Leinardi <leinardi@gmail.com> Date: Sun, 2 Feb 2020 22:26:58 +0100 Subject: [PATCH 3/4] Prepare for release 0.7.1 --- RELEASING.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index 2422852..1543db3 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -3,13 +3,14 @@ 1. `flatpak run org.freedesktop.appstream-glib validate data/com.leinardi.gst.appdata.xml` 2. Bump the `APP_VERSION` property in `gst/conf.py` based on Major.Minor.Patch naming scheme 3. Update `data/com.leinardi.gst.appdata.xml` for the impending release. -4. Update the `README.md` with the new changes (if necessary). -5. `git commit -am "Prepare for release X.Y.Z"` (where X.Y.Z is the version you set in step 1) -6. `flatpak uninstall com.leinardi.gst --assumeyes; ./build.sh --flatpak-local --flatpak-install --flatpak-bundle && flatpak run com.leinardi.gst --debug` -7. Tag version `X.Y.Z` (`git tag -s X.Y.Z`) (where X.Y.Z is the version you set in step 1) -8. Update tag and SHA in `flatpak/com.leinardi.gst.json` -9. `git push --follow-tags` -10. Trigger Flathub build bot `cd flatpak && git commit -am "Release X.Y.Z" && git push` (where X.Y.Z is the version you set in step 1) -11. Make a PR to the Flathub repository master, test the build and, if OK, merge the PR -12. `git commit -am "Release X.X.X" && git push` (where X.Y.Z is the version you set in step 1) -13. Create a PR from [master](../../tree/master) to [release](../../tree/release) +4. Run `./build.sh` to update the CHANGELOG.md +5. Update the `README.md` with the new changes (if necessary). +6. `git commit -am "Prepare for release X.Y.Z"` (where X.Y.Z is the version you set in step 1) +7. `flatpak uninstall com.leinardi.gst --assumeyes; ./build.sh --flatpak-local --flatpak-install --flatpak-bundle && flatpak run com.leinardi.gst` +8. Tag version `X.Y.Z` (`git tag -s X.Y.Z`) (where X.Y.Z is the version you set in step 1) +9. Update tag and SHA in `flatpak/com.leinardi.gst.json` +10. `git push --follow-tags` +11. Trigger Flathub build bot `cd flatpak && git commit -am "Release X.Y.Z" && git push` (where X.Y.Z is the version you set in step 1) +12. Make a PR to the Flathub repository master, test the build and, if OK, merge the PR +13. `git commit -am "Release X.X.X" && git push` (where X.Y.Z is the version you set in step 1) +14. Create a PR from [master](../../tree/master) to [release](../../tree/release) -- GitLab From 14a4ab1b7f264370f7add3eed9316b01c5ae658c Mon Sep 17 00:00:00 2001 From: Roberto Leinardi <leinardi@gmail.com> Date: Sun, 2 Feb 2020 22:29:19 +0100 Subject: [PATCH 4/4] Release 0.7.1 --- flatpak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak b/flatpak index bfc11f3..2692154 160000 --- a/flatpak +++ b/flatpak @@ -1 +1 @@ -Subproject commit bfc11f32fa6f07aeda8504b9e1c2630c5e4039b6 +Subproject commit 269215460c61c45484bf9cfb203db5a494ecdbb8 -- GitLab