Removed Amazon as Company for QSettings (#1649)
* Removed Amazon as Company for QSettings Signed-off-by: Terry Michaels <miterenc@amazon.com>
This commit is contained in:
@@ -129,8 +129,8 @@ int main(int argc, char **argv)
|
||||
{
|
||||
ComponentApplicationWrapper componentApplicationWrapper;
|
||||
|
||||
QApplication::setOrganizationName("Amazon");
|
||||
QApplication::setOrganizationDomain("amazon.com");
|
||||
QApplication::setOrganizationName("O3DE");
|
||||
QApplication::setOrganizationDomain("o3de.org");
|
||||
QApplication::setApplicationName("O3DEWidgetGallery");
|
||||
|
||||
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
|
||||
|
||||
@@ -252,8 +252,8 @@ namespace Editor
|
||||
setWindowIcon(QIcon(":/Application/res/o3de_editor.ico"));
|
||||
|
||||
// set the default key store for our preferences:
|
||||
setOrganizationName("Amazon");
|
||||
setOrganizationDomain("amazon.com");
|
||||
setOrganizationName("O3DE");
|
||||
setOrganizationDomain("o3de.org");
|
||||
setApplicationName("O3DE Editor");
|
||||
|
||||
connect(m_idleTimer, &QTimer::timeout, this, &EditorQtApplication::maybeProcessIdle);
|
||||
|
||||
@@ -1654,7 +1654,7 @@ BOOL CCryEditApp::InitInstance()
|
||||
GetIEditor()->GetCommandManager()->RegisterAutoCommands();
|
||||
GetIEditor()->AddUIEnums();
|
||||
|
||||
mainWindowWrapper->enableSaveRestoreGeometry("amazon", "O3DE", "mainWindowGeometry");
|
||||
mainWindowWrapper->enableSaveRestoreGeometry("O3DE", "O3DE", "mainWindowGeometry");
|
||||
m_pDocManager->OnFileNew();
|
||||
|
||||
if (IsInRegularEditorMode())
|
||||
|
||||
@@ -240,7 +240,7 @@ public:
|
||||
|
||||
virtual bool HotKey_LoadExisting() override
|
||||
{
|
||||
QSettings settings("Amazon", "O3DE");
|
||||
QSettings settings("O3DE", "O3DE");
|
||||
QString group = "Hotkeys/";
|
||||
|
||||
HotKey_BuildDefaults();
|
||||
@@ -276,7 +276,7 @@ public:
|
||||
|
||||
virtual void HotKey_SaveCurrent() override
|
||||
{
|
||||
QSettings settings("Amazon", "O3DE");
|
||||
QSettings settings("O3DE", "O3DE");
|
||||
QString group = "Hotkeys/";
|
||||
settings.remove("Hotkeys/");
|
||||
settings.sync();
|
||||
|
||||
@@ -146,7 +146,7 @@ GraphicsSettingsDialog::GraphicsSettingsDialog(QWidget* parent /* = nullptr */)
|
||||
m_ui->m_platformEntry->addItem(platform);
|
||||
}
|
||||
|
||||
QSettings settings("Amazon", "O3DE");
|
||||
QSettings settings("O3DE", "O3DE");
|
||||
settings.beginGroup("GraphicsSettingsDialog");
|
||||
|
||||
if (settings.contains("Platform"))
|
||||
@@ -174,7 +174,7 @@ GraphicsSettingsDialog::GraphicsSettingsDialog(QWidget* parent /* = nullptr */)
|
||||
|
||||
GraphicsSettingsDialog::~GraphicsSettingsDialog()
|
||||
{
|
||||
QSettings settings("Amazon", "O3DE");
|
||||
QSettings settings("O3DE", "O3DE");
|
||||
settings.beginGroup("GraphicsSettingsDialog");
|
||||
|
||||
auto platformCheck = [this](AZStd::pair<AZStd::string, ESystemConfigPlatform>& stringConfigPair) { return stringConfigPair.second == m_currentPlatform; };
|
||||
@@ -556,7 +556,7 @@ void GraphicsSettingsDialog::LoadPlatformConfigurations()
|
||||
|
||||
setUpdatesEnabled(true);
|
||||
|
||||
QSettings settings("Amazon", "O3DE");
|
||||
QSettings settings("O3DE", "O3DE");
|
||||
settings.beginGroup("GraphicsSettingsDialog");
|
||||
settings.beginGroup("cvarGroup");
|
||||
|
||||
@@ -619,7 +619,7 @@ void GraphicsSettingsDialog::CleanUI()
|
||||
{
|
||||
setUpdatesEnabled(false);
|
||||
|
||||
QSettings settings("Amazon", "O3DE");
|
||||
QSettings settings("O3DE", "O3DE");
|
||||
settings.beginGroup("GraphicsSettingsDialog");
|
||||
settings.beginGroup("cvarGroup");
|
||||
|
||||
|
||||
@@ -104,7 +104,7 @@ void KeyboardCustomizationSettings::LoadDefaults()
|
||||
|
||||
void KeyboardCustomizationSettings::Load()
|
||||
{
|
||||
QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE"));
|
||||
QSettings settings(QStringLiteral("O3DE"), QStringLiteral("O3DE"));
|
||||
settings.beginGroup(QStringLiteral("Keyboard Shortcuts"));
|
||||
settings.beginGroup(m_group);
|
||||
|
||||
@@ -151,7 +151,7 @@ void KeyboardCustomizationSettings::LoadFromSnapshot(const Snapshot& snapshot)
|
||||
|
||||
void KeyboardCustomizationSettings::Save()
|
||||
{
|
||||
QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE"));
|
||||
QSettings settings(QStringLiteral("O3DE"), QStringLiteral("O3DE"));
|
||||
settings.beginGroup(QStringLiteral("Keyboard Shortcuts"));
|
||||
settings.beginGroup(m_group);
|
||||
|
||||
|
||||
@@ -299,7 +299,7 @@ MainWindow::MainWindow(QWidget* parent)
|
||||
, m_undoStateAdapter(new UndoStackStateAdapter(this))
|
||||
, m_keyboardCustomization(nullptr)
|
||||
, m_activeView(nullptr)
|
||||
, m_settings("amazon", "O3DE") // TODO_KDAB: Replace with a central settings class
|
||||
, m_settings("O3DE", "O3DE")
|
||||
, m_toolbarManager(new ToolbarManager(m_actionManager, this))
|
||||
, m_assetImporterManager(new AssetImporterManager(this))
|
||||
, m_levelEditorMenuHandler(new LevelEditorMenuHandler(this, m_viewPaneManager, m_settings))
|
||||
|
||||
@@ -211,7 +211,7 @@ public:
|
||||
ToolbarManager::ToolbarManager(ActionManager* actionManager, MainWindow* mainWindow)
|
||||
: m_mainWindow(mainWindow)
|
||||
, m_actionManager(actionManager)
|
||||
, m_settings("amazon", "O3DE")
|
||||
, m_settings("O3DE", "O3DE")
|
||||
, m_expanderWatcher(new AmazonToolBarExpanderWatcher())
|
||||
{
|
||||
// Note that we don't actually save/load from AmazonToolbar::List
|
||||
|
||||
@@ -1854,7 +1854,7 @@ void CTrackViewDialog::ReadMiscSettings()
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void CTrackViewDialog::SaveLayouts()
|
||||
{
|
||||
QSettings settings("Amazon", "O3DE");
|
||||
QSettings settings("O3DE", "O3DE");
|
||||
settings.beginGroup("TrackView");
|
||||
QByteArray stateData = this->saveState();
|
||||
settings.setValue("layout", stateData);
|
||||
@@ -1870,7 +1870,7 @@ void CTrackViewDialog::SaveLayouts()
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void CTrackViewDialog::ReadLayouts()
|
||||
{
|
||||
QSettings settings("Amazon", "O3DE");
|
||||
QSettings settings("O3DE", "O3DE");
|
||||
settings.beginGroup("TrackView");
|
||||
|
||||
setViewMode(static_cast<ViewMode>(settings.value("lastViewMode").toInt()));
|
||||
|
||||
@@ -789,7 +789,7 @@ void CViewportTitleDlg::OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_
|
||||
|
||||
void CViewportTitleDlg::LoadCustomPresets(const QString& section, const QString& keyName, QStringList& outCustompresets)
|
||||
{
|
||||
QSettings settings("Amazon", "O3DE"); // Temporary solution until we have the global Settings class.
|
||||
QSettings settings("O3DE", "O3DE"); // Temporary solution until we have the global Settings class.
|
||||
settings.beginGroup(section);
|
||||
outCustompresets = settings.value(keyName).toStringList();
|
||||
settings.endGroup();
|
||||
@@ -797,7 +797,7 @@ void CViewportTitleDlg::LoadCustomPresets(const QString& section, const QString&
|
||||
|
||||
void CViewportTitleDlg::SaveCustomPresets(const QString& section, const QString& keyName, const QStringList& custompresets)
|
||||
{
|
||||
QSettings settings("Amazon", "O3DE"); // Temporary solution until we have the global Settings class.
|
||||
QSettings settings("O3DE", "O3DE"); // Temporary solution until we have the global Settings class.
|
||||
settings.beginGroup(section);
|
||||
settings.setValue(keyName, custompresets);
|
||||
settings.endGroup();
|
||||
|
||||
@@ -639,7 +639,7 @@ bool ApplicationManager::Activate()
|
||||
|
||||
QString ApplicationManager::GetOrganizationName() const
|
||||
{
|
||||
return "Amazon";
|
||||
return "O3DE";
|
||||
}
|
||||
|
||||
QString ApplicationManager::GetApplicationName() const
|
||||
|
||||
Reference in New Issue
Block a user