[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/karbon
From:       Jan Hambrecht <jaham () gmx ! net>
Date:       2008-08-04 20:43:33
Message-ID: 1217882613.405722.24445.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 842182 by jaham:

make style docker a plugin so other application can use it as well



 M  +1 -1      plugins/CMakeLists.txt  
 M  +8 -4      plugins/dockers/CMakeLists.txt  
 M  +2 -2      plugins/dockers/KarbonDockersPlugin.cpp  
 A             plugins/dockers/KarbonStyleDocker.cpp   \
ui/dockers/KarbonStylePreviewDocker.cpp#842137 [License: LGPL (v2+)]  A             \
plugins/dockers/KarbonStyleDocker.h   ui/dockers/KarbonStylePreviewDocker.h#842137 \
[License: LGPL (v2+)]  A             plugins/dockers/KarbonStyleDockerFactory.cpp   \
[License: LGPL (v2+)]  A             plugins/dockers/KarbonStyleDockerFactory.h   \
[License: LGPL (v2+)]  M  +0 -1      ui/CMakeLists.txt  
 M  +3 -8      ui/KarbonView.cpp  
 D             ui/dockers/KarbonStylePreviewDocker.cpp  
 D             ui/dockers/KarbonStylePreviewDocker.h  
 M  +3 -1      ui/widgets/KarbonGradientChooser.h  
 M  +3 -1      ui/widgets/KarbonGradientItem.h  
 M  +3 -1      ui/widgets/KarbonStyleButtonBox.h  
 M  +3 -1      ui/widgets/KarbonStylePreview.h  


--- trunk/koffice/karbon/plugins/CMakeLists.txt #842181:842182
@@ -3,4 +3,4 @@
 add_subdirectory( refinepath )
 add_subdirectory( whirlpinch )
 add_subdirectory( tools )
-#add_subdirectory( dockers )
+add_subdirectory( dockers )
--- trunk/koffice/karbon/plugins/dockers/CMakeLists.txt #842181:842182
@@ -1,16 +1,20 @@
 project(karbondockersplugin)
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${KOGUIUTILS_INCLUDES} )
+include_directories( 
+    ${KDE4_INCLUDE_DIR} 
+    ${QT_INCLUDES} 
+    ${KOGUIUTILS_INCLUDES}
+    ${CMAKE_SOURCE_DIR}/karbon/ui/widgets )
 
 set(karbondockers_SRCS
     KarbonDockersPlugin.cpp
-    KarbonStrokeDocker.cpp
-    KarbonStrokeDockerFactory.cpp
+    KarbonStyleDocker.cpp
+    KarbonStyleDockerFactory.cpp
 )
 
 kde4_add_plugin(karbondockersplugin ${karbondockers_SRCS})
 
