diff --git a/ChangeLog b/ChangeLog index 072fb9fd30..8a8223d7f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-04-11 Michael Natterer + + * app/test_commands.c: fixed the dockable names. + + * app/tools/gimpbezierselecttool.c: applied patch from Dave Neary + which fixes some minor stuff that was forgotten to port. + + * app/widgets/gimpdockbook.c: set the tooltip of the notebook tab + also if it is a plain label. + 2001-04-11 Simon Budig * app/tools/gimppathtool.[ch] diff --git a/app/gui/test-commands.c b/app/gui/test-commands.c index 4b7bed19fe..f6fcc49f57 100644 --- a/app/gui/test-commands.c +++ b/app/gui/test-commands.c @@ -702,7 +702,9 @@ test_dock_new (GimpViewType view_type, gimp_dock_add_book (GIMP_DOCK (dock), GIMP_DOCKBOOK (dockbook), 0); - dockable = gimp_dockable_new ("Brush List", "Brushes", + dockable = gimp_dockable_new (view_type == GIMP_VIEW_TYPE_LIST ? + "Brush List" : "Brush Grid", + "Brushes", test_brush_tab_func); view = gimp_data_factory_view_new (view_type, global_brush_factory, @@ -715,7 +717,9 @@ test_dock_new (GimpViewType view_type, gimp_dock_add (GIMP_DOCK (dock), GIMP_DOCKABLE (dockable), -1, -1); - dockable = gimp_dockable_new ("Pattern List", "Patterns", + dockable = gimp_dockable_new (view_type == GIMP_VIEW_TYPE_LIST ? + "Pattern List" : "Pattern Grid", + "Patterns", test_pattern_tab_func); view = gimp_data_factory_view_new (view_type, global_pattern_factory, @@ -728,7 +732,9 @@ test_dock_new (GimpViewType view_type, gimp_dock_add (GIMP_DOCK (dock), GIMP_DOCKABLE (dockable), -1, -1); - dockable = gimp_dockable_new ("Gradient List", "Gradients", + dockable = gimp_dockable_new (view_type == GIMP_VIEW_TYPE_LIST ? + "Gradient List" : "Gradient Grid", + "Gradients", test_gradient_tab_func); view = gimp_data_factory_view_new (view_type, global_gradient_factory, @@ -741,7 +747,9 @@ test_dock_new (GimpViewType view_type, gimp_dock_add (GIMP_DOCK (dock), GIMP_DOCKABLE (dockable), -1, -1); - dockable = gimp_dockable_new ("Palette List", "Palettes", + dockable = gimp_dockable_new (view_type == GIMP_VIEW_TYPE_LIST ? + "Palette List" : "Palette Grid", + "Palettes", test_palette_tab_func); view = gimp_data_factory_view_new (view_type, global_palette_factory, diff --git a/app/test_commands.c b/app/test_commands.c index 4b7bed19fe..f6fcc49f57 100644 --- a/app/test_commands.c +++ b/app/test_commands.c @@ -702,7 +702,9 @@ test_dock_new (GimpViewType view_type, gimp_dock_add_book (GIMP_DOCK (dock), GIMP_DOCKBOOK (dockbook), 0); - dockable = gimp_dockable_new ("Brush List", "Brushes", + dockable = gimp_dockable_new (view_type == GIMP_VIEW_TYPE_LIST ? + "Brush List" : "Brush Grid", + "Brushes", test_brush_tab_func); view = gimp_data_factory_view_new (view_type, global_brush_factory, @@ -715,7 +717,9 @@ test_dock_new (GimpViewType view_type, gimp_dock_add (GIMP_DOCK (dock), GIMP_DOCKABLE (dockable), -1, -1); - dockable = gimp_dockable_new ("Pattern List", "Patterns", + dockable = gimp_dockable_new (view_type == GIMP_VIEW_TYPE_LIST ? + "Pattern List" : "Pattern Grid", + "Patterns", test_pattern_tab_func); view = gimp_data_factory_view_new (view_type, global_pattern_factory, @@ -728,7 +732,9 @@ test_dock_new (GimpViewType view_type, gimp_dock_add (GIMP_DOCK (dock), GIMP_DOCKABLE (dockable), -1, -1); - dockable = gimp_dockable_new ("Gradient List", "Gradients", + dockable = gimp_dockable_new (view_type == GIMP_VIEW_TYPE_LIST ? + "Gradient List" : "Gradient Grid", + "Gradients", test_gradient_tab_func); view = gimp_data_factory_view_new (view_type, global_gradient_factory, @@ -741,7 +747,9 @@ test_dock_new (GimpViewType view_type, gimp_dock_add (GIMP_DOCK (dock), GIMP_DOCKABLE (dockable), -1, -1); - dockable = gimp_dockable_new ("Palette List", "Palettes", + dockable = gimp_dockable_new (view_type == GIMP_VIEW_TYPE_LIST ? + "Palette List" : "Palette Grid", + "Palettes", test_palette_tab_func); view = gimp_data_factory_view_new (view_type, global_palette_factory, diff --git a/app/tools/gimpbezierselecttool.c b/app/tools/gimpbezierselecttool.c index cdb0a39d55..0110b8637a 100644 --- a/app/tools/gimpbezierselecttool.c +++ b/app/tools/gimpbezierselecttool.c @@ -355,9 +355,11 @@ static void gimp_bezier_select_tool_init (GimpBezierSelectTool *bezier_select) { GimpTool *tool; + GimpDrawTool *draw_tool; GimpSelectionTool *select_tool; tool = GIMP_TOOL (bezier_select); + draw_tool = GIMP_DRAW_TOOL (bezier_select); select_tool = GIMP_SELECTION_TOOL (bezier_select); if (! bezier_options) @@ -369,9 +371,16 @@ gimp_bezier_select_tool_init (GimpBezierSelectTool *bezier_select) (ToolOptions *) bezier_options); } + bezier_select->num_points = 0; + bezier_select->mask = NULL; + tool->tool_cursor = GIMP_BEZIER_SELECT_TOOL_CURSOR; tool->preserve = FALSE; /* Don't preserve on drawable change */ + curCore = draw_tool; + curSel = bezier_select; + curTool = tool; + bezier_select_reset (bezier_select); paths_new_bezier_select_tool (); @@ -909,7 +918,9 @@ bezier_select_load (GDisplay *gdisp, GimpBezierSelectTool *bezier_sel; /* select the bezier tool */ - gimp_context_set_tool (gimp_context_get_user (), BEZIER_SELECT); + gimp_context_set_tool (gimp_context_get_user (), + tool_manager_get_info_by_type + ( GIMP_TYPE_BEZIER_SELECT_TOOL)); tool = active_tool; tool->state = ACTIVE; tool->gdisp = gdisp; @@ -3139,7 +3150,9 @@ bezier_paste_bezierselect_to_current (GDisplay *gdisp, } } - gimp_context_set_tool (gimp_context_get_user (), BEZIER_SELECT); + gimp_context_set_tool (gimp_context_get_user (), + tool_manager_get_info_by_type + ( GIMP_TYPE_BEZIER_SELECT_TOOL)); active_tool->paused_count = 0; active_tool->gdisp = gdisp; active_tool->drawable = gimp_image_active_drawable (gdisp->gimage); diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c index c146a7136f..9d00bc8346 100644 --- a/app/widgets/gimpdockbook.c +++ b/app/widgets/gimpdockbook.c @@ -207,10 +207,8 @@ gimp_dockbook_add (GimpDockbook *dockbook, tab_widget = event_box; } - else - { - gimp_help_set_help_data (tab_widget, dockable->name, NULL); - } + + gimp_help_set_help_data (tab_widget, dockable->name, NULL); gtk_object_set_data (GTK_OBJECT (tab_widget), "gimp_dockable", dockable);