fix printing selector dropdown not working on mac (#5606)

* Fix crash when VDS show tags is unchecked

* revert the refactor since I don't know if there's a reason they did it that way

.github/workflows/desktop-build.yml

@@ -330,7 +330,7 @@ jobs:
         if: matrix.make_package
         uses: actions/upload-artifact@v4
         with:
-          name: macOS${{matrix.target}}${{ matrix.soc == 'Intel' && '_Intel' || '' }}${{ matrix.type == 'Debug' && '_Debug' || '' }}-dmg
+          name: macOS${{matrix.target}}${{ matrix.soc == 'Intel' && '_Intel' || '' }}${{ matrix.type == 'Debug' && '_Debug' || '' }}-package
           path: ${{steps.build.outputs.path}}
           if-no-files-found: error
 

CMakeLists.txt

@@ -74,11 +74,11 @@ endif()
 
 # A project name is needed for CPack
 # Version can be overriden by git tags, see cmake/getversion.cmake
-project("Cockatrice" VERSION 2.10.0)
+project("Cockatrice" VERSION 2.10.1)
 
 # Set release name if not provided via env/cmake var
 if(NOT DEFINED GIT_TAG_RELEASENAME)
-  set(GIT_TAG_RELEASENAME "Rings of the Wild")
+  set(GIT_TAG_RELEASENAME "Omenpath")
 endif()
 
 # Use c++20 for all targets

cockatrice/CMakeLists.txt

@@ -110,9 +110,9 @@ set(cockatrice_SOURCES
     src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp
     src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp
     src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_view_options_toolbar_widget.cpp
-    src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.cpp
     src/client/ui/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
+    src/client/ui/widgets/quick_settings/settings_button_widget.cpp
+    src/client/ui/widgets/quick_settings/settings_popup_widget.cpp
     src/client/network/release_channel.cpp
     src/client/network/client_update_checker.cpp
     src/server/remote/remote_client.cpp
@@ -338,6 +338,13 @@ if(APPLE)
     PATTERN "tls/*.dylib"
   )
 
+  install(
+    DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
+    DESTINATION ${qtconf_dest_dir}/
+    FILES_MATCHING
+    PATTERN "*.ini"
+  )
+
   install(
     CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
@@ -372,6 +379,13 @@ if(WIN32)
     PATTERN "*.dll"
   )
 
+  install(
+    DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
+    DESTINATION ./
+    FILES_MATCHING
+    PATTERN "*.ini"
+  )
+
   # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6) platforms, printsupport (Qt5), styles, tls (Qt6)
   install(
     DIRECTORY "${QT_PLUGINS_DIR}/"

cockatrice/cockatrice.qrc

@@ -13,6 +13,7 @@
         <file>resources/icons/arrow_top_green.svg</file>
         <file>resources/icons/arrow_up_green.svg</file>
         <file>resources/icons/clearsearch.svg</file>
+        <file>resources/icons/cogwheel.svg</file>
         <file>resources/icons/conceded.svg</file>
         <file>resources/icons/decrement.svg</file>
         <file>resources/icons/delete.svg</file>
@@ -342,19 +343,28 @@
 
         <!-- ADD TIP OF THE DAY IMAGES HERE -->
         <file>resources/tips/images/accounts_tab.png</file>
+        <file>resources/tips/images/add_card.png</file>
         <file>resources/tips/images/arrows.png</file>
+        <file>resources/tips/images/card_select.png</file>
         <file>resources/tips/images/cockatrice_register.png</file>
         <file>resources/tips/images/cockatrice_wiki.png</file>
         <file>resources/tips/images/coin_flip.png</file>
         <file>resources/tips/images/counter_expression.png</file>
         <file>resources/tips/images/discord.png</file>
+        <file>resources/tips/images/edhrec.png</file>
         <file>resources/tips/images/face_down.png</file>
         <file>resources/tips/images/filter_games.png</file>
         <file>resources/tips/images/github_logo.png</file>
+        <file>resources/tips/images/highlight_cards.png</file>
+        <file>resources/tips/images/pawns.png</file>
         <file>resources/tips/images/setpt.png</file>
         <file>resources/tips/images/shortcuts.png</file>
+        <file>resources/tips/images/syntax_help.png</file>
         <file>resources/tips/images/themes.png</file>
         <file>resources/tips/images/tip_of_the_day.png</file>
+        <file>resources/tips/images/token.png</file>
+        <file>resources/tips/images/updates.png</file>
+        <file>resources/tips/images/visual_deck_tags.png</file>
         <file>resources/tips/tips_of_the_day.xml</file>
 
         <file>resources/help/search.md</file>

cockatrice/resources/icons/cogwheel.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+     xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="102.5024mm" height="102.24421mm"
+     viewBox="0 0 102.5024 102.24421" version="1.1"
+     id="svg1"
+     inkscape:version="1.4 (e7c3feb100, 2024-10-09)" sodipodi:docname="cog_wheel.svg"
+     xmlns="http://www.w3.org/2000/svg">
+    <sodipodi:namedview id="namedview1" pagecolor="#ffffff" bordercolor="#000000" borderopacity="0.25"
+                        inkscape:showpageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0"
+                        inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:zoom="0.66101291"
+                        inkscape:cx="146.74449" inkscape:cy="193.64221" inkscape:window-width="1829"
+                        inkscape:window-height="951" inkscape:window-x="0" inkscape:window-y="0"
+                        inkscape:window-maximized="1" inkscape:current-layer="layer1"/>
+    <defs id="defs1"/>
+    <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-66.148059,-97.377896)">
+        <g id="g1" transform="translate(-165.09777,-82.009607)">
+            <g id="g2" transform="matrix(0.26458333,0,0,0.26458333,64.983323,161.37858)">
+                <path style="fill:#333333;stroke-width:94.4882"
+                      d="m 721.34301,94.413051 40.00966,29.763289 29.51933,-9.27053 14.63768,-46.840589 36.83817,0.48792 13.41787,46.108699 28.29952,9.5145 40.74155,-28.299519 29.0314,21.468599 -15.85748,47.08454 16.58937,23.66426 48.30432,-2.68358 12.93,34.88648 -41.71741,27.07971 -0.48792,29.27536 40.49763,26.10387 -10.2464,34.15459 -48.54834,-0.97584 -18.78502,23.42029 15.85749,45.37681 -28.29952,21.71256 -41.22947,-29.27536 -28.54348,9.75846 -13.66184,47.57246 -38.30194,-0.73188 -14.63768,-48.30435 -27.07971,-9.27054 -40.00966,29.27537 -30.25121,-20.49276 17.32125,-46.35266 -17.80918,-24.64009 -49.76812,3.17149 -11.22222,-34.64251 40.74155,-27.07971 0.48792,-30.00725 -41.71739,-27.32367 12.19807,-32.93479 48.30435,2.68358 20.24879,-24.6401 -17.32126,-47.08455 z"
+                      id="path1"/>
+                <circle style="fill:#f9f9f9;stroke-width:72.1317" id="path2" cx="822.09906" cy="261.28262"
+                        r="83.434792"/>
+                <circle style="fill:#4d4d4d;stroke-width:40.5147" id="circle2" cx="822.09906" cy="261.28262"
+                        r="46.863361"/>
+            </g>
+        </g>
+    </g>
+</svg>

cockatrice/resources/tips/tips_of_the_day.xml

@@ -1,99 +1,214 @@
 <tips>
-    <tip>
-        <title>Tip of the Day</title>
-        <text>Tip of the Day is a new feature to Cockatrice that allows users to get information about the newest features of the program and some of the most commonly asked questions!</text>
-        <image>tip_of_the_day.png</image>
-        <date>2018-03-01</date>
-    </tip>
-    <tip>
-        <title>Suggesting New Tips</title>
-        <text>You can suggest new Tips of the Day by reaching out to the development team on &lt;a href="https://discord.gg/3Z9yzmA"&gt;Discord&lt;/a&gt;!</text>
-        <image>discord.png</image>
-        <date>2023-10-18</date>
-    </tip>
-    <tip>
-        <title>Reporting Bugs</title>
-        <text>If you encounter a bug while using Cockatrice, you can report the bug to the development team via &lt;a href="https://github.com/cockatrice/cockatrice/issues"&gt;GitHub&lt;a&gt;</text>
-        <image>github_logo.png</image>
-        <date>2018-03-01</date>
-    </tip>
-    <tip>
-        <title>FAQ/Troubleshooting Wiki</title>
-        <text>You can find answers to the most common questions and some helpful Cockatrice toubleshooting over on the &lt;a href="https://github.com/cockatrice/cockatrice/wiki"&gt;GitHub wiki&lt;a&gt;</text>
-        <image>cockatrice_wiki.png</image>
-        <date>2018-03-01</date>
-    </tip>
-    <tip>
-        <title>Register for a Server</title>
-        <text>Click on either Cockatrice (Windows) or Actions (Mac) and then Register to server...  When the dialogue appears, fill out the desired server information.</text>
-        <image>cockatrice_register.png</image>
-        <date>2018-03-01</date>
-    </tip>
-    <tip>
-        <title>Drawing Arrows</title>
-        <text>You can draw arrows of different color by holding a combination of keys!
-            Right Click: Red Arrow
-            Shift + Right Click: Green Arrow
-            Alt + Right Click: Blue Arrow
-            Cmd + Right Click: Yellow Arrow
-        </text>
-        <image>arrows.png</image>
-        <date>2018-03-01</date>
-    </tip>
-    <tip>
-        <title>Filtering Games</title>
-        <text>Don't see all the active games? Want to see a smaller selection? Use the Game Filters to change your horizon</text>
-        <image>filter_games.png</image>
-        <date>2018-03-01</date>
-    </tip>
-    <tip>
-        <title>Upload Custom Avatar</title>
-        <text>Want to show off your hippo avatar? Need to update your password? Check out the Accounts Tab for more info!</text>
-        <image>accounts_tab.png</image>
-        <date>2018-03-01</date>
-    </tip>
-    <tip>
-        <title>Common Shortcuts</title>
-        <text>You can find a full list of shortcuts &lt;a href="https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts"&gt;on the wiki&lt;/a&gt;, but a short list:
-            &lt;br&gt;Roll a die: CTRL + I
-            &lt;br&gt;Mulligan: CTRL + M
-            &lt;br&gt;Draw a card: CTRL + D
-            &lt;br&gt;Undo a draw: CTRL + SHIFT + D
-            &lt;br&gt;View Sideboard: CTRL + F3
-            &lt;br&gt;Change Life: CTRL + L
-            &lt;br&gt;All shortcuts can be customized via Settings->Shortcuts!
-        </text>
-        <image>shortcuts.png</image>
-        <date>2018-03-01</date>
-    </tip>
-    <tip>
-        <title>Changing Themes</title>
-        <text>Did you know Cockatrice has custom themes? You can either &lt;a href="https://github.com/Cockatrice/Cockatrice/wiki/Themes"&gt;create one yourself&lt;/a&gt; or use one of the several pre-loaded ones! Go to Settings->Appearance and try them out!</text>
-        <image>themes.png</image>
-        <date>2018-03-01</date>
-    </tip>
-    <tip>
-        <title>Flip of the Coin</title>
-        <text>You can flip a coin instead of rolling a die by rolling a 2 sided die instead!</text>
-        <image>coin_flip.png</image>
-        <date>2018-03-01</date>
-    </tip>
-    <tip>
-        <title>Face Down Cards</title>
-        <text>You can hold Shift while dragging or clicking on a card to have it enter play face down</text>
-        <image>face_down.png</image>
-        <date>2018-03-01</date>
-    </tip>
-    <tip>
-        <title>Counter expressions</title>
-        <text>When setting a counter value, you can type a math expression in the box and the counter will be set to the result.&lt;br&gt;The "x" variable contains the current counter value.</text>
-        <image>counter_expression.png</image>
-        <date>2019-02-02</date>
-    </tip>
-    <tip>
-        <title>Power and Toughness</title>
-        <text>You can add and subtract to a creature's stats.&lt;br&gt;With a card selected, set the power and toughness ( default: ctrl + p ) and enter +3/-1 to increase power by three while decreasing toughness by one.&lt;br&gt;You can also reset it to the original value ( default: ctrl + alt + 0 ).</text>
-        <image>setpt.png</image>
-        <date>2019-03-02</date>
-    </tip>
+	<tip>
+		<title>Tip of the Day</title>
+		<text>Tip of the Day is a feature to Cockatrice that allows users to get information about the newest features of the program and some of the most commonly asked questions!
+Check back in with major updates for new tips to be added or old tips to be updated as features are added or expanded upon!
+		</text>
+		<image>tip_of_the_day.png</image>
+		<date>2025-02-10</date>
+	</tip>
+	<tip>
+		<title>Join the Community</title>
+		<text>You can join the community to find games, interact with other players, suggest new 'Tips of the Day' and provide user feedback to the development or support teams on &lt;a href="https://discord.gg/3Z9yzmA"&gt;Discord&lt;/a&gt;!</text>
+		<image>discord.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Reporting Bugs and Requesting Features</title>
+		<text>If you encounter a bug while using Cockatrice, you can report the bug to and request the feature from the development team via &lt;a href="https://github.com/cockatrice/cockatrice/issues"&gt;GitHub&lt;a&gt;</text>
+		<image>github_logo.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>FAQ/Troubleshooting Wiki</title>
+		<text>You can find answers to the most common questions and some helpful Cockatrice troubleshooting over on the &lt;a href="https://github.com/cockatrice/cockatrice/wiki"&gt;GitHub wiki&lt;a&gt;</text>
+		<image>cockatrice_wiki.png</image>
+		<date>2018-03-01</date>
+	</tip>
+	<tip>
+		<title>Register for a Server</title>
+		<text>Click on either Cockatrice (Windows) or Actions (Mac) and then Register to server...  When the dialogue appears, fill out the desired server information.</text>
+		<image>cockatrice_register.png</image>
+		<date>2018-03-01</date>
+	</tip>
+	<tip>
+		<title>Filtering Games</title>
+		<text>Don't see an open game or want to see a smaller selection? Use the Game Filters to change your horizon!</text>
+		<image>filter_games.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Common Shortcuts</title>
+		<text>You can find a full list of default shortcuts &lt;a href="https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts"&gt;on the wiki&lt;/a&gt; or in Settings -> Shortcuts, but a short list:
+&lt;ul&gt;
+&lt;li&gt;Roll a die: CMD/CTRL + I&lt;/li&gt;
+&lt;li&gt;Mulligan: CMD/CTRL + M&lt;/li&gt;
+&lt;li&gt;Draw 1 / X card(s): CMD/CTRL + D / E&lt;/li&gt;
+&lt;li&gt;Undo a draw: CMD/CTRL + SHIFT + D&lt;/li&gt;
+&lt;li&gt;View Library / Sideboard: F3 / CMD/CTRL + F3&lt;/li&gt;
+&lt;li&gt;Change Life: CMD/CTRL + L&lt;/li&gt;
+&lt;li&gt;Show Card Info: Middle Mouse Click&lt;/li&gt;
+&lt;/ul&gt;
+All shortcuts can be customized via Cockatrice -> Settings -> Shortcuts!
+		</text>
+		<image>shortcuts.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Power and Toughness</title>
+		<text>You can add and subtract to a creature's stats.
+With a card selected, with the following keybindings:
+
+&lt;ul&gt;
+&lt;li&gt;Set P/T to any value: CTRL + P&lt;/li&gt;
+&lt;li&gt;+1 or -1 to both to P/T: CMD/CTRL + ALT + '+' or '-'&lt;/li&gt;
+&lt;li&gt;+1 or -1 to Power Only: CMD/CTRL + '+' or '-'&lt;/li&gt;
+&lt;li&gt;+1 or -1 to Toughness Only: ALT + '+' or '-'&lt;/li&gt;
+&lt;li&gt;Set P/T to Default: CMD/CTRL + ALT + 0&lt;/li&gt;
+&lt;/ul&gt;
+All shortcuts can be customized via Cockatrice -> Settings -> Shortcuts!
+		</text>
+		<image>setpt.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Drawing Arrows</title>
+		<text>You can draw arrows of different color by holding a combination of keys!
+
+&lt;ul&gt;
+&lt;li&gt;Right Click: Red Arrow&lt;/li&gt;
+&lt;li&gt;SHIFT + Right Click: Green Arrow&lt;/li&gt;
+&lt;li&gt;ALT + Right Click: Blue Arrow&lt;/li&gt;
+&lt;li&gt;CMD/CTRL + Right Click: Yellow Arrow&lt;/li&gt;
+&lt;/ul&gt;
+		</text>
+		<image>arrows.png</image>
+		<date>2018-03-01</date>
+	</tip>
+	<tip>
+		<title>General Etiquette</title>
+		<text>When playing on Cockatrice there are general "rules of engagement" for a better play experience for all players.
+The following are some of the expectations a player should reasonably expect for how to operate smooth and enjoyable games:
+&lt;ul&gt;
+&lt;li&gt;Have a "Rule 0" conversation pre-game with your fellow players on the expectations of the game including deck strength, house rules (e.g. no take backs and "may is not must"), etc.&lt;/li&gt;
+&lt;li&gt;When rolling your die for turn order, it is often best to create a token with the text of your roll (using CTRL + T and typing the number into "Name") and then tap this token when created to show that you have resolved your mulligans and are ready to start the game.&lt;/li&gt;
+&lt;li&gt;Use the phases and steps trackers on the left of the client to show others where in the turn you are and announce when moving between them. (Double Click for the action of this button)&lt;/li&gt;
+&lt;li&gt;When your turn is over leave it on your end step and DO NOT HIT PASS. Allow other players to respond if they can, and then if not, let the next player pass to themselves.&lt;/li&gt;
+&lt;li&gt;Please treat others kindly and respect as per &lt;a href="https://cockatrice.us/terms.php"&gt;our Terms of Service&lt;/a&gt;.&lt;/li&gt;
+&lt;/ul&gt;
+		</text>
+		<image>token.png</image>
+		<date>2025-02-10</date>
+	</tip>
+	<tip>
+		<title>Flip of the Coin</title>
+		<text>You can flip a coin instead of rolling a die by rolling a 2 sided die instead!</text>
+		<image>coin_flip.png</image>
+		<date>2018-03-01</date>
+	</tip>
+	<tip>
+		<title>Upload Custom Avatar</title>
+		<text>Want to show off your hippo avatar? Need to update your password? Check out the Accounts Tab for more info!</text>
+		<image>accounts_tab.png</image>
+		<date>2018-03-01</date>
+	</tip>
+	<tip>
+		<title>Player Icon Key</title>
+		<text>Besides your name is a player icon, this is a key for what they mean:
+&lt;ul&gt;
+&lt;li&gt;Flag: Country of Origin Player Selected&lt;/li&gt;
+&lt;li&gt;Purple Heart: Donator (&lt;a href="https://cockatrice.us/donate"&gt;Help support us and donate here!&lt;/a&gt;)&lt;/li&gt;
+&lt;li&gt;Gold Star: VIP (Special Admin Given Role)&lt;/li&gt;
+&lt;li&gt;Brown Gavel (Hammer): Judge / Rule's Lawyer&lt;/li&gt;
+&lt;li&gt;Black/White Pawn: Moderator (Support for Client Issues)&lt;/li&gt;
+&lt;li&gt;Red: Administrator (Sever Operators)&lt;/li&gt;
+&lt;/ul&gt;
+		</text>
+		<image>pawns.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Changing Themes</title>
+		<text>Did you know Cockatrice has custom themes? You can either &lt;a href="https://github.com/Cockatrice/Cockatrice/wiki/Themes"&gt;create one yourself&lt;/a&gt; or use one of the several preloaded ones! Go to Settings->Appearance and try them out!</text>
+		<image>themes.png</image>
+		<date>2018-03-01</date>
+	</tip>
+	<tip>
+		<title>Face Down Cards</title>
+		<text>You can hold Shift while dragging or clicking on a card to have it enter play face down.
+You can also hold CTRL + SHIFT and click and drag from your library to move bottom card face down as well!
+		</text>
+		<image>face_down.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Counter expressions</title>
+		<text>When setting a counter value, you can type a math expression in the box and the counter will be set to the result.&lt;br&gt;The "x" variable contains the current counter value.</text>
+		<image>counter_expression.png</image>
+		<date>2019-02-02</date>
+	</tip>
+	<tip>
+		<title>Select Multiple Cards</title>
+		<text>You can click and drag in any zone in order to highlight all cards within the created box.
+You can also hold CMD/CTRL and clik or click and drag to maintain other previously selected cards while adding others!
+You can move, alter and attach multiple highlighted cards at the same time!
+Other useful multi-select keybindings:
+&lt;ul&gt;
+&lt;li&gt;Select All Cards in Zone: CMD/CTRL + A&lt;/li&gt;
+&lt;li&gt;Select All Cards in Column: CMD/CTRL + SHIFT + C&lt;/li&gt;
+&lt;li&gt;Select All Cards in Row: CMD/CTRL + SHIFT + X&lt;/li&gt;
+&lt;/ul&gt;
+		</text>
+		<image>highlight_cards.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Auto Cascade and Search Parameters</title>
+		<text>You can use the default keybind of CMD/CTRL + SHIFT + Y in order to perform auto cascade or similar effects from your library using Scryfall search syntax.
+If you are unfamiliar with the syntax you may find it by opening a deck in deck editor and clicking the "i" next to the search bar in order to pull up a list of syntax commands.
+This same syntax can be used in the deck editor search bar as well to help you find the best cards for your decks!
+		</text>
+		<image>syntax_help.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Visual Deck Storage and Tags</title>
+		<text>You can now view your saved decks visually with integrated folder,tags and filter support!
+Pro Tip: If you want to use emoji's press WinKey + '.' or CTRL + CMD + SPACE on Windows or Mac respectively!
+		</text>
+		<image>visual_deck_tags.png</image>
+		<date>2025-02-09</date>
+	</tip>
+	<tip>
+		<title>Card Selector And Card Preferences</title>
+		<text>Cockatrice's deck editor now has the ability for players to bling out their decks by selecting the arts for cards on a per-card basis!
+You can also have multiple printings of the same card in your deck if you so choose!
+Not only that, other players will see the arts you have chosen by default!
+If you want to disable this feature for other players: Settings -> Appearance -> Select "Override all card art with personal set preference"
+		</text>
+		<image>card_select.png</image>
+		<date>2025-02-10</date>
+	</tip>
+	<tip>
+		<title>EDHREC Integration</title>
+		<text>We now have in-client integration for EDHREC, which allows you to right-click on any card name in the deck editor in order to bring up the contextual menu for the card.</text>
+		<image>edhrec.png</image>
+		<date>2025-02-10</date>
+	</tip>
+	<tip>
+		<title>Add Cards to Deck</title>
+		<text>You can now right-click anywhere on a card in any card info view in order to add it to any decks you have open in your tabs.</text>
+		<image>add_card.png</image>
+		<date>2025-02-10</date>
+	</tip>
+	<tip>
+		<title>Update Client and Card Database</title>
+		<text>You can update your client by going to Help and selecting whichever you wish to update.
+Client Update: Updates the client (if available) for new features, fixes and changes.
+Card Update: Updates card sources for spoilers and new card printings.
+Updating your card sources can often fix issues of cards not working or displaying properly, if not, go to Cockatrice -> Settings -> Card Sources -> Update Spoilers
+		</text>
+		<image>updates.png</image>
+		<date>2025-02-10</date>
+	</tip>
 </tips>

cockatrice/src/client/network/release_channel.cpp

@@ -42,7 +42,7 @@ void ReleaseChannel::checkForUpdates()
 #if defined(Q_OS_MACOS)
 bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
 {
-    static QRegularExpression version_regex("macOS-(\\d+)\\.(\\d+)");
+    static QRegularExpression version_regex("macOS(\\d+)");
     auto match = version_regex.match(fileName);
     if (!match.hasMatch()) {
         return false;
@@ -50,10 +50,8 @@ bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
 
     // older(smaller) releases are compatible with a newer or the same system version
     int sys_maj = QSysInfo::productVersion().split(".")[0].toInt();
-    int sys_min = QSysInfo::productVersion().split(".")[1].toInt();
     int rel_maj = match.captured(1).toInt();
-    int rel_min = match.captured(2).toInt();
-    return rel_maj < sys_maj || (rel_maj == sys_maj && rel_min <= sys_min);
+    return rel_maj == sys_maj;
 }
 #elif defined(Q_OS_WIN)
 bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)

cockatrice/src/client/ui/widgets/cards/card_size_widget.cpp

@@ -11,8 +11,8 @@
  * This widget allows users to dynamically change the card size in a linked FlowWidget
  * and updates the application's settings accordingly.
  */
-CardSizeWidget::CardSizeWidget(QWidget *parent, FlowWidget *flowWidget, int defaultValue)
-    : parent(parent), flowWidget(flowWidget)
+CardSizeWidget::CardSizeWidget(QWidget *parent, FlowWidget *_flowWidget, int defaultValue)
+    : parent(parent), flowWidget(_flowWidget)
 {
     cardSizeLayout = new QHBoxLayout(this);
     cardSizeLayout->setContentsMargins(9, 0, 9, 0);

cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp

@@ -5,7 +5,6 @@
 #include "printing_selector_card_search_widget.h"
 #include "printing_selector_card_selection_widget.h"
 #include "printing_selector_card_sorting_widget.h"
-#include "printing_selector_view_options_toolbar_widget.h"
 
 #include <QScrollBar>
 
@@ -29,29 +28,49 @@ PrintingSelector::PrintingSelector(QWidget *parent,
     : QWidget(parent), deckEditor(deckEditor), deckModel(deckModel), deckView(deckView)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    layout = new QVBoxLayout();
+    layout = new QVBoxLayout(this);
     setLayout(layout);
+
     widgetLoadingBufferTimer = new QTimer(this);
 
-    // Initialize toolbar and widgets
-    viewOptionsToolbar = new PrintingSelectorViewOptionsToolbarWidget(this, this);
-    layout->addWidget(viewOptionsToolbar);
+    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
 
     sortToolBar = new PrintingSelectorCardSortingWidget(this);
-    sortToolBar->setVisible(SettingsCache::instance().getPrintingSelectorSortOptionsVisible());
-    layout->addWidget(sortToolBar);
+    sortToolBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+    displayOptionsWidget = new SettingsButtonWidget(this);
+    displayOptionsWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+
+    // Create the checkbox for navigation buttons visibility
+    navigationCheckBox = new QCheckBox(this);
+    navigationCheckBox->setChecked(SettingsCache::instance().getPrintingSelectorNavigationButtonsVisible());
+    connect(navigationCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &PrintingSelector::toggleVisibilityNavigationButtons);
+    connect(navigationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+            &SettingsCache::setPrintingSelectorNavigationButtonsVisible);
+
+    cardSizeWidget =
+        new CardSizeWidget(displayOptionsWidget, flowWidget, SettingsCache::instance().getPrintingSelectorCardSize());
+
+    displayOptionsWidget->addSettingsWidget(sortToolBar);
+    displayOptionsWidget->addSettingsWidget(navigationCheckBox);
+    displayOptionsWidget->addSettingsWidget(cardSizeWidget);
+
+    sortAndOptionsContainer = new QWidget(this);
+    sortAndOptionsLayout = new QHBoxLayout(sortAndOptionsContainer);
+    sortAndOptionsLayout->setSpacing(3);
+    sortAndOptionsLayout->setContentsMargins(0, 0, 0, 0);
+    sortAndOptionsContainer->setLayout(sortAndOptionsLayout);
 
     searchBar = new PrintingSelectorCardSearchWidget(this);
-    searchBar->setVisible(SettingsCache::instance().getPrintingSelectorSearchBarVisible());
-    layout->addWidget(searchBar);
 
-    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
+    sortAndOptionsLayout->addWidget(searchBar);
+    sortAndOptionsLayout->addWidget(displayOptionsWidget);
+
+    layout->addWidget(sortAndOptionsContainer);
+
     layout->addWidget(flowWidget);
 
-    cardSizeWidget = new CardSizeWidget(this, flowWidget, SettingsCache::instance().getPrintingSelectorCardSize());
-    cardSizeWidget->setVisible(SettingsCache::instance().getPrintingSelectorCardSizeSliderVisible());
-    layout->addWidget(cardSizeWidget);
-
     cardSelectionBar = new PrintingSelectorCardSelectionWidget(this);
     cardSelectionBar->setVisible(SettingsCache::instance().getPrintingSelectorNavigationButtonsVisible());
     layout->addWidget(cardSelectionBar);
@@ -59,6 +78,13 @@ PrintingSelector::PrintingSelector(QWidget *parent,
     // Connect deck model data change signal to update display
     connect(deckModel, &DeckListModel::rowsInserted, this, &PrintingSelector::printingsInDeckChanged);
     connect(deckModel, &DeckListModel::rowsRemoved, this, &PrintingSelector::printingsInDeckChanged);
+
+    retranslateUi();
+}
+
+void PrintingSelector::retranslateUi()
+{
+    navigationCheckBox->setText(tr("Display Navigation Buttons"));
 }
 
 void PrintingSelector::printingsInDeckChanged()
@@ -206,36 +232,6 @@ void PrintingSelector::getAllSetsForCurrentCard()
     widgetLoadingBufferTimer->start(0); // Process as soon as possible
 }
 
-/**
- * @brief Toggles the visibility of the sorting options toolbar.
- *
- * @param _state The visibility state to set.
- */
-void PrintingSelector::toggleVisibilitySortOptions(bool _state)
-{
-    sortToolBar->setVisible(_state);
-}
-
-/**
- * @brief Toggles the visibility of the search bar.
- *
- * @param _state The visibility state to set.
- */
-void PrintingSelector::toggleVisibilitySearchBar(bool _state)
-{
-    searchBar->setVisible(_state);
-}
-
-/**
- * @brief Toggles the visibility of the card size slider.
- *
- * @param _state The visibility state to set.
- */
-void PrintingSelector::toggleVisibilityCardSizeSlider(bool _state)
-{
-    cardSizeWidget->setVisible(_state);
-}
-
 /**
  * @brief Toggles the visibility of the navigation buttons.
  *

cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h

@@ -5,7 +5,9 @@
 #include "../../../../game/cards/card_database.h"
 #include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
+#include "../quick_settings/settings_button_widget.h"
 
+#include <QCheckBox>
 #include <QLabel>
 #include <QTreeView>
 #include <QVBoxLayout>
@@ -16,7 +18,7 @@
 class PrintingSelectorCardSearchWidget;
 class PrintingSelectorCardSelectionWidget;
 class PrintingSelectorCardSortingWidget;
-class PrintingSelectorViewOptionsToolbarWidget;
+class PrintingSelectorViewOptionsWidget;
 class TabDeckEditor;
 class PrintingSelector : public QWidget
 {
@@ -24,16 +26,15 @@ class PrintingSelector : public QWidget
 
 public:
     PrintingSelector(QWidget *parent, TabDeckEditor *deckEditor, DeckListModel *deckModel, QTreeView *deckView);
+
     void setCard(const CardInfoPtr &newCard, const QString &_currentZone);
     void getAllSetsForCurrentCard();
 
 public slots:
+    void retranslateUi();
     void updateDisplay();
     void selectPreviousCard();
     void selectNextCard();
-    void toggleVisibilitySortOptions(bool _state);
-    void toggleVisibilitySearchBar(bool _state);
-    void toggleVisibilityCardSizeSlider(bool _state);
     void toggleVisibilityNavigationButtons(bool _state);
 
 private slots:
@@ -41,7 +42,10 @@ private slots:
 
 private:
     QVBoxLayout *layout;
-    PrintingSelectorViewOptionsToolbarWidget *viewOptionsToolbar;
+    SettingsButtonWidget *displayOptionsWidget;
+    QWidget *sortAndOptionsContainer;
+    QHBoxLayout *sortAndOptionsLayout;
+    QCheckBox *navigationCheckBox;
     PrintingSelectorCardSortingWidget *sortToolBar;
     PrintingSelectorCardSearchWidget *searchBar;
     FlowWidget *flowWidget;

cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp

@@ -18,10 +18,11 @@ const QStringList PrintingSelectorCardSortingWidget::SORT_OPTIONS = {SORT_OPTION
  */
 PrintingSelectorCardSortingWidget::PrintingSelectorCardSortingWidget(PrintingSelector *parent) : parent(parent)
 {
+    setMinimumWidth(300);
     sortToolBar = new QHBoxLayout(this);
-    sortToolBar->setContentsMargins(9, 0, 9, 0);
 
     sortOptionsSelector = new QComboBox(this);
+    sortOptionsSelector->setFocusPolicy(Qt::StrongFocus);
     sortOptionsSelector->addItems(SORT_OPTIONS);
     sortOptionsSelector->setCurrentIndex(SettingsCache::instance().getPrintingSelectorSortOrder());
     connect(sortOptionsSelector, &QComboBox::currentTextChanged, this,

cockatrice/src/client/ui/widgets/printing_selector/printing_selector_view_options_toolbar_widget.cpp

@@ -1,140 +0,0 @@
-#include "printing_selector_view_options_toolbar_widget.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-
-/**
- * @class PrintingSelectorViewOptionsToolbarWidget
- * @brief A widget that provides a toolbar for view options with collapsible and expandable functionality.
- *
- * This widget allows the user to collapse or expand the view options for the PrintingSelector,
- * providing a more compact interface when collapsed and a full view of options when expanded.
- */
-PrintingSelectorViewOptionsToolbarWidget::PrintingSelectorViewOptionsToolbarWidget(QWidget *_parent,
-                                                                                   PrintingSelector *_printingSelector)
-    : QWidget(_parent), printingSelector(_printingSelector)
-{
-    // Set up layout for the widget
-    layout = new QVBoxLayout();
-    layout->setContentsMargins(9, 0, 9, 0);
-    layout->setSpacing(0);
-    setLayout(layout);
-
-    // Set up the expanded widget with its layout
-    expandedWidget = new QWidget(this);
-    auto *expandedLayout = new QVBoxLayout(expandedWidget);
-    expandedLayout->setContentsMargins(0, 0, 0, 0);
-    expandedLayout->setSpacing(0);
-
-    // Collapse button to toggle between expanded and collapsed states
-    collapseButton = new QPushButton("▼", this);
-    collapseButton->setFixedSize(20, 20);
-    collapseButton->setToolTip("Collapse");
-    collapseButton->setStyleSheet("border: none;");
-    connect(collapseButton, &QPushButton::clicked, this, &PrintingSelectorViewOptionsToolbarWidget::collapse);
-    expandedLayout->addWidget(collapseButton, 0, Qt::AlignLeft);
-
-    // View options widget
-    viewOptions = new PrintingSelectorViewOptionsWidget(expandedWidget, printingSelector);
-    expandedLayout->addWidget(viewOptions);
-
-    expandedWidget->setLayout(expandedLayout);
-
-    // Set up the collapsed widget with its layout
-    collapsedWidget = new QWidget(this);
-    auto *collapsedLayout = new QHBoxLayout(collapsedWidget);
-    collapsedLayout->setContentsMargins(5, 0, 5, 0);
-    collapsedLayout->setSpacing(0);
-
-    // Expand button to show full options
-    expandButton = new QPushButton("▲", this);
-    expandButton->setFixedSize(20, 20);
-    expandButton->setToolTip("Expand");
-    expandButton->setStyleSheet("border: none;");
-    connect(expandButton, &QPushButton::clicked, this, &PrintingSelectorViewOptionsToolbarWidget::expand);
-    collapsedLayout->addWidget(expandButton);
-
-    // Label for collapsed state
-    auto *collapsedLabel = new QLabel(tr("Display Options"), this);
-    collapsedLayout->addWidget(collapsedLabel);
-
-    collapsedWidget->setLayout(collapsedLayout);
-
-    // Stack widget to switch between expanded and collapsed states
-    stackedWidget = new QStackedWidget(this);
-    stackedWidget->addWidget(expandedWidget);
-    stackedWidget->addWidget(collapsedWidget);
-
-    layout->addWidget(stackedWidget);
-
-    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-
-    // Default to the expanded widget
-    stackedWidget->setCurrentWidget(expandedWidget);
-
-    // Connect the stacked widget to update the layout when it changes
-    connect(stackedWidget, &QStackedWidget::currentChanged, this,
-            &PrintingSelectorViewOptionsToolbarWidget::onWidgetChanged);
-}
-
-/**
- * @brief Toggles the widget to the collapsed state.
- */
-void PrintingSelectorViewOptionsToolbarWidget::collapse()
-{
-    stackedWidget->setCurrentWidget(collapsedWidget);
-    updateGeometry();
-}
-
-/**
- * @brief Toggles the widget to the expanded state.
- */
-void PrintingSelectorViewOptionsToolbarWidget::expand()
-{
-    stackedWidget->setCurrentWidget(expandedWidget);
-    updateGeometry();
-}
-
-/**
- * @brief Handles the geometry update when the stacked widget changes.
- *
- * This ensures that the parent layout is also updated when the widget's display state changes.
- */
-void PrintingSelectorViewOptionsToolbarWidget::onWidgetChanged(int)
-{
-    updateGeometry();
-    if (parentWidget() && parentWidget()->layout()) {
-        parentWidget()->layout()->invalidate();
-    }
-}
-
-/**
- * @brief Provides the recommended size for the widget based on the current view.
- *
- * @return QSize The suggested size for the widget.
- */
-QSize PrintingSelectorViewOptionsToolbarWidget::sizeHint() const
-{
-    return stackedWidget->currentWidget()->sizeHint();
-}
-
-/**
- * @brief Provides the minimum size required for the widget based on the current view.
- *
- * @return QSize The minimum size required for the widget.
- */
-QSize PrintingSelectorViewOptionsToolbarWidget::minimumSizeHint() const
-{
-    return stackedWidget->currentWidget()->minimumSizeHint();
-}
-
-/**
- * @brief Returns the view options widget contained within this toolbar.
- *
- * @return PrintingSelectorViewOptionsWidget* The view options widget.
- */
-PrintingSelectorViewOptionsWidget *PrintingSelectorViewOptionsToolbarWidget::getViewOptionsWidget() const
-{
-    return viewOptions;
-}

cockatrice/src/client/ui/widgets/printing_selector/printing_selector_view_options_toolbar_widget.h

@@ -1,36 +0,0 @@
-#ifndef PRINTING_SELECTOR_SORT_AND_SEARCH_TOOLBAR_WIDGET_H
-#define PRINTING_SELECTOR_SORT_AND_SEARCH_TOOLBAR_WIDGET_H
-
-#include "printing_selector.h"
-#include "printing_selector_view_options_widget.h"
-
-#include <QPushButton>
-#include <QStackedWidget>
-#include <QVBoxLayout>
-#include <QWidget>
-
-class PrintingSelectorViewOptionsToolbarWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit PrintingSelectorViewOptionsToolbarWidget(QWidget *parent, PrintingSelector *printingSelector);
-    void collapse();
-    void expand();
-    void onWidgetChanged(int);
-    QSize sizeHint() const override;
-    QSize minimumSizeHint() const override;
-    PrintingSelectorViewOptionsWidget *getViewOptionsWidget() const;
-
-private:
-    QVBoxLayout *layout;
-    PrintingSelector *printingSelector;
-    PrintingSelectorViewOptionsWidget *viewOptions;
-    QWidget *expandedWidget;
-    QPushButton *collapseButton;
-    QWidget *collapsedWidget;
-    QPushButton *expandButton;
-    QStackedWidget *stackedWidget;
-};
-
-#endif // PRINTING_SELECTOR_SORT_AND_SEARCH_TOOLBAR_WIDGET_H

cockatrice/src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.cpp

@@ -1,63 +0,0 @@
-#include "printing_selector_view_options_widget.h"
-
-#include "../../../../settings/cache_settings.h"
-
-/**
- * @class PrintingSelectorViewOptionsWidget
- * @brief A widget that provides the view options for the PrintingSelector, including checkboxes
- * for sorting, search bar, card size slider, and navigation buttons.
- *
- * This widget allows the user to toggle the visibility of various interface components of the
- * PrintingSelector through checkboxes. The state of the checkboxes is saved and restored using
- * the `SettingsCache`.
- */
-PrintingSelectorViewOptionsWidget::PrintingSelectorViewOptionsWidget(QWidget *parent,
-                                                                     PrintingSelector *_printingSelector)
-    : QWidget(parent), printingSelector(_printingSelector)
-{
-    // Create the grid to hold the checkboxes
-    gridLayout = new QGridLayout(this);
-    setLayout(gridLayout);
-
-    // Create the checkbox for sorting options visibility
-    sortCheckBox = new QCheckBox(this);
-    sortCheckBox->setText(tr("Display Sorting Options"));
-    sortCheckBox->setChecked(SettingsCache::instance().getPrintingSelectorSortOptionsVisible());
-    connect(sortCheckBox, &QCheckBox::QT_STATE_CHANGED, printingSelector,
-            &PrintingSelector::toggleVisibilitySortOptions);
-    connect(sortCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setPrintingSelectorSortOptionsVisible);
-
-    // Create the checkbox for search bar visibility
-    searchCheckBox = new QCheckBox(this);
-    searchCheckBox->setText(tr("Display Search Bar"));
-    searchCheckBox->setChecked(SettingsCache::instance().getPrintingSelectorSearchBarVisible());
-    connect(searchCheckBox, &QCheckBox::QT_STATE_CHANGED, printingSelector,
-            &PrintingSelector::toggleVisibilitySearchBar);
-    connect(searchCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setPrintingSelectorSearchBarVisible);
-
-    // Create the checkbox for card size slider visibility
-    cardSizeCheckBox = new QCheckBox(this);
-    cardSizeCheckBox->setText(tr("Display Card Size Slider"));
-    cardSizeCheckBox->setChecked(SettingsCache::instance().getPrintingSelectorCardSizeSliderVisible());
-    connect(cardSizeCheckBox, &QCheckBox::QT_STATE_CHANGED, printingSelector,
-            &PrintingSelector::toggleVisibilityCardSizeSlider);
-    connect(cardSizeCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setPrintingSelectorCardSizeSliderVisible);
-
-    // Create the checkbox for navigation buttons visibility
-    navigationCheckBox = new QCheckBox(this);
-    navigationCheckBox->setText(tr("Display Navigation Buttons"));
-    navigationCheckBox->setChecked(SettingsCache::instance().getPrintingSelectorNavigationButtonsVisible());
-    connect(navigationCheckBox, &QCheckBox::QT_STATE_CHANGED, printingSelector,
-            &PrintingSelector::toggleVisibilityNavigationButtons);
-    connect(navigationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setPrintingSelectorNavigationButtonsVisible);
-
-    // Add checkboxes to the grid
-    gridLayout->addWidget(sortCheckBox, 0, 0);
-    gridLayout->addWidget(searchCheckBox, 0, 1);
-    gridLayout->addWidget(cardSizeCheckBox, 1, 0);
-    gridLayout->addWidget(navigationCheckBox, 1, 1);
-}

cockatrice/src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.h

@@ -1,27 +0,0 @@
-#ifndef PRINTING_SELECTOR_VIEW_OPTIONS_WIDGET_H
-#define PRINTING_SELECTOR_VIEW_OPTIONS_WIDGET_H
-
-#include "../general/layout_containers/flow_widget.h"
-#include "printing_selector.h"
-
-#include <QCheckBox>
-#include <QHBoxLayout>
-#include <QWidget>
-
-class PrintingSelectorViewOptionsWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit PrintingSelectorViewOptionsWidget(QWidget *parent, PrintingSelector *_printingSelector);
-
-private:
-    QGridLayout *gridLayout;
-    PrintingSelector *printingSelector;
-    QCheckBox *sortCheckBox;
-    QCheckBox *searchCheckBox;
-    QCheckBox *cardSizeCheckBox;
-    QCheckBox *navigationCheckBox;
-};
-
-#endif // PRINTING_SELECTOR_VIEW_OPTIONS_WIDGET_H

cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.cpp

@@ -0,0 +1,80 @@
+#include "settings_button_widget.h"
+
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QMouseEvent>
+#include <QScreen>
+
+SettingsButtonWidget::SettingsButtonWidget(QWidget *parent)
+    : QWidget(parent), button(new QToolButton(this)), popup(new SettingsPopupWidget(this))
+{
+
+    button->setIcon(QPixmap("theme:icons/cogwheel"));
+    button->setCheckable(true);
+    button->setFixedSize(32, 32);
+    connect(button, &QToolButton::clicked, this, &SettingsButtonWidget::togglePopup);
+    connect(popup, &SettingsPopupWidget::aboutToClose, this, &SettingsButtonWidget::onPopupClosed);
+
+    layout = new QHBoxLayout(this);
+    layout->addWidget(button);
+    layout->setContentsMargins(0, 0, 0, 0);
+    setLayout(layout);
+}
+
+void SettingsButtonWidget::addSettingsWidget(QWidget *toAdd) const
+{
+    popup->addSettingsWidget(toAdd);
+}
+
+void SettingsButtonWidget::togglePopup()
+{
+    if (popup->isVisible()) {
+        popup->close();
+    } else {
+        // Ensure popup size is known before positioning
+        popup->adjustSize();
+        QSize popupSize = popup->size();
+
+        // Get button position
+        QPoint buttonGlobalPos = button->mapToGlobal(QPoint(0, button->height()));
+
+        // Get screen geometry
+        QScreen *screen = QApplication::screenAt(buttonGlobalPos);
+        QRect screenGeom = screen ? screen->availableGeometry() : QApplication::primaryScreen()->availableGeometry();
+
+        int x = buttonGlobalPos.x();
+        int y = buttonGlobalPos.y();
+
+        // Adjust X position if popup overflows the right side of the screen
+        if (x + popupSize.width() > screenGeom.right()) {
+            x = buttonGlobalPos.x() - popupSize.width() + button->width(); // Move left
+        }
+
+        // Adjust Y position if popup overflows the bottom of the screen
+        if (y + popupSize.height() > screenGeom.bottom()) {
+            y = buttonGlobalPos.y() - popupSize.height() - button->height(); // Move up
+        }
+
+        popup->move(x, y);
+        popup->show();
+        popup->setFocus();
+        button->setChecked(true); // Ensure button is checked when popup is visible
+    }
+}
+
+void SettingsButtonWidget::onPopupClosed() const
+{
+    button->setChecked(false); // Ensure button unchecks when popup closes
+}
+
+void SettingsButtonWidget::mousePressEvent(QMouseEvent *event)
+{
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    if (popup->isVisible() && !popup->geometry().contains(event->globalPosition().toPoint())) {
+#else
+    if (popup->isVisible() && !popup->geometry().contains(event->globalPos())) {
+#endif
+        popup->close();
+    }
+    QWidget::mousePressEvent(event);
+}

cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.h

@@ -0,0 +1,30 @@
+#ifndef SETTINGS_BUTTON_WIDGET_H
+#define SETTINGS_BUTTON_WIDGET_H
+
+#include "settings_popup_widget.h"
+
+#include <QToolButton>
+#include <QWidget>
+
+class SettingsButtonWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit SettingsButtonWidget(QWidget *parent = nullptr);
+    void addSettingsWidget(QWidget *toAdd) const;
+
+protected:
+    void mousePressEvent(QMouseEvent *event) override;
+
+private slots:
+    void togglePopup();
+    void onPopupClosed() const;
+
+private:
+    QHBoxLayout *layout;
+    QToolButton *button;
+    SettingsPopupWidget *popup;
+};
+
+#endif // SETTINGS_BUTTON_WIDGET_H

cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp

@@ -0,0 +1,37 @@
+#include "settings_popup_widget.h"
+
+#include <QApplication>
+#include <QFocusEvent>
+#include <QPainter>
+
+SettingsPopupWidget::SettingsPopupWidget(QWidget *parent) : QWidget(parent, Qt::Popup | Qt::FramelessWindowHint)
+{
+    layout = new QVBoxLayout(this);
+}
+
+void SettingsPopupWidget::addSettingsWidget(QWidget *toAdd) const
+{
+    layout->addWidget(toAdd);
+}
+
+void SettingsPopupWidget::focusOutEvent(QFocusEvent *event)
+{
+    if (!this->isAncestorOf(QApplication::focusWidget())) {
+        close();
+    }
+    QWidget::focusOutEvent(event);
+}
+
+void SettingsPopupWidget::closeEvent(QCloseEvent *event)
+{
+    emit aboutToClose();
+    QWidget::closeEvent(event);
+}
+
+void SettingsPopupWidget::paintEvent(QPaintEvent *event)
+{
+    QPainter painter(this);
+    painter.setPen(Qt::gray);
+    painter.drawRect(rect().adjusted(0, 0, -1, -1));
+    QWidget::paintEvent(event);
+}

cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.h

@@ -0,0 +1,27 @@
+#ifndef SETTINGS_POPUP_WIDGET_H
+#define SETTINGS_POPUP_WIDGET_H
+
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QWidget>
+
+class SettingsPopupWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit SettingsPopupWidget(QWidget *parent = nullptr);
+    void addSettingsWidget(QWidget *toAdd) const;
+
+signals:
+    void aboutToClose();
+
+protected:
+    void focusOutEvent(QFocusEvent *event) override;
+    void closeEvent(QCloseEvent *event) override;
+    void paintEvent(QPaintEvent *event) override;
+
+    QVBoxLayout *layout;
+};
+
+#endif // SETTINGSPOPUP_H

cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.cpp

@@ -119,9 +119,10 @@ QChar DeckPreviewColorCircleWidget::getColorChar() const
 DeckPreviewColorIdentityWidget::DeckPreviewColorIdentityWidget(QWidget *parent, const QString &colorIdentity)
     : QWidget(parent)
 {
-    QHBoxLayout *layout = new QHBoxLayout(this);
+    layout = new QHBoxLayout(this);
     layout->setSpacing(5);
     layout->setContentsMargins(0, 0, 0, 0);
+    layout->setAlignment(Qt::AlignHCenter);
     setLayout(layout);
 
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
@@ -143,6 +144,25 @@ DeckPreviewColorIdentityWidget::DeckPreviewColorIdentityWidget(QWidget *parent,
             }
         }
     }
