Compare commits

...

2 Commits

Author SHA1 Message Date
47431c8834 merge upstream 2025-05-09 13:03:18 -04:00
0eb003d599
Keep "About NUSGet" and "About Qt" under the application menu on macOS
Defined menu roles for those items so that Qt knows they belong under "NUSGet" when on macOS. This worked automatically somehow in English, but when loading a localization they'd be relocated to "Help" like they are on Windows and Linux. They'll now stay in the correct place for all languages.
2025-05-09 12:56:26 -04:00
10 changed files with 60 additions and 44 deletions

View File

@ -35,9 +35,11 @@ class Ui_MainWindow(object):
self.actionAbout.setObjectName(u"actionAbout")
icon = QIcon(QIcon.fromTheme(QIcon.ThemeIcon.HelpAbout))
self.actionAbout.setIcon(icon)
self.actionAbout.setMenuRole(QAction.MenuRole.ApplicationSpecificRole)
self.actionAbout_Qt = QAction(MainWindow)
self.actionAbout_Qt.setObjectName(u"actionAbout_Qt")
self.actionAbout_Qt.setIcon(icon)
self.actionAbout_Qt.setMenuRole(QAction.MenuRole.ApplicationSpecificRole)
self.centralwidget = QWidget(MainWindow)
self.centralwidget.setObjectName(u"centralwidget")
self.horizontalLayout_3 = QHBoxLayout(self.centralwidget)
@ -332,7 +334,7 @@ class Ui_MainWindow(object):
def retranslateUi(self, MainWindow):
MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"MainWindow", None))
self.actionAbout.setText(QCoreApplication.translate("MainWindow", u"About", None))
self.actionAbout.setText(QCoreApplication.translate("MainWindow", u"About NUSGet", None))
self.actionAbout_Qt.setText(QCoreApplication.translate("MainWindow", u"About Qt", None))
self.tree_filter_input.setPlaceholderText(QCoreApplication.translate("MainWindow", u"Search", None))
self.tree_filter_reset_btn.setText(QCoreApplication.translate("MainWindow", u"Clear", None))

View File

@ -461,7 +461,10 @@ li.checked::marker { content: "\2612"; }
<iconset theme="QIcon::ThemeIcon::HelpAbout"/>
</property>
<property name="text">
<string>About</string>
<string>About NUSGet</string>
</property>
<property name="menuRole">
<enum>QAction::MenuRole::ApplicationSpecificRole</enum>
</property>
</action>
<action name="actionAbout_Qt">
@ -471,6 +474,9 @@ li.checked::marker { content: &quot;\2612&quot;; }
<property name="text">
<string>About Qt</string>
</property>
<property name="menuRole">
<enum>QAction::MenuRole::ApplicationSpecificRole</enum>
</property>
</action>
</widget>
<customwidgets>

View File

@ -469,11 +469,15 @@ li.checked::marker { content: &quot;\2612&quot;; }
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About</source>
<translation>Über</translation>
<source>About NUSGet</source>
<translation type="unfinished">Über NUSGet</translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="472"/>
<source>About</source>
<translation type="vanished">Über</translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="475"/>
<source>About Qt</source>
<translation>Über Qt</translation>
</message>

View File

@ -152,6 +152,11 @@ li.checked::marker { content: &quot;\2612&quot;; }
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About NUSGet</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../NUSGet.py" line="157"/>
<source>Pack installable archive (WAD/TAD)</source>
@ -213,12 +218,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="472"/>
<location filename="../../qt/ui/MainMenu.ui" line="475"/>
<source>About Qt</source>
<translation type="unfinished"></translation>
</message>

View File

@ -411,6 +411,11 @@ li.checked::marker { content: &quot;\2612&quot;; }
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About NUSGet</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../NUSGet.py" line="157"/>
<source>Pack installable archive (WAD/TAD)</source>
@ -481,12 +486,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="472"/>
<location filename="../../qt/ui/MainMenu.ui" line="475"/>
<source>About Qt</source>
<translation type="unfinished"></translation>
</message>

View File

@ -140,6 +140,11 @@
<source>General Settings</source>
<translation>Impostazioni generali</translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About NUSGet</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../NUSGet.py" line="157"/>
<source>Pack installable archive (WAD/TAD)</source>
@ -217,12 +222,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="472"/>
<location filename="../../qt/ui/MainMenu.ui" line="475"/>
<source>About Qt</source>
<translation type="unfinished"></translation>
</message>

View File

@ -140,6 +140,11 @@
<source>General Settings</source>
<translation> </translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About NUSGet</source>
<translation type="unfinished">NUSGet </translation>
</message>
<message>
<location filename="../../NUSGet.py" line="157"/>
<source>Pack installable archive (WAD/TAD)</source>
@ -217,12 +222,11 @@ li.checked::marker { content: &quot;\2612&quot;; }
<translation></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="472"/>
<location filename="../../qt/ui/MainMenu.ui" line="475"/>
<source>About Qt</source>
<translation>Qt </translation>
</message>

View File

@ -140,6 +140,11 @@
<source>General Settings</source>
<translation>Generelle Instillinger</translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About NUSGet</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../NUSGet.py" line="157"/>
<source>Pack installable archive (WAD/TAD)</source>
@ -217,12 +222,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="472"/>
<location filename="../../qt/ui/MainMenu.ui" line="475"/>
<source>About Qt</source>
<translation type="unfinished"></translation>
</message>

View File

@ -140,6 +140,11 @@
<source>General Settings</source>
<translation>Generelle Instillinger</translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About NUSGet</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../NUSGet.py" line="157"/>
<source>Pack installable archive (WAD/TAD)</source>
@ -217,12 +222,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="472"/>
<location filename="../../qt/ui/MainMenu.ui" line="475"/>
<source>About Qt</source>
<translation type="unfinished"></translation>
</message>

View File

@ -449,6 +449,11 @@ li.checked::marker { content: &quot;\2612&quot;; }
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About NUSGet</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../NUSGet.py" line="157"/>
<source>Pack installable archive (WAD/TAD)</source>
@ -519,12 +524,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="464"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qt/ui/MainMenu.ui" line="472"/>
<location filename="../../qt/ui/MainMenu.ui" line="475"/>
<source>About Qt</source>
<translation type="unfinished"></translation>
</message>