[gtk/wip/baedert/for-master: 7/29] printeroptionwidget: Stop using radio buttons
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/for-master: 7/29] printeroptionwidget: Stop using radio buttons
- Date: Mon, 31 Aug 2020 02:26:57 +0000 (UTC)
commit 151b9c71db807c282ae511d61f58345a8710dee2
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Aug 30 17:43:00 2020 -0400
printeroptionwidget: Stop using radio buttons
Use grouped check buttons instead.
gtk/gtkprinteroptionwidget.c | 55 ++++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 28 deletions(-)
---
diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c
index 200eef8a39..5165ff69a0 100644
--- a/gtk/gtkprinteroptionwidget.c
+++ b/gtk/gtkprinteroptionwidget.c
@@ -32,7 +32,7 @@
#include "gtkimage.h"
#include "gtklabel.h"
#include "gtkliststore.h"
-#include "gtkradiobutton.h"
+#include "gtkcheckbutton.h"
#include "gtkgrid.h"
#include "gtktogglebutton.h"
#include "gtkorientable.h"
@@ -867,7 +867,7 @@ radio_changed_cb (GtkWidget *button,
{
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
char *value;
-
+
g_signal_handler_block (priv->source, priv->source_changed_handler);
value = g_object_get_data (G_OBJECT (button), "value");
if (value)
@@ -876,16 +876,6 @@ radio_changed_cb (GtkWidget *button,
emit_changed (widget);
}
-static void
-select_maybe (GtkWidget *widget,
- const char *value)
-{
- char *v = g_object_get_data (G_OBJECT (widget), "value");
-
- if (strcmp (value, v) == 0)
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
-}
-
static void
alternative_set (GtkWidget *box,
const char *value)
@@ -895,28 +885,37 @@ alternative_set (GtkWidget *box,
for (child = gtk_widget_get_first_child (box);
child != NULL;
child = gtk_widget_get_next_sibling (child))
- select_maybe (child, value);
+ {
+ char *v = g_object_get_data (G_OBJECT (child), "value");
+
+ if (strcmp (value, v) == 0)
+ {
+ gtk_check_button_set_active (GTK_CHECK_BUTTON (child), TRUE);
+ break;
+ }
+ }
}
-static GSList *
+static void
alternative_append (GtkWidget *box,
const char *label,
const char *value,
GtkPrinterOptionWidget *widget,
- GSList *group)
+ GtkWidget **group)
{
GtkWidget *button;
- button = gtk_radio_button_new_with_label (group, label);
- gtk_widget_show (button);
+ button = gtk_check_button_new_with_label (label);
+ if (*group)
+ gtk_check_button_set_group (GTK_CHECK_BUTTON (button), GTK_CHECK_BUTTON (*group));
+ else
+ *group = button;
+
gtk_widget_set_valign (button, GTK_ALIGN_BASELINE);
gtk_box_append (GTK_BOX (box), button);
g_object_set_data (G_OBJECT (button), "value", (gpointer)value);
- g_signal_connect (button, "toggled",
- G_CALLBACK (radio_changed_cb), widget);
-
- return gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+ g_signal_connect (button, "toggled", G_CALLBACK (radio_changed_cb), widget);
}
static void
@@ -926,7 +925,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
GtkPrinterOption *source;
char *text;
int i;
- GSList *group;
+ GtkWidget *group;
source = priv->source;
@@ -1000,14 +999,14 @@ construct_widgets (GtkPrinterOptionWidget *widget)
gtk_box_append (GTK_BOX (widget), priv->box);
for (i = 0; i < source->num_choices; i++)
{
- group = alternative_append (priv->box,
- source->choices_display[i],
- source->choices[i],
- widget,
- group);
+ alternative_append (priv->box,
+ source->choices_display[i],
+ source->choices[i],
+ widget,
+ &group);
/* for mnemonic activation */
if (i == 0)
- priv->button = group->data;
+ priv->button = group;
}
if (source->display_text)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]