• C. Boemann's avatar
    Ok so this is the big one that splits KoDocument into · c9027086
    C. Boemann authored
    KoPart and KoDocument.
    
    There might be some fallout and regressions, so please check your apps and fix
    
    See mail to mailing list from around april for more detailed description of what this is about
    
    Squashed commit of the following:
    
    commit dc33dcd1349fb8da46ab2edbc9d60fba582bb325
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Mon Aug 6 17:29:42 2012 +0200
    
        compile fix
    
    commit 40edabc0aca0f73577658b245fe1596ddfacb9bb
    Merge: 0a72933 25223fb
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Mon Aug 6 17:23:02 2012 +0200
    
        Merge branch 'master' into libs-kodocument_split_boud_and_boemann
    
        Conflicts:
        	plan/kptpart.cpp
        	plan/kptview.cpp
        	words/part/KWDocument.cpp
    
    commit 0a729336992e1f321f2c647f75cab7d9c80d1780
    Merge: c96e1fe 414b046
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Fri Jul 13 09:55:52 2012 +0200
    
        Merge branch 'master' into libs-kodocument_split_boud_and_boemann
    
        Conflicts:
        	active/src/CAPresentationHandler.cpp
        	active/src/CASpreadsheetHandler.cpp
        	active/src/CATextDocumentHandler.cpp
        	krita/ui/CMakeLists.txt
        	libs/flake/KoPathShape.cpp
        	plan/libs/ui/kptdependencyeditor.cpp
        	tools/converter/calligraconverter.cpp
        	tools/cstester/cstester.cpp
        	tools/thumbnail/calligracreator.cpp
    
    commit c96e1fefa1dee2d7202155d1c519a0710b5ad35c
    Merge: 690a49e 6cf29b3
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Fri Jun 15 13:39:30 2012 +0200
    
        Merge branch 'master' into libs-kodocument_split_boud_and_boemann
    
        Conflicts:
        	libs/main/KoMainWindow.cpp
    
    commit 690a49e0381eb60f50eb7ecb5cd502ca5238824b
    Merge: ecc54ed 69f9ea5
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Wed Jun 6 02:38:02 2012 +0200
    
        Merge branch 'master' into libs-kodocument_split_boud_and_boemann
    
        Conflicts:
        	karbon/ui/KarbonPart.cpp
        	karbon/ui/KarbonPart.h
        	plugins/chartshape/ChartDocument.cpp
        	sheets/part/Factory.cpp
    
    commit ecc54ed213fa91ea48565588fe5e06eec5597c2d
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Wed May 23 11:43:04 2012 +0200
    
        missed these merge conflicts
    
    commit ff9f66a591ebf958fc48279a4acfe860482779c3
    Merge: d5ff4ff 0c30d48
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Wed May 23 11:17:50 2012 +0200
    
        Merge branch 'libs-kodocument_split_boud_and_boemann' of git://anongit2.kde.org/calligra into libs-kodocument_split_boud_and_boemann
    
    commit d5ff4ff25a1bf74c6b4f93f4c8c440a0959015c3
    Merge: 7e386a4 0e67a5a
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Wed May 23 11:17:33 2012 +0200
    
        Merge branch 'master' into libs-kodocument_split_boud_and_boemann
    
        Conflicts:
        	flow/part/FlowDocument.cpp
        	flow/part/FlowDocument.h
        	flow/part/FlowFactory.cpp
        	interfaces/koChart.cc
        	karbon/ui/KarbonFactory.cpp
        	karbon/ui/KarbonPart.cpp
        	karbon/ui/KarbonPart.h
        	krita/ui/kis_doc2.cc
        	krita/ui/kis_doc2.h
        	krita/ui/kis_factory2.cc
        	libs/kopageapp/KoPADocument.cpp
        	libs/kopageapp/KoPADocument.h
        	libs/main/CMakeLists.txt
        	libs/main/KoApplication.cpp
        	libs/main/KoDocument.cpp
        	libs/main/KoDocument.h
        	libs/main/KoMainWindow.cpp
        	libs/main/KoVersionDialog.cpp
        	libs/main/KoView.cpp
        	plan/kptfactory.cpp
        	plan/kptpart.cpp
        	plan/kptpart.h
        	plan/libs/ui/kptperteditor.cpp
        	plan/plugins/scripting/Module.cpp
        	plugins/formulashape/FormulaDocument.cpp
        	sheets/DocBase.cpp
        	sheets/DocBase.h
        	sheets/part/Doc.cpp
        	sheets/part/Doc.h
        	sheets/part/Factory.cpp
        	sheets/plugins/scripting/ScriptingModule.cpp
        	stage/part/KPrDocument.cpp
        	stage/part/KPrDocument.h
        	stage/part/KPrFactory.cpp
        	words/part/KWDocument.cpp
        	words/part/KWDocument.h
        	words/part/KWFactory.cpp
    
    commit 0c30d48eb89e7e54ff4f3d6eb578e3c9ac948075
    Author: Dag Andersen <danders@get2net.dk>
    Date:   Wed May 23 09:56:06 2012 +0200
    
        Typo
    
    commit f81211bc9f9777134f8977e6bb305c05e6f71d1d
    Author: Thorsten Zachmann <t.zachmann@zagge.de>
    Date:   Wed May 23 05:50:03 2012 +0200
    
        Fix update of document structure docker.
    
        The problem was that the docker was created to late and therefore setCanvas was
        not called. Now we create the docker earlier and setCanvas gets called and the
        content in the docker is shown again.
    
    commit 7e386a45ed9a1608c69faa94e5b7a47da639dfdb
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon May 21 14:41:23 2012 +0200
    
        rough and ready port of calligra active
    
    commit d1e277ec2ff6b5ffdfacfce57a76bd2d33934f30
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Mon May 21 12:31:33 2012 +0200
    
        finish porting Plan
    
    commit a7b24dfa3956ec4bd7e347b0ad322b51b8f2d0d6
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon May 21 12:23:24 2012 +0200
    
        fix formula shape tests
    
    commit 547904f6e4a4342d70ef659d03ad4fe3018f2c18
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon May 21 12:18:59 2012 +0200
    
        fix sheets filter -- by why all the const?
    
    commit 69f2d908c537ff4d8d037baa49c5985b4e9d7f05
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon May 21 12:10:24 2012 +0200
    
        fix spreadsheetmigrate stuff
    
    commit 98ef9afa46a2ec1b29f81bbe51a256b54dbca2c5
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Mon May 21 12:09:06 2012 +0200
    
        Port formulashape to new structure
    
    commit 5950056d985c5fda7b54be3a2f12aa40e410410c
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon May 21 12:07:00 2012 +0200
    
        port chart interface
    
    commit b5a6cce40b42967b129e3ba3dd3bea3299aae77a
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Mon May 21 11:56:27 2012 +0200
    
        Port Chart to new document/part/view structure
    
        And look! I remembereded to add the new files :)
    
    commit b32989625548779abd55836fa184be1d6ca4dd5f
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon May 21 11:37:51 2012 +0200
    
        Finish porting sheets
    
    commit 77c55cb6d1406c4c86d0c46708c004ec6baacc00
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon May 21 11:28:15 2012 +0200
    
        make cstester compile
    
    commit 8c60c43a2afffdf75dc3079c747a417612704e0a
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon May 21 11:16:13 2012 +0200
    
        port some tools
    
    commit 0df5eabf09da64e3ba759e11f38fb34c7f8258cf
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Mon May 21 11:08:08 2012 +0200
    
        3rd round of Plan porting to new structure
    
    commit 829f1bed89385079efcb1e2913f298d0d5ab8435
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon May 21 11:07:09 2012 +0200
    
        Port all of Karbon to KoPart/KoDocument split
    
        Rough and ready port, though.
    
        XXX: we need to figure out the partmanager activated stuff
    
    commit ed596c7781a1ccbf46160a4e22e774a60d28dbfb
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon May 21 10:35:01 2012 +0200
    
        some more work on karbon...
    
    commit 3de8daf4d489f625efefe107c4edc9fc67dc0366
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Mon May 21 09:30:32 2012 +0200
    
        first part of porting Karbon
    
    commit d2e05239989132f5e12586ab0de62291d31deed1
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 22:59:21 2012 +0200
    
        It wouldn't be a porting if i didn't forget these two files..
    
    commit be8d65538cff5f36454792cf44b67ff06b667286
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 22:58:12 2012 +0200
    
        2. round on porting Plan
    
    commit a0b570f741d56459febd3b754dbeb4a26d370f91
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 22:08:32 2012 +0200
    
        Show all toolbars again
    
        setXMLFile did the trick.
    
    commit df977d1d96a37fb900f69b0e511a8ee2c55accd4
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 21:09:56 2012 +0200
    
        4 out of 4 last tries :(
    
    commit 07ab9ac29a2d06e2924294b2c04f913d6d52dc62
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 21:05:42 2012 +0200
    
        fix unittests
    
    commit a669e21467d2ee8bf8a6c8365ad5acad25b7224d
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 21:05:35 2012 +0200
    
        port Krita to the kopart/kodocument split
    
    commit b10b8891b598c86971ba0da5aa9c2c251a20a51f
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 17:08:51 2012 +0200
    
        set the busy cursor when loading
    
    commit 614ec0362284cca32ccaca47e337a48b2f3a49c5
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 20:49:36 2012 +0200
    
        Partial port of Sheets to ne document/part/view structure
    
    commit 7bd4be3c01ef15f34050ece8a65c42a882683a7d
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 15:48:28 2012 +0200
    
        Forgot these (do you sense a pattern..)
    
    commit b06ead5509647516e5057851f7122856b39a024b
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 15:48:01 2012 +0200
    
        Make the templates in words show up again
    
    commit b35e4fe675ee4954aebc4eb8bdf3169c52627d7b
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 15:44:27 2012 +0200
    
        First round of porting Plan to the new document/part/view structure
    
    commit b3fc0f371a57b65f60673a53ba1e4edbc7d527fb
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 15:46:23 2012 +0200
    
        fix some more sig/slot connections, for saving
    
    commit 8d55059076d6a2c8478892e271a4c100751bf2fb
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 14:42:42 2012 +0200
    
        Port Flow to new document/part/view structure
    
    commit 04b2cd154bfaada981b918eb3491f84e9af610cd
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 14:14:59 2012 +0200
    
        forgot these
    
    commit acab76c34f0398e5e7087f3e7b7c9f2422de8db2
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 12:33:02 2012 +0200
    
        Port Stage to the new document/part/view structure
    
    commit eec7f81f2508abdfabb3fac65e4da27d4af5aa6f
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 12:13:25 2012 +0200
    
        add some todo comments
    
    commit 2a399c9ed5008d5721cea4944079c2b221e61bd3
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 12:11:00 2012 +0200
    
        Fix some more signal/slot connections
    
    commit 3771e9b0e3fc2cc56659b4ac274ba3fe3091fec3
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 12:09:59 2012 +0200
    
        Fix crash on closing a document
    
    commit e691c224a475e6da3a229f6235147ef13795f68f
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 12:08:01 2012 +0200
    
        Call the loadFile and saveFile of KoDocument from KoPart
    
        We still need to shuffle code from KoDocument to KoPart, this is not
        the final state. But loading a document works now.
    
    commit 64b44c4c8a5f782b562ae6be67e2eed6d4cde0ad
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 11:55:56 2012 +0200
    
        Fix the completed/canceled signals
    
        And bite my tongue when I wanted to say something nasty about the habit
        of using c-style casts for qobjects.
    
    commit b74aab1f3cab939408df54795ec2b54de971e9b6
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 11:51:42 2012 +0200
    
        make sure that KoMainWindow has a document
    
        If we don't pass a document explicitly, get it from the part.
    
        Query: should we just remove the document parameter and always assume
        that the part has the right document?
    
    commit ffc753396678a47894c7814d3b110694862a0aca
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 11:40:49 2012 +0200
    
        fix naming of variables
    
    commit b7ca556763f1efbf9f8e8cef6f61951bfe395426
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 11:28:10 2012 +0200
    
        move slotStarted from document to part
    
    commit 5dbe9a3c643cc65e0535cc86c3fffdf0d3f9b8f1
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 11:09:27 2012 +0200
    
        Add a temporary default value for the KoPart parm for KWDocument
    
        This makes the tests build; once the refactoring is done, KoDocument
        will not have a KoPart reference anymore anyway.
    
    commit 41739611e75d1b3d7f305d305043a7d036580781
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 10:29:29 2012 +0200
    
        Make Words compile again after the latest round of changes
    
    commit 85e5d6022be0e44a29b82569102e24d412df3697
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 09:47:48 2012 +0200
    
        fix compilation of test
    
    commit cd8f87bac542dc0e34464b0c3998a1ea88fb42e4
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 09:43:55 2012 +0200
    
        Forgot to add these files
    
    commit 5414a218148a077915a30f48efdf60a9afa5e167
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 09:37:48 2012 +0200
    
        Adapt KoPageApp to the new document/part/view structure
    
        Some signals needs to be connected in the apps to regain lost functionality
    
    commit 51cfbcc00a6496cd41a22bf54eb144e0d7c2af57
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sun May 20 08:50:07 2012 +0200
    
        move openpane/template stuff to kopart
    
        * also remove the current() stuff
        * also move the progress proxy from kodocument to kopart
    
    commit 4b837049bcd3a7157fa41f47edc9f4fec79daf03
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sat May 19 22:16:41 2012 +0200
    
        add some whitespace
    
    commit 768acdfc4da2a98bf16e44a3ca849f63bd92d6c7
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sat May 19 22:16:01 2012 +0200
    
        remove KoDocument::showEmbedInitDialog
    
    commit a5d17cfa2da87317df185333c4b7d2d5fc1289f0
    Author: C. Boemann <cbo@boemann.dk>
    Date:   Sun May 20 00:00:27 2012 +0200
    
        Refactor Words so it builds against the new document/part/view structure
    
    commit a3b9d5357c50ceaf2327b9b8b41a52e6a3834888
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sat May 19 14:25:50 2012 +0200
    
        half-way document reform
    
    commit 1b5c88a475ebc0228110454de931c988386f15a2
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sat May 19 12:28:46 2012 +0200
    
        Remove paintEverything
    
        It was only used to call paintContent now that there are no subdocuments
        anymore. (and it was this way for a long time already).
    
    commit ce82fdad15052d229f805daee00a747df3148af1
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sat May 19 11:20:33 2012 +0200
    
        Remove last traces of document embedding
    
        Embedding is done through flake; not through embedding parts in parts.
    
        This means:
    
        * singleview mode is gone
        * browserextension is gone
    
    commit 2ee6f6b20176ba00e962cb4c12340035eb247222
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sat May 19 10:38:17 2012 +0200
    
        Remove unused saveChildren methods
    
        In KoDocument and KoDocumentOdf. We save child documents through
        flake, not through nested main documents.
    
    commit 8e075c2a2470daed46167cec1585a717a267d21b
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sat May 19 10:33:41 2012 +0200
    
        Move three static functions out of KoDocument to KoServiceProvider
    
        This prepares for splitting up KoDocument into KoDocument and KoPart.
    
    commit 79060b21929598e465d2506cbd1c7b3a8424a8f6
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sat May 19 10:13:13 2012 +0200
    
        remove wantsExportConfirmation virtual method
    
        Replaced by a configuration string
    
    commit 5c15704c540c8d8c7ef0d4d36978f0cf9a9578d0
    Author: Boudewijn Rempt <boud@valdyas.org>
    Date:   Sat May 19 10:07:24 2012 +0200
    
        remove kounavail
    
        It's unmaintained and prevents refactoring. Document embedding
        is done using flake now; this part is no longer used.
    c9027086
koChart.cc 1.4 KB