+
+    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageDrawUnusedColorIdentitiesChanged, this,
+            &DeckPreviewColorIdentityWidget::toggleUnusedVisibility);
+    toggleUnusedVisibility(SettingsCache::instance().getVisualDeckStorageDrawUnusedColorIdentities());
+}
+
+void DeckPreviewColorIdentityWidget::toggleUnusedVisibility(bool _visible) const
+{
+    if (_visible) {
+        for (DeckPreviewColorCircleWidget *circle : findChildren<DeckPreviewColorCircleWidget *>()) {
+            circle->setVisible(true);
+        }
+    } else {
+        for (DeckPreviewColorCircleWidget *circle : findChildren<DeckPreviewColorCircleWidget *>()) {
+            if (!circle->getIsActive()) {
+                circle->setHidden(true);
+            }
+        }
+    }
 }
 
 void DeckPreviewColorIdentityWidget::resizeEvent(QResizeEvent *event)

cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.h

@@ -15,6 +15,10 @@ public:
 
     void setColorActive(bool active);
     QChar getColorChar() const;
+    bool getIsActive() const
+    {
+        return isActive;
+    }
 
 protected:
     void resizeEvent(QResizeEvent *event) override;
@@ -35,8 +39,14 @@ class DeckPreviewColorIdentityWidget : public QWidget
 public:
     explicit DeckPreviewColorIdentityWidget(QWidget *parent, const QString &colorIdentity);
 
