jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-05 09:33:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[Client] Sync conflict dialog, onboarding and conflict default

Browse source
This commit is contained in:
Lukas Brübach 2026-10-11 16:46:46 +02:00
parent de3468cc33
commit d2e2e722e7
21 changed files with 1020 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/interface/widgets/settings_page/general_settings_page.h
View file

@ -52,6 +52,7 @@ private:
QGroupBox *cardDatabaseGroupBox;
QGroupBox *startupGroupBox;
QGroupBox *pathsGroupBox;
QGroupBox *deckSyncGroupBox;
QLabel languageLabel;
QComboBox languageBox;
@ -104,6 +105,9 @@ private:
QLineEdit *tokenDatabasePathEdit;
QPushButton *resetAllPathsButton;
QLabel *allPathsResetLabel;
QLabel conflictDefaultLabel;
QComboBox conflictDefaultSelector;
};
#endif // COCKATRICE_GENERAL_SETTINGS_PAGE_H