Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DQt2: Emulation MenuBar #3646

Merged
merged 1 commit into from
Mar 20, 2016
Merged

Conversation

rukai
Copy link
Contributor

@rukai rukai commented Feb 16, 2016

Emulation menubar includes save states, fullscreen, frame advance, screenshot and emulation controls.

Also included in this PR is combining the pause and start button into the same slot in the toolbar

emulationmenusavestatesubmenus

Review on Reviewable

@rukai rukai changed the title DQt2: Emulation Bar DQt2: Emulation MenuBar Feb 16, 2016
@spxtr
Copy link
Member

spxtr commented Feb 18, 2016

I think I kept the Play and Pause buttons separate because one was slightly larger than the other so they shifted stuff around a couple pixels when I swapped one for the other. Is that still the case?

@rukai
Copy link
Contributor Author

rukai commented Feb 18, 2016

Looks fine on my end.


Review status: 0 of 7 files reviewed at latest revision, all discussions resolved.


Comments from the review on Reviewable.io

@spxtr
Copy link
Member

spxtr commented Feb 18, 2016

Fine with me, then. Anyway it's an easy change if enough people complain.

@rukai rukai force-pushed the dolphinQtEmulationMenu branch 2 times, most recently from 59593af to 3fd1f23 Compare March 9, 2016 10:14
int slot = i + 1;
QString info = QString::fromStdString(State::GetInfoStringOfSlot(slot));
QString action_string = QStringLiteral(" Slot %1 - %2").arg(slot).arg(info);
actions_load.at(i)->setText(QStringLiteral("Load from") + action_string);

This comment was marked as off-topic.

m_fullscreen_action->setEnabled(true);
m_screenshot_action->setEnabled(true);
}

void ToolBar::EmulationPaused()
{
m_play_action->setEnabled(true);
{ m_play_action->setEnabled(true);

This comment was marked as off-topic.

@Sonicadvance1
Copy link
Contributor

Source/Core/DolphinQt2/MainWindow.cpp, line 323 [r3] (raw file):
This line should be indented to match the code style above in StateLoad.


Comments from the review on Reviewable.io

@Sonicadvance1
Copy link
Contributor

Reviewed 4 of 7 files at r1, 1 of 1 files at r2, 1 of 1 files at r3.
Review status: 6 of 7 files reviewed at latest revision, 1 unresolved discussion.


Comments from the review on Reviewable.io

@spxtr
Copy link
Member

spxtr commented Mar 19, 2016

LGTM

@@ -15,19 +15,71 @@ class MenuBar final : public QMenuBar
explicit MenuBar(QWidget* parent = nullptr);

signals:
//File

This comment was marked as off-topic.

QAction* action;
for (int i = 1; i <= 10; i++)
{
action = m_state_load_slots_menu->addAction(QStringLiteral(""));

This comment was marked as off-topic.

Save states, fullscreen, frame advance, screenshot and emulation
controls are available through the MenuBar
lioncash added a commit that referenced this pull request Mar 20, 2016
@lioncash lioncash merged commit 3ff56aa into dolphin-emu:master Mar 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants