Allow displaying age/page IDs in Object Browser tree

src/PrpShop/Main.cpp

@@ -67,6 +67,7 @@ PrpShopMain::PrpShopMain()
     fActions[kFileSaveAs] = new QAction(tr("Sa&ve As..."), this);
     fActions[kFileExit] = new QAction(tr("E&xit"), this);
     fActions[kToolsProperties] = new QAction(tr("Show &Properties Pane"), this);
+    fActions[kToolsShowAgePageIDs] = new QAction(tr("Show &Age/Page IDs"), this);
     fActions[kToolsShowTypeIDs] = new QAction(tr("Show Type &IDs"), this);
     fActions[kToolsNewObject] = new QAction(tr("&New Object..."), this);
     fActions[kWindowPrev] = new QAction(tr("&Previous"), this);
@@ -96,6 +97,8 @@ PrpShopMain::PrpShopMain()
     fActions[kWindowClose]->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     fActions[kToolsProperties]->setCheckable(true);
     fActions[kToolsProperties]->setChecked(true);
+    fActions[kToolsShowAgePageIDs]->setCheckable(true);
+    fActions[kToolsShowAgePageIDs]->setChecked(false);
     fActions[kToolsShowTypeIDs]->setCheckable(true);
     fActions[kToolsShowTypeIDs]->setChecked(false);
 
@@ -111,6 +114,7 @@ PrpShopMain::PrpShopMain()
 
     QMenu* viewMenu = menuBar()->addMenu(tr("&Tools"));
     viewMenu->addAction(fActions[kToolsProperties]);
+    viewMenu->addAction(fActions[kToolsShowAgePageIDs]);
     viewMenu->addAction(fActions[kToolsShowTypeIDs]);
     viewMenu->addSeparator();
     viewMenu->addAction(fActions[kToolsNewObject]);
@@ -180,6 +184,8 @@ PrpShopMain::PrpShopMain()
             fPropertyDock, &QWidget::setVisible);
     connect(fPropertyDock, &QDockWidget::visibilityChanged,
             fActions[kToolsProperties], &QAction::setChecked);
+    connect(fActions[kToolsShowAgePageIDs], &QAction::toggled,
+            this, &PrpShopMain::showAgePageIDs);
     connect(fActions[kToolsShowTypeIDs], &QAction::toggled,
             this, &PrpShopMain::showTypeIDs);
     connect(fActions[kToolsNewObject], &QAction::triggered,
@@ -231,6 +237,8 @@ PrpShopMain::PrpShopMain()
     if (settings.contains("DialogDir"))
         fDialogDir = settings.value("DialogDir").toString();
 
+    fActions[kToolsShowAgePageIDs]->setChecked(
+            settings.value("ShowAgePageIDs", false).toBool());
     fActions[kToolsShowTypeIDs]->setChecked(
             settings.value("ShowTypeIDs", false).toBool());
 }
@@ -248,6 +256,7 @@ void PrpShopMain::closeEvent(QCloseEvent*)
     settings.setValue("WinState", saveState());
 
     settings.setValue("DialogDir", fDialogDir);
+    settings.setValue("ShowAgePageIDs", s_showAgePageIDs);
     settings.setValue("ShowTypeIDs", s_showTypeIDs);
 }
 
@@ -1171,6 +1180,21 @@ void PrpShopMain::createNewObject()
     }
 }
 
