fix(ui): use platform button ordering for Modal class

Author: CyanVoxel

src/tagstudio/qt/controllers/changelog_modal.py

@@ -24,6 +24,7 @@
     QTextFormat,
 )
 from PySide6.QtNetwork import QNetworkAccessManager, QNetworkReply, QNetworkRequest
+from PySide6.QtWidgets import QDialogButtonBox
 
 from tagstudio.core.constants import DOCS_URL, GITHUB_REPO_URL
 from tagstudio.core.utils.types import unwrap
@@ -313,8 +314,8 @@ def parent_post_init(self) -> None:
         assert isinstance(modal_view, ModalView)
         close_button = unwrap(self.done_button)
         close_button.setText(Translations["generic.close"])
-        modal_view.button_layout.insertWidget(
-            modal_view.button_layout.indexOf(close_button), self.layout().view_more_button
+        modal_view.button_box.addButton(
+            self.layout().view_more_button, QDialogButtonBox.ButtonRole.ActionRole
         )
 
         # NOTE: A lot of the styling is similar to the "About" window, which eventually needs to be

src/tagstudio/qt/views/modal_view.py

@@ -4,7 +4,7 @@
 
 import structlog
 from PySide6.QtCore import Qt
-from PySide6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget
+from PySide6.QtWidgets import QDialogButtonBox, QLabel, QVBoxLayout
 
 from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.modal_content import ModalContent
@@ -28,28 +28,26 @@ def __init__(
         self.content_widget = content_widget
         self.setContentsMargins(PAD, PAD if inline_title else PAD * 2, PAD, PAD)
 
-        self.button_container = QWidget()
-        self.button_layout = QHBoxLayout(self.button_container)
-        self.button_layout.setContentsMargins(PAD, PAD, PAD, PAD)
-        self.button_layout.addStretch(1)
+        self.button_box = QDialogButtonBox()
+        self.button_box.setContentsMargins(PAD, PAD, PAD, PAD)
 
-        # [Done]
-        # - OR -
-        # [Cancel] [Save]
         if not is_savable:
-            done_button = QPushButton(Translations["generic.done"])
+            done_button = self.button_box.addButton(
+                Translations["generic.done"], QDialogButtonBox.ButtonRole.AcceptRole
+            )
             done_button.setAutoDefault(True)
             self.content_widget.done_button = done_button
-            self.button_layout.addWidget(done_button)
         else:
-            cancel_button = QPushButton(Translations["generic.cancel"])
+            cancel_button = self.button_box.addButton(
+                Translations["generic.cancel"], QDialogButtonBox.ButtonRole.RejectRole
+            )
             self.content_widget.cancel_button = cancel_button
-            self.button_layout.addWidget(cancel_button)
 
-            save_button = QPushButton(Translations["generic.save"])
+            save_button = self.button_box.addButton(
+                Translations["generic.save"], QDialogButtonBox.ButtonRole.AcceptRole
+            )
             save_button.setAutoDefault(True)
             self.content_widget.save_button = save_button
-            self.button_layout.addWidget(save_button)
 
         if inline_title:
             self.title_label = QLabel()
@@ -61,4 +59,4 @@ def __init__(
 
         self.addWidget(content_widget)
         self.setStretch(1, 2)
-        self.addWidget(self.button_container)
+        self.addWidget(self.button_box)