mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2025-09-08 11:31:32 -04:00
Change global folders to shared folders
- For each instance, a custom (shared) screenshots/worlds/resourcepacks folder can be set - Remove ability to set shared folders for all instances (Might add later in different form) Signed-off-by: Naomi <103967@gmail.com>
This commit is contained in:
Naomi
parent
aafd8be7e7
commit
d6aaee6ea6
@ -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<GenericPageProvider>(tr("Settings"));
|
||||
|
||||
@ -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()
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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<Mod*> MinecraftInstance::getJarMods() const
|
||||
|
||||
void MinecraftInstance::applySettings()
|
||||
{
|
||||
// Global directories
|
||||
m_update_global_directories_task = std::make_shared<UpdateGlobalDirectoriesTask>(this, nullptr);
|
||||
m_update_global_directories_task->start();
|
||||
// Shared directories
|
||||
m_update_shared_directories_task = std::make_shared<UpdateSharedDirectoriesTask>(this, nullptr);
|
||||
m_update_shared_directories_task->start();
|
||||
}
|
||||
|
||||
#include "MinecraftInstance.moc"
|
||||
|
||||
@ -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<PackProfile> m_components;
|
||||
std::shared_ptr<UpdateGlobalDirectoriesTask> m_update_global_directories_task;
|
||||
std::shared_ptr<UpdateSharedDirectoriesTask> m_update_shared_directories_task;
|
||||
mutable std::shared_ptr<ModFolderModel> m_loader_mod_list;
|
||||
mutable std::shared_ptr<ModFolderModel> m_core_mod_list;
|
||||
mutable std::shared_ptr<ModFolderModel> m_nil_mod_list;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "UpdateGlobalDirectoriesTask.h"
|
||||
#include "UpdateSharedDirectoriesTask.h"
|
||||
|
||||
#include <QDirIterator>
|
||||
|
||||
@ -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<ConcurrentTask>("UpdateGlobalDirectoriesTask");
|
||||
auto tasks = makeShared<ConcurrentTask>("UpdateSharedDirectoriesTask");
|
||||
|
||||
auto screenshotsTask = makeShared<TryCreateSymlinkTask>(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<TryCreateSymlinkTask>(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<TryCreateSymlinkTask>(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<TryCreateSymlinkTask>(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<TryCreateSymlinkTask>(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<TryCreateSymlinkTask>(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<TryCreateSymlinkTask>(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<TryCreateSymlinkTask>(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);
|
||||
@ -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;
|
||||
@ -70,7 +70,7 @@
|
||||
<item row="0" column="1" colspan="3">
|
||||
<widget class="QLabel" name="isSymlinkWarning">
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" color:#f5c211;">Warning: This is the global folder</span></p></body></html></string>
|
||||
<string><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></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -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()
|
||||
|
||||
@ -25,12 +25,12 @@
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="globalScreenshotsFolderWarninglabel">
|
||||
<widget class="QLabel" name="sharedScreenshotsFolderWarninglabel">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><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></string>
|
||||
<string><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></string>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
|
||||
@ -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()
|
||||
|
||||
@ -25,9 +25,9 @@
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="globalSavesFolderWarninglabel">
|
||||
<widget class="QLabel" name="sharedSavesFolderWarninglabel">
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" color:#f5c211;">Warning: This is the global saves folder</span></p></body></html></string>
|
||||
<string><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></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -801,7 +801,7 @@ It is most likely you will need to change the path - please refer to the mod's w
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="globalFoldersTab">
|
||||
<widget class="QWidget" name="sharedFoldersTab">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
@ -809,11 +809,11 @@ It is most likely you will need to change the path - please refer to the mod's w
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<attribute name="title">
|
||||
<string>Global Folders</string>
|
||||
<string>Shared Folders</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="globalFoldersVerticalLayout">
|
||||
<layout class="QVBoxLayout" name="sharedFoldersVerticalLayout">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="globalFoldersGroupBox">
|
||||
<widget class="QGroupBox" name="sharedFoldersGroupBox">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
@ -826,28 +826,28 @@ It is most likely you will need to change the path - please refer to the mod's w
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="globalFoldersSettingsVerticalLayout">
|
||||
<layout class="QVBoxLayout" name="sharedFoldersSettingsVerticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="globalFoldersWarning">
|
||||
<widget class="QLabel" name="sharedFoldersWarning">
|
||||
<property name="text">
|
||||
<string><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></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="GlobalFolderWidget" name="globalScreenshotsFolder" native="true"/>
|
||||
<widget class="SharedFolderWidget" name="sharedScreenshotsFolder" native="true"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="GlobalFolderWidget" name="globalSavesFolder" native="true"/>
|
||||
<widget class="SharedFolderWidget" name="sharedSavesFolder" native="true"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="GlobalFolderWidget" name="globalResourcePacksFolder" native="true"/>
|
||||
<widget class="SharedFolderWidget" name="sharedResourcePacksFolder" native="true"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="globalFoldersLabel">
|
||||
<widget class="QLabel" name="sharedFoldersLabel">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
@ -855,7 +855,7 @@ It is most likely you will need to change the path - please refer to the mod's w
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><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></string>
|
||||
<string><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></string>
|
||||
</property>
|
||||
<property name="scaledContents">
|
||||
<bool>false</bool>
|
||||
@ -888,9 +888,9 @@ It is most likely you will need to change the path - please refer to the mod's w
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>GlobalFolderWidget</class>
|
||||
<class>SharedFolderWidget</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>ui/widgets/GlobalFolderWidget.h</header>
|
||||
<header>ui/widgets/SharedFolderWidget.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
#include "GlobalFolderWidget.h"
|
||||
#include "ui_GlobalFolderWidget.h"
|
||||
#include "SharedFolderWidget.h"
|
||||
#include "ui_SharedFolderWidget.h"
|
||||
|
||||
#include <QFileDialog>
|
||||
|
||||
#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;
|
||||
}
|
||||
@ -3,15 +3,15 @@
|
||||
#include <QWidget>
|
||||
|
||||
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;
|
||||
};
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>GlobalFolderWidget</class>
|
||||
<widget class="QWidget" name="GlobalFolderWidget">
|
||||
<class>SharedFolderWidget</class>
|
||||
<widget class="QWidget" name="SharedFolderWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
Loading…
x
Reference in New Issue
Block a user