diff --git a/umbrello/icon_utils.cpp b/umbrello/icon_utils.cpp index c80b14eb5..a73da685f 100644 --- a/umbrello/icon_utils.cpp +++ b/umbrello/icon_utils.cpp @@ -1,391 +1,392 @@ /* Copyright 2008 Andreas Fischer Copyright (C) 2009-2014 * Umbrello UML Modeller Authors * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License or (at your option) version 3 or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 14 of version 3 of the license. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include "icon_utils.h" #include "basictypes.h" #include "debug_utils.h" +#include "optionstate.h" #include #include namespace Icon_Utils { #define ICON_PREFIX QLatin1String(":/pics/") /** * Returns the pixmap for the given type as small icon. * @param type the identification of the icon * @return the wanted pixmap */ QPixmap SmallIcon(IconType type) { QString icon = toString(type); if (QFile::exists(ICON_PREFIX + icon + QLatin1String(".png"))) return QPixmap(ICON_PREFIX + icon); else return SmallIcon(icon); } /** * Returns the pixmap for the given type as bar icon. * @param type the identification of the icon * @return the wanted pixmap */ QPixmap BarIcon(IconType type) { QString icon = toString(type); if (QFile::exists(ICON_PREFIX + icon + QLatin1String(".png"))) return QPixmap(ICON_PREFIX + icon); else return BarIcon(icon); } /** * Returns the pixmap for the given type as main bar icon. * @param type the identification of the icon * @return the wanted pixmap */ QPixmap MainBarIcon(IconType type) { QString icon = toString(type); if (QFile::exists(ICON_PREFIX + icon + QLatin1String(".png"))) return QPixmap(ICON_PREFIX + icon); else return MainBarIcon(icon); } /** * Returns the pixmap for the given type as user icon. * @param type the identification of the icon * @return the wanted pixmap */ QPixmap UserIcon(IconType type) { QString icon = toString(type); if (QFile::exists(ICON_PREFIX + icon + QLatin1String(".png"))) return QPixmap(ICON_PREFIX + icon); else return UserIcon(icon); } /** * Returns the pixmap for the given type as desktop icon. * @param type the identification of the icon * @return the wanted icon */ QPixmap DesktopIcon(IconType type) { QString icon = toString(type); if (QFile::exists(ICON_PREFIX + icon + QLatin1String(".png"))) return QPixmap(ICON_PREFIX + icon); else return DesktopIcon(icon); } /** * Returns the pixmap for the given type as user icon. * This is used in worktoolbar to create cursors. * @param type the identification of the icon * @return the wanted cursor */ QCursor Cursor(IconType type) { // TODO: generate from a 32x32 cursor template and place requested icon into QString icon = QLatin1String("cursor-") + toString(type); if (QFile::exists(ICON_PREFIX + icon + QLatin1String(".png"))) return QCursor(QPixmap(ICON_PREFIX + icon), 9, 9); else return QCursor(UserIcon(icon), 9, 9); } /** * Return the icon corresponding to the given Diagram_Type. * @param dt the diagram type * @return the wanted icon */ QPixmap iconSet(Uml::DiagramType::Enum dt) { switch (dt) { case Uml::DiagramType::UseCase: return DesktopIcon(it_Diagram_Usecase); case Uml::DiagramType::Collaboration: return DesktopIcon(it_Diagram_Collaboration); case Uml::DiagramType::Class: return DesktopIcon(it_Diagram_Class); case Uml::DiagramType::Object: return DesktopIcon(it_Diagram_Object); case Uml::DiagramType::Sequence: return DesktopIcon(it_Diagram_Sequence); case Uml::DiagramType::State: return DesktopIcon(it_Diagram_State); case Uml::DiagramType::Activity: return DesktopIcon(it_Diagram_Activity); case Uml::DiagramType::Component: return DesktopIcon(it_Diagram_Component); case Uml::DiagramType::Deployment: return DesktopIcon(it_Diagram_Deployment); case Uml::DiagramType::EntityRelationship: return DesktopIcon(it_Diagram_EntityRelationship); default: uDebug() << "Widget_Utils::iconSet: unknown diagram type " << Uml::DiagramType::toString(dt); return QPixmap(); } } /** * Return the icon corresponding to the given Diagram_Type. * @param dt the diagram type * @return the wanted icon */ QPixmap smallIcon(Uml::DiagramType::Enum dt) { switch (dt) { case Uml::DiagramType::UseCase: return SmallIcon(it_Diagram_Usecase); case Uml::DiagramType::Collaboration: return SmallIcon(it_Diagram_Collaboration); case Uml::DiagramType::Class: return SmallIcon(it_Diagram_Class); case Uml::DiagramType::Object: return SmallIcon(it_Diagram_Object); case Uml::DiagramType::Sequence: return SmallIcon(it_Diagram_Sequence); case Uml::DiagramType::State: return SmallIcon(it_Diagram_State); case Uml::DiagramType::Activity: return SmallIcon(it_Diagram_Activity); case Uml::DiagramType::Component: return SmallIcon(it_Diagram_Component); case Uml::DiagramType::Deployment: return SmallIcon(it_Diagram_Deployment); case Uml::DiagramType::EntityRelationship: return SmallIcon(it_Diagram_EntityRelationship); default: uDebug() << "Widget_Utils::smallIcon: unknown diagram type " << Uml::DiagramType::toString(dt); return QPixmap(); } } /** * Conversion from icon type to its string name. * @param type the identification of the icon * @return the string representation of the type */ QString toString(IconType type) { switch (type) { case it_Accept_Signal: return QLatin1String("accept_signal"); case it_Accept_TimeEvent: return QLatin1String("accept_time_event"); case it_Activity: return QLatin1String("activity"); case it_Activity_End: return QLatin1String("end_state"); case it_Activity_Final: return QLatin1String("final_activity"); case it_Activity_Initial: return QLatin1String("initial_state"); case it_Activity_Transition: return QLatin1String("uniassociation"); case it_Actor: return QLatin1String("actor"); case it_Add_Point: return QLatin1String("format-add-node"); case it_Aggregation: return QLatin1String("aggregation"); case it_Align_Bottom: return QLatin1String("align-vertical-bottom"); case it_Align_HorizontalDistribute: return QLatin1String("distribute-horizontal"); case it_Align_HorizontalMiddle: return QLatin1String("align-horizontal-center"); case it_Align_Left: return QLatin1String("align-horizontal-left"); case it_Align_Right: return QLatin1String("align-horizontal-right"); case it_Align_Top: return QLatin1String("align-vertical-top"); case it_Align_VerticalDistribute: return QLatin1String("distribute-vertical"); case it_Align_VerticalMiddle: return QLatin1String("align-vertical-center"); case it_Anchor: return QLatin1String("anchor"); case it_And_Line: return QLatin1String("andline"); case it_Arrow: return QLatin1String("arrow"); case it_Arrow_Down: return QLatin1String("arrow-down"); case it_Arrow_Up: return QLatin1String("arrow-up"); case it_Artifact: return QLatin1String("artifact"); case it_Association: return QLatin1String("association"); case it_Attribute_New: return QLatin1String("CVpublic_var"); case it_Box: return QLatin1String("box"); case it_Branch: return QLatin1String("branch"); case it_Category: return QLatin1String("category"); case it_Category_Child: return QLatin1String("child2category"); case it_Category_Parent: return QLatin1String("category2parent"); case it_Change_Font: return QLatin1String("preferences-desktop-font"); case it_Check_Constraint: return QLatin1String("check_constraint"); case it_Choice_Rhomb: return QLatin1String("choice-rhomb"); case it_Choice_Round: return QLatin1String("choice-round"); case it_Class: return QLatin1String("class"); case it_ClassOrPackage: return QLatin1String("class-or-package"); case it_Clear: return QLatin1String("edit-clear"); case it_Code_Gen_Wizard: return QLatin1String("umbrello"); case it_Color_Fill: return QLatin1String("fill-color"); case it_Color_Line: return QLatin1String("draw-brush"); case it_Combined_Fragment: return QLatin1String("combined_fragment"); - case it_Component: return QLatin1String("component"); + case it_Component: return Settings::optionState().generalState.uml2 ? QLatin1String("component") : QLatin1String("component1"); case it_Composition: return QLatin1String("composition"); case it_Condition_PrePost: return QLatin1String("PrePostCondition"); case it_Constraint_Check: return QLatin1String("check_constraint"); case it_Constraint_ForeignKey: return QLatin1String("foreignkey_constraint"); case it_Constraint_PrimaryKey: return QLatin1String("primarykey_constraint"); case it_Constraint_Unique: return QLatin1String("unique_constraint"); case it_Containment: return QLatin1String("containment"); case it_Copy: return QLatin1String("edit-copy"); case it_Cut: return QLatin1String("edit-cut"); case it_Datatype: return QLatin1String("datatype"); case it_Delete: return QLatin1String("edit-delete"); case it_Delete_Point: return QLatin1String("format-remove-node"); case it_Dependency: return QLatin1String("dependency"); case it_Diagram: return QLatin1String("CVnamespace"); case it_Diagram_Activity: return QLatin1String("umbrello_diagram_activity"); case it_Diagram_Class: return QLatin1String("umbrello_diagram_class"); case it_Diagram_Collaboration: return QLatin1String("umbrello_diagram_collaboration"); case it_Diagram_Component: return QLatin1String("umbrello_diagram_component"); case it_Diagram_Deployment: return QLatin1String("umbrello_diagram_deployment"); case it_Diagram_EntityRelationship: return QLatin1String("umbrello_diagram_deployment"); case it_Diagram_Object: return QLatin1String("umbrello_diagram_object"); case it_Diagram_Sequence: return QLatin1String("umbrello_diagram_sequence"); case it_Diagram_State: return QLatin1String("umbrello_diagram_state"); case it_Diagram_Usecase: return QLatin1String("umbrello_diagram_usecase"); case it_Directional_Association: return QLatin1String("uniassociation"); case it_Document_Edit: return QLatin1String("document-edit"); case it_Duplicate: return QLatin1String("duplicate"); case it_EndState: return QLatin1String("end_state"); case it_Entity: return QLatin1String("entity"); case it_Entity_Attribute: return QLatin1String("text-x-generic"); case it_Entity_Attribute_New: return QLatin1String("text-x-generic"); case it_Enum: return QLatin1String("enum"); case it_Enum_Literal: return QLatin1String("text-x-generic"); case it_Exception: return QLatin1String("exception"); case it_Export_Files: return QLatin1String("document-export"); case it_Export_Picture: return QLatin1String("image-x-generic"); case it_Folder: return QLatin1String("folder-new"); case it_Folder_Cyan: return QLatin1String("folder"); case it_Folder_Cyan_Open: return QLatin1String("folder-open"); case it_Folder_Green: return QLatin1String("folder-green"); case it_Folder_Green_Open: return QLatin1String("folder-green"); //FIXME was folder_green_open case it_Folder_Grey: return QLatin1String("folder-grey"); case it_Folder_Grey_Open: return QLatin1String("folder-grey"); //FIXME was folder_grey_open case it_Folder_Orange: return QLatin1String("folder-orange"); case it_Folder_Orange_Open: return QLatin1String("folder-orange"); //FIXME was folder_orange_open case it_Folder_Red: return QLatin1String("folder-red"); case it_Folder_Red_Open: return QLatin1String("folder-red"); //FIXME was folder_red_open case it_Folder_Violet: return QLatin1String("folder-violet"); case it_Folder_Violet_Open: return QLatin1String("folder-violet"); //FIXME was folder_violet_open case it_ForeignKey_Constraint: return QLatin1String("foreignkey_constraint"); case it_Fork_Join: return QLatin1String("activity-fork"); case it_Fork_State: return QLatin1String("state-fork"); case it_Generalisation: return QLatin1String("generalisation"); case it_Go_Next: return QLatin1String("go-next"); case it_Go_Previous: return QLatin1String("go-previous"); case it_History_Deep: return QLatin1String("deep-history"); case it_History_Shallow: return QLatin1String("shallow-history"); case it_Home: return QLatin1String("user-home"); case it_Implementation_Attribute: return QLatin1String("CVimplementation_var"); case it_Implementation_Method: return QLatin1String("CVimplementation_meth"); case it_Implements: return QLatin1String("generalisation"); case it_Import_File: return QLatin1String("document-import"); case it_Import_Files: return QLatin1String("document-import"); case it_Import_Project: return QLatin1String("document-import"); case it_InitialState: return QLatin1String("initial_state"); case it_Instance: return QLatin1String("instance"); case it_Interface: return QLatin1String("interface"); case it_Join: return QLatin1String("join"); case it_Junction: return QLatin1String("junction"); case it_Literal_New: return QLatin1String("text-x-generic"); case it_Message_Async: return QLatin1String("umbr-message-asynchronous"); case it_Message_Asynchronous: return QLatin1String("umbr-coll-message-asynchronous"); case it_Message_Found: return QLatin1String("umbr-message-found"); case it_Message_Lost: return QLatin1String("umbr-message-lost"); case it_Message_Sync: return QLatin1String("umbr-message-synchronous"); case it_Message_Synchronous: return QLatin1String("umbr-coll-message-synchronous"); case it_New: return QLatin1String("document-new"); case it_Node: return QLatin1String("node"); case it_Note: return QLatin1String("note"); case it_Object: return QLatin1String("object"); case it_Object_Node: return QLatin1String("object_node"); case it_Operation_New: return QLatin1String("document-new"); case it_Operation_Public_New: return QLatin1String("CVpublic_meth"); case it_Package: return QLatin1String("package"); case it_Parameter_New: return QLatin1String("text-x-generic"); case it_Paste: return QLatin1String("edit-paste"); case it_Pin: return QLatin1String("pin"); case it_Port: return QLatin1String("port"); case it_Precondition: return QLatin1String("precondition"); case it_PrimaryKey_Constraint: return QLatin1String("primarykey_constraint"); case it_Private_Attribute: return QLatin1String("CVprivate_var"); case it_Private_Method: return QLatin1String("CVprivate_meth"); case it_Properties: return QLatin1String("preferences-system"); case it_Properties_Activities: return QLatin1String("text-x-generic"); case it_Properties_Associations: return QLatin1String("preferences-other"); case it_Properties_Attributes: return QLatin1String("preferences-other"); case it_Properties_AutoLayout: return QLatin1String("code-class"); case it_Properties_Class: return QLatin1String("document-properties"); case it_Properties_CodeGeneration: return QLatin1String("document-export"); case it_Properties_CodeImport: return QLatin1String("document-import"); case it_Properties_CodeViewer: return QLatin1String("package_graphics_viewer"); case it_Properties_Color: return QLatin1String("preferences-desktop-color"); case it_Properties_Columns: return QLatin1String("preferences-other"); case it_Properties_Contents: return QLatin1String("preferences-other"); case it_Properties_Display: return QLatin1String("preferences-desktop-theme"); case it_Properties_EntityAttributes: return QLatin1String("preferences-other"); case it_Properties_EntityConstraints: return QLatin1String("preferences-other"); case it_Properties_EnumLiterals: return QLatin1String("preferences-other"); case it_Properties_Font: return QLatin1String("preferences-desktop-font"); case it_Properties_General: return QLatin1String("preferences-other"); case it_Properties_Operations: return QLatin1String("preferences-other"); case it_Properties_Roles: return QLatin1String("preferences-other"); case it_Properties_Templates: return QLatin1String("preferences-other"); case it_Properties_UserInterface: return QLatin1String("preferences-desktop-theme"); case it_Protected_Attribute: return QLatin1String("CVprotected_var"); case it_Protected_Method: return QLatin1String("CVprotected_meth"); case it_Public_Attribute: return QLatin1String("CVpublic_var"); case it_Public_Method: return QLatin1String("CVpublic_meth"); case it_Redo: return QLatin1String("edit-redo"); case it_Refactor: return QLatin1String("refactor"); case it_Region: return QLatin1String("region"); case it_Relationship: return QLatin1String("relationship"); case it_Remove: return QLatin1String("remove"); case it_Rename: return QLatin1String("edit-rename"); case it_Send_Signal: return QLatin1String("send_signal"); case it_Show: return QLatin1String("document-preview"); case it_State: return QLatin1String("state"); case it_State_Activity: return QLatin1String("text-x-generic"); case it_State_Transition: return QLatin1String("uniassociation"); case it_Subsystem: return QLatin1String("subsystem"); case it_Tab_Close: return QLatin1String("tab-close"); case it_Tab_New: return QLatin1String("tab-new"); case it_Template: return QLatin1String("template"); case it_Template_Class: return QLatin1String("format-justify-fill"); case it_Template_Interface: return QLatin1String("text-x-generic-template"); case it_Template_New: return QLatin1String("text-x-generic-template"); case it_Text: return QLatin1String("text"); case it_Undo: return QLatin1String("edit-undo"); case it_UndoView: return QLatin1String("document-save"); case it_Uniassociation: return QLatin1String("uniassociation"); case it_Unique_Constraint: return QLatin1String("unique_constraint"); case it_UseCase: return QLatin1String("usecase"); case it_View_Code: return QLatin1String("text-x-generic"); case it_Zoom_100: return QLatin1String("zoom-original"); case it_Zoom_Slider: return QLatin1String("zoom-original"); default: return QString(); } } } // namespace diff --git a/umbrello/icons.qrc b/umbrello/icons.qrc index 04d1847e0..f4f52b1cf 100644 --- a/umbrello/icons.qrc +++ b/umbrello/icons.qrc @@ -1,176 +1,178 @@ pics/accept_signal.png pics/accept_time_event.png pics/activity-fork.png pics/actor.png pics/aggregation.png pics/align-horizontal-center.png pics/align-horizontal-left.png pics/align-horizontal-right.png pics/align-vertical-bottom.png pics/align-vertical-center.png pics/align-vertical-top.png pics/anchor.png pics/andline.png pics/arrow.png pics/artifact.png pics/association.png pics/box.png pics/branch.png pics/category2parent.png pics/category.png pics/check_constraint.png pics/child2category.png pics/choice-rhomb.png pics/choice-round.png pics/class-or-package.png pics/class.png pics/combined_fragment.png pics/component.png pics/composition.png pics/containment.png pics/cursor-accept_signal.png pics/cursor-accept_time_event.png pics/cursor-activity-fork.png pics/cursor-actor.png pics/cursor-aggregation.png pics/cursor-anchor.png pics/cursor-andline.png pics/cursor-artifact.png pics/cursor-association.png pics/cursor-box.png pics/cursor-branch.png pics/cursor-category2parent.png pics/cursor-category.png pics/cursor-child2category.png pics/cursor-choice-rhomb.png pics/cursor-choice-round.png pics/cursor-class.png pics/cursor-combined_fragment.png pics/cursor-component.png pics/cursor-composition.png pics/cursor-containment.png pics/cursor-datatype.png pics/cursor-deep-history.png pics/cursor-dependency.png pics/cursor-end_state.png pics/cursor-entity.png pics/cursor-enum.png pics/cursor-exception.png pics/cursor-final_activity.png pics/cursor-generalisation.png pics/cursor-initial_state.png pics/cursor-instance.png pics/cursor-interface.png pics/cursor-join.png pics/cursor-junction.png pics/cursor-node.png pics/cursor-note.png pics/cursor-object_node.png pics/cursor-object.png pics/cursor-package.png pics/cursor-pin.png pics/cursor-precondition.png pics/cursor-PrePostCondition.png pics/cursor-region.png pics/cursor-relationship.png pics/cursor-send_signal.png pics/cursor-shallow-history.png pics/cursor-state-fork.png pics/cursor-text.png pics/cursor-umbr-coll-message-asynchronous.png pics/cursor-umbr-coll-message-synchronous.png pics/cursor-umbr-message-asynchronous.png pics/cursor-umbr-message-found.png pics/cursor-umbr-message-lost.png pics/cursor-umbr-message-synchronous.png pics/cursor-uniassociation.png pics/cursor-usecase.png pics/CVglobal_meth.png pics/CVglobal_var.png pics/CVimplementation_meth.png pics/CVimplementation_signal.png pics/CVimplementation_slot.png pics/CVimplementation_var.png pics/CVprivate_meth.png pics/CVprivate_signal.png pics/CVprivate_slot.png pics/CVprivate_var.png pics/CVprotected_meth.png pics/CVprotected_signal.png pics/CVprotected_slot.png pics/CVprotected_var.png pics/CVpublic_meth.png pics/CVpublic_signal.png pics/CVpublic_slot.png pics/CVpublic_var.png pics/CVstruct.png pics/datatype.png pics/deep-history.png pics/dependency.png pics/distribute-horizontal.png pics/distribute-vertical.png pics/end_state.png pics/entity.png pics/enum.png pics/exception.png pics/final_activity.png pics/foreignkey_constraint.png pics/generalisation.png pics/global/128-apps-umbrello.png pics/global/16-apps-umbrello.png pics/global/16-mimetypes-application-x-uml.png pics/global/22-apps-umbrello.png pics/global/32-apps-umbrello.png pics/global/32-mimetypes-application-x-uml.png pics/global/48-apps-umbrello.png pics/global/64-apps-umbrello.png pics/hi22-actions-umbrello_diagram_activity.png pics/hi22-actions-umbrello_diagram_class.png pics/hi22-actions-umbrello_diagram_collaboration.png pics/hi22-actions-umbrello_diagram_component.png pics/hi22-actions-umbrello_diagram_deployment.png pics/diag_object.png pics/hi22-actions-umbrello_diagram_sequence.png pics/hi22-actions-umbrello_diagram_state.png pics/hi22-actions-umbrello_diagram_usecase.png pics/initial_state.png pics/instance.png pics/interface.png pics/join.png pics/junction.png pics/node.png pics/note.png pics/object_node.png pics/object.png pics/package.png pics/pin.png pics/port.png pics/precondition.png pics/PrePostCondition.png pics/primarykey_constraint.png pics/realization.png pics/refactor.png pics/region.png pics/relationship.png pics/send_signal.png pics/shallow-history.png pics/startlogo.png pics/state-fork.png pics/subsystem.png pics/template.png pics/text.png pics/umbr-coll-message-asynchronous.png pics/umbr-coll-message-synchronous.png pics/umbr-message-asynchronous.png pics/umbr-message-found.png pics/umbr-message-lost.png pics/umbr-message-synchronous.png pics/uniassociation.png pics/unique_constraint.png pics/usecase.png pics/state.png pics/cursor-state.png + pics/component1.png + pics/cursor-component1.png diff --git a/umbrello/pics/CMakeLists.txt b/umbrello/pics/CMakeLists.txt index def94e16a..19615f886 100644 --- a/umbrello/pics/CMakeLists.txt +++ b/umbrello/pics/CMakeLists.txt @@ -1,179 +1,181 @@ add_subdirectory(global) set(ICONS accept_signal accept_time_event activity activity-fork actor aggregation align-horizontal-center align-horizontal-left align-horizontal-right align-vertical-bottom align-vertical-center align-vertical-top anchor andline arrow artifact association box branch category category2parent check_constraint child2category choice-rhomb choice-round class class-or-package combined_fragment component + component1 composition containment CVglobal_meth CVglobal_var CVimplementation_meth CVimplementation_signal CVimplementation_slot CVimplementation_var CVnamespace CVprivate_meth CVprivate_signal CVprivate_slot CVprivate_var CVprotected_meth CVprotected_signal CVprotected_slot CVprotected_var CVpublic_meth CVpublic_signal CVpublic_slot CVpublic_var CVstruct datatype deep-history dependency #unused #diag_activity #diagbase #diag_class #diag_collaboration #diag_component #diag_deployment #diag_entityrelationship #diag_sequence #diag_state diag_object #diag_usecase distribute-horizontal distribute-vertical end_state entity enum foreignkey_constraint generalisation initial_state instance interface join junction node note object package port primarykey_constraint realization refactor relationship send_signal shallow-history state state-fork subsystem template text umbr-coll-message-asynchronous umbr-coll-message-synchronous umbr-message-asynchronous umbr-message-synchronous uniassociation unique_constraint usecase ) set(CURSOR_ICONS accept_signal accept_time_event activity activity-fork actor aggregation anchor andline artifact association box branch category2parent category child2category choice-rhomb choice-round class combined_fragment component + component1 composition containment datatype deep-history dependency end_state entity enum exception final_activity generalisation initial_state instance interface join junction node note object_node object package pin precondition PrePostCondition region relationship send_signal shallow-history state state-fork text umbr-coll-message-asynchronous umbr-coll-message-synchronous umbr-message-asynchronous umbr-message-found umbr-message-lost umbr-message-synchronous uniassociation usecase ) if(BUILD_ICONS) generate_icons("${ICONS}" 22) # for visual inspecting #generate_icons("${ICONS}" 128) endif() if(BUILD_CURSOR_ICONS) generate_cursor_icons("${CURSOR_ICONS}" 32) endif() diff --git a/umbrello/pics/component.png b/umbrello/pics/component.png index 0946ac452..b9fc7c891 100644 Binary files a/umbrello/pics/component.png and b/umbrello/pics/component.png differ diff --git a/umbrello/pics/component.png b/umbrello/pics/component1.png similarity index 87% copy from umbrello/pics/component.png copy to umbrello/pics/component1.png index 0946ac452..3863a6530 100644 Binary files a/umbrello/pics/component.png and b/umbrello/pics/component1.png differ diff --git a/umbrello/pics/cursor-component.png b/umbrello/pics/cursor-component.png index 1ca6bc76d..61aac2b20 100644 Binary files a/umbrello/pics/cursor-component.png and b/umbrello/pics/cursor-component.png differ diff --git a/umbrello/pics/cursor-component.png b/umbrello/pics/cursor-component1.png similarity index 86% copy from umbrello/pics/cursor-component.png copy to umbrello/pics/cursor-component1.png index 1ca6bc76d..1bb002b12 100644 Binary files a/umbrello/pics/cursor-component.png and b/umbrello/pics/cursor-component1.png differ diff --git a/umbrello/pics/sources/component.svg b/umbrello/pics/sources/component.svg index 514cc7659..3f1d4f1df 100644 --- a/umbrello/pics/sources/component.svg +++ b/umbrello/pics/sources/component.svg @@ -1,123 +1,220 @@ - + + version="1.1"> + + + + image/svg+xml + + + + + + + + + inkscape:window-x="1680" + inkscape:window-y="0" + showgrid="true" + inkscape:window-maximized="1" + inkscape:current-layer="svg1"> + + + width="26.22858411" + height="18.73091698" + x="0.68923926" + y="4.44105864" /> - - - + width="24.968206" + height="17.499308" + ry="0" + x="1.3317506" + y="5.064446" /> + x="175.11363" + y="-1.7772827" /> + + + + + + + + diff --git a/umbrello/pics/sources/component.svg b/umbrello/pics/sources/component1.svg similarity index 100% copy from umbrello/pics/sources/component.svg copy to umbrello/pics/sources/component1.svg