Changeset View
Changeset View
Standalone View
Standalone View
utils/okteta/oktetadocument.cpp
Show All 20 Lines | |||||
21 | */ | 21 | */ | ||
22 | 22 | | |||
23 | #include "oktetadocument.h" | 23 | #include "oktetadocument.h" | ||
24 | 24 | | |||
25 | // plugin | 25 | // plugin | ||
26 | #include "oktetaplugin.h" | 26 | #include "oktetaplugin.h" | ||
27 | #include "oktetaview.h" | 27 | #include "oktetaview.h" | ||
28 | // Okteta | 28 | // Okteta | ||
29 | #if KASTEN_VERSION == 2 | 29 | #include <kasten/okteta/bytearrayviewprofilemanager.h> | ||
30 | #include <bytearrayviewprofilemanager.h> | 30 | #include <kasten/okteta/bytearrayviewprofilesynchronizer.h> | ||
31 | #include <bytearrayviewprofilesynchronizer.h> | 31 | #include <kasten/okteta/bytearrayrawfilesynchronizerfactory.h> | ||
32 | #include <bytearrayrawfilesynchronizerfactory.h> | 32 | #include <kasten/okteta/bytearraydocument.h> | ||
33 | #include <bytearraydocument.h> | | |||
34 | #elif KASTEN_VERSION == 1 | | |||
35 | #include <bytearrayrawfilesynchronizerfactory.h> | | |||
36 | #include <bytearraydocument.h> | | |||
37 | #else | | |||
38 | #include <bytearrayrawfilesynchronizerfactory.h> | | |||
39 | #include <bytearraydocument.h> | | |||
40 | #endif | | |||
41 | // Kasten | 33 | // Kasten | ||
42 | #if KASTEN_VERSION == 2 | | |||
43 | #include <Kasten2/JobManager> | | |||
44 | #include <Kasten2/AbstractLoadJob> | | |||
45 | #include <Kasten2/AbstractSyncToRemoteJob> | | |||
46 | #include <Kasten2/AbstractSyncFromRemoteJob> | | |||
47 | #include <Kasten2/AbstractModelSynchronizer> | | |||
48 | #elif KASTEN_VERSION == 1 | | |||
49 | #include <Kasten1/JobManager> | | |||
50 | #include <Kasten1/AbstractLoadJob> | | |||
51 | #include <Kasten1/AbstractSyncToRemoteJob> | | |||
52 | #include <Kasten1/AbstractSyncFromRemoteJob> | | |||
53 | #include <Kasten1/AbstractModelSynchronizer> | | |||
54 | #else | | |||
55 | #include <Kasten/JobManager> | 34 | #include <Kasten/JobManager> | ||
56 | #include <Kasten/AbstractLoadJob> | 35 | #include <Kasten/AbstractLoadJob> | ||
57 | #include <Kasten/AbstractSyncToRemoteJob> | 36 | #include <Kasten/AbstractSyncToRemoteJob> | ||
58 | #include <Kasten/AbstractSyncFromRemoteJob> | 37 | #include <Kasten/AbstractSyncFromRemoteJob> | ||
59 | #include <Kasten/AbstractModelSynchronizer> | 38 | #include <Kasten/AbstractModelSynchronizer> | ||
60 | #endif | | |||
61 | // KDevelop | 39 | // KDevelop | ||
62 | #include <shell/core.h> | 40 | #include <shell/core.h> | ||
63 | #include <shell/uicontroller.h> | 41 | #include <shell/uicontroller.h> | ||
64 | #include <interfaces/icore.h> | 42 | #include <interfaces/icore.h> | ||
65 | #include <interfaces/iuicontroller.h> | 43 | #include <interfaces/iuicontroller.h> | ||
66 | #include <interfaces/idocumentcontroller.h> | 44 | #include <interfaces/idocumentcontroller.h> | ||
67 | // Sublime | 45 | // Sublime | ||
68 | #include <sublime/mainwindow.h> | 46 | #include <sublime/mainwindow.h> | ||
Show All 25 Lines | |||||
94 | 72 | | |||
95 | KParts::Part* OktetaDocument::partForView( QWidget* ) const { return 0; } | 73 | KParts::Part* OktetaDocument::partForView( QWidget* ) const { return 0; } | ||
96 | KTextEditor::Document* OktetaDocument::textDocument() const { return 0; } | 74 | KTextEditor::Document* OktetaDocument::textDocument() const { return 0; } | ||
97 | KTextEditor::Cursor OktetaDocument::cursorPosition() const { return KTextEditor::Cursor(); } | 75 | KTextEditor::Cursor OktetaDocument::cursorPosition() const { return KTextEditor::Cursor(); } | ||
98 | 76 | | |||
99 | IDocument::DocumentState OktetaDocument::state() const | 77 | IDocument::DocumentState OktetaDocument::state() const | ||
100 | { | 78 | { | ||
101 | return mByteArrayDocument ? | 79 | return mByteArrayDocument ? | ||
102 | #if KASTEN_VERSION == 2 | | |||
103 | ( mByteArrayDocument->synchronizer()->localSyncState() == Kasten::LocalHasChanges ? | 80 | ( mByteArrayDocument->synchronizer()->localSyncState() == Kasten::LocalHasChanges ? | ||
104 | #else | | |||
105 | ( mByteArrayDocument->localSyncState() == Kasten::LocalHasChanges ? | | |||
106 | #endif | | |||
107 | IDocument::Modified : | 81 | IDocument::Modified : | ||
108 | IDocument::Clean ) : | 82 | IDocument::Clean ) : | ||
109 | IDocument::Clean; | 83 | IDocument::Clean; | ||
110 | } | 84 | } | ||
111 | 85 | | |||
112 | 86 | | |||
113 | bool OktetaDocument::save( IDocument::DocumentSaveMode mode ) | 87 | bool OktetaDocument::save( IDocument::DocumentSaveMode mode ) | ||
114 | { | 88 | { | ||
115 | if( mode & Discard ) | 89 | if( mode & Discard ) | ||
116 | return true; | 90 | return true; | ||
117 | 91 | | |||
118 | if( state() == IDocument::Clean ) | 92 | if( state() == IDocument::Clean ) | ||
119 | return false; | 93 | return false; | ||
120 | 94 | | |||
121 | Kasten::AbstractModelSynchronizer* synchronizer = mByteArrayDocument->synchronizer(); | 95 | Kasten::AbstractModelSynchronizer* synchronizer = mByteArrayDocument->synchronizer(); | ||
122 | 96 | | |||
123 | Kasten::AbstractSyncToRemoteJob* syncJob = synchronizer->startSyncToRemote(); | 97 | Kasten::AbstractSyncToRemoteJob* syncJob = synchronizer->startSyncToRemote(); | ||
124 | const bool syncSucceeded = | 98 | const bool syncSucceeded = Kasten::JobManager::executeJob( syncJob ); | ||
125 | #if KASTEN_VERSION == 1 || KASTEN_VERSION == 2 | | |||
126 | Kasten::JobManager::executeJob( syncJob ); | | |||
127 | #else | | |||
128 | Kasten::JobManager::executeJob( syncJob, qApp->activeWindow() ); | | |||
129 | #endif | | |||
130 | 99 | | |||
131 | if( syncSucceeded ) | 100 | if( syncSucceeded ) | ||
132 | { | 101 | { | ||
133 | notifySaved(); | 102 | notifySaved(); | ||
134 | notifyStateChanged(); | 103 | notifyStateChanged(); | ||
135 | } | 104 | } | ||
136 | 105 | | |||
137 | return syncSucceeded; | 106 | return syncSucceeded; | ||
138 | } | 107 | } | ||
139 | 108 | | |||
140 | 109 | | |||
141 | void OktetaDocument::reload() | 110 | void OktetaDocument::reload() | ||
142 | { | 111 | { | ||
143 | Kasten::AbstractModelSynchronizer* synchronizer = mByteArrayDocument->synchronizer(); | 112 | Kasten::AbstractModelSynchronizer* synchronizer = mByteArrayDocument->synchronizer(); | ||
144 | 113 | | |||
145 | Kasten::AbstractSyncFromRemoteJob* syncJob = synchronizer->startSyncFromRemote(); | 114 | Kasten::AbstractSyncFromRemoteJob* syncJob = synchronizer->startSyncFromRemote(); | ||
146 | const bool syncSucceeded = | 115 | const bool syncSucceeded = Kasten::JobManager::executeJob( syncJob ); | ||
147 | #if KASTEN_VERSION == 1 || KASTEN_VERSION == 2 | | |||
148 | Kasten::JobManager::executeJob( syncJob ); | | |||
149 | #else | | |||
150 | Kasten::JobManager::executeJob( syncJob, qApp->activeWindow() ); | | |||
151 | #endif | | |||
152 | 116 | | |||
153 | if( syncSucceeded ) | 117 | if( syncSucceeded ) | ||
154 | notifyStateChanged(); | 118 | notifyStateChanged(); | ||
155 | } | 119 | } | ||
156 | 120 | | |||
157 | bool OktetaDocument::close( IDocument::DocumentSaveMode mode ) | 121 | bool OktetaDocument::close( IDocument::DocumentSaveMode mode ) | ||
158 | { | 122 | { | ||
159 | bool isCanceled = false; | 123 | bool isCanceled = false; | ||
▲ Show 20 Lines • Show All 79 Lines • ▼ Show 20 Line(s) | |||||
239 | { | 203 | { | ||
240 | if( mByteArrayDocument == 0 ) | 204 | if( mByteArrayDocument == 0 ) | ||
241 | { | 205 | { | ||
242 | Kasten::ByteArrayRawFileSynchronizerFactory* synchronizerFactory = | 206 | Kasten::ByteArrayRawFileSynchronizerFactory* synchronizerFactory = | ||
243 | new Kasten::ByteArrayRawFileSynchronizerFactory(); | 207 | new Kasten::ByteArrayRawFileSynchronizerFactory(); | ||
244 | Kasten::AbstractModelSynchronizer* synchronizer = synchronizerFactory->createSynchronizer(); | 208 | Kasten::AbstractModelSynchronizer* synchronizer = synchronizerFactory->createSynchronizer(); | ||
245 | 209 | | |||
246 | Kasten::AbstractLoadJob* loadJob = synchronizer->startLoad( url() ); | 210 | Kasten::AbstractLoadJob* loadJob = synchronizer->startLoad( url() ); | ||
247 | #if KASTEN_VERSION == 2 | 211 | connect( loadJob, &Kasten::AbstractLoadJob::documentLoaded, | ||
248 | connect( loadJob, SIGNAL(documentLoaded(Kasten2::AbstractDocument*)), | 212 | this, &OktetaDocument::onByteArrayDocumentLoaded ); | ||
249 | SLOT(onByteArrayDocumentLoaded(Kasten2::AbstractDocument*)) ); | 213 | const bool syncSucceeded = Kasten::JobManager::executeJob( loadJob ); | ||
kfunk: Fix indent | |||||
250 | #elif KASTEN_VERSION == 1 | | |||
251 | connect( loadJob, SIGNAL(documentLoaded(Kasten1::AbstractDocument*)), | | |||
252 | SLOT(onByteArrayDocumentLoaded(Kasten1::AbstractDocument*)) ); | | |||
253 | #else | | |||
254 | connect( loadJob, SIGNAL(documentLoaded(Kasten::AbstractDocument*)), | | |||
255 | SLOT(onByteArrayDocumentLoaded(Kasten::AbstractDocument*)) ); | | |||
256 | #endif | | |||
257 | const bool syncSucceeded = | | |||
258 | #if KASTEN_VERSION == 1 || KASTEN_VERSION == 2 | | |||
259 | Kasten::JobManager::executeJob( loadJob ); | | |||
260 | #else | | |||
261 | Kasten::JobManager::executeJob( loadJob, qApp->activeWindow() ); | | |||
262 | #endif | | |||
263 | 214 | | |||
264 | delete synchronizerFactory; | 215 | delete synchronizerFactory; | ||
265 | } | 216 | } | ||
266 | 217 | | |||
267 | #if KASTEN_VERSION == 2 | | |||
268 | Kasten::ByteArrayViewProfileManager* const viewProfileManager = mPlugin->viewProfileManager(); | 218 | Kasten::ByteArrayViewProfileManager* const viewProfileManager = mPlugin->viewProfileManager(); | ||
269 | Kasten::ByteArrayViewProfileSynchronizer* viewProfileSynchronizer = | 219 | Kasten::ByteArrayViewProfileSynchronizer* viewProfileSynchronizer = | ||
270 | new Kasten::ByteArrayViewProfileSynchronizer( viewProfileManager ); | 220 | new Kasten::ByteArrayViewProfileSynchronizer( viewProfileManager ); | ||
271 | viewProfileSynchronizer->setViewProfileId( viewProfileManager->defaultViewProfileId() ); | 221 | viewProfileSynchronizer->setViewProfileId( viewProfileManager->defaultViewProfileId() ); | ||
272 | return new OktetaView( this, viewProfileSynchronizer ); | 222 | return new OktetaView( this, viewProfileSynchronizer ); | ||
273 | #else | | |||
274 | return new OktetaView( this ); | | |||
275 | #endif | | |||
276 | } | 223 | } | ||
277 | 224 | | |||
278 | bool OktetaDocument::closeDocument(bool silent) | 225 | bool OktetaDocument::closeDocument(bool silent) | ||
279 | { | 226 | { | ||
280 | return close(silent ? Silent : Default); | 227 | return close(silent ? Silent : Default); | ||
281 | } | 228 | } | ||
282 | 229 | | |||
283 | void OktetaDocument::onByteArrayDocumentLoaded( Kasten::AbstractDocument* document ) | 230 | void OktetaDocument::onByteArrayDocumentLoaded( Kasten::AbstractDocument* document ) | ||
284 | { | 231 | { | ||
285 | if( document ) | 232 | if( document ) | ||
286 | { | 233 | { | ||
287 | mByteArrayDocument = static_cast<Kasten::ByteArrayDocument*>( document ); | 234 | mByteArrayDocument = static_cast<Kasten::ByteArrayDocument*>( document ); | ||
288 | #if KASTEN_VERSION == 2 | 235 | connect( mByteArrayDocument->synchronizer(), &Kasten::AbstractModelSynchronizer::localSyncStateChanged, | ||
kfunk: Nitpick: Use new-style connect | |||||
289 | connect( mByteArrayDocument->synchronizer(), SIGNAL(localSyncStateChanged(Kasten2::LocalSyncState)), | 236 | this, &OktetaDocument::onByteArrayDocumentChanged ); | ||
290 | #elif KASTEN_VERSION == 1 | | |||
291 | connect( mByteArrayDocument, SIGNAL(localSyncStateChanged(Kasten1::LocalSyncState)), | | |||
292 | #else | | |||
293 | connect( mByteArrayDocument, SIGNAL(localSyncStateChanged(Kasten::LocalSyncState)), | | |||
294 | #endif | | |||
295 | SLOT(onByteArrayDocumentChanged()) ); | | |||
296 | } | 237 | } | ||
297 | } | 238 | } | ||
298 | 239 | | |||
299 | void OktetaDocument::onByteArrayDocumentChanged() | 240 | void OktetaDocument::onByteArrayDocumentChanged() | ||
300 | { | 241 | { | ||
301 | notifyStateChanged(); | 242 | notifyStateChanged(); | ||
302 | } | 243 | } | ||
303 | 244 | | |||
304 | OktetaDocument::~OktetaDocument() | 245 | OktetaDocument::~OktetaDocument() | ||
305 | { | 246 | { | ||
306 | delete mByteArrayDocument; | 247 | delete mByteArrayDocument; | ||
307 | } | 248 | } | ||
308 | 249 | | |||
309 | } | 250 | } |
Fix indent