diff --git a/launcher/Application.cpp b/launcher/Application.cpp index bab46e354..99b72870b 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -894,14 +894,6 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv) // Custom Technic Client ID m_settings->registerSetting("TechnicClientID", ""); - // Global folders - m_settings->registerSetting("UseGlobalScreenshotsFolder", false); - m_settings->registerSetting("GlobalScreenshotsPath", FS::PathCombine(APPLICATION->dataRoot(), "screenshots")); - m_settings->registerSetting("UseGlobalSavesFolder", false); - m_settings->registerSetting("GlobalSavesPath", FS::PathCombine(APPLICATION->dataRoot(), "saves")); - m_settings->registerSetting("UseGlobalResourcePacksFolder", false); - m_settings->registerSetting("GlobalResourcePacksPath", FS::PathCombine(APPLICATION->dataRoot(), "resourcepacks")); - // Init page provider { m_globalSettingsProvider = std::make_shared(tr("Settings")); diff --git a/launcher/BaseInstance.cpp b/launcher/BaseInstance.cpp index bc0877cd1..b5d7b2a03 100644 --- a/launcher/BaseInstance.cpp +++ b/launcher/BaseInstance.cpp @@ -126,16 +126,13 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s m_settings->registerSetting("Profiler", ""); - // Global folders - auto globalScreenshotsSetting = m_settings->registerSetting("OverrideGlobalScreenshots", false); - m_settings->registerOverride(globalSettings->getSetting("UseGlobalScreenshotsFolder"), globalScreenshotsSetting); - m_settings->registerOverride(globalSettings->getSetting("GlobalScreenshotsPath"), globalScreenshotsSetting); - auto globalSavesSetting = m_settings->registerSetting("OverrideGlobalSaves", false); - m_settings->registerOverride(globalSettings->getSetting("UseGlobalSavesFolder"), globalSavesSetting); - m_settings->registerOverride(globalSettings->getSetting("GlobalSavesPath"), globalSavesSetting); - auto globalResourcePacksSetting = m_settings->registerSetting("OverrideGlobalResourcePacks", false); - m_settings->registerOverride(globalSettings->getSetting("UseGlobalResourcePacksFolder"), globalResourcePacksSetting); - m_settings->registerOverride(globalSettings->getSetting("GlobalResourcePacksPath"), globalResourcePacksSetting); + // Shared folders + m_settings->registerSetting("UseSharedScreenshotsFolder", false); + m_settings->registerSetting("SharedScreenshotsPath", FS::PathCombine(APPLICATION->dataRoot(), "screenshots")); + m_settings->registerSetting("UseSharedSavesFolder", false); + m_settings->registerSetting("SharedSavesPath", FS::PathCombine(APPLICATION->dataRoot(), "saves")); + m_settings->registerSetting("UseSharedResourcePacksFolder", false); + m_settings->registerSetting("SharedResourcePacksPath", FS::PathCombine(APPLICATION->dataRoot(), "resourcepacks")); } QString BaseInstance::getPreLaunchCommand() diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 555c7fd6f..773913210 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -315,8 +315,8 @@ set(MINECRAFT_SOURCES minecraft/Library.cpp minecraft/Library.h minecraft/MojangDownloadInfo.h - minecraft/UpdateGlobalDirectoriesTask.cpp - minecraft/UpdateGlobalDirectoriesTask.h + minecraft/UpdateSharedDirectoriesTask.cpp + minecraft/UpdateSharedDirectoriesTask.h minecraft/VanillaInstanceCreationTask.cpp minecraft/VanillaInstanceCreationTask.h minecraft/VersionFile.cpp @@ -1126,8 +1126,8 @@ SET(LAUNCHER_SOURCES ui/widgets/CustomCommands.h ui/widgets/EnvironmentVariables.cpp ui/widgets/EnvironmentVariables.h - ui/widgets/GlobalFolderWidget.cpp - ui/widgets/GlobalFolderWidget.h + ui/widgets/SharedFolderWidget.cpp + ui/widgets/SharedFolderWidget.h ui/widgets/IconLabel.cpp ui/widgets/IconLabel.h ui/widgets/JavaWizardWidget.cpp @@ -1235,7 +1235,7 @@ qt_wrap_ui(LAUNCHER_UI ui/pages/modplatform/technic/TechnicPage.ui ui/widgets/CustomCommands.ui ui/widgets/EnvironmentVariables.ui - ui/widgets/GlobalFolderWidget.ui + ui/widgets/SharedFolderWidget.ui ui/widgets/InfoFrame.ui ui/widgets/ModFilterWidget.ui ui/widgets/SubTaskProgressBar.ui diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 6cd46598c..9c9f66241 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -85,7 +85,7 @@ #include "AssetsUtils.h" #include "MinecraftLoadAndCheck.h" #include "PackProfile.h" -#include "minecraft/UpdateGlobalDirectoriesTask.h" +#include "minecraft/UpdateSharedDirectoriesTask.h" #include "minecraft/gameoptions/GameOptions.h" #include "minecraft/update/FoldersTask.h" @@ -1316,9 +1316,9 @@ QList MinecraftInstance::getJarMods() const void MinecraftInstance::applySettings() { - // Global directories - m_update_global_directories_task = std::make_shared(this, nullptr); - m_update_global_directories_task->start(); + // Shared directories + m_update_shared_directories_task = std::make_shared(this, nullptr); + m_update_shared_directories_task->start(); } #include "MinecraftInstance.moc" diff --git a/launcher/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h index 4934c6a0e..c92eba1be 100644 --- a/launcher/minecraft/MinecraftInstance.h +++ b/launcher/minecraft/MinecraftInstance.h @@ -52,7 +52,7 @@ class WorldList; class GameOptions; class LaunchStep; class PackProfile; -class UpdateGlobalDirectoriesTask; +class UpdateSharedDirectoriesTask; class MinecraftInstance : public BaseInstance { Q_OBJECT @@ -167,7 +167,7 @@ class MinecraftInstance : public BaseInstance { protected: // data std::shared_ptr m_components; - std::shared_ptr m_update_global_directories_task; + std::shared_ptr m_update_shared_directories_task; mutable std::shared_ptr m_loader_mod_list; mutable std::shared_ptr m_core_mod_list; mutable std::shared_ptr m_nil_mod_list; diff --git a/launcher/minecraft/UpdateGlobalDirectoriesTask.cpp b/launcher/minecraft/UpdateSharedDirectoriesTask.cpp similarity index 80% rename from launcher/minecraft/UpdateGlobalDirectoriesTask.cpp rename to launcher/minecraft/UpdateSharedDirectoriesTask.cpp index 4b3717104..0b8e469a1 100644 --- a/launcher/minecraft/UpdateGlobalDirectoriesTask.cpp +++ b/launcher/minecraft/UpdateSharedDirectoriesTask.cpp @@ -1,4 +1,4 @@ -#include "UpdateGlobalDirectoriesTask.h" +#include "UpdateSharedDirectoriesTask.h" #include @@ -84,7 +84,7 @@ class TryCreateSymlinkTask : public Task { // Make sure that symbolic links are supported. if (!FS::canLink(m_source, m_destination)) { - fail(tr("Failed to create global folder.\nSymbolic links are not supported on the filesystem")); + fail(tr("Failed to create shared folder.\nSymbolic links are not supported on the filesystem")); return; } @@ -101,7 +101,7 @@ class TryCreateSymlinkTask : public Task { } else if (FS::checkFolderPathExists(m_destination)) { if (!FS::checkFolderPathEmpty(m_destination)) { if (!interactiveMove(m_destination, m_source, true, m_parent)) { - fail(tr("Failed to create global folder.\nEnsure that \"%1\" is empty.").arg(m_destination)); + fail(tr("Failed to create shared folder.\nEnsure that \"%1\" is empty.").arg(m_destination)); return; } } @@ -111,7 +111,7 @@ class TryCreateSymlinkTask : public Task { // Make sure the source folder exists if (!FS::ensureFolderPathExists(m_source)) { - fail(tr("Failed to create global folder.\nEnsure that \"%1\" exists.").arg(m_source)); + fail(tr("Failed to create shared folder.\nEnsure that \"%1\" exists.").arg(m_source)); return; } @@ -121,7 +121,7 @@ class TryCreateSymlinkTask : public Task { if (folderLink()) { emitSucceeded(); } else { - fail(tr("Failed to create global folder. Error %1: %2") + fail(tr("Failed to create shared folder. Error %1: %2") .arg(folderLink.getOSError().value()) .arg(folderLink.getOSError().message().c_str())); } @@ -143,44 +143,44 @@ class TryCreateSymlinkTask : public Task { QWidget* m_parent; }; -UpdateGlobalDirectoriesTask::UpdateGlobalDirectoriesTask(MinecraftInstance* inst, QWidget* parent) +UpdateSharedDirectoriesTask::UpdateSharedDirectoriesTask(MinecraftInstance* inst, QWidget* parent) : Task(parent), m_inst(inst), m_parent(parent) {} -UpdateGlobalDirectoriesTask::~UpdateGlobalDirectoriesTask() {} +UpdateSharedDirectoriesTask::~UpdateSharedDirectoriesTask() {} -void UpdateGlobalDirectoriesTask::executeTask() +void UpdateSharedDirectoriesTask::executeTask() { - auto tasks = makeShared("UpdateGlobalDirectoriesTask"); + auto tasks = makeShared("UpdateSharedDirectoriesTask"); - auto screenshotsTask = makeShared(m_inst->settings()->get("GlobalScreenshotsPath").toString(), - m_inst->screenshotsDir(), m_inst, "UseGlobalScreenshotsFolder", m_parent); - connect(screenshotsTask.get(), &Task::failed, this, &UpdateGlobalDirectoriesTask::notifyFailed); + auto screenshotsTask = makeShared(m_inst->settings()->get("SharedScreenshotsPath").toString(), + m_inst->screenshotsDir(), m_inst, "UseSharedScreenshotsFolder", m_parent); + connect(screenshotsTask.get(), &Task::failed, this, &UpdateSharedDirectoriesTask::notifyFailed); tasks->addTask(screenshotsTask); - auto savesTask = makeShared(m_inst->settings()->get("GlobalSavesPath").toString(), m_inst->worldDir(), m_inst, - "UseGlobalSavesFolder", m_parent); - connect(savesTask.get(), &Task::failed, this, &UpdateGlobalDirectoriesTask::notifyFailed); + auto savesTask = makeShared(m_inst->settings()->get("SharedSavesPath").toString(), m_inst->worldDir(), m_inst, + "UseSharedSavesFolder", m_parent); + connect(savesTask.get(), &Task::failed, this, &UpdateSharedDirectoriesTask::notifyFailed); tasks->addTask(savesTask); - auto resoucePacksTask = makeShared(m_inst->settings()->get("GlobalResourcePacksPath").toString(), - m_inst->resourcePacksDir(), m_inst, "UseGlobalResourcePacksFolder", m_parent); - connect(resoucePacksTask.get(), &Task::failed, this, &UpdateGlobalDirectoriesTask::notifyFailed); + auto resoucePacksTask = makeShared(m_inst->settings()->get("SharedResourcePacksPath").toString(), + m_inst->resourcePacksDir(), m_inst, "UseSharedResourcePacksFolder", m_parent); + connect(resoucePacksTask.get(), &Task::failed, this, &UpdateSharedDirectoriesTask::notifyFailed); tasks->addTask(resoucePacksTask); - auto texturePacksTask = makeShared(m_inst->settings()->get("GlobalResourcePacksPath").toString(), - m_inst->texturePacksDir(), m_inst, "UseGlobalResourcePacksFolder", m_parent); - connect(texturePacksTask.get(), &Task::failed, this, &UpdateGlobalDirectoriesTask::notifyFailed); + auto texturePacksTask = makeShared(m_inst->settings()->get("SharedResourcePacksPath").toString(), + m_inst->texturePacksDir(), m_inst, "UseSharedResourcePacksFolder", m_parent); + connect(texturePacksTask.get(), &Task::failed, this, &UpdateSharedDirectoriesTask::notifyFailed); tasks->addTask(texturePacksTask); m_tasks = tasks; - connect(m_tasks.get(), &Task::succeeded, this, &UpdateGlobalDirectoriesTask::emitSucceeded); + connect(m_tasks.get(), &Task::succeeded, this, &UpdateSharedDirectoriesTask::emitSucceeded); m_tasks->start(); } -void UpdateGlobalDirectoriesTask::notifyFailed(QString reason) +void UpdateSharedDirectoriesTask::notifyFailed(QString reason) { CustomMessageBox::selectable(m_parent, tr("Failed"), reason, QMessageBox::Warning, QMessageBox::Ok)->exec(); emit failed(reason); diff --git a/launcher/minecraft/UpdateGlobalDirectoriesTask.h b/launcher/minecraft/UpdateSharedDirectoriesTask.h similarity index 66% rename from launcher/minecraft/UpdateGlobalDirectoriesTask.h rename to launcher/minecraft/UpdateSharedDirectoriesTask.h index 4afadc8ec..dadab0d71 100644 --- a/launcher/minecraft/UpdateGlobalDirectoriesTask.h +++ b/launcher/minecraft/UpdateSharedDirectoriesTask.h @@ -4,10 +4,10 @@ class MinecraftInstance; -class UpdateGlobalDirectoriesTask : public Task { +class UpdateSharedDirectoriesTask : public Task { public: - explicit UpdateGlobalDirectoriesTask(MinecraftInstance* inst, QWidget* parent = 0); - virtual ~UpdateGlobalDirectoriesTask(); + explicit UpdateSharedDirectoriesTask(MinecraftInstance* inst, QWidget* parent = 0); + virtual ~UpdateSharedDirectoriesTask(); protected: virtual void executeTask() override; diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.ui b/launcher/ui/pages/instance/ExternalResourcesPage.ui index 5af31b9c4..934f00255 100644 --- a/launcher/ui/pages/instance/ExternalResourcesPage.ui +++ b/launcher/ui/pages/instance/ExternalResourcesPage.ui @@ -70,7 +70,7 @@ - <html><head/><body><p><span style=" color:#f5c211;">Warning: This is the global folder</span></p></body></html> + <html><head/><body><p><span style=" font-weight:700; color:#f5c211;">Warning</span><span style=" color:#f5c211;">: This is a shared folder and potentially shared with multiple instances</span></p></body></html> diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp index c65d17808..904ae1bd3 100644 --- a/launcher/ui/pages/instance/ScreenshotsPage.cpp +++ b/launcher/ui/pages/instance/ScreenshotsPage.cpp @@ -565,7 +565,7 @@ void ScreenshotsPage::openedImpl() ui->toolBar->setVisibilityState(QByteArray::fromBase64(m_wide_bar_setting->get().toString().toUtf8())); // Enable the symbolic link warning when the screenshots folder is a symbolic link - ui->globalScreenshotsFolderWarninglabel->setVisible(FS::isSymLink(m_folder)); + ui->sharedScreenshotsFolderWarninglabel->setVisible(FS::isSymLink(m_folder)); } void ScreenshotsPage::closedImpl() diff --git a/launcher/ui/pages/instance/ScreenshotsPage.ui b/launcher/ui/pages/instance/ScreenshotsPage.ui index 4dd650f9c..beb2c6427 100644 --- a/launcher/ui/pages/instance/ScreenshotsPage.ui +++ b/launcher/ui/pages/instance/ScreenshotsPage.ui @@ -25,12 +25,12 @@ 0 - + false - <html><head/><body><p><span style=" font-weight:600; color:#f5c211;">Warning</span><span style=" color:#f5c211;">: This is the global screenshots folder</span></p></body></html> + <html><head/><body><p><span style=" font-weight:600; color:#f5c211;">Warning</span><span style=" color:#f5c211;">: This is a shared folder and potentially shared with multiple instances</span></p></body></html> 0 diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp index 582493265..52911bd57 100644 --- a/launcher/ui/pages/instance/WorldListPage.cpp +++ b/launcher/ui/pages/instance/WorldListPage.cpp @@ -128,7 +128,7 @@ void WorldListPage::openedImpl() ui->toolBar->setVisibilityState(QByteArray::fromBase64(m_wide_bar_setting->get().toString().toUtf8())); // Enable the symbolic link warning when the saves folder is a symbolic link - ui->globalSavesFolderWarninglabel->setVisible(FS::isSymLink(FS::PathCombine(m_inst->gameRoot(), "saves"))); + ui->sharedSavesFolderWarninglabel->setVisible(FS::isSymLink(FS::PathCombine(m_inst->gameRoot(), "saves"))); } void WorldListPage::closedImpl() diff --git a/launcher/ui/pages/instance/WorldListPage.ui b/launcher/ui/pages/instance/WorldListPage.ui index 53cd0cf30..b89240bcb 100644 --- a/launcher/ui/pages/instance/WorldListPage.ui +++ b/launcher/ui/pages/instance/WorldListPage.ui @@ -25,9 +25,9 @@ 0 - + - <html><head/><body><p><span style=" color:#f5c211;">Warning: This is the global saves folder</span></p></body></html> + <html><head/><body><p><span style=" font-weight:700; color:#f5c211;">Warning</span><span style=" color:#f5c211;">: This is a shared folder and potentially shared with multiple instances</span></p></body></html> diff --git a/launcher/ui/widgets/MinecraftSettingsWidget.cpp b/launcher/ui/widgets/MinecraftSettingsWidget.cpp index 5a5033971..89ce06413 100644 --- a/launcher/ui/widgets/MinecraftSettingsWidget.cpp +++ b/launcher/ui/widgets/MinecraftSettingsWidget.cpp @@ -53,7 +53,8 @@ MinecraftSettingsWidget::MinecraftSettingsWidget(MinecraftInstancePtr instance, m_ui->setupUi(this); if (m_instance == nullptr) { - m_ui->settingsTabs->removeTab(1); + m_ui->settingsTabs->removeTab(m_ui->settingsTabs->indexOf(m_ui->javaPage)); + m_ui->settingsTabs->removeTab(m_ui->settingsTabs->indexOf(m_ui->sharedFoldersTab)); m_ui->openGlobalSettingsButton->setVisible(false); m_ui->instanceAccountGroupBox->hide(); @@ -282,11 +283,11 @@ void MinecraftSettingsWidget::loadSettings() m_ui->quilt->blockSignals(false); m_ui->liteLoader->blockSignals(false); - // Global folders - m_ui->globalScreenshotsFolder->initialize(settings->get("UseGlobalScreenshotsFolder").toBool(), settings->get("GlobalScreenshotsPath").toString()); - m_ui->globalSavesFolder->initialize(settings->get("UseGlobalSavesFolder").toBool(), settings->get("GlobalSavesPath").toString()); - m_ui->globalResourcePacksFolder->initialize(settings->get("UseGlobalResourcePacksFolder").toBool(), - settings->get("GlobalResourcePacksPath").toString()); + // Shared folders + m_ui->sharedScreenshotsFolder->initialize(settings->get("UseSharedScreenshotsFolder").toBool(), settings->get("SharedScreenshotsPath").toString()); + m_ui->sharedSavesFolder->initialize(settings->get("UseSharedSavesFolder").toBool(), settings->get("SharedSavesPath").toString()); + m_ui->sharedResourcePacksFolder->initialize(settings->get("UseSharedResourcePacksFolder").toBool(), + settings->get("SharedResourcePacksPath").toString()); } m_ui->legacySettingsGroupBox->setChecked(settings->get("OverrideLegacySettings").toBool()); @@ -477,13 +478,13 @@ void MinecraftSettingsWidget::saveSettings() } if (m_instance != nullptr) { - // Global folders - settings->set("UseGlobalScreenshotsFolder", m_ui->globalScreenshotsFolder->isEnabled()); - settings->set("GlobalScreenshotsPath", m_ui->globalScreenshotsFolder->getPath()); - settings->set("UseGlobalSavesFolder", m_ui->globalSavesFolder->isEnabled()); - settings->set("GlobalSavesPath", m_ui->globalSavesFolder->getPath()); - settings->set("UseGlobalResourcePacksFolder", m_ui->globalResourcePacksFolder->isEnabled()); - settings->set("GlobalResourcePacksPath", m_ui->globalResourcePacksFolder->getPath()); + // Shared folders + settings->set("UseSharedScreenshotsFolder", m_ui->sharedScreenshotsFolder->isEnabled()); + settings->set("SharedScreenshotsPath", m_ui->sharedScreenshotsFolder->getPath()); + settings->set("UseSharedSavesFolder", m_ui->sharedSavesFolder->isEnabled()); + settings->set("SharedSavesPath", m_ui->sharedSavesFolder->getPath()); + settings->set("UseSharedResourcePacksFolder", m_ui->sharedResourcePacksFolder->isEnabled()); + settings->set("SharedResourcePacksPath", m_ui->sharedResourcePacksFolder->getPath()); } } diff --git a/launcher/ui/widgets/MinecraftSettingsWidget.ui b/launcher/ui/widgets/MinecraftSettingsWidget.ui index 7772851fd..8358595e7 100644 --- a/launcher/ui/widgets/MinecraftSettingsWidget.ui +++ b/launcher/ui/widgets/MinecraftSettingsWidget.ui @@ -801,7 +801,7 @@ It is most likely you will need to change the path - please refer to the mod's w - + 0 @@ -809,11 +809,11 @@ It is most likely you will need to change the path - please refer to the mod's w - Global Folders + Shared Folders - + - + 0 @@ -826,28 +826,28 @@ It is most likely you will need to change the path - please refer to the mod's w Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop - + - + <html><head/><body><p><span style=" font-weight:600; color:#f5c211;">Warning</span><span style=" color:#f5c211;">: After enabling files cannot be automatically restored to their original folder.</span></p></body></html> - + - + - + - + 0 @@ -855,7 +855,7 @@ It is most likely you will need to change the path - please refer to the mod's w - <html><head/><body><p>A global folder is a folder that is shared across instances.</p><p>For example: If two instances share the same global saves folder, they can both play on the same worlds without having to copy the world over.</p></body></html> + <html><head/><body><p>A shared folder is a folder that can be shared across instances.</p><p>For example: If two instances share the same shared saves folder, they can both play on the same worlds without having to copy the world over.</p></body></html> false @@ -888,9 +888,9 @@ It is most likely you will need to change the path - please refer to the mod's w 1 - GlobalFolderWidget + SharedFolderWidget QWidget -
ui/widgets/GlobalFolderWidget.h
+
ui/widgets/SharedFolderWidget.h
1
diff --git a/launcher/ui/widgets/GlobalFolderWidget.cpp b/launcher/ui/widgets/SharedFolderWidget.cpp similarity index 56% rename from launcher/ui/widgets/GlobalFolderWidget.cpp rename to launcher/ui/widgets/SharedFolderWidget.cpp index 5f7222379..3ae8d007b 100644 --- a/launcher/ui/widgets/GlobalFolderWidget.cpp +++ b/launcher/ui/widgets/SharedFolderWidget.cpp @@ -1,21 +1,21 @@ -#include "GlobalFolderWidget.h" -#include "ui_GlobalFolderWidget.h" +#include "SharedFolderWidget.h" +#include "ui_SharedFolderWidget.h" #include #include "FileSystem.h" -GlobalFolderWidget::GlobalFolderWidget(QWidget* parent) : QWidget(parent), ui(new Ui::GlobalFolderWidget) +SharedFolderWidget::SharedFolderWidget(QWidget* parent) : QWidget(parent), ui(new Ui::SharedFolderWidget) { ui->setupUi(this); } -GlobalFolderWidget::~GlobalFolderWidget() +SharedFolderWidget::~SharedFolderWidget() { delete ui; } -void GlobalFolderWidget::initialize(bool enabled, const QString& path, const QString& label) +void SharedFolderWidget::initialize(bool enabled, const QString& path, const QString& label) { ui->enabledCheckBox->setChecked(enabled); ui->enabledCheckBox->setText(label); @@ -26,25 +26,25 @@ void GlobalFolderWidget::initialize(bool enabled, const QString& path, const QSt ui->pathBrowseBtn->setEnabled(enabled); } -bool GlobalFolderWidget::isEnabled() const +bool SharedFolderWidget::isEnabled() const { return ui->enabledCheckBox->isChecked(); } -QString GlobalFolderWidget::getPath() const +QString SharedFolderWidget::getPath() const { return ui->pathTextBox->text(); } -void GlobalFolderWidget::on_enabledCheckBox_toggled(bool checked) +void SharedFolderWidget::on_enabledCheckBox_toggled(bool checked) { ui->pathTextBox->setEnabled(checked); ui->pathBrowseBtn->setEnabled(checked); } -void GlobalFolderWidget::on_pathBrowseBtn_clicked() +void SharedFolderWidget::on_pathBrowseBtn_clicked() { - QString path = QFileDialog::getExistingDirectory(this, tr("Select global folder"), ui->pathTextBox->text()); + QString path = QFileDialog::getExistingDirectory(this, tr("Select shared folder"), ui->pathTextBox->text()); if (path.isEmpty()) { return; } diff --git a/launcher/ui/widgets/GlobalFolderWidget.h b/launcher/ui/widgets/SharedFolderWidget.h similarity index 64% rename from launcher/ui/widgets/GlobalFolderWidget.h rename to launcher/ui/widgets/SharedFolderWidget.h index 80241c522..0d40df152 100644 --- a/launcher/ui/widgets/GlobalFolderWidget.h +++ b/launcher/ui/widgets/SharedFolderWidget.h @@ -3,15 +3,15 @@ #include namespace Ui { -class GlobalFolderWidget; +class SharedFolderWidget; } -class GlobalFolderWidget : public QWidget { +class SharedFolderWidget : public QWidget { Q_OBJECT public: - explicit GlobalFolderWidget(QWidget* parent = 0); - virtual ~GlobalFolderWidget(); + explicit SharedFolderWidget(QWidget* parent = 0); + virtual ~SharedFolderWidget(); void initialize(bool enabled, const QString& path, const QString& label = ""); bool isEnabled() const; @@ -22,5 +22,5 @@ class GlobalFolderWidget : public QWidget { void on_pathBrowseBtn_clicked(); private: - Ui::GlobalFolderWidget* ui; + Ui::SharedFolderWidget* ui; }; diff --git a/launcher/ui/widgets/GlobalFolderWidget.ui b/launcher/ui/widgets/SharedFolderWidget.ui similarity index 91% rename from launcher/ui/widgets/GlobalFolderWidget.ui rename to launcher/ui/widgets/SharedFolderWidget.ui index 35f28a9c0..6f0d857fd 100644 --- a/launcher/ui/widgets/GlobalFolderWidget.ui +++ b/launcher/ui/widgets/SharedFolderWidget.ui @@ -1,7 +1,7 @@ - GlobalFolderWidget - + SharedFolderWidget + 0