piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to the About dialog & add the SystemInfo dialog.

Browse Source 
Also fix the build on Mac OS X.
This commit is contained in:
Augustin Cavalier
2014-10-25 09:21:05 -04:00
parent 51700a2b68
commit 69cd8229d8
13 changed files with 296 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -11,17 +11,22 @@
#include "DolphinQt/AboutDialog.h"
#include "DolphinQt/MainWindow.h"
#include "DolphinQt/SystemInfo.h"
#include "DolphinQt/Utils/Resources.h"
#include "DolphinQt/Utils/Utils.h"
DMainWindow::DMainWindow(QWidget* parent_widget)
: QMainWindow(parent_widget)
{
ui = std::make_unique<Ui::DMainWindow>();
ui->setupUi(this);
m_ui = std::make_unique<Ui::DMainWindow>();
m_ui->setupUi(this);
Resources::Init();
ui->actOpen->setIcon(Resources::GetIcon(Resources::TOOLBAR_OPEN));
m_ui->actOpen->setIcon(Resources::GetIcon(Resources::TOOLBAR_OPEN));
#ifdef Q_OS_MACX
m_ui->toolbar->setMovable(false);
#endif
}
DMainWindow::~DMainWindow()
@ -43,8 +48,14 @@ void DMainWindow::on_actGitHub_triggered()
QDesktopServices::openUrl(QUrl(SL("https://github.com/dolphin-emu/dolphin/")));
}
void DMainWindow::on_actSystemInfo_triggered()
{
DSystemInfo* dlg = new DSystemInfo(this);
dlg->open();
}
void DMainWindow::on_actAbout_triggered()
{
DAboutDialog dlg;
dlg.exec();
DAboutDialog* dlg = new DAboutDialog(this);
dlg->open();
}