Commit 2ec91abf authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg
Browse files

merge in the new object icons from jimmac. ditto. ditto. ditto.

2002-01-30  Jody Goldberg <jody@gnome.org>

	* src/application.c : merge in the new object icons from jimmac.
	* src/pixmaps/Makefile.am : ditto.
	* src/workbook-control-gui.c : ditto.
	* src/GNOME_Gnumeric.xml : ditto.
	s/^/Object/
	s/Rect/Rectangle/
	s/Oval/Ellipse/
	s/Checkbutton/Checkbox/

	* src/gui-util.c (gnumeric_error_info_dialog_show) : center error
	  dialog on the mouse.
parent be2d5528
2002-01-30 Jody Goldberg <jody@gnome.org>
* src/application.c : merge in the new object icons from jimmac.
* src/pixmaps/Makefile.am : ditto.
* src/workbook-control-gui.c : ditto.
* src/GNOME_Gnumeric.xml : ditto.
s/^/Object/
s/Rect/Rectangle/
s/Oval/Ellipse/
s/Checkbutton/Checkbox/
* src/gui-util.c (gnumeric_error_info_dialog_show) : center error
dialog on the mouse.
2002-01-29 Jody Goldberg <jody@gnome.org>
* src/workbook-control-gui.c (cb_notebook_switch_page) : fix changing
......
2002-01-30 Jody Goldberg <jody@gnome.org>
* src/application.c : merge in the new object icons from jimmac.
* src/pixmaps/Makefile.am : ditto.
* src/workbook-control-gui.c : ditto.
* src/GNOME_Gnumeric.xml : ditto.
s/^/Object/
s/Rect/Rectangle/
s/Oval/Ellipse/
s/Checkbutton/Checkbox/
* src/gui-util.c (gnumeric_error_info_dialog_show) : center error
dialog on the mouse.
2002-01-29 Jody Goldberg <jody@gnome.org>
* src/workbook-control-gui.c (cb_notebook_switch_page) : fix changing
......
2002-01-30 Jody Goldberg <jody@gnome.org>
* src/application.c : merge in the new object icons from jimmac.
* src/pixmaps/Makefile.am : ditto.
* src/workbook-control-gui.c : ditto.
* src/GNOME_Gnumeric.xml : ditto.
s/^/Object/
s/Rect/Rectangle/
s/Oval/Ellipse/
s/Checkbutton/Checkbox/
* src/gui-util.c (gnumeric_error_info_dialog_show) : center error
dialog on the mouse.
2002-01-29 Jody Goldberg <jody@gnome.org>
* src/workbook-control-gui.c (cb_notebook_switch_page) : fix changing
......
......@@ -852,68 +852,68 @@
homogeneous="0" look="icon" relief="none" verb="ObjectToolbar">
<toolitem name="Label"
pixtype="stock" pixname="Gnumeric_Label"
pixtype="stock" pixname="Gnumeric_ObjectLabel"
look="icon"
_label="Label"
_tip="Create a label" verb="CreateLabel"/>
<toolitem name="Frame"
pixtype="stock" pixname="Gnumeric_Frame"
pixtype="stock" pixname="Gnumeric_ObjectFrame"
_label="Frame"
_tip="Create a frame" verb="CreateFrame"/>
<!-- Not useful until we have scripts
<toolitem name="Button"
pixtype="stock" pixname="Gnumeric_Button"
pixtype="stock" pixname="Gnumeric_ObjectButton"
_label="Button"
_tip="Create a button" verb="CreateButton"/>
-->
<toolitem name="Scrollbar"
pixtype="stock" pixname="Gnumeric_Scrollbar"
pixtype="stock" pixname="Gnumeric_ObjectScrollbar"
_label="Scrollbar"
_tip="Create a scrollbar" verb="CreateScrollbar"/>
<toolitem name="Checkbox"
pixtype="stock" pixname="Gnumeric_Checkbutton"
pixtype="stock" pixname="Gnumeric_ObjectCheckbox"
_label="Checkbox"
_tip="Create a checkbox" verb="CreateCheckbox"/>
<!-- think about how to handle groups
<toolitem name="Radiobutton"
pixtype="stock" pixname="Gnumeric_Radiobutton"
pixtype="stock" pixname="Gnumeric_ObjectRadiobutton"
_label="Radio Button"
_tip="Create a radio button" verb="CreateRadiobutton"/>
<toolitem name="List"
pixtype="stock" pixname="Gnumeric_List"
pixtype="stock" pixname="Gnumeric_ObjectList"
_label="List"
_tip="Create a list" verb="CreateList"/>
<toolitem name="Combo"
pixtype="stock" pixname="Gnumeric_Combo"
pixtype="stock" pixname="Gnumeric_ObjectCombo"
_label="Combo Box"
_tip="Create a combo box" verb="CreateCombo"/>
-->
<toolitem name="Line"
pixtype="stock" pixname="Gnumeric_Line"
pixtype="stock" pixname="Gnumeric_ObjectLine"
_label="Line"
_tip="Create a line" verb="CreateLine"/>
<toolitem name="Arrow"
pixtype="stock" pixname="Gnumeric_Arrow"
pixtype="stock" pixname="Gnumeric_ObjectArrow"
_label="Arrow"
_tip="Create an arrow" verb="CreateArrow"/>
<toolitem name="Rectangle"
pixtype="stock" pixname="Gnumeric_Rectangle"
pixtype="stock" pixname="Gnumeric_ObjectRectangle"
_label="Rectangle"
_tip="Draw a rectangle" verb="CreateRectangle"/>
<toolitem name="Oval"
pixtype="stock" pixname="Gnumeric_Oval"
_label="Oval"
_tip="Draw an oval" verb="CreateEllipse"/>
<toolitem name="Ellipse"
pixtype="stock" pixname="Gnumeric_ObjectEllipse"
_label="Ellipse"
_tip="Draw an ellipse" verb="CreateEllipse"/>
</dockitem>
<keybindings>
......
......@@ -125,19 +125,19 @@ application_init (void)
{ gnm_bucket, NULL, "Gnumeric_Bucket" },
{ gnm_font, NULL, "Gnumeric_Font" },
{ gnm_arrow, NULL, "Gnumeric_Arrow" },
{ gnm_line, NULL, "Gnumeric_Line" },
{ gnm_oval, NULL, "Gnumeric_Oval" },
{ gnm_rect, NULL, "Gnumeric_Rectangle" },
{ gnm_button, NULL, "Gnumeric_Button" },
{ gnm_checkbutton, NULL, "Gnumeric_Checkbutton" },
{ gnm_combo, NULL, "Gnumeric_Combo" },
{ gnm_frame, NULL, "Gnumeric_Frame" },
{ gnm_label, NULL, "Gnumeric_Label" },
{ gnm_list, NULL, "Gnumeric_List" },
{ gnm_radiobutton, NULL, "Gnumeric_Radiobutton" },
{ gnm_vscrollbar, NULL, "Gnumeric_Scrollbar" },
{ gnm_object_arrow, NULL, "Gnumeric_ObjectArrow" },
{ gnm_object_ellipse, NULL, "Gnumeric_ObjectEllipse" },
{ gnm_object_line, NULL, "Gnumeric_ObjectLine" },
{ gnm_object_rectangle, NULL, "Gnumeric_ObjectRectangle" },
{ gnm_object_button, NULL, "Gnumeric_ObjectButton" },
{ gnm_object_checkbox, NULL, "Gnumeric_ObjectCheckbox" },
{ gnm_object_combo, NULL, "Gnumeric_ObjectCombo" },
{ gnm_object_frame, NULL, "Gnumeric_ObjectFrame" },
{ gnm_object_label, NULL, "Gnumeric_ObjectLabel" },
{ gnm_object_list, NULL, "Gnumeric_ObjectList" },
{ gnm_object_radiobutton, NULL, "Gnumeric_ObjectRadiobutton" },
{ gnm_object_scrollbar, NULL, "Gnumeric_ObjectScrollbar" },
};
unsigned i = 0;
GtkIconFactory *factory = gtk_icon_factory_new ();
......
......@@ -368,6 +368,11 @@ gnumeric_error_info_dialog_show (WorkbookControlGUI *wbcg, ErrorInfo *error)
gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
#warning FIXME : not needed when set_transient is finished
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
gnumeric_set_transient (wbcg, GTK_WINDOW (dialog));
if (gnumeric_dialog_run (wbcg, GTK_DIALOG (dialog)) == GNUMERIC_RESPONSE_DETAILS)
gnumeric_error_info_dialog_show_full (wbcg, error);
}
......
......@@ -39,19 +39,20 @@ IMAGES = @STRIP_BEGIN@ \
bucket.xpm \
font.xpm \
\
arrow.xpm \
line.xpm \
oval.xpm \
rect.xpm \
object-arrow.png \
object-ellipse.png \
object-line.png \
object-rectangle.png \
\
button.xpm \
checkbutton.xpm \
object-checkbox.png \
combo.xpm \
frame.xpm \
label.xpm \
object-frame.png \
object-label.png \
list.xpm \
radiobutton.xpm \
vscrollbar.xpm \
object-scrollbar.png \
\
@STRIP_END@
VARIABLES = @STRIP_BEGIN@ \
......@@ -115,19 +116,19 @@ VARIABLES = @STRIP_BEGIN@ \
gnm_bucket $(srcdir)/bucket.xpm \
gnm_font $(srcdir)/font.xpm \
\
gnm_arrow $(srcdir)/arrow.xpm \
gnm_line $(srcdir)/line.xpm \
gnm_oval $(srcdir)/oval.xpm \
gnm_rect $(srcdir)/rect.xpm \
\
gnm_button $(srcdir)/button.xpm \
gnm_checkbutton $(srcdir)/checkbutton.xpm \
gnm_combo $(srcdir)/combo.xpm \
gnm_frame $(srcdir)/frame.xpm \
gnm_label $(srcdir)/label.xpm \
gnm_list $(srcdir)/list.xpm \
gnm_radiobutton $(srcdir)/radiobutton.xpm \
gnm_vscrollbar $(srcdir)/vscrollbar.xpm \
gnm_object_arrow $(srcdir)/object-arrow.png \
gnm_object_ellipse $(srcdir)/object-ellipse.png \
gnm_object_line $(srcdir)/object-line.png \
gnm_object_rectangle $(srcdir)/object-rectangle.png \
\
gnm_object_button $(srcdir)/button.xpm \
gnm_object_checkbox $(srcdir)/object-checkbox.png \
gnm_object_combo $(srcdir)/combo.xpm \
gnm_object_frame $(srcdir)/object-frame.png \
gnm_object_label $(srcdir)/object-label.png \
gnm_object_list $(srcdir)/list.xpm \
gnm_object_radiobutton $(srcdir)/radiobutton.xpm \
gnm_object_scrollbar $(srcdir)/object-scrollbar.png \
@STRIP_END@
pixbuf_file = $(srcdir)/gnumeric-stock-pixbufs.h
......
......@@ -128,46 +128,46 @@ cmd_create_ellipse (GtkWidget *widget, WorkbookControlGUI *wbcg)
static GnomeUIInfo workbook_object_toolbar [] = {
GNOMEUIINFO_ITEM_STOCK (
N_("Label"), N_("Creates a label"),
&cmd_create_label, "Gnumeric_Label"),
&cmd_create_label, "Gnumeric_ObjectLabel"),
GNOMEUIINFO_ITEM_STOCK (
N_("Frame"), N_("Creates a frame"),
&cmd_create_frame, "Gnumeric_Frame"),
&cmd_create_frame, "Gnumeric_ObjectFrame"),
#if 0
/* not useful until we have scripts */
GNOMEUIINFO_ITEM_STOCK (
N_("Button"), N_("Creates a button"),
&cmd_create_button, "Gnumeric_Button"),
&cmd_create_button, "Gnumeric_ObjectButton"),
#endif
GNOMEUIINFO_ITEM_STOCK (
N_("Scrollbar"), N_("Creates a scrollbar"),
&cmd_create_scrollbar, "Gnumeric_Scrollbar"),
&cmd_create_scrollbar, "Gnumeric_ObjectScrollbar"),
GNOMEUIINFO_ITEM_STOCK (
N_("Checkbox"), N_("Creates a checkbox"),
&cmd_create_checkbox, "Gnumeric_Checkbutton"),
&cmd_create_checkbox, "Gnumeric_ObjectCheckbox"),
#if 0
/* need to think about how to manage groups */
GNOMEUIINFO_ITEM_STOCK (
N_("RadioButton"), N_("Creates a radio button"),
&cmd_create_radiobutton, "Gnumeric_Radiobutton"),
&cmd_create_radiobutton, "Gnumeric_ObjectRadiobutton"),
#endif
GNOMEUIINFO_ITEM_STOCK (
N_("List"), N_("Creates a list"),
&cmd_create_list, "Gnumeric_List"),
&cmd_create_list, "Gnumeric_ObjectList"),
GNOMEUIINFO_ITEM_STOCK (
N_("Combo"), N_("Creates a combo box"),
&cmd_create_combo, "Gnumeric_Combo"),
&cmd_create_combo, "Gnumeric_ObjectCombo"),
GNOMEUIINFO_ITEM_STOCK (
N_("Line"), N_("Creates a line object"),
cmd_create_line, "Gnumeric_Line"),
cmd_create_line, "Gnumeric_ObjectLine"),
GNOMEUIINFO_ITEM_STOCK (
N_("Arrow"), N_("Creates an arrow object"),
cmd_create_arrow, "Gnumeric_Arrow"),
cmd_create_arrow, "Gnumeric_ObjectArrow"),
GNOMEUIINFO_ITEM_STOCK (
N_("Rectangle"), N_("Creates a rectangle object"),
cmd_create_rectangle, "Gnumeric_Rectangle"),
cmd_create_rectangle, "Gnumeric_ObjectRectangle"),
GNOMEUIINFO_ITEM_STOCK (
N_("Ellipse"), N_("Creates an ellipse object"),
cmd_create_ellipse, "Gnumeric_Oval"),
cmd_create_ellipse, "Gnumeric_ObjectEllipse"),
GNOMEUIINFO_END
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment