> On Oct. 30, 2014, 7:45 p.m., Friedrich W. H. Kossebau wrote: > > CalligraProducts.cmake, line 136 > > <https://git.reviewboard.kde.org/r/120890/diff/2/?file=323629#file323629line136> > > > > Hm, PLUGIN_QTQUICK defined after being referenced before by APP_GEMINI > > is not supported (no lazy id resolving implemeneted yet). So this would > > need to move before the definition of APP_GEMINI. > > > > Not sure, but is this not more kind of a part then a plugin? So I would > > list PLUGIN_QTQUICK in the section "# parts" and perhaps also rename it to > > PART_QTQUICK.
Technical reason's obvious yeah, it needs to move elsewhere... There's something else to consider here, though... PARTs are currently all KParts, right? That would be changed if we changed PLUGIN_QTQUICK to PART_QTQUICK... I'm not against it, since it's also a point that all the other PLUGIN entries are Calligra plugins, as opposed to just technically a Qt based plugin like the QtQuick components are... One or the other of the two sections would be changed, and i guess it sort of makes sense, since the whole PART thing would change anyway for 3... unless i'm mistaken here, which is entirely possible ;) (an hour or so later, after other stuff ;) ) Right, i've changed it to a part - it isn't technically one, but it fulfills that position conceptually, so that works :) > On Oct. 30, 2014, 7:45 p.m., Friedrich W. H. Kossebau wrote: > > qtquick/CMakeLists.txt, line 3 > > <https://git.reviewboard.kde.org/r/120890/diff/2/?file=323663#file323663line3> > > > > Is this include needed? Hmm... We used it in the past for install dir locations on Windows... but i guess that has been fixed since, we're not using what it defines, so no :) > On Oct. 30, 2014, 7:45 p.m., Friedrich W. H. Kossebau wrote: > > libs/main/gemini/ViewModeSwitchEvent.h, line 93 > > <https://git.reviewboard.kde.org/r/120890/diff/2/?file=323658#file323658line93> > > > > This line intended? If so, "m" might not be the best symbol name here... > > And also needs a comment, to avoid further "hu?" faces... Hm, no, that's not needed... very strange bit of left-over, looks like something from experimentation times... it exists in the Krita version, i wonder if it's used there - not cleaning that one in this merge, but yeah, very odd... anyway, not used in Calligra Gemini etc, so removed from here :) > On Oct. 30, 2014, 7:45 p.m., Friedrich W. H. Kossebau wrote: > > libs/main/KoView.cpp, line 364 > > <https://git.reviewboard.kde.org/r/120890/diff/2/?file=323657#file323657line364> > > > > Please also add a comment why multiple KoMainWindow can nest each > > other, surprising to the innocent code reader, e.g. me :) They can't - but multiple mainwindows can :) explained now, but in short, Gemini embeds a KoMainWindow inside another QMainWindow, so the window() call won't return the KoMainWindow instance (as it's not top-level), but given it still exists, we do this search :) > On Oct. 30, 2014, 7:45 p.m., Friedrich W. H. Kossebau wrote: > > libs/main/KoTemplate.h, line 29 > > <https://git.reviewboard.kde.org/r/120890/diff/2/?file=323652#file323652line29> > > > > Thanks, that should help everyone to create new Calligra-style > > templates, with variants :) You're welcome :) It's something we should also support for (as in visual support) in the welcome panes of the standard desktop apps, but given there's plans for redoing those for 3 anyway, that would probably be a bit premature :) (also outside the scope here anyway) > On Oct. 30, 2014, 7:45 p.m., Friedrich W. H. Kossebau wrote: > > filters/words/msword-odf/wv2/src/utilities.cpp, line 63 > > <https://git.reviewboard.kde.org/r/120890/diff/2/?file=323638#file323638line63> > > > > Why toLocal8Bit()? I would have expected toLatin1()? Hmm... In this instance, i guess it doesn't really matter... Normally, toLatin1 is problematic when dealing with people outside a certain very narrow selection of manking (those who think latin1 is the only character set), but this is specifically number stuff... so yeah, let's latin1 it here :) > On Oct. 30, 2014, 7:45 p.m., Friedrich W. H. Kossebau wrote: > > libs/main/KoDocumentSectionDelegate.cpp, line 48 > > <https://git.reviewboard.kde.org/r/120890/diff/2/?file=323649#file323649line48> > > > > I guess future code readers might need a hint why this flag is needed. > > Also not immediately obvious to me already now. > > When can it happen that the same delegate gets called in paint() while > > it already has been called there and is only executing it? Actually, looked into that a bit deeper - this was left-over code from some crash reduction work. It isn't needed, so i got rid of it :) - Dan Leinir Turthra ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/120890/#review69542 ----------------------------------------------------------- On Oct. 30, 2014, 2:54 p.m., Dan Leinir Turthra Jensen wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/120890/ > ----------------------------------------------------------- > > (Updated Oct. 30, 2014, 2:54 p.m.) > > > Review request for Calligra. > > > Repository: calligra > > > Description > ------- > > The many changes in this patch are all the ones found in the Calligra Gemini > branch. It includes the addition of the Qt Quick compinents created a while > ago by Arjen and Shantanu, as well as a number of changes which improves the > writing performance and experience in Words, especially when dealing with > very large documents. It further extends the template system with support for > variations. > > It does not include the gemini subdirectory itself (and as such to compile > this you would need to check out the branch itself, rather than apply this > patch), the reason being the large amount of data found in this subdirectory > took the patch from the current 233KiB to a nice, solid 55MiB. So, i thought > this would be more useful. > > > Diffs > ----- > > stage/templates/common_desktop/emptyLandscapeWide.desktop c5f8f8a > stage/templates/odf/CMakeLists.txt f7db7d0 > stage/templates/odf/blue_orange_vector.desktop 31dae09 > stage/templates/odf/blue_orange_vector.png PRE-CREATION > stage/templates/odf/burning_desire.desktop ac79022 > stage/templates/odf/burning_desire.png PRE-CREATION > stage/templates/odf/business.desktop d552db3 > stage/templates/odf/business.png PRE-CREATION > stage/templates/odf/cohere-blue.desktop PRE-CREATION > stage/templates/odf/cohere-blue.otp PRE-CREATION > stage/templates/odf/cohere-blue.png PRE-CREATION > stage/templates/odf/cohere-gold.desktop PRE-CREATION > stage/templates/odf/cohere-gold.otp PRE-CREATION > stage/templates/odf/cohere-gold.png PRE-CREATION > stage/templates/odf/cohere-magenta.desktop PRE-CREATION > stage/templates/odf/cohere-magenta.otp PRE-CREATION > stage/templates/odf/cohere-magenta.png PRE-CREATION > stage/part/animations/KPrAnimateColor.cpp 59a5e0e > stage/part/animations/KPrAnimateTransform.cpp 914047e > qtquick/CQTextToCModel.h PRE-CREATION > qtquick/CQTextToCModel.cpp PRE-CREATION > qtquick/CQThumbnailItem.h PRE-CREATION > qtquick/CQThumbnailItem.cpp PRE-CREATION > qtquick/CalligraQtQuickComponentsPlugin.h PRE-CREATION > qtquick/CalligraQtQuickComponentsPlugin.cpp PRE-CREATION > qtquick/qmldir PRE-CREATION > stage/part/KPrView.h b4bab24 > stage/part/KPrView.cpp 1edd8e8 > stage/part/animations/KPrAnimTransitionFilter.cpp 3347fe1 > qtquick/CQTextDocumentModel.cpp PRE-CREATION > qtquick/CQTextDocumentNotesModel.h PRE-CREATION > qtquick/CQTextDocumentNotesModel.cpp PRE-CREATION > qtquick/CQCanvasBase.h PRE-CREATION > qtquick/CQCanvasBase.cpp PRE-CREATION > qtquick/CQCanvasController.h PRE-CREATION > qtquick/CQCanvasController.cpp PRE-CREATION > qtquick/CQCanvasControllerItem.h PRE-CREATION > qtquick/CQCanvasControllerItem.cpp PRE-CREATION > qtquick/CQImageProvider.h PRE-CREATION > qtquick/CQImageProvider.cpp PRE-CREATION > qtquick/CQLinkArea.h PRE-CREATION > qtquick/CQLinkArea.cpp PRE-CREATION > qtquick/CQPluginLoaderProxy.h PRE-CREATION > qtquick/CQPluginLoaderProxy.cpp PRE-CREATION > qtquick/CQPresentationCanvas.h PRE-CREATION > qtquick/CQPresentationCanvas.cpp PRE-CREATION > qtquick/CQPresentationModel.h PRE-CREATION > qtquick/CQPresentationModel.cpp PRE-CREATION > qtquick/CQPresentationView.h PRE-CREATION > qtquick/CQPresentationView.cpp PRE-CREATION > qtquick/CQSpreadsheetCanvas.h PRE-CREATION > qtquick/CQSpreadsheetCanvas.cpp PRE-CREATION > qtquick/CQSpreadsheetListModel.h PRE-CREATION > qtquick/CQSpreadsheetListModel.cpp PRE-CREATION > qtquick/CQTextDocumentCanvas.h PRE-CREATION > qtquick/CQTextDocumentCanvas.cpp PRE-CREATION > qtquick/CQTextDocumentModel.h PRE-CREATION > filters/words/docx/export/DocxFile.cpp d67e41f > filters/words/msword-odf/wv2/src/utilities.cpp 4be8c38 > krita/sketch/KisSketchView.cpp 5cb9172 > krita/sketch/SketchDeclarativeView.cpp e352fc9 > libs/flake/KoCanvasController.h 804a1e4 > libs/flake/KoCanvasController.cpp 5190f62 > libs/flake/KoToolManager.h ac17dd0 > libs/flake/KoToolManager.cpp 5d4da91 > libs/kopageapp/KoPADocumentModel.cpp 22bd75a > libs/kopageapp/tools/backgroundTool/KoPABackgroundToolFactory.cpp f442b84 > libs/main/KoApplication.cpp b20c0e9 > libs/main/KoDocument.h c3936a9 > libs/main/KoDocumentSectionDelegate.cpp 81c53c0 > libs/main/KoMainWindow.cpp 8db43f8 > libs/main/KoPart.cpp 04b8d25 > libs/main/KoTemplate.h f96099c > libs/main/KoTemplate.cpp f1d3bd9 > libs/main/KoTemplateCreateDia.cpp 72573cc > libs/main/KoTemplateGroup.cpp ab35dd1 > libs/main/KoTemplateTree.cpp 8f864b4 > libs/main/KoView.cpp 4770dcc > libs/main/gemini/ViewModeSwitchEvent.h PRE-CREATION > libs/odf/KoEncryptedStore.cpp 53c75b6 > libs/widgets/KoZoomAction.h c5f69b0 > plugins/defaultTools/defaulttool/SelectionDecorator.h 83e715e > plugins/defaultTools/defaulttool/SelectionDecorator.cpp 3e16cfa > qtquick/CMakeLists.txt PRE-CREATION > words/templates/Wordprocessing/professional.png PRE-CREATION > words/templates/Wordprocessing/FaxA4.desktop 2b43998 > words/templates/Wordprocessing/FaxLetter.desktop fc1c161 > words/templates/Wordprocessing/ProfessionalA4.desktop 7c84f34 > words/templates/Wordprocessing/ProfessionalLetter.desktop 5f8b94f > words/templates/Wordprocessing/a4.png PRE-CREATION > words/templates/Wordprocessing/colorful.png PRE-CREATION > words/templates/Wordprocessing/fax.png PRE-CREATION > stage/templates/odf/cohere-red.desktop PRE-CREATION > stage/templates/odf/cohere-red.otp PRE-CREATION > stage/templates/odf/cohere-red.png PRE-CREATION > stage/templates/odf/curious_penguin.desktop 429e7c9 > stage/templates/odf/curious_penguin.png PRE-CREATION > stage/templates/odf/flood_light.desktop 23adbb2 > stage/templates/odf/flood_light.png PRE-CREATION > stage/templates/odf/hisc-action-cohere-blue.svgz PRE-CREATION > stage/templates/odf/hisc-action-cohere-gold.svgz PRE-CREATION > stage/templates/odf/hisc-action-cohere-magenta.svgz PRE-CREATION > stage/templates/odf/hisc-action-cohere-red.svgz PRE-CREATION > stage/templates/odf/kde_events.desktop afa4534 > stage/templates/odf/kde_events.png PRE-CREATION > stage/templates/odf/rounded_square.desktop 85015a2 > stage/templates/odf/rounded_square.png PRE-CREATION > stage/templates/odf/simple_waves.desktop dd2bd96 > stage/templates/odf/simple_waves.png PRE-CREATION > stage/templates/odf/skyline_monotone.desktop 0c9dd68 > stage/templates/odf/skyline_monotone.png PRE-CREATION > stage/templates/odf/skyline_monotone_wide.desktop 152c719 > stage/templates/odf/skyline_monotone_wide.png PRE-CREATION > stage/templates/odf/skyline_morning.desktop ec4140d > stage/templates/odf/skyline_morning.png PRE-CREATION > stage/templates/odf/skyline_morning_wide.desktop d3337ae > stage/templates/odf/skyline_morning_wide.png PRE-CREATION > stage/templates/odf/skyline_night.desktop 28e3a18 > stage/templates/odf/skyline_night.png PRE-CREATION > stage/templates/odf/skyline_night_wide.desktop e188171 > stage/templates/odf/skyline_night_wide.png PRE-CREATION > stage/templates/odf/strange_far_hills.desktop 1a17807 > stage/templates/odf/strange_far_hills.png PRE-CREATION > words/part/KWCanvasBase.cpp 0d2d28f > words/part/KWCanvasItem.cpp cfdae98 > words/part/KWGui.cpp 65aedf7 > words/part/KWPageStyle.h a3bf58b > words/part/KWView.h f21f8e3 > words/part/KWView.cpp 1285d21 > words/part/commands/KWShapeCreateCommand.h eb268f8 > words/part/dockers/KWNavigationWidget.cpp 1bb54e0 > words/part/dockers/KWStatisticsWidget.h eac4d44 > words/part/dockers/KWStatisticsWidget.cpp 63d0384 > words/part/frames/KWCopyShape.h 01eedf5 > words/part/frames/KWCopyShape.cpp 744f292 > words/part/pagetool/KWPageTool.cpp 7935390 > words/templates/Wordprocessing/A4.desktop 8a35eaf > words/templates/Wordprocessing/CMakeLists.txt 88b73fa > words/templates/Wordprocessing/ColorfulA4.desktop 04caf8e > words/templates/Wordprocessing/ColorfulLetter.desktop ce38ab5 > CMakeLists.txt fa00fdd > CalligraProducts.cmake c2ef8ac > active/main.cpp 7e4c888 > active/qml/Test.qml PRE-CREATION > active/src/CASpreadsheetHandler.cpp e8cebff > active/src/CATextDocumentModel.cpp 4e72581 > active/src/MainWindow.cpp c378881 > cmake/modules/FindLibgit2.cmake PRE-CREATION > cmake/modules/FindLibqgit2.cmake PRE-CREATION > > Diff: https://git.reviewboard.kde.org/r/120890/diff/ > > > Testing > ------- > > * Compiles and shipped to users on Windows (through the Calligra Gemini > packages) > * Used every day for writing in a production environment (for producing my > novel and recent short story) > > > Thanks, > > Dan Leinir Turthra Jensen > >
_______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel
