Git commit cedf488dc21e91ac49e5574f2c542999193751c4 by Friedrich W. H. Koss=
ebau.
Committed on 01/06/2013 at 00:49.
Pushed by kossebau into branch 'master'.

Add preliminary mimetype for MS Project Exchange files (*.mpx) + support in=
 Plan's MpxjImport

M  +1    -0    filters/plan/mpxj/import/CMakeLists.txt
M  +8    -0    filters/plan/mpxj/import/calligra_planner_mpp.xml
M  +4    -1    filters/plan/mpxj/import/mpxjimport.cpp
A  +8    -0    filters/plan/mpxj/import/plan_msprojectexchange_import.deskt=
op

http://commits.kde.org/calligra/cedf488dc21e91ac49e5574f2c542999193751c4

diff --git a/filters/plan/mpxj/import/CMakeLists.txt b/filters/plan/mpxj/im=
port/CMakeLists.txt
index 580e5cb..a59a76c 100644
--- a/filters/plan/mpxj/import/CMakeLists.txt
+++ b/filters/plan/mpxj/import/CMakeLists.txt
@@ -19,6 +19,7 @@ install(TARGETS planmpxjimport  DESTINATION ${PLUGIN_INST=
ALL_DIR})
 =

 install(FILES
     plan_msproject_import.desktop
+    plan_msprojectexchange_import.desktop
     plan_planner_import.desktop
   DESTINATION ${SERVICES_INSTALL_DIR})
 =

diff --git a/filters/plan/mpxj/import/calligra_planner_mpp.xml b/filters/pl=
an/mpxj/import/calligra_planner_mpp.xml
index 2290f80..67a8af3 100644
--- a/filters/plan/mpxj/import/calligra_planner_mpp.xml
+++ b/filters/plan/mpxj/import/calligra_planner_mpp.xml
@@ -8,6 +8,14 @@
     <glob pattern=3D"*.mpp"/>
     <generic-icon name=3D"application-x-vnd.kde.plan"/>
   </mime-type>
+  <mime-type type=3D"application/x-project">
+    <comment>MS Project Exchange file</comment>
+    <magic priority=3D"50">
+      <match type=3D"string" value=3D"MPX" offset=3D"0"/>
+    </magic>
+    <glob pattern=3D"*.mpx"/>
+    <generic-icon name=3D"application-x-vnd.kde.plan"/>
+  </mime-type>
   <mime-type type=3D"application/x-planner">
     <sub-class-of type=3D"application/xml"/>
     <comment>Planner project plan</comment>
diff --git a/filters/plan/mpxj/import/mpxjimport.cpp b/filters/plan/mpxj/im=
port/mpxjimport.cpp
index 2c34e6c..a4a3108 100644
--- a/filters/plan/mpxj/import/mpxjimport.cpp
+++ b/filters/plan/mpxj/import/mpxjimport.cpp
@@ -47,7 +47,10 @@ MpxjImport::MpxjImport(QObject* parent, const QVariantLi=
st &)
 =

 QStringList MpxjImport::mimeTypes()
 {
-    return QStringList() << "application/vnd.ms-project" << "application/x=
-planner";
+    return QStringList()
+        << QLatin1String("application/vnd.ms-project")
+        << QLatin1String("application/x-project")
+        << QLatin1String("application/x-planner");
 }
 =

 KoFilter::ConversionStatus MpxjImport::convert(const QByteArray& from, con=
st QByteArray& to)
diff --git a/filters/plan/mpxj/import/plan_msprojectexchange_import.desktop=
 b/filters/plan/mpxj/import/plan_msprojectexchange_import.desktop
new file mode 100644
index 0000000..d0da3b4
--- /dev/null
+++ b/filters/plan/mpxj/import/plan_msprojectexchange_import.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=3DService
+Name=3DMS Project Exchange Import Filter
+X-KDE-Export=3Dapplication/x-vnd.kde.plan
+X-KDE-Import=3Dapplication/x-project
+X-KDE-Weight=3D1
+X-KDE-Library=3Dplanmpxjimport
+X-KDE-ServiceTypes=3DCalligra/Filter