[kde-doc-english] [kolourpaint/frameworks] /: Merge branch 'master' into frameworks
Alexander Potashev
aspotashev at gmail.com
Fri Sep 25 03:34:15 UTC 2015
Git commit 6aa2d5104810978311d5ef6b57aabeda5c8cb9b0 by Alexander Potashev.
Committed on 25/09/2015 at 02:49.
Pushed by aspotashev into branch 'frameworks'.
Merge branch 'master' into frameworks
M +241 -419 CMakeLists.txt
M +3 -0 doc/index.docbook
M +2 -0 mainWindow/kpMainWindow.h
M +3 -1 mainWindow/kpMainWindowPrivate.h
M +14 -19 mainWindow/kpMainWindow_File.cpp
http://commits.kde.org/kolourpaint/6aa2d5104810978311d5ef6b57aabeda5c8cb9b0
diff --cc CMakeLists.txt
index 8cf343a,d311063..eb299e5
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -27,6 -7,17 +27,17 @@@ find_package(KF5 REQUIRED COMPONENT
find_package(QImageBlitz REQUIRED)
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
-find_package(KSane)
++# find_package(KSane)
+
+ if(KSANE_FOUND)
+ include_directories(${KSANE_INCLUDE_DIR})
+ add_definitions(-DHAVE_KSANE=1)
+ else(KSANE_FOUND)
+ add_definitions(-DHAVE_KSANE=0)
+ endif(KSANE_FOUND)
+
+
include_directories(
# GENERATED BY ./gen_cmake_include_dirs
@@@ -200,135 -203,145 +209,146 @@@ set(kolourpaint_lib1_SRC
) # kolourpaint_lib1_SRCS
set(kolourpaint_lib2_SRCS
- ${CMAKE_CURRENT_SOURCE_DIR}/kolourpaint.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/kpThumbnail.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/kpViewScrollableContainer.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpAbstractImageSelection.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpEllipticalImageSelection.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpFreeFormImageSelection.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpImageSelectionTransparency.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpRectangularImageSelection.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/kpAbstractSelection.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/kpSelectionDrag.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/kpSelectionFactory.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpTextSelection.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpTextSelection_Cursor.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpTextSelection_Paint.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpTextStyle.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpPreeditText.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/layers/tempImage/kpTempImage.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Colors.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Edit.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_File.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Image.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Settings.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_StatusBar.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Text.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Tools.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_View.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_View_Thumbnail.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_View_Zoom.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_DrawShapes.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_Transforms.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolBrush.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolColorEraser.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolEraser.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolFlowBase.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolFlowPixmapBase.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolPen.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolSpraycan.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolAction.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolColorPicker.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_Drawing.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolFloodFill.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_KeyboardEvents.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_MouseEvents.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_OtherEvents.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_UserNotifications.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_Utilities.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolZoom.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolCurve.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolLine.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolPolygonalBase.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolPolygon.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolPolyline.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular/kpToolEllipse.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular/kpToolRectangle.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular/kpToolRectangularBase.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular/kpToolRoundedRectangle.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpAbstractImageSelectionTool.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpToolEllipticalSelection.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpToolFreeFormSelection.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpToolRectSelection.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool_Create.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool_Move.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool_ResizeScale.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_Commands.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_Create.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_CursorCalc.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_InputMethodEvents.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_KeyboardEvents.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_Move.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_ResizeScale.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_SelectText.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_TextStyle.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/kolourpaint.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/kpThumbnail.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/kpViewScrollableContainer.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpAbstractImageSelection.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpEllipticalImageSelection.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpFreeFormImageSelection.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpImageSelectionTransparency.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/image/kpRectangularImageSelection.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/kpAbstractSelection.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/kpSelectionDrag.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/kpSelectionFactory.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpTextSelection.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpTextSelection_Cursor.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpTextSelection_Paint.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpTextStyle.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/selections/text/kpPreeditText.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/layers/tempImage/kpTempImage.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Colors.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Edit.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_File.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Image.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Settings.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_StatusBar.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Text.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_Tools.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_View.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_View_Thumbnail.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mainWindow/kpMainWindow_View_Zoom.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_DrawShapes.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/pixmapfx/kpPixmapFX_Transforms.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolBrush.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolColorEraser.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolEraser.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolFlowBase.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolFlowPixmapBase.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolPen.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/flow/kpToolSpraycan.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolAction.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolColorPicker.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_Drawing.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolFloodFill.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_KeyboardEvents.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_MouseEvents.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_OtherEvents.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_UserNotifications.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpTool_Utilities.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/kpToolZoom.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolCurve.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolLine.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolPolygonalBase.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolPolygon.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/polygonal/kpToolPolyline.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular/kpToolEllipse.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular/kpToolRectangle.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular/kpToolRectangularBase.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/rectangular/kpToolRoundedRectangle.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpAbstractImageSelectionTool.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpToolEllipticalSelection.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpToolFreeFormSelection.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/image/kpToolRectSelection.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool_Create.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool_Move.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/kpAbstractSelectionTool_ResizeScale.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_Commands.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_Create.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_CursorCalc.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_InputMethodEvents.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_KeyboardEvents.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_Move.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_ResizeScale.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_SelectText.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/tools/selection/text/kpToolText_TextStyle.cpp
) # kolourpaint_lib2_SRCS
- set(kolourpaint_SRCS
- ${CMAKE_CURRENT_SOURCE_DIR}/views/kpThumbnailView.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/views/kpUnzoomedThumbnailView.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/views/kpView.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/views/kpView_Events.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/views/kpView_Paint.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/views/kpView_Selections.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/views/kpZoomedThumbnailView.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/views/kpZoomedView.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/views/manager/kpViewManager.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/views/manager/kpViewManager_TextCursor.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/views/manager/kpViewManager_ViewUpdates.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity/kpColorSimilarityFrame.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity/kpColorSimilarityHolder.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectBalanceWidget.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectEmbossWidget.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectFlattenWidget.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectHSVWidget.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectInvertWidget.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectWidgetBase.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpColorCells.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpColorPalette.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpDefaultColorCollection.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpDocumentSaveOptionsWidget.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpDualColorButton.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpPrintDialogPage.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpTransparentColorCell.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/kpColorToolBar.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/kpToolToolBar.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetBase.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetBrush.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetEraserSize.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetFillStyle.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetLineWidth.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp
-
-
- ) # set(kolourpaint_SRCS
++
+ if(KSANE_FOUND)
+ set(kolourpaint_lib2_SRCS
+ ${kolourpaint_lib2_SRCS}
+ ${CMAKE_CURRENT_SOURCE_DIR}/scan/sanedialog.cpp
+ )
+ endif(KSANE_FOUND)
+
+ set(kolourpaint_app_SRCS
+ ${CMAKE_CURRENT_SOURCE_DIR}/views/kpThumbnailView.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/views/kpUnzoomedThumbnailView.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/views/kpView.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/views/kpView_Events.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/views/kpView_Paint.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/views/kpView_Selections.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/views/kpZoomedThumbnailView.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/views/kpZoomedView.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/views/manager/kpViewManager.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/views/manager/kpViewManager_TextCursor.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/views/manager/kpViewManager_ViewUpdates.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity/kpColorSimilarityFrame.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity/kpColorSimilarityHolder.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectBalanceWidget.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectEmbossWidget.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectFlattenWidget.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectHSVWidget.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectInvertWidget.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/imagelib/effects/kpEffectWidgetBase.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpColorCells.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpColorPalette.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpDefaultColorCollection.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpDocumentSaveOptionsWidget.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpDualColorButton.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpPrintDialogPage.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/kpTransparentColorCell.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/kpColorToolBar.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/kpToolToolBar.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetBase.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetBrush.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetEraserSize.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetFillStyle.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetLineWidth.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp
+ ) # set(kolourpaint_app_SRCS
+
+ if(CMAKE_MAJOR_VERSION MATCHES "2" AND CMAKE_MINOR_VERSION MATCHES "4" AND MINGW)
+
+ set(kolourpaint_SRCS ${kolourpaint_app_SRCS})
+
-kde4_add_library(kolourpaint_lib1 STATIC ${kolourpaint_lib1_SRCS})
-kde4_add_library(kolourpaint_lib2 STATIC ${kolourpaint_lib2_SRCS})
+add_library(kolourpaint_lib1 STATIC ${kolourpaint_lib1_SRCS})
+add_library(kolourpaint_lib2 STATIC ${kolourpaint_lib2_SRCS})
# doubled for the linker
set(mingw_libs kolourpaint_lib1 kolourpaint_lib2 kolourpaint_lib1 kolourpaint_lib2)
@@@ -572,13 -380,18 +389,18 @@@ install(TARGETS kolourpaint_lgpl ${INST
# Executable
#
-kde4_add_app_icon(kolourpaint_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/hi*-app-kolourpaint.png")
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/hi*-app-kolourpaint.png")
+ecm_add_app_icon(kolourpaint_SRCS ICONS ${ICONS_SRCS})
-kde4_add_executable(kolourpaint ${kolourpaint_SRCS})
+add_executable(kolourpaint ${kolourpaint_SRCS})
- target_link_libraries(kolourpaint KF5::KDELibs4Support
- ${QIMAGEBLITZ_LIBRARIES} kolourpaint_lgpl)
+ target_link_libraries(kolourpaint
+ ${mingw_libs}
- ${KDE4_KIO_LIBS}
- ${KDE4_KUTILS_LIBS}
++ KF5::KDELibs4Support
+ ${QIMAGEBLITZ_LIBRARIES}
+ ${KSANE_LIBRARY}
+ kolourpaint_lgpl
+ )
install(TARGETS kolourpaint ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --cc mainWindow/kpMainWindow.h
index a4d9c63,b8d63ec..f362dc0
--- a/mainWindow/kpMainWindow.h
+++ b/mainWindow/kpMainWindow.h
@@@ -341,10 -340,12 +341,12 @@@ private
private slots:
void slotOpen ();
- void slotOpenRecent (const KUrl &url);
+ void slotOpenRecent (const QUrl &url);
+ #if HAVE_KSANE
void slotScan ();
void slotScanned (const QImage &image, int);
+ #endif // HAVE_KSANE
void slotScreenshot();
void slotMakeScreenshot();
diff --cc mainWindow/kpMainWindowPrivate.h
index 1b225d0,c584318..589001b
--- a/mainWindow/kpMainWindowPrivate.h
+++ b/mainWindow/kpMainWindowPrivate.h
@@@ -308,9 -310,9 +310,9 @@@ struct kpMainWindowPrivat
*actionMail,
*actionClose, *actionQuit;
- KScanDialog *scanDialog;
+ SaneDialog *scanDialog;
- KUrl lastExportURL;
+ QUrl lastExportURL;
kpDocumentSaveOptions lastExportSaveOptions;
bool exportFirstTime;
More information about the kde-doc-english
mailing list