dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove lots of unused variables, apparently my builds were without proper 

2008-10-30  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimptexttool.c: remove lots of unused variables,
	apparently my builds were without proper warnings for some time.
	Some formatting cleanup and code reordering.

	* app/actions/text-tool-actions.c
	* menus/text-tool-menu.xml: rename "text-tool-input-methods"
	to "text-tool-input-methods-menu".


svn path=/trunk/; revision=27482
This commit is contained in:
Michael Natterer 2008-10-30 22:18:16 +00:00 committed by Michael Natterer
parent c214f41285
commit 7ee008bc48
4 changed files with 89 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-10-30 Michael Natterer <mitch@gimp.org>
* app/tools/gimptexttool.c: remove lots of unused variables,
apparently my builds were without proper warnings for some time.
Some formatting cleanup and code reordering.
* app/actions/text-tool-actions.c
* menus/text-tool-menu.xml: rename "text-tool-input-methods"
to "text-tool-input-methods-menu".
2008-10-30 Sven Neumann <sven@gimp.org> 2008-10-30 Sven Neumann <sven@gimp.org>
* app/text/gimptextlayout.c: fixed order of includes. * app/text/gimptextlayout.c: fixed order of includes.

8
app/actions/text-tool-actions.c
View File

@ -49,6 +49,10 @@ static const GimpActionEntry text_tool_actions[] =
N_("Text Tool Menu"), NULL, NULL, NULL, N_("Text Tool Menu"), NULL, NULL, NULL,
NULL }, NULL },
{ "text-tool-input-methods-menu", NULL,
N_("Input _Methods"), NULL, NULL, NULL,
NULL },
{ "text-tool-cut", GTK_STOCK_CUT, { "text-tool-cut", GTK_STOCK_CUT,
N_("Cu_t"), NULL, NULL, N_("Cu_t"), NULL, NULL,
G_CALLBACK (text_tool_cut_cmd_callback), G_CALLBACK (text_tool_cut_cmd_callback),
@ -90,10 +94,6 @@ static const GimpActionEntry text_tool_actions[] =
N_("Text along Path"), "", N_("Text along Path"), "",
N_("Bend the text along the currently active path"), N_("Bend the text along the currently active path"),
G_CALLBACK (text_tool_text_along_path_cmd_callback), G_CALLBACK (text_tool_text_along_path_cmd_callback),
NULL },
{ "text-tool-input-methods", NULL,
N_("Input _Methods"), NULL, NULL, NULL,
NULL } NULL }
}; };

153
app/tools/gimptexttool.c
View File

