Merge pull request #2390 from darkengine-io/new-qt
More miscellaneous Qt fixes
This commit is contained in:
commit
f706518dc0
|
@ -78,6 +78,7 @@ DMainWindow::DMainWindow(QWidget* parent_widget)
|
||||||
connect(m_ui->actionGitHub, SIGNAL(triggered()), this, SLOT(OnOpenGitHub()));
|
connect(m_ui->actionGitHub, SIGNAL(triggered()), this, SLOT(OnOpenGitHub()));
|
||||||
connect(m_ui->actionSystemInfo, SIGNAL(triggered()), this, SLOT(OnOpenSystemInfo()));
|
connect(m_ui->actionSystemInfo, SIGNAL(triggered()), this, SLOT(OnOpenSystemInfo()));
|
||||||
connect(m_ui->actionAbout, SIGNAL(triggered()), this, SLOT(OnOpenAbout()));
|
connect(m_ui->actionAbout, SIGNAL(triggered()), this, SLOT(OnOpenAbout()));
|
||||||
|
connect(m_ui->actionAboutQt, SIGNAL(triggered()), this, SLOT(OnOpenAboutQt()));
|
||||||
|
|
||||||
// Update GUI items
|
// Update GUI items
|
||||||
emit CoreStateChanged(Core::CORE_UNINITIALIZED);
|
emit CoreStateChanged(Core::CORE_UNINITIALIZED);
|
||||||
|
@ -92,6 +93,11 @@ DMainWindow::~DMainWindow()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DMainWindow::closeEvent(QCloseEvent* ce)
|
||||||
|
{
|
||||||
|
Stop();
|
||||||
|
}
|
||||||
|
|
||||||
// Emulation
|
// Emulation
|
||||||
|
|
||||||
void DMainWindow::StartGame(const QString filename)
|
void DMainWindow::StartGame(const QString filename)
|
||||||
|
@ -111,9 +117,15 @@ void DMainWindow::StartGame(const QString filename)
|
||||||
m_ui->centralWidget->addWidget(m_render_widget.get());
|
m_ui->centralWidget->addWidget(m_render_widget.get());
|
||||||
m_ui->centralWidget->setCurrentWidget(m_render_widget.get());
|
m_ui->centralWidget->setCurrentWidget(m_render_widget.get());
|
||||||
|
|
||||||
// TODO: When rendering to main, this won't resize the parent window...
|
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderWindowAutoSize)
|
||||||
m_render_widget->resize(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth,
|
{
|
||||||
|
// Resize main window to fit render
|
||||||
|
m_render_widget->setMinimumSize(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth,
|
||||||
SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight);
|
SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight);
|
||||||
|
qApp->processEvents(); // Force a redraw so the window has time to resize
|
||||||
|
m_render_widget->setMinimumSize(0, 0); // Allow the widget to scale down
|
||||||
|
}
|
||||||
|
m_render_widget->adjustSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!BootManager::BootCore(filename.toStdString()))
|
if (!BootManager::BootCore(filename.toStdString()))
|
||||||
|
@ -351,3 +363,8 @@ void DMainWindow::OnOpenAbout()
|
||||||
DAboutDialog* dlg = new DAboutDialog(this);
|
DAboutDialog* dlg = new DAboutDialog(this);
|
||||||
dlg->open();
|
dlg->open();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DMainWindow::OnOpenAboutQt()
|
||||||
|
{
|
||||||
|
QApplication::aboutQt();
|
||||||
|
}
|
||||||
|
|
|
@ -58,11 +58,13 @@ private slots:
|
||||||
void OnOpenGitHub();
|
void OnOpenGitHub();
|
||||||
void OnOpenSystemInfo();
|
void OnOpenSystemInfo();
|
||||||
void OnOpenAbout();
|
void OnOpenAbout();
|
||||||
|
void OnOpenAboutQt();
|
||||||
|
|
||||||
// Misc.
|
// Misc.
|
||||||
void UpdateIcons();
|
void UpdateIcons();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
void closeEvent(QCloseEvent* ce);
|
||||||
std::unique_ptr<Ui::DMainWindow> m_ui;
|
std::unique_ptr<Ui::DMainWindow> m_ui;
|
||||||
DGameTracker* m_game_tracker;
|
DGameTracker* m_game_tracker;
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>990</width>
|
<width>990</width>
|
||||||
<height>24</height>
|
<height>19</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QMenu" name="mnuFile">
|
<widget class="QMenu" name="mnuFile">
|
||||||
|
@ -218,17 +218,23 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="actionPlay_mnu">
|
<action name="actionPlay_mnu">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Play</string>
|
<string>&Play</string>
|
||||||
|
</property>
|
||||||
|
<property name="shortcut">
|
||||||
|
<string>F10</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionStop_mnu">
|
<action name="actionStop_mnu">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Stop</string>
|
<string>&Stop</string>
|
||||||
|
</property>
|
||||||
|
<property name="shortcut">
|
||||||
|
<string>Esc</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionReset">
|
<action name="actionReset">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Reset</string>
|
<string>&Reset</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
</widget>
|
</widget>
|
||||||
|
|
Loading…
Reference in New Issue