X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkprinteroption.c;h=644fe209dc2f2f82f41638e874646ff491fb80e7;hb=67f5e595a796a8321d6dc7737c58476564998c07;hp=821efbd3e77be59f9345483c0b077d6d9333bdb6;hpb=320660fb8100271f4abc59a0d86ff02864288dc6;p=~andy%2Fgtk
diff --git a/gtk/gtkprinteroption.c b/gtk/gtkprinteroption.c
index 821efbd3e..644fe209d 100644
--- a/gtk/gtkprinteroption.c
+++ b/gtk/gtkprinteroption.c
@@ -13,17 +13,16 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
#include "config.h"
#include
#include
+#include "gtkintl.h"
+#include "gtkprivate.h"
#include "gtkprinteroption.h"
-#include "gtkalias.h"
/*****************************************
* GtkPrinterOption *
@@ -34,8 +33,22 @@ enum {
LAST_SIGNAL
};
+enum {
+ PROP_0,
+ PROP_VALUE
+};
+
static guint signals[LAST_SIGNAL] = { 0 };
+static void gtk_printer_option_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_printer_option_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+
G_DEFINE_TYPE (GtkPrinterOption, gtk_printer_option, G_TYPE_OBJECT)
static void
@@ -63,6 +76,7 @@ static void
gtk_printer_option_init (GtkPrinterOption *option)
{
option->value = g_strdup ("");
+ option->activates_default = FALSE;
}
static void
@@ -71,6 +85,8 @@ gtk_printer_option_class_init (GtkPrinterOptionClass *class)
GObjectClass *gobject_class = (GObjectClass *)class;
gobject_class->finalize = gtk_printer_option_finalize;
+ gobject_class->set_property = gtk_printer_option_set_property;
+ gobject_class->get_property = gtk_printer_option_get_property;
signals[CHANGED] =
g_signal_new ("changed",
@@ -80,11 +96,19 @@ gtk_printer_option_class_init (GtkPrinterOptionClass *class)
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+
+ g_object_class_install_property (G_OBJECT_CLASS (class),
+ PROP_VALUE,
+ g_param_spec_string ("value",
+ P_("Option Value"),
+ P_("Value of the option"),
+ "",
+ GTK_PARAM_READWRITE));
}
GtkPrinterOption *
gtk_printer_option_new (const char *name, const char *display_text,
- GtkPrinterOptionType type)
+ GtkPrinterOptionType type)
{
GtkPrinterOption *option;
@@ -97,6 +121,44 @@ gtk_printer_option_new (const char *name, const char *display_text,
return option;
}
+static void
+gtk_printer_option_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GtkPrinterOption *option = GTK_PRINTER_OPTION (object);
+
+ switch (prop_id)
+ {
+ case PROP_VALUE:
+ gtk_printer_option_set (option, g_value_get_string (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_printer_option_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkPrinterOption *option = GTK_PRINTER_OPTION (object);
+
+ switch (prop_id)
+ {
+ case PROP_VALUE:
+ g_value_set_string (value, option->value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
static void
emit_changed (GtkPrinterOption *option)
{
@@ -114,8 +176,7 @@ gtk_printer_option_set (GtkPrinterOption *option,
return;
if ((option->type == GTK_PRINTER_OPTION_TYPE_PICKONE ||
- option->type == GTK_PRINTER_OPTION_TYPE_ALTERNATIVE) &&
- value != NULL)
+ option->type == GTK_PRINTER_OPTION_TYPE_ALTERNATIVE))
{
int i;
@@ -131,7 +192,7 @@ gtk_printer_option_set (GtkPrinterOption *option,
if (i == option->num_choices)
return; /* Not found in available choices */
}
-
+
g_free (option->value);
option->value = g_strdup (value);
@@ -215,6 +276,19 @@ gtk_printer_option_has_choice (GtkPrinterOption *option,
return FALSE;
}
+void
+gtk_printer_option_set_activates_default (GtkPrinterOption *option,
+ gboolean activates)
+{
+ g_return_if_fail (GTK_IS_PRINTER_OPTION (option));
+
+ option->activates_default = activates;
+}
-#define __GTK_PRINTER_OPTION_C__
-#include "gtkaliasdef.c"
+gboolean
+gtk_printer_option_get_activates_default (GtkPrinterOption *option)
+{
+ g_return_val_if_fail (GTK_IS_PRINTER_OPTION (option), FALSE);
+
+ return option->activates_default;
+}