Skip to content
Snippets Groups Projects
Commit 394ea6d6 authored by Cedric Seehausen's avatar Cedric Seehausen
Browse files

Issue 2919, Scenario wont set Global QSettings

parent e2c4030a
No related branches found
No related tags found
1 merge request!17ScenarioManager fixes
......@@ -175,12 +175,7 @@ void ScenarioManagerWidgetController::init()
// editModeAction->setChecked(true);
editModeAction->setToolTip("If toggled the application database and the application property view will be shown.");
//Setting Global QSettings
QCoreApplication::setOrganizationName("armarx");
QCoreApplication::setOrganizationDomain("https://h2t.anthropomatik.kit.edu/751.php");
QCoreApplication::setApplicationName("ScenarioManager");
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
QStringList packages = settings.value("packages").toStringList();
if (packages.size() == 0)
......@@ -232,7 +227,7 @@ void ScenarioManagerWidgetController::onConnectComponent()
void ScenarioManagerWidgetController::reparsePackages()
{
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
QStringList packages = settings.value("packages").toStringList();
PackageBuilder parser;
......@@ -278,7 +273,7 @@ void ScenarioManagerWidgetController::updateModels()
void ScenarioManagerWidgetController::editMode(bool edit)
{
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
settings.setValue("editMode", edit);
widget.detailedApplicationView->setVisible(edit);
widget.applicationDatabase->setVisible(edit);
......
......@@ -29,7 +29,6 @@
#include <ArmarXCore/core/logging/Logging.h>
#include <QSettings>
#include <QMessageBox>
using namespace ScenarioManager;
......
......@@ -300,7 +300,7 @@ void ScenarioListController::removeItem(QModelIndex item)
//scenItem = static_cast<ScenarioItem*>(tItem);
ScenarioPtr scen = scenItem->getScenario();
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
QStringList scenarios = settings.value("scenarios").toStringList();
QString toFind(QString::fromStdString(scen->getName()));
toFind.append("::Package::");
......@@ -376,7 +376,7 @@ void ScenarioListController::createdScenario(string name, string packageStr)
}
}
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
QStringList scenarios = settings.value("scenarios").toStringList();
QString toAdd;
toAdd.append(QString::fromStdString(ptr->getName()));
......
......@@ -82,7 +82,7 @@ SettingsController::~SettingsController()
void SettingsController::init()
{
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
QStringList execSettings = settings.value("execSettings").toStringList();
if (execSettings.size() < 3)
......@@ -101,7 +101,7 @@ void SettingsController::init()
void SettingsController::showSettings()
{
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
QStringList execSettings = settings.value("execSettings").toStringList();
if (execSettings.size() < 3)
......@@ -126,7 +126,7 @@ void SettingsController::showPackageAdderView()
void SettingsController::addPackage(std::string name)
{
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
QStringList packages = settings.value("packages").toStringList();
packages.append(QString::fromStdString(name));
......@@ -150,7 +150,7 @@ void SettingsController::removePackage(int row, int column, QModelIndex parent)
PackagePtr package = settingsItem->getPackage();
//Remove Package from QSettings
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
QStringList settingsPackages = settings.value("packages").toStringList();
settingsPackages.removeAt(settingsPackages.indexOf(QString::fromStdString(package->getName())));
......@@ -206,7 +206,7 @@ void SettingsController::setExecutorStopStrategy(std::string killMethod, int del
}
executor->setStopStrategy(stopStrategy);
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
QStringList execSettings = settings.value("execSettings").toStringList();
execSettings.clear();
......
......@@ -116,7 +116,7 @@ void OpenScenarioController::on_openScenario(int row, int column, QModelIndex pa
package->addScenario(scenario);
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
QStringList settingsPackages = settings.value("scenarios").toStringList();
QString toAppend = QString::fromStdString(scenario->getName());
......
......@@ -47,7 +47,7 @@ std::map<std::string, DependencyTree> PackageBuilder::cachedTrees;
PackagePtr PackageBuilder::parsePackage(string name)
{
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
QStringList openedScenarios = settings.value("scenarios").toStringList();
//remove duplicates
openedScenarios = openedScenarios.toSet().toList();
......@@ -111,7 +111,7 @@ PackagePtr PackageBuilder::parsePackage(string name)
QStringList PackageBuilder::getAllClosedScenarios()
{
QSettings settings;
QSettings settings("KIT", "ScenarioManager");
QStringList packages = settings.value("packages").toStringList();
QStringList openedScenarios = settings.value("scenarios").toStringList();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment