4802 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
RickyRister	37bb1367db	refactor method for positioning cards in ZoneViewZone (#5203) ... * refactor out method for positioning cards in zone view * rename some variables * use max/min * some small formatting stuff	2024-11-28 14:59:31 -05:00
RickyRister	24b5dab456	leave some documentation on Zone classes (#5199) ... * leave some documentation on Zone classes * small refactor * undo functional change from refactor and clean up comments * move variables into if block	2024-11-28 14:40:49 -05:00
Zach H	c6bfc8b8ea	Fix Qt5 Slot/Signals for QCheckBoxes (#5201)	2024-11-27 22:11:55 +00:00
RickyRister	f2b0fa164e	add padding to right side of card reveal window (#5198)	2024-11-27 00:17:37 -05:00
RickyRister	0ca8bdb3a8	refactor CardList (#5197)	2024-11-27 00:15:35 -05:00
RickyRister	a8471f62bc	clean up DownloadSettings (#5194) ... * refactor DownloadSettings * only reset to default on first run * use c++ foreach * use addItems * move default urls to static const	2024-11-26 02:12:56 +00:00
tooomm	5f1c03682f	macOS version fix + wording (#5189)	2024-11-26 00:05:09 +01:00
RickyRister	3255ed3ffb	add menu option to reload card db (#5196)	2024-11-25 07:43:08 +00:00
RickyRister	c51b54c0c5	rename variables for url list layout (#5195)	2024-11-25 06:27:21 +00:00
RickyRister	a3f0807d47	fix error message (#5192) ... `QObject::connect: No such slot UserInterfaceSettingsPage::setNotificationEnabled(Qt::CheckState) in /Users/Ricky/GitHub/Cockatrice/cockatrice/src/dialogs/dlg_settings.cpp:448`	2024-11-24 14:52:56 +00:00
RickyRister	27055944df	skip tap animation when rewinding (#5168)	2024-11-23 10:40:37 -05:00
Zach H	7b1653034b	Bump macos14 XCode to 15.4 (#5188)	2024-11-22 22:52:42 -05:00
dependabot[bot]	39d8ca050f	Bump cross-spawn from 7.0.3 to 7.0.6 in /webclient (#5181) ... Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-11-22 22:22:36 -05:00
Zach H	50274cb66d	Change 'custom(VER)' to 'custom-VER' because Fedora mad (#5180)	2024-11-22 22:22:22 -05:00
RickyRister	bd60a9fd2e	don't blink highlighted phase when backwards skipping in replays (#5185)	2024-11-22 22:21:54 -05:00
BruebachL	83409c32c4	Cache redirects properly by implementing our own QSettings cache for urls. (#5186) ... * Cache redirects properly by implementing our own QSettings cache for urls. * Load and store redirects properly. * Set the maximum network cache size from settings value on PictureLoaderWorker instantiation. * Address comments. * Lint. * Adjust debug statements to be in line with existing ones. * Minor Tweaks * Make redirect cache ttl a user-adjustable setting. * Fix Build * Minor Cleanup * Minor Cleanup * Build Fix --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de> Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>	2024-11-22 22:21:26 -05:00
RickyRister	1bc92623dc	add "open in new tab" button to decklist confirmation dialogue (#5183) ... * refactor to use confirmOpen * implement extra button in confirmation * use brackets in one-liner if statements * refactor save confirmation window into function	2024-11-21 23:24:50 +01:00
BruebachL	f73196841a	Multiple Printings per Deck (#5171) ... * Refactor CardInfo Widgets to reside in their appropriate folder and to have a clearer naming structure. * Added Zach's work on storing printing information in the DeckList (#1) * Change CardInfo's PixmapCacheKey to be the UUID of the preferred set after database loading has finished. Otherwise, and if no UUID of a preferred set is available, default to the card name. * Refactor CardDatabase *db global variable to singleton CardDatabaseManager. This commit refactors the global variable CardDatabase *db into a singleton encapsulated by the DatabaseManager class, accessible via DatabaseManager::getInstance(). This change centralizes access to the database instance, improving code modularity and encapsulation, resolving dependencies on main.h for code that requires access to the database instance. - Added DatabaseManager class with getInstance() method returning a pointer to the singleton CardDatabase. - Removed global db variable and updated references across the codebase. - Thread-safe static initialization for the singleton. Impact: This refactor should have no functional impact on the application, as it maintains the same interface for accessing the CardDatabase instance. However, the codebase now benefits from improved encapsulation, lifetime management, and thread-safety. * fixed db issue an renamed sets to set in picture loader * canibalized zach work and added it to the decklist builder --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de> * Reintroduce some changes lost in the merge. * Introduce UUID attribute to abstract_card_item, card_item, deck_view_card, server_card and serverinfo_card. * Have various game events respect the new UUID attribute on instantiation. * Correct some calls to default to preferred printing. * DeckList now tries to assign reasonable defaults for UUID and collectorNumber if none are found in loaded DeckLists. Rename overloaded DeckListModel findChild() function to findCardChildByNameAndUUID() for clarity. * canibalized zach work and added it to the decklist builder * Change getPreferredPrintingForCard to getPreferredSetForCard to reflect refactor. * Properly update and set the DeckEditor's CardFrame to fetch by name and UUID if a card was selected from the decklist. * Mainboard/Sideboard swaps should respect the UUID from the old zone instead of just blindly adding preferredPrinting. * If the card info is null, there's no point in trying to look for the sets. * Don't define methods twice. * Convenience method to fetch a specific CardInfoPerSet instance for a cardName and a UUID. * Check if the uuid starts with card_ when comparing. * Address pull request comments (nullptr checks and additional comments, mostly.) * Reformat code so the linter will stop yelling at me. * DeckList no longer pre-populates uuids. * Update Event_MoveCard to include the card UUID. * Update Player::MoveCard to include the card UUID. * Set the uuid when we set the cardName, in terms of hidden zones. * [TEST/RevertMe] Set the uuid everywhere to test. * Don't inline setUUID and mimic setName for AbstractCardItem. * Revert blindly setting uuid for testing. * Address PR comments (AbstractCardItem). * Combine if-statement. * Re-order uuid to visually align with its field number. * Remove unnecessary new uuid field from event_move_card. * Remove unused imports. * Include cardName in the PixmapCacheKey in order to not break double-faced cards. * Refactor setCode to cardUUID and introduce new cardSetShortName field. * Override * Refactor UUID to be providerId and change QString comparisons with empty string to isEmpty(). * Update translations. * Change parent to be the first argument. * Pull Parent argument up for CardItem. * Pull Parent argument up for CardItem. * Linter. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de> Co-authored-by: LunaticCat <39006478+LunyaticCat@users.noreply.github.com> Co-authored-by: luna <yannbrun1507@outlook.fr> Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>	2024-11-18 21:56:44 -05:00
RickyRister	86a4b130ff	don't open deck in new tab if current tab is blank (#5169)	2024-11-18 11:59:34 +01:00
tooomm	f4e2f117c3	Readme: Remove last Gitter hint (#5178)	2024-11-18 00:27:33 +01:00
BruebachL	8ef92d26c5	Add Utility Layouts and corresponding Widgets (#5177) ... * Add FlowWidget class with flexible layout and scroll handling - Implemented FlowWidget class to organize widgets in a flow layout with scrollable options. - Integrated QScrollArea to handle overflow with configurable horizontal and vertical scroll policies. - Incorporated dynamic layout selection (FlowLayout, HorizontalFlowLayout, VerticalFlowLayout) based on scroll policy. * Add OverlapWidget and OverlapLayout for managing overlapping child widgets - Implemented the OverlapWidget class to manage child widgets in an overlapping manner, supporting configurable overlap percentage, maximum columns, maximum rows, and layout direction. - Introduced the OverlapLayout class, which arranges widgets with overlapping positions, allowing flexible stacking based on specified parameters. * Add OverlapControlWidget. * Delete FlowLayout items later to allow them to finish their event loop. * Allow OverlapWidgets to adjust their rows/columns on resize. * Clamp vertical FlowLayout to any available parent scrollAreas. * Implement margins and spacing for FlowLayouts. * Adjust/revert some things. * Address pull request comments (nullptr checks and additional comments, mostly.) * Reformat code so the linter will stop yelling at me. * Remove undefined methods from FlowLayouts. * Fix the build. * Revert FlowLayout::takeAt to index check. * Commits will continue until linter morale improves. * Fix various warnings in FlowLayout. * Fix various warnings in FlowLayout.h. * Fix various warnings in the FlowLayout classes. * Fix [[nodiscard]] warning. * Fix more warnings. * Final round of yellow squiggle fixing. * Linter formatting. * Refactor column/row calculation to be more readable. * Code style. * Address PR comments. * Combine if-statements. * Replace std::math functions with Qt equivalents. * Fix non-consts and QtMath. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2024-11-17 13:32:31 -05:00
BruebachL	c8336df49d	Refactor Card Info Widgets (#5176) ... * Refactor CardInfo Widgets to reside in their appropriate folder and to have a clearer naming structure. * Add optional HoverToZoom functionality to CardInfoPictureWidget (default: disabled) and utility class to display text over a CardInfoPictureWidget. * Patch CardInfoWidgets to use the new CardDatabaseManager. * Add HoverToZoom to CardInfoPictureWithTextOverlayWidget * Refactors and new signals for CardInfoPictureWidgets. * Address pull request comments (nullptr checks and additional comments, mostly.) * Reformat code so the linter will stop yelling at me. * Linting. * Fix the build. * Fix warnings. * Formatting, const qualifiers. * Sensibly call the base class's (QWidget) paint event. * Address PR comments (card picture). * QT Version check because enterEvent signature changed. * Linting. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2024-11-17 10:49:22 -05:00
RickyRister	c2fe3cda35	Add option to open deck in new tab by default (#5143) ... * add comments * add new setting for openDeckInNewTab * implement open deck in new tab * rename setting * fix typo * set default to false	2024-11-10 18:16:50 -05:00
BruebachL	c54f47efbf	Change CardInfo's PixmapCacheKey to be the UUID of the card in the preferred set after database loading has finished. Otherwise, and if no UUID of a preferred set is available, default to the card name. (#5158) ... * Change CardInfo's PixmapCacheKey to be the UUID of the preferred set after database loading has finished. Otherwise, and if no UUID of a preferred set is available, default to the card name. * Clean up some variable names, clarify preferred Set insertion for PictureLoader, use the new CardDatabaseManager. * Code formatting. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2024-11-10 17:49:11 -05:00
lumadd	3c40cc4b7d	[4191] fix: Move unfocusTextBox and aFocusChat shortcuts to Player group (#5079) ... * [4191] fix: Move unfocusTextBox and aFocusChat shortcuts to Player family * [4191] fix: fix formatting * Revert "[4191] fix: fix formatting" This reverts commit 86a4a675f3bc8118d4ba8dd45f408c4e8c348f33. * Revert "[4191] fix: Move unfocusTextBox and aFocusChat shortcuts to Player family" This reverts commit 3ec183628df81c48123a8a248d0416c529ee0c8e. * [4191] fix: Textbox and tab_game shortcut groups cannot conflict with Player group * Revert "[4191] fix: Textbox and tab_game shortcut groups cannot conflict with Player group" This reverts commit 36800393339d997df1a932bb798f95d2d387399a. * [4191] fix: Move unfocusTextBox and aFocusChat shortcuts to Player family * [4191] fix: Migrate shortcuts if new version is detected * [4191] fix: formatting * [4191] fix: Maybe fix build issue on Windows7, Debian11, UbuntuBionic and UbuntuFocal	2024-11-09 19:56:42 +01:00
RickyRister	f0fb77bade	move replay-related constants into ReplayTimelineWidget (#5166) ... * move constants * make the existing static const into a constexpr	2024-11-09 11:18:51 +01:00
RickyRister	e894e78346	Do not open card reveal windows when skipping in replays (#5157) ... * create EventProcessingOption QFlag * pass EventProcessingOption all the way down * implement reveal skipping logic	2024-11-09 02:06:23 +01:00
SlightlyCircuitous	dd04c610ec	Remove Fedora 39 Build and Add Fedora 41 Build (#5151) ... * Remove Fedora 39 docker file EOL * Add Fedora 41 Dockerfile new release * Remove Fedora 39, Add Fedora 41 to release template * Remove Fedora 39, Add Fedora 41 to desktop build --------- Co-authored-by: tooomm <tooomm@users.noreply.github.com>	2024-11-08 11:32:54 +01:00
tooomm	2e674efe50	Pretty print translation source (#5107)	2024-11-05 22:26:54 +01:00
ebbit1q	4d394c31f9	fix the timezones used for the user info box and add comments (#5162)	2024-11-05 14:54:38 -05:00
tooomm	11d58abbc3	CI: Update build matrix & clean naming (#5040) ... --------- Co-authored-by: ebbit1q <ebbit1q@gmail.com> Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>	2024-11-05 14:38:33 -05:00
BruebachL	5f4ad87a47	Refactor CardDatabase *db global variable to singleton CardDatabaseManager. (#5159) ... * Refactor CardDatabase *db global variable to singleton CardDatabaseManager. This commit refactors the global variable CardDatabase *db into a singleton encapsulated by the DatabaseManager class, accessible via DatabaseManager::getInstance(). This change centralizes access to the database instance, improving code modularity and encapsulation, resolving dependencies on main.h for code that requires access to the database instance. - Added DatabaseManager class with getInstance() method returning a pointer to the singleton CardDatabase. - Removed global db variable and updated references across the codebase. - Thread-safe static initialization for the singleton. Impact: This refactor should have no functional impact on the application, as it maintains the same interface for accessing the CardDatabase instance. However, the codebase now benefits from improved encapsulation, lifetime management, and thread-safety. * Refactor CardDatabase *db global variable to singleton CardDatabaseManager. This commit refactors the global variable CardDatabase *db into a singleton encapsulated by the DatabaseManager class, accessible via DatabaseManager::getInstance(). This change centralizes access to the database instance, improving code modularity and encapsulation, resolving dependencies on main.h for code that requires access to the database instance. - Added DatabaseManager class with getInstance() method returning a pointer to the singleton CardDatabase. - Removed global db variable and updated references across the codebase. - Thread-safe static initialization for the singleton. Impact: This refactor should have no functional impact on the application, as it maintains the same interface for accessing the CardDatabase instance. However, the codebase now benefits from improved encapsulation, lifetime management, and thread-safety. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2024-11-05 19:32:59 +01:00
RickyRister	e43a21866c	Buffer rewinds from backward skips in replays (#5141) ... * split event processing to own method * implement rewind throttling * don't throttle backward skips from clicks * use the term 'buffering' instead * remove initial backup logic; just always buffer shortcut backward skips * prevent segfault * turns out you can just reuse the same one-shot timer * try scaling timeout based on event count * rewrite timeout calculation code * fix linker error	2024-11-05 18:45:42 +01:00
RickyRister	6652012f4c	fix bug with phase highlighting in replays (#5161) ... * fix bug with incorrectly highlighted phases * fix new bug with phases continuously darkening * use preincrement instead of postincrement * simplify conditional	2024-11-05 18:23:01 +01:00
BruebachL	0c4e8ca290	CardDatabase gains a new signal void cardDatabaseLoadingFinished(), which (#5156) ... it will emit in loadCardDatabases(), mirroring the else branch where cardDatabaseLoadingFailed() is emitted. Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>	2024-11-03 23:45:19 +01:00
ebbit1q	230a2c5c62	fix crashes in local games because of using uninitialised pointers (#5147)	2024-10-26 21:03:32 +00:00
ebbit1q	590fb7f533	fix row colors swapping when using back button in replays (#5148) ... only happens when there is an uneven amount of rows in the chat	2024-10-26 21:02:51 +00:00
github-actions[bot]	e8b88248f2	Update translation files (#5146)	2024-10-26 19:11:24 +02:00
transifex-integration[bot]	c6ba1b6a4e	Translate cockatrice/cockatrice_en@source.ts in de (#5145) ... 100% translated source file: 'cockatrice/cockatrice_en@source.ts' on 'de'. Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>	2024-10-26 14:11:18 +02:00
RickyRister	c4c52bd8c0	Add keyboard shortcuts for skipping forward/backward in replays (#5140) ... * split skipToTime into own function * implement shortcut * fix shortcut warning bug * check boundary conditions in skipToTime * change default fast forward shortcut to . * implement big skip shortcuts * remove unnecessary arg in lambda * change default fast forward shortcut to Ctrl+F * rename constants * change default fast forward shortcut to Ctrl+P * use static const	2024-10-23 14:00:23 +02:00
tooomm	c633a792f5	bump version (#5099)	2024-10-21 18:57:47 -04:00
Zach H	8d5421d9da	Add backwards support Qt6.7's checkStateChanged on QCheckBoxes (#5137)	2024-10-20 23:35:34 -04:00
github-actions[bot]	b041f4ace2	Update translation source strings (#5117) ... Co-authored-by: github-actions <github-actions@github.com>	2024-10-20 16:18:32 -04:00
RickyRister	d26f96db9e	Add keyboard shortcuts for replays (#5136) ... * add keyboard shortcut for play/pause * add keyboard shortcut for fast-forward * make shortcuts rebindable * run formatter	2024-10-20 16:41:59 +02:00
LunaticCat	fa999880ee	Major Directory Refactoring (#5118) ... * refactored cardzone.cpp, added doc and changed if to switch case * started moving every files into different folders * remove undercase to match with other files naming convention * refactored dialog files * ran format.sh * refactored client/tabs folder * refactored client/tabs folder * refactored client/tabs folder * refactored client folder * refactored carddbparser * refactored dialogs * Create sonar-project.properties temporary file for lint * Create build.yml temporary file for lint * removed all files from root directory * removed all files from root directory * added current branch to workflow * fixed most broken import * fixed issues while renaming files * fixed oracle importer * fixed dbconverter * updated translations * made sub-folders for client * removed linter * removed linter folder * fixed oracle import * revert card_zone documentation * renamed db parser files name and deck_view imports * fixed dlg file issue * ran format file and fixed test file * fixed carddb test files * moved player folder in game * updated translations and format files * fixed peglib import * format cmake files * removing vcpkg to try to add it back later * tried fixing vcpkg file * renamed filter to filters and moved database parser to cards folder * reverted translation files * reverted oracle translated * Update cockatrice/src/dialogs/dlg_register.cpp Co-authored-by: tooomm <tooomm@users.noreply.github.com> * Update cockatrice/src/client/ui/window_main.cpp Co-authored-by: tooomm <tooomm@users.noreply.github.com> * removed empty line at file start * removed useless include from tab_supervisor.cpp * refactored cardzone.cpp, added doc and changed if to switch case * started moving every files into different folders * remove undercase to match with other files naming convention * refactored dialog files * ran format.sh * refactored client/tabs folder * refactored client folder * refactored carddbparser * refactored dialogs * removed all files from root directory * Create sonar-project.properties temporary file for lint * Create build.yml temporary file for lint * added current branch to workflow * fixed most broken import * fixed issues while renaming files * fixed oracle importer * fixed dbconverter * updated translations * made sub-folders for client * removed linter * removed linter folder * fixed oracle import * revert card_zone documentation * renamed db parser files name and deck_view imports * fixed dlg file issue * ran format file and fixed test file * fixed carddb test files * moved player folder in game * updated translations and format files * fixed peglib import * reverted translation files * format cmake files * removing vcpkg to try to add it back later * tried fixing vcpkg file * pre-updating of cockatrice changes * removed empty line at file start * reverted oracle translated * Update cockatrice/src/dialogs/dlg_register.cpp Co-authored-by: tooomm <tooomm@users.noreply.github.com> * Update cockatrice/src/client/ui/window_main.cpp Co-authored-by: tooomm <tooomm@users.noreply.github.com> * removed useless include from tab_supervisor.cpp --------- Co-authored-by: tooomm <tooomm@users.noreply.github.com>	2024-10-20 10:11:35 -04:00
RickyRister	d1e0f9dfc5	fix bug (#5133)	2024-10-19 20:18:35 -04:00
RickyRister	2d86938375	Consolidate play/pause buttons in replays (#5131) ... * Consolidate play/pause buttons in replays * always enable fast forward button * run formatter	2024-10-19 20:18:01 -04:00
ebbit1q	4865269a73	don't delete "" (#5135)	2024-10-19 13:06:18 +02:00
dependabot[bot]	038ce3dcec	Bump send and express in /webclient (#5123) ... Bumps [send](https://github.com/pillarjs/send) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `send` from 0.18.0 to 0.19.0 - [Release notes](https://github.com/pillarjs/send/releases) - [Changelog](https://github.com/pillarjs/send/blob/master/HISTORY.md) - [Commits](https://github.com/pillarjs/send/compare/0.18.0...0.19.0) Updates `express` from 4.18.2 to 4.21.0 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.2...4.21.0) --- updated-dependencies: - dependency-name: send dependency-type: indirect - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-10-11 04:28:41 +00:00
RickyRister	43b997fe40	follow symlinks when iterating through the custom image folder (#5126)	2024-10-11 04:27:24 +00:00