UI|Client: Updated UI terminology

"Packages": Any kind of data file, mod, package, etc. including the core net.dengine.* packages, game IWADs, etc. "Mod": An add-on, PWAD, resource pack, or other such modification to one of the original games.
skyjake · Oct 22, 2017 · 4e005e3 · 4e005e3
1 parent f153586
commit 4e005e3
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 24 deletions.
diff --git a/doomsday/apps/client/include/ui/home/packagescolumnwidget.h b/doomsday/apps/client/include/ui/home/packagescolumnwidget.h
@@ -31,6 +31,7 @@ class PackagesColumnWidget : public ColumnWidget
     int availablePackageCount() const;
 
     de::String tabHeading() const override;
+    de::String tabShortcut() const override;
     void setHighlighted(bool highlighted) override;
 
 signals:

diff --git a/doomsday/apps/client/src/ui/dialogs/createprofiledialog.cpp b/doomsday/apps/client/src/ui/dialogs/createprofiledialog.cpp
@@ -199,7 +199,7 @@ CreateProfileDialog::CreateProfileDialog(String const &gameFamily)
     layout.setColumnAlignment(0, ui::AlignRight);
     layout << *LabelWidget::newWithText(tr("Game:"), form)
            << *d->gameChoice
-           << *LabelWidget::newWithText(tr("Packages:"), form)
+           << *LabelWidget::newWithText(tr("Mods:"), form)
            << *d->packages;
 
     LabelWidget *optionsLabel = LabelWidget::newWithText(_E(D) + tr("Game Options"), form);

diff --git a/doomsday/apps/client/src/ui/dialogs/datafilesettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/datafilesettingsdialog.cpp
@@ -60,9 +60,9 @@ DataFileSettingsDialog::DataFileSettingsDialog(String const &name)
                                "Only these folders are checked, not their subfolders."));
     setValue(d->iwadGroup, d->iwadFolders.value());
 
-    d->pkgGroup = addGroup(tr("Add-on and Package Folders"),
+    d->pkgGroup = addGroup(tr("Mod / Add-on Folders"),
                            tr("The following folders and all their subfolders are searched "
-                              "for resource packs and other add-ons."));
+                              "for mods, resource packs, and other add-ons."));
     setValue(d->pkgGroup, d->pkgFolders.value());
 
     connect(this, &DirectoryListDialog::arrayChanged, [this] ()

diff --git a/doomsday/apps/client/src/ui/dialogs/networksettingsdialog.cpp b/doomsday/apps/client/src/ui/dialogs/networksettingsdialog.cpp
@@ -44,7 +44,7 @@ DENG_GUI_PIMPL(NetworkSettingsDialog)
     {
         ScrollAreaWidget &area = self().area();
 
-        area.add(localPackages = new VariableToggleWidget(tr("Local Multiplayer Packages"), App::config("resource.localPackages")));
+        area.add(localPackages = new VariableToggleWidget(tr("Local Multiplayer Mods"), App::config("resource.localPackages")));
 
         // Developer options.
         self().add(devPopup = new GridPopupWidget);

diff --git a/doomsday/apps/client/src/ui/dialogs/packagecompatibilitydialog.cpp b/doomsday/apps/client/src/ui/dialogs/packagecompatibilitydialog.cpp
@@ -67,9 +67,9 @@ DENG2_PIMPL(PackageCompatibilityDialog)
         }
         if (list->itemCount() > 0)
         {
-            return _E(b) + tr("Load Packages");
+            return _E(b) + tr("Load Mods");
         }
-        return _E(b) + tr("Unload Packages");
+        return _E(b) + tr("Unload Mods");
     }
 
     void enableIgnore(bool yes)

diff --git a/doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp b/doomsday/apps/client/src/ui/dialogs/packagesdialog.cpp
@@ -169,7 +169,7 @@ DENG_GUI_PIMPL(PackagesDialog)
         // Indicator that is only visible when no packages have been added to the profile.
         nothingSelected = new LabelWidget;
 
-        nothingSelected->setText(tr("No Packages Selected"));
+        nothingSelected->setText(tr("No Mods Selected"));
         style().as<ClientStyle>().emptyMenuLabelStylist().applyStyle(*nothingSelected);
         nothingSelected->rule()
                 .setRect(self().leftArea().rule())