+public slots:
+    void toggleUnusedVisibility(bool _visible) const;
+
 protected:
     void resizeEvent(QResizeEvent *event) override;
+
+private:
+    QHBoxLayout *layout;
 };
 
 #endif // DECK_PREVIEW_COLOR_IDENTITY_WIDGET_H

cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp

@@ -1,6 +1,7 @@
 #include "deck_preview_widget.h"
 
 #include "../../../../../game/cards/card_database_manager.h"
+#include "../../../../../settings/cache_settings.h"
 #include "../../cards/deck_preview_card_picture_widget.h"
 #include "deck_preview_deck_tags_display_widget.h"
 
@@ -12,7 +13,8 @@
 DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent,
                                      VisualDeckStorageWidget *_visualDeckStorageWidget,
                                      const QString &_filePath)
-    : QWidget(_parent), visualDeckStorageWidget(_visualDeckStorageWidget), filePath(_filePath)
+    : QWidget(_parent), visualDeckStorageWidget(_visualDeckStorageWidget), filePath(_filePath),
+      colorIdentityWidget(nullptr), deckTagsDisplayWidget(nullptr)
 {
     layout = new QVBoxLayout(this);
     setLayout(layout);
@@ -30,6 +32,9 @@ DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent,
     connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this,
             &DeckPreviewWidget::imageDoubleClickedEvent);
 
