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

List:       kde-commits
Subject:    KDE/kdesdk/okteta/libs/kasten/gui/shell
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2011-08-11 10:09:30
Message-ID: 20110811100930.A7DC0AC873 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1246396 by kossebau:

Changed: make SingleViewWindow also unaware of DocumentManager

 M  +2 -16     singleviewwindow.cpp  
 M  +1 -10     singleviewwindow.h  
 M  +0 -42     singleviewwindow_p.cpp  
 M  +1 -10     singleviewwindow_p.h  


--- trunk/KDE/kdesdk/okteta/libs/kasten/gui/shell/singleviewwindow.cpp #1246395:1246396
@@ -28,19 +28,12 @@
 namespace Kasten
 {
 
-SingleViewWindow::SingleViewWindow( DocumentManager* documentManager, AbstractView* view )
+SingleViewWindow::SingleViewWindow( AbstractView* view )
   : KXmlGuiWindow(),
-    d_ptr( new SingleViewWindowPrivate(this, documentManager, view) )
+    d_ptr( new SingleViewWindowPrivate(this, view) )
 {
 }
 
-DocumentManager* SingleViewWindow::documentManager() const
-{
-    Q_D( const SingleViewWindow );
-
-    return d->documentManager();
-}
-
 AbstractView* SingleViewWindow::view() const
 {
     Q_D( const SingleViewWindow );
@@ -84,14 +77,7 @@
     d->addTool( toolView );
 }
 
-bool SingleViewWindow::queryClose()
-{
-    Q_D( SingleViewWindow );
 
-    return d->queryClose();
-}
-
-
 SingleViewWindow::~SingleViewWindow()
 {
     delete d_ptr;
--- trunk/KDE/kdesdk/okteta/libs/kasten/gui/shell/singleviewwindow.h #1246395:1246396
@@ -39,7 +39,6 @@
 class SingleViewWindowPrivate;
 
 class AbstractView;
-class DocumentManager;
 class AbstractToolView;
 class AbstractXmlGuiController;
 class SingleViewArea;
@@ -52,7 +51,7 @@
    Q_INTERFACES( Kasten::If::WidgetsDockable )
 
   public:
-    explicit SingleViewWindow( DocumentManager* documentManager, AbstractView* view );
+    explicit SingleViewWindow( AbstractView* view );
     virtual ~SingleViewWindow();
 
   public:
@@ -64,23 +63,15 @@
   public: // If::WidgetsDockable API
     virtual QList<ToolViewDockWidget*> dockWidgets() const;
 
-  protected: // KMainWindow API
-    virtual bool queryClose();
-
   protected:
     AbstractView* view() const;
     SingleViewArea* viewArea() const;
-    DocumentManager* documentManager() const;
 
   private:
     Q_PRIVATE_SLOT( d_func(), void onTitleChanged( const QString& newTitle ) )
     Q_PRIVATE_SLOT( d_func(), void onLocalSyncStateChanged( Kasten::LocalSyncState newState ) )
 //     void onViewFocusChanged( Kasten::AbstractView* view );
-//     void onFocusRequested( Kasten::AbstractDocument* document );
     Q_PRIVATE_SLOT( d_func(), void onToolVisibilityChanged( bool isVisible ) )
-//     Q_PRIVATE_SLOT( d_func(), void onCloseRequest( const QList<Kasten::AbstractView*>& views ) )
-    Q_PRIVATE_SLOT( d_func(), void onDataOffered( const QMimeData* mimeData, bool& accept ) )
-    Q_PRIVATE_SLOT( d_func(), void onDataDropped( const QMimeData* mimeData ) )
 
   protected:
     SingleViewWindowPrivate* const d_ptr;
--- trunk/KDE/kdesdk/okteta/libs/kasten/gui/shell/singleviewwindow_p.cpp #1246395:1246396
@@ -30,31 +30,19 @@
 #include <abstractview.h>
 // Kasten core
 #include <abstracttool.h>
-#include <documentmanager.h>
-#include <documentcreatemanager.h>
-#include <documentsyncmanager.h>
-// KDE
-#include <KUrl>
 
 
 namespace Kasten
 {
 
 SingleViewWindowPrivate::SingleViewWindowPrivate( SingleViewWindow* parent,
-                                                  DocumentManager* documentManager,
                                                   AbstractView* view )
   : q_ptr( parent ),
-    mDocumentManager( documentManager ),
     mView( view ),
     mViewArea( new SingleViewArea() )
 {
     parent->setCentralWidget( mViewArea->widget() );
     mViewArea->setView( mView );
-
-    QObject::connect( mViewArea, SIGNAL(dataOffered(const QMimeData*,bool&)),
-                      parent, SLOT(onDataOffered(const QMimeData*,bool&)) );
-    QObject::connect( mViewArea, SIGNAL(dataDropped(const QMimeData*)),
-                      parent, SLOT(onDataDropped(const QMimeData*)) );
 }
 
 void SingleViewWindowPrivate::setView( AbstractView* view )
@@ -116,13 +104,6 @@
                 SLOT(onToolVisibilityChanged(bool)) );
 }
 
-bool SingleViewWindowPrivate::queryClose()
-{
-    AbstractDocument* document = mView ? mView->findBaseModel<AbstractDocument*>() : 0;
-    // TODO: query the document manager or query the view manager?
-    return (! document) || mDocumentManager->canClose( document );
-}
-
 void SingleViewWindowPrivate::onTitleChanged( const QString& newTitle )
 {
     Q_Q( SingleViewWindow );
@@ -145,30 +126,7 @@
         q->setCaption( view->title(), newState == LocalHasChanges );
 }
 
-void SingleViewWindowPrivate::onDataOffered( const QMimeData* mimeData, bool& accept )
-{
-    // TODO: this all should be forwarded to some client object
-    accept = KUrl::List::canDecode( mimeData )
-             || mDocumentManager->createManager()->canCreateNewFromData( mimeData );
-}
 
-void SingleViewWindowPrivate::onDataDropped( const QMimeData* mimeData )
-{
-    // TODO: this all should be forwarded to some client object
-    const KUrl::List urls = KUrl::List::fromMimeData( mimeData );
-
-    if( ! urls.isEmpty() )
-    {
-        DocumentSyncManager* syncManager = mDocumentManager->syncManager();
-
-        foreach( const KUrl& url, urls )
-            syncManager->load( url );
-    }
-    else
-        mDocumentManager->createManager()->createNewFromData( mimeData, true );
-}
-
-
 void SingleViewWindowPrivate::onToolVisibilityChanged( bool isVisible )
 {
     Q_Q( SingleViewWindow );
--- trunk/KDE/kdesdk/okteta/libs/kasten/gui/shell/singleviewwindow_p.h #1246395:1246396
@@ -43,7 +43,7 @@
 {
   public:
     SingleViewWindowPrivate( SingleViewWindow* parent,
-                             DocumentManager* documentManager, AbstractView* view );
+                             AbstractView* view );
 
     ~SingleViewWindowPrivate();
 
@@ -58,20 +58,14 @@
   public: // If::WidgetsDockable API
     QList<ToolViewDockWidget*> dockWidgets() const;
 
-  protected: // KMainWindow API
-    bool queryClose();
-
   protected:
     AbstractView* view() const;
     SingleViewArea* viewArea() const;
-    DocumentManager* documentManager() const;
 
   private: // Q_SLOTS
     void onTitleChanged( const QString& newTitle );
     void onLocalSyncStateChanged( Kasten::LocalSyncState newState );
     void onToolVisibilityChanged( bool isVisible );
-    void onDataOffered( const QMimeData* mimeData, bool& accept );
-    void onDataDropped( const QMimeData* mimeData );
 
   protected:
     Q_DECLARE_PUBLIC( SingleViewWindow )
@@ -79,8 +73,6 @@
   protected:
     SingleViewWindow* const q_ptr;
 
-    DocumentManager* const mDocumentManager;
-
     AbstractView* mView;
 
     SingleViewArea* const mViewArea;
@@ -93,7 +85,6 @@
 inline QList<ToolViewDockWidget*> SingleViewWindowPrivate::dockWidgets() const { return mDockWidgets; }
 inline AbstractView* SingleViewWindowPrivate::view() const { return mView; }
 inline SingleViewArea* SingleViewWindowPrivate::viewArea() const { return mViewArea; }
-inline DocumentManager* SingleViewWindowPrivate::documentManager() const { return mDocumentManager; }
 
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]