diff --git a/krita/plugins/formats/ora/CMakeLists.txt b/krita/plugins/formats/ora/CMakeLists.txt index 76af35699e9..2d8c573191b 100644 --- a/krita/plugins/formats/ora/CMakeLists.txt +++ b/krita/plugins/formats/ora/CMakeLists.txt @@ -1,47 +1,47 @@ -include_directories( ${KRITA_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/ui/openrastertk ${CMAKE_SOURCE_DIR}/krita/image/metadata) +include_directories( ${KRITA_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/ui/ora ${CMAKE_SOURCE_DIR}/krita/image/metadata) set(libkritaconverter_LIB_SRCS ora_converter.cc ora_load_context.cc ora_save_context.cc ) set(kritaoraimport_PART_SRCS ora_import.cc ${libkritaconverter_LIB_SRCS} ) kde4_add_plugin(kritaoraimport ${kritaoraimport_PART_SRCS}) target_link_libraries(kritaoraimport kritaui ) install(TARGETS kritaoraimport DESTINATION ${PLUGIN_INSTALL_DIR}) ########### next target ############### set(kritaoraexport_PART_SRCS ora_export.cc ${libkritaconverter_LIB_SRCS} ) kde4_add_plugin(kritaoraexport ${kritaoraexport_PART_SRCS}) target_link_libraries(kritaoraexport kritaui ) install(TARGETS kritaoraexport DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES krita_ora_import.desktop krita_ora_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install( PROGRAMS krita_ora.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) if(SHOULD_BUILD_EXTRA_THUMBNAIL) install( FILES krita_ora_thumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR}) endif(SHOULD_BUILD_EXTRA_THUMBNAIL) install(FILES krita_ora.xml DESTINATION ${XDG_MIME_INSTALL_DIR}) update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR}) diff --git a/krita/ui/CMakeLists.txt b/krita/ui/CMakeLists.txt index 1713af6bd82..78a61c6a8e7 100644 --- a/krita/ui/CMakeLists.txt +++ b/krita/ui/CMakeLists.txt @@ -1,360 +1,360 @@ add_definitions(${KDE4_ENABLE_EXCEPTIONS}) include_directories( ${KOTEXT_INCLUDES} ${TEXTLAYOUT_INCLUDES} ${CMAKE_SOURCE_DIR}/libs/pigment/colorprofiles ${CMAKE_CURRENT_SOURCE_DIR}/flake ${CMAKE_CURRENT_SOURCE_DIR}/pigment/resources ${CMAKE_CURRENT_SOURCE_DIR}/widgets/resources - ${CMAKE_CURRENT_SOURCE_DIR}/openrastertk + ${CMAKE_CURRENT_SOURCE_DIR}/ora ${CMAKE_SOURCE_DIR}/krita/image/metadata ${EXIV2_INCLUDE_DIR} ) add_subdirectory( tests ) configure_file(config-processor.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-processor.h ) include(kdefx.cmake) set(kritaui_LIB_SRCS canvas/kis_canvas_widget_base.cpp canvas/kis_canvas2.cpp canvas/kis_canvas_controller.cpp canvas/kis_display_filter.cpp canvas/kis_tool_proxy.cpp canvas/kis_canvas_decoration.cc canvas/kis_coordinates_converter.cpp canvas/kis_grid_manager.cpp canvas/kis_grid_painter_configuration.cpp canvas/kis_perspective_grid_manager.cpp canvas/kis_prescaled_projection.cpp canvas/kis_qpainter_canvas.cpp canvas/kis_projection_backend.cpp canvas/kis_update_info.cpp canvas/kis_image_patch.cpp canvas/kis_image_pyramid.cpp canvas/kis_infinity_manager.cpp dialogs/kis_dlg_adj_layer_props.cc dialogs/kis_dlg_adjustment_layer.cc dialogs/kis_dlg_filter.cpp dialogs/kis_dlg_generator_layer.cpp dialogs/kis_dlg_file_layer.cpp dialogs/kis_dlg_image_properties.cc dialogs/kis_dlg_layer_properties.cc dialogs/kis_dlg_preferences.cc dialogs/kis_dlg_blacklist_cleanup.cpp flake/kis_node_dummies_graph.cpp flake/kis_dummies_facade_base.cpp flake/kis_dummies_facade.cpp flake/kis_node_shapes_graph.cpp flake/kis_node_shape.cpp flake/kis_shape_controller.cpp flake/kis_shape_layer.cc flake/kis_shape_layer_canvas.cpp flake/kis_shape_selection.cpp flake/kis_shape_selection_canvas.cpp flake/kis_shape_selection_model.cpp flake/kis_take_all_shapes_command.cpp kis_autogradient.cc kis_autogradient_resource.cc kis_bookmarked_configurations_editor.cc kis_bookmarked_configurations_model.cc kis_bookmarked_filter_configurations_model.cc kis_canvas_resource_provider.cpp kis_categorized_item_delegate.cpp kis_clipboard.cc kis_config.cc kis_config_notifier.cpp kis_color_data_list.cpp kis_control_frame.cpp kis_composite_ops_model.cc kis_paint_ops_model.cpp kis_cursor.cc kis_custom_pattern.cc kis_doc2.cc kis_part2.cpp kis_factory2.cc kis_file_layer.cpp kis_filter_manager.cc kis_filters_model.cc kis_flipbook.cpp kis_flipbook_item.cpp kis_histogram_view.cc kis_image_manager.cc kis_image_view_converter.cpp kis_import_catcher.cc kis_layer_manager.cc kis_mask_manager.cc kis_mimedata.cpp kis_node_commands_adapter.cpp kis_node_manager.cpp kis_node_model.cpp kis_model_index_converter_base.cpp kis_model_index_converter.cpp kis_model_index_converter_show_all.cpp kis_painting_assistant.cc kis_painting_assistants_manager.cc kis_paintop_box.cc kis_palette_manager.cpp kis_popup_palette.cpp kis_png_converter.cpp kis_preference_set_registry.cpp kis_print_job.cpp kis_resource_server_provider.cpp kis_selection_decoration.cc kis_selection_manager.cc kis_statusbar.cc kis_view2.cpp kis_zoom_manager.cc ko_favorite_resource_manager.cpp kis_workspace_resource.cpp kis_mirror_visitor.cpp kis_action.cpp kis_action_manager.cpp kis_view_plugin.cpp kisexiv2/kis_exif_io.cpp kisexiv2/kis_exiv2.cpp kisexiv2/kis_iptc_io.cpp kisexiv2/kis_xmp_io.cpp kra/kis_kra_utils.cpp kra/kis_kra_load_visitor.cpp kra/kis_kra_loader.cpp kra/kis_kra_save_visitor.cpp kra/kis_kra_saver.cpp kra/kis_kra_savexml_visitor.cpp opengl/kis_opengl.cpp opengl/kis_opengl_canvas2.cpp opengl/kis_opengl_image_textures.cpp opengl/kis_texture_tile.cpp - openrastertk/kis_open_raster_stack_load_visitor.cpp - openrastertk/kis_open_raster_stack_save_visitor.cpp + ora/kis_open_raster_stack_load_visitor.cpp + ora/kis_open_raster_stack_save_visitor.cpp recorder/kis_node_query_path_editor.cc recorder/kis_recorded_action_creator.cc recorder/kis_recorded_action_creator_factory.cc recorder/kis_recorded_action_creator_factory_registry.cc recorder/kis_recorded_action_editor_factory.cc recorder/kis_recorded_action_editor_factory_registry.cc recorder/kis_recorded_filter_action_editor.cc recorder/kis_recorded_filter_action_creator.cpp recorder/kis_recorded_paint_action_editor.cc tool/kis_selection_tool_helper.cpp tool/kis_selection_tool_config_widget_helper.cpp tool/kis_shape_tool_helper.cpp tool/kis_tool.cc tool/kis_tool_freehand.cc tool/kis_painting_information_builder.cpp tool/kis_tool_freehand_helper.cpp tool/kis_tool_multihand_helper.cpp tool/kis_figure_painting_tool_helper.cpp tool/kis_recording_adapter.cpp tool/kis_tool_paint.cc tool/kis_tool_shape.cc tool/kis_tool_select_base.cpp tool/kis_tool_ellipse_base.cpp tool/kis_tool_rectangle_base.cpp tool/kis_tool_polyline_base.cpp tool/kis_color_picker_utils.cpp tool/kis_resources_snapshot.cpp tool/kis_smoothing_options.cpp tool/strokes/freehand_stroke.cpp tool/strokes/kis_painter_based_stroke_strategy.cpp tool/strokes/kis_filter_stroke_strategy.cpp widgets/KisFlipbookSelector.cpp widgets/kis_channelflags_widget.cpp widgets/kis_cmb_composite.cc widgets/kis_paintop_list_widget.cpp widgets/kis_cmb_idlist.cc widgets/kis_color_space_selector.cc widgets/kis_curve_widget.cpp widgets/kis_custom_image_widget.cc widgets/kis_image_from_clipboard_widget.cpp widgets/kis_double_widget.cc widgets/kis_filter_selector_widget.cc widgets/kis_gradient_chooser.cc widgets/kis_gradient_slider_widget.cc widgets/kis_gradient_slider.cpp widgets/kis_iconwidget.cc widgets/kis_mask_widgets.cpp widgets/kis_meta_data_merge_strategy_chooser_widget.cc widgets/kis_multi_bool_filter_widget.cc widgets/kis_multi_double_filter_widget.cc widgets/kis_multi_integer_filter_widget.cc widgets/kis_multipliers_double_slider_spinbox.cpp widgets/kis_paintop_presets_popup.cpp widgets/kis_paintop_presets_chooser_popup.cpp widgets/kis_pattern_chooser.cc widgets/kis_popup_button.cc widgets/kis_preset_chooser.cpp widgets/kis_progress_widget.cpp widgets/kis_selection_options.cc widgets/kis_scratch_pad.cpp widgets/kis_scratch_pad_event_filter.cpp widgets/kis_preset_selector_strip.cpp widgets/kis_tree_view_popup.cc widgets/kis_slider_spin_box.cpp widgets/kis_wdg_generator.cpp widgets/kis_workspace_chooser.cpp widgets/squeezedcombobox.cpp widgets/kis_categorized_list_view.cpp widgets/kis_widget_chooser.cpp widgets/kis_tool_button.cpp widgets/kis_floating_message.cpp input/kis_input_manager.cpp input/kis_abstract_input_action.cpp input/kis_tool_invocation_action.cpp input/kis_pan_action.cpp input/kis_alternate_invocation_action.cpp input/kis_rotate_canvas_action.cpp input/kis_zoom_action.cpp input/kis_show_palette_action.cpp input/kis_change_primary_setting_action.cpp input/kis_abstract_shortcut.cpp input/kis_single_action_shortcut.cpp input/kis_stroke_shortcut.cpp input/kis_shortcut_matcher.cpp operations/kis_operation.cpp operations/kis_operation_configuration.cpp operations/kis_operation_registry.cpp operations/kis_operation_ui_factory.cpp operations/kis_operation_ui_widget.cpp operations/kis_filter_selection_operation.cpp actions/kis_selection_action_factories.cpp kis_document_undo_store.cpp kis_transaction_based_command.cpp ) if(HAVE_OPENGL) if(HAVE_GLEW) set(kritaui_LIB_SRCS ${kritaui_LIB_SRCS} opengl/kis_opengl_shader.cpp opengl/kis_opengl_fragment_shader.cpp opengl/kis_opengl_vertex_shader.cpp opengl/kis_opengl_program.cpp opengl/kis_opengl_gradient_program.cpp ) endif(HAVE_GLEW) set(kritaui_LIB_SRCS ${kritaui_LIB_SRCS} kis_3d_object_model.cpp ) endif(HAVE_OPENGL) add_definitions(${KDE4_ENABLE_EXCEPTIONS}) kde4_add_ui_files(kritaui_LIB_SRCS forms/wdgfullscreensettings.ui forms/wdgautogradient.ui forms/wdggeneralsettings.ui forms/wdgperformancesettings.ui forms/wdggridsettings.ui forms/wdggenerators.ui forms/wdgcustompalette.ui forms/wdgbookmarkedconfigurationseditor.ui forms/wdgapplyprofile.ui forms/wdgcustompattern.ui forms/wdglayerproperties.ui forms/wdgcolorsettings.ui forms/wdgtabletsettings.ui forms/wdgcolorspaceselector.ui forms/wdgdisplaysettings.ui forms/kis_previewwidgetbase.ui forms/kis_matrix_widget.ui forms/wdgselectionoptions.ui forms/wdgshapeoptions.ui forms/wdgnewimage.ui forms/wdgimageproperties.ui forms/wdgmaskfromselection.ui forms/wdgmasksource.ui forms/wdgfilterdialog.ui forms/wdgmetadatamergestrategychooser.ui forms/wdgpaintoppresets.ui forms/wdgpaintopsettings.ui forms/wdgdlggeneratorlayer.ui forms/wdgdlgfilelayer.ui forms/wdgfilterselector.ui forms/wdgfilternodecreation.ui forms/wdgpaintactioneditor.ui forms/wdgmultipliersdoublesliderspinbox.ui forms/wdgnodequerypatheditor.ui forms/wdgpresetselectorstrip.ui forms/wdgdlgblacklistcleanup.ui forms/wdgflipbookselector.ui ) kde4_add_library(kritaui SHARED ${kritaui_LIB_SRCS} ) target_link_libraries(kritaui ${X11_X11_LIB}) target_link_libraries(kritaui ${GLEW_LIBRARIES}) if(GHNS) target_link_libraries(kritaui ${KDE4_KFILE_LIBRARY} kritaimage komain kowidgets kowidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES} ${KDE4_KNEWSTUFF3_LIBS}) else(GHNS) target_link_libraries(kritaui ${KDE4_KFILE_LIBRARY} kritaimage komain kowidgets kowidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES}) endif (GHNS) if(HAVE_OPENGL) target_link_libraries(kritaui ${OPENGL_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${OPENEXR_LIBRARIES}) # activate workaround for the VSync disable # TODO: port this to Glew when Glew 1.7 will become a mandatory dep if(NOT WIN32) target_link_libraries(kritaui ${CMAKE_DL_LIBS}) endif(NOT WIN32) set (GL_INTERFACE_LIBRARIES ";${OPENGL_LIBRARIES};${QT_QTOPENGL_LIBRARY}") if(HAVE_GLEW) target_link_libraries(kritaui ${GLEW_LIBRARIES}) endif(HAVE_GLEW) endif(HAVE_OPENGL) target_link_libraries(kritaui LINK_INTERFACE_LIBRARIES kritaimage komain ${GL_INTERFACE_LIBRARIES} ) set_target_properties(kritaui PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} ) install(TARGETS kritaui ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### install( FILES canvas/kis_canvas2.h canvas/kis_canvas_decoration.h canvas/kis_coordinates_converter.h tool/kis_tool.h kis_cursor.h kis_view2.h kis_ui_types.h # kis_cmb_composite.h # kis_cmb_idlist.h # kis_color_cup.h # kis_config.h # kis_double_click_event.h # kis_double_widget.h # kis_filter_manager.h # kis_gradient_chooser.h # kis_gradient_slider_widget.h # kis_histogram_view.h # kis_icon_item.h # kis_iconwidget.h # kis_itemchooser.h # kis_label_zoom.h # kis_move_event.h widgets/kis_multi_bool_filter_widget.h widgets/kis_multi_double_filter_widget.h widgets/kis_multi_integer_filter_widget.h # kis_paintop_box.h # kis_previewwidget.h # kis_tool_non_paint.h # kis_tool_paint.h # kis_tool_freehand.h # kis_tool_dummy.h # kis_tool_manager.h # kis_tool_types.h # KoInputDevice.h # canvas/kis_perspective_grid_manager.h DESTINATION ${INCLUDE_INSTALL_DIR}) diff --git a/krita/ui/openrastertk/kis_open_raster_load_context.h b/krita/ui/ora/kis_open_raster_load_context.h similarity index 100% rename from krita/ui/openrastertk/kis_open_raster_load_context.h rename to krita/ui/ora/kis_open_raster_load_context.h diff --git a/krita/ui/openrastertk/kis_open_raster_save_context.h b/krita/ui/ora/kis_open_raster_save_context.h similarity index 100% rename from krita/ui/openrastertk/kis_open_raster_save_context.h rename to krita/ui/ora/kis_open_raster_save_context.h diff --git a/krita/ui/openrastertk/kis_open_raster_stack_load_visitor.cpp b/krita/ui/ora/kis_open_raster_stack_load_visitor.cpp similarity index 100% rename from krita/ui/openrastertk/kis_open_raster_stack_load_visitor.cpp rename to krita/ui/ora/kis_open_raster_stack_load_visitor.cpp diff --git a/krita/ui/openrastertk/kis_open_raster_stack_load_visitor.h b/krita/ui/ora/kis_open_raster_stack_load_visitor.h similarity index 100% rename from krita/ui/openrastertk/kis_open_raster_stack_load_visitor.h rename to krita/ui/ora/kis_open_raster_stack_load_visitor.h diff --git a/krita/ui/openrastertk/kis_open_raster_stack_save_visitor.cpp b/krita/ui/ora/kis_open_raster_stack_save_visitor.cpp similarity index 100% rename from krita/ui/openrastertk/kis_open_raster_stack_save_visitor.cpp rename to krita/ui/ora/kis_open_raster_stack_save_visitor.cpp diff --git a/krita/ui/openrastertk/kis_open_raster_stack_save_visitor.h b/krita/ui/ora/kis_open_raster_stack_save_visitor.h similarity index 100% rename from krita/ui/openrastertk/kis_open_raster_stack_save_visitor.h rename to krita/ui/ora/kis_open_raster_stack_save_visitor.h