birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit 5f214be

Browse Source
This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/KeyboardCustomizationSettings.cpp
+5 -5
View File
@@ -109,7 +109,7 @@ void KeyboardCustomizationSettings::LoadDefaults()
void KeyboardCustomizationSettings::Load()
{
QSettings settings(QStringLiteral("Amazon"), QStringLiteral("Lumberyard"));
QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE"));
settings.beginGroup(QStringLiteral("Keyboard Shortcuts"));
settings.beginGroup(m_group);
@@ -156,7 +156,7 @@ void KeyboardCustomizationSettings::LoadFromSnapshot(const Snapshot& snapshot)
void KeyboardCustomizationSettings::Save()
{
QSettings settings(QStringLiteral("Amazon"), QStringLiteral("Lumberyard"));
QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE"));
settings.beginGroup(QStringLiteral("Keyboard Shortcuts"));
settings.beginGroup(m_group);
@@ -189,7 +189,7 @@ KeyboardCustomizationSettings::Snapshot KeyboardCustomizationSettings::CreateSna
void KeyboardCustomizationSettings::ExportToFile(QWidget* parent)
{
QString fileName = QFileDialog::getSaveFileName(parent, QObject::tr("Export Keyboard Shortcuts"), QStringLiteral("lumberyard.keys"), QObject::tr("Keyboard Settings (*.keys)"));
QString fileName = QFileDialog::getSaveFileName(parent, QObject::tr("Export Keyboard Shortcuts"), QStringLiteral("o3de.keys"), QObject::tr("Keyboard Settings (*.keys)"));
if (fileName.isEmpty())
{
return;
@@ -205,7 +205,7 @@ void KeyboardCustomizationSettings::ExportToFile(QWidget* parent)
QJsonObject store;
store.insert("version", "1.0");
store.insert("Content-Type", "application/x-lumberyard-sdk-keyboard-settings+json");
store.insert("Content-Type", "application/x-o3de-sdk-keyboard-settings+json");
QJsonObject groups;
for (auto instance = m_instances.constBegin(); instance != m_instances.constEnd(); instance++)
@@ -262,7 +262,7 @@ void KeyboardCustomizationSettings::ImportFromFile(QWidget* parent)
QJsonDocument imported(QJsonDocument::fromJson(rawData));
QJsonObject store = imported.object();
if (store.value("Content-Type") != "application/x-lumberyard-sdk-keyboard-settings+json" || store.value("version") != "1.0")
if (store.value("Content-Type") != "application/x-o3de-sdk-keyboard-settings+json" || store.value("version") != "1.0")
{
QMessageBox::critical(parent, QObject::tr("Shortcut Import Error"), QObject::tr("\"%1\" doesn't appear to contain keyboard settings").arg(fileName));
return;