[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/karbon
From: Boudewijn Rempt <boud () valdyas ! org>
Date: 2009-06-16 20:50:19
Message-ID: 1245185419.852222.8501.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 982825 by rempt:
Make karbon compile and link
M +8 -1 CMakeLists.txt
M +2 -2 plugins/dockers/CMakeLists.txt
M +1 -1 plugins/flattenpath/CMakeLists.txt
M +1 -1 plugins/roundcorners/CMakeLists.txt
M +1 -1 plugins/tools/CMakeLists.txt
M +1 -1 plugins/whirlpinch/CMakeLists.txt
M +3 -3 ui/CMakeLists.txt
M +9 -10 ui/KarbonView.cpp
--- trunk/koffice/karbon/CMakeLists.txt #982824:982825
@@ -1,5 +1,6 @@
project(karbon)
+IF(SHOULD_BUILD_KARBON)
#Set the correct compiler options
IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -17,9 +18,13 @@
include_directories(
${QT_INCLUDES}
${KDE4_INCLUDE_DIR}
- ${KOGUIUTILS_INCLUDES}
+
${FLAKE_INCLUDES}
${KOTEXT_INCLUDES}
+ ${KOMAIN_INCLUDES}
+ ${CMAKE_SOURCE_DIR}/libs/resources
+ ${CMAKE_SOURCE_DIR}/libs/widgets/resources
+ ${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets
${CMAKE_SOURCE_DIR}/karbon/ui
${CMAKE_SOURCE_DIR}/karbon/common
${CMAKE_SOURCE_DIR}/karbon/common/commands
@@ -61,3 +66,5 @@
target_link_libraries( karbon kdeinit_karbon )
install(TARGETS karbon ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ENDIF(SHOULD_BUILD_KARBON)
--- trunk/koffice/karbon/plugins/dockers/CMakeLists.txt #982824:982825
@@ -1,7 +1,7 @@
project(karbondockersplugin)
include_directories(
- ${KOGUIUTILS_INCLUDES}
+
${KOPAGEAPP_INCLUDES}
${CMAKE_SOURCE_DIR}/karbon/ui/widgets )
@@ -13,7 +13,7 @@
kde4_add_plugin(karbondockersplugin ${karbondockers_SRCS})
-target_link_libraries(karbondockersplugin karboncommon koguiutils karbonui \
${KDE4_KDEUI_LIBS} ) +target_link_libraries(karbondockersplugin karboncommon flake \
koresources kocolorwidgets koresourcewidget karbonui ${KDE4_KDEUI_LIBS} )
install(TARGETS karbondockersplugin DESTINATION ${PLUGIN_INSTALL_DIR})
--- trunk/koffice/karbon/plugins/flattenpath/CMakeLists.txt #982824:982825
@@ -12,7 +12,7 @@
-target_link_libraries(karbon_flattenpathplugin flake ${KDE4_KPARTS_LIBS} koguiutils \
karboncommon ) +target_link_libraries(karbon_flattenpathplugin flake \
${KDE4_KPARTS_LIBS} karboncommon )
install(TARGETS karbon_flattenpathplugin DESTINATION ${PLUGIN_INSTALL_DIR})
--- trunk/koffice/karbon/plugins/roundcorners/CMakeLists.txt #982824:982825
@@ -12,7 +12,7 @@
-target_link_libraries(karbon_roundcornersplugin koguiutils flake \
${KDE4_KPARTS_LIBS} karboncommon ) +target_link_libraries(karbon_roundcornersplugin \
kobase koinput flake ${KDE4_KPARTS_LIBS} karboncommon )
install(TARGETS karbon_roundcornersplugin DESTINATION ${PLUGIN_INSTALL_DIR})
--- trunk/koffice/karbon/plugins/tools/CMakeLists.txt #982824:982825
@@ -31,7 +31,7 @@
kde4_add_plugin(karbontools ${karbon_tools_PART_SRCS})
-target_link_libraries(karbontools koresources pigmentcms koguiutils flake \
${KDE4_KPARTS_LIBS} koguiutils karboncommon karbonui ) \
+target_link_libraries(karbontools koresources pigmentcms flake ${KDE4_KPARTS_LIBS} \
karboncommon karbonui )
install(TARGETS karbontools DESTINATION ${PLUGIN_INSTALL_DIR})
--- trunk/koffice/karbon/plugins/whirlpinch/CMakeLists.txt #982824:982825
@@ -7,7 +7,7 @@
kde4_add_plugin(karbon_whirlpinchplugin ${karbon_whirlpinchplugin_PART_SRCS})
-target_link_libraries(karbon_whirlpinchplugin koguiutils flake ${KDE4_KPARTS_LIBS} \
karboncommon ) +target_link_libraries(karbon_whirlpinchplugin koinput flake \
${KDE4_KPARTS_LIBS} karboncommon )
install(TARGETS karbon_whirlpinchplugin DESTINATION ${PLUGIN_INSTALL_DIR})
--- trunk/koffice/karbon/ui/CMakeLists.txt #982824:982825
@@ -1,7 +1,7 @@
include_directories(
${KDE4_INCLUDE_DIR}
${QT_INCLUDES}
- ${KOGUIUTILS_INCLUDES}
+ ${KOMAIN_INCLUDES}
${CMAKE_SOURCE_DIR}/karbon/
${CMAKE_SOURCE_DIR}/karbon/ui
${CMAKE_SOURCE_DIR}/karbon/ui/dialogs
@@ -44,8 +44,8 @@
target_link_libraries( karbonui ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} \
${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY} karboncommon kostore pigmentcms
- komain koresources
- koguiutils
+ komain koresources koresourcewidget kocolorwidgets
+
kotext
flake )
--- trunk/koffice/karbon/ui/KarbonView.cpp #982824:982825
@@ -209,7 +209,7 @@
d->canvas = new KarbonCanvas( p );
d->canvas->setParent( this );
d->canvas->setDocumentViewMargin( viewMargin );
- connect( d->canvas->shapeManager()->selection(), SIGNAL( selectionChanged() ),
+ connect( d->canvas->shapeManager()->selection(), SIGNAL( selectionChanged() ),
this, SLOT( selectionChanged() ) );
d->canvasController = new KoCanvasController(this);
@@ -242,7 +242,7 @@
zoomController->setZoomMode( KoZoomMode::ZOOM_PAGE );
connect( zoomController, SIGNAL(zoomedToSelection()), this, \
SLOT(zoomSelection()));
connect( zoomController, SIGNAL(zoomedToAll()), this, SLOT(zoomDrawing()));
-
+
KarbonSmallStylePreview * smallPreview = new KarbonSmallStylePreview( \
statusBar() );
connect( smallPreview, SIGNAL(fillApplied()), this, SLOT(applyFillToSelection()) \
);
connect( smallPreview, SIGNAL(strokeApplied()), this, \
SLOT(applyStrokeToSelection()) ); @@ -280,9 +280,9 @@
connect( d->canvasController, SIGNAL(canvasOffsetYChanged(int)), this, \
SLOT(pageOffsetChanged()));
connect( d->canvasController, SIGNAL(canvasMousePositionChanged(const QPoint \
&)), this, SLOT(mousePositionChanged(const QPoint&)));
- connect( d->vertRuler, SIGNAL(guideLineCreated(Qt::Orientation,int)),
+ connect( d->vertRuler, SIGNAL(guideLineCreated(Qt::Orientation,int)),
d->canvasController, SLOT( addGuideLine(Qt::Orientation,int) ) );
- connect( d->horizRuler, SIGNAL(guideLineCreated(Qt::Orientation,int)),
+ connect( d->horizRuler, SIGNAL(guideLineCreated(Qt::Orientation,int)),
d->canvasController, SLOT( addGuideLine(Qt::Orientation,int) ) );
updateRuler();
@@ -306,8 +306,8 @@
setDockerManager(dockerMng);
}
- connect( d->canvasController, SIGNAL( toolOptionWidgetsChanged(const \
QMap<QString, QWidget *> &, KoView *) ),
- dockerMng, SLOT( newOptionWidgets(const QMap<QString, QWidget *> &, \
KoView *) ) ); + connect( d->canvasController, SIGNAL( \
toolOptionWidgetsChanged(const QMap<QString, QWidget *> &, QWidget*) ), + \
dockerMng, SLOT( newOptionWidgets(const QMap<QString, QWidget *> &, QWidget*) ) );
KoToolManager::instance()->requestToolActivation( d->canvasController );
@@ -874,7 +874,7 @@
actionCollection()->addAction("object_duplicate", actionDuplicate );
actionDuplicate->setShortcut(QKeySequence("Ctrl+D"));
connect(actionDuplicate, SIGNAL(triggered()), this, SLOT(selectionDuplicate()));
-
+
KAction *actionDistributeHorizontalCenter = new KAction(i18n("Distribute Center \
(Horizontal)"), this);
actionCollection()->addAction("object_distribute_horizontal_center", \
actionDistributeHorizontalCenter );
connect(actionDistributeHorizontalCenter, SIGNAL(triggered()), this, \
SLOT(selectionDistributeHorizontalCenter())); @@ -1186,7 +1186,6 @@
d->subtractPath->setEnabled( selectedPaths + selectedParametrics == 2 );
d->unitePath->setEnabled( selectedPaths + selectedParametrics == 2 );
d->pathSnapToGrid->setEnabled( selectedPaths > 0 );
-
// if only one shape selected, set its parent layer as the active layer
if( count == 1 )
{
@@ -1272,7 +1271,7 @@
KoSelection *selection = d->canvas->shapeManager()->selection();
if( ! selection->count() )
return;
-
+
KoShape * shape = selection->firstSelectedShape();
d->canvas->addCommand( new KoShapeBackgroundCommand( \
selection->selectedShapes(), shape->background() ) ); }
@@ -1282,7 +1281,7 @@
KoSelection *selection = d->canvas->shapeManager()->selection();
if( ! selection->count() )
return;
-
+
KoShape * shape = selection->firstSelectedShape();
d->canvas->addCommand( new KoShapeBorderCommand( selection->selectedShapes(), \
shape->border() ) ); }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic