#include "gtkcelllayout.h"
#include "gtkcellrenderertext.h"
#include "gtkcombobox.h"
-#include "gtkcomboboxentry.h"
#include "gtkfilechooserbutton.h"
#include "gtkimage.h"
#include "gtklabel.h"
#include "gtkprivate.h"
#include "gtkprinteroptionwidget.h"
-#include "gtkalias.h"
#define GTK_PRINTER_OPTION_WIDGET_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PRINTER_OPTION_WIDGET, GtkPrinterOptionWidgetPrivate))
enum {
PROP_0,
- PROP_SOURCE,
+ PROP_SOURCE
};
static guint signals[LAST_SIGNAL] = { 0 };
GValue *value,
GParamSpec *pspec);
static gboolean gtk_printer_option_widget_mnemonic_activate (GtkWidget *widget,
- gboolean group_cycling);
+ gboolean group_cycling);
static void
gtk_printer_option_widget_class_init (GtkPrinterOptionWidgetClass *class)
}
void
-gtk_printer_option_widget_set_source (GtkPrinterOptionWidget *widget,
- GtkPrinterOption *source)
+gtk_printer_option_widget_set_source (GtkPrinterOptionWidget *widget,
+ GtkPrinterOption *source)
{
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
g_object_notify (G_OBJECT (widget), "source");
}
+enum {
+ NAME_COLUMN,
+ VALUE_COLUMN,
+ N_COLUMNS
+};
+
static void
combo_box_set_model (GtkWidget *combo_box)
{
GtkListStore *store;
- store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+ store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
g_object_unref (store);
}
cell = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), cell,
- "text", 1,
+ "text", NAME_COLUMN,
NULL);
}
combo_box_entry_new (void)
{
GtkWidget *combo_box;
- combo_box = gtk_combo_box_entry_new ();
+ combo_box = g_object_new (GTK_TYPE_COMBO_BOX, "has-entry", TRUE, NULL);
combo_box_set_model (combo_box);
- gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combo_box), 1);
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (combo_box), NAME_COLUMN);
return combo_box;
}
}
static void
-combo_box_append (GtkWidget *combo,
- const char *display_text,
- const char *value)
+combo_box_append (GtkWidget *combo,
+ const gchar *display_text,
+ const gchar *value)
{
GtkTreeModel *model;
GtkListStore *store;
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
- 0, display_text,
- 1, value,
+ NAME_COLUMN, display_text,
+ VALUE_COLUMN, value,
-1);
}
struct ComboSet {
GtkComboBox *combo;
- const char *value;
+ const gchar *value;
};
static gboolean
-set_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+set_cb (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer data)
{
struct ComboSet *set_data = data;
gboolean found;
char *value;
- gtk_tree_model_get (model, iter, 1, &value, -1);
+ gtk_tree_model_get (model, iter, VALUE_COLUMN, &value, -1);
found = (strcmp (value, set_data->value) == 0);
g_free (value);
}
static void
-combo_box_set (GtkWidget *combo,
- const char *value)
+combo_box_set (GtkWidget *combo,
+ const gchar *value)
{
GtkTreeModel *model;
- GtkListStore *store;
struct ComboSet set_data;
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
- store = GTK_LIST_STORE (model);
set_data.combo = GTK_COMBO_BOX (combo);
set_data.value = value;
combo_box_get (GtkWidget *combo)
{
GtkTreeModel *model;
- char *val;
+ gchar *value;
GtkTreeIter iter;
- if (GTK_IS_COMBO_BOX_ENTRY (combo))
- {
- val = gtk_combo_box_get_active_text(GTK_COMBO_BOX (combo));
- }
- else
- {
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
+
+ value = NULL;
+ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
+ gtk_tree_model_get (model, &iter, VALUE_COLUMN, &value, -1);
- val = NULL;
- if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
- gtk_tree_model_get (model, &iter,
- 1, &val,
- -1);
- }
- return val;
+ return value;
}
}
static void
-check_toggled_cb (GtkToggleButton *toggle_button,
+check_toggled_cb (GtkToggleButton *toggle_button,
GtkPrinterOptionWidget *widget)
{
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
}
static void
-filesave_changed_cb (GtkWidget *w,
+filesave_changed_cb (GtkWidget *button,
GtkPrinterOptionWidget *widget)
{
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
- gchar *uri, *directory, *path;
- const gchar *file;
+ gchar *uri, *file;
+ gchar *directory;
- /* TODO: how do we support nonlocal file systems? */
- directory = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (priv->combo));
file = g_filename_from_utf8 (gtk_entry_get_text (GTK_ENTRY (priv->entry)),
-1, NULL, NULL, NULL);
if (file == NULL)
/* combine the value of the chooser with the value of the entry */
g_signal_handler_block (priv->source, priv->source_changed_handler);
- if (g_path_is_absolute (file))
- uri = g_filename_to_uri (file, NULL, NULL);
- else
+ directory = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (priv->combo));
+
+ if ((g_uri_parse_scheme (file) == NULL) && (directory != NULL))
{
-#ifdef G_OS_UNIX
- if (file[0] == '~' && file[1] == '/')
+ if (g_path_is_absolute (file))
+ uri = g_filename_to_uri (file, NULL, NULL);
+ else
{
- directory = g_strdup (g_get_home_dir ());
- file += 2;
- }
+ gchar *path;
+
+#ifdef G_OS_UNIX
+ if (file[0] == '~' && file[1] == '/')
+ {
+ path = g_build_filename (g_get_home_dir (), file + 2, NULL);
+ }
+ else
#endif
-
- path = g_build_filename (directory, file, NULL);
- uri = g_filename_to_uri (path, NULL, NULL);
- g_free (path);
- }
+ {
+ path = g_build_filename (directory, file, NULL);
+ }
+
+ uri = g_filename_to_uri (path, NULL, NULL);
+ g_free (path);
+ }
+ }
+ else
+ {
+ if (g_uri_parse_scheme (file) != NULL)
+ uri = g_strdup (file);
+ else
+ uri = g_build_path ("/", gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (priv->combo)), file, NULL);
+ }
+
if (uri)
gtk_printer_option_set (priv->source, uri);
- g_free (directory);
g_free (uri);
+ g_free (file);
+ g_free (directory);
g_signal_handler_unblock (priv->source, priv->source_changed_handler);
emit_changed (widget);
}
-static char *
-filter_numeric (const char *val,
- gboolean allow_neg,
- gboolean allow_dec,
- gboolean *changed_out)
+static gchar *
+filter_numeric (const gchar *val,
+ gboolean allow_neg,
+ gboolean allow_dec,
+ gboolean *changed_out)
{
gchar *filtered_val;
int i, j;
for (i = 0, j = 0; i < len; i++)
{
- if (isdigit(val[i]))
+ if (isdigit (val[i]))
{
filtered_val[j] = val[i];
j++;
return filtered_val;
}
+
static void
-combo_changed_cb (GtkWidget *combo,
+combo_changed_cb (GtkWidget *combo,
GtkPrinterOptionWidget *widget)
{
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
}
static void
-entry_changed_cb (GtkWidget *entry,
+entry_changed_cb (GtkWidget *entry,
GtkPrinterOptionWidget *widget)
{
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
- const char *value;
+ const gchar *value;
g_signal_handler_block (priv->source, priv->source_changed_handler);
value = gtk_entry_get_text (GTK_ENTRY (entry));
GtkPrinterOptionWidget *widget)
{
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
- char *value;
+ gchar *value;
g_signal_handler_block (priv->source, priv->source_changed_handler);
value = g_object_get_data (G_OBJECT (button), "value");
select_maybe (GtkWidget *widget,
const gchar *value)
{
- char *v = g_object_get_data (G_OBJECT (widget), "value");
+ gchar *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 GSList *
-alternative_append (GtkWidget *box,
- const gchar *label,
- const gchar *value,
+alternative_append (GtkWidget *box,
+ const gchar *label,
+ const gchar *value,
GtkPrinterOptionWidget *widget,
- GSList *group)
+ GSList *group)
{
GtkWidget *button;
deconstruct_widgets (widget);
+ gtk_widget_set_sensitive (GTK_WIDGET (widget), TRUE);
+
if (source == NULL)
{
priv->combo = combo_box_new ();
combo_box_append (priv->combo,_("Not available"), "None");
gtk_combo_box_set_active (GTK_COMBO_BOX (priv->combo), 0);
- gtk_widget_set_sensitive (priv->combo, FALSE);
+ gtk_widget_set_sensitive (GTK_WIDGET (widget), FALSE);
gtk_widget_show (priv->combo);
gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE, TRUE, 0);
}
case GTK_PRINTER_OPTION_TYPE_ALTERNATIVE:
group = NULL;
- priv->box = gtk_hbox_new (FALSE, 12);
+ priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_widget_show (priv->box);
gtk_box_pack_start (GTK_BOX (widget), priv->box, TRUE, TRUE, 0);
for (i = 0; i < source->num_choices; i++)
case GTK_PRINTER_OPTION_TYPE_STRING:
priv->entry = gtk_entry_new ();
+ gtk_entry_set_activates_default (GTK_ENTRY (priv->entry),
+ gtk_printer_option_get_activates_default (source));
gtk_widget_show (priv->entry);
gtk_box_pack_start (GTK_BOX (widget), priv->entry, TRUE, TRUE, 0);
g_signal_connect (priv->entry, "changed", G_CALLBACK (entry_changed_cb), widget);
/* TODO: make this a gtkfilechooserentry once we move to GTK */
priv->entry = gtk_entry_new ();
- priv->combo = gtk_file_chooser_button_new (source->display_text,
+ priv->combo = gtk_file_chooser_button_new (_("Select a folder"),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ g_object_set (priv->combo, "local-only", FALSE, NULL);
+ gtk_entry_set_activates_default (GTK_ENTRY (priv->entry),
+ gtk_printer_option_get_activates_default (source));
+
label = gtk_label_new_with_mnemonic (_("_Name:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->entry);
g_signal_connect (priv->entry, "changed", G_CALLBACK (filesave_changed_cb), widget);
- g_signal_connect (priv->combo, "current-folder-changed", G_CALLBACK (filesave_changed_cb), widget);
+ g_signal_connect (priv->combo, "selection-changed", G_CALLBACK (filesave_changed_cb), widget);
}
break;
default:
switch (source->type)
{
case GTK_PRINTER_OPTION_TYPE_BOOLEAN:
- if (strcmp (source->value, "True") == 0)
+ if (g_ascii_strcasecmp (source->value, "True") == 0)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->check), TRUE);
else
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->check), FALSE);
break;
case GTK_PRINTER_OPTION_TYPE_FILESAVE:
{
- char *basename = g_path_get_basename (source->value);
- char *dirname = g_path_get_dirname (source->value);
- gtk_entry_set_text (GTK_ENTRY (priv->entry), basename);
- if (g_path_is_absolute (dirname))
- gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (priv->combo),
- dirname);
- g_free (basename);
- g_free (dirname);
+ gchar *filename = g_filename_from_uri (source->value, NULL, NULL);
+ if (filename != NULL)
+ {
+ gchar *basename, *dirname, *text;
+
+ basename = g_path_get_basename (filename);
+ dirname = g_path_get_dirname (filename);
+ text = g_filename_to_utf8 (basename, -1, NULL, NULL, NULL);
+
+ if (text != NULL)
+ gtk_entry_set_text (GTK_ENTRY (priv->entry), text);
+ if (g_path_is_absolute (dirname))
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (priv->combo),
+ dirname);
+ g_free (text);
+ g_free (basename);
+ g_free (dirname);
+ g_free (filename);
+ }
+ else
+ gtk_entry_set_text (GTK_ENTRY (priv->entry), source->value);
break;
}
default:
}
gboolean
-gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *widget)
+gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *widget)
{
return widget->priv->label != NULL;
}
return widget->priv->label;
}
-const char *
-gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *widget)
+const gchar *
+gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *widget)
{
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
return "";
}
-
-#define __GTK_PRINTER_OPTION_WIDGET_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff