diff options
-rw-r--r-- | dist/qt_themes/qdarkstyle/LICENSE.md | 183 | ||||
-rw-r--r-- | dist/qt_themes/qdarkstyle/style.qss | 607 | ||||
m--------- | externals/dynarmic | 0 | ||||
-rw-r--r-- | src/common/common_funcs.h | 4 | ||||
-rw-r--r-- | src/common/logging/backend.cpp | 2 | ||||
-rw-r--r-- | src/common/logging/log.h | 2 | ||||
-rw-r--r-- | src/common/swap.h | 2 | ||||
-rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/core/file_sys/partition_filesystem.cpp | 5 | ||||
-rw-r--r-- | src/core/hle/service/btm/btm.cpp | 121 | ||||
-rw-r--r-- | src/core/hle/service/btm/btm.h | 15 | ||||
-rw-r--r-- | src/core/hle/service/hid/hid.cpp | 18 | ||||
-rw-r--r-- | src/core/hle/service/service.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/service/wlan/wlan.cpp | 172 | ||||
-rw-r--r-- | src/core/hle/service/wlan/wlan.h | 15 | ||||
-rw-r--r-- | src/yuzu/about_dialog.cpp | 5 | ||||
-rw-r--r-- | src/yuzu/aboutdialog.ui | 4 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_debug.cpp | 1 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_general.cpp | 1 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_graphics.cpp | 1 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_input.cpp | 2 | ||||
-rw-r--r-- | src/yuzu/main.cpp | 5 |
22 files changed, 834 insertions, 341 deletions
diff --git a/dist/qt_themes/qdarkstyle/LICENSE.md b/dist/qt_themes/qdarkstyle/LICENSE.md new file mode 100644 index 000000000..d8910aea5 --- /dev/null +++ b/dist/qt_themes/qdarkstyle/LICENSE.md @@ -0,0 +1,183 @@ +# License + +## The MIT License (MIT) - Code + +Copyright (c) 2013-2018 Colin Duquesnoy + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +## Creative Commons Attribution International 4.0 - Images + +QDarkStyle (c) 2013-2018 Colin Duquesnoy + +Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible. + +### Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses. + +* __Considerations for licensors:__ Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. [More considerations for licensors](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors). + +* __Considerations for the public:__ By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees). + +## Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +### Section 1 – Definitions + +a. __Adapted Material__ means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. + +b. __Adapter's License__ means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. + +c. __Copyright and Similar Rights__ means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + +d. __Effective Technological Measures__ means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. + +e. __Exceptions and Limitations__ means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. + +f. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public License. + +g. __Licensed Rights__ means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. + +h. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public License. + +i. __Share__ means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. + +j. __Sui Generis Database Rights__ means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. + +k. __You__ means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. + +### Section 2 – Scope + +a. ___License grant.___ + + 1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: + + A. reproduce and Share the Licensed Material, in whole or in part; and + + B. produce, reproduce, and Share Adapted Material. + + 2. __Exceptions and Limitations.__ For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. + + 3. __Term.__ The term of this Public License is specified in Section 6(a). + + 4. __Media and formats; technical modifications allowed.__ The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. + + 5. __Downstream recipients.__ + + A. __Offer from the Licensor – Licensed Material.__ Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. + + B. __No downstream restrictions.__ You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. + + 6. __No endorsement.__ Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). + +b. ___Other rights.___ + + 1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this Public License. + + 3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties. + +### Section 3 – License Conditions + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + +a. ___Attribution.___ + + 1. If You Share the Licensed Material (including in modified form), You must: + + A. retain the following if it is supplied by the Licensor with the Licensed Material: + + i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of warranties; + + v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + + B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and + + C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. + + 3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License. + +### Section 4 – Sui Generis Database Rights + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + +a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database; + +b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and + +c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. + +### Section 5 – Disclaimer of Warranties and Limitation of Liability + +a. __Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.__ + +b. __To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.__ + +c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. + +### Section 6 – Term and Termination + +a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. + +b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. + +c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. + +d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +### Section 7 – Other Terms and Conditions + +a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. + +b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. + +### Section 8 – Interpretation + +a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. + +b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. + +c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. + +d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. + +> Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at [creativecommons.org/policies](http://creativecommons.org/policies), Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses. +> +> Creative Commons may be contacted at creativecommons.org
\ No newline at end of file diff --git a/dist/qt_themes/qdarkstyle/style.qss b/dist/qt_themes/qdarkstyle/style.qss index c8e50312a..399c38dce 100644 --- a/dist/qt_themes/qdarkstyle/style.qss +++ b/dist/qt_themes/qdarkstyle/style.qss @@ -1,40 +1,15 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) <2013-2014> <Colin Duquesnoy> - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -QToolTip -{ +QToolTip { border: 1px solid #76797C; - background-color: rgb(90, 102, 117);; + background-color: #5A7566; color: white; - padding: 5px; + padding: 0px; /*remove padding, for fix combobox tooltip.*/ opacity: 200; } -QWidget -{ +QWidget { color: #eff0f1; background-color: #31363b; - selection-background-color:#3daee9; + selection-background-color: #3daee9; selection-color: #eff0f1; background-clip: border; border-image: none; @@ -42,43 +17,38 @@ QWidget outline: 0; } -QWidget:item:hover -{ +QWidget:item:hover { background-color: #18465d; color: #eff0f1; } -QWidget:item:selected -{ +QWidget:item:selected { background-color: #18465d; } -QCheckBox -{ +QCheckBox { spacing: 5px; outline: none; color: #eff0f1; margin-bottom: 2px; } -QCheckBox:disabled -{ +QCheckBox:disabled { color: #76797C; } QCheckBox::indicator, -QGroupBox::indicator -{ +QGroupBox::indicator { width: 18px; height: 18px; } -QGroupBox::indicator -{ + +QGroupBox::indicator { margin-left: 2px; } -QCheckBox::indicator:unchecked -{ +QCheckBox::indicator:unchecked, +QGroupBox::indicator:unchecked { image: url(:/qss_icons/rc/checkbox_unchecked.png); } @@ -87,14 +57,13 @@ QCheckBox::indicator:unchecked:focus, QCheckBox::indicator:unchecked:pressed, QGroupBox::indicator:unchecked:hover, QGroupBox::indicator:unchecked:focus, -QGroupBox::indicator:unchecked:pressed -{ - border: none; +QGroupBox::indicator:unchecked:pressed { + border: none; image: url(:/qss_icons/rc/checkbox_unchecked_focus.png); } -QCheckBox::indicator:checked -{ +QCheckBox::indicator:checked, +QGroupBox::indicator:checked { image: url(:/qss_icons/rc/checkbox_checked.png); } @@ -103,72 +72,60 @@ QCheckBox::indicator:checked:focus, QCheckBox::indicator:checked:pressed, QGroupBox::indicator:checked:hover, QGroupBox::indicator:checked:focus, -QGroupBox::indicator:checked:pressed -{ - border: none; +QGroupBox::indicator:checked:pressed { + border: none; image: url(:/qss_icons/rc/checkbox_checked_focus.png); } - -QCheckBox::indicator:indeterminate -{ +QCheckBox::indicator:indeterminate { image: url(:/qss_icons/rc/checkbox_indeterminate.png); } QCheckBox::indicator:indeterminate:focus, QCheckBox::indicator:indeterminate:hover, -QCheckBox::indicator:indeterminate:pressed -{ +QCheckBox::indicator:indeterminate:pressed { image: url(:/qss_icons/rc/checkbox_indeterminate_focus.png); } QCheckBox::indicator:checked:disabled, -QGroupBox::indicator:checked:disabled -{ +QGroupBox::indicator:checked:disabled { image: url(:/qss_icons/rc/checkbox_checked_disabled.png); } QCheckBox::indicator:unchecked:disabled, -QGroupBox::indicator:unchecked:disabled -{ +QGroupBox::indicator:unchecked:disabled { image: url(:/qss_icons/rc/checkbox_unchecked_disabled.png); } -QRadioButton -{ +QRadioButton { spacing: 5px; outline: none; color: #eff0f1; margin-bottom: 2px; } -QRadioButton:disabled -{ +QRadioButton:disabled { color: #76797C; } -QRadioButton::indicator -{ + +QRadioButton::indicator { width: 21px; height: 21px; } -QRadioButton::indicator:unchecked -{ +QRadioButton::indicator:unchecked { image: url(:/qss_icons/rc/radio_unchecked.png); } - QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:focus, -QRadioButton::indicator:unchecked:pressed -{ +QRadioButton::indicator:unchecked:pressed { border: none; outline: none; image: url(:/qss_icons/rc/radio_unchecked_focus.png); } -QRadioButton::indicator:checked -{ +QRadioButton::indicator:checked { border: none; outline: none; image: url(:/qss_icons/rc/radio_checked.png); @@ -176,72 +133,60 @@ QRadioButton::indicator:checked QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:focus, -QRadioButton::indicator:checked:pressed -{ +QRadioButton::indicator:checked:pressed { border: none; outline: none; image: url(:/qss_icons/rc/radio_checked_focus.png); } -QRadioButton::indicator:checked:disabled -{ +QRadioButton::indicator:checked:disabled { outline: none; image: url(:/qss_icons/rc/radio_checked_disabled.png); } -QRadioButton::indicator:unchecked:disabled -{ +QRadioButton::indicator:unchecked:disabled { image: url(:/qss_icons/rc/radio_unchecked_disabled.png); } - -QMenuBar -{ +QMenuBar { background-color: #31363b; color: #eff0f1; } -QMenuBar::item -{ +QMenuBar::item { background: transparent; } -QMenuBar::item:selected -{ +QMenuBar::item:selected { background: transparent; border: 1px solid #76797C; } -QMenuBar::item:pressed -{ +QMenuBar::item:pressed { border: 1px solid #76797C; background-color: #3daee9; color: #eff0f1; - margin-bottom:-1px; - padding-bottom:1px; + margin-bottom: -1px; + padding-bottom: 1px; } -QMenu -{ +QMenu { border: 1px solid #76797C; color: #eff0f1; margin: 2px; } -QMenu::icon -{ +QMenu::icon { margin: 5px; } -QMenu::item -{ +QMenu::item { padding: 5px 30px 5px 30px; - margin-left: 5px; - border: 1px solid transparent; /* reserve space for selection border */ + border: 1px solid transparent; + /* reserve space for selection border */ } -QMenu::item:selected -{ +QMenu::item:selected { color: #eff0f1; } @@ -257,8 +202,10 @@ QMenu::indicator { height: 18px; } + /* non-exclusive indicator = check box style indicator (see QActionGroup::setExclusive) */ + QMenu::indicator:non-exclusive:unchecked { image: url(:/qss_icons/rc/checkbox_unchecked.png); } @@ -275,7 +222,9 @@ QMenu::indicator:non-exclusive:checked:selected { image: url(:/qss_icons/rc/checkbox_checked_disabled.png); } + /* exclusive indicator = radio button style indicator (see QActionGroup::setExclusive) */ + QMenu::indicator:exclusive:unchecked { image: url(:/qss_icons/rc/radio_unchecked.png); } @@ -297,33 +246,31 @@ QMenu::right-arrow { image: url(:/qss_icons/rc/right_arrow.png) } - -QWidget:disabled -{ +QWidget:disabled { color: #454545; background-color: #31363b; } -QAbstractItemView -{ +QAbstractItemView { alternate-background-color: #31363b; color: #eff0f1; - border: 1px solid 3A3939; + border: 1px solid #3A3939; border-radius: 2px; } -QWidget:focus, QMenuBar:focus -{ +QWidget:focus, +QMenuBar:focus { border: 1px solid #3daee9; } -QTabWidget:focus, QCheckBox:focus, QRadioButton:focus, QSlider:focus -{ +QTabWidget:focus, +QCheckBox:focus, +QRadioButton:focus, +QSlider:focus { border: none; } -QLineEdit -{ +QLineEdit { background-color: #232629; padding: 5px; border-style: solid; @@ -332,13 +279,12 @@ QLineEdit color: #eff0f1; } -QAbstractItemView QLineEdit -{ +QAbstractItemView QLineEdit { padding: 0; } QGroupBox { - border:1px solid #76797C; + border: 1px solid #76797C; border-radius: 2px; margin-top: 20px; } @@ -351,15 +297,13 @@ QGroupBox::title { padding-top: 10px; } -QAbstractScrollArea -{ +QAbstractScrollArea { border-radius: 2px; border: 1px solid #76797C; background-color: transparent; } -QScrollBar:horizontal -{ +QScrollBar:horizontal { height: 15px; margin: 3px 15px 3px 15px; border: 1px transparent #2A2929; @@ -367,15 +311,13 @@ QScrollBar:horizontal background-color: #2A2929; } -QScrollBar::handle:horizontal -{ +QScrollBar::handle:horizontal { background-color: #605F5F; min-width: 5px; border-radius: 4px; } -QScrollBar::add-line:horizontal -{ +QScrollBar::add-line:horizontal { margin: 0px 3px 0px 3px; border-image: url(:/qss_icons/rc/right_arrow_disabled.png); width: 10px; @@ -384,8 +326,7 @@ QScrollBar::add-line:horizontal subcontrol-origin: margin; } -QScrollBar::sub-line:horizontal -{ +QScrollBar::sub-line:horizontal { margin: 0px 3px 0px 3px; border-image: url(:/qss_icons/rc/left_arrow_disabled.png); height: 10px; @@ -394,8 +335,8 @@ QScrollBar::sub-line:horizontal subcontrol-origin: margin; } -QScrollBar::add-line:horizontal:hover,QScrollBar::add-line:horizontal:on -{ +QScrollBar::add-line:horizontal:hover, +QScrollBar::add-line:horizontal:on { border-image: url(:/qss_icons/rc/right_arrow.png); height: 10px; width: 10px; @@ -403,9 +344,8 @@ QScrollBar::add-line:horizontal:hover,QScrollBar::add-line:horizontal:on subcontrol-origin: margin; } - -QScrollBar::sub-line:horizontal:hover, QScrollBar::sub-line:horizontal:on -{ +QScrollBar::sub-line:horizontal:hover, +QScrollBar::sub-line:horizontal:on { border-image: url(:/qss_icons/rc/left_arrow.png); height: 10px; width: 10px; @@ -413,19 +353,17 @@ QScrollBar::sub-line:horizontal:hover, QScrollBar::sub-line:horizontal:on subcontrol-origin: margin; } -QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal -{ +QScrollBar::up-arrow:horizontal, +QScrollBar::down-arrow:horizontal { background: none; } - -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal -{ +QScrollBar::add-page:horizontal, +QScrollBar::sub-page:horizontal { background: none; } -QScrollBar:vertical -{ +QScrollBar:vertical { background-color: #2A2929; width: 15px; margin: 15px 3px 15px 3px; @@ -433,15 +371,13 @@ QScrollBar:vertical border-radius: 4px; } -QScrollBar::handle:vertical -{ +QScrollBar::handle:vertical { background-color: #605F5F; min-height: 5px; border-radius: 4px; } -QScrollBar::sub-line:vertical -{ +QScrollBar::sub-line:vertical { margin: 3px 0px 3px 0px; border-image: url(:/qss_icons/rc/up_arrow_disabled.png); height: 10px; @@ -450,8 +386,7 @@ QScrollBar::sub-line:vertical subcontrol-origin: margin; } -QScrollBar::add-line:vertical -{ +QScrollBar::add-line:vertical { margin: 3px 0px 3px 0px; border-image: url(:/qss_icons/rc/down_arrow_disabled.png); height: 10px; @@ -460,9 +395,8 @@ QScrollBar::add-line:vertical subcontrol-origin: margin; } -QScrollBar::sub-line:vertical:hover,QScrollBar::sub-line:vertical:on -{ - +QScrollBar::sub-line:vertical:hover, +QScrollBar::sub-line:vertical:on { border-image: url(:/qss_icons/rc/up_arrow.png); height: 10px; width: 10px; @@ -470,9 +404,8 @@ QScrollBar::sub-line:vertical:hover,QScrollBar::sub-line:vertical:on subcontrol-origin: margin; } - -QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on -{ +QScrollBar::add-line:vertical:hover, +QScrollBar::add-line:vertical:on { border-image: url(:/qss_icons/rc/down_arrow.png); height: 10px; width: 10px; @@ -480,34 +413,31 @@ QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on subcontrol-origin: margin; } -QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical -{ +QScrollBar::up-arrow:vertical, +QScrollBar::down-arrow:vertical { background: none; } - -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical -{ +QScrollBar::add-page:vertical, +QScrollBar::sub-page:vertical { background: none; } -QTextEdit -{ +QTextEdit { background-color: #232629; color: #eff0f1; border: 1px solid #76797C; } -QPlainTextEdit -{ - background-color: #232629;; +QPlainTextEdit { + background-color: #232629; + ; color: #eff0f1; border-radius: 2px; border: 1px solid #76797C; } -QHeaderView::section -{ +QHeaderView::section { background-color: #76797C; color: #eff0f1; padding: 5px; @@ -520,9 +450,7 @@ QSizeGrip { height: 12px; } - -QMainWindow::separator -{ +QMainWindow::separator { background-color: #31363b; color: white; padding-left: 4px; @@ -530,9 +458,7 @@ QMainWindow::separator border: 1px dashed #76797C; } -QMainWindow::separator:hover -{ - +QMainWindow::separator:hover { background-color: #787876; color: white; padding-left: 4px; @@ -540,9 +466,7 @@ QMainWindow::separator:hover spacing: 2px; } - -QMenu::separator -{ +QMenu::separator { height: 1px; background-color: #76797C; color: white; @@ -551,21 +475,17 @@ QMenu::separator margin-right: 5px; } - -QFrame -{ +QFrame { border-radius: 2px; border: 1px solid #76797C; } -QFrame[frameShape="0"] -{ +QFrame[frameShape="0"] { border-radius: 2px; border: 1px transparent #76797C; } -QStackedWidget -{ +QStackedWidget { border: 1px transparent black; } @@ -578,21 +498,24 @@ QToolBar { QToolBar::handle:horizontal { image: url(:/qss_icons/rc/Hmovetoolbar.png); } + QToolBar::handle:vertical { image: url(:/qss_icons/rc/Vmovetoolbar.png); } + QToolBar::separator:horizontal { image: url(:/qss_icons/rc/Hsepartoolbar.png); } + QToolBar::separator:vertical { image: url(:/qss_icons/rc/Vsepartoolbar.png); } + QToolButton#qt_toolbar_ext_button { background: #58595a } -QPushButton -{ +QPushButton { color: #eff0f1; background-color: #31363b; border-width: 1px; @@ -603,8 +526,7 @@ QPushButton outline: none; } -QPushButton:disabled -{ +QPushButton:disabled { background-color: #31363b; border-width: 1px; border-color: #454545; @@ -622,15 +544,13 @@ QPushButton:focus { color: white; } -QPushButton:pressed -{ +QPushButton:pressed { background-color: #3daee9; padding-top: -15px; padding-bottom: -17px; } -QComboBox -{ +QComboBox { selection-background-color: #3daee9; border-style: solid; border: 1px solid #76797C; @@ -639,38 +559,40 @@ QComboBox min-width: 75px; } -QPushButton:checked{ +QPushButton:checked { background-color: #76797C; border-color: #6A6969; } -QComboBox:hover,QPushButton:hover,QAbstractSpinBox:hover,QLineEdit:hover,QTextEdit:hover,QPlainTextEdit:hover,QAbstractView:hover,QTreeView:hover -{ +QComboBox:hover, +QPushButton:hover, +QAbstractSpinBox:hover, +QLineEdit:hover, +QTextEdit:hover, +QPlainTextEdit:hover, +QAbstractView:hover, +QTreeView:hover { border: 1px solid #3daee9; color: #eff0f1; } -QComboBox:on -{ +QComboBox:on { padding-top: 3px; padding-left: 4px; selection-background-color: #4a4a4a; } -QComboBox QAbstractItemView -{ +QComboBox QAbstractItemView { background-color: #232629; border-radius: 2px; border: 1px solid #76797C; selection-background-color: #18465d; } -QComboBox::drop-down -{ +QComboBox::drop-down { subcontrol-origin: padding; subcontrol-position: top right; width: 15px; - border-left-width: 0px; border-left-color: darkgray; border-left-style: solid; @@ -678,14 +600,13 @@ QComboBox::drop-down border-bottom-right-radius: 3px; } -QComboBox::down-arrow -{ +QComboBox::down-arrow { image: url(:/qss_icons/rc/down_arrow_disabled.png); } -QComboBox::down-arrow:on, QComboBox::down-arrow:hover, -QComboBox::down-arrow:focus -{ +QComboBox::down-arrow:on, +QComboBox::down-arrow:hover, +QComboBox::down-arrow:focus { image: url(:/qss_icons/rc/down_arrow.png); } @@ -698,49 +619,47 @@ QAbstractSpinBox { min-width: 75px; } -QAbstractSpinBox:up-button -{ +QAbstractSpinBox:up-button { background-color: transparent; subcontrol-origin: border; subcontrol-position: center right; } -QAbstractSpinBox:down-button -{ +QAbstractSpinBox:down-button { background-color: transparent; subcontrol-origin: border; subcontrol-position: center left; } -QAbstractSpinBox::up-arrow,QAbstractSpinBox::up-arrow:disabled,QAbstractSpinBox::up-arrow:off { +QAbstractSpinBox::up-arrow, +QAbstractSpinBox::up-arrow:disabled, +QAbstractSpinBox::up-arrow:off { image: url(:/qss_icons/rc/up_arrow_disabled.png); width: 10px; height: 10px; } -QAbstractSpinBox::up-arrow:hover -{ + +QAbstractSpinBox::up-arrow:hover { image: url(:/qss_icons/rc/up_arrow.png); } - -QAbstractSpinBox::down-arrow,QAbstractSpinBox::down-arrow:disabled,QAbstractSpinBox::down-arrow:off -{ +QAbstractSpinBox::down-arrow, +QAbstractSpinBox::down-arrow:disabled, +QAbstractSpinBox::down-arrow:off { image: url(:/qss_icons/rc/down_arrow_disabled.png); width: 10px; height: 10px; } -QAbstractSpinBox::down-arrow:hover -{ + +QAbstractSpinBox::down-arrow:hover { image: url(:/qss_icons/rc/down_arrow.png); } - -QLabel -{ +QLabel { border: 0px solid black; } -QTabWidget{ +QTabWidget { border: 0px transparent black; } @@ -751,27 +670,24 @@ QTabWidget::pane { } QTabWidget::tab-bar { - left: 5px; /* move to the right by 5px */ + /* left: 5px; move to the right by 5px */ } -QTabBar -{ +QTabBar { qproperty-drawBase: 0; border-radius: 3px; } -QTabBar:focus -{ +QTabBar:focus { border: 0px transparent black; } -QTabBar::close-button { +QTabBar::close-button { image: url(:/qss_icons/rc/close.png); background: transparent; } -QTabBar::close-button:hover -{ +QTabBar::close-button:hover { image: url(:/qss_icons/rc/close-hover.png); background: transparent; } @@ -781,7 +697,9 @@ QTabBar::close-button:pressed { background: transparent; } + /* TOP TABS */ + QTabBar::tab:top { color: #eff0f1; border: 1px solid #76797C; @@ -793,12 +711,11 @@ QTabBar::tab:top { border-top-right-radius: 2px; } -QTabBar::tab:top:!selected -{ +QTabBar::tab:top:selected { color: #eff0f1; background-color: #54575B; border: 1px solid #76797C; - border-bottom: 1px transparent black; + border-bottom: 2px solid #3daee9; border-top-left-radius: 2px; border-top-right-radius: 2px; } @@ -807,7 +724,9 @@ QTabBar::tab:top:!selected:hover { background-color: #3daee9; } + /* BOTTOM TABS */ + QTabBar::tab:bottom { color: #eff0f1; border: 1px solid #76797C; @@ -819,12 +738,11 @@ QTabBar::tab:bottom { min-width: 50px; } -QTabBar::tab:bottom:!selected -{ +QTabBar::tab:bottom:selected { color: #eff0f1; background-color: #54575B; border: 1px solid #76797C; - border-top: 1px transparent black; + border-top: 2px solid #3daee9; border-bottom-left-radius: 2px; border-bottom-right-radius: 2px; } @@ -833,7 +751,9 @@ QTabBar::tab:bottom:!selected:hover { background-color: #3daee9; } + /* LEFT TABS */ + QTabBar::tab:left { color: #eff0f1; border: 1px solid #76797C; @@ -845,12 +765,11 @@ QTabBar::tab:left { min-height: 50px; } -QTabBar::tab:left:!selected -{ +QTabBar::tab:left:selected { color: #eff0f1; background-color: #54575B; border: 1px solid #76797C; - border-left: 1px transparent black; + border-left: 2px solid #3daee9; border-top-right-radius: 2px; border-bottom-right-radius: 2px; } @@ -861,6 +780,7 @@ QTabBar::tab:left:!selected:hover { /* RIGHT TABS */ + QTabBar::tab:right { color: #eff0f1; border: 1px solid #76797C; @@ -872,12 +792,11 @@ QTabBar::tab:right { min-height: 50px; } -QTabBar::tab:right:!selected -{ +QTabBar::tab:right:selected { color: #eff0f1; background-color: #54575B; border: 1px solid #76797C; - border-right: 1px transparent black; + border-right: 2px solid #3daee9; border-top-left-radius: 2px; border-bottom-left-radius: 2px; } @@ -887,21 +806,20 @@ QTabBar::tab:right:!selected:hover { } QTabBar QToolButton::right-arrow:enabled { - image: url(:/qss_icons/rc/right_arrow.png); - } + image: url(:/qss_icons/rc/right_arrow.png); +} - QTabBar QToolButton::left-arrow:enabled { - image: url(:/qss_icons/rc/left_arrow.png); - } +QTabBar QToolButton::left-arrow:enabled { + image: url(:/qss_icons/rc/left_arrow.png); +} QTabBar QToolButton::right-arrow:disabled { - image: url(:/qss_icons/rc/right_arrow_disabled.png); - } - - QTabBar QToolButton::left-arrow:disabled { - image: url(:/qss_icons/rc/left_arrow_disabled.png); - } + image: url(:/qss_icons/rc/right_arrow_disabled.png); +} +QTabBar QToolButton::left-arrow:disabled { + image: url(:/qss_icons/rc/left_arrow_disabled.png); +} QDockWidget { background: #31363b; @@ -910,29 +828,32 @@ QDockWidget { titlebar-normal-icon: url(:/qss_icons/rc/undock.png); } -QDockWidget::close-button, QDockWidget::float-button { +QDockWidget::close-button, +QDockWidget::float-button { border: 1px solid transparent; border-radius: 2px; background: transparent; } -QDockWidget::close-button:hover, QDockWidget::float-button:hover { +QDockWidget::close-button:hover, +QDockWidget::float-button:hover { background: rgba(255, 255, 255, 10); } -QDockWidget::close-button:pressed, QDockWidget::float-button:pressed { +QDockWidget::close-button:pressed, +QDockWidget::float-button:pressed { padding: 1px -1px -1px 1px; background: rgba(255, 255, 255, 10); } -QTreeView, QListView -{ +QTreeView, +QListView { border: 1px solid #76797C; background-color: #232629; } -QTreeView:branch:selected, QTreeView:branch:hover -{ +QTreeView:branch:selected, +QTreeView:branch:hover { background: url(:/qss_icons/rc/transparent.png); } @@ -954,31 +875,75 @@ QTreeView::branch:closed:has-children:has-siblings { } QTreeView::branch:open:has-children:!has-siblings, -QTreeView::branch:open:has-children:has-siblings { +QTreeView::branch:open:has-children:has-siblings { image: url(:/qss_icons/rc/branch_open.png); } QTreeView::branch:has-children:!has-siblings:closed:hover, QTreeView::branch:closed:has-children:has-siblings:hover { image: url(:/qss_icons/rc/branch_closed-on.png); - } +} QTreeView::branch:open:has-children:!has-siblings:hover, -QTreeView::branch:open:has-children:has-siblings:hover { +QTreeView::branch:open:has-children:has-siblings:hover { image: url(:/qss_icons/rc/branch_open-on.png); - } +} -QListView::item:!selected:hover, QTreeView::item:!selected:hover { +QListView::item:!selected:hover, +QTreeView::item:!selected:hover { background: #18465d; outline: 0; color: #eff0f1 } -QListView::item:selected:hover, QTreeView::item:selected:hover { +QListView::item:selected:hover, +QTreeView::item:selected:hover { background: #287399; color: #eff0f1; } +QTreeView::indicator:checked, +QListView::indicator:checked { + image: url(:/qss_icons/rc/checkbox_checked.png); +} + +QTreeView::indicator:unchecked, +QListView::indicator:unchecked { + image: url(:/qss_icons/rc/checkbox_unchecked.png); +} + +QTreeView::indicator:indeterminate, +QListView::indicator:indeterminate { + image: url(:/qss_icons/rc/checkbox_indeterminate.png); +} + +QTreeView::indicator:checked:hover, +QTreeView::indicator:checked:focus, +QTreeView::indicator:checked:pressed, +QListView::indicator:checked:hover, +QListView::indicator:checked:focus, +QListView::indicator:checked:pressed { + image: url(:/qss_icons/rc/checkbox_checked_focus.png); +} + +QTreeView::indicator:unchecked:hover, +QTreeView::indicator:unchecked:focus, +QTreeView::indicator:unchecked:pressed, +QListView::indicator:unchecked:hover, +QListView::indicator:unchecked:focus, +QListView::indicator:unchecked:pressed { + image: url(:/qss_icons/rc/checkbox_unchecked_focus.png); +} + +QTreeView::indicator:indeterminate:hover, +QTreeView::indicator:indeterminate:focus, +QTreeView::indicator:indeterminate:pressed, +QListView::indicator:indeterminate:hover, +QListView::indicator:indeterminate:focus, +QListView::indicator:indeterminate:pressed { + image: url(:/qss_icons/rc/checkbox_indeterminate_focus.png); +} + QSlider::groove:horizontal { border: 1px solid #565a5e; height: 4px; @@ -1021,38 +986,49 @@ QToolButton { padding: 5px; } -QToolButton[popupMode="1"] { /* only for MenuButtonPopup */ - padding-right: 20px; /* make way for the popup button */ - border: 1px #76797C; - border-radius: 5px; +QToolButton[popupMode="1"] { + /* only for MenuButtonPopup */ + padding-right: 20px; + /* make way for the popup button */ + border: 1px #76797C; + border-radius: 5px; } -QToolButton[popupMode="2"] { /* only for InstantPopup */ - padding-right: 10px; /* make way for the popup button */ - border: 1px #76797C; +QToolButton[popupMode="2"] { + /* only for InstantPopup */ + padding-right: 10px; + /* make way for the popup button */ + border: 1px #76797C; } - -QToolButton:hover, QToolButton::menu-button:hover { +QToolButton:hover, +QToolButton::menu-button:hover { background-color: transparent; border: 1px solid #3daee9; padding: 5px; } -QToolButton:checked, QToolButton:pressed, - QToolButton::menu-button:pressed { +QToolButton:checked, +QToolButton:pressed, +QToolButton::menu-button:pressed { background-color: #3daee9; border: 1px solid #3daee9; padding: 5px; } + /* the subcontrol below is used only in the InstantPopup or DelayedPopup mode */ + QToolButton::menu-indicator { image: url(:/qss_icons/rc/down_arrow.png); - top: -7px; left: -2px; /* shift it a bit */ + top: -7px; + left: -2px; + /* shift it a bit */ } + /* the subcontrols below are used only in the MenuButtonPopup mode */ + QToolButton::menu-button { border: 1px transparent #76797C; border-top-right-radius: 6px; @@ -1070,47 +1046,46 @@ QToolButton::menu-arrow:open { border: 1px solid #76797C; } -QPushButton::menu-indicator { +QPushButton::menu-indicator { subcontrol-origin: padding; subcontrol-position: bottom right; left: 8px; } -QTableView -{ +QTableView { border: 1px solid #76797C; gridline-color: #31363b; background-color: #232629; } - -QTableView, QHeaderView -{ +QTableView, +QHeaderView { border-radius: 0px; } -QTableView::item:pressed, QListView::item:pressed, QTreeView::item:pressed { +QTableView::item:pressed, +QListView::item:pressed, +QTreeView::item:pressed { background: #18465d; color: #eff0f1; } -QTableView::item:selected:active, QTreeView::item:selected:active, QListView::item:selected:active { +QTableView::item:selected:active, +QTreeView::item:selected:active, +QListView::item:selected:active { background: #287399; color: #eff0f1; } - -QHeaderView -{ +QHeaderView { background-color: #31363b; border: 1px transparent; border-radius: 0px; margin: 0px; padding: 0px; - } -QHeaderView::section { +QHeaderView::section { background-color: #31363b; color: #eff0f1; padding: 5px; @@ -1119,34 +1094,32 @@ QHeaderView::section { text-align: center; } -QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one -{ +QHeaderView::section::vertical::first, +QHeaderView::section::vertical::only-one { border-top: 1px solid #76797C; } -QHeaderView::section::vertical -{ +QHeaderView::section::vertical { border-top: transparent; } -QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one -{ +QHeaderView::section::horizontal::first, +QHeaderView::section::horizontal::only-one { border-left: 1px solid #76797C; } -QHeaderView::section::horizontal -{ +QHeaderView::section::horizontal { border-left: transparent; } - -QHeaderView::section:checked - { +QHeaderView::section:checked { color: white; background-color: #334e5e; - } +} + + +/* style the sort indicator */ - /* style the sort indicator */ QHeaderView::down-arrow { image: url(:/qss_icons/rc/down_arrow.png); } @@ -1155,14 +1128,13 @@ QHeaderView::up-arrow { image: url(:/qss_icons/rc/up_arrow.png); } - QTableCornerButton::section { background-color: #31363b; border: 1px transparent #76797C; border-radius: 0px; } -QToolBox { +QToolBox { padding: 5px; border: 1px transparent black; } @@ -1176,22 +1148,22 @@ QToolBox::tab { border-top-right-radius: 5px; } -QToolBox::tab:selected { /* italicize selected tabs */ +QToolBox::tab:selected { + /* italicize selected tabs */ font: italic; background-color: #31363b; border-color: #3daee9; - } +} QStatusBar::item { border: 0px transparent dark; - } - +} -QFrame[height="3"], QFrame[width="3"] { +QFrame[height="3"], +QFrame[width="3"] { background-color: #76797C; } - QSplitter::handle { border: 1px dashed #76797C; } @@ -1219,8 +1191,7 @@ QProgressBar::chunk { background-color: #05B8CC; } -QDateEdit -{ +QDateEdit { selection-background-color: #3daee9; border-style: solid; border: 1px solid #3375A3; @@ -1229,23 +1200,20 @@ QDateEdit min-width: 75px; } -QDateEdit:on -{ +QDateEdit:on { padding-top: 3px; padding-left: 4px; selection-background-color: #4a4a4a; } -QDateEdit QAbstractItemView -{ +QDateEdit QAbstractItemView { background-color: #232629; border-radius: 2px; border: 1px solid #3375A3; selection-background-color: #3daee9; } -QDateEdit::drop-down -{ +QDateEdit::drop-down { subcontrol-origin: padding; subcontrol-position: top right; width: 15px; @@ -1256,13 +1224,12 @@ QDateEdit::drop-down border-bottom-right-radius: 3px; } -QDateEdit::down-arrow -{ +QDateEdit::down-arrow { image: url(:/qss_icons/rc/down_arrow_disabled.png); } -QDateEdit::down-arrow:on, QDateEdit::down-arrow:hover, -QDateEdit::down-arrow:focus -{ +QDateEdit::down-arrow:on, +QDateEdit::down-arrow:hover, +QDateEdit::down-arrow:focus { image: url(:/qss_icons/rc/down_arrow.png); } diff --git a/externals/dynarmic b/externals/dynarmic -Subproject 98e23801297167db1fd266696484a49096e734c +Subproject 73d3efc3e03887fb89c6a7b655d2f79d0e0711a diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 93f1c0044..8b0d34da6 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -6,7 +6,7 @@ #include <string> -#if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM) +#if !defined(ARCHITECTURE_x86_64) #include <cstdlib> // for exit #endif #include "common/common_types.h" @@ -32,8 +32,6 @@ #ifdef ARCHITECTURE_x86_64 #define Crash() __asm__ __volatile__("int $3") -#elif defined(ARCHITECTURE_ARM) -#define Crash() __asm__ __volatile__("trap") #else #define Crash() exit(1) #endif diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 38cc85e23..55de535c0 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -169,6 +169,7 @@ void FileBackend::Write(const Entry& entry) { SUB(Service, AOC) \ SUB(Service, APM) \ SUB(Service, BCAT) \ + SUB(Service, BTM) \ SUB(Service, Fatal) \ SUB(Service, Friend) \ SUB(Service, FS) \ @@ -192,6 +193,7 @@ void FileBackend::Write(const Entry& entry) { SUB(Service, SSL) \ SUB(Service, Time) \ SUB(Service, VI) \ + SUB(Service, WLAN) \ CLS(HW) \ SUB(HW, Memory) \ SUB(HW, LCD) \ diff --git a/src/common/logging/log.h b/src/common/logging/log.h index db4a80d0a..e8d98de99 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -56,6 +56,7 @@ enum class Class : ClassType { Service_APM, ///< The APM (Performance) service Service_Audio, ///< The Audio (Audio control) service Service_BCAT, ///< The BCAT service + Service_BTM, ///< The BTM service Service_Fatal, ///< The Fatal service Service_Friend, ///< The friend service Service_FS, ///< The FS (Filesystem) service @@ -79,6 +80,7 @@ enum class Class : ClassType { Service_SSL, ///< The SSL service Service_Time, ///< The time service Service_VI, ///< The VI (Video interface) service + Service_WLAN, ///< The WLAN (Wireless local area network) service HW, ///< Low-level hardware emulation HW_Memory, ///< Memory-map and address translation HW_LCD, ///< LCD register emulation diff --git a/src/common/swap.h b/src/common/swap.h index fc7af4280..32af0b6ac 100644 --- a/src/common/swap.h +++ b/src/common/swap.h @@ -69,7 +69,7 @@ inline u32 swap32(u32 _data) { inline u64 swap64(u64 _data) { return _byteswap_uint64(_data); } -#elif ARCHITECTURE_ARM +#elif defined(ARCHITECTURE_ARM) && (__ARM_ARCH >= 6) inline u16 swap16(u16 _data) { u32 data = _data; __asm__("rev16 %0, %1\n" : "=l"(data) : "l"(data)); diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f1e7e2593..f05e02cfb 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -142,6 +142,8 @@ add_library(core STATIC hle/service/bcat/module.h hle/service/btdrv/btdrv.cpp hle/service/btdrv/btdrv.h + hle/service/btm/btm.cpp + hle/service/btm/btm.h hle/service/erpt/erpt.cpp hle/service/erpt/erpt.h hle/service/es/es.cpp @@ -277,6 +279,8 @@ add_library(core STATIC hle/service/vi/vi_s.h hle/service/vi/vi_u.cpp hle/service/vi/vi_u.h + hle/service/wlan/wlan.cpp + hle/service/wlan/wlan.h hw/hw.cpp hw/hw.h hw/lcd.cpp diff --git a/src/core/file_sys/partition_filesystem.cpp b/src/core/file_sys/partition_filesystem.cpp index 521e21078..47e032b19 100644 --- a/src/core/file_sys/partition_filesystem.cpp +++ b/src/core/file_sys/partition_filesystem.cpp @@ -97,9 +97,8 @@ void PartitionFilesystem::PrintDebugInfo() const { LOG_DEBUG(Service_FS, "Magic: {:.4}", pfs_header.magic); LOG_DEBUG(Service_FS, "Files: {}", pfs_header.num_entries); for (u32 i = 0; i < pfs_header.num_entries; i++) { - LOG_DEBUG(Service_FS, " > File {}: {} (0x{:X} bytes, at 0x{:X})", i, - pfs_files[i]->GetName(), pfs_files[i]->GetSize(), - dynamic_cast<OffsetVfsFile*>(pfs_files[i].get())->GetOffset()); + LOG_DEBUG(Service_FS, " > File {}: {} (0x{:X} bytes)", i, + pfs_files[i]->GetName(), pfs_files[i]->GetSize()); } } diff --git a/src/core/hle/service/btm/btm.cpp b/src/core/hle/service/btm/btm.cpp new file mode 100644 index 000000000..b949bfabd --- /dev/null +++ b/src/core/hle/service/btm/btm.cpp @@ -0,0 +1,121 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include <memory> + +#include "common/logging/log.h" +#include "core/hle/ipc_helpers.h" +#include "core/hle/kernel/hle_ipc.h" +#include "core/hle/service/btm/btm.h" +#include "core/hle/service/service.h" +#include "core/hle/service/sm/sm.h" + +namespace Service::BTM { + +class BTM final : public ServiceFramework<BTM> { +public: + explicit BTM() : ServiceFramework{"btm"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, nullptr, "Unknown1"}, + {1, nullptr, "Unknown2"}, + {2, nullptr, "RegisterSystemEventForConnectedDeviceConditionImpl"}, + {3, nullptr, "Unknown3"}, + {4, nullptr, "Unknown4"}, + {5, nullptr, "Unknown5"}, + {6, nullptr, "Unknown6"}, + {7, nullptr, "Unknown7"}, + {8, nullptr, "RegisterSystemEventForRegisteredDeviceInfoImpl"}, + {9, nullptr, "Unknown8"}, + {10, nullptr, "Unknown9"}, + {11, nullptr, "Unknown10"}, + {12, nullptr, "Unknown11"}, + {13, nullptr, "Unknown12"}, + {14, nullptr, "EnableRadioImpl"}, + {15, nullptr, "DisableRadioImpl"}, + {16, nullptr, "Unknown13"}, + {17, nullptr, "Unknown14"}, + {18, nullptr, "Unknown15"}, + {19, nullptr, "Unknown16"}, + {20, nullptr, "Unknown17"}, + {21, nullptr, "Unknown18"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + +class BTM_DBG final : public ServiceFramework<BTM_DBG> { +public: + explicit BTM_DBG() : ServiceFramework{"btm:dbg"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, nullptr, "RegisterSystemEventForDiscoveryImpl"}, + {1, nullptr, "Unknown1"}, + {2, nullptr, "Unknown2"}, + {3, nullptr, "Unknown3"}, + {4, nullptr, "Unknown4"}, + {5, nullptr, "Unknown5"}, + {6, nullptr, "Unknown6"}, + {7, nullptr, "Unknown7"}, + {8, nullptr, "Unknown8"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + +class IBtmSystemCore final : public ServiceFramework<IBtmSystemCore> { +public: + explicit IBtmSystemCore() : ServiceFramework{"IBtmSystemCore"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, nullptr, "StartGamepadPairingImpl"}, + {1, nullptr, "CancelGamepadPairingImpl"}, + {2, nullptr, "ClearGamepadPairingDatabaseImpl"}, + {3, nullptr, "GetPairedGamepadCountImpl"}, + {4, nullptr, "EnableRadioImpl"}, + {5, nullptr, "DisableRadioImpl"}, + {6, nullptr, "GetRadioOnOffImpl"}, + {7, nullptr, "AcquireRadioEventImpl"}, + {8, nullptr, "AcquireGamepadPairingEventImpl"}, + {9, nullptr, "IsGamepadPairingStartedImpl"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + +class BTM_SYS final : public ServiceFramework<BTM_SYS> { +public: + explicit BTM_SYS() : ServiceFramework{"btm:sys"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, &BTM_SYS::GetCoreImpl, "GetCoreImpl"}, + }; + // clang-format on + + RegisterHandlers(functions); + } + +private: + void GetCoreImpl(Kernel::HLERequestContext& ctx) { + IPC::ResponseBuilder rb{ctx, 2, 0, 1}; + rb.Push(RESULT_SUCCESS); + rb.PushIpcInterface<IBtmSystemCore>(); + + LOG_DEBUG(Service_BTM, "called"); + } +}; + +void InstallInterfaces(SM::ServiceManager& sm) { + std::make_shared<BTM>()->InstallAsService(sm); + std::make_shared<BTM_DBG>()->InstallAsService(sm); + std::make_shared<BTM_SYS>()->InstallAsService(sm); +} + +} // namespace Service::BTM diff --git a/src/core/hle/service/btm/btm.h b/src/core/hle/service/btm/btm.h new file mode 100644 index 000000000..e6425a7e3 --- /dev/null +++ b/src/core/hle/service/btm/btm.h @@ -0,0 +1,15 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +namespace Service::SM { +class ServiceManager; +} + +namespace Service::BTM { + +void InstallInterfaces(SM::ServiceManager& sm); + +} // namespace Service::BTM diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index e4619a547..ed53f96c5 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -326,7 +326,7 @@ public: {79, &Hid::SetGyroscopeZeroDriftMode, "SetGyroscopeZeroDriftMode"}, {80, nullptr, "GetGyroscopeZeroDriftMode"}, {81, nullptr, "ResetGyroscopeZeroDriftMode"}, - {82, nullptr, "IsSixAxisSensorAtRest"}, + {82, &Hid::IsSixAxisSensorAtRest, "IsSixAxisSensorAtRest"}, {91, nullptr, "ActivateGesture"}, {100, &Hid::SetSupportedNpadStyleSet, "SetSupportedNpadStyleSet"}, {101, &Hid::GetSupportedNpadStyleSet, "GetSupportedNpadStyleSet"}, @@ -343,7 +343,7 @@ public: "SetNpadJoyAssignmentModeSingleByDefault"}, {123, nullptr, "SetNpadJoyAssignmentModeSingleByDefault"}, {124, &Hid::SetNpadJoyAssignmentModeDual, "SetNpadJoyAssignmentModeDual"}, - {125, nullptr, "MergeSingleJoyAsDualJoy"}, + {125, &Hid::MergeSingleJoyAsDualJoy, "MergeSingleJoyAsDualJoy"}, {126, nullptr, "StartLrAssignmentMode"}, {127, nullptr, "StopLrAssignmentMode"}, {128, &Hid::SetNpadHandheldActivationMode, "SetNpadHandheldActivationMode"}, @@ -455,6 +455,14 @@ private: LOG_WARNING(Service_HID, "(STUBBED) called"); } + void IsSixAxisSensorAtRest(Kernel::HLERequestContext& ctx) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + // TODO (Hexagon12): Properly implement reading gyroscope values from controllers. + rb.Push(true); + LOG_WARNING(Service_HID, "(STUBBED) called"); + } + void SetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); @@ -530,6 +538,12 @@ private: LOG_WARNING(Service_HID, "(STUBBED) called"); } + void MergeSingleJoyAsDualJoy(Kernel::HLERequestContext& ctx) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + LOG_WARNING(Service_HID, "(STUBBED) called"); + } + void SetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 5180a0c93..3cad64837 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -22,6 +22,7 @@ #include "core/hle/service/audio/audio.h" #include "core/hle/service/bcat/bcat.h" #include "core/hle/service/btdrv/btdrv.h" +#include "core/hle/service/btm/btm.h" #include "core/hle/service/erpt/erpt.h" #include "core/hle/service/es/es.h" #include "core/hle/service/eupld/eupld.h" @@ -55,6 +56,7 @@ #include "core/hle/service/ssl/ssl.h" #include "core/hle/service/time/time.h" #include "core/hle/service/vi/vi.h" +#include "core/hle/service/wlan/wlan.h" using Kernel::ClientPort; using Kernel::ServerPort; @@ -201,6 +203,7 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm) { Audio::InstallInterfaces(*sm); BCAT::InstallInterfaces(*sm); BtDrv::InstallInterfaces(*sm); + BTM::InstallInterfaces(*sm); ERPT::InstallInterfaces(*sm); ES::InstallInterfaces(*sm); EUPLD::InstallInterfaces(*sm); @@ -225,12 +228,13 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm) { PCTL::InstallInterfaces(*sm); PlayReport::InstallInterfaces(*sm); PM::InstallInterfaces(*sm); + Set::InstallInterfaces(*sm); Sockets::InstallInterfaces(*sm); SPL::InstallInterfaces(*sm); SSL::InstallInterfaces(*sm); Time::InstallInterfaces(*sm); VI::InstallInterfaces(*sm, nv_flinger); - Set::InstallInterfaces(*sm); + WLAN::InstallInterfaces(*sm); LOG_DEBUG(Service, "initialized OK"); } diff --git a/src/core/hle/service/wlan/wlan.cpp b/src/core/hle/service/wlan/wlan.cpp new file mode 100644 index 000000000..2654594c1 --- /dev/null +++ b/src/core/hle/service/wlan/wlan.cpp @@ -0,0 +1,172 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include <memory> + +#include "core/hle/service/service.h" +#include "core/hle/service/sm/sm.h" +#include "core/hle/service/wlan/wlan.h" + +namespace Service::WLAN { + +class WLANInfra final : public ServiceFramework<WLANInfra> { +public: + explicit WLANInfra() : ServiceFramework{"wlan:inf"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, nullptr, "Unknown1"}, + {1, nullptr, "Unknown2"}, + {2, nullptr, "GetMacAddress"}, + {3, nullptr, "StartScan"}, + {4, nullptr, "StopScan"}, + {5, nullptr, "Connect"}, + {6, nullptr, "CancelConnect"}, + {7, nullptr, "Disconnect"}, + {8, nullptr, "Unknown3"}, + {9, nullptr, "Unknown4"}, + {10, nullptr, "GetState"}, + {11, nullptr, "GetScanResult"}, + {12, nullptr, "GetRssi"}, + {13, nullptr, "ChangeRxAntenna"}, + {14, nullptr, "Unknown5"}, + {15, nullptr, "Unknown6"}, + {16, nullptr, "RequestWakeUp"}, + {17, nullptr, "RequestIfUpDown"}, + {18, nullptr, "Unknown7"}, + {19, nullptr, "Unknown8"}, + {20, nullptr, "Unknown9"}, + {21, nullptr, "Unknown10"}, + {22, nullptr, "Unknown11"}, + {23, nullptr, "Unknown12"}, + {24, nullptr, "Unknown13"}, + {25, nullptr, "Unknown14"}, + {26, nullptr, "Unknown15"}, + {27, nullptr, "Unknown16"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + +class WLANLocal final : public ServiceFramework<WLANLocal> { +public: + explicit WLANLocal() : ServiceFramework{"wlan:lcl"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, nullptr, "Unknown1"}, + {1, nullptr, "Unknown2"}, + {2, nullptr, "Unknown3"}, + {3, nullptr, "Unknown4"}, + {4, nullptr, "Unknown5"}, + {5, nullptr, "Unknown6"}, + {6, nullptr, "GetMacAddress"}, + {7, nullptr, "CreateBss"}, + {8, nullptr, "DestroyBss"}, + {9, nullptr, "StartScan"}, + {10, nullptr, "StopScan"}, + {11, nullptr, "Connect"}, + {12, nullptr, "CancelConnect"}, + {13, nullptr, "Join"}, + {14, nullptr, "CancelJoin"}, + {15, nullptr, "Disconnect"}, + {16, nullptr, "SetBeaconLostCount"}, + {17, nullptr, "Unknown7"}, + {18, nullptr, "Unknown8"}, + {19, nullptr, "Unknown9"}, + {20, nullptr, "GetBssIndicationEvent"}, + {21, nullptr, "GetBssIndicationInfo"}, + {22, nullptr, "GetState"}, + {23, nullptr, "GetAllowedChannels"}, + {24, nullptr, "AddIe"}, + {25, nullptr, "DeleteIe"}, + {26, nullptr, "Unknown10"}, + {27, nullptr, "Unknown11"}, + {28, nullptr, "CreateRxEntry"}, + {29, nullptr, "DeleteRxEntry"}, + {30, nullptr, "Unknown12"}, + {31, nullptr, "Unknown13"}, + {32, nullptr, "AddMatchingDataToRxEntry"}, + {33, nullptr, "RemoveMatchingDataFromRxEntry"}, + {34, nullptr, "GetScanResult"}, + {35, nullptr, "Unknown14"}, + {36, nullptr, "SetActionFrameWithBeacon"}, + {37, nullptr, "CancelActionFrameWithBeacon"}, + {38, nullptr, "CreateRxEntryForActionFrame"}, + {39, nullptr, "DeleteRxEntryForActionFrame"}, + {40, nullptr, "Unknown15"}, + {41, nullptr, "Unknown16"}, + {42, nullptr, "CancelGetActionFrame"}, + {43, nullptr, "GetRssi"}, + {44, nullptr, "Unknown17"}, + {45, nullptr, "Unknown18"}, + {46, nullptr, "Unknown19"}, + {47, nullptr, "Unknown20"}, + {48, nullptr, "Unknown21"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + +class WLANLocalGetFrame final : public ServiceFramework<WLANLocalGetFrame> { +public: + explicit WLANLocalGetFrame() : ServiceFramework{"wlan:lg"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, nullptr, "Unknown"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + +class WLANSocketGetFrame final : public ServiceFramework<WLANSocketGetFrame> { +public: + explicit WLANSocketGetFrame() : ServiceFramework{"wlan:sg"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, nullptr, "Unknown"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + +class WLANSocketManager final : public ServiceFramework<WLANSocketManager> { +public: + explicit WLANSocketManager() : ServiceFramework{"wlan:soc"} { + // clang-format off + static const FunctionInfo functions[] = { + {0, nullptr, "Unknown1"}, + {1, nullptr, "Unknown2"}, + {2, nullptr, "Unknown3"}, + {3, nullptr, "Unknown4"}, + {4, nullptr, "Unknown5"}, + {5, nullptr, "Unknown6"}, + {6, nullptr, "GetMacAddress"}, + {7, nullptr, "SwitchTsfTimerFunction"}, + {8, nullptr, "Unknown7"}, + {9, nullptr, "Unknown8"}, + {10, nullptr, "Unknown9"}, + {11, nullptr, "Unknown10"}, + }; + // clang-format on + + RegisterHandlers(functions); + } +}; + +void InstallInterfaces(SM::ServiceManager& sm) { + std::make_shared<WLANInfra>()->InstallAsService(sm); + std::make_shared<WLANLocal>()->InstallAsService(sm); + std::make_shared<WLANLocalGetFrame>()->InstallAsService(sm); + std::make_shared<WLANSocketGetFrame>()->InstallAsService(sm); + std::make_shared<WLANSocketManager>()->InstallAsService(sm); +} + +} // namespace Service::WLAN diff --git a/src/core/hle/service/wlan/wlan.h b/src/core/hle/service/wlan/wlan.h new file mode 100644 index 000000000..054ea928a --- /dev/null +++ b/src/core/hle/service/wlan/wlan.h @@ -0,0 +1,15 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +namespace Service::SM { +class ServiceManager; +} + +namespace Service::WLAN { + +void InstallInterfaces(SM::ServiceManager& sm); + +} // namespace Service::WLAN diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp index d6647eeea..39ed3bccf 100644 --- a/src/yuzu/about_dialog.cpp +++ b/src/yuzu/about_dialog.cpp @@ -10,8 +10,9 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog) { ui->setupUi(this); ui->labelLogo->setPixmap(QIcon::fromTheme("yuzu").pixmap(200)); - ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg( - Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc)); + ui->labelBuildInfo->setText( + ui->labelBuildInfo->text().arg(Common::g_build_name, Common::g_scm_branch, + Common::g_scm_desc, QString(Common::g_build_date).left(10))); } AboutDialog::~AboutDialog() {} diff --git a/src/yuzu/aboutdialog.ui b/src/yuzu/aboutdialog.ui index 2680480cc..f122ba39d 100644 --- a/src/yuzu/aboutdialog.ui +++ b/src/yuzu/aboutdialog.ui @@ -70,7 +70,7 @@ </sizepolicy> </property> <property name="text"> - <string><html><head/><body><p>%1 | %2-%3</p></body></html></string> + <string><html><head/><body><p>%1 | %2-%3 (%4)</p></body></html></string> </property> </widget> </item> @@ -115,7 +115,7 @@ p, li { white-space: pre-wrap; } <item> <widget class="QLabel" name="labelLinks"> <property name="text"> - <string><html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#0000ff;">Website</span></a> | <a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#0000ff;">Source Code</span></a> | <a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#0000ff;">Contributors</span></a> | <a href="https://github.com/yuzu-emu/yuzu/blob/master/license.txt"><span style=" text-decoration: underline; color:#0000ff;">License</span></a></p></body></html></string> + <string><html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://github.com/yuzu-emu/yuzu/blob/master/license.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html></string> </property> <property name="openExternalLinks"> <bool>true</bool> diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index 5e66239ff..7fd07539a 100644 --- a/src/yuzu/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp @@ -44,5 +44,4 @@ void ConfigureDebug::applyConfiguration() { Log::Filter filter; filter.ParseFilterString(Settings::values.log_filter); Log::SetGlobalFilter(filter); - Settings::Apply(); } diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index baa558667..cb7d3f8bf 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -44,5 +44,4 @@ void ConfigureGeneral::applyConfiguration() { Settings::values.use_cpu_jit = ui->use_cpu_jit->isChecked(); Settings::values.use_multi_core = ui->use_multi_core->isChecked(); Settings::values.use_docked_mode = ui->use_docked_mode->isChecked(); - Settings::Apply(); } diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 7664880d5..3379b7963 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -67,5 +67,4 @@ void ConfigureGraphics::applyConfiguration() { ToResolutionFactor(static_cast<Resolution>(ui->resolution_factor_combobox->currentIndex())); Settings::values.toggle_framelimit = ui->toggle_framelimit->isChecked(); Settings::values.use_accurate_framebuffers = ui->use_accurate_framebuffers->isChecked(); - Settings::Apply(); } diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp index 78559e2bb..5e7badedf 100644 --- a/src/yuzu/configuration/configure_input.cpp +++ b/src/yuzu/configuration/configure_input.cpp @@ -191,8 +191,6 @@ void ConfigureInput::applyConfiguration() { [](const Common::ParamPackage& param) { return param.Serialize(); }); std::transform(analogs_param.begin(), analogs_param.end(), Settings::values.analogs.begin(), [](const Common::ParamPackage& param) { return param.Serialize(); }); - - Settings::Apply(); } void ConfigureInput::loadConfiguration() { diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 96998643e..be38cfa9b 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -723,10 +723,12 @@ void GMainWindow::ToggleWindowMode() { void GMainWindow::OnConfigure() { ConfigureDialog configureDialog(this); + auto old_theme = UISettings::values.theme; auto result = configureDialog.exec(); if (result == QDialog::Accepted) { configureDialog.applyConfiguration(); - UpdateUITheme(); + if (UISettings::values.theme != old_theme) + UpdateUITheme(); config->Save(); } } @@ -957,7 +959,6 @@ int main(int argc, char* argv[]) { QCoreApplication::setOrganizationName("yuzu team"); QCoreApplication::setApplicationName("yuzu"); - QApplication::setAttribute(Qt::AA_X11InitThreads); QApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity); QApplication app(argc, argv); |