+    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageShowTagsOnDeckPreviewsChanged, this,
+            &DeckPreviewWidget::updateTagsVisibility);
+
     layout->addWidget(bannerCardDisplayWidget);
 }
 
@@ -51,6 +56,7 @@ void DeckPreviewWidget::initializeUi(const bool deckLoadSuccess)
 
     colorIdentityWidget = new DeckPreviewColorIdentityWidget(this, getColorIdentity());
     deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, deckLoader);
+    updateTagsVisibility(SettingsCache::instance().getVisualDeckStorageShowTagsOnDeckPreviews());
 
     layout->addWidget(colorIdentityWidget);
     layout->addWidget(deckTagsDisplayWidget);
@@ -72,6 +78,19 @@ bool DeckPreviewWidget::checkVisibility() const
     return true;
 }
 
+void DeckPreviewWidget::updateTagsVisibility(bool visible)
+{
+    if (!deckTagsDisplayWidget) {
+        return;
+    }
+
+    if (visible) {
+        deckTagsDisplayWidget->setVisible(true);
+    } else {
+        deckTagsDisplayWidget->setHidden(true);
+    }
+}
+
 QString DeckPreviewWidget::getColorIdentity()
 {
     QStringList cardList = deckLoader->getCardList();

cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h

@@ -45,6 +45,7 @@ public slots:
     void imageDoubleClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
     void initializeUi(bool deckLoadSuccess);
     void updateVisibility();
+    void updateTagsVisibility(bool visible);
 };
 
 #endif // DECK_PREVIEW_WIDGET_H

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp

@@ -172,7 +172,7 @@ void VisualDeckStorageFolderDisplayWidget::updateShowFolders(bool enabled)
     if (!showFolders) {
         flattenFolderStructure();
     } else {
-        // if setting was switched from disabled to enabled, we assume that there isn't any existing subfolders
+        // if setting was switched from disabled to enabled, we assume that there aren't any existing subfolders
         createWidgetsForFiles();
         createWidgetsForFolders();
     }

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp

@@ -95,7 +95,7 @@ QList<DeckPreviewWidget *> VisualDeckStorageSortWidget::filterFiles(QList<DeckPr
             case ByName:
                 return widget1->deckLoader->getName() < widget2->deckLoader->getName();
             case Alphabetical:
-                return info1.fileName().toLower() < info2.fileName().toLower();
+                return QString::localeAwareCompare(info1.fileName(), info2.fileName()) <= 0;
             case ByLastModified:
                 return info1.lastModified() > info2.lastModified();
             case ByLastLoaded: {

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp

@@ -2,6 +2,7 @@
 
 #include "../../../../game/cards/card_database_manager.h"
 #include "../../../../settings/cache_settings.h"
+#include "../quick_settings/settings_button_widget.h"
 #include "deck_preview/deck_preview_widget.h"
 #include "visual_deck_storage_folder_display_widget.h"
 #include "visual_deck_storage_search_widget.h"
@@ -24,36 +25,59 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
     setLayout(layout);
 
     // search bar row
-    searchAndSortLayout = new QHBoxLayout(this);
+    searchAndSortContainer = new QWidget(this);
+    searchAndSortLayout = new QHBoxLayout(searchAndSortContainer);
     searchAndSortLayout->setSpacing(3);
     searchAndSortLayout->setContentsMargins(9, 0, 9, 0);
+    searchAndSortContainer->setLayout(searchAndSortLayout);
 
     deckPreviewColorIdentityFilterWidget = new DeckPreviewColorIdentityFilterWidget(this);
     sortWidget = new VisualDeckStorageSortWidget(this);
     searchWidget = new VisualDeckStorageSearchWidget(this);
 
-    searchAndSortLayout->addWidget(deckPreviewColorIdentityFilterWidget);
-    searchAndSortLayout->addWidget(sortWidget);
-    searchAndSortLayout->addWidget(searchWidget);
-
-    // checkbox row
-    QHBoxLayout *checkBoxLayout = new QHBoxLayout(this);
-    checkBoxLayout->setContentsMargins(9, 0, 9, 0);
-
     showFoldersCheckBox = new QCheckBox(this);
     showFoldersCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowFolders());
+    connect(showFoldersCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &VisualDeckStorageWidget::updateShowFolders);
     connect(showFoldersCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
             &SettingsCache::setVisualDeckStorageShowFolders);
 
-    checkBoxLayout->addWidget(showFoldersCheckBox);
-    checkBoxLayout->addStretch();
+    tagFilterVisibilityCheckBox = new QCheckBox(this);
+    tagFilterVisibilityCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowTagFilter());
+    connect(tagFilterVisibilityCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &VisualDeckStorageWidget::updateTagsVisibility);
+    connect(tagFilterVisibilityCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+            &SettingsCache::setVisualDeckStorageShowTagFilter);
 