@@ -299,7 +299,7 @@ DENG_GUI_PIMPL(PackagesDialog)
             }
             if (!dataFiles.isEmpty())
             {
-                gameDataFiles->setText(_E(l) + String::format("Data file%s: ", dataFiles.size() != 1? "s" : "") +
+                gameDataFiles->setText(_E(l) + String::format("Game data file%s: ", dataFiles.size() != 1? "s" : "") +
                                        _E(.) + String::join(dataFiles, _E(l) " and " _E(.)));
             }
             else
@@ -353,7 +353,7 @@ PackagesDialog::PackagesDialog(String const &titleText)
 {
     if (titleText.isEmpty())
     {
-        heading().setText(tr("Packages"));
+        heading().setText(tr("Mods"));
     }
     else
     {

diff --git a/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp b/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp
@@ -181,7 +181,7 @@ DENG_GUI_PIMPL(ServerInfoDialog)
         serverPackages->setActionItems(serverPackageActions);
         serverPackages->setActionsAlwaysShown(true);
         serverPackages->setPackageStatus(*this);
-        serverPackages->searchTermsEditor().setEmptyContentHint(tr("Filter Server Packages"));
+        serverPackages->searchTermsEditor().setEmptyContentHint(tr("Filter Server Mods"));
         serverPackages->rule().setInput(Rule::Width, rule("dialog.serverinfo.popup.width"));
         serverPopup->setContent(serverPackages);
 
@@ -196,7 +196,7 @@ DENG_GUI_PIMPL(ServerInfoDialog)
         localPackages = new PackagesButtonWidget;
         localPackages->setColorTheme(Inverted);
         localPackages->setLabelPrefix(tr("Local: "));
-        localPackages->setNoneLabel(tr("Local Packages..."));
+        localPackages->setNoneLabel(tr("Local Mods..."));
         localPackages->setGameProfile(profile);
         localPackages->disable();
         localPackages->rule().setLeftTop(svBut->rule().right(), svBut->rule().top());
@@ -307,7 +307,7 @@ DENG_GUI_PIMPL(ServerInfoDialog)
 
         // Local packages.
         {
-            localPackages->setDialogTitle(tr("Local Packages for %1 Multiplayer").arg(gameTitle));
+            localPackages->setDialogTitle(tr("Local Mods for %1 Multiplayer").arg(gameTitle));
             localPackages->setGameProfile(profile);
             localPackages->setPackages(Game::localMultiplayerPackages(gameId));
         }

diff --git a/doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp b/doomsday/apps/client/src/ui/home/gamepanelbuttonwidget.cpp
@@ -95,7 +95,7 @@ DENG_GUI_PIMPL(GamePanelButtonWidget)
 
         packagesButton = new PackagesButtonWidget;
         packagesButton->setGameProfile(gameProfile);
-        packagesButton->setDialogTitle(tr("Packages for %1").arg(profile.name()));
+        packagesButton->setDialogTitle(tr("Mods for %1").arg(profile.name()));
         packagesButton->setSetupCallback([this] (PackagesDialog &dialog)
         {
             // Add a button for starting the game.

diff --git a/doomsday/apps/client/src/ui/home/packagescolumnwidget.cpp b/doomsday/apps/client/src/ui/home/packagescolumnwidget.cpp
@@ -123,8 +123,8 @@ PackagesColumnWidget::PackagesColumnWidget()
     : ColumnWidget("packages-column")
     , d(new Impl(this))
 {
-    header().title().setText(_E(s) "\n" _E(.) + tr("Packages"));
-    header().info().setText(tr("Browse available packages and install new ones."));
+    header().title().setText(_E(s) "\n" _E(.) + tr("Mods"));
+    header().info().setText(tr("Browse available mods/add-ons and install new ones."));
     header().infoPanel().close(0);
 
     // Total number of packages listed.
@@ -154,7 +154,12 @@ int PackagesColumnWidget::availablePackageCount() const
 
 String PackagesColumnWidget::tabHeading() const
 {
-    return tr("Packages");
+    return tr("Mods");
+}
+
+String PackagesColumnWidget::tabShortcut() const
+{
+    return QStringLiteral("s");
 }
 
 void PackagesColumnWidget::setHighlighted(bool highlighted)

diff --git a/doomsday/apps/client/src/ui/widgets/packageswidget.cpp b/doomsday/apps/client/src/ui/widgets/packageswidget.cpp
@@ -51,10 +51,11 @@
 
 using namespace de;
 
-static String    const VAR_TITLE ("title");
-static String    const VAR_TAGS  ("tags");
-static String    const TAG_HIDDEN("hidden");
-static String    const TAG_LOADED("loaded");
+static String const VAR_TITLE ("title");
+static String const VAR_TAGS  ("tags");
+static String const TAG_HIDDEN("hidden");
+static String const TAG_LOADED("loaded");
+static String const TAG_CACHED("cached");
 
 static TimeDelta const REFILTER_DELAY(0.2);
 
@@ -550,12 +551,13 @@ DENG_GUI_PIMPL(PackagesWidget)
 
             if (!item.info) return false;
 
-            bool const isHidden = Package::matchTags(*item.file, QStringLiteral("\\bhidden\\b"));
-            if (showHidden ^ isHidden)
+            if (showOnlyLoaded && !item.isLoaded())
             {
                 return false;
             }
-            if (showOnlyLoaded && !item.isLoaded())
+
+            bool const isHidden = Package::matchTags(*item.file, QStringLiteral("\\bhidden\\b"));
+            if (showHidden ^ isHidden)
             {
                 return false;
             }

diff --git a/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp b/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp
@@ -488,7 +488,7 @@ TaskBarWidget::TaskBarWidget() : GuiWidget("taskbar"), d(new Impl(this))
             << unloadMenu                           // hidden with null-game
             << new ui::Item(ui::Item::Separator)
             << new ui::Item(ui::Item::Separator, tr("Resources"))
-            << new ui::ActionItem(tr("Browse Packages..."), new SignalAction(this, SLOT(openPackagesSidebar())))
+            << new ui::ActionItem(tr("Browse Mods..."), new SignalAction(this, SLOT(openPackagesSidebar())))
             << new ui::Item(ui::Item::Annotation,
                             tr("Load/unload data files and view package information."))
             << new ui::ActionItem(tr("Clear Cache"), new CallbackAction([] () { DoomsdayApp::app().clearCache(); }))