# HG changeset patch
# User Chris Cannam
# Date 1227274655 0
# Node ID 5228aaccfb1b56c02db79ae5cb0a596b52cc78d6
# Parent  0842fc8a0db075e429ad9b0fd0951d09485ab995
* Use enum for transform type instead of trying to do dumb things like
  compare translated strings

diff -r 0842fc8a0db0 -r 5228aaccfb1b main/MainWindow.cpp
--- a/main/MainWindow.cpp	Thu Nov 20 12:21:33 2008 +0000
+++ b/main/MainWindow.cpp	Fri Nov 21 13:37:35 2008 +0000
@@ -1225,17 +1225,16 @@
         m_transformsMenu->setSeparatorsCollapsible(true);
     }
 
-    TransformList transforms =
-	TransformFactory::getInstance()->getAllTransformDescriptions();
-
-    vector<QString> types =
-        TransformFactory::getInstance()->getAllTransformTypes();
-
-    map<QString, map<QString, SubdividingMenu *> > categoryMenus;
-    map<QString, map<QString, SubdividingMenu *> > makerMenus;
-
-    map<QString, SubdividingMenu *> byPluginNameMenus;
-    map<QString, map<QString, QMenu *> > pluginNameMenus;
+    TransformFactory *factory = TransformFactory::getInstance();
+
+    TransformList transforms = factory->getAllTransformDescriptions();
+    vector<TransformDescription::Type> types = factory->getAllTransformTypes();
+
+    map<TransformDescription::Type, map<QString, SubdividingMenu *> > categoryMenus;
+    map<TransformDescription::Type, map<QString, SubdividingMenu *> > makerMenus;
+
+    map<TransformDescription::Type, SubdividingMenu *> byPluginNameMenus;
+    map<TransformDescription::Type, map<QString, QMenu *> > pluginNameMenus;
 
     set<SubdividingMenu *> pendingMenus;
 
@@ -1248,14 +1247,16 @@
     m_transformsMenu->addSeparator();
     m_rightButtonTransformsMenu->addSeparator();
     
-    for (vector<QString>::iterator i = types.begin(); i != types.end(); ++i) {
+    for (vector<TransformDescription::Type>::iterator i = types.begin();
+         i != types.end(); ++i) {
 
         if (i != types.begin()) {
             m_transformsMenu->addSeparator();
             m_rightButtonTransformsMenu->addSeparator();
         }
 
-        QString byCategoryLabel = tr("%1 by Category").arg(*i);
+        QString byCategoryLabel = tr("%1 by Category")
+            .arg(factory->getTransformTypeName(*i));
         SubdividingMenu *byCategoryMenu = new SubdividingMenu(byCategoryLabel,
                                                               20, 40);
         byCategoryMenu->setTearOffEnabled(true);
@@ -1263,8 +1264,7 @@
         m_rightButtonTransformsMenu->addMenu(byCategoryMenu);
         pendingMenus.insert(byCategoryMenu);
 
-        vector<QString> categories = 
-            TransformFactory::getInstance()->getTransformCategories(*i);
+        vector<QString> categories = factory->getTransformCategories(*i);
 
         for (vector<QString>::iterator j = categories.begin();
              j != categories.end(); ++j) {
@@ -1301,22 +1301,23 @@
             }
         }
 
-        QString byPluginNameLabel = tr("%1 by Plugin Name").arg(*i);
+        QString byPluginNameLabel = tr("%1 by Plugin Name")
+            .arg(factory->getTransformTypeName(*i));
         byPluginNameMenus[*i] = new SubdividingMenu(byPluginNameLabel);
         byPluginNameMenus[*i]->setTearOffEnabled(true);
         m_transformsMenu->addMenu(byPluginNameMenus[*i]);
         m_rightButtonTransformsMenu->addMenu(byPluginNameMenus[*i]);
         pendingMenus.insert(byPluginNameMenus[*i]);
 
-        QString byMakerLabel = tr("%1 by Maker").arg(*i);
+        QString byMakerLabel = tr("%1 by Maker")
+            .arg(factory->getTransformTypeName(*i));
         SubdividingMenu *byMakerMenu = new SubdividingMenu(byMakerLabel, 20, 40);
         byMakerMenu->setTearOffEnabled(true);
         m_transformsMenu->addMenu(byMakerMenu);
         m_rightButtonTransformsMenu->addMenu(byMakerMenu);
         pendingMenus.insert(byMakerMenu);
 
-        vector<QString> makers = 
-            TransformFactory::getInstance()->getTransformMakers(*i);
+        vector<QString> makers = factory->getTransformMakers(*i);
 
         for (vector<QString>::iterator j = makers.begin();
              j != makers.end(); ++j) {
@@ -1353,7 +1354,8 @@
 
 //        std::cerr << "Plugin Name: " << name.toStdString() << std::endl;
 
-        QString type = transforms[i].type;
+        TransformDescription::Type type = transforms[i].type;
+        QString typeStr = factory->getTransformTypeName(type);
 
         QString category = transforms[i].category;
         if (category == "") category = tr("Unclassified");