[gnumeric] Change rectangle object image



commit 44b12a43bab714f4be2e13c650391a56082931e5
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Tue Sep 22 02:32:07 2009 -0600

    Change rectangle object image
    
    2009-09-22  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/GNOME_Gnumeric-gtk.xml.in: remove CreateLabel
    	* src/HILDON_Gnumeric-gtk.xml.in: ditto
    	* src/wbc-gtk-actions.c: remove CreateLabel
    	* src/wbc-gtk.c: attach label image to Gnumeric_ObjectRectangle

 ChangeLog                      |    7 +++++++
 src/GNOME_Gnumeric-gtk.xml.in  |    2 --
 src/HILDON_Gnumeric-gtk.xml.in |    1 -
 src/wbc-gtk-actions.c          |    5 -----
 src/wbc-gtk.c                  |    3 +--
 5 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 85e03d9..91b4c8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-22  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/GNOME_Gnumeric-gtk.xml.in: remove CreateLabel
+	* src/HILDON_Gnumeric-gtk.xml.in: ditto
+	* src/wbc-gtk-actions.c: remove CreateLabel
+	* src/wbc-gtk.c: attach label image to Gnumeric_ObjectRectangle
+
 2009-09-21  Morten Welinder  <terra gnome org>
 
 	* src/xml-sax-write.c (gnm_xml_out_add_color,
diff --git a/src/GNOME_Gnumeric-gtk.xml.in b/src/GNOME_Gnumeric-gtk.xml.in
index 8f33cfb..1991b2f 100644
--- a/src/GNOME_Gnumeric-gtk.xml.in
+++ b/src/GNOME_Gnumeric-gtk.xml.in
@@ -327,8 +327,6 @@
     <toolitem action="FormatIncreaseIndent"/>
   </toolbar>
   <toolbar _name="ObjectToolbar">
-<!-- Functionally Equivalent to CreateRectangle
-     <toolitem action="CreateLabel"/> -->
     <toolitem action="CreateFrame"/>
 <!-- Not useful until we have scripts
     <toolitem action="CreateButton"/> -->
diff --git a/src/HILDON_Gnumeric-gtk.xml.in b/src/HILDON_Gnumeric-gtk.xml.in
index 31b8bd2..2a62b8d 100644
--- a/src/HILDON_Gnumeric-gtk.xml.in
+++ b/src/HILDON_Gnumeric-gtk.xml.in
@@ -292,7 +292,6 @@
     <toolitem action="ColorFore"/>
   </toolbar>
   <toolbar _name="ObjectToolbar">
-    <toolitem action="CreateLabel"/>
     <toolitem action="CreateFrame"/>
 <!-- Not useful until we have scripts
     <toolitem action="CreateButton"/> -->
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 417564a..8b7aca2 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -1196,8 +1196,6 @@ create_object (WBCGtk *wbcg, GType t,
 	va_end (args);
 }
 
-static GNM_ACTION_DEF (cmd_create_label)
-	{ create_object (wbcg, GNM_SO_FILLED_TYPE, "text", "", NULL); }
 static GNM_ACTION_DEF (cmd_create_frame)
 	{ create_object (wbcg, sheet_widget_frame_get_type(), NULL); }
 static GNM_ACTION_DEF (cmd_create_button)
@@ -2253,9 +2251,6 @@ static GtkActionEntry const actions[] = {
 		G_CALLBACK (cb_sort_descending) },
 
 /* Object Toolbar */
-	{ "CreateLabel", "Gnumeric_ObjectLabel", N_("Label"),
-		NULL, N_("Create a label"),
-		G_CALLBACK (cmd_create_label) },
 	{ "CreateFrame", "Gnumeric_ObjectFrame", N_("Frame"),
 		NULL, N_("Create a frame"),
 		G_CALLBACK (cmd_create_frame) },
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 5ed5a93..defe43f 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -3979,10 +3979,9 @@ wbc_gtk_setup_icons (void)
 		{ gnm_object_arrow_24,			NULL,				"Gnumeric_ObjectArrow" },
 		{ gnm_object_ellipse_24,		NULL,				"Gnumeric_ObjectEllipse" },
 		{ gnm_object_line_24,			NULL,				"Gnumeric_ObjectLine" },
-		{ gnm_object_rectangle_24,		NULL,				"Gnumeric_ObjectRectangle" },
+		{ gnm_object_label_24,		        NULL,				"Gnumeric_ObjectRectangle" },
 
 		{ gnm_object_frame_24,			NULL,				"Gnumeric_ObjectFrame" },
-		{ gnm_object_label_24,			NULL,				"Gnumeric_ObjectLabel" },
 		{ gnm_object_button_24,			NULL,				"Gnumeric_ObjectButton" },
 		{ gnm_object_checkbox_24,		NULL,				"Gnumeric_ObjectCheckbox" },
 		{ gnm_object_radiobutton_24,		NULL,				"Gnumeric_ObjectRadioButton" },



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]