Diffusion Calligra f652d13de296

Merge branch 'master' into calligra-gemini-leinir
f652d13de296
Actions

Authored by leinir on Jul 23 2017, 1:47 PM.

Description

Merge branch 'master' into calligra-gemini-leinir

Details

Committed

leinir

Jul 23 2017, 1:47 PM

Parents

R8:b31621174fd1: Add the GeminiMainWindow library
R8:a5a14f883e44: Fix Stage document page in Gemini

Branches

Unknown

Tags

Unknown

leinir committed R8:f652d13de296: Merge branch 'master' into calligra-gemini-leinir (authored by leinir).Jul 23 2017, 1:47 PM

leinir mentioned this in R8:1bbb6e00022b: Port Calligra Gemini for 3.x.Nov 8 2017, 2:17 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit		Author	Details	Committed
b31621174fd1		leinir	Add the GeminiMainWindow library	Jul 23 2017
d743ceb472db		vandenoever	clazy fixes	Jul 22 2017
85938ea78a6e		vandenoever	clazy fixes	Jul 22 2017
898702477624		vandenoever	Add a seed parameter to make the qHash used	Jul 22 2017
1df54cb184ab		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 17 2017
8d3b5a27812f		ltoscano	Fix translations, partial revert of quoting	Jul 12 2017
12b2ddf87c28		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 12 2017
45f809f010ec		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 12 2017
f39a0615536d		danders	Sheets test: just for debuggung tests on CI	Jul 11 2017
db74842b3d88		danders	Plan: Remove runtime warnings	Jul 11 2017
450fb5e1d4ba		danders	Plan: Mark document as modified if project props are changed on creation	Jul 11 2017
f878d31c6459		danders	More "space in directory names" fixes	Jul 11 2017
40c05982373b		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 11 2017
e8bea7bac370		danders	Fix failing unit tests, again	Jul 10 2017
5a6f789d92ea		danders	Fix failing unit tests	Jul 10 2017
9c52accb7a19		danders	Plan: Remove possible duplicates in holiday regions (due to…	Jul 10 2017
e40000e8dd0d		danders	Plan: Properly #ifdef HAVE_KHOLIDAYS	Jul 10 2017
ee020430e2c9		danders	Plan: Pick default holidays based on country in timezone	Jul 10 2017
b276d0c7b2ee		anthonyfieroni	Merge branch 'master' of git://anongit.kde.org/calligra	Jul 10 2017
7317a1faae84	D5094	anthonyfieroni	[artisictextshape] Remove cache to limit ram usage	Jul 10 2017
f962ca806bcd		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 10 2017
ad0302afe36d		yurchor	Fix minor typos	Jul 8 2017
408db2fc4ed8		danders	Plan: Add support for holidays	Jul 7 2017
b0f5de5a1815		pino	cmake: do not overwrite description & url for shared-mime-info	Jul 6 2017
87f0f297d193		yurchor	Fix minor typo	Jul 4 2017
a3b759da0bb6		danders	Plan: Connect to proper signal from main project dialog	Jul 3 2017
208777b0751c		danders	Plan: Polish WelcomeView	Jul 3 2017
39ac5ec22b00		danders	Plan: Use enum when refering to CalendarItemModel columns	Jul 3 2017
071791e00c29		yurchor	Fix minor typo	Jul 1 2017
d26f050f81e9		yurchor	Fix minor typo	Jul 1 2017
c72a8d51282c		danders	Plan: Fixes related to startup	Jun 30 2017
1caead57b0fd		danders	Plan: Calendar view: Handle context menus with no calendar	Jun 30 2017
f07d88adcd7a		danders	Plan welcomeview: Make dialogs non-blocking and singular	Jun 29 2017
0f560a5da176		danders	Plan: Looks better if we do not delete the startup widget	Jun 29 2017
e2d748044068		danders	Plan: Assign multiple tasks to same resource	Jun 27 2017
e9bc0c37cc19		pino	fixuifiles	Jun 26 2017
ce7d21514ce0		danders	Plan: Add support for shared resources	Jun 26 2017
232a6697351f		danders	Plan: Clenaup all resources when removing a calendar	Jun 26 2017
59e1ba7c5b38		pino	typo fixes	Jun 25 2017
cdf024838a06		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 11 2017
d23153bd596d		cfeck	Sheets LaTeX export: Fix typo in UI string	Jun 6 2017
797b6249724b		danders	Plan: Add odt report templates	Jun 2 2017
4eb2eb036c95		danders	Plan: Add report generator	Jun 2 2017
079aea214e3c		danders	Plan: Make kreports optional	Jun 2 2017
37d2e24933ec		l10n daemon script	GIT_SILENT made messages (after extraction)	May 22 2017
c42ec281febf		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 16 2017
6fcfce77e921		l10n daemon script	GIT_SILENT made messages (after extraction)	May 16 2017
2f38f30a0f12		pino	cmake: remove unused modules	May 14 2017
2c287a028315		pino	Revert "fix linking with msvc"	May 14 2017
014bdd1166b6		pino	cmake: switch to the FindPoppler module from ECM	May 14 2017

Changes (160)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		CMakeLists.txt
M		braindump/data/org.kde.braindump.appdata.xml
D		cmake/modules/FindOpenJPEG.cmake
D		cmake/modules/FindPoppler.cmake
M		cmake/modules/FindPopplerXPDFHeaders.cmake
D		cmake/modules/MacroJPEG.cmake
M		devtools/cstester/visualimagecompare/CMakeLists.txt
M		devtools/rng2cpp/rng2cpp.cpp
M		extras/calligra/main.cpp
M		extras/converter/calligraconverter.cpp
M		filters/karbon/pdf/CMakeLists.txt
M		filters/karbon/svg/calligra_filter_svg2karbon.desktop
M		filters/karbon/wmf/calligra_filter_karbon2wmf.desktop
M		filters/karbon/wmf/calligra_filter_wmf2svg.desktop
M		filters/karbon/wpg/calligra_filter_wpg2svg.desktop
M		filters/karbon/xaml/karbon_xaml_export.desktop
M		filters/karbon/xaml/karbon_xaml_import.desktop
M		filters/karbon/xfig/calligra_filter_xfig2odg.desktop
M		filters/sheets/applixspread/calligra_filter_applixspread2kspread.desktop
M		filters/sheets/csv/calligra_filter_csv2sheets.desktop
M		filters/sheets/csv/calligra_filter_sheets2csv.desktop
M		filters/sheets/latex/export/latexexportwidget.ui
M		filters/sheets/opencalc/calligra_filter_opencalc2sheets.desktop
M		filters/sheets/opencalc/calligra_filter_sheets2opencalc.desktop
M		filters/sheets/qpro/calligra_filter_qpro2sheets.desktop
M		filters/stage/powerpoint/calligra_filter_ppt2odp.desktop
M		filters/stage/pptx/calligra_filter_pptx2odp.desktop
M		flow/part/org.kde.calligraflow.appdata.xml
M		gemini/lib/CMakeLists.txt
M		gemini/lib/GeminiMainWindow.cpp
M		gemini/lib/GeminiMainWindow.h
M		gemini/main.cpp
M		gemini/thumbnailhelper.cpp
M		karbon/data/karbon_dock.desktop
M		karbon/data/org.kde.karbon.appdata.xml
M		karbon/main.cpp
M		karbon/stencils/BPMN/Ad-Hoc-Collapsed-Sub-Process.desktop
M		karbon/stencils/BPMN/Collapsed-Sub-Process.desktop
M		karbon/stencils/BPMN/Compensation-Collapsed-Sub-Process.desktop
M		karbon/stencils/BPMN/Looping-Collapsed-Sub-Process.desktop
M		karbon/stencils/BPMN/Multiple-Instance-Collapsed-Sub-Process.desktop
M		karbon/stencils/Contact/collection.desktop
M		karbon/stencils/Flags/czechia.desktop
M		karbon/stencils/Scenegraph/switch.desktop
M		kundo2_aware_xgettext.sh
M		libs/main/KoApplication.cpp
M		libs/main/KoApplication.h
M		libs/odf/KoBorder.cpp
M		libs/odf/KoColumns.cpp
M		libs/odf/KoOdfGraphicStyles.cpp
M		libs/odf/KoStyleStack.cpp
M		libs/odf/tests/TestKoGenStyles.cpp
M		libs/odf/tests/TestXmlReader.cpp
M		libs/odf/tests/TestXmlReaderWithoutSpaces.cpp
M		libs/store/KoEncryptedStore.cpp
M		libs/store/KoXmlReader.cpp
M		libs/store/tests/storedroptest.cpp
M		plan/CMakeLists.txt
A		plan/ConfigProjectPanel.cpp
P		plan/ConfigProjectPanel.h Copied from plan/kptpart.h
A		plan/ConfigProjectPanel.ui
A		plan/ConfigWorkVacationPanel.cpp
P		plan/ConfigWorkVacationPanel.h Copied from plan/kptpart.h
A		plan/ConfigWorkVacationPanel.ui
M		plan/about/aboutpage.cpp
M		plan/about/intro.html
M		plan/about/main.html
M		plan/about/tips.html
M		plan/about/tutorial.html
M		plan/calligraplan.rc
M		plan/calligraplansettings.kcfg
M		plan/kptconfig.cpp
M		plan/kptconfig.h
M		plan/kptmaindocument.cpp
M		plan/kptmaindocument.h
M		plan/kptpart.cpp
P		plan/kptpart.h Copied to multiple locations: plan/ConfigProjectPanel.h plan/ConfigWorkVacationPanel.h
M		plan/kptview.cpp
M		plan/kptview.h
M		plan/kptviewlistdialog.cpp
M		plan/libs/kernel/CMakeLists.txt
M		plan/libs/kernel/kptcalendar.cpp
M		plan/libs/kernel/kptcalendar.h
M		plan/libs/kernel/kptcommand.cpp
M		plan/libs/kernel/kptcommand.h
M		plan/libs/kernel/kptconfigbase.h
M		plan/libs/kernel/kptproject.cpp
M		plan/libs/kernel/kptproject.h
M		plan/libs/kernel/kptresource.cpp
M		plan/libs/kernel/kptresource.h
M		plan/libs/models/CMakeLists.txt
M		plan/libs/models/kptcalendarmodel.cpp
M		plan/libs/models/kptcalendarmodel.h
M		plan/libs/models/kptcommonstrings.cpp
M		plan/libs/models/kptcommonstrings.h
M		plan/libs/models/kptnodeitemmodel.cpp
M		plan/libs/models/kptnodeitemmodel.h
M		plan/libs/models/kptresourcemodel.cpp
M		plan/libs/models/kptresourcemodel.h
M		plan/libs/models/kptschedulemodel.cpp
M		plan/libs/models/kpttaskstatusmodel.cpp
A	(dir)	plan/libs/models/reportgenerator/
A		plan/libs/models/reportgenerator/ReportGenerator.cpp
A		plan/libs/models/reportgenerator/ReportGenerator.h
A		plan/libs/models/reportgenerator/ReportGeneratorOdt.cpp
A		plan/libs/models/reportgenerator/ReportGeneratorOdt.h
M		plan/libs/ui/CMakeLists.txt
A		plan/libs/ui/ResourceAllocationView.cpp
A		plan/libs/ui/ResourceAllocationView.h
M		plan/libs/ui/kptcalendareditor.cpp
M		plan/libs/ui/kptmainprojectdialog.cpp
M		plan/libs/ui/kptmainprojectdialog.h
M		plan/libs/ui/kptmainprojectpanel.cpp
M		plan/libs/ui/kptmainprojectpanel.h
M		plan/libs/ui/kptmainprojectpanelbase.ui
M		plan/libs/ui/kptresourceeditor.cpp
M		plan/libs/ui/kpttaskeditor.cpp
M		plan/libs/ui/kpttaskstatusview.cpp
M		plan/libs/ui/kptviewbase.cpp
M		plan/libs/ui/kptviewbase.h
M		plan/libs/ui/reports/items/text/PlanReportItemText.cpp
M		plan/libs/ui/reports/items/text/text.json
A	(dir)	plan/libs/ui/reportsgenerator/
A		plan/libs/ui/reportsgenerator/ProjectPerformance.odt
A		plan/libs/ui/reportsgenerator/ProjectPerformanceCost.odt
A		plan/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
A		plan/libs/ui/reportsgenerator/ReportsGeneratorView.h
A		plan/libs/ui/reportsgenerator/TaskStatus.odt
A	(dir)	plan/libs/ui/welcome/
A		plan/libs/ui/welcome/WelcomeView.cpp
A		plan/libs/ui/welcome/WelcomeView.h
A		plan/libs/ui/welcome/WelcomeView.ui
M		plan/main.cpp
M		plan/org.kde.calligraplan.appdata.xml
M		plugins/artistictextshape/ArtisticTextShape.cpp
M		plugins/artistictextshape/ArtisticTextShape.h
M		plugins/stencilsdocker/calligra_docker_stencils.desktop
M		sheets/ValueParser.cpp
M		sheets/org.kde.calligrasheets.appdata.xml
M		sheets/org.kde.calligrasheets.desktop
M		sheets/part/Main.cpp
M		stage/app/main.cpp
M		stage/app/org.kde.calligrastage.appdata.xml
M		tests/test_i18n.sh
M		tests/test_i18n_noop.sh
M		tests/test_i18n_noop2.sh
M		tests/test_i18nc.sh
M		tests/test_i18nc_long.sh
M		tests/test_i18np.sh
M		tests/test_kundo2_i18n.sh
M		tests/test_kundo2_i18nc.sh
M		tests/test_kundo2_i18nc_long.sh
M		tests/test_messages.sh
M		tests/test_xi18n.sh
M		tests/test_xi18nc.sh
M		tests/test_xi18nc_long.sh
M		tests/test_xi18ncp.sh
M		tests/test_xi18np.sh
M		words/app/main.cpp
M		words/app/org.kde.calligrawords.appdata.xml