diff --git a/rare/components/tabs/settings/widgets/overlay.py b/rare/components/tabs/settings/widgets/overlay.py index c13810a58e..127d9c1dc1 100644 --- a/rare/components/tabs/settings/widgets/overlay.py +++ b/rare/components/tabs/settings/widgets/overlay.py @@ -333,6 +333,8 @@ def __init__(self, parent=None): (OverlayLineEdit("dxvk.deviceFilter", ""), "dxvk.deviceFilter"), (OverlayNumberInput("dxvk.numCompilerThreads", 0), "dxvk.numCompilerThreads"), (OverlaySelectInput("dxvk.tearFree", dxvk_config_tristate), "dxvk.tearFree"), + (OverlaySelectInput("dxvk.enableDescriptorHeap", dxvk_config_tristate), + "dxvk.enableDescriptorHeap"), (OverlaySelectInput("dxvk.enableGraphicsPipelineLibrary", dxvk_config_tristate), "dxvk.enableGraphicsPipelineLibrary"), (OverlaySelectInput("dxvk.enableAsync", dxvk_config_boolean), "dxvk.enableAsync"), diff --git a/rare/main.py b/rare/main.py index a391d18999..cb29d984c3 100755 --- a/rare/main.py +++ b/rare/main.py @@ -30,6 +30,7 @@ def main() -> int: # remove QT_QPA_PLATFORMTHEME to avoid broken theming if "QT_QPA_PLATFORMTHEME" in os.environ: del os.environ["QT_QPA_PLATFORMTHEME"] + os.environ["QT_STYLE_OVERRIDE"] = "fusion" # remove XDG_CONFIG_HOME if running under Wine to stop legendary from using the Linux client config if platform.system() == "Windows" and "XDG_CONFIG_HOME" in os.environ: del os.environ["XDG_CONFIG_HOME"] diff --git a/rare/resources/colors/Airy.scheme b/rare/resources/colors/Airy.scheme deleted file mode 100644 index f445a80aae..0000000000 --- a/rare/resources/colors/Airy.scheme +++ /dev/null @@ -1,39 +0,0 @@ -[ColorScheme] -Active\AlternateBase=#ff5c5b5a -Active\Base=#ffc8c8c8 -Active\BrightText=#ff0a0a0a -Active\Button=#ffdcdcdc -Active\ButtonText=#ff0a0a0a -Active\Dark=#ff646464 -Active\Highlight=#ff0986d3 -Active\HighlightedText=#ff0a0a0a -Active\Light=#ffdcdcdc -Active\Link=#ff0986d3 -Active\LinkVisited=#ffa70b06 -Active\Mid=#ffe1e1e1 -Active\Midlight=#ff5e5c5b -Active\PlaceholderText=#80000000 -Active\Shadow=#ffe7e4e0 -Active\Text=#ff000000 -Active\ToolTipBase=#ff646464 -Active\ToolTipText=#ff050505 -Active\Window=#ffffffff -Active\WindowText=#ff000000 -Disabled\Base=#ff969696 -Disabled\BrightText=#ffffffff -Disabled\Button=#ff424245 -Disabled\ButtonText=#ff808080 -Disabled\HighlightedText=#ff808080 -Disabled\Text=#ff808080 -Disabled\ToolTipText=#ffffffff -Disabled\Window=#ffc8c8c8 -Disabled\WindowText=#ffffffff -Inactive\Base=#ff969696 -Inactive\BrightText=#ff323232 -Inactive\Button=#ffb4b4b4 -Inactive\ButtonText=#ff323232 -Inactive\HighlightedText=#ff323232 -Inactive\Text=#ff323232 -Inactive\ToolTipText=#ff323232 -Inactive\Window=#ffc8c8c8 -Inactive\WindowText=#ff323232 diff --git a/rare/resources/resources.py b/rare/resources/resources.py index 3a4f1188d5..274ea4bf8a 100644 --- a/rare/resources/resources.py +++ b/rare/resources/resources.py @@ -35503,28 +35503,6 @@ )gyUd#\x9d%\x028\xbe\x11^j\x9a\x1b\ \x9e\xe9\xde\xf0\x95\x90)\xca\xa9\xcc6\x7f\x88\x93\xe94\ \ -\x00\x00\x01;\ -\x00\ -\x00\x04\x1bx\x9cu\x92\xcfR\x830\x10\xc6\xef\xbe\x86\ -/\x80-\xa1\xf4\xe0\xa1\xb6\x07\x9d\xa93\xce\x94\xd1\x83\ -z\x08\xc9V2\x8d\xc4\x81\xf8\xe7\xf1e\x81\x04\xb2@\ -\xbe\xdb\xf7\xcbn\xf2e\xf3\xba7\xdaT'Q\xc0'\ -\xbc_\xed\x84U?\xf0\xb6\xd3\x16\xaa\x92[\xb8\xe35\ -\xdc^\x9f\xcfL\xb0\x9cq\x87\x9d+R\x94w+\xf5\ -Q\xd8\x0c\xfe,\xb2\x88\xa3<\xfb\xb6\xd6\x94\xe8K\x81\ -\x0a\xfd\xf9\x9a\x03\xaf.\xe8&1\xca\xb9\xf7\xcd!\x1a\ -\x0fj\x0b\xb6i\x22\xd7\x13\x04r\xbe\xe3\xd1\xd5\x85\x97\ -8\xaa\xf22\xed\x86\xee\xb3\xaaU\xd3\x0d!\xdfDy\ -\x948\xf8\xa8Z\x13nP#\xd3\xdf\x8c\x01>\x99#\ -O\x9a\x0b(\x8c\x96Pu7K\xa3n\xb9\x0d\xa7\x82\ -K\xf3\xdb\xb6\xdc@\x0c\xde\xf79\x82\xdd\x991:S\ -_n\x0c\xe1\x03\xf5\xd0W2\x94\x83/\xaa\xec\xcf\xe9\ -V\xe8\x93\xd3\x0e\xaa\xe6\xb9\x06\xe9\xe7\xbdMP#?\ -\x98x\xdfq\xa0~\xe6\xf1\xaa\x11\xa3\xc4\xd5\xa5\x11j\ -\xa03c\xa4[\x16\xfd0;\xbd\xd1\x90\xbe\xff\xb9\x84\ -\x90\xba\x87\x92\x87\xff\xbd\xcf?\xf8A\xfe\xf5\x0a5\xa2\ ->\x7f\x1e\xa3(Y\xaa\x9b\xc9O\xb7,\xfaa~\x8a\ -'\xf9\x09!u\xff\x15\x8bcs\ \x00\x00\x01\x02\ \x00\ \x00\x02\xa9x\x9cu\x91\xc1R\xc3 \x14E\xf7\xfd\x8d\ @@ -35676,10 +35654,6 @@ \x08a\xa1\x8b\ \x00A\ \x00r\x00c\x00-\x00D\x00a\x00r\x00k\ -\x00\x04\ -\x00\x04\x80\x99\ -\x00A\ -\x00i\x00r\x00y\ \x00\x0a\ \x01\xa1\x81\x02\ \x00A\ @@ -35713,27 +35687,25 @@ qt_resource_struct = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x02\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\x14\x00\x02\x00\x00\x00\x02\x00\x00\x00\x0c\ +\x00\x00\x00\x14\x00\x02\x00\x00\x00\x02\x00\x00\x00\x0b\ \x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x09\x00\x00\x00\x03\ +\x00\x00\x00\x00\x00\x02\x00\x00\x00\x08\x00\x00\x00\x03\ \x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00n\x00\x01\x00\x00\x00\x01\x00\x08\xaa\x11\ -\x00\x00\x01\x8f\xdd\xb9\xe7\xc6\ -\x00\x00\x00\xe2\x00\x01\x00\x00\x00\x01\x00\x08\xafS\ +\x00\x00\x00\xd4\x00\x01\x00\x00\x00\x01\x00\x08\xae\x14\ \x00\x00\x01\x8f\xdd\xb9\xe7\xc6\ -\x00\x00\x00\xf0\x00\x01\x00\x00\x00\x01\x00\x08\xb0D\ +\x00\x00\x00\xe2\x00\x01\x00\x00\x00\x01\x00\x08\xaf\x05\ \x00\x00\x01\x94\x0a\x06\xda.\ -\x00\x00\x00\xb4\x00\x01\x00\x00\x00\x01\x00\x08\xadc\ +\x00\x00\x00\xa6\x00\x01\x00\x00\x00\x01\x00\x08\xac$\ \x00\x00\x01\x8f\xdd\xb9\xe7\xc6\ -\x00\x00\x00|\x00\x01\x00\x00\x00\x01\x00\x08\xabP\ +\x00\x00\x00n\x00\x01\x00\x00\x00\x01\x00\x08\xaa\x11\ \x00\x00\x01\x8f\xdd\xb9\xe7\xc6\ -\x00\x00\x00\xce\x00\x01\x00\x00\x00\x01\x00\x08\xae`\ +\x00\x00\x00\xc0\x00\x01\x00\x00\x00\x01\x00\x08\xad!\ \x00\x00\x01\x8f\xdd\xb9\xe7\xc6\ -\x00\x00\x00\xfe\x00\x01\x00\x00\x00\x01\x00\x08\xb1K\ +\x00\x00\x00\xf0\x00\x01\x00\x00\x00\x01\x00\x08\xb0\x0c\ \x00\x00\x01\x8f\xdd\xb9\xe7\xc6\ \x00\x00\x00X\x00\x01\x00\x00\x00\x01\x00\x08\xa8\xfc\ \x00\x00\x01\x8f\xdd\xb9\xe7\xc6\ -\x00\x00\x00\x96\x00\x01\x00\x00\x00\x01\x00\x08\xacV\ +\x00\x00\x00\x88\x00\x01\x00\x00\x00\x01\x00\x08\xab\x17\ \x00\x00\x01\x8f\xdd\xb9\xe7\xc6\ \x00\x00\x00B\x00\x01\x00\x00\x00\x01\x00\x08\x95\x06\ \x00\x00\x01\x9c\xc3\x1e\xdd\x86\ diff --git a/rare/resources/resources.qrc b/rare/resources/resources.qrc index 42daa7e04f..7564c6f83c 100644 --- a/rare/resources/resources.qrc +++ b/rare/resources/resources.qrc @@ -1,7 +1,6 @@ colors/Adapta-Nokto.scheme - colors/Airy.scheme colors/Arc-Dark.scheme colors/Arc-Darker.scheme colors/Darker.scheme diff --git a/rare/ui/components/tabs/settings/about.py b/rare/ui/components/tabs/settings/about.py index 37a7fa73a4..686843f8da 100644 --- a/rare/ui/components/tabs/settings/about.py +++ b/rare/ui/components/tabs/settings/about.py @@ -17,7 +17,7 @@ class Ui_About(object): def setupUi(self, About): if not About.objectName(): About.setObjectName(u"About") - About.resize(508, 210) + About.resize(542, 215) self.about_layout = QFormLayout(About) self.about_layout.setObjectName(u"about_layout") self.about_layout.setLabelAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter) @@ -104,7 +104,9 @@ def setupUi(self, About): self.label = QLabel(About) self.label.setObjectName(u"label") - self.label.setText(u"MultisampledNight artwork, bug hunting, testing\n" + self.label.setText(u"CommandMC author of original Rare, the very early base of this project\n" +"
\n" +"MultisampledNight artwork, bug hunting, testing\n" "
\n" "invertedEcho moving games, environment variables\n" "
\n" diff --git a/rare/ui/components/tabs/settings/about.ui b/rare/ui/components/tabs/settings/about.ui index f2d797174f..a55381397a 100644 --- a/rare/ui/components/tabs/settings/about.ui +++ b/rare/ui/components/tabs/settings/about.ui @@ -6,8 +6,8 @@ 0 0 - 508 - 210 + 542 + 215 @@ -154,7 +154,9 @@ - <a href='https://github.com/MultisampledNight' style='color: #2980b9; text-decoration:none'>MultisampledNight</a> <i>artwork, bug hunting, testing</i> + <a href='https://github.com/CommandMC' style='color: #2980b9; text-decoration:none'>CommandMC</a> <i>author of <a href='https://github.com/CommandMC/Rare' style='color: #2980b9; text-decoration:none'>original Rare</a>, the very early base of this project</i> +<br> +<a href='https://github.com/MultisampledNight' style='color: #2980b9; text-decoration:none'>MultisampledNight</a> <i>artwork, bug hunting, testing</i> <br> <a href='https://github.com/invertedEcho' style='color: #2980b9; text-decoration:none'>invertedEcho</a> <i>moving games, environment variables</i> <br>