summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--meson.build2
-rw-r--r--src/calendar.c2
-rw-r--r--src/entry.c2
-rw-r--r--src/forms.c2
-rw-r--r--src/msg.c2
-rw-r--r--src/password.c2
-rw-r--r--src/progress.c2
-rw-r--r--src/scale.c2
-rw-r--r--src/text.c12
-rw-r--r--src/tree.c5
-rw-r--r--src/zenity-tree-column-view.c3
-rw-r--r--src/zenity.ui22
13 files changed, 34 insertions, 26 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d406aa9..8d08a5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
variables:
- DEPENDENCIES: gettext gettext-devel gcc git libadwaita-devel meson gtk4-devel yelp-tools webkit2gtk5.0-devel
+ DEPENDENCIES: gettext gettext-devel gcc git libadwaita-devel meson gtk4-devel yelp-tools webkitgtk6.0-devel
build_fedora:
image: fedora:latest
diff --git a/meson.build b/meson.build
index d431809..062fed4 100644
--- a/meson.build
+++ b/meson.build
@@ -65,7 +65,7 @@ opt_missing_str = '''
Requested optional @0@ support but library not found.
Please ensure you have any required development libraries installed.'''
-webkitgtk_dep = dependency('webkit2gtk-5.0', required: false)
+webkitgtk_dep = dependency('webkitgtk-6.0', required: false)
if get_option('webkitgtk')
if webkitgtk_dep.found()
zenity_conf.set('HAVE_WEBKITGTK', true)
diff --git a/src/calendar.c b/src/calendar.c
index f5237d1..1eac9f3 100644
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -60,7 +60,7 @@ zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data)
G_CALLBACK(zenity_calendar_dialog_response), data);
if (data->dialog_title)
- gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+ adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
gtk_window_set_icon_name (GTK_WINDOW(dialog),
"x-office-calendar");
diff --git a/src/entry.c b/src/entry.c
index bf94cd4..2632d28 100644
--- a/src/entry.c
+++ b/src/entry.c
@@ -73,7 +73,7 @@ zenity_entry (ZenityData *data, ZenityEntryData *entry_data)
g_signal_connect (dialog, "response", G_CALLBACK(zenity_entry_dialog_response), data);
if (data->dialog_title)
- gtk_window_set_title (GTK_WINDOW(dialog), data->dialog_title);
+ adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
gtk_window_set_icon_name (GTK_WINDOW(dialog),
"insert-text");
diff --git a/src/forms.c b/src/forms.c
index 4e4a60e..59ada04 100644
--- a/src/forms.c
+++ b/src/forms.c
@@ -248,7 +248,7 @@ zenity_forms_dialog (ZenityData *data, ZenityFormsData *forms_data)
G_CALLBACK (zenity_forms_dialog_response), forms_data);
if (data->dialog_title)
- gtk_window_set_title (GTK_WINDOW(dialog), data->dialog_title);
+ adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
if (data->width > -1 || data->height > -1) {
gtk_window_set_default_size (GTK_WINDOW(dialog),
diff --git a/src/msg.c b/src/msg.c
index 87a5beb..8ebb2e0 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -122,7 +122,7 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data)
g_signal_connect (dialog, "response", G_CALLBACK(zenity_msg_dialog_response), data);
if (data->dialog_title)
- gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+ adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
if (data->ok_label)
{
diff --git a/src/password.c b/src/password.c
index 69dd683..fc27021 100644
--- a/src/password.c
+++ b/src/password.c
@@ -120,7 +120,7 @@ zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data)
1, 1);
if (data->dialog_title)
- gtk_window_set_title (GTK_WINDOW(dialog), data->dialog_title);
+ adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
if (data->modal)
gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
diff --git a/src/progress.c b/src/progress.c
index 507c4c5..adc7574 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -347,7 +347,7 @@ zenity_progress (ZenityData *data, ZenityProgressData *progress_data)
g_signal_connect (dialog, "response", G_CALLBACK(zenity_progress_dialog_response), data);
if (data->dialog_title)
- gtk_window_set_title (GTK_WINDOW(dialog), data->dialog_title);
+ adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
gtk_window_set_icon_name (GTK_WINDOW(dialog),
"appointment-soon");
diff --git a/src/scale.c b/src/scale.c
index 7ac0f41..73ab015 100644
--- a/src/scale.c
+++ b/src/scale.c
@@ -73,7 +73,7 @@ zenity_scale (ZenityData *data, ZenityScaleData *scale_data)
}
if (data->dialog_title)
- gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+ adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
gtk_window_set_icon_name (GTK_WINDOW(dialog),
"dialog-question");
diff --git a/src/text.c b/src/text.c
index 7c37855..7f09cda 100644
--- a/src/text.c
+++ b/src/text.c
@@ -31,7 +31,7 @@
#include <gio/gio.h>
#ifdef HAVE_WEBKITGTK
-#include <webkit2/webkit2.h>
+#include <webkit/webkit.h>
#endif
#include <config.h>
@@ -280,7 +280,7 @@ zenity_text (ZenityData *data, ZenityTextData *text_data)
G_CALLBACK(zenity_text_dialog_response), data);
if (data->dialog_title)
- gtk_window_set_title (GTK_WINDOW(dialog), data->dialog_title);
+ adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
gtk_window_set_icon_name (GTK_WINDOW(dialog),
"accessories-text-editor");
@@ -358,9 +358,13 @@ zenity_text (ZenityData *data, ZenityTextData *text_data)
if (text_data->html)
{
/* "ephemeral" == private browsing */
- g_autoptr(WebKitWebContext) wk_context = webkit_web_context_new_ephemeral ();
+ g_autoptr(WebKitWebContext) wk_context = webkit_web_context_new ();
+ g_autoptr(WebKitNetworkSession) wk_session = webkit_network_session_new_ephemeral ();
- web_kit = webkit_web_view_new_with_context (wk_context);
+ web_kit = WEBKIT_WEB_VIEW (g_object_new (WEBKIT_TYPE_WEB_VIEW,
+ "web-context", wk_context,
+ "network-session", wk_session,
+ NULL));
scrolled_window = GTK_WIDGET (
gtk_builder_get_object (builder, "zenity_text_scrolled_window"));
diff --git a/src/tree.c b/src/tree.c
index b59a919..f43de03 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -120,6 +120,9 @@ zenity_tree_handle_stdin (GIOChannel *channel, GIOCondition condition, gpointer
/* We're starting a new row */
column_count = 0;
row_count++;
+ if (row)
+ g_list_store_append (store, row);
+ row = zenity_tree_row_new ();
}
if (toggles && column_count == 0)
@@ -291,7 +294,7 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data)
g_signal_connect (dialog, "response", G_CALLBACK(zenity_tree_dialog_response), data);
if (data->dialog_title)
- gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+ adw_message_dialog_set_heading (ADW_MESSAGE_DIALOG(dialog), data->dialog_title);;
if (data->modal)
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
diff --git a/src/zenity-tree-column-view.c b/src/zenity-tree-column-view.c
index 9b4b5a6..5117f95 100644
--- a/src/zenity-tree-column-view.c
+++ b/src/zenity-tree-column-view.c
@@ -555,7 +555,8 @@ factory_bind_cb (ZenityTreeColumnView *self,
item = zenity_tree_row_get_item (row, col_index);
item_child = zenity_tree_item_get_child (item);
item_text = zenity_tree_item_get_text (item);
- gtk_list_item_set_child (list_item, item_child);
+ if (!gtk_widget_get_parent (item_child))
+ gtk_list_item_set_child (list_item, item_child);
gtk_widget_set_halign (item_child, GTK_ALIGN_START);
diff --git a/src/zenity.ui b/src/zenity.ui
index e4e6a5b..5644aff 100644
--- a/src/zenity.ui
+++ b/src/zenity.ui
@@ -6,7 +6,7 @@
<interface>
<requires lib="gtk" version="4.0"/>
<object class="AdwMessageDialog" id="zenity_scale_dialog">
- <property name="title" translatable="yes">Adjust the scale value</property>
+ <property name="heading" translatable="yes">Adjust the scale value</property>
<property name="default_width">300</property>
<property name="default_height">100</property>
<property name="extra-child">zenity_scale_box</property>
@@ -42,7 +42,7 @@
</child>
</object>
<object class="AdwMessageDialog" id="zenity_text_dialog">
- <property name="title" translatable="yes">Text View</property>
+ <property name="heading" translatable="yes">Text View</property>
<property name="default_width">300</property>
<property name="default_height">200</property>
<property name="resizable">true</property>
@@ -79,7 +79,7 @@
</child>
</object>
<object class="AdwMessageDialog" id="zenity_calendar_dialog">
- <property name="title" translatable="yes">Calendar selection</property>
+ <property name="heading" translatable="yes">Calendar selection</property>
<property name="extra-child">zenity_calendar_box</property>
<responses>
<response id="cancel" translatable="yes">_Cancel</response>
@@ -129,7 +129,7 @@
</child>
</object>
<object class="AdwMessageDialog" id="zenity_entry_dialog">
- <property name="title" translatable="yes">Add a new entry</property>
+ <property name="heading" translatable="yes">Add a new entry</property>
<property name="extra-child">zenity_entry_box</property>
<responses>
<response id="cancel" translatable="yes">_Cancel</response>
@@ -167,7 +167,7 @@
</child>
</object>
<object class="AdwMessageDialog" id="zenity_error_dialog">
- <property name="title" translatable="yes">Error</property>
+ <property name="heading" translatable="yes">Error</property>
<property name="extra-child">zenity_error_box</property>
<responses>
<response id="ok" translatable="yes">_OK</response>
@@ -266,7 +266,7 @@
</child>
</object>
<object class="AdwMessageDialog" id="zenity_info_dialog">
- <property name="title" translatable="yes">Information</property>
+ <property name="heading" translatable="yes">Information</property>
<property name="extra-child">zenity_info_box</property>
<responses>
<response id="ok" translatable="yes">_OK</response>
@@ -302,7 +302,7 @@
</child>
</object>
<object class="AdwMessageDialog" id="zenity_progress_dialog">
- <property name="title" translatable="yes">Progress</property>
+ <property name="heading" translatable="yes">Progress</property>
<property name="extra-child">zenity_progress_box</property>
</object>
<object class="GtkBox" id="zenity_progress_box">
@@ -336,7 +336,7 @@
</child>
</object>
<object class="AdwMessageDialog" id="zenity_question_dialog">
- <property name="title" translatable="yes">Question</property>
+ <property name="heading" translatable="yes">Question</property>
<property name="extra-child">zenity_question_box</property>
<responses>
<response id="no" translatable="yes">_No</response>
@@ -372,7 +372,7 @@
</child>
</object>
<object class="AdwMessageDialog" id="zenity_tree_dialog">
- <property name="title" translatable="yes">Select items from the list</property>
+ <property name="heading" translatable="yes">Select items from the list</property>
<property name="default_width">480</property>
<property name="default_height">320</property>
<property name="extra-child">zenity_tree_box</property>
@@ -412,7 +412,7 @@
</child>
</object>
<object class="AdwMessageDialog" id="zenity_warning_dialog">
- <property name="title" translatable="yes">Warning</property>
+ <property name="heading" translatable="yes">Warning</property>
<property name="resizable">false</property>
<property name="extra-child">zenity_warning_box</property>
<responses>
@@ -449,7 +449,7 @@
</child>
</object>
<object class="AdwMessageDialog" id="zenity_password_dialog">
- <property name="title" translatable="yes">Warning</property>
+ <property name="heading" translatable="yes">Warning</property>
<property name="resizable">false</property>
<property name="extra-child">zenity_password_box</property>
<responses>
View Lorry Controller Status