From c266171128d52d049755bd21d7d2999a5bcc0e8b Mon Sep 17 00:00:00 2001 From: joncruz Date: Sat, 18 Apr 2009 21:52:05 +0000 Subject: [PATCH] Added code to deal with changed icon names. Fixes bug #360964 --- src/widgets/icon.cpp | 259 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 255 insertions(+), 4 deletions(-) diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index 60cc40a74..f51a53bff 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -229,7 +229,9 @@ static GdkPixbuf* renderup( gchar const* name, Inkscape::IconSize lsize, unsigne if (!pb) { pb = sp_icon_image_load_svg( name, Inkscape::getRegisteredIconSize(lsize), psize ); if (!pb && (legacyNames.find(name) != legacyNames.end())) { - g_message("Checking fallback [%s]->[%s]", name, legacyNames[name].c_str()); + if ( Inkscape::Preferences::get()->getBool("/debug/icons/dumpSvg") ) { + g_message("Checking fallback [%s]->[%s]", name, legacyNames[name].c_str()); + } pb = sp_icon_image_load_svg( legacyNames[name].c_str(), Inkscape::getRegisteredIconSize(lsize), psize ); } @@ -279,9 +281,258 @@ static Glib::ustring icon_cache_key(gchar const *name, unsigned lsize, unsigned static GdkPixbuf *get_cached_pixbuf(Glib::ustring const &key); static void setupLegacyNaming() { - legacyNames["view-fullscreen"] = "fullscreen"; - legacyNames["edit-select-all"] = "selection_select_all"; - legacyNames["window-new"] = "view_new"; + legacyNames["document-import"] ="file_import"; + legacyNames["document-export"] ="file_export"; + legacyNames["document-import-ocal"] ="ocal_import"; + legacyNames["document-export-ocal"] ="ocal_export"; + legacyNames["document-metadata"] ="document_metadata"; + legacyNames["dialog-input-devices"] ="input_devices"; + legacyNames["edit-duplicate"] ="edit_duplicate"; + legacyNames["edit-clone"] ="edit_clone"; + legacyNames["edit-clone-unlink"] ="edit_unlink_clone"; + legacyNames["edit-select-original"] ="edit_select_original"; + legacyNames["edit-undo-history"] ="edit_undo_history"; + legacyNames["edit-paste-in-place"] ="selection_paste_in_place"; + legacyNames["edit-paste-style"] ="selection_paste_style"; + legacyNames["selection-make-bitmap-copy"] ="selection_bitmap"; + legacyNames["edit-select-all"] ="selection_select_all"; + legacyNames["edit-select-all-layers"] ="selection_select_all_in_all_layers"; + legacyNames["edit-select-invert"] ="selection_invert"; + legacyNames["edit-select-none"] ="selection_deselect"; + legacyNames["dialog-xml-editor"] ="xml_editor"; + legacyNames["zoom-original"] ="zoom_1_to_1"; + legacyNames["zoom-half-size"] ="zoom_1_to_2"; + legacyNames["zoom-double-size"] ="zoom_2_to_1"; + legacyNames["zoom-fit-selection"] ="zoom_select"; + legacyNames["zoom-fit-drawing"] ="zoom_draw"; + legacyNames["zoom-fit-page"] ="zoom_page"; + legacyNames["zoom-fit-width"] ="zoom_pagewidth"; + legacyNames["zoom-previous"] ="zoom_previous"; + legacyNames["zoom-next"] ="zoom_next"; + legacyNames["zoom-in"] ="zoom_in"; + legacyNames["zoom-out"] ="zoom_out"; + legacyNames["show-grid"] ="grid"; + legacyNames["show-guides"] ="guides"; + legacyNames["color-management"] ="color_management"; + legacyNames["show-dialogs"] ="dialog_toggle"; + legacyNames["dialog-messages"] ="messages"; + legacyNames["dialog-scripts"] ="scripts"; + legacyNames["window-previous"] ="window_previous"; + legacyNames["window-next"] ="window_next"; + legacyNames["dialog-icon-preview"] ="view_icon_preview"; + legacyNames["window-new"] ="view_new"; + legacyNames["view-fullscreen"] ="fullscreen"; + legacyNames["layer-new"] ="new_layer"; + legacyNames["layer-rename"] ="rename_layer"; + legacyNames["layer-previous"] ="switch_to_layer_above"; + legacyNames["layer-next"] ="switch_to_layer_below"; + legacyNames["selection-move-to-layer-above"] ="move_selection_above"; + legacyNames["selection-move-to-layer-below"] ="move_selection_below"; + legacyNames["layer-raise"] ="raise_layer"; + legacyNames["layer-lower"] ="lower_layer"; + legacyNames["layer-top"] ="layer_to_top"; + legacyNames["layer-bottom"] ="layer_to_bottom"; + legacyNames["layer-delete"] ="delete_layer"; + legacyNames["dialog-layers"] ="layers"; + legacyNames["dialog-fill-and-stroke"] ="fill_and_stroke"; + legacyNames["dialog-object-properties"] ="dialog_item_properties"; + legacyNames["object-group"] ="selection_group"; + legacyNames["object-ungroup"] ="selection_ungroup"; + legacyNames["selection-raise"] ="selection_up"; + legacyNames["selection-lower"] ="selection_down"; + legacyNames["selection-top"] ="selection_top"; + legacyNames["selection-bottom"] ="selection_bot"; + legacyNames["object-rotate-left"] ="object_rotate_90_CCW"; + legacyNames["object-rotate-right"] ="object_rotate_90_CW"; + legacyNames["object-flip-horizontal"] ="object_flip_hor"; + legacyNames["object-flip-vertical"] ="object_flip_ver"; + legacyNames["dialog-transform"] ="object_trans"; + legacyNames["dialog-align-and-distribute"] ="object_align"; + legacyNames["dialog-rows-and-columns"] ="grid_arrange"; + legacyNames["object-to-path"] ="object_tocurve"; + legacyNames["stroke-to-path"] ="stroke_tocurve"; + legacyNames["bitmap-trace"] ="selection_trace"; + legacyNames["path-union"] ="union"; + legacyNames["path-difference"] ="difference"; + legacyNames["path-intersection"] ="intersection"; + legacyNames["path-exclusion"] ="exclusion"; + legacyNames["path-division"] ="division"; + legacyNames["path-cut"] ="cut_path"; + legacyNames["path-combine"] ="selection_combine"; + legacyNames["path-break-apart"] ="selection_break"; + legacyNames["path-outset"] ="outset_path"; + legacyNames["path-inset"] ="inset_path"; + legacyNames["path-offset-dynamic"] ="dynamic_offset"; + legacyNames["path-offset-linked"] ="linked_offset"; + legacyNames["path-simplify"] ="simplify"; + legacyNames["path-reverse"] ="selection_reverse"; + legacyNames["dialog-text-and-font"] ="object_font"; + legacyNames["text-put-on-path"] ="put_on_path"; + legacyNames["text-remove-from-path"] ="remove_from_path"; + legacyNames["text-flow-into-frame"] ="flow_into_frame"; + legacyNames["text-unflow"] ="unflow"; + legacyNames["text-convert-to-regular"] ="convert_to_text"; + legacyNames["text-unkern"] ="remove_manual_kerns"; + legacyNames["help-keyboard-shortcuts"] ="help_keys"; + legacyNames["help-contents"] ="help_tutorials"; + legacyNames["inkscape"] ="inkscape_options"; + legacyNames["dialog-memory"] ="about_memory"; + legacyNames["tool-pointer"] ="draw_select"; + legacyNames["tool-node-editor"] ="draw_node"; + legacyNames["tool-tweak"] ="draw_tweak"; + legacyNames["zoom"] ="draw_zoom"; + legacyNames["draw-rectangle"] ="draw_rect"; + legacyNames["draw-cuboid"] ="draw_3dbox"; + legacyNames["draw-ellipse"] ="draw_arc"; + legacyNames["draw-polygon-star"] ="draw_star"; + legacyNames["draw-spiral"] ="draw_spiral"; + legacyNames["draw-freehand"] ="draw_freehand"; + legacyNames["draw-path"] ="draw_pen"; + legacyNames["draw-calligraphic"] ="draw_calligraphic"; + legacyNames["draw-eraser"] ="draw_erase"; + legacyNames["color-fill"] ="draw_paintbucket"; + legacyNames["draw-text"] ="draw_text"; + legacyNames["draw-connector"] ="draw_connector"; + legacyNames["color-gradient"] ="draw_gradient"; + legacyNames["color-picker"] ="draw_dropper"; + legacyNames["transform-affect-stroke"] ="transform_stroke"; + legacyNames["transform-affect-rounded-corners"] ="transform_corners"; + legacyNames["transform-affect-gradient"] ="transform_gradient"; + legacyNames["transform-affect-pattern"] ="transform_pattern"; + legacyNames["node-add"] ="node_insert"; + legacyNames["node-delete"] ="node_delete"; + legacyNames["node-join"] ="node_join"; + legacyNames["node-break"] ="node_break"; + legacyNames["node-join-segment"] ="node_join_segment"; + legacyNames["node-delete-segment"] ="node_delete_segment"; + legacyNames["node-type-cusp"] ="node_cusp"; + legacyNames["node-type-smooth"] ="node_smooth"; + legacyNames["node-type-symmetric"] ="node_symmetric"; + legacyNames["node-type-auto-smooth"] ="node_auto"; + legacyNames["node-segment-curve"] ="node_curve"; + legacyNames["node-segment-line"] ="node_line"; + legacyNames["show-node-handles"] ="nodes_show_handles"; + legacyNames["path-effect-parameter-next"] ="edit_next_parameter"; + legacyNames["show-path-outline"] ="nodes_show_helperpath"; + legacyNames["path-clip-edit"] ="nodeedit-clippath"; + legacyNames["path-mask-edit"] ="nodeedit-mask"; + legacyNames["node-type-cusp"] ="node_cusp"; + legacyNames["object-tweak-push"] ="tweak_move_mode"; + legacyNames["object-tweak-attract"] ="tweak_move_mode_inout"; + legacyNames["object-tweak-randomize"] ="tweak_move_mode_jitter"; + legacyNames["object-tweak-shrink"] ="tweak_scale_mode"; + legacyNames["object-tweak-rotate"] ="tweak_rotate_mode"; + legacyNames["object-tweak-duplicate"] ="tweak_moreless_mode"; + legacyNames["object-tweak-push"] ="tweak_move_mode"; + legacyNames["path-tweak-push"] ="tweak_push_mode"; + legacyNames["path-tweak-shrink"] ="tweak_shrink_mode"; + legacyNames["path-tweak-attract"] ="tweak_attract_mode"; + legacyNames["path-tweak-roughen"] ="tweak_roughen_mode"; + legacyNames["object-tweak-paint"] ="tweak_colorpaint_mode"; + legacyNames["object-tweak-jitter-color"] ="tweak_colorjitter_mode"; + legacyNames["object-tweak-blur"] ="tweak_blur_mode"; + legacyNames["rectangle-make-corners-sharp"] ="squared_corner"; + legacyNames["perspective-parallel"] ="toggle_vp_x"; + legacyNames["draw-ellipse-whole"] ="reset_circle"; + legacyNames["draw-ellipse-segment"] ="circle_closed_arc"; + legacyNames["draw-ellipse-arc"] ="circle_open_arc"; + legacyNames["draw-polygon"] ="star_flat"; + legacyNames["draw-star"] ="star_angled"; + legacyNames["path-mode-bezier"] ="bezier_mode"; + legacyNames["path-mode-spiro"] ="spiro_splines_mode"; + legacyNames["path-mode-polyline"] ="polylines_mode"; + legacyNames["path-mode-polyline-paraxial"] ="paraxial_lines_mode"; + legacyNames["draw-use-tilt"] ="guse_tilt"; + legacyNames["draw-use-pressure"] ="guse_pressure"; + legacyNames["draw-trace-background"] ="trace_background"; + legacyNames["draw-eraser-delete-objects"] ="delete_object"; + legacyNames["format-text-direction-vertical"] ="writing_mode_tb"; + legacyNames["format-text-direction-horizontal"] ="writing_mode_lr"; + legacyNames["connector-avoid"] ="connector_avoid"; + legacyNames["connector-ignore"] ="connector_ignore"; + legacyNames["object-fill"] ="controls_fill"; + legacyNames["object-stroke"] ="controls_stroke"; + legacyNames["snap"] ="toggle_snap_global"; + legacyNames["snap-bounding-box"] ="toggle_snap_bbox"; + legacyNames["snap-bounding-box-edges"] ="toggle_snap_to_bbox_path"; + legacyNames["snap-bounding-box-corners"] ="toggle_snap_to_bbox_node"; + legacyNames["snap-bounding-box-midpoints"] ="toggle_snap_to_bbox_edge_midpoints"; + legacyNames["snap-bounding-box-center"] ="toggle_snap_to_bbox_midpoints"; + legacyNames["snap-nodes"] ="toggle_snap_nodes"; + legacyNames["snap-nodes-path"] ="toggle_snap_to_paths"; + legacyNames["snap-nodes-cusp"] ="toggle_snap_to_nodes"; + legacyNames["snap-nodes-smooth"] ="toggle_snap_to_smooth_nodes"; + legacyNames["snap-nodes-midpoint"] ="toggle_snap_to_midpoints"; + legacyNames["snap-nodes-intersection"] ="toggle_snap_to_path_intersections"; + legacyNames["snap-nodes-center"] ="toggle_snap_to_bbox_midpoints-3"; + legacyNames["snap-nodes-rotation-center"] ="toggle_snap_center"; + legacyNames["snap-page"] ="toggle_snap_page_border"; + legacyNames["snap-grid-guide-intersections"] ="toggle_snap_grid_guide_intersections"; + legacyNames["align-horizontal-right-to-anchor"] ="al_left_out"; + legacyNames["align-horizontal-left"] ="al_left_in"; + legacyNames["align-horizontal-center"] ="al_center_hor"; + legacyNames["align-horizontal-right"] ="al_right_in"; + legacyNames["align-horizontal-left-to-anchor"] ="al_right_out"; + legacyNames["align-horizontal-baseline"] ="al_baselines_vert"; + legacyNames["align-vertical-bottom-to-anchor"] ="al_top_out"; + legacyNames["align-vertical-top"] ="al_top_in"; + legacyNames["align-vertical-center"] ="al_center_ver"; + legacyNames["align-vertical-bottom"] ="al_bottom_in"; + legacyNames["align-vertical-top-to-anchor"] ="al_bottom_out"; + legacyNames["align-vertical-baseline"] ="al_baselines_hor"; + legacyNames["distribute-horizontal-left"] ="distribute_left"; + legacyNames["distribute-horizontal-center"] ="distribute_hcentre"; + legacyNames["distribute-horizontal-right"] ="distribute_right"; + legacyNames["distribute-horizontal-baseline"] ="distribute_baselines_hor"; + legacyNames["distribute-vertical-bottom"] ="distribute_bottom"; + legacyNames["distribute-vertical-center"] ="distribute_vcentre"; + legacyNames["distribute-vertical-top"] ="distribute_top"; + legacyNames["distribute-vertical-baseline"] ="distribute_baselines_vert"; + legacyNames["distribute-randomize"] ="distribute_randomize"; + legacyNames["distribute-unclump"] ="unclump"; + legacyNames["distribute-graph"] ="graph_layout"; + legacyNames["distribute-graph-directed"] ="directed_graph"; + legacyNames["distribute-remove-overlaps"] ="remove_overlaps"; + legacyNames["align-horizontal-node"] ="node_valign"; + legacyNames["align-vertical-node"] ="node_halign"; + legacyNames["distribute-vertical-node"] ="node_vdistribute"; + legacyNames["distribute-horizontal-node"] ="node_hdistribute"; + legacyNames["xml-element-new"] ="add_xml_element_node"; + legacyNames["xml-text-new"] ="add_xml_text_node"; + legacyNames["xml-node-delete"] ="delete_xml_node"; + legacyNames["xml-node-duplicate"] ="duplicate_xml_node"; + legacyNames["xml-attribute-delete"] ="delete_xml_attribute"; + legacyNames["transform-move-horizontal"] ="arrows_hor"; + legacyNames["transform-move-vertical"] ="arrows_ver"; + legacyNames["transform-scale-horizontal"] ="transform_scale_hor"; + legacyNames["transform-scale-vertical"] ="transform_scale_ver"; + legacyNames["transform-skew-horizontal"] ="transform_scew_hor"; + legacyNames["transform-skew-vertical"] ="transform_scew_ver"; + legacyNames["object-fill"] ="properties_fill"; + legacyNames["object-stroke"] ="properties_stroke_paint"; + legacyNames["object-stroke-style"] ="properties_stroke"; + legacyNames["paint-none"] ="fill_none"; + legacyNames["paint-solid"] ="fill_solid"; + legacyNames["paint-gradient-linear"] ="fill_gradient"; + legacyNames["paint-gradient-radial"] ="fill_radial"; + legacyNames["paint-pattern"] ="fill_pattern"; + legacyNames["paint-unknown"] ="fill_unset"; + legacyNames["fill-rule-even-odd"] ="fillrule_evenodd"; + legacyNames["fill-rule-nonzero"] ="fillrule_nonzero"; + legacyNames["stroke-join-miter"] ="join_miter"; + legacyNames["stroke-join-bevel"] ="join_bevel"; + legacyNames["stroke-join-round"] ="join_round"; + legacyNames["stroke-cap-butt"] ="cap_butt"; + legacyNames["stroke-cap-square"] ="cap_square"; + legacyNames["stroke-cap-round"] ="cap_round"; + legacyNames["guides"] ="guide"; + legacyNames["grid-rectangular"] ="grid_xy"; + legacyNames["grid-axonometric"] ="grid_axonom"; + legacyNames["object-visible"] ="visible"; + legacyNames["object-hidden"] ="hidden"; + legacyNames["object-unlocked"] ="lock_unlocked"; + legacyNames["object-locked"] ="width_height_lock"; + legacyNames["zoom"] ="sticky_zoom"; } static GtkWidget * -- 2.30.2