[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bcalligra=5D_/=3A_changed_strings_from_kivio_to_flow?=
From: Yue Liu <opuspace () gmail ! com>
Date: 2011-04-06 1:24:22
Message-ID: 20110406012422.73D34A609B () git ! kde ! org
[Download RAW message or body]
Git commit f6a268e7bf66a679716b84f097ef1221243d2fa3 by Yue Liu.
Committed on 06/04/2011 at 03:24.
Pushed by liu into branch 'master'.
changed strings from kivio to flow
M +2 -2 doc/CMakeLists.txt
M +1 -1 filters/filter-status.txt
M +2 -2 filters/generic_wrapper/generic_filter.cc
M +1 -1 filters/xsltfilter/export/xsltexport.cc
M +1 -1 filters/xsltfilter/import/xsltimport.cc
M +2 -2 libs/flake/KoResourceManager.h
M +1 -1 libs/kotext/KoInlineObject.h
M +4 -4 tools/quickprint/CMakeLists.txt
D +0 -69 tools/quickprint/kivio_konqi.desktop
http://commits.kde.org/calligra/f6a268e7bf66a679716b84f097ef1221243d2fa3
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 488ecfc..922861c 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -4,9 +4,9 @@ endif(BUILD_karbon)
if(BUILD_kexi)
add_subdirectory(kexi)
endif(BUILD_kexi)
-if(BUILD_kivio)
+if(BUILD_flow)
add_subdirectory(flow)
-endif(BUILD_kivio)
+endif(BUILD_flow)
if(BUILD_kchart)
add_subdirectory(kchart)
endif(BUILD_kchart)
diff --git a/filters/filter-status.txt b/filters/filter-status.txt
index 932d648..53491a5 100644
--- a/filters/filter-status.txt
+++ b/filters/filter-status.txt
@@ -134,7 +134,7 @@ Note: pole (p-ole) by Ariya has four copies: in the hancomword, starwriter, exce
* Not compiled.
* export
-== kplato ==
+== flow ==
=== icalendar ===
diff --git a/filters/generic_wrapper/generic_filter.cc b/filters/generic_wrapper/generic_filter.cc
index df9db31..d2c39cf 100644
--- a/filters/generic_wrapper/generic_filter.cc
+++ b/filters/generic_wrapper/generic_filter.cc
@@ -68,11 +68,11 @@ KoFilter::ConversionStatus GenericFilter::convert(const QByteArray &from, const
//decide between import/export
if (m_to == "application/x-kword" || m_to == "application/x-karbon" ||
- m_to == "application/x-kspread" || m_to == "application/x-kivio" ||
+ m_to == "application/x-kspread" || m_to == "application/x-flow" ||
m_to == "application/x-kchart" || m_to == "application/x-kpresenter")
return doImport();
else if (m_from == "application/x-kword" || m_from == "application/x-karbon" ||
- m_from == "application/x-kspread" || m_from == "application/x-kivio" ||
+ m_from == "application/x-kspread" || m_from == "application/x-flow" ||
m_from == "application/x-kchart" || m_from == "application/x-kpresenter")
return doExport();
else
diff --git a/filters/xsltfilter/export/xsltexport.cc b/filters/xsltfilter/export/xsltexport.cc
index 232e0cd..9cd47db 100644
--- a/filters/xsltfilter/export/xsltexport.cc
+++ b/filters/xsltfilter/export/xsltexport.cc
@@ -48,7 +48,7 @@ KoFilter::ConversionStatus XSLTExport::convert(const QByteArray& from, const QBy
{
if (from != "application/x-kword" &&
from != "application/x-kontour" && from != "application/x-kspread" &&
- from != "application/x-kivio" && from != "application/x-kchart" &&
+ from != "application/x-flow" && from != "application/x-kchart" &&
from != "application/x-kpresenter")
return KoFilter::NotImplemented;
kDebug() << "In the xslt filter";
diff --git a/filters/xsltfilter/import/xsltimport.cc b/filters/xsltfilter/import/xsltimport.cc
index b73528e..18489aa 100644
--- a/filters/xsltfilter/import/xsltimport.cc
+++ b/filters/xsltfilter/import/xsltimport.cc
@@ -45,7 +45,7 @@ KoFilter::ConversionStatus XSLTImport::convert(const QByteArray&, const QByteArr
if (to != "application/x-kword" &&
to != "application/x-kontour" && to != "application/x-kspread" &&
- to != "application/x-kivio" && to != "application/x-kchart" &&
+ to != "application/x-flow" && to != "application/x-kchart" &&
to != "application/x-kpresenter")
return KoFilter::NotImplemented;
diff --git a/libs/flake/KoResourceManager.h b/libs/flake/KoResourceManager.h
index 831ff0d..7ec35d9 100644
--- a/libs/flake/KoResourceManager.h
+++ b/libs/flake/KoResourceManager.h
@@ -60,7 +60,7 @@ enum CanvasResource {
ActiveRange, ///< The area where the rulers should show white
KarbonStart = 1000, ///< Base number for karbon specific values.
KexiStart = 2000, ///< Base number for kexi specific values.
- KivioStart = 3000, ///< Base number for kivio specific values.
+ FlowStart = 3000, ///< Base number for flow specific values.
KPlatoStart = 4000, ///< Base number for kplato specific values.
KPresenterStart = 5000, ///< Base number for kpresenter specific values.
KritaStart = 6000, ///< Base number for krita specific values.
@@ -92,7 +92,7 @@ enum DocumentResource {
KarbonStart = 1000, ///< Base number for karbon specific values.
KexiStart = 2000, ///< Base number for kexi specific values.
- KivioStart = 3000, ///< Base number for kivio specific values.
+ FlowStart = 3000, ///< Base number for flow specific values.
KPlatoStart = 4000, ///< Base number for kplato specific values.
KPresenterStart = 5000, ///< Base number for kpresenter specific values.
KritaStart = 6000, ///< Base number for krita specific values.
diff --git a/libs/kotext/KoInlineObject.h b/libs/kotext/KoInlineObject.h
index 20cd642..52df000 100644
--- a/libs/kotext/KoInlineObject.h
+++ b/libs/kotext/KoInlineObject.h
@@ -76,7 +76,7 @@ public:
KarbonStart = 1000, ///< Base number for karbon specific values.
KexiStart = 2000, ///< Base number for kexi specific values.
- KivioStart = 3000, ///< Base number for kivio specific values.
+ FlowStart = 3000, ///< Base number for flow specific values.
KPlatoStart = 4000, ///< Base number for kplato specific values.
KPresenterStart = 5000, ///< Base number for kpresenter specific values.
KritaStart = 6000, ///< Base number for krita specific values.
diff --git a/tools/quickprint/CMakeLists.txt b/tools/quickprint/CMakeLists.txt
index 957e2f7..a125f89 100644
--- a/tools/quickprint/CMakeLists.txt
+++ b/tools/quickprint/CMakeLists.txt
@@ -1,7 +1,7 @@
set( QUICK_PRINT_SERVICES kchart_konqi.desktop karbon_konqi.desktop
kspread_konqi.desktop kpresenter_konqi.desktop
-kword_konqi.desktop krita_konqi.desktop kivio_konqi.desktop )
+kword_konqi.desktop krita_konqi.desktop flow_konqi.desktop )
if( BUILD_kformula )
set( QUICK_PRINT_SERVICES ${QUICK_PRINT_SERVICES} kformula_konqi.desktop )
@@ -12,9 +12,9 @@ endif( BUILD_kformula )
# set( QUICK_PRINT_SERVICES ${QUICK_PRINT_SERVICES} kexi_konqi.desktop )
# endif( BUILD_kexi )
-if( BUILD_kivio )
-set( QUICK_PRINT_SERVICES ${QUICK_PRINT_SERVICES} kivio_konqi.desktop )
-endif( BUILD_kivio )
+if( BUILD_flow )
+set( QUICK_PRINT_SERVICES ${QUICK_PRINT_SERVICES} flow_konqi.desktop )
+endif( BUILD_flow )
install( FILES ${QUICK_PRINT_SERVICES} DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus)
diff --git a/tools/quickprint/kivio_konqi.desktop b/tools/quickprint/kivio_konqi.desktop
deleted file mode 100644
index 784d6fd..0000000
--- a/tools/quickprint/kivio_konqi.desktop
+++ /dev/null
@@ -1,69 +0,0 @@
-[Desktop Entry]
-X-KDE-ServiceTypes=KonqPopupMenu/Plugin,application/x-kivio
-Type=Service
-Actions=Print;
-
-[Desktop Action Print]
-Name=Print...
-Name[be]=Друк...
-Name[bg]=Печат...
-Name[br]=Moulañ ...
-Name[ca]=Imprimeix...
-Name[ca@valencia]=Imprimeix...
-Name[cs]=Tisk...
-Name[cy]=Argraffu...
-Name[da]=Udskriv...
-Name[de]=Drucken ...
-Name[el]=Εκτύπωση...
-Name[en_GB]=Print...
-Name[eo]=Presi...
-Name[es]=Imprimir...
-Name[et]=Trükkimine...
-Name[eu]=Inprimatu...
-Name[fa]=چاپ...
-Name[fi]=Tulosta...
-Name[fr]=Impression...
-Name[fy]=Printsje...
-Name[ga]=Priontáil...
-Name[gl]=Imprimir...
-Name[he]=הדפסה...
-Name[hi]=छापें...
-Name[hne]=छापव...
-Name[hr]=Ispiši …
-Name[hu]=Nyomtatás...
-Name[is]=Prenta...
-Name[it]=Stampa...
-Name[ja]=印刷...
-Name[kk]=Басып шығару...
-Name[ku]=Çapkirin...
-Name[lt]=Spausdinti...
-Name[lv]=Drukāt...
-Name[mai]=छापू...
-Name[ms]=Cetak...
-Name[nb]=Skriv ut …
-Name[nds]=Drucken...
-Name[ne]=मुद्रण गर्नुहोस्...
-Name[nl]=Afdrukken...
-Name[oc]=Estampar...
-Name[pa]=ਛਾਪੋ...
-Name[pl]=Drukuj...
-Name[pt]=Imprimir...
-Name[pt_BR]=Imprimir...
-Name[ro]=Imprimare...
-Name[ru]=Печать...
-Name[se]=Čálit …
-Name[sk]=Tlačiť...
-Name[sl]=Natisni ...
-Name[sv]=Skriv ut...
-Name[ta]=அச்சு...
-Name[tg]=Чоп...
-Name[tr]=Yazdır...
-Name[uk]=Друк...
-Name[uz]=Bosib chiqarish
-Name[uz@cyrillic]=Босиб чиқариш
-Name[wa]=Imprimer...
-Name[x-test]=xxPrint...xx
-Name[zh_CN]=打印...
-Name[zh_TW]=列印...
-Exec=kivio --print %U
-Icon=filequickprint
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic