AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CResourceBrowser: Make use of Qt 5 signals and slots

This commit is contained in:
Lioncash 2020-06-29 00:01:37 -04:00
parent 30428614c4
commit 0a3b05e7de
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/Editor/ResourceBrowser/CResourceBrowser.cpp
View File

@ -44,10 +44,10 @@ CResourceBrowser::CResourceBrowser(QWidget *pParent)
addAction(mpRedoAction); addAction(mpRedoAction);
#endif #endif
connect(mpUndoAction, SIGNAL(triggered(bool)), this, SLOT(Undo())); connect(mpUndoAction, &QAction::triggered, this, &CResourceBrowser::Undo);
connect(mpRedoAction, SIGNAL(triggered(bool)), this, SLOT(Redo())); connect(mpRedoAction, &QAction::triggered, this, &CResourceBrowser::Redo);
connect(&mUndoStack, SIGNAL(canUndoChanged(bool)), this, SLOT(UpdateUndoActionStates())); connect(&mUndoStack, &QUndoStack::canUndoChanged, this, &CResourceBrowser::UpdateUndoActionStates);
connect(&mUndoStack, SIGNAL(canRedoChanged(bool)), this, SLOT(UpdateUndoActionStates())); connect(&mUndoStack, &QUndoStack::canRedoChanged, this, &CResourceBrowser::UpdateUndoActionStates);
// Configure display mode buttons // Configure display mode buttons
QButtonGroup *pModeGroup = new QButtonGroup(this); QButtonGroup *pModeGroup = new QButtonGroup(this);
@ -104,28 +104,28 @@ CResourceBrowser::CResourceBrowser(QWidget *pParent)
// Set up the options menu // Set up the options menu
QMenu *pOptionsMenu = new QMenu(this); QMenu *pOptionsMenu = new QMenu(this);
QMenu *pImportMenu = pOptionsMenu->addMenu(tr("Import Names")); QMenu *pImportMenu = pOptionsMenu->addMenu(tr("Import Names"));
pOptionsMenu->addAction(tr("Export Names"), this, SLOT(ExportAssetNames())); pOptionsMenu->addAction(tr("Export Names"), this, &CResourceBrowser::ExportAssetNames);
pOptionsMenu->addSeparator(); pOptionsMenu->addSeparator();
pImportMenu->addAction(tr("Asset Name Map"), this, SLOT(ImportAssetNameMap())); pImportMenu->addAction(tr("Asset Name Map"), this, &CResourceBrowser::ImportAssetNameMap);
pImportMenu->addAction(tr("Package Contents List"), this, SLOT(ImportPackageContentsList())); pImportMenu->addAction(tr("Package Contents List"), this, &CResourceBrowser::ImportPackageContentsList);
pImportMenu->addAction(tr("Generate Asset Names"), this, SLOT(GenerateAssetNames())); pImportMenu->addAction(tr("Generate Asset Names"), this, &CResourceBrowser::GenerateAssetNames);
QAction *pDisplayAssetIDsAction = new QAction(tr("Display Asset IDs"), this); QAction *pDisplayAssetIDsAction = new QAction(tr("Display Asset IDs"), this);
pDisplayAssetIDsAction->setCheckable(true); pDisplayAssetIDsAction->setCheckable(true);
connect(pDisplayAssetIDsAction, SIGNAL(toggled(bool)), this, SLOT(SetAssetIDDisplayEnabled(bool))); connect(pDisplayAssetIDsAction, &QAction::toggled, this, &CResourceBrowser::SetAssetIDDisplayEnabled);
pOptionsMenu->addAction(pDisplayAssetIDsAction); pOptionsMenu->addAction(pDisplayAssetIDsAction);
pOptionsMenu->addAction(tr("Find Asset by ID"), this, SLOT(FindAssetByID())); pOptionsMenu->addAction(tr("Find Asset by ID"), this, &CResourceBrowser::FindAssetByID);
pOptionsMenu->addAction(tr("Rebuild Database"), this, SLOT(RebuildResourceDB())); pOptionsMenu->addAction(tr("Rebuild Database"), this, &CResourceBrowser::RebuildResourceDB);
mpUI->OptionsToolButton->setMenu(pOptionsMenu); mpUI->OptionsToolButton->setMenu(pOptionsMenu);
#if !PUBLIC_RELEASE #if !PUBLIC_RELEASE
// Only add the store menu in debug builds. We don't want end users editing the editor store. // Only add the store menu in debug builds. We don't want end users editing the editor store.
pOptionsMenu->addSeparator(); pOptionsMenu->addSeparator();
QMenu *pStoreMenu = pOptionsMenu->addMenu(tr("Set Store")); QMenu *pStoreMenu = pOptionsMenu->addMenu(tr("Set Store"));
QAction *pProjStoreAction = pStoreMenu->addAction(tr("Project Store"), this, SLOT(SetProjectStore())); QAction *pProjStoreAction = pStoreMenu->addAction(tr("Project Store"), this, &CResourceBrowser::SetProjectStore);
QAction *pEdStoreAction = pStoreMenu->addAction(tr("Editor Store"), this, SLOT(SetEditorStore())); QAction *pEdStoreAction = pStoreMenu->addAction(tr("Editor Store"), this, &CResourceBrowser::SetEditorStore);
pProjStoreAction->setCheckable(true); pProjStoreAction->setCheckable(true);
pProjStoreAction->setChecked(true); pProjStoreAction->setChecked(true);
@ -143,21 +143,21 @@ CResourceBrowser::CResourceBrowser(QWidget *pParent)
new CResourceTableContextMenu(this, mpUI->ResourceTableView, mpModel, mpProxyModel); new CResourceTableContextMenu(this, mpUI->ResourceTableView, mpModel, mpProxyModel);
// Set up connections // Set up connections
connect(mpUI->SearchBar, SIGNAL(StoppedTyping(QString)), this, SLOT(OnSearchStringChanged(QString))); connect(mpUI->SearchBar, &CTimedLineEdit::StoppedTyping, this, &CResourceBrowser::OnSearchStringChanged);
connect(mpUI->ResourceTreeButton, SIGNAL(pressed()), this, SLOT(SetResourceTreeView())); connect(mpUI->ResourceTreeButton, &QPushButton::pressed, this, &CResourceBrowser::SetResourceTreeView);
connect(mpUI->ResourceListButton, SIGNAL(pressed()), this, SLOT(SetResourceListView())); connect(mpUI->ResourceListButton, &QPushButton::pressed, this, &CResourceBrowser::SetResourceListView);
connect(mpUI->SortComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnSortModeChanged(int))); connect(mpUI->SortComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &CResourceBrowser::OnSortModeChanged);
connect(mpUI->ClearButton, SIGNAL(pressed()), this, SLOT(OnClearButtonPressed())); connect(mpUI->ClearButton, &QPushButton::pressed, this, &CResourceBrowser::OnClearButtonPressed);
connect(mpUI->DirectoryTreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(OnDirectorySelectionChanged(QModelIndex))); connect(mpUI->DirectoryTreeView, &CVirtualDirectoryTreeView::clicked, this, &CResourceBrowser::OnDirectorySelectionChanged);
connect(mpUI->DirectoryTreeView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(OnDirectorySelectionChanged(QModelIndex))); connect(mpUI->DirectoryTreeView->selectionModel(), &QItemSelectionModel::currentChanged, this, &CResourceBrowser::OnDirectorySelectionChanged);
connect(mpUI->ResourceTableView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnDoubleClickTable(QModelIndex))); connect(mpUI->ResourceTableView, &CResourceTableView::doubleClicked, this, &CResourceBrowser::OnDoubleClickTable);
connect(mpUI->ResourceTableView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(OnResourceSelectionChanged(QModelIndex))); connect(mpUI->ResourceTableView->selectionModel(), &QItemSelectionModel::currentChanged, this, &CResourceBrowser::OnResourceSelectionChanged);
connect(mpProxyModel, SIGNAL(rowsInserted(QModelIndex,int,int)), mpUI->ResourceTableView, SLOT(resizeRowsToContents())); connect(mpProxyModel, &CResourceProxyModel::rowsInserted, mpUI->ResourceTableView, &CResourceTableView::resizeRowsToContents);
connect(mpProxyModel, SIGNAL(layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)), mpUI->ResourceTableView, SLOT(resizeRowsToContents())); connect(mpProxyModel, &CResourceProxyModel::layoutChanged, mpUI->ResourceTableView, &CResourceTableView::resizeRowsToContents);
connect(mpProxyModel, SIGNAL(modelReset()), mpUI->ResourceTableView, SLOT(resizeRowsToContents())); connect(mpProxyModel, &CResourceProxyModel::modelReset, mpUI->ResourceTableView, &CResourceTableView::resizeRowsToContents);
connect(mpFilterAllBox, SIGNAL(toggled(bool)), this, SLOT(OnFilterTypeBoxTicked(bool))); connect(mpFilterAllBox, &QCheckBox::toggled, this, &CResourceBrowser::OnFilterTypeBoxTicked);
connect(gpEdApp, SIGNAL(ActiveProjectChanged(CGameProject*)), this, SLOT(UpdateStore())); connect(gpEdApp, &CEditorApplication::ActiveProjectChanged, this, &CResourceBrowser::UpdateStore);
} }
CResourceBrowser::~CResourceBrowser() = default; CResourceBrowser::~CResourceBrowser() = default;