[Uml-devel] branches/work/soc-umbrello

[Gopala Krishna A]

SVN commit 943064 by gopala:

Merged revisions 928929,928936 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r928929 | habacker | 2009-02-20 18:15:58 +0530 (Fri, 20 Feb 2009) | 1 line
  
  bug fix: removed double entries and sorted list
........
  r928936 | habacker | 2009-02-20 18:24:28 +0530 (Fri, 20 Feb 2009) | 3 lines
  
  added option "export-formats", which prints out a list of all supported export formats to stderr
  The list gives the answer for bug 180031 - pdf isn't a supported export format
  BUG:180031
........


 _M            . (directory)  
 M  +8 -0      umbrello/main.cpp  
 M  +10 -6     umbrello/umlviewimageexportermodel.cpp  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652,916104,916343,916990-917128,917351,918579-919414,920540-921357,922431,922854-927155
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652,916104,916343,916990-917128,917351,918579-919414,920540-921357,922431,922854-927155,928929-928936
--- branches/work/soc-umbrello/umbrello/main.cpp #943063:943064
@@ -10,6 +10,7 @@
  ***************************************************************************/
 
 #include <unistd.h>
+#include <stdio.h>
 
 // kde includes
 #include <kaboutdata.h>
@@ -26,6 +27,7 @@
 #include "version.h"
 #include "umldoc.h"
 #include "cmdlineexportallviewsevent.h"
+#include "umlviewimageexportermodel.h"
 #include "umbrellosettings.h"
 
 
@@ -81,6 +83,7 @@
     KCmdLineOptions options;
     options.add("+[File]", ki18n("File to open"));
     options.add("export <extension>", ki18n("export diagrams to extension and exit"));
+    options.add("export-formats", ki18n("list available export extensions"));
     options.add("directory <url>", ki18n("the local directory to save the exported diagrams in"), I18N_NOOP("the directory of the file"));
     options.add("use-folders", ki18n("keep the tree structure used to store the views in the document in the target directory"));
     KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
@@ -101,6 +104,11 @@
 
         initDocument(args);
 
+        if (args->isSet("export-formats")) {
+            foreach(QString type, UMLViewImageExporterModel::supportedImageTypes())
+                fprintf(stderr,"%s\n",qPrintable(type));
+            return 0;
+        }
         // export option
         QStringList exportOpt = args->getOptionList("export");
         if (exportOpt.size() > 0) {
--- branches/work/soc-umbrello/umbrello/umlviewimageexportermodel.cpp #943063:943064
@@ -52,19 +52,23 @@
 QStringList UMLViewImageExporterModel::supportedImageTypes()
 {
     if (!supportedImageTypesList.size()) {
-        // specific supported formats
-        supportedImageTypesList << "eps";
-        supportedImageTypesList << "svg";
-
         // QT supported formats
         QList<QByteArray> qImageFormats = QImageWriter::supportedImageFormats();
         QList<QByteArray>::const_iterator it, it_end;
         it = qImageFormats.begin(); it_end = qImageFormats.end();
         for (; it != it_end; ++it) {
-            supportedImageTypesList << QString(*it).toLower();
+            QString format = QString(*it).toLower();
+            if (!supportedImageTypesList.contains(format))
+                supportedImageTypesList << format;
         }
+        // specific supported formats
+        if (!supportedImageTypesList.contains("eps"))
+            supportedImageTypesList << "eps";
+        if (!supportedImageTypesList.contains("svg"))
+            supportedImageTypesList << "svg";
     }
-
+    supportedImageTypesList.sort();
+    
     return supportedImageTypesList;
 }