@ -53,6 +53,7 @@
#include "widgets/gimphelp-ids.h" #include "widgets/gimphelp-ids.h"
#include "widgets/gimpmenufactory.h" #include "widgets/gimpmenufactory.h"
#include "widgets/gimptexteditor.h" #include "widgets/gimptexteditor.h"
#include "widgets/gimpuimanager.h"
#include "widgets/gimpviewabledialog.h" #include "widgets/gimpviewabledialog.h"
#include "display/gimpcanvas.h" #include "display/gimpcanvas.h"
@ -139,10 +140,10 @@ static void gimp_text_tool_apply (GimpTextTool *text_tool);
static void gimp_text_tool_create_layer (GimpTextTool *text_tool, static void gimp_text_tool_create_layer (GimpTextTool *text_tool,
GimpText *text); GimpText *text);
static void gimp_text_tool_canvas_editor (GimpTextTool *text_tool);
static gchar *gimp_text_tool_canvas_editor_get_text (GimpTextTool *text_tool);
static void gimp_text_tool_editor (GimpTextTool *text_tool); static void gimp_text_tool_editor (GimpTextTool *text_tool);
static void gimp_text_tool_canvas_editor (GimpTextTool *text_tool);
static gchar * gimp_text_tool_canvas_editor_get_text
(GimpTextTool *text_tool);
static void gimp_text_tool_layer_changed (GimpImage *image, static void gimp_text_tool_layer_changed (GimpImage *image,
GimpTextTool *text_tool); GimpTextTool *text_tool);
@ -152,10 +153,10 @@ static gboolean gimp_text_tool_set_drawable (GimpTextTool *text_tool,
GimpDrawable *drawable, GimpDrawable *drawable,
gboolean confirm); gboolean confirm);
static void gimp_text_tool_update_layout (GimpTextTool *text_tool); static void gimp_text_tool_update_layout (GimpTextTool *text_tool);
static void gimp_text_tool_update_proxy (GimpTextTool *text_tool); static void gimp_text_tool_update_proxy (GimpTextTool *text_tool);
static void gimp_text_tool_enter_text (GimpTextTool *text_tool, static void gimp_text_tool_enter_text (GimpTextTool *text_tool,
const gchar *str); const gchar *str);
static void gimp_text_tool_text_buffer_changed (GtkTextBuffer *text_buffer, static void gimp_text_tool_text_buffer_changed (GtkTextBuffer *text_buffer,
GimpTextTool *text_tool); GimpTextTool *text_tool);
@ -220,8 +221,6 @@ gimp_text_tool_class_init (GimpTextToolClass *klass)
object_class->set_property = gimp_rectangle_tool_set_property; object_class->set_property = gimp_rectangle_tool_set_property;
object_class->get_property = gimp_rectangle_tool_get_property; object_class->get_property = gimp_rectangle_tool_get_property;
gimp_rectangle_tool_install_properties (object_class);
tool_class->control = gimp_text_tool_control; tool_class->control = gimp_text_tool_control;
tool_class->button_press = gimp_text_tool_button_press; tool_class->button_press = gimp_text_tool_button_press;
tool_class->motion = gimp_text_tool_motion; tool_class->motion = gimp_text_tool_motion;
@ -232,6 +231,8 @@ gimp_text_tool_class_init (GimpTextToolClass *klass)
tool_class->get_popup = gimp_text_tool_get_popup; tool_class->get_popup = gimp_text_tool_get_popup;
draw_tool_class->draw = gimp_text_tool_draw; draw_tool_class->draw = gimp_text_tool_draw;
gimp_rectangle_tool_install_properties (object_class);
} }
static void static void
@ -328,7 +329,6 @@ static void
gimp_text_tool_dispose (GObject *object) gimp_text_tool_dispose (GObject *object)
{ {
GimpTextTool *text_tool = GIMP_TEXT_TOOL (object); GimpTextTool *text_tool = GIMP_TEXT_TOOL (object);
GimpTool *tool = GIMP_TOOL (object);
gimp_text_tool_set_drawable (text_tool, NULL, FALSE); gimp_text_tool_set_drawable (text_tool, NULL, FALSE);
@ -401,10 +401,9 @@ gimp_text_tool_button_press (GimpTool *tool,
GimpDisplay *display) GimpDisplay *display)
{ {
GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool); GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);
GimpRectangleTool *rect_tool = GIMP_RECTANGLE_TOOL (tool);
GimpText *text = text_tool->text; GimpText *text = text_tool->text;
GimpDrawable *drawable; GimpDrawable *drawable;
GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
GimpRectangleTool *rect_tool = GIMP_RECTANGLE_TOOL (tool);
gint x1, y1; gint x1, y1;
gint x2, y2; gint x2, y2;
@ -651,9 +650,6 @@ gimp_text_tool_motion (GimpTool *tool,
GimpDisplay *display) GimpDisplay *display)
{ {
GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool); GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);
gdouble snapped_x;
gdouble snapped_y;
gint snap_x, snap_y;
if (text_tool->text_cursor_changing) if (text_tool->text_cursor_changing)
{ {
@ -923,8 +919,6 @@ gimp_text_tool_cursor_update (GimpTool *tool,
GdkModifierType state, GdkModifierType state,
GimpDisplay *display) GimpDisplay *display)
{ {
GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);
if (tool->display == display) if (tool->display == display)
{ {
gint x1, y1; gint x1, y1;
@ -964,30 +958,6 @@ gimp_text_tool_get_popup (GimpTool *tool,
gint x1, y1; gint x1, y1;
gint x2, y2; gint x2, y2;
if (! text_tool->ui_manager)
{
GimpDialogFactory *dialog_factory;
GtkWidget *im_menu;
GtkWidget *im_menuitem;
dialog_factory = gimp_dialog_factory_from_name ("toplevel");
text_tool->ui_manager =
gimp_menu_factory_manager_new (dialog_factory->menu_factory,
"<TextTool>",
text_tool, FALSE);
im_menuitem = gtk_ui_manager_get_widget (GTK_UI_MANAGER (text_tool->ui_manager),
"/text-tool-popup/text-tool-input-methods");
im_menu = gtk_menu_new ();
gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (text_tool->im_context),
GTK_MENU_SHELL (im_menu));
gtk_menu_item_set_submenu (GTK_MENU_ITEM (im_menuitem), im_menu);
gtk_widget_show (im_menuitem);
}
g_object_get (text_tool, g_object_get (text_tool,
"x1", &x1, "x1", &x1,
"y1", &y1, "y1", &y1,
@ -998,6 +968,28 @@ gimp_text_tool_get_popup (GimpTool *tool,
if (coords->x > x1 && coords->x <= x2 && if (coords->x > x1 && coords->x <= x2 &&
coords->y > y1 && coords->y <= y2) coords->y > y1 && coords->y <= y2)
{ {
if (! text_tool->ui_manager)
{
GimpDialogFactory *dialog_factory;
GtkWidget *im_menu;
dialog_factory = gimp_dialog_factory_from_name ("toplevel");
text_tool->ui_manager =
gimp_menu_factory_manager_new (dialog_factory->menu_factory,
"<TextTool>",
text_tool, FALSE);
im_menu = gtk_ui_manager_get_widget (GTK_UI_MANAGER (text_tool->ui_manager),
"/text-tool-popup/text-tool-input-methods-menu");
if (GTK_IS_MENU_ITEM (im_menu))
im_menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (im_menu));
gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (text_tool->im_context),
GTK_MENU_SHELL (im_menu));
}
gimp_ui_manager_update (text_tool->ui_manager, text_tool); gimp_ui_manager_update (text_tool->ui_manager, text_tool);
*ui_path = "/text-tool-popup"; *ui_path = "/text-tool-popup";
@ -1012,9 +1004,7 @@ static void
gimp_text_tool_draw (GimpDrawTool *draw_tool) gimp_text_tool_draw (GimpDrawTool *draw_tool)
{ {
GimpTextTool *text_tool = GIMP_TEXT_TOOL (draw_tool); GimpTextTool *text_tool = GIMP_TEXT_TOOL (draw_tool);
GimpTool *tool = GIMP_TOOL (draw_tool);
GdkRectangle cliprect; GdkRectangle cliprect;
gint width, height;
gint x1, x2; gint x1, x2;
gint y1, y2; gint y1, y2;
GtkTextIter start; GtkTextIter start;
@ -1097,9 +1087,9 @@ gimp_text_tool_draw (GimpDrawTool *draw_tool)
} }
else else
{ {
/* If the text buffer has a selection, highlight the /* If the text buffer has a selection, highlight the selected
* selected letters*/ * letters
*/
gimp_text_tool_draw_selection (draw_tool); gimp_text_tool_draw_selection (draw_tool);
} }
@ -1152,6 +1142,7 @@ gimp_text_tool_draw_preedit (GimpDrawTool *draw_tool)
crect.x + crect.width, crect.x + crect.width,
crect.y + crect.height, crect.y + crect.height,
TRUE); TRUE);
if (i == firstline) if (i == firstline)
{ {
PangoRectangle crect2 = crect; PangoRectangle crect2 = crect;
@ -1218,10 +1209,9 @@ gimp_text_tool_draw_selection (GimpDrawTool *draw_tool)
line_iter = pango_layout_get_iter (layout); line_iter = pango_layout_get_iter (layout);
i = 0; i = 0;
/* Invert the selected letters by inverting all /* Invert the selected letters by inverting all lines containing
* lines containing selected letters, then * selected letters, then invert the unselected letters on these
* invert the unselected letters on these lines * lines a second time to make them look normal
* a second time to make them look normal
*/ */
do do
{ {
@ -1242,10 +1232,11 @@ gimp_text_tool_draw_selection (GimpDrawTool *draw_tool)
crect.x, crect.y, crect.x, crect.y,
crect.width, crect.height, crect.width, crect.height,
TRUE); TRUE);
if (i == firstline) if (i == firstline)
{ {
/* Twice invert all letters before the selection, /* Twice invert all letters before the selection, making
* making them look normal * them look normal
*/ */
PangoRectangle crect2 = crect; PangoRectangle crect2 = crect;
@ -1257,10 +1248,11 @@ gimp_text_tool_draw_selection (GimpDrawTool *draw_tool)
crect2.width, crect2.height, crect2.width, crect2.height,
TRUE); TRUE);
} }
if (i == lastline) if (i == lastline)
{ {
/* Twice invert all letters after the selection, /* Twice invert all letters after the selection, making
* making them look normal * them look normal
*/ */
PangoRectangle crect2 = crect; PangoRectangle crect2 = crect;
@ -1273,9 +1265,11 @@ gimp_text_tool_draw_selection (GimpDrawTool *draw_tool)
TRUE); TRUE);
} }
} }
i++; i++;
} }
while (pango_layout_iter_next_line (line_iter)); while (pango_layout_iter_next_line (line_iter));
pango_layout_iter_free (line_iter); pango_layout_iter_free (line_iter);
} }
@ -1301,11 +1295,10 @@ gimp_text_tool_rectangle_change_complete (GimpRectangleTool *rect_tool)
if (! text || ! text->text || (text->text[0] == 0)) if (! text || ! text->text || (text->text[0] == 0))
{ {
/* /* we can't set properties for the text layer, because it
* we can't set properties for the text layer, because * isn't created until some text has been inserted, so we
* it isn't created until some text has been inserted, * need to make a special note that will remind us what to
* so we need to make a special note that will remind * do when we actually create the layer
* us what to do when we actually create the layer
*/ */
return TRUE; return TRUE;
} }
@ -1645,8 +1638,9 @@ gimp_text_tool_apply (GimpTextTool *text_tool)
gimp_image_undo_group_end (image); gimp_image_undo_group_end (image);
} }
/* if we're doing dynamic text, we want to update the /* if we're doing dynamic text, we want to update the shape of the
* shape of the rectangle */ * rectangle
*/
if (layer->text->box_mode == GIMP_TEXT_BOX_DYNAMIC) if (layer->text->box_mode == GIMP_TEXT_BOX_DYNAMIC)
{ {
text_tool->handle_rectangle_change_complete = FALSE; text_tool->handle_rectangle_change_complete = FALSE;
@ -1753,26 +1747,10 @@ gimp_text_tool_create_layer (GimpTextTool *text_tool,
gimp_text_tool_set_drawable (text_tool, GIMP_DRAWABLE (layer), FALSE); gimp_text_tool_set_drawable (text_tool, GIMP_DRAWABLE (layer), FALSE);
} }
static void
gimp_text_tool_canvas_editor (GimpTextTool *text_tool)
{
GimpTool *tool = GIMP_TOOL (text_tool);
GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
gtk_im_context_set_client_window (text_tool->im_context,
GIMP_DISPLAY_SHELL (tool->display->shell)->canvas->window);
gtk_im_context_focus_in (text_tool->im_context);
gimp_text_tool_update_layout (text_tool);
if (options->use_editor)
gimp_text_tool_editor (text_tool);
}
static void static void
gimp_text_tool_editor (GimpTextTool *text_tool) gimp_text_tool_editor (GimpTextTool *text_tool)
{ {
GimpTool *tool = GIMP_TOOL (text_tool);
GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool); GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
GimpDialogFactory *dialog_factory; GimpDialogFactory *dialog_factory;
GtkWindow *parent = NULL; GtkWindow *parent = NULL;
@ -1785,8 +1763,8 @@ gimp_text_tool_editor (GimpTextTool *text_tool)
dialog_factory = gimp_dialog_factory_from_name ("toplevel"); dialog_factory = gimp_dialog_factory_from_name ("toplevel");
if (GIMP_TOOL (text_tool)->display) if (tool->display)
parent = GTK_WINDOW (GIMP_TOOL (text_tool)->display->shell); parent = GTK_WINDOW (tool->display->shell);
text_tool->editor = gimp_text_options_editor_new (parent, options, text_tool->editor = gimp_text_options_editor_new (parent, options,
dialog_factory->menu_factory, dialog_factory->menu_factory,
@ -1803,6 +1781,23 @@ gimp_text_tool_editor (GimpTextTool *text_tool)
gtk_widget_show (text_tool->editor); gtk_widget_show (text_tool->editor);
} }
static void
gimp_text_tool_canvas_editor (GimpTextTool *text_tool)
{
GimpTool *tool = GIMP_TOOL (text_tool);
GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
gtk_im_context_set_client_window (text_tool->im_context,
GIMP_DISPLAY_SHELL (tool->display->shell)->canvas->window);
gtk_im_context_focus_in (text_tool->im_context);
gimp_text_tool_update_layout (text_tool);
if (options->use_editor)
gimp_text_tool_editor (text_tool);
}
static gchar * static gchar *
gimp_text_tool_canvas_editor_get_text (GimpTextTool *text_tool) gimp_text_tool_canvas_editor_get_text (GimpTextTool *text_tool)
{ {

3
menus/text-tool-menu.xml
View File

@ -17,7 +17,6 @@
<menuitem action="text-tool-direction-ltr" /> <menuitem action="text-tool-direction-ltr" />
<menuitem action="text-tool-direction-rtl" /> <menuitem action="text-tool-direction-rtl" />
<separator /> <separator />
<menu action="text-tool-input-methods"> <menu action="text-tool-input-methods-menu" />
</menu>
</popup> </popup>
</ui> </ui>