restructured main menu

apps/opencs/view/doc/view.cpp

@@ -84,65 +84,77 @@ void CSVDoc::View::setupWorldMenu()
 {
     QMenu *world = menuBar()->addMenu (tr ("&World"));
 
+    QAction *regions = new QAction (tr ("Regions"), this);
+    connect (regions, SIGNAL (triggered()), this, SLOT (addRegionsSubView()));
+    world->addAction (regions);
+
+    QAction *cells = new QAction (tr ("Cells"), this);
+    connect (cells, SIGNAL (triggered()), this, SLOT (addCellsSubView()));
+    world->addAction (cells);
+
+    QAction *referenceables = new QAction (tr ("Referenceables"), this);
+    connect (referenceables, SIGNAL (triggered()), this, SLOT (addReferenceablesSubView()));
+    world->addAction (referenceables);
+
+    QAction *references = new QAction (tr ("References"), this);
+    connect (references, SIGNAL (triggered()), this, SLOT (addReferencesSubView()));
+    world->addAction (references);
+
+    world->addSeparator(); // items that don't represent single record lists follow here
+
+    QAction *regionMap = new QAction (tr ("Region Map"), this);
+    connect (regionMap, SIGNAL (triggered()), this, SLOT (addRegionMapSubView()));
+    world->addAction (regionMap);
+}
+
+void CSVDoc::View::setupMechanicsMenu()
+{
+    QMenu *mechanics = menuBar()->addMenu (tr ("&Mechanics"));
+
     QAction *globals = new QAction (tr ("Globals"), this);
     connect (globals, SIGNAL (triggered()), this, SLOT (addGlobalsSubView()));
-    world->addAction (globals);
+    mechanics->addAction (globals);
 
     QAction *gmsts = new QAction (tr ("Game settings"), this);
     connect (gmsts, SIGNAL (triggered()), this, SLOT (addGmstsSubView()));
-    world->addAction (gmsts);
+    mechanics->addAction (gmsts);
 
     QAction *skills = new QAction (tr ("Skills"), this);
     connect (skills, SIGNAL (triggered()), this, SLOT (addSkillsSubView()));
-    world->addAction (skills);
+    mechanics->addAction (skills);
 
     QAction *classes = new QAction (tr ("Classes"), this);
     connect (classes, SIGNAL (triggered()), this, SLOT (addClassesSubView()));
-    world->addAction (classes);
+    mechanics->addAction (classes);
 
     QAction *factions = new QAction (tr ("Factions"), this);
     connect (factions, SIGNAL (triggered()), this, SLOT (addFactionsSubView()));
-    world->addAction (factions);
+    mechanics->addAction (factions);
 
     QAction *races = new QAction (tr ("Races"), this);
     connect (races, SIGNAL (triggered()), this, SLOT (addRacesSubView()));
-    world->addAction (races);
-
-    QAction *sounds = new QAction (tr ("Sounds"), this);
-    connect (sounds, SIGNAL (triggered()), this, SLOT (addSoundsSubView()));
-    world->addAction (sounds);
+    mechanics->addAction (races);
 
     QAction *scripts = new QAction (tr ("Scripts"), this);
     connect (scripts, SIGNAL (triggered()), this, SLOT (addScriptsSubView()));
-    world->addAction (scripts);
-
-    QAction *regions = new QAction (tr ("Regions"), this);
-    connect (regions, SIGNAL (triggered()), this, SLOT (addRegionsSubView()));
-    world->addAction (regions);
+    mechanics->addAction (scripts);
 
     QAction *birthsigns = new QAction (tr ("Birthsigns"), this);
     connect (birthsigns, SIGNAL (triggered()), this, SLOT (addBirthsignsSubView()));
-    world->addAction (birthsigns);
+    mechanics->addAction (birthsigns);
 
     QAction *spells = new QAction (tr ("Spells"), this);
     connect (spells, SIGNAL (triggered()), this, SLOT (addSpellsSubView()));
-    world->addAction (spells);
-
-    QAction *cells = new QAction (tr ("Cells"), this);
-    connect (cells, SIGNAL (triggered()), this, SLOT (addCellsSubView()));
-    world->addAction (cells);
-
-    QAction *referenceables = new QAction (tr ("Referenceables"), this);
-    connect (referenceables, SIGNAL (triggered()), this, SLOT (addReferenceablesSubView()));
-    world->addAction (referenceables);
+    mechanics->addAction (spells);
+}
 
-    QAction *references = new QAction (tr ("References"), this);
-    connect (references, SIGNAL (triggered()), this, SLOT (addReferencesSubView()));
-    world->addAction (references);
+void CSVDoc::View::setupAssetsMenu()
+{
+    QMenu *assets = menuBar()->addMenu (tr ("&Assets"));
 
-    QAction *regionMap = new QAction (tr ("Region Map"), this);
-    connect (regionMap, SIGNAL (triggered()), this, SLOT (addRegionMapSubView()));
-    world->addAction (regionMap);
+    QAction *sounds = new QAction (tr ("Sounds"), this);
+    connect (sounds, SIGNAL (triggered()), this, SLOT (addSoundsSubView()));
+    assets->addAction (sounds);
 }
 
 void CSVDoc::View::setupUi()
@@ -151,6 +163,8 @@ void CSVDoc::View::setupUi()
     setupEditMenu();
     setupViewMenu();
     setupWorldMenu();
+    setupMechanicsMenu();
+    setupAssetsMenu();
 }
 
 void CSVDoc::View::updateTitle()

apps/opencs/view/doc/view.hpp

@@ -60,6 +60,10 @@ namespace CSVDoc
 
             void setupWorldMenu();
 
+            void setupMechanicsMenu();
+
+            void setupAssetsMenu();
+
             void setupUi();
 
             void updateTitle();