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

Update help URLs and remove unneeded links (#1520)

Browse Source
This commit is contained in:
Terry Michaels
2021-06-23 14:42:33 -05:00
committed by GitHub
parent 47a83f4f15
commit 1e457928f5
120 changed files with 128 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/AboutDialog.cpp
+2 -2
View File
@@ -81,12 +81,12 @@ void CAboutDialog::mouseReleaseEvent(QMouseEvent* event)
void CAboutDialog::OnCustomerAgreement()
{
QDesktopServices::openUrl(QUrl(QStringLiteral("http://aws.amazon.com/agreement/")));
QDesktopServices::openUrl(QUrl(QStringLiteral("https://lfprojects.org/policies/terms-of-use/")));
}
void CAboutDialog::OnPrivacyNotice()
{
QDesktopServices::openUrl(QUrl(QStringLiteral("http://aws.amazon.com/privacy/")));
QDesktopServices::openUrl(QUrl(QStringLiteral("https://lfprojects.org/policies/privacy-policy/")));
}
#include <moc_AboutDialog.cpp>
Code/Sandbox/Editor/AboutDialog.ui
+1 -1
View File
@@ -154,7 +154,7 @@
<item>
<widget class="ClickableLabel" name="m_transparentAgreement">
<property name="text">
<string>AWS Customer Agreement</string>
<string>Terms of Use</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
Code/Sandbox/Editor/AssetImporter/UI/SelectDestinationDialog.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
static const char* g_assetProcessorLink = "<a href=\"https://docs.aws.amazon.com/console/lumberyard/userguide/asset-processor\">Asset Processor</a>";
static const char* g_assetProcessorLink = "<a href=\"https://docs.o3de.org/docs/user-guide/assets/pipeline/processor-ui/\">Asset Processor</a>";
static const char* g_copyFilesMessage = "The original file will remain outside of the project and the %1 will not monitor the file.";
static const char* g_moveFilesMessage = "The original file will be moved inside of the project and the %1 will monitor the file for changes.";
static const char* g_selectDestinationFilesPath = "AssetImporter/SelectDestinationFilesPath";
Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
+1 -13
View File
@@ -798,7 +798,7 @@ QMenu* LevelEditorMenuHandler::CreateHelpMenu()
auto text = lineEdit->text();
if (text.isEmpty())
{
QDesktopServices::openUrl(QUrl("https://aws.amazon.com/documentation/lumberyard/"));
QDesktopServices::openUrl(QUrl("https://docs.o3de.org/docs/"));
}
else
{
@@ -836,9 +836,6 @@ QMenu* LevelEditorMenuHandler::CreateHelpMenu()
// Documentation
auto documentationMenu = helpMenu.AddMenu(tr("Documentation"));
// Glossary
documentationMenu.AddAction(ID_DOCUMENTATION_GLOSSARY);
// Open 3D Engine Documentation
documentationMenu.AddAction(ID_DOCUMENTATION_O3DE);
@@ -854,9 +851,6 @@ QMenu* LevelEditorMenuHandler::CreateHelpMenu()
// Game Dev Blog
gameDevResourceMenu.AddAction(ID_DOCUMENTATION_GAMEDEVBLOG);
// GameDev Twitch Channel
gameDevResourceMenu.AddAction(ID_DOCUMENTATION_TWITCHCHANNEL);
// Forums
gameDevResourceMenu.AddAction(ID_DOCUMENTATION_FORUMS);
@@ -865,12 +859,6 @@ QMenu* LevelEditorMenuHandler::CreateHelpMenu()
helpMenu.AddSeparator();
// Give Us Feedback
helpMenu.AddAction(ID_DOCUMENTATION_FEEDBACK);
// Report a Bug???
// auto reportBugMenu = helpMenu.Get()->addAction(tr("Report a Bug"));
// About Open 3D Engine
helpMenu.AddAction(ID_APP_ABOUT);
Code/Sandbox/Editor/CryEdit.cpp
+6 -32
View File
@@ -111,7 +111,6 @@ AZ_POP_DISABLE_WARNING
#include "LevelInfo.h"
#include "EditorPreferencesDialog.h"
#include "GraphicsSettingsDialog.h"
#include "FeedbackDialog/FeedbackDialog.h"
#include "AnimationContext.h"
#include "GotoPositionDlg.h"
@@ -355,17 +354,13 @@ void CCryEditApp::RegisterActionHandlers()
{
ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
ON_COMMAND(ID_APP_SHOW_WELCOME, OnAppShowWelcomeScreen)
ON_COMMAND(ID_DOCUMENTATION_GETTINGSTARTEDGUIDE, OnDocumentationGettingStartedGuide)
ON_COMMAND(ID_DOCUMENTATION_TUTORIALS, OnDocumentationTutorials)
ON_COMMAND(ID_DOCUMENTATION_GLOSSARY, OnDocumentationGlossary)
ON_COMMAND(ID_DOCUMENTATION_O3DE, OnDocumentationO3DE)
ON_COMMAND(ID_DOCUMENTATION_GAMELIFT, OnDocumentationGamelift)
ON_COMMAND(ID_DOCUMENTATION_RELEASENOTES, OnDocumentationReleaseNotes)
ON_COMMAND(ID_DOCUMENTATION_GAMEDEVBLOG, OnDocumentationGameDevBlog)
ON_COMMAND(ID_DOCUMENTATION_TWITCHCHANNEL, OnDocumentationTwitchChannel)
ON_COMMAND(ID_DOCUMENTATION_FORUMS, OnDocumentationForums)
ON_COMMAND(ID_DOCUMENTATION_AWSSUPPORT, OnDocumentationAWSSupport)
ON_COMMAND(ID_DOCUMENTATION_FEEDBACK, OnDocumentationFeedback)
ON_COMMAND(ID_FILE_EXPORT_SELECTEDOBJECTS, OnExportSelectedObjects)
ON_COMMAND(ID_EDIT_HOLD, OnEditHold)
ON_COMMAND(ID_EDIT_FETCH, OnEditFetch)
@@ -2012,40 +2007,33 @@ void CCryEditApp::OnUpdateShowWelcomeScreen(QAction* action)
&& !m_savingLevel);
}
// App command to open online documentation page
void CCryEditApp::OnDocumentationGettingStartedGuide()
{
QString webLink = tr("https://docs.aws.amazon.com/lumberyard/latest/gettingstartedguide");
QDesktopServices::openUrl(QUrl(webLink));
}
void CCryEditApp::OnDocumentationTutorials()
{
QString webLink = tr("https://www.youtube.com/amazonlumberyardtutorials");
QString webLink = tr("https://o3deorg.netlify.app/docs/learning-guide/");
QDesktopServices::openUrl(QUrl(webLink));
}
void CCryEditApp::OnDocumentationGlossary()
{
QString webLink = tr("https://docs.aws.amazon.com/lumberyard/userguide/glossary");
QString webLink = tr("https://docs.o3de.org/docs/user-guide/appendix/glossary/");
QDesktopServices::openUrl(QUrl(webLink));
}
void CCryEditApp::OnDocumentationO3DE()
{
QString webLink = tr("https://docs.aws.amazon.com/lumberyard/userguide");
QString webLink = tr("https://o3deorg.netlify.app/docs/");
QDesktopServices::openUrl(QUrl(webLink));
}
void CCryEditApp::OnDocumentationGamelift()
{
QString webLink = tr("https://docs.aws.amazon.com/gamelift/developerguide");
QString webLink = tr("https://docs.aws.amazon.com/gamelift/");
QDesktopServices::openUrl(QUrl(webLink));
}
void CCryEditApp::OnDocumentationReleaseNotes()
{
QString webLink = tr("https://docs.aws.amazon.com/lumberyard/releasenotes");
QString webLink = tr("https://o3deorg.netlify.app/docs/release-notes/");
QDesktopServices::openUrl(QUrl(webLink));
}
@@ -2055,15 +2043,9 @@ void CCryEditApp::OnDocumentationGameDevBlog()
QDesktopServices::openUrl(QUrl(webLink));
}
void CCryEditApp::OnDocumentationTwitchChannel()
{
QString webLink = tr("http://twitch.tv/amazongamedev");
QDesktopServices::openUrl(QUrl(webLink));
}
void CCryEditApp::OnDocumentationForums()
{
QString webLink = tr("https://gamedev.amazon.com/forums");
QString webLink = tr("https://o3deorg.netlify.app/community/");
QDesktopServices::openUrl(QUrl(webLink));
}
@@ -2073,14 +2055,6 @@ void CCryEditApp::OnDocumentationAWSSupport()
QDesktopServices::openUrl(QUrl(webLink));
}
void CCryEditApp::OnDocumentationFeedback()
{
FeedbackDialog dialog;
dialog.show();
dialog.adjustSize();
dialog.exec();
}
bool CCryEditApp::FixDanglingSharedMemory(const QString& sharedMemName) const
{
QSystemSemaphore sem(sharedMemName + "_sem", 1);
Code/Sandbox/Editor/CryEdit.h
-3
View File
@@ -193,11 +193,8 @@ public:
void OnDocumentationGamelift();
void OnDocumentationReleaseNotes();
void OnDocumentationGameDevBlog();
void OnDocumentationGettingStartedGuide();
void OnDocumentationTwitchChannel();
void OnDocumentationForums();
void OnDocumentationAWSSupport();
void OnDocumentationFeedback();
void OnCommercePublish();
void OnCommerceMerch();
void SaveTagLocations();
Code/Sandbox/Editor/FeedbackDialog/FeedbackDialog.cpp
-41
View File
@@ -1,41 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include "EditorDefs.h"
#include "FeedbackDialog.h"
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
#include <FeedbackDialog/ui_FeedbackDialog.h>
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
namespace {
QString feedbackText = "<h3>We love getting feedback from our customers.</h3>"
"Feedback from our community helps us to constantly improve Open 3D Engine.<br/><br/>"
"In addition to using our forums and AWS support channels, you can always email us with your comments and suggestions at "
"<a href=\"mailto:o3de-feedback@amazon.com\" style=\"color: #4285F4;\">o3de-feedback@amazon.com</a>. "
"While we do not respond to everyone who submits feedback, we read everything and aspire to use your feedback to improve Open 3D Engine for everyone.";
}
FeedbackDialog::FeedbackDialog(QWidget* pParent)
: QDialog(pParent)
, ui(new Ui::FeedbackDialog)
{
ui->setupUi(this);
ui->feedbackLabel->setText(feedbackText);
resize(size().expandedTo(sizeHint()));
}
FeedbackDialog::~FeedbackDialog()
{
}
#include <FeedbackDialog/moc_FeedbackDialog.cpp>
Code/Sandbox/Editor/FeedbackDialog/FeedbackDialog.h
-31
View File
@@ -1,31 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#if !defined(Q_MOC_RUN)
#include <QDialog>
#endif
namespace Ui {
class FeedbackDialog;
}
class QStringListModel;
class FeedbackDialog
: public QDialog
{
Q_OBJECT
public:
FeedbackDialog(QWidget* pParent = nullptr);
~FeedbackDialog();
private:
QScopedPointer<Ui::FeedbackDialog> ui;
};
Code/Sandbox/Editor/FeedbackDialog/FeedbackDialog.ui
-80
View File
@@ -1,80 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>FeedbackDialog</class>
<widget class="QWidget" name="FeedbackDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>580</width>
<height>204</height>
</rect>
</property>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="windowTitle">
<string>Give us Feedback</string>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="Contents" native="true">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="leftMargin">
<number>20</number>
</property>
<property name="topMargin">
<number>20</number>
</property>
<property name="rightMargin">
<number>20</number>
</property>
<property name="bottomMargin">
<number>20</number>
</property>
<item>
<widget class="QLabel" name="feedbackLabel">
<property name="text">
<string>&lt;h3&gt;We love putting in placeholder text for our dialogs. &lt;/h3&gt; Placeholder text like this helps us to see how this dialog will look in Qt Designer without having to recompile for every change.&lt;br/&gt;&lt;br/&gt;In addition to using placeholder text and placeholder text, you can always use this place holder text to hold your place and show how an html link will look. WHile we do not always use placeholder text like this text, we do use it when we are designing our dialog boxes and we know that the text will need to be in a localization file which we have not yet setup.</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources>
<include location="FeedbackDialog.qrc"/>
<include location="WelcomeScreenDialog.qrc"/>
</resources>
<connections/>
</ui>
Code/Sandbox/Editor/MainWindow.cpp
-8
View File
@@ -1022,13 +1022,9 @@ void MainWindow::InitActions()
.Connect(&QAction::triggered, this, &MainWindow::RefreshStyle);
// Help actions
am->AddAction(ID_DOCUMENTATION_GETTINGSTARTEDGUIDE, tr("Getting Started"))
.SetReserved();
am->AddAction(ID_DOCUMENTATION_TUTORIALS, tr("Tutorials"))
.SetReserved();
am->AddAction(ID_DOCUMENTATION_GLOSSARY, tr("Glossary"))
.SetReserved();
am->AddAction(ID_DOCUMENTATION_O3DE, tr("Open 3D Engine Documentation"))
.SetReserved();
am->AddAction(ID_DOCUMENTATION_GAMELIFT, tr("GameLift Documentation"))
@@ -1038,15 +1034,11 @@ void MainWindow::InitActions()
am->AddAction(ID_DOCUMENTATION_GAMEDEVBLOG, tr("GameDev Blog"))
.SetReserved();
am->AddAction(ID_DOCUMENTATION_TWITCHCHANNEL, tr("GameDev Twitch Channel"))
.SetReserved();
am->AddAction(ID_DOCUMENTATION_FORUMS, tr("Forums"))
.SetReserved();
am->AddAction(ID_DOCUMENTATION_AWSSUPPORT, tr("AWS Support"))
.SetReserved();
am->AddAction(ID_DOCUMENTATION_FEEDBACK, tr("Give Us Feedback"))
.SetReserved();
am->AddAction(ID_APP_ABOUT, tr("&About Open 3D Engine"))
.SetStatusTip(tr("Display program information, version number and copyright"))
.SetReserved();
Code/Sandbox/Editor/editor_lib_files.cmake
-3
View File
@@ -477,9 +477,6 @@ set(FILES
Export/OBJExporter.h
Export/OCMExporter.cpp
Export/OCMExporter.h
FeedbackDialog/FeedbackDialog.h
FeedbackDialog/FeedbackDialog.cpp
FeedbackDialog/FeedbackDialog.ui
EditorFileMonitor.cpp
EditorFileMonitor.h
Include/IEditorFileMonitor.h