[Traverso-commit] traverso/src/traverso Interface.cpp

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/06/03 18:52:58

Modified files:
        src/traverso   : Interface.cpp 

Log message:
        3 more Song => Sheet fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.86&r2=1.87

Patches:
Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- Interface.cpp       29 May 2007 12:54:10 -0000      1.86
+++ Interface.cpp       3 Jun 2007 18:52:58 -0000       1.87
@@ -501,7 +501,11 @@
                                continue;
                        }
                        QAction* action = toplevelmenu->insertMenu(action, 
menu);
-                       action->setText(className.remove("View"));
+                       QString name = className.remove("View");
+
+                       if (name == "Song") name = "Sheet"; // FIXME!!!
+
+                       action->setText(name);
                }
        }
        
@@ -554,7 +558,7 @@
        QList<const QMetaObject*> interfacelist; interfacelist << 
&Interface::staticMetaObject;
        QList<const QMetaObject*> pmlist; pmlist << 
&ProjectManager::staticMetaObject;
                
-       objects.insert("Song", songlist);
+       objects.insert("Sheet", songlist);
        objects.insert("Track", tracklist);
        objects.insert("AudioClip", cliplist);
        objects.insert("Curve", curvelist);
@@ -647,6 +651,9 @@
        } else {
                name = "noname";
        }
+
+       if (name == "Song") name = "Sheet"; // FIXME!!!
+
        QAction* menuAction = menu->addAction(name);
        QFont font(themer()->get_font("ContextMenu:fontscale:actions"));
        font.setBold(true);
@@ -660,7 +667,7 @@
        for (int i=0; i<list.size(); ++i) {
                MenuData data = list.at(i);
                
-               // Merge entries with equall action, but different key facts.
+               // Merge entries with equal actions, but different key facts.
                for (int j=i+1; j<list.size(); ++j) {
                        if (list.at(j).description == data.description) {
                                QString mergestring = list.at(j).keysequence;