jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-29 09:22:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Naming and sizing

Browse source 
Took 4 minutes
This commit is contained in:
Lukas Brübach 2026-08-15 22:09:56 +02:00
parent 30429d074b
commit 5fa5a0eaff
5 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
View file

@ -162,6 +162,9 @@ GeneralSettingsPage::GeneralSettingsPage()
}); });
startupRoomNameEdit = new QLineEdit(settings.tabs().getStartupRoomName()); startupRoomNameEdit = new QLineEdit(settings.tabs().getStartupRoomName());
// Default (Expanding) would stretch the whole controls column when this row becomes visible,
// so size it like the combo boxes instead: fills the column, never widens it.
startupRoomNameEdit->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
connect(startupRoomNameEdit, &QLineEdit::editingFinished, this, connect(startupRoomNameEdit, &QLineEdit::editingFinished, this,
[this] { SettingsCache::instance().tabs().setStartupRoomName(startupRoomNameEdit->text().trimmed()); }); [this] { SettingsCache::instance().tabs().setStartupRoomName(startupRoomNameEdit->text().trimmed()); });
@ -412,8 +415,8 @@ void GeneralSettingsPage::languageBoxChanged(int index)
void GeneralSettingsPage::updateStartupServerControlsVisibility() void GeneralSettingsPage::updateStartupServerControlsVisibility()
{ {
const int index = startupTabSelector.currentIndex(); const int index = startupTabSelector.currentIndex();
const bool serverNeeded = index == StartupTabServer || index == StartupTabServerRoom; const bool serverNeeded = index == StartupTab::StartupTabServer || index == StartupTab::StartupTabServerRoom;
const bool roomNeeded = index == StartupTabServerRoom; const bool roomNeeded = index == StartupTab::StartupTabServerRoom;
startupServerLabel.setVisible(serverNeeded); startupServerLabel.setVisible(serverNeeded);
startupServerSelector.setVisible(serverNeeded); startupServerSelector.setVisible(serverNeeded);
startupRoomLabel.setVisible(roomNeeded); startupRoomLabel.setVisible(roomNeeded);
@ -457,14 +460,14 @@ void GeneralSettingsPage::retranslateUi()
newVersionOracleCheckBox.setText(tr("Automatically run Oracle when running a new version of Cockatrice")); newVersionOracleCheckBox.setText(tr("Automatically run Oracle when running a new version of Cockatrice"));
showTipsOnStartup.setText(tr("Show tips on startup")); showTipsOnStartup.setText(tr("Show tips on startup"));
startupTabLabel.setText(tr("Startup tab:")); startupTabLabel.setText(tr("Startup tab:"));
startupTabSelector.setItemText(StartupTabHome, tr("Home")); startupTabSelector.setItemText(StartupTab::StartupTabHome, tr("Home"));
startupTabSelector.setItemText(StartupTabVisualDeckStorage, tr("Visual Deck Storage")); startupTabSelector.setItemText(StartupTab::StartupTabVisualDeckStorage, tr("Visual Deck Storage"));
startupTabSelector.setItemText(StartupTabDeckStorage, tr("Deck Storage")); startupTabSelector.setItemText(StartupTab::StartupTabDeckStorage, tr("Deck Storage"));
startupTabSelector.setItemText(StartupTabReplays, tr("Game Replays")); startupTabSelector.setItemText(StartupTab::StartupTabReplays, tr("Game Replays"));
startupTabSelector.setItemText(StartupTabDeckEditor, tr("Deck Editor")); startupTabSelector.setItemText(StartupTab::StartupTabDeckEditor, tr("Deck Editor"));
startupTabSelector.setItemText(StartupTabVisualDeckEditor, tr("Visual Deck Editor")); startupTabSelector.setItemText(StartupTab::StartupTabVisualDeckEditor, tr("Visual Deck Editor"));
startupTabSelector.setItemText(StartupTabServer, tr("Server")); startupTabSelector.setItemText(StartupTab::StartupTabServer, tr("Server"));
startupTabSelector.setItemText(StartupTabServerRoom, tr("Server Room")); startupTabSelector.setItemText(StartupTab::StartupTabServerRoom, tr("Server Room"));
startupTabSelector.setToolTip( startupTabSelector.setToolTip(
tr("The tab shown when Cockatrice starts. If the chosen tab is not open yet, it is opened.")); tr("The tab shown when Cockatrice starts. If the chosen tab is not open yet, it is opened."));
startupServerLabel.setText(tr("Server:")); startupServerLabel.setText(tr("Server:"));

16
cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
View file

@ -358,36 +358,36 @@ void TabSupervisor::initStartupTabs()
} }
switch (SettingsCache::instance().tabs().getStartupTabIndex()) { switch (SettingsCache::instance().tabs().getStartupTabIndex()) {
case StartupTabVisualDeckStorage: case StartupTab::StartupTabVisualDeckStorage:
if (!tabVisualDeckStorage) { if (!tabVisualDeckStorage) {
openTabVisualDeckStorage(); openTabVisualDeckStorage();
} }
setCurrentWidget(tabVisualDeckStorage); setCurrentWidget(tabVisualDeckStorage);
break; break;
case StartupTabDeckStorage: case StartupTab::StartupTabDeckStorage:
if (!tabDeckStorage) { if (!tabDeckStorage) {
openTabDeckStorage(); openTabDeckStorage();
} }
setCurrentWidget(tabDeckStorage); setCurrentWidget(tabDeckStorage);
break; break;
case StartupTabReplays: case StartupTab::StartupTabReplays:
if (!tabReplays) { if (!tabReplays) {
openTabReplays(); openTabReplays();
} }
setCurrentWidget(tabReplays); setCurrentWidget(tabReplays);
break; break;
case StartupTabDeckEditor: case StartupTab::StartupTabDeckEditor:
addDeckEditorTab(LoadedDeck()); addDeckEditorTab(LoadedDeck());
break; break;
case StartupTabVisualDeckEditor: case StartupTab::StartupTabVisualDeckEditor:
addVisualDeckEditorTab(LoadedDeck()); addVisualDeckEditorTab(LoadedDeck());
break; break;
case StartupTabServer: case StartupTab::StartupTabServer:
case StartupTabServerRoom: case StartupTab::StartupTabServerRoom:
// Handled asynchronously by MainWindow::applyStartupDestination(); Home stays selected // Handled asynchronously by MainWindow::applyStartupDestination(); Home stays selected
// until the server connection succeeds. // until the server connection succeeds.
break; break;
case StartupTabHome: case StartupTab::StartupTabHome:
default: default:
setCurrentWidget(tabHome); setCurrentWidget(tabHome);
break; break;

6
cockatrice/src/interface/window_main.cpp
View file

@ -669,7 +669,7 @@ void MainWindow::applyStartupDestination()
} }
const int destination = SettingsCache::instance().tabs().getStartupTabIndex(); const int destination = SettingsCache::instance().tabs().getStartupTabIndex();
if (destination != StartupTabServer && destination != StartupTabServerRoom) { if (destination != StartupTab::StartupTabServer && destination != StartupTab::StartupTabServerRoom) {
return; return;
} }
@ -703,7 +703,7 @@ void MainWindow::onStartupDestinationConnected(int destination, const ContextCon
tabSupervisor->openTabServer(); tabSupervisor->openTabServer();
} }
if (destination == StartupTabServerRoom) { if (destination == StartupTab::StartupTabServerRoom) {
auto roomContext = std::make_unique<ContextJoinRoom>(); auto roomContext = std::make_unique<ContextJoinRoom>();
roomContext->serverContext = serverContext; roomContext->serverContext = serverContext;
auto *roomIntent = new IntentOpenServerRoomByName(tabSupervisor, getRemoteClient(), std::move(roomContext), auto *roomIntent = new IntentOpenServerRoomByName(tabSupervisor, getRemoteClient(), std::move(roomContext),
@ -729,7 +729,7 @@ void MainWindow::startupDestinationFailed(const QString &reason)
bool MainWindow::startupDestinationConnectsToServer() const bool MainWindow::startupDestinationConnectsToServer() const
{ {
const int destination = SettingsCache::instance().tabs().getStartupTabIndex(); const int destination = SettingsCache::instance().tabs().getStartupTabIndex();
return destination == StartupTabServer || destination == StartupTabServerRoom; return destination == StartupTab::StartupTabServer || destination == StartupTab::StartupTabServerRoom;
} }
void MainWindow::alertForcedOracleRun(const QString &version, bool isUpdate) void MainWindow::alertForcedOracleRun(const QString &version, bool isUpdate)

2
libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp
View file

@ -7,7 +7,7 @@ TabsSettings::TabsSettings(const QString &settingPath, QObject *parent)
int TabsSettings::getStartupTabIndex() const int TabsSettings::getStartupTabIndex() const
{ {
return getValue("startupTab", QString(), QString(), StartupTabHome).toInt(); return getValue("startupTab", QString(), QString(), StartupTab::StartupTabHome).toInt();
} }
QString TabsSettings::getStartupServerHost() const QString TabsSettings::getStartupServerHost() const

6
tests/settings/settings_defaults_test.cpp
View file

@ -191,14 +191,14 @@ TEST_F(SettingsDefaultsTest, Sound_MasterVolume_SetAndGet)
TEST_F(SettingsDefaultsTest, Tabs_StartupTab_Default) TEST_F(SettingsDefaultsTest, Tabs_StartupTab_Default)
{ {
TabsSettings s(settingsPath, nullptr); TabsSettings s(settingsPath, nullptr);
ASSERT_EQ(s.getStartupTabIndex(), static_cast<int>(StartupTabHome)); ASSERT_EQ(s.getStartupTabIndex(), static_cast<int>(StartupTab::StartupTabHome));
} }
TEST_F(SettingsDefaultsTest, Tabs_StartupTab_SetAndGet) TEST_F(SettingsDefaultsTest, Tabs_StartupTab_SetAndGet)
{ {
TabsSettings s(settingsPath, nullptr); TabsSettings s(settingsPath, nullptr);
s.setStartupTabIndex(StartupTabServerRoom); s.setStartupTabIndex(StartupTab::StartupTabServerRoom);
ASSERT_EQ(s.getStartupTabIndex(), static_cast<int>(StartupTabServerRoom)); ASSERT_EQ(s.getStartupTabIndex(), static_cast<int>(StartupTab::StartupTabServerRoom));
} }
TEST_F(SettingsDefaultsTest, Tabs_StartupServer_Default) TEST_F(SettingsDefaultsTest, Tabs_StartupServer_Default)