-target_link_libraries(karbondockersplugin koguiutils komain)
+target_link_libraries(karbondockersplugin koguiutils komain karbonui )
 
 install(TARGETS karbondockersplugin DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- trunk/koffice/karbon/plugins/dockers/KarbonDockersPlugin.cpp #842181:842182
@@ -18,7 +18,7 @@
  */
 
 #include "KarbonDockersPlugin.h"
-#include "KarbonStrokeDockerFactory.h"
+#include "KarbonStyleDockerFactory.h"
 
 #include <KoDockRegistry.h>
 
@@ -31,7 +31,7 @@
 KarbonDockersPlugin::KarbonDockersPlugin( QObject *parent, const QVariantList& )
     : QObject(parent)
 {
-    KoDockRegistry::instance()->add( new KarbonStrokeDockerFactory() );
+    KoDockRegistry::instance()->add( new KarbonStyleDockerFactory() );
 }
 
 #include "KarbonDockersPlugin.moc"
--- trunk/koffice/karbon/ui/CMakeLists.txt #842181:842182
@@ -21,7 +21,6 @@
     dockers/KarbonLayerDocker.cpp
     dockers/KarbonLayerModel.cpp
     dockers/KarbonLayerSortingModel.cpp
-    dockers/KarbonStylePreviewDocker.cpp
 
     widgets/KarbonCanvas.cpp
     widgets/KarbonGradientWidget.cpp
--- trunk/koffice/karbon/ui/KarbonView.cpp #842181:842182
@@ -51,9 +51,9 @@
 // Dockers.
 #include "vdocumentdocker.h"
 #include "KarbonLayerDocker.h"
-#include "KarbonStylePreviewDocker.h"
 
 // The rest.
+#include "Karbon.h"
 #include "KarbonFactory.h"
 #include "KarbonPart.h"
 #include "KarbonCanvas.h"
@@ -154,7 +154,7 @@
 {
 public:
     Private( KarbonPart * p)
-        : part(p), canvas( 0 ), stylePreview(0)
+        : part(p), canvas( 0 )
     {}
 
     KarbonPart * part;
@@ -163,8 +163,6 @@
     KoRuler * horizRuler;
     KoRuler * vertRuler;
 
-    KarbonStylePreviewDocker * stylePreview;
-
     // actions:
     KAction * groupObjects;
     KAction * ungroupObjects;
@@ -291,9 +289,6 @@
         KoToolBoxFactory toolBoxFactory(d->canvasController, i18n( "Tools" ) );
         createDockWidget( &toolBoxFactory );
 
-        KarbonStylePreviewDockerFactory styleFactory;
-        d->stylePreview = dynamic_cast<KarbonStylePreviewDocker*>( createDockWidget( \
                &styleFactory ) );
-
         KoDockerManager *dockerManager = new KoDockerManager(this);
         connect( d->canvasController, SIGNAL( toolOptionWidgetsChanged(const \
                QMap<QString, QWidget *> &) ),
              dockerManager, SLOT( newOptionWidgets(const  QMap<QString, QWidget *> \
&) ) ); @@ -359,7 +354,7 @@
         if( ! part() )
             return;
 
-        if( d->stylePreview->strokeIsSelected() )
+        if( d->canvas->resourceProvider()->intResource( Karbon::ActiveStyle ) == \
Karbon::Foreground )  {
             QList<KoShapeBorderModel*> borders;
             QList<KoShape*> selectedShapes = selection->selectedShapes();
--- trunk/koffice/karbon/ui/widgets/KarbonGradientChooser.h #842181:842182
@@ -25,9 +25,11 @@
 #include <KoResourceServerAdapter.h>
 #include <KoCheckerBoardPainter.h>
 
+#include <karbonui_export.h>
+
 class QResizeEvent;
 
-class KarbonGradientChooser : public KoResourceItemChooser
+class KARBONUI_EXPORT KarbonGradientChooser : public KoResourceItemChooser
 {
     Q_OBJECT
 public:
--- trunk/koffice/karbon/ui/widgets/KarbonGradientItem.h #842181:842182
@@ -23,9 +23,11 @@
 #include <KoResourceItemChooser.h>
 #include <KoCheckerBoardPainter.h>
 
+#include <karbonui_export.h>
+
 class KoAbstractGradient;
 
-class KarbonGradientItem : public KoResourceItem
+class KARBONUI_EXPORT KarbonGradientItem : public KoResourceItem
 {
 public:
     KarbonGradientItem( KoAbstractGradient * gradient, KoCheckerBoardPainter * \
                checkerPainter );
--- trunk/koffice/karbon/ui/widgets/KarbonStyleButtonBox.h #842181:842182
@@ -23,9 +23,11 @@
 
 #include <QtGui/QWidget>
 
+#include <karbonui_export.h>
+
 class QButtonGroup;
 
-class KarbonStyleButtonBox : public QWidget
+class KARBONUI_EXPORT KarbonStyleButtonBox : public QWidget
 {
     Q_OBJECT
 
--- trunk/koffice/karbon/ui/widgets/KarbonStylePreview.h #842181:842182
@@ -26,6 +26,8 @@
 #include <KoCheckerBoardPainter.h>
 #include <QFrame>
 
+#include <karbonui_export.h>
+
 class QEvent;
 class QPaintEvent;
 class QBrush;
@@ -33,7 +35,7 @@
 class KoShapeBackground;
 
 /// A widget to preview stroke and fill of a shape
-class KarbonStylePreview : public QFrame
+class KARBONUI_EXPORT KarbonStylePreview : public QFrame
 {
     Q_OBJECT
 


[prev in list] [next in list] [prev in thread] [next in thread]