[gnome-packagekit/wip/mak/betterchangelog: 2/2] Allow user to resize the changelog display box
- From: Matthias Klumpp <mak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-packagekit/wip/mak/betterchangelog: 2/2] Allow user to resize the changelog display box
- Date: Wed, 27 Jul 2022 00:27:01 +0000 (UTC)
commit 59fd50af06509d7bdfd26934546a1f18c6c348b1
Author: Matthias Klumpp <matthias tenstral net>
Date: Wed Jul 27 02:26:21 2022 +0200
Allow user to resize the changelog display box
meson.build | 4 +-
src/gpk-update-viewer.c | 2 +-
src/gpk-update-viewer.ui | 342 +++++++++++++++++++++++++----------------------
3 files changed, 188 insertions(+), 160 deletions(-)
---
diff --git a/meson.build b/meson.build
index d06bde93..db7b68ec 100644
--- a/meson.build
+++ b/meson.build
@@ -79,8 +79,8 @@ foreach arg: test_link_args
endif
endforeach
-gio = dependency('gio-2.0', version : '>= 2.25.9')
-gtk = dependency('gtk+-3.0', version : '>= 3.22')
+gio = dependency('gio-2.0', version : '>= 2.26')
+gtk = dependency('gtk+-3.0', version : '>= 3.24')
packagekit = dependency('packagekit-glib2', version : '>= 0.9.1')
libm = cc.find_library('libm', required: false)
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index ef31c247..f7fd1bfa 100644
--- a/src/gpk-update-viewer.c
+++ b/src/gpk-update-viewer.c
@@ -2896,7 +2896,7 @@ gpk_update_viewer_application_startup_cb (GtkApplication *_application, gpointer
gtk_widget_show (label);
/* pack infobars into main UI */
- widget = GTK_WIDGET(gtk_builder_get_object (builder, "vbox1"));
+ widget = GTK_WIDGET(gtk_builder_get_object (builder, "vbox2"));
gtk_box_pack_start (GTK_BOX(widget), info_mobile, FALSE, FALSE, 3);
gtk_box_reorder_child (GTK_BOX(widget), info_mobile, 1);
gtk_box_pack_start (GTK_BOX(widget), info_updates, FALSE, FALSE, 3);
diff --git a/src/gpk-update-viewer.ui b/src/gpk-update-viewer.ui
index 24cc2162..e5a43657 100644
--- a/src/gpk-update-viewer.ui
+++ b/src/gpk-update-viewer.ui
@@ -1,203 +1,231 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.38.2 -->
<interface>
- <requires lib="gtk+" version="3.18"/>
+ <requires lib="gtk+" version="3.24"/>
<object class="GtkApplicationWindow" id="dialog_updates">
- <property name="can_focus">False</property>
- <property name="border_width">18</property>
- <property name="icon_name">software-update-available</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">18</property>
+ <property name="icon-name">software-update-available</property>
<child>
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="spacing">8</property>
<child>
- <object class="GtkBox" id="hbox_header">
+ <object class="GtkPaned" id="paned1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage" id="image_header">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixel_size">48</property>
- <property name="icon_name">system-software-update</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can-focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkBox">
+ <object class="GtkBox" id="vbox2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="label_header_title">
+ <object class="GtkBox" id="hbox_header">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label"><big><b>There are updates
available</b></big></property>
- <property name="use_markup">True</property>
+ <property name="can-focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkImage" id="image_header">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="pixel-size">48</property>
+ <property name="icon-name">system-software-update</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label_header_title">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label"><big><b>There are updates
available</b></big></property>
+ <property name="use-markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_header_desc">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Package updates correct errors,
eliminate security vulnerabilities, and provide new features.</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_header_desc">
+ <object class="GtkViewport" id="viewport_upgrade">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Package updates correct errors, eliminate
security vulnerabilities, and provide new features.</property>
- <property name="wrap">True</property>
- <property name="xalign">0</property>
+ <property name="can-focus">False</property>
+ <property name="resize-mode">queue</property>
+ <property name="shadow-type">out</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label_upgrade">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label"><b>New distribution upgrade release
available</b></property>
+ <property name="use-markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_upgrade">
+ <property name="label" translatable="yes">_Upgrade</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack-type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow_updates">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="shadow-type">in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview_updates">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkViewport" id="viewport_upgrade">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="resize_mode">queue</property>
- <property name="shadow_type">out</property>
<child>
- <object class="GtkBox">
+ <object class="GtkExpander" id="expander1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="can-focus">True</property>
+ <property name="margin-top">8</property>
<child>
- <object class="GtkLabel" id="label_upgrade">
+ <object class="GtkScrolledWindow" id="scrolledwindow_details">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"><b>New distribution upgrade release
available</b></property>
- <property name="use_markup">True</property>
+ <property name="can-focus">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow-type">in</property>
+ <property name="min-content-height">180</property>
+ <child>
+ <object class="GtkTextView" id="textview_details">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="border-width">6</property>
+ </object>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkButton" id="button_upgrade">
- <property name="label" translatable="yes">_Upgrade</property>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">Details</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow_updates">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="treeview_updates">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"/>
</child>
</object>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">True</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkExpander" id="expander1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow_details">
- <property name="height_request">100</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTextView" id="textview_details">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">6</property>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Details</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="hbox_status">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image_progress">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="stock">gtk-save</property>
</object>
<packing>
@@ -208,7 +236,7 @@
</child>
<child>
<object class="GtkProgressBar" id="progressbar_progress">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="valign">center</property>
<property name="fraction">0.5</property>
</object>
@@ -220,14 +248,14 @@
</child>
<child>
<object class="GtkLabel" id="label_status">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label"><b>Downloading</b></property>
- <property name="use_markup">True</property>
+ <property name="use-markup">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">2</property>
</packing>
</child>
@@ -241,11 +269,11 @@
<child>
<object class="GtkBox" id="hbox_info">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image_info">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="stock">gtk-remove</property>
</object>
<packing>
@@ -256,9 +284,9 @@
</child>
<child>
<object class="GtkLabel" id="label_info">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label">data that doesn't need the progressbar</property>
- <property name="use_markup">True</property>
+ <property name="use-markup">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -285,25 +313,25 @@
<child type="titlebar">
<object class="GtkHeaderBar" id="headerbar">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="title" translatable="yes">Package Updater</property>
- <property name="show_close_button">True</property>
+ <property name="show-close-button">True</property>
<child>
<object class="GtkButton" id="button_install">
<property name="label" translatable="yes">_Install Updates</property>
- <property name="use_action_appearance">False</property>
+ <property name="use-action-appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
<style>
<class name="suggested-action"/>
</style>
</object>
<packing>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
</packing>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
