Do not popup the logout dialog when the close button (X) of window manager
2003-11-27 Muktha <muktha.narayan@wipro.com> * main.c: Do not popup the logout dialog when the close button (X) of window manager is clicked. Fixes bug #124032. 2004-02-16 Jody Goldberg <jody@gnome.org> * accessibility-keyboard.c (cb_load_CDE_file) : Add a kludge to set the vertical size based on the monitor size until the filesel can do a better job of doing it itself. 2003-12-07 Jan Arne Petersen <jpetersen@uni-bonn.de> * accessibility-keyboard.c: (load_CDE_file), (fchooser_handle_response), (cb_load_CDE_file): replace GtkFileSelection with GtkFileChooser. 2003-12-07 Jan Arne Petersen <jpetersen@uni-bonn.de> * background-properties-capplet.c: remove unused "preview_file_selection.h" include. 2004-02-16 Jody Goldberg <jody@gnome.org> * gconf-property-editor.c (peditor_image_clicked_cb) : Use the monitor size kludge for the vertical size of the new file selector. 2003-12-07 Jan Arne Petersen <jpetersen@uni-bonn.de> * gconf-property-editor.c: (peditor_image_set_filename), (peditor_image_chooser_response_cb), (peditor_image_chooser_update_preview_cb), (peditor_image_clicked_cb): replace PreviewFileSelection (GtkFileSelection) with GtkFileChooser, use new gdk_pixbuf_new_from_file_at_size method to load a scaled image. 2004-02-16 Jody Goldberg <jody@gnome.org> * gnome-settings-accessibility-keyboard.c : include libgnome/gnome-help.h to avoid potential crash on 64 bit arches. (ax_response_callback) : actually display the error message on failure. 2004-02-16 Jody Goldberg <jody@gnome.org> http://bugzilla.gnome.org/show_bug.cgi?id=134389 * Makefile.am : Patch from jmmv@menta.net (Julio M. Merino Vidal) to honour the standard schema install flags. I've extended the patch to support builddir != srcdir too
This commit is contained in:
Muktha
Jody Goldberg
parent
cdb5349d9a
commit
92bc252e78
14 changed files with 139 additions and 407 deletions
|
|
@ -1,3 +1,17 @@
|
|||
2004-02-16 Jody Goldberg <jody@gnome.org>
|
||||
|
||||
* gconf-property-editor.c (peditor_image_clicked_cb) : Use the monitor
|
||||
size kludge for the vertical size of the new file selector.
|
||||
|
||||
2003-12-07 Jan Arne Petersen <jpetersen@uni-bonn.de>
|
||||
|
||||
* gconf-property-editor.c: (peditor_image_set_filename),
|
||||
(peditor_image_chooser_response_cb),
|
||||
(peditor_image_chooser_update_preview_cb),
|
||||
(peditor_image_clicked_cb): replace
|
||||
PreviewFileSelection (GtkFileSelection) with GtkFileChooser, use new
|
||||
gdk_pixbuf_new_from_file_at_size method to load a scaled image.
|
||||
|
||||
2004-02-13 Jody Goldberg <jody@gnome.org>
|
||||
|
||||
* Release 2.5.3
|
||||
|
|
|
|||
|
|
@ -31,8 +31,6 @@
|
|||
#include "gconf-property-editor.h"
|
||||
#include "gconf-property-editor-marshal.h"
|
||||
|
||||
#include "preview-file-selection.h"
|
||||
|
||||
enum {
|
||||
VALUE_CHANGED,
|
||||
LAST_SIGNAL
|
||||
|
|
@ -1525,7 +1523,6 @@ gboolean
|
|||
peditor_image_set_filename (GConfPropertyEditor *peditor, const gchar *filename)
|
||||
{
|
||||
GdkPixbuf *pixbuf = NULL;
|
||||
GdkPixbuf *scaled;
|
||||
GtkImage *image = NULL;
|
||||
const int scale = 100;
|
||||
gchar *message = NULL;
|
||||
|
|
@ -1544,7 +1541,7 @@ peditor_image_set_filename (GConfPropertyEditor *peditor, const gchar *filename)
|
|||
filename);
|
||||
|
||||
}
|
||||
else if (!(pixbuf = gdk_pixbuf_new_from_file (filename, NULL)))
|
||||
else if (!(pixbuf = gdk_pixbuf_new_from_file_at_size (filename, scale, scale, NULL)))
|
||||
{
|
||||
message = g_strdup_printf (_("I don't know how to open the file '%s'.\n"
|
||||
"Perhaps it's "
|
||||
|
|
@ -1592,34 +1589,39 @@ peditor_image_set_filename (GConfPropertyEditor *peditor, const gchar *filename)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
scaled = preview_file_selection_intelligent_scale (pixbuf,
|
||||
scale);
|
||||
|
||||
gtk_image_set_from_pixbuf (image, scaled);
|
||||
gtk_image_set_from_pixbuf (image, pixbuf);
|
||||
g_object_unref (G_OBJECT (pixbuf));
|
||||
g_object_unref (G_OBJECT (scaled));
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
peditor_image_fsel_ok_cb (GtkFileSelection *fsel, gpointer data)
|
||||
peditor_image_chooser_response_cb (GtkWidget *chooser,
|
||||
gint response,
|
||||
GConfPropertyEditor *peditor)
|
||||
{
|
||||
GConfValue *value, *value_wid;
|
||||
GConfPropertyEditor *peditor;
|
||||
const gchar *filename;
|
||||
gchar *filename;
|
||||
|
||||
peditor = g_object_get_data (G_OBJECT (fsel), "peditor");
|
||||
if (response == GTK_RESPONSE_CANCEL ||
|
||||
response == GTK_RESPONSE_DELETE_EVENT)
|
||||
{
|
||||
gtk_widget_destroy (chooser);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!peditor->p->inited)
|
||||
return;
|
||||
|
||||
filename = gtk_file_selection_get_filename (fsel);
|
||||
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
|
||||
if (!(filename && peditor_image_set_filename (peditor, filename)))
|
||||
{
|
||||
g_free (filename);
|
||||
return;
|
||||
}
|
||||
|
||||
value_wid = gconf_value_new (GCONF_VALUE_STRING);
|
||||
gconf_value_set_string (value_wid, gtk_file_selection_get_filename (fsel));
|
||||
gconf_value_set_string (value_wid, filename);
|
||||
value = peditor->p->conv_from_widget_cb (peditor, value_wid);
|
||||
|
||||
peditor_set_gconf_value (peditor, peditor->p->key, value);
|
||||
|
|
@ -1627,7 +1629,29 @@ peditor_image_fsel_ok_cb (GtkFileSelection *fsel, gpointer data)
|
|||
|
||||
gconf_value_free (value_wid);
|
||||
gconf_value_free (value);
|
||||
gtk_widget_destroy (GTK_WIDGET (fsel));
|
||||
g_free (filename);
|
||||
gtk_widget_destroy (chooser);
|
||||
}
|
||||
|
||||
void
|
||||
peditor_image_chooser_update_preview_cb (GtkFileChooser *chooser,
|
||||
GtkImage *preview)
|
||||
{
|
||||
char *filename;
|
||||
GdkPixbuf *pixbuf = NULL;
|
||||
const int scale = 100;
|
||||
|
||||
filename = gtk_file_chooser_get_preview_filename (chooser);
|
||||
|
||||
if (filename != NULL && g_file_test (filename, G_FILE_TEST_IS_REGULAR))
|
||||
pixbuf = gdk_pixbuf_new_from_file_at_size (filename, scale, scale, NULL);
|
||||
|
||||
gtk_image_set_from_pixbuf (preview, pixbuf);
|
||||
|
||||
g_free (filename);
|
||||
|
||||
if (pixbuf != NULL)
|
||||
gdk_pixbuf_unref (pixbuf);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -1635,10 +1659,42 @@ peditor_image_clicked_cb (GConfPropertyEditor *peditor, GtkButton *button)
|
|||
{
|
||||
GConfValue *value = NULL, *value_wid;
|
||||
const gchar *filename;
|
||||
GtkWidget *fsel;
|
||||
GtkWidget *chooser, *toplevel, *preview, *preview_box;
|
||||
GdkRectangle rect;
|
||||
int kludge_height;
|
||||
|
||||
fsel = preview_file_selection_new (_("Please select an image."), TRUE);
|
||||
gtk_window_set_modal (GTK_WINDOW (fsel), TRUE);
|
||||
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
|
||||
chooser = gtk_file_chooser_dialog_new (_("Please select an image."),
|
||||
GTK_IS_WINDOW (toplevel) ? GTK_WINDOW (toplevel)
|
||||
: NULL,
|
||||
GTK_FILE_CHOOSER_ACTION_OPEN,
|
||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||
_("_Select"), GTK_RESPONSE_OK,
|
||||
NULL);
|
||||
|
||||
preview = gtk_image_new ();
|
||||
|
||||
preview_box = gtk_hbox_new (FALSE, 6);
|
||||
gtk_box_pack_start (GTK_BOX (preview_box), preview, FALSE, TRUE, 0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (preview_box), 6);
|
||||
|
||||
gtk_widget_show_all (preview_box);
|
||||
gtk_file_chooser_set_preview_widget (GTK_FILE_CHOOSER (chooser),
|
||||
preview_box);
|
||||
gtk_file_chooser_set_preview_widget_active (GTK_FILE_CHOOSER (chooser),
|
||||
TRUE);
|
||||
|
||||
gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_OK);
|
||||
gtk_window_set_destroy_with_parent (GTK_WINDOW (chooser), TRUE);
|
||||
gtk_window_set_modal (GTK_WINDOW (chooser), TRUE);
|
||||
|
||||
/* the new file selectors vertical height negotiation isn't wonderful,
|
||||
* kludge up a rough version that uses a fraction of the screen height for now */
|
||||
gdk_screen_get_monitor_geometry (GTK_WINDOW (toplevel)->screen, 0, &rect);
|
||||
kludge_height = rect.height * .6;
|
||||
if (kludge_height < 400)
|
||||
kludge_height = rect.height * .9;
|
||||
gtk_window_set_default_size (GTK_WINDOW (chooser), -1, kludge_height);
|
||||
|
||||
/* need the current filename */
|
||||
if (peditor->p->changeset)
|
||||
|
|
@ -1659,24 +1715,19 @@ peditor_image_clicked_cb (GConfPropertyEditor *peditor, GtkButton *button)
|
|||
filename = gconf_value_get_string (value_wid);
|
||||
|
||||
if (filename && strcmp (filename, ""))
|
||||
gtk_file_selection_set_filename (GTK_FILE_SELECTION (fsel), filename);
|
||||
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (chooser), filename);
|
||||
|
||||
g_object_set_data (G_OBJECT (fsel), "peditor", peditor);
|
||||
|
||||
g_signal_connect_swapped (G_OBJECT (GTK_FILE_SELECTION (fsel)->ok_button),
|
||||
"clicked",
|
||||
(GCallback) peditor_image_fsel_ok_cb,
|
||||
fsel);
|
||||
|
||||
g_signal_connect_swapped (G_OBJECT (GTK_FILE_SELECTION (fsel)->cancel_button),
|
||||
"clicked",
|
||||
(GCallback) gtk_widget_destroy,
|
||||
fsel);
|
||||
g_signal_connect (G_OBJECT (chooser), "update-preview",
|
||||
G_CALLBACK (peditor_image_chooser_update_preview_cb),
|
||||
preview);
|
||||
g_signal_connect (G_OBJECT (chooser), "response",
|
||||
G_CALLBACK (peditor_image_chooser_response_cb),
|
||||
peditor);
|
||||
|
||||
if (gtk_grab_get_current ())
|
||||
gtk_grab_add (fsel);
|
||||
gtk_grab_add (chooser);
|
||||
|
||||
gtk_widget_show (fsel);
|
||||
gtk_widget_show (chooser);
|
||||
|
||||
gconf_value_free (value);
|
||||
gconf_value_free (value_wid);
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
2004-02-16 Jody Goldberg <jody@gnome.org>
|
||||
|
||||
* gnome-settings-accessibility-keyboard.c : include
|
||||
libgnome/gnome-help.h to avoid potential crash on 64 bit arches.
|
||||
(ax_response_callback) : actually display the error message on
|
||||
failure.
|
||||
|
||||
2004-02-15 Anders Carlsson <andersca@gnome.org>
|
||||
|
||||
* actions/Makefile.am: Link with ALSA_LIBS.
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#include <gdk/gdk.h>
|
||||
#include <gdk/gdkx.h>
|
||||
#include <gconf/gconf-client.h>
|
||||
#include <libgnome/gnome-help.h>
|
||||
|
||||
#include "gnome-settings-accessibility-keyboard.h"
|
||||
#include "gnome-settings-daemon.h"
|
||||
|
|
@ -322,7 +323,7 @@ ax_response_callback (gint response_id, guint revert_controls_mask, gboolean ena
|
|||
0,
|
||||
GTK_MESSAGE_ERROR,
|
||||
GTK_BUTTONS_CLOSE,
|
||||
_("There was an error displaying help:"),
|
||||
_("There was an error displaying help: %s"),
|
||||
err->message);
|
||||
g_signal_connect (G_OBJECT (error_dialog),
|
||||
"response",
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2003-12-07 Jan Arne Petersen <jpetersen@uni-bonn.de>
|
||||
|
||||
* Makefile.am: remove ununsed preview-file-selection.[ch] from
|
||||
build.
|
||||
|
||||
2004-02-13 Jody Goldberg <jody@gnome.org>
|
||||
|
||||
* Release 2.5.3
|
||||
|
|
|
|||
|
|
@ -11,5 +11,4 @@ noinst_LTLIBRARIES = libbackground.la
|
|||
|
||||
libbackground_la_SOURCES = \
|
||||
applier.c applier.h \
|
||||
preferences.c preferences.h \
|
||||
preview-file-selection.c preview-file-selection.h
|
||||
preferences.c preferences.h
|
||||
|
|
|
|||
|
|
@ -1,302 +0,0 @@
|
|||
/* -*- mode: c; style: linux -*- */
|
||||
|
||||
/* preview-file-selection.c
|
||||
* Copyright (C) 2001 Ximian, Inc.
|
||||
*
|
||||
* Written by Rachel Hestilow <hestilow@ximian.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
* 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <libgnome/libgnome.h>
|
||||
#include <gtk/gtkimage.h>
|
||||
#include <gtk/gtkhbox.h>
|
||||
#include <gtk/gtkframe.h>
|
||||
#include <gtk/gtklabel.h>
|
||||
#include <gtk/gtktreeview.h>
|
||||
#include <gtk/gtkmain.h>
|
||||
#include "preview-file-selection.h"
|
||||
|
||||
#define SCALE 100
|
||||
|
||||
struct _PreviewFileSelectionPrivate
|
||||
{
|
||||
GtkWidget *preview;
|
||||
GtkWidget *label;
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
PROP_0,
|
||||
PROP_DO_PREVIEW
|
||||
};
|
||||
|
||||
static GObjectClass *parent_class;
|
||||
|
||||
static void preview_file_selection_set_property (GObject *object, guint arg_id, const GValue *value, GParamSpec *spec);
|
||||
static void preview_file_selection_get_property (GObject *object, guint arg_id, GValue *value, GParamSpec *spec);
|
||||
|
||||
static void
|
||||
preview_file_selection_finalize (GObject *object)
|
||||
{
|
||||
PreviewFileSelection *fsel = PREVIEW_FILE_SELECTION (object);
|
||||
|
||||
g_free (fsel->priv);
|
||||
|
||||
parent_class->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
preview_file_selection_class_init (GObjectClass *object_class)
|
||||
{
|
||||
parent_class = g_type_class_ref (GTK_TYPE_FILE_SELECTION);
|
||||
|
||||
object_class->set_property = preview_file_selection_set_property;
|
||||
object_class->get_property = preview_file_selection_get_property;
|
||||
object_class->finalize = preview_file_selection_finalize;
|
||||
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_DO_PREVIEW,
|
||||
g_param_spec_boolean ("do_preview",
|
||||
"Preview images",
|
||||
"Whether to preview images",
|
||||
TRUE,
|
||||
G_PARAM_READWRITE |
|
||||
G_PARAM_CONSTRUCT_ONLY));
|
||||
}
|
||||
|
||||
static void
|
||||
preview_file_selection_init (GObject *object)
|
||||
{
|
||||
PreviewFileSelection *fsel = PREVIEW_FILE_SELECTION (object);
|
||||
|
||||
fsel->priv = g_new0 (PreviewFileSelectionPrivate, 1);
|
||||
}
|
||||
|
||||
GType
|
||||
preview_file_selection_get_type (void)
|
||||
{
|
||||
static GType type = 0;
|
||||
|
||||
if (!type)
|
||||
{
|
||||
GTypeInfo info =
|
||||
{
|
||||
sizeof (PreviewFileSelectionClass),
|
||||
NULL,
|
||||
NULL,
|
||||
(GClassInitFunc) preview_file_selection_class_init,
|
||||
NULL,
|
||||
NULL,
|
||||
sizeof (PreviewFileSelection),
|
||||
0,
|
||||
(GInstanceInitFunc) preview_file_selection_init,
|
||||
NULL
|
||||
};
|
||||
|
||||
type = g_type_register_static (GTK_TYPE_FILE_SELECTION,
|
||||
"PreviewFileSelection",
|
||||
&info, 0);
|
||||
}
|
||||
|
||||
return type;
|
||||
}
|
||||
|
||||
GtkWidget*
|
||||
preview_file_selection_new (const gchar *title, gboolean do_preview)
|
||||
{
|
||||
return GTK_WIDGET (
|
||||
g_object_new (PREVIEW_FILE_SELECTION_TYPE,
|
||||
"title", title,
|
||||
"do_preview", do_preview,
|
||||
NULL));
|
||||
}
|
||||
|
||||
GdkPixbuf*
|
||||
preview_file_selection_intelligent_scale (GdkPixbuf *buf, guint scale)
|
||||
{
|
||||
GdkPixbuf *scaled;
|
||||
int w, h;
|
||||
guint ow = gdk_pixbuf_get_width (buf);
|
||||
guint oh = gdk_pixbuf_get_height (buf);
|
||||
|
||||
if (ow <= scale && oh <= scale)
|
||||
scaled = gdk_pixbuf_ref (buf);
|
||||
else
|
||||
{
|
||||
if (ow > oh)
|
||||
{
|
||||
w = scale;
|
||||
h = scale * (((double)oh)/(double)ow);
|
||||
}
|
||||
else
|
||||
{
|
||||
h = scale;
|
||||
w = scale * (((double)ow)/(double)oh);
|
||||
}
|
||||
|
||||
scaled = gdk_pixbuf_scale_simple (buf, w, h, GDK_INTERP_BILINEAR);
|
||||
}
|
||||
|
||||
return scaled;
|
||||
}
|
||||
|
||||
static void
|
||||
preview_file_selection_update (PreviewFileSelection *fsel, gpointer data)
|
||||
{
|
||||
GdkPixbuf *buf;
|
||||
const gchar *filename;
|
||||
|
||||
g_return_if_fail (IS_PREVIEW_FILE_SELECTION (fsel));
|
||||
|
||||
filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fsel));
|
||||
if (filename && (buf = gdk_pixbuf_new_from_file (filename, NULL)))
|
||||
{
|
||||
int w, h;
|
||||
char *size;
|
||||
GdkPixbuf *scaled = preview_file_selection_intelligent_scale (buf, SCALE);
|
||||
gtk_image_set_from_pixbuf (GTK_IMAGE (fsel->priv->preview),
|
||||
scaled);
|
||||
g_object_unref (scaled);
|
||||
|
||||
w = gdk_pixbuf_get_width (buf);
|
||||
h = gdk_pixbuf_get_height (buf);
|
||||
|
||||
size = g_strdup_printf ("%d x %d", w, h);
|
||||
gtk_label_set_text (GTK_LABEL (fsel->priv->label), size);
|
||||
g_free (size);
|
||||
|
||||
g_object_unref (buf);
|
||||
}
|
||||
else {
|
||||
gtk_image_set_from_file (GTK_IMAGE (fsel->priv->preview), NULL);
|
||||
gtk_label_set_text (GTK_LABEL (fsel->priv->label), " ");
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
preview_file_selection_add_preview (PreviewFileSelection *fsel)
|
||||
{
|
||||
GtkWidget *hbox, *frame, *vbox;
|
||||
|
||||
g_return_if_fail (IS_PREVIEW_FILE_SELECTION (fsel));
|
||||
|
||||
hbox = GTK_FILE_SELECTION (fsel)->file_list;
|
||||
do
|
||||
{
|
||||
hbox = hbox->parent;
|
||||
if (!hbox)
|
||||
{
|
||||
g_warning (_("Can't find an hbox, using a normal file selection"));
|
||||
return;
|
||||
}
|
||||
} while (!GTK_IS_HBOX (hbox));
|
||||
|
||||
frame = gtk_frame_new (_("Preview"));
|
||||
gtk_widget_set_size_request (frame, SCALE + 10, SCALE + 10);
|
||||
gtk_widget_show (frame);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 2);
|
||||
gtk_widget_show (vbox);
|
||||
gtk_container_add (GTK_CONTAINER (frame), vbox);
|
||||
|
||||
fsel->priv->preview = gtk_image_new ();
|
||||
gtk_box_pack_start (GTK_BOX (vbox), fsel->priv->preview, FALSE, FALSE, 0);
|
||||
gtk_widget_show (fsel->priv->preview);
|
||||
|
||||
fsel->priv->label = gtk_label_new ("");
|
||||
gtk_box_pack_start (GTK_BOX (vbox), fsel->priv->label, FALSE, FALSE, 0);
|
||||
gtk_widget_show (fsel->priv->label);
|
||||
|
||||
g_signal_connect_data (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (GTK_FILE_SELECTION (fsel)->file_list))), "changed", (GCallback) preview_file_selection_update, fsel, NULL, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
|
||||
|
||||
preview_file_selection_update (fsel, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
preview_file_selection_set_property (GObject *object, guint arg_id, const GValue *value, GParamSpec *spec)
|
||||
{
|
||||
PreviewFileSelection *fsel = PREVIEW_FILE_SELECTION (object);
|
||||
|
||||
switch (arg_id)
|
||||
{
|
||||
case PROP_DO_PREVIEW:
|
||||
if (g_value_get_boolean (value))
|
||||
preview_file_selection_add_preview (fsel);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void preview_file_selection_get_property (GObject *object, guint arg_id, GValue *value, GParamSpec *spec)
|
||||
{
|
||||
PreviewFileSelection *fsel = PREVIEW_FILE_SELECTION (object);
|
||||
|
||||
switch (arg_id)
|
||||
{
|
||||
case PROP_DO_PREVIEW:
|
||||
g_value_set_boolean (value, fsel->priv->preview != NULL);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
browse_dialog_ok (GtkWidget *button, GnomeFileEntry *entry)
|
||||
{
|
||||
gnome_file_entry_set_filename (entry, gtk_file_selection_get_filename (GTK_FILE_SELECTION (entry->fsw)));
|
||||
g_signal_emit_by_name (entry, "activate");
|
||||
gtk_widget_destroy (entry->fsw);
|
||||
}
|
||||
|
||||
static void
|
||||
browse_dialog_kill (GtkFileSelection *fsel, GnomeFileEntry *entry)
|
||||
{
|
||||
entry->fsw = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
browse_clicked_cb (GnomeFileEntry *entry, const gchar *title)
|
||||
{
|
||||
GtkFileSelection *fs = GTK_FILE_SELECTION (preview_file_selection_new (title, TRUE));
|
||||
|
||||
entry->fsw = GTK_WIDGET (fs);
|
||||
|
||||
g_signal_connect (fs->ok_button, "clicked",
|
||||
(GCallback) browse_dialog_ok, entry);
|
||||
|
||||
g_signal_connect_swapped (fs->cancel_button, "clicked",
|
||||
(GCallback) gtk_widget_destroy, fs);
|
||||
|
||||
g_signal_connect (fs, "destroy",
|
||||
(GCallback) browse_dialog_kill, entry);
|
||||
|
||||
if (gtk_grab_get_current ())
|
||||
gtk_grab_add (entry->fsw);
|
||||
}
|
||||
|
||||
void
|
||||
preview_file_selection_hookup_file_entry (GnomeFileEntry *entry, const gchar *title)
|
||||
{
|
||||
g_return_if_fail (GNOME_IS_FILE_ENTRY (entry));
|
||||
g_return_if_fail (title != NULL);
|
||||
|
||||
g_signal_connect (G_OBJECT (entry), "browse_clicked",
|
||||
(GCallback) browse_clicked_cb, (gpointer) title);
|
||||
}
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
/* -*- mode: c; style: linux -*- */
|
||||
|
||||
/* preview-file-selection.h
|
||||
* Copyright (C) 2001 Ximian, Inc.
|
||||
*
|
||||
* Written by Rachel Hestilow <hestilow@ximian.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
* 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __PREVIEW_FILE_SELECTION_H__
|
||||
#define __PREVIEW_FILE_SELECTION_H__
|
||||
|
||||
#include <gtk/gtkfilesel.h>
|
||||
#include <libgnomeui/gnome-file-entry.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define PREVIEW_FILE_SELECTION_TYPE preview_file_selection_get_type ()
|
||||
#define PREVIEW_FILE_SELECTION(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, PREVIEW_FILE_SELECTION_TYPE, PreviewFileSelection)
|
||||
#define PREVIEW_FILE_SELECTION_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, PREVIEW_FILE_SELECTION_TYPE, PreviewFileSelectionClass)
|
||||
#define IS_PREVIEW_FILE_SELECTION(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, PREVIEW_FILE_SELECTION_TYPE)
|
||||
|
||||
typedef struct _PreviewFileSelection PreviewFileSelection;
|
||||
typedef struct _PreviewFileSelectionClass PreviewFileSelectionClass;
|
||||
typedef struct _PreviewFileSelectionPrivate PreviewFileSelectionPrivate;
|
||||
|
||||
struct _PreviewFileSelection
|
||||
{
|
||||
GtkFileSelection parent;
|
||||
|
||||
PreviewFileSelectionPrivate *priv;
|
||||
};
|
||||
|
||||
struct _PreviewFileSelectionClass
|
||||
{
|
||||
GtkFileSelectionClass parent_class;
|
||||
};
|
||||
|
||||
GType preview_file_selection_get_type (void);
|
||||
|
||||
GtkWidget *preview_file_selection_new (const gchar *title, gboolean do_preview);
|
||||
|
||||
void preview_file_selection_hookup_file_entry (GnomeFileEntry *entry, const gchar *title);
|
||||
|
||||
GdkPixbuf* preview_file_selection_intelligent_scale (GdkPixbuf *pixbuf, guint scale);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __PREVIEW_FILE_SELECTION_H__ */
|
||||
|
|
@ -103,7 +103,6 @@ gnome-settings-daemon/gnome-settings-xsettings.c
|
|||
gnome-settings-daemon/reaper.c
|
||||
libbackground/applier.c
|
||||
libbackground/preferences.c
|
||||
libbackground/preview-file-selection.c
|
||||
libsounds/sound-view.c
|
||||
libwindow-settings/gnome-wm-manager.c
|
||||
libwindow-settings/metacity-window-manager.c
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@ main (int argc, char *argv[])
|
|||
gint i;
|
||||
DrWright *drwright;
|
||||
DrwSelection *selection;
|
||||
GnomeClient *client;
|
||||
gboolean no_check = FALSE;
|
||||
|
||||
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
2004-02-16 Jody Goldberg <jody@gnome.org>
|
||||
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=134389
|
||||
* Makefile.am : Patch from jmmv@menta.net (Julio M. Merino Vidal)
|
||||
to honour the standard schema install flags.
|
||||
I've extended the patch to support builddir != srcdir too
|
||||
|
||||
2004-02-13 Jody Goldberg <jody@gnome.org>
|
||||
|
||||
* Release 2.5.3
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ mimeinfo_DATA = fontilus.keys fontilus.mime
|
|||
appregdir = $(datadir)/application-registry
|
||||
appreg_DATA = fontilus.applications
|
||||
|
||||
schemasdir = $(sysconfdir)/gconf/schemas
|
||||
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
|
||||
schemas_DATA = fontilus.schemas
|
||||
|
||||
serverdir = $(libdir)/bonobo/servers
|
||||
|
|
@ -42,10 +42,14 @@ server_DATA = fontilus.server
|
|||
fontilus.server.in: fontilus.server.in.in
|
||||
sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
|
||||
|
||||
if GCONF_SCHEMAS_INSTALL
|
||||
install-data-local:
|
||||
if test -z "$(DESTDIR)"; then \
|
||||
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule fontilus.schemas; \
|
||||
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/fontilus.schemas; \
|
||||
fi
|
||||
else
|
||||
install-data-local:
|
||||
endif
|
||||
|
||||
@INTLTOOL_DIRECTORY_RULE@
|
||||
@INTLTOOL_SCHEMAS_RULE@
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
2004-02-16 Jody Goldberg <jody@gnome.org>
|
||||
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=134389
|
||||
* Makefile.am : Patch from jmmv@menta.net (Julio M. Merino Vidal)
|
||||
to honour the standard schema install flags.
|
||||
I've extended the patch to support builddir != srcdir too
|
||||
|
||||
2004-02-13 Jody Goldberg <jody@gnome.org>
|
||||
|
||||
* Release 2.5.3
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ vfsmoduleconf_DATA = theme-method.conf
|
|||
vfsdirectorydir = $(datadir)/gnome/vfolders
|
||||
vfsdirectory_DATA = theme-method.directory
|
||||
|
||||
schemasdir = $(sysconfdir)/gconf/schemas
|
||||
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
|
||||
schemas_in_files = themus.schemas.in
|
||||
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
|
||||
|
||||
|
|
@ -70,10 +70,14 @@ Themus_Properties_View.server.in: Themus_Properties_View.server.in.in
|
|||
|
||||
CLEANFILES = Themus_Properties_View.server Themus_Properties_View.server.in
|
||||
|
||||
if GCONF_SCHEMAS_INSTALL
|
||||
install-data-local:
|
||||
if test -z "$(DESTDIR)"; then \
|
||||
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule themus.schemas; \
|
||||
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/themus.schemas; \
|
||||
fi
|
||||
else
|
||||
install-data-local:
|
||||
endif
|
||||
|
||||
@INTLTOOL_KEYS_RULE@
|
||||
@INTLTOOL_SERVER_RULE@
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue