summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Bicha <jeremy.bicha@canonical.com>2022-04-27 15:33:58 -0400
committerJeremy Bicha <jeremy.bicha@canonical.com>2022-04-27 15:33:58 -0400
commit2f2336732889e3e5a59849dcde6dce2f8fc87430 (patch)
treeffd1f6c291fa5f1415d1ccfeea1f6aa780381333
parentNew upstream version 3.42.0 (diff)
parentUpdate NEWS and meson.build for 3.42.0 (diff)
downloadzenity-2f2336732889e3e5a59849dcde6dce2f8fc87430.tar.gz
zenity-2f2336732889e3e5a59849dcde6dce2f8fc87430.tar.bz2
zenity-2f2336732889e3e5a59849dcde6dce2f8fc87430.zip
New upstream version 3.42.1
-rw-r--r--NEWS6
-rw-r--r--meson.build2
-rw-r--r--src/msg.c8
-rw-r--r--src/zenity.ui5
4 files changed, 15 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 2544934a..b5620628 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Zenity 3.42.1
+ - scale: Make OK button default (allows pressing Enter to accept selected
+ value) (hydrargyrum)
+ - Fix maximum width of message dialogs to 60 characters, and make message
+ dialogs non-resizable (fixes regression from 3b64d05e) (David King)
+
Zenity 3.42.0
- tree: Clicking row checks radio/checkboxes (Logan Rathbone)
- Fix search column selection with --imagelist (Janne Pulkkinen)
diff --git a/meson.build b/meson.build
index 81512be6..6f287908 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('zenity', 'c',
- version: '3.42.0',
+ version: '3.42.1',
meson_version: '>=0.53.0',
license: 'LGPL-2.1-or-later'
)
diff --git a/src/msg.c b/src/msg.c
index 496fe185..92651525 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -202,12 +202,10 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data) {
if (data->width > -1)
gtk_widget_set_size_request (GTK_WIDGET (text), data->width, -1);
else if (!msg_data->ellipsize && !msg_data->no_wrap) {
- // the magic number 60 is picked from gtk+/gtk/ui/gtkmessagedialog.ui
- // however, 60 would increase the distance between the icon and the
- // text,
- // decreasing to 10 fix it.
+ /* The magic number 60 is taken from gtk+/gtk/ui/gtkmessagedialog.ui
+ with 10 as a minimum width. */
gtk_label_set_width_chars (GTK_LABEL (text), 10);
- gtk_label_set_max_width_chars (GTK_LABEL (text), 10);
+ gtk_label_set_max_width_chars (GTK_LABEL (text), 60);
}
if (data->modal)
diff --git a/src/zenity.ui b/src/zenity.ui
index 13594422..c1a367c3 100644
--- a/src/zenity.ui
+++ b/src/zenity.ui
@@ -46,6 +46,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
+ <property name="has_default">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -465,6 +466,7 @@
<property name="title" translatable="yes">Error</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
+ <property name="resizable">false</property>
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox7">
@@ -681,6 +683,7 @@
<property name="title" translatable="yes">Information</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
+ <property name="resizable">false</property>
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox9">
@@ -882,6 +885,7 @@
<property name="title" translatable="yes">Question</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
+ <property name="resizable">false</property>
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox3">
@@ -1064,6 +1068,7 @@
<property name="title" translatable="yes">Warning</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
+ <property name="resizable">false</property>
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
bgstack15