gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-08-25 02:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

finished task 1442, zoom control needs to be themable. Added code to

Browse source 
finished task 1442, zoom control needs to be themable.  Added code
	to update the control when the theme changes, and an alternate
	magnifying glass image to the eazel theme for testing.
This commit is contained in:
Andy Hertzfeld 2000-07-25 22:59:44 +00:00
parent 2cadd3ec33
commit 8c695ff9ef
4 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2000-07-25 Andy Hertzfeld <andy@eazel.com>
completed bug 1442, toolbar zoom control needs to be themable.
* src/nautilus-zoom-control.c: (nautilus_zoom_control_destroy),
(nautilus_zoom_control_initialize), (nautilus_zoom_control_new),
(nautilus_zoom_control_theme_changed):
made the zoom control connect to the theme preference and update
itself when the theme changes.
* icons/eazel/Makefile.am:
* icons/eazel/zoom_body.png:
added an alternative magnifying glass to eazel theme for testing.
It needs some clean-up, which Susan will do soon.
2000-07-25 Andy Hertzfeld <andy@eazel.com>
reorganized the menus. There's now a user level menu, which uses

1
icons/eazel/Makefile.am
View file

@ -50,6 +50,7 @@ eazel_DATA = \
i-regular-aa.png \
i-regular.xml \
theme_preview.png \
zoom_body.png \
$(NULL)
EXTRA_DIST = $(eazel_DATA)

BIN
icons/eazel/zoom_body.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

29
src/nautilus-zoom-control.c
View file

@ -40,6 +40,7 @@
#include <libnautilus-extensions/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-gtk-extensions.h>
#include <libnautilus-extensions/nautilus-glib-extensions.h>
#include <libnautilus-extensions/nautilus-global-preferences.h>
#include <libnautilus-extensions/nautilus-icon-factory.h>
#include <libnautilus-extensions/nautilus-file-utilities.h>
#include <libnautilus-extensions/nautilus-theme.h>
@ -77,6 +78,8 @@ static int nautilus_zoom_control_expose (GtkWidget *widget,
static gboolean nautilus_zoom_control_button_press_event (GtkWidget *widget,
GdkEventButton *event);
static void nautilus_zoom_control_load_images (NautilusZoomControl *zoom_control);
static void nautilus_zoom_control_unload_images (NautilusZoomControl *zoom_control);
static void nautilus_zoom_control_theme_changed (gpointer user_data);
void draw_number (GtkWidget *widget,
GdkRectangle *box);
@ -175,6 +178,13 @@ nautilus_zoom_control_destroy (GtkObject *object)
nautilus_g_list_free_deep (NAUTILUS_ZOOM_CONTROL (object)->details->preferred_zoom_levels);
NAUTILUS_ZOOM_CONTROL (object)->details->preferred_zoom_levels = NULL;
/* deallocate pixbufs */
nautilus_zoom_control_unload_images (NAUTILUS_ZOOM_CONTROL (object));
nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
nautilus_zoom_control_theme_changed,
object);
g_free (NAUTILUS_ZOOM_CONTROL (object)->details);
NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object));
@ -205,13 +215,19 @@ nautilus_zoom_control_initialize (NautilusZoomControl *zoom_control)
zoom_control->details->preferred_zoom_levels = NULL;
/* allocate the pixmap that holds the image */
nautilus_zoom_control_load_images (zoom_control);
zoom_width = get_zoom_width (zoom_control);
gtk_widget_set_usize (GTK_WIDGET (zoom_control), zoom_width, -1);
/* add a callback for when the theme changes */
nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_THEME,
nautilus_zoom_control_theme_changed,
zoom_control);
}
/* allocate a new zoom control */
GtkWidget*
nautilus_zoom_control_new ()
{
@ -219,6 +235,17 @@ nautilus_zoom_control_new ()
return GTK_WIDGET (zoom_control);
}
/* handler for handling theme changes */
static void
nautilus_zoom_control_theme_changed (gpointer user_data)
{
NautilusZoomControl *zoom_control;
zoom_control = NAUTILUS_ZOOM_CONTROL (user_data);
nautilus_zoom_control_load_images (zoom_control);
gtk_widget_queue_draw (GTK_WIDGET (zoom_control)) ;
}
/* draw the current zoom percentage */
void draw_number (GtkWidget *widget, GdkRectangle *box)
{