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

Gems/Atom

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 17:57:02 -07:00
parent 257557c692
commit c19c4af1e1
23 changed files with 44 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.cpp
+3 -3
View File
@@ -125,7 +125,7 @@ namespace MaterialEditor
QDesktopServices::openUrl(QUrl::fromLocalFile(entry->GetFullPath().c_str()));
});
menu->addAction("Duplicate...", [entry, caller]()
menu->addAction("Duplicate...", [entry]()
{
const QFileInfo duplicateFileInfo(AtomToolsFramework::GetDuplicationFileInfo(entry->GetFullPath().c_str()));
if (!duplicateFileInfo.absoluteFilePath().isEmpty())
@@ -156,7 +156,7 @@ namespace MaterialEditor
AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::OpenDocument, entry->GetFullPath());
});
menu->addAction("Duplicate...", [entry, caller]()
menu->addAction("Duplicate...", [entry]()
{
const QFileInfo duplicateFileInfo(AtomToolsFramework::GetDuplicationFileInfo(entry->GetFullPath().c_str()));
if (!duplicateFileInfo.absoluteFilePath().isEmpty())
@@ -285,7 +285,7 @@ namespace MaterialEditor
});
// add get latest action
m_getLatestAction = sourceControlMenu->addAction("Get Latest", [path, this]()
m_getLatestAction = sourceControlMenu->addAction("Get Latest", [path]()
{
SourceControlCommandBus::Broadcast(&SourceControlCommandBus::Events::RequestLatest, path.c_str(),
[](bool, const SourceControlFileInfo&) {});
Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
+4 -4
View File
@@ -304,7 +304,7 @@ namespace MaterialEditor
}
}, QKeySequence::New);
m_actionOpen = m_menuFile->addAction("&Open...", [this]() {
m_actionOpen = m_menuFile->addAction("&Open...", []() {
const AZStd::vector<AZ::Data::AssetType> assetTypes = { azrtti_typeid<AZ::RPI::MaterialAsset>() };
const AZStd::string filePath = AtomToolsFramework::GetOpenFileInfo(assetTypes).absoluteFilePath().toUtf8().constData();
if (!filePath.empty())
@@ -369,7 +369,7 @@ namespace MaterialEditor
AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::CloseDocument, documentId);
}, QKeySequence::Close);
m_actionCloseAll = m_menuFile->addAction("Close All", [this]() {
m_actionCloseAll = m_menuFile->addAction("Close All", []() {
AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Events::CloseAllDocuments);
});
@@ -436,7 +436,7 @@ namespace MaterialEditor
SetDockWidgetVisible(label, !IsDockWidgetVisible(label));
});
m_actionConsole = m_menuView->addAction("&Console", [this]() {
m_actionConsole = m_menuView->addAction("&Console", []() {
});
m_actionPythonTerminal = m_menuView->addAction("Python &Terminal", [this]() {
@@ -471,7 +471,7 @@ namespace MaterialEditor
dialog.exec();
});
m_actionAbout = m_menuHelp->addAction("&About...", [this]() {
m_actionAbout = m_menuHelp->addAction("&About...", []() {
});
}