applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move the patch into cvs for the release

Browse source 
2004-06-01  Jody Goldberg <jody@gnome.org>

	* control-center.c (relayout_canvas) : minor layout tweaks
	  and improved padding
This commit is contained in:
Jody Goldberg 2004-06-01 13:01:59 +00:00 • committed by Jody Goldberg
parent 80f10aac09
commit 3c41dec01c
3 changed files with 70 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
control-center/ChangeLog
View file

@ -1,3 +1,8 @@
2004-06-01 Jody Goldberg <jody@gnome.org>
* control-center.c (relayout_canvas) : minor layout tweaks
and improved padding
2004-05-27 Jody Goldberg <jody@gnome.org> 2004-05-27 Jody Goldberg <jody@gnome.org>
* gnomecc-rounded-rect.c : new canvas item to match nautilus. * gnomecc-rounded-rect.c : new canvas item to match nautilus.

9
control-center/control-center.c
View file

@ -360,7 +360,7 @@ start_again :
category_vert_pos); category_vert_pos);
ei->height = height; ei->height = height;
gnome_canvas_item_set (ei->selection, gnome_canvas_item_set (ei->selection,
"x2", (double) ei->width, "x2", (double) ei->width + 2 * PAD,
"y2", (double) ei->text_height, "y2", (double) ei->text_height,
NULL); NULL);
gnome_canvas_item_set (ei->cover, gnome_canvas_item_set (ei->cover,
@ -375,7 +375,7 @@ start_again :
"clip_height", (double) ei->height, "clip_height", (double) ei->height,
NULL); NULL);
gnome_canvas_item_move_absolute (ei->selection, 0, max_icon_height); gnome_canvas_item_move_absolute (ei->selection, -PAD, max_icon_height);
if (ei->text) /* text is centered by pango */ if (ei->text) /* text is centered by pango */
gnome_canvas_item_move_absolute (ei->text, gnome_canvas_item_move_absolute (ei->text,
0, max_icon_height); 0, max_icon_height);
@ -810,14 +810,11 @@ set_style (ControlCenter *cc, gboolean font_changed)
for (j = 0; j < cc->info->categories[i]->count; j++) { for (j = 0; j < cc->info->categories[i]->count; j++) {
ControlCenterEntry *entry = cc->info->categories[i]->entries[j]; ControlCenterEntry *entry = cc->info->categories[i]->entries[j];
EntryInfo *entryinfo = entry->user_data; EntryInfo *entryinfo = entry->user_data;
g_object_set (entryinfo->selection,
"fill_color_gdk", &widget->style->base[GTK_STATE_SELECTED],
NULL);
if (font_changed && entryinfo->text) if (font_changed && entryinfo->text)
g_object_set (entryinfo->text, g_object_set (entryinfo->text,
"font", NULL, "font", NULL,
NULL); NULL);
setup_entry (entry); /* Sets ei->text color */ setup_entry (entry);
} }
} }
if (font_changed) if (font_changed)

62
control-center/ximian-shell.patch Normal file
View file

@ -0,0 +1,62 @@
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-control-center/control-center/Makefile.am,v
retrieving revision 1.46
diff -u -w -r1.46 Makefile.am
--- Makefile.am 7 May 2003 18:55:08 -0000 1.46
+++ Makefile.am 1 Jun 2004 13:00:15 -0000
@@ -10,6 +10,11 @@
sys_DATA = $(sys_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
+serverdir = $(libdir)/bonobo/servers
+server_in_files = GNOME_ControlCenter.server.in
+server_DATA = $(server_in_files:.server.in=.server)
+@INTLTOOL_SERVER_RULE@
+
uidir = $(datadir)/gnome-2.0/ui
ui_DATA = gnomecc-ui.xml
@@ -20,18 +25,34 @@
-DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \
-DART_DIR=\""$(splashdir)"\" \
-DGNOME_SBINDIR=\""$(sbindir)"\" \
- $(GNOMECC_CFLAGS)
+ $(GNOMECC_CFLAGS) $(NAUTILUS_CFLAGS)
bin_PROGRAMS = gnome-control-center
gnome_control_center_SOURCES = \
- main.c \
- capplet-dir.c capplet-dir.h \
- capplet-dir-view.c capplet-dir-view.h \
- capplet-dir-view-list.c
+ control-center-categories.c \
+ control-center-categories.h \
+ control-center.c \
+ gnomecc-rounded-rect.c \
+ gnomecc-rounded-rect.h \
+ gnomecc-event-box.c \
+ gnomecc-event-box.h
+
+gnome_control_center_LDADD = $(GNOMECC_LIBS) $(NAUTILUS_LIBS)
+
+IMAGES = text-selection-frame.png
+VARIABLES = \
+ gnomecc_rounded_rect_frame $(srcdir)/text-selection-frame.png
+
+pixbuf_file = $(top_builddir)/control-center/gnomecc-rounded-rect-pixbuf.h
+pixbuf_file = gnomecc-rounded-rect-pixbuf.h
+noinst_DATA = $(pixbuf_file)
-gnome_control_center_LDADD = $(GNOMECC_LIBS)
+$(pixbuf_file) : $(IMAGES)
+ $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) > $@
-EXTRA_DIST = gnomecc.desktop.in $(splash_DATA) $(ui_DATA)
+EXTRA_DIST = gnomecc.desktop.in $(splash_DATA) $(ui_DATA) $(server_DATA) \
+ $(IMAGES)
-CLEANFILES = gnomecc.desktop
+BUILT_SOURCES = $(pixbuf_file)
+CLEANFILES = gnomecc.desktop $(noinst_DATA)