-    // tag filter box
-    tagFilterWidget = new VisualDeckStorageTagFilterWidget(this);
+    tagsOnWidgetsVisibilityCheckBox = new QCheckBox(this);
+    tagsOnWidgetsVisibilityCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowTagsOnDeckPreviews());
+    connect(tagsOnWidgetsVisibilityCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+            &SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews);
+
+    drawUnusedColorIdentitiesCheckBox = new QCheckBox(this);
+    drawUnusedColorIdentitiesCheckBox->setChecked(
+        SettingsCache::instance().getVisualDeckStorageDrawUnusedColorIdentities());
+    connect(drawUnusedColorIdentitiesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
+            &SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities);
 
     // card size slider
     cardSizeWidget = new CardSizeWidget(this, nullptr, SettingsCache::instance().getVisualDeckStorageCardSize());
 
+    quickSettingsWidget = new SettingsButtonWidget(this);
+    quickSettingsWidget->addSettingsWidget(showFoldersCheckBox);
+    quickSettingsWidget->addSettingsWidget(tagFilterVisibilityCheckBox);
+    quickSettingsWidget->addSettingsWidget(tagsOnWidgetsVisibilityCheckBox);
+    quickSettingsWidget->addSettingsWidget(drawUnusedColorIdentitiesCheckBox);
+    quickSettingsWidget->addSettingsWidget(cardSizeWidget);
+
+    searchAndSortLayout->addWidget(deckPreviewColorIdentityFilterWidget);
+    searchAndSortLayout->addWidget(sortWidget);
+    searchAndSortLayout->addWidget(searchWidget);
+    searchAndSortLayout->addWidget(quickSettingsWidget);
+
+    // tag filter box
+    tagFilterWidget = new VisualDeckStorageTagFilterWidget(this);
+    updateTagsVisibility(SettingsCache::instance().getVisualDeckStorageShowTagFilter());
+
     // deck area
     scrollArea = new QScrollArea(this);
     scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
@@ -61,11 +85,9 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
     scrollArea->setWidgetResizable(true);
 
     // putting everything together
-    layout->addLayout(searchAndSortLayout);
-    layout->addLayout(checkBoxLayout);
+    layout->addWidget(searchAndSortContainer);
     layout->addWidget(tagFilterWidget);
     layout->addWidget(scrollArea);
-    layout->addWidget(cardSizeWidget);
 
     connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
             &VisualDeckStorageWidget::createRootFolderWidget);
@@ -107,6 +129,9 @@ void VisualDeckStorageWidget::retranslateUi()
     databaseLoadIndicator->setText(tr("Loading database ..."));
 
     showFoldersCheckBox->setText(tr("Show Folders"));
+    tagFilterVisibilityCheckBox->setText(tr("Show Tag Filter"));
+    tagsOnWidgetsVisibilityCheckBox->setText(tr("Show Tags On Deck Previews"));
+    drawUnusedColorIdentitiesCheckBox->setText(tr("Draw not contained Color Identities"));
 }
 
 void VisualDeckStorageWidget::deckPreviewClickedEvent(QMouseEvent *event, DeckPreviewWidget *instance)
@@ -125,15 +150,20 @@ void VisualDeckStorageWidget::createRootFolderWidget()
     folderWidget = new VisualDeckStorageFolderDisplayWidget(this, this, SettingsCache::instance().getDeckPath(), false,
                                                             showFoldersCheckBox->isChecked());
 
-    connect(showFoldersCheckBox, &QCheckBox::QT_STATE_CHANGED, folderWidget,
-            &VisualDeckStorageFolderDisplayWidget::updateShowFolders);
-
     scrollArea->setWidget(folderWidget);
     scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width());
     scrollArea->widget()->adjustSize();
     updateSortOrder();
 }
 
