[calligra] /: Remove move leftovers of Flow
Pino Toscano
null at kde.org
Wed Mar 18 21:38:57 GMT 2020
Git commit fdd1ff321efc62ab6205fcc30ce7007c2e7b10c2 by Pino Toscano.
Committed on 18/03/2020 at 21:37.
Pushed by pino into branch 'master'.
Remove move leftovers of Flow
M +0 -5 README
M +0 -1 cmake/productsets/desktop.cmake
M +0 -1 cmake/productsets/osx.cmake
M +0 -1 devtools/iconcheck/findunusedicons.py
M +0 -1 doc/stage/index.docbook
M +0 -4 doc/status.txt
M +0 -13 doc/tocs.txt
M +0 -4 extras/quickprint/CMakeLists.txt
D +0 -45 extras/quickprint/flow_print.desktop
M +3 -3 extras/thumbnail/CMakeLists.txt
M +1 -1 windows/calligra_installer/PreserveGUIDs.xslt
M +0 -16 windows/calligra_installer/calligra.wxs
M +0 -1 windows/calligra_installer/en-us.wxl
https://commits.kde.org/calligra/fdd1ff321efc62ab6205fcc30ce7007c2e7b10c2
diff --git a/README b/README
index c0191c2cd0e..1ceef3ceacc 100644
--- a/README
+++ b/README
@@ -26,11 +26,6 @@ Advanced plugins:
- Chart - Graphic data visualization
- KFormula - Mathematical formulas
-The applications not yet part of the official release, but will
-be included in a next version:
-
-- Flow - Flowcharting program
-
More information can be found at http://www.calligra.org
diff --git a/cmake/productsets/desktop.cmake b/cmake/productsets/desktop.cmake
index 7e9a10fb7e3..1bda2a5c6c5 100644
--- a/cmake/productsets/desktop.cmake
+++ b/cmake/productsets/desktop.cmake
@@ -4,7 +4,6 @@ calligra_define_productset(DESKTOP "Calligra for Desktop"
OPTIONAL
# apps
BRAINDUMP
- FLOW
KARBON
SHEETS
STAGE
diff --git a/cmake/productsets/osx.cmake b/cmake/productsets/osx.cmake
index a997f3df1ce..61eace4102a 100644
--- a/cmake/productsets/osx.cmake
+++ b/cmake/productsets/osx.cmake
@@ -5,7 +5,6 @@ calligra_define_productset(OSX "Calligra for OS X Desktop"
OPTIONAL
# apps
BRAINDUMP
- FLOW
KARBON
SHEETS
STAGE
diff --git a/devtools/iconcheck/findunusedicons.py b/devtools/iconcheck/findunusedicons.py
index 2ece5f0177e..75faf41ba1f 100755
--- a/devtools/iconcheck/findunusedicons.py
+++ b/devtools/iconcheck/findunusedicons.py
@@ -17,7 +17,6 @@ def createCalligraIconFile(calligraIconsFile):
"-name 'docs' -o " +
"-name 'tests' \) -prune -o " +
"! -path './braindump/data/states/states/*' " +
- "! -path './flow/*' " + # not ported for 3.x currently
"! -path './gemini/themes/*' " +
"! -path './karbon/stencils/*' " +
"! -path './plugins/karbonplugins/tools/CalligraphyTool/tutorial/*' " +
diff --git a/doc/stage/index.docbook b/doc/stage/index.docbook
index 1948647d8dc..2bb32319006 100644
--- a/doc/stage/index.docbook
+++ b/doc/stage/index.docbook
@@ -5,7 +5,6 @@
<!ENTITY tables "<application>Calligra Tables</application>">
<!ENTITY words "<application>Calligra Words</application>">
<!ENTITY stage "<application>Calligra Stage</application>">
- <!ENTITY flow "<application>Calligra Flow</application>">
<!ENTITY plan "<application>Calligra Plan</application>">
<!-- the following author entities have been added to user.entities in 4.10 branch and trunk of svn
they can be removed from this file once they are present in the kdelibs minimum version required by &kappname; -->
diff --git a/doc/status.txt b/doc/status.txt
index ca8b6fa2da7..61b0712d929 100644
--- a/doc/status.txt
+++ b/doc/status.txt
@@ -56,10 +56,6 @@ there are almost no screenshots and only very little actual text.
It's also questionable if we should include tips on how you should do
presentations. If so, it ought to be an appendix, not a running chapter.
-Flow
-
-Screenshots are missing, a toolbars and menus description should be added.
-
Karbon
Easy: no documentation at all.
diff --git a/doc/tocs.txt b/doc/tocs.txt
index a278ec61d94..c3cc06eb959 100644
--- a/doc/tocs.txt
+++ b/doc/tocs.txt
@@ -139,19 +139,6 @@ Reference Guide
--------------------------------------------------------------------------------
-Flow
-
-Introduction
- Basically a copy of the goals described in the general Calligra handbook.
-Working with Calligra Flow
- Working with stencils
- Working with stencil sets
- <more technologies?>
-<usecases>
-Reference Guide
-
---------------------------------------------------------------------------------
-
Karbon
Introduction
diff --git a/extras/quickprint/CMakeLists.txt b/extras/quickprint/CMakeLists.txt
index f9ab1b9a223..a79912aa094 100644
--- a/extras/quickprint/CMakeLists.txt
+++ b/extras/quickprint/CMakeLists.txt
@@ -2,10 +2,6 @@
set( QUICK_PRINT_SERVICES
)
-if( SHOULD_BUILD_APP_FLOW )
- set( QUICK_PRINT_SERVICES ${QUICK_PRINT_SERVICES} flow_print.desktop )
-endif()
-
if( SHOULD_BUILD_APP_KARBON )
set( QUICK_PRINT_SERVICES ${QUICK_PRINT_SERVICES} karbon_print.desktop )
endif()
diff --git a/extras/quickprint/flow_print.desktop b/extras/quickprint/flow_print.desktop
deleted file mode 100644
index fc32b6e4b49..00000000000
--- a/extras/quickprint/flow_print.desktop
+++ /dev/null
@@ -1,45 +0,0 @@
-[Desktop Entry]
-Type=Service
-ServiceTypes=KonqPopupMenu/Plugin
-MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.visio;
-Actions=Print;
-
-[Desktop Action Print]
-Name=Print with Calligra Flow...
-Name[bs]=Štampanej s Calligra Flow---...
-Name[ca]=Imprimeix amb el Calligra Flow...
-Name[ca at valencia]=Imprimeix amb el Calligra Flow...
-Name[cs]=Tisknout pomocí Calligra Flow...
-Name[da]=Udskriv med Calligra Flow...
-Name[de]=Drucken mit Calligra Flow ...
-Name[el]=Εκτύπωση με το Calligra Flow...
-Name[en_GB]=Print with Calligra Flow...
-Name[es]=Imprimir con Calligra Flow...
-Name[et]=Trükkimine Calligra Flow'ga...
-Name[eu]=Calligra Flow-ren bidez inprimatu...
-Name[fi]=Tulosta Calligra Flow’lla…
-Name[fr]=Imprimer avec Calligra Flow...
-Name[gl]=Imprimir con Calligra Flow…
-Name[hu]=Nyomtatás a Calligra Flow-val…
-Name[ia]=Imprime con Calligra Flow...
-Name[it]=Stampa con Calligra Flow...
-Name[ja]=Calligra Flow で印刷...
-Name[kk]=Calligra Flow-мен басып шығару
-Name[ko]=Calligra Flow로 인쇄...
-Name[nb]=Skriv ut med Calligra Flow …
-Name[nl]=Met Calligra Flow afdrukken...
-Name[nn]=Skriv ut med Calligra Flow …
-Name[pl]=Drukuj z Schematami Calligra...
-Name[pt]=Imprimir com o Calligra Flow...
-Name[pt_BR]=Imprimir com o Calligra Flow...
-Name[ru]=Печать в Calligra Flow...
-Name[sk]=Tlačiť pomocou Calligra Flow...
-Name[sl]=Natisni s Calligra Flow ...
-Name[sv]=Skriv ut med Calligra Flow...
-Name[tr]=Calligra Flow ile yazdır...
-Name[uk]=Надрукувати за допомогою Calligra Flow…
-Name[x-test]=xxPrint with Calligra Flow...xx
-Name[zh_CN]=用 Calligra Flow 打印...
-
-Exec=calligraflow --print %U
-Icon=document-print
diff --git a/extras/thumbnail/CMakeLists.txt b/extras/thumbnail/CMakeLists.txt
index 437893abbd2..e7d5e1bc2f1 100644
--- a/extras/thumbnail/CMakeLists.txt
+++ b/extras/thumbnail/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(calligrathumbnail MODULE ${calligrathumbnail_SRCS})
target_link_libraries(calligrathumbnail komain KF5::KIOWidgets)
install(TARGETS calligrathumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
-if( SHOULD_BUILD_APP_FLOW OR SHOULD_BUILD_APP_KARBON )
+if( SHOULD_BUILD_APP_KARBON )
set(calligraimagethumbnail_SRCS calligracreator.cpp)
add_library(calligraimagethumbnail MODULE ${calligraimagethumbnail_SRCS})
set_target_properties(calligraimagethumbnail PROPERTIES COMPILE_FLAGS "-DNO_ICON_BLENDING")
@@ -20,8 +20,8 @@ endif()
set( THUMBNAIL_SERVICES
)
-# both flow and karbon load odg natively, so if any is build add support for odg
-if( SHOULD_BUILD_APP_FLOW OR SHOULD_BUILD_APP_KARBON )
+# karbon loads odg natively, so if it is built add support for odg
+if( SHOULD_BUILD_APP_KARBON )
list( APPEND THUMBNAIL_SERVICES calligra_odg_thumbnail.desktop )
endif()
diff --git a/windows/calligra_installer/PreserveGUIDs.xslt b/windows/calligra_installer/PreserveGUIDs.xslt
index 7777e342bea..73ddc10d0a7 100644
--- a/windows/calligra_installer/PreserveGUIDs.xslt
+++ b/windows/calligra_installer/PreserveGUIDs.xslt
@@ -59,7 +59,7 @@
<xsl:template match="wix:File/@Id">
<xsl:variable name="programNames">
<!-- Always also put a final ',' to the last item -->
- <xsl:text>braindump,calligraflow,calligrasheets,calligrastage,calligrawords,karbon,</xsl:text>
+ <xsl:text>braindump,calligrasheets,calligrastage,calligrawords,karbon,</xsl:text>
</xsl:variable>
<xsl:attribute name="Id">
<xsl:call-template name="setId">
diff --git a/windows/calligra_installer/calligra.wxs b/windows/calligra_installer/calligra.wxs
index ebeba994c5d..7aebbe27b56 100644
--- a/windows/calligra_installer/calligra.wxs
+++ b/windows/calligra_installer/calligra.wxs
@@ -82,15 +82,6 @@
</Component>
- <?if $(env.BUILDflow) = on ?>
- <Component Id="FLOW.LNK" DiskId="1" Guid="{C52C9784-19E8-414d-B083-893EA8B79B83}">
- <CreateFolder/>
- <Shortcut Id="ProgramMenu.CalligraFlow" Directory="ProgramMenuDir" Name="Calligra Flow"
- WorkingDirectory='CALLIGRADIR' Icon="Icon.Flow.exe" IconIndex="0" Advertise="no"
- Arguments="--style windowsvista" Target="[CALLIGRADIR]bin\calligraflow.exe" />
- </Component>
- <?endif ?>
-
<?if $(env.BUILDkarbon) = on ?>
<Component Id="KARBON.LNK" DiskId="1" Guid="F784F8B3-1F5F-404f-8480-ECF870C03D5B">
<!-- CALLIGRA PROGRAM MENU -->
@@ -126,7 +117,6 @@
<Component Id="DesktopShortcuts" DiskId="1" Guid="95136A79-458C-4c9d-860F-0319FD47B3EA">
<!-- CALLIGRA PROGRAM MENU -->
- <!-- Removed Flow icon from Desktop until correct icon is available -->
<CreateFolder/>
<?if $(env.BUILDkarbon) = on ?>
@@ -196,9 +186,6 @@
<ComponentRef Id="STARTAPP.VBS" />
- <?if $(env.BUILDflow) = on ?>
- <ComponentRef Id="FLOW.LNK" />
- <?endif ?>
<?if $(env.BUILDkarbon) = on ?>
<ComponentRef Id="KARBON.LNK" />
<?endif ?>
@@ -243,9 +230,6 @@
-->
<!-- Icons -->
- <?if $(env.BUILDflow) = on ?>
- <Icon Id="Icon.Flow.exe" SourceFile="$(env.C2WINSTALL_INPUT)\bin\CALLIGRAFLOW.EXE" />
- <?endif ?>
<?if $(env.BUILDkarbon) = on ?>
<Icon Id="Icon.Karbon.exe" SourceFile="$(env.C2WINSTALL_INPUT)\bin\KARBON.EXE" />
<?endif ?>
diff --git a/windows/calligra_installer/en-us.wxl b/windows/calligra_installer/en-us.wxl
index 22ba3ba0633..b60c9187602 100644
--- a/windows/calligra_installer/en-us.wxl
+++ b/windows/calligra_installer/en-us.wxl
@@ -15,7 +15,6 @@
<String Id="ApplicationNameWords">Calligra Words [C2WINSTALL_VERSIONSTRING]</String>
<String Id="ApplicationNameSheets">Calligra Sheets [C2WINSTALL_VERSIONSTRING]</String>
<String Id="ApplicationNameStage">Calligra Stage [C2WINSTALL_VERSIONSTRING]</String>
- <String Id="ApplicationNameFlow">Calligra Flow [C2WINSTALL_VERSIONSTRING]</String>
<String Id="ApplicationNameKarbon">Karbon [C2WINSTALL_VERSIONSTRING]</String>
<!-- Filetype assocations -->
More information about the kde-doc-english
mailing list