+void PrpShopMain::showAgePageIDs(bool show)
+{
+    s_showAgePageIDs = show;
+
+    // Refresh currently loaded pages
+    for (int i=0; i<fBrowserTree->topLevelItemCount(); i++) {
+        QPlasmaTreeItem* ageNode = (QPlasmaTreeItem*)fBrowserTree->topLevelItem(i);
+        for (int j=0; j<ageNode->childCount(); j++) {
+            QPlasmaTreeItem* pageNode = (QPlasmaTreeItem*)ageNode->child(j);
+            pageNode->reinit();
+        }
+        ageNode->sortChildren(0, Qt::AscendingOrder);
+    }
+}
+
 void PrpShopMain::showTypeIDs(bool show)
 {
     s_showTypeIDs = show;

src/PrpShop/Main.h

@@ -73,8 +73,8 @@ class PrpShopMain : public QMainWindow
     {
         // Main Menu
         kFileNewPage, kFileOpen, kFileSave, kFileSaveAs, kFileExit,
-        kToolsProperties, kToolsShowTypeIDs, kToolsNewObject, kWindowPrev,
-        kWindowNext, kWindowTile, kWindowCascade, kWindowClose, kWindowCloseAll,
+        kToolsProperties, kToolsShowAgePageIDs, kToolsShowTypeIDs, kToolsNewObject,
+        kWindowPrev, kWindowNext, kWindowTile, kWindowCascade, kWindowClose, kWindowCloseAll,
 
         // Tree Context Menu
         kTreeClose, kTreeEdit, kTreeEditPRC, kTreeEditHex, kTreePreview,
@@ -119,6 +119,7 @@ public slots:
     void treeItemActivated(QTreeWidgetItem* item, int column);
     void treeContextMenu(const QPoint& pos);
     void createNewObject();
+    void showAgePageIDs(bool show);
     void showTypeIDs(bool show);
     void closeWindows(const plLocation& loc);
 

src/PrpShop/QPlasmaTreeItem.cpp

@@ -15,6 +15,8 @@
  */
 
 #include "QPlasmaTreeItem.h"
+
+#include <string_theory/format>
 #include "QPlasmaUtils.h"
 
 QPlasmaTreeItem::QPlasmaTreeItem()
@@ -110,6 +112,15 @@ QPlasmaTreeItem::QPlasmaTreeItem(QTreeWidgetItem* parent, plPageInfo* page)
     reinit();
 }
 
+static QString pqFormatPageName(const plPageInfo* page)
+{
+    if (s_showAgePageIDs) {
+        return st2qstr(ST::format("{} {}", page->getLocation().toString(), page->getPage()));
+    } else {
+        return st2qstr(page->getPage());
+    }
+}
+
 void QPlasmaTreeItem::reinit()
 {
     switch (type()) {
@@ -133,7 +144,7 @@ void QPlasmaTreeItem::reinit()
             break;
 
         case kTypePage:
-            setText(0, st2qstr(fPage->getPage()));
+            setText(0, pqFormatPageName(fPage));
             setIcon(0, QIcon(":/img/page.png"));
             break;
     }
@@ -146,6 +157,12 @@ bool QPlasmaTreeItem::operator<(const QTreeWidgetItem& other) const
         // sort class type folders by the numeric type ID.
         auto otherPlasma = static_cast<const QPlasmaTreeItem&>(other);
         return fClassType < otherPlasma.fClassType;
+    } else if (s_showAgePageIDs && type() == kTypePage && other.type() == kTypePage) {
+        // If age/page IDs are shown,
+        // sort pages by their location
+        // (i. e. first by age ID, then by page ID).
+        auto otherPlasma = static_cast<const QPlasmaTreeItem&>(other);
+        return fPage->getLocation() < otherPlasma.fPage->getLocation();
     } else if (type() != other.type()) {
         // Sort items of different types by their type,
         // i. e. group items of the same type together.

src/PrpShop/QPlasmaUtils.cpp

@@ -21,6 +21,7 @@
 #include <PRP/Object/plCoordinateInterface.h>
 #include <PRP/Object/plSceneObject.h>
 
+bool s_showAgePageIDs = false;
 bool s_showTypeIDs = false;
 
 enum

src/PrpShop/QPlasmaUtils.h

@@ -24,6 +24,7 @@
 #include "QPlasma.h"
 #include "QNumerics.h"
 
+extern bool s_showAgePageIDs;
 extern bool s_showTypeIDs;
 
 enum