+void VisualDeckStorageWidget::updateShowFolders(bool enabled)
+{
+    if (folderWidget) {
+        folderWidget->updateShowFolders(enabled);
+        updateSortOrder();
+    }
+}
+
 void VisualDeckStorageWidget::updateSortOrder()
 {
     if (folderWidget) {
@@ -168,3 +198,13 @@ void VisualDeckStorageWidget::updateSearchFilter()
     }
     emit searchFilterUpdated();
 }
+
+void VisualDeckStorageWidget::updateTagsVisibility(const bool visible)
+{
+    if (visible) {
+        tagFilterWidget->setVisible(true);
+
+    } else {
+        tagFilterWidget->setHidden(true);
+    }
+}

cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h

@@ -4,6 +4,7 @@
 #include "../../../../deck/deck_list_model.h"
 #include "../../../ui/widgets/general/layout_containers/flow_widget.h"
 #include "../cards/card_size_widget.h"
+#include "../quick_settings/settings_button_widget.h"
 #include "deck_preview/deck_preview_color_identity_filter_widget.h"
 #include "deck_preview/deck_preview_widget.h"
 #include "visual_deck_storage_folder_display_widget.h"
@@ -24,8 +25,8 @@ class VisualDeckStorageWidget final : public QWidget
     Q_OBJECT
 public:
     explicit VisualDeckStorageWidget(QWidget *parent);
-
     void retranslateUi();
+
     CardSizeWidget *cardSizeWidget;
     VisualDeckStorageTagFilterWidget *tagFilterWidget;
 
@@ -33,9 +34,11 @@ public slots:
     void deckPreviewClickedEvent(QMouseEvent *event, DeckPreviewWidget *instance);
     void deckPreviewDoubleClickedEvent(QMouseEvent *event, DeckPreviewWidget *instance);
     void createRootFolderWidget(); // Refresh the display of cards based on the current sorting option
+    void updateShowFolders(bool enabled);
     void updateTagFilter();
     void updateColorFilter();
     void updateSearchFilter();
+    void updateTagsVisibility(bool visible);
     void updateSortOrder();
     void resizeEvent(QResizeEvent *event) override;
     void showEvent(QShowEvent *event) override;
@@ -51,15 +54,18 @@ signals:
 
 private:
     QVBoxLayout *layout;
+    QWidget *searchAndSortContainer;
     QHBoxLayout *searchAndSortLayout;
     DeckListModel *deckListModel;
     QLabel *databaseLoadIndicator;
     VisualDeckStorageSortWidget *sortWidget;
     VisualDeckStorageSearchWidget *searchWidget;
     DeckPreviewColorIdentityFilterWidget *deckPreviewColorIdentityFilterWidget;
-
+    SettingsButtonWidget *quickSettingsWidget;
     QCheckBox *showFoldersCheckBox;
-
+    QCheckBox *drawUnusedColorIdentitiesCheckBox;
+    QCheckBox *tagFilterVisibilityCheckBox;
+    QCheckBox *tagsOnWidgetsVisibilityCheckBox;
     QScrollArea *scrollArea;
     VisualDeckStorageFolderDisplayWidget *folderWidget;
 };

cockatrice/src/dialogs/dlg_tip_of_the_day.cpp

@@ -88,8 +88,8 @@ DlgTipOfTheDay::DlgTipOfTheDay(QWidget *parent) : QDialog(parent)
     setLayout(mainLayout);
 
     setWindowTitle(tr("Tip of the Day"));
-    setMinimumWidth(500);
-    setMinimumHeight(300);
+    setMinimumWidth(700);
+    setMinimumHeight(500);
     successfulInit = true;
 }
 
@@ -144,6 +144,7 @@ void DlgTipOfTheDay::updateTip(int tipId)
 
     title->setText("<h2>" + titleText + "</h2>");
     tipTextContent->setText(contentText);
+    tipTextContent->setTextFormat(Qt::RichText);
 
     if (!image->load(imagePath)) {
         qCDebug(DlgTipOfTheDayLog) << "Image failed to load from" << imagePath;
@@ -159,6 +160,8 @@ void DlgTipOfTheDay::updateTip(int tipId)
     tipNumber->setText("Tip " + QString::number(tipId + 1) + " / " + QString::number(tipDatabase->rowCount()));
 
     currentTip = static_cast<unsigned int>(tipId);
+
+    adjustSize();
 }
 
 void DlgTipOfTheDay::resizeEvent(QResizeEvent *event)

cockatrice/src/main.cpp

@@ -190,8 +190,10 @@ int main(int argc, char *argv[])
     const QByteArray configPath = "";
 #endif
 
-    // Set the QT_LOGGING_CONF environment variable
-    qputenv("QT_LOGGING_CONF", configPath);
+    if (!qEnvironmentVariableIsSet(("QT_LOGGING_CONF"))) {
+        // Set the QT_LOGGING_CONF environment variable
+        qputenv("QT_LOGGING_CONF", configPath);
+    }
     qSetMessagePattern(
         "\033[0m[%{time yyyy-MM-dd h:mm:ss.zzz} "
         "%{if-debug}\033[36mD%{endif}%{if-info}\033[32mI%{endif}%{if-warning}\033[33mW%{endif}%{if-critical}\033[31mC%{"

cockatrice/src/settings/cache_settings.cpp

@@ -258,15 +258,14 @@ SettingsCache::SettingsCache()
     bumpSetsWithCardsInDeckToTop = settings->value("cards/bumpsetswithcardsindecktotop", true).toBool();
     printingSelectorSortOrder = settings->value("cards/printingselectorsortorder", 1).toInt();
     printingSelectorCardSize = settings->value("cards/printingselectorcardsize", 100).toInt();
-    printingSelectorSortOptionsVisible = settings->value("cards/printingselectorsortoptionsvisible", true).toBool();
-    printingSelectorSearchBarVisible = settings->value("cards/printingselectorcardsearchbarvisible", true).toBool();
-    printingSelectorCardSizeSliderVisible =
-        settings->value("cards/printingselectorcardsizeslidervisible", true).toBool();
     printingSelectorNavigationButtonsVisible =
         settings->value("cards/printingselectornavigationbuttonsvisible", true).toBool();
-    visualDeckStorageCardSize = settings->value("cards/visualdeckstoragecardsize", 100).toInt();
+    visualDeckStorageCardSize = settings->value("interface/visualdeckstoragecardsize", 100).toInt();
     visualDeckStorageSortingOrder = settings->value("interface/visualdeckstoragesortingorder", 0).toInt();
     visualDeckStorageShowFolders = settings->value("interface/visualdeckstorageshowfolders", true).toBool();
+    visualDeckStorageShowTagFilter = settings->value("interface/visualdeckstorageshowtagfilter", true).toBool();
+    visualDeckStorageShowTagsOnDeckPreviews =
+        settings->value("interface/visualdeckstorageshowtagsondeckpreviews", true).toBool();
     visualDeckStorageDrawUnusedColorIdentities =
         settings->value("interface/visualdeckstoragedrawunusedcoloridentities", true).toBool();
     visualDeckStorageUnusedColorIdentitiesOpacity =
@@ -645,27 +644,6 @@ void SettingsCache::setPrintingSelectorCardSize(int _printingSelectorCardSize)
     emit printingSelectorCardSizeChanged();
 }
 
-void SettingsCache::setPrintingSelectorSortOptionsVisible(QT_STATE_CHANGED_T _sortOptionsVisible)
-{
-    printingSelectorSortOptionsVisible = _sortOptionsVisible;
-    settings->setValue("cards/printingselectorsortoptionsvisible", printingSelectorSortOptionsVisible);
-    emit printingSelectorSortOptionsVisibleChanged();
-}
-
-void SettingsCache::setPrintingSelectorSearchBarVisible(QT_STATE_CHANGED_T _searchBarVisible)
-{
-    printingSelectorSearchBarVisible = _searchBarVisible;
-    settings->setValue("cards/printingselectorsearchbarvisible", printingSelectorSearchBarVisible);
-    emit printingSelectorSearchBarVisibleChanged();
-}
-
-void SettingsCache::setPrintingSelectorCardSizeSliderVisible(QT_STATE_CHANGED_T _cardSizeSliderVisible)
-{
-    printingSelectorCardSizeSliderVisible = _cardSizeSliderVisible;
-    settings->setValue("cards/printingselectorcardsizeslidervisible", printingSelectorCardSizeSliderVisible);
-    emit printingSelectorCardSizeSliderVisibleChanged();
-}
-
 void SettingsCache::setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T _navigationButtonsVisible)
 {
     printingSelectorNavigationButtonsVisible = _navigationButtonsVisible;
@@ -685,10 +663,24 @@ void SettingsCache::setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T value)
     settings->setValue("interface/visualdeckstorageshowfolders", visualDeckStorageShowFolders);
 }
 
+void SettingsCache::setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T _showTags)
+{
+    visualDeckStorageShowTagFilter = _showTags;
+    settings->setValue("interface/visualdeckstorageshowtagfilter", visualDeckStorageShowTagFilter);
+    emit visualDeckStorageShowTagFilterChanged(visualDeckStorageShowTagFilter);
+}
+
+void SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T _showTags)
+{
+    visualDeckStorageShowTagsOnDeckPreviews = _showTags;
+    settings->setValue("interface/visualdeckstorageshowtagsondeckpreviews", visualDeckStorageShowTagsOnDeckPreviews);
+    emit visualDeckStorageShowTagsOnDeckPreviewsChanged(visualDeckStorageShowTagsOnDeckPreviews);
+}
+
 void SettingsCache::setVisualDeckStorageCardSize(int _visualDeckStorageCardSize)
 {
     visualDeckStorageCardSize = _visualDeckStorageCardSize;
-    settings->setValue("cards/visualdeckstoragecardsize", visualDeckStorageCardSize);
+    settings->setValue("interface/visualdeckstoragecardsize", visualDeckStorageCardSize);
     emit visualDeckStorageCardSizeChanged();
 }
 
@@ -696,13 +688,15 @@ void SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities(
     QT_STATE_CHANGED_T _visualDeckStorageDrawUnusedColorIdentities)
 {
     visualDeckStorageDrawUnusedColorIdentities = _visualDeckStorageDrawUnusedColorIdentities;
-    settings->setValue("cards/visualdeckstoragedrawunusedcoloridentities", visualDeckStorageDrawUnusedColorIdentities);
+    settings->setValue("interface/visualdeckstoragedrawunusedcoloridentities",
+                       visualDeckStorageDrawUnusedColorIdentities);
+    emit visualDeckStorageDrawUnusedColorIdentitiesChanged(visualDeckStorageDrawUnusedColorIdentities);
 }
 
 void SettingsCache::setVisualDeckStorageUnusedColorIdentitiesOpacity(int _visualDeckStorageUnusedColorIdentitiesOpacity)
 {
     visualDeckStorageUnusedColorIdentitiesOpacity = _visualDeckStorageUnusedColorIdentitiesOpacity;
-    settings->setValue("cards/visualdeckstorageunusedcoloridentitiesopacity",
+    settings->setValue("interface/visualdeckstorageunusedcoloridentitiesopacity",
                        visualDeckStorageUnusedColorIdentitiesOpacity);
 }
 

cockatrice/src/settings/cache_settings.h

@@ -58,11 +58,11 @@ signals:
     void bumpSetsWithCardsInDeckToTopChanged();
     void printingSelectorSortOrderChanged();
     void printingSelectorCardSizeChanged();
-    void printingSelectorSortOptionsVisibleChanged();
-    void printingSelectorSearchBarVisibleChanged();
-    void printingSelectorCardSizeSliderVisibleChanged();
     void printingSelectorNavigationButtonsVisibleChanged();
+    void visualDeckStorageShowTagFilterChanged(bool _visible);
+    void visualDeckStorageShowTagsOnDeckPreviewsChanged(bool _visible);
     void visualDeckStorageCardSizeChanged();
+    void visualDeckStorageDrawUnusedColorIdentitiesChanged(bool _visible);
     void visualDeckStorageInGameChanged(bool enabled);
     void horizontalHandChanged();
     void handJustificationChanged();
@@ -126,12 +126,11 @@ private:
     bool bumpSetsWithCardsInDeckToTop;
     int printingSelectorSortOrder;
     int printingSelectorCardSize;
-    bool printingSelectorSortOptionsVisible;
-    bool printingSelectorSearchBarVisible;
-    bool printingSelectorCardSizeSliderVisible;
     bool printingSelectorNavigationButtonsVisible;
     int visualDeckStorageSortingOrder;
     bool visualDeckStorageShowFolders;
+    bool visualDeckStorageShowTagsOnDeckPreviews;
+    bool visualDeckStorageShowTagFilter;
     int visualDeckStorageCardSize;
     bool visualDeckStorageDrawUnusedColorIdentities;
     int visualDeckStorageUnusedColorIdentitiesOpacity;
@@ -397,18 +396,6 @@ public:
     {
         return printingSelectorCardSize;
     }
-    bool getPrintingSelectorSortOptionsVisible() const
-    {
-        return printingSelectorSortOptionsVisible;
-    }
-    bool getPrintingSelectorSearchBarVisible() const
-    {
-        return printingSelectorSearchBarVisible;
-    }
-    bool getPrintingSelectorCardSizeSliderVisible() const
-    {
-        return printingSelectorCardSizeSliderVisible;
-    }
     bool getPrintingSelectorNavigationButtonsVisible() const
     {
         return printingSelectorNavigationButtonsVisible;
@@ -421,6 +408,14 @@ public:
     {
         return visualDeckStorageShowFolders;
     }
+    bool getVisualDeckStorageShowTagFilter() const
+    {
+        return visualDeckStorageShowTagFilter;
+    }
+    bool getVisualDeckStorageShowTagsOnDeckPreviews() const
+    {
+        return visualDeckStorageShowTagsOnDeckPreviews;
+    }
     int getVisualDeckStorageCardSize() const
     {
         return visualDeckStorageCardSize;
@@ -761,12 +756,11 @@ public slots:
     void setBumpSetsWithCardsInDeckToTop(QT_STATE_CHANGED_T _bumpSetsWithCardsInDeckToTop);
     void setPrintingSelectorSortOrder(int _printingSelectorSortOrder);
     void setPrintingSelectorCardSize(int _printingSelectorCardSize);
-    void setPrintingSelectorSortOptionsVisible(QT_STATE_CHANGED_T _sortOptionsVisible);
-    void setPrintingSelectorSearchBarVisible(QT_STATE_CHANGED_T _searchBarVisible);
-    void setPrintingSelectorCardSizeSliderVisible(QT_STATE_CHANGED_T _cardSizeSliderVisible);
     void setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T _navigationButtonsVisible);
     void setVisualDeckStorageSortingOrder(int _visualDeckStorageSortingOrder);
     void setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T value);
+    void setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T _showTags);
+    void setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T _showTags);
     void setVisualDeckStorageCardSize(int _visualDeckStorageCardSize);
     void setVisualDeckStorageDrawUnusedColorIdentities(QT_STATE_CHANGED_T _visualDeckStorageDrawUnusedColorIdentities);
     void setVisualDeckStorageUnusedColorIdentitiesOpacity(int _visualDeckStorageUnusedColorIdentitiesOpacity);

common/server_protocolhandler.cpp

@@ -790,9 +790,6 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room
 {
     if (authState == NotLoggedIn)
         return Response::RespLoginNeeded;
-    const int gameId = databaseInterface->getNextGameId();
-    if (gameId == -1)
-        return Response::RespInternalError;
     if (cmd.password().length() > MAX_NAME_LENGTH)
         return Response::RespContextError;
 
@@ -821,6 +818,11 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room
     QString description = nameFromStdString(cmd.description());
     int startingLifeTotal = cmd.has_starting_life_total() ? cmd.starting_life_total() : 20;
 
+    const int gameId = databaseInterface->getNextGameId();
+    if (gameId == -1) {
+        return Response::RespInternalError;
+    }
+
     // When server doesn't permit registered users to exist, do not honor only-reg setting
     bool onlyRegisteredUsers = cmd.only_registered() && (server->permitUnregisteredUsers());
     Server_Game *game = new Server_Game(

dbconverter/src/mocks.cpp

@@ -196,15 +196,6 @@ void SettingsCache::setPrintingSelectorSortOrder(int /* _printingSelectorSortOrd
 void SettingsCache::setPrintingSelectorCardSize(int /* _printingSelectorCardSize */)
 {
 }
-void SettingsCache::setPrintingSelectorSortOptionsVisible(QT_STATE_CHANGED_T /* _sortOptionsVisible */)
-{
-}
-void SettingsCache::setPrintingSelectorSearchBarVisible(QT_STATE_CHANGED_T /* _searchBarVisible */)
-{
-}
-void SettingsCache::setPrintingSelectorCardSizeSliderVisible(QT_STATE_CHANGED_T /* _cardSizeSliderVisible */)
-{
-}
 void SettingsCache::setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T /* _navigationButtonsVisible */)
 {
 }
@@ -214,6 +205,12 @@ void SettingsCache::setVisualDeckStorageSortingOrder(int /* _visualDeckStorageSo
 void SettingsCache::setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T /* value */)
 {
 }
+void SettingsCache::setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T /* _showTags */)
+{
+}
+void SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T /* _showTags */)
+{
+}
 void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */)
 {
 }

servatrice/src/servatrice_database_interface.cpp

@@ -108,7 +108,7 @@ bool Servatrice_DatabaseInterface::checkSql()
     }
 
     auto query = QSqlQuery(sqlDatabase);
-    if (query.exec("select 1") && query.isActive()) {
+    if (query.exec("select 1") && !query.isActive()) {
         return openDatabase();
     }
 
@@ -709,7 +709,9 @@ bool Servatrice_DatabaseInterface::userSessionExists(const QString &userName)
         "select 1 from {prefix}_sessions where user_name = :user_name and id_server = :id_server and end_time is null");
     query->bindValue(":id_server", server->getServerID());
     query->bindValue(":user_name", userName);
-    execSqlQuery(query);
+    if (!execSqlQuery(query)) {
+        return false;
+    };
     return query->next();
 }
 
@@ -745,15 +747,9 @@ void Servatrice_DatabaseInterface::endSession(qint64 sessionId)
     if (!checkSql())
         return;
 
-    QSqlQuery *query = prepareQuery("lock tables {prefix}_sessions write");
-    execSqlQuery(query);
-
-    query = prepareQuery("update {prefix}_sessions set end_time=NOW() where id = :id_session");
+    auto *query = prepareQuery("update {prefix}_sessions set end_time=NOW() where id = :id_session");
     query->bindValue(":id_session", sessionId);
     execSqlQuery(query);
-
-    query = prepareQuery("unlock tables");
-    execSqlQuery(query);
 }
 
 QMap<QString, ServerInfo_User> Servatrice_DatabaseInterface::getBuddyList(const QString &name)
@@ -811,7 +807,10 @@ int Servatrice_DatabaseInterface::getNextGameId()
         return -1;
 
     QSqlQuery *query = prepareQuery("insert into {prefix}_games (time_started) values (now())");
-    execSqlQuery(query);
+
+    if (!execSqlQuery(query)) {
+        return -1;
+    }
 
     return query->lastInsertId().toInt();
 }
@@ -822,7 +821,10 @@ int Servatrice_DatabaseInterface::getNextReplayId()
         return -1;
 
     QSqlQuery *query = prepareQuery("insert into {prefix}_replays (id_game) values (NULL)");
-    execSqlQuery(query);
+
+    if (!execSqlQuery(query)) {
+        return -1;
+    }
 
     return query->lastInsertId().toInt();
 }

tests/carddatabase/mocks.cpp

@@ -200,15 +200,6 @@ void SettingsCache::setPrintingSelectorSortOrder(int /* _printingSelectorSortOrd
 void SettingsCache::setPrintingSelectorCardSize(int /* _printingSelectorCardSize */)
 {
 }
-void SettingsCache::setPrintingSelectorSortOptionsVisible(QT_STATE_CHANGED_T /* _sortOptionsVisible */)
-{
-}
-void SettingsCache::setPrintingSelectorSearchBarVisible(QT_STATE_CHANGED_T /* _searchBarVisible */)
-{
-}
-void SettingsCache::setPrintingSelectorCardSizeSliderVisible(QT_STATE_CHANGED_T /* _cardSizeSliderVisible */)
-{
-}
 void SettingsCache::setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T /* _navigationButtonsVisible */)
 {
 }
@@ -218,6 +209,12 @@ void SettingsCache::setVisualDeckStorageSortingOrder(int /* _visualDeckStorageSo
 void SettingsCache::setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T /* value */)
 {
 }
+void SettingsCache::setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T /* _showTags */)
+{
+}
+void SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T /* _showTags */)
+{
+}
 void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */)
 {
 }