Lots more minor DolphinQt stuffs. #3032

waddlesplash · 2015-09-12T18:15:01Z

Commit messages should be self-explanatory. r? @lioncash, @phire, @JosJuice

We don't need two sets of actions (one with icons, one without icons) for Play/Stop, we can just tell Qt not to display the icons in the menus.

waddlesplash · 2015-09-12T18:32:01Z

Windows buildbot failed because it's on a too-old version of Qt. ping @shuffle2 on that.

Also cc @comex if he wants to look at this.

Source/Core/DolphinQt/Host.h

+class HostTitleEvent final : public QEvent
+{
+public:
+	HostTitleEvent(const std::string title);


* Confirm stopping emulation when the window is closing, not just the "Stop" button * Don't resume if we were already paused when we got the quit event * Shutdown the core at the end of main() so we don't crash on exit * Miscellaneous other logic cleanups related to this

… console.

* Windows 8.1/10 & OS X .10/.11 constants now in Qt * idealThreadCount() includes hyperthreads, so say 'logical processors'

waddlesplash · 2015-09-13T13:37:31Z

@lioncash Done, so now this is just waiting for the Qt update.

waddlesplash · 2015-09-28T22:14:58Z

@lioncash LGTU?

tony971 · 2015-09-30T16:22:16Z

QTDIR not set or non-existent (pull the submodule?)

Visual Studio 2015

JosJuice · 2015-09-30T16:30:16Z

@tony971 Did you pull the submodule?

tony971 · 2015-09-30T16:31:18Z

Yes. It builds without this pull.

waddlesplash · 2015-09-30T22:40:57Z

It builds without this pull.

No, that's just Visual Studio ignoring the DolphinQt build failure. You need the pull in order to build DolphinQt. Also, even if you pulled before, now that the Qt submodule has been updated, you'll have to update your local copy as well.

tony971 · 2015-09-30T22:59:48Z

I've got Git set to update sub modules every time I pull.

waddlesplash · 2015-09-30T23:01:58Z

Then you need to be on the latest Git revision, or merge this branch into master. This branch by itself is not enough.

tony971 · 2015-09-30T23:12:59Z

I merged this pull request into the latest master after updating the submodule. Everything was up to date and that's why I'm reporting an issue.

waddlesplash · 2015-09-30T23:24:05Z

Please paste the contents of the Externals\Qt directory, as well as the contents of QtCompile.props.

tony971 · 2015-10-02T02:36:40Z

I looked in the Externals\Qt directory and got confused why I saw 5.4 stuffs. So I deleted the directory and pulled again. Same result.

https://www.dropbox.com/s/dbzgfwbx17t0zza/Qt.7z?dl=0

waddlesplash · 2015-10-02T03:32:28Z

Sorry, I meant a directory listing, not the actual directory.

Ah, I see -- the submodule is linked to a specific commit, not master. I'll need to fix that.

waddlesplash · 2015-11-06T23:40:40Z

@tony971 Can you pull, update the submodule, and try again?

tony971 · 2015-11-09T15:44:12Z

@waddlesplash works for me now :)

waddlesplash · 2015-11-09T16:05:40Z

@lioncash Merge?

rukai · 2015-11-22T11:56:41Z

Wont compile on my machine running Arch Linux.

/home/rubic/Projects/dolphin/src/dolphin-dev-waddlesplash/Source/Core/Core/NetPlayServer.cpp: In static member function ‘static bool NetPlayServer::initUPnP()’:
/home/rubic/Projects/dolphin/src/dolphin-dev-waddlesplash/Source/Core/Core/NetPlayServer.cpp:907:74: error: invalid conversion from ‘int*’ to ‘unsigned char’ [-fpermissive]
  UPNPDev *devlist = upnpDiscover(2000, nullptr, nullptr, 0, 0, &upnperror);
                                                                          ^
/home/rubic/Projects/dolphin/src/dolphin-dev-waddlesplash/Source/Core/Core/NetPlayServer.cpp:907:74: error: too few arguments to function ‘UPNPDev* upnpDiscover(int, const char*, const char*, int, int, unsigned char, int*)’
In file included from /home/rubic/Projects/dolphin/src/dolphin-dev-waddlesplash/Source/Core/Core/NetPlayServer.cpp:840:0:
/usr/include/miniupnpc/miniupnpc.h:62:1: note: declared here
 upnpDiscover(int delay, const char * multicastif,

It looks like its grabbing miniupnpc from /usr/include instead of from the Externals folder.
I have no idea how your changes have caused that however.

BhaaLseN · 2015-11-22T13:25:16Z

He didn't touch NetPlay, so this PR is not at fault (or should not). Does master work for you?

rukai · 2015-11-22T23:51:45Z

Yes master works fine for me.

I know, its totally bizarre. o.0
I grabbed the zip of dolphin-emu/dolphin and the dolphin-qt branch of waddlesplash/dolphin.
Extracted both, made the build dirs etc.
Compiled them both with cmake -DENABLE_QT=true ..; make

dolphin-emu/dolphin works fine
while waddlesplash/dolphin comes up with that error

I would think that the error is more to do with the build process, but that wasnt touched either.

rukai · 2015-11-23T02:07:37Z

My bad, nothing is wrong.

I assumed waddlesplash's repo needed to have the full history of the master dolphin in order to be merged, I can now see that isnt the case.
The problem I was experiencing would have been fixed in a recent commit to master, that wasnt in the history of waddlesplash's repo.

Lots more minor DolphinQt stuffs.

DolphinQt: Simplify action setup.

436f113

We don't need two sets of actions (one with icons, one without icons) for Play/Stop, we can just tell Qt not to display the icons in the menus.

lioncash reviewed Sep 12, 2015
View reviewed changes

Source/Core/DolphinQt/Host.h

class HostTitleEvent final : public QEvent

{

public:

HostTitleEvent(const std::string title);

This comment was marked as off-topic.

Sign in to view

waddlesplash added 8 commits September 13, 2015 09:32

DolphinQt: Indentation fixes.

db8b50c

DolphinQt: Add 'Screenshot' button.

7c13021

DolphinQt: Remove '&' on closures where it isn't needed.

0e2ea1b

DolphinQt: Set the SUBSYSTEM in Release mode to 'Windows' to hide the…

11c641e

… console.

DolphinQt: Use C++11 'final' keyword where applicable.

7c2f22f

DolphinQt: Updates to the SystemInfo dialog.

7c91669

* Windows 8.1/10 & OS X .10/.11 constants now in Qt * idealThreadCount() includes hyperthreads, so say 'logical processors'

DolphinQt: Handle the Host_UpdateTitle callback.

f5743f5

waddlesplash force-pushed the dolphin-qt branch from f047248 to f5743f5 Compare September 13, 2015 13:37

waddlesplash mentioned this pull request Sep 13, 2015

QtCompile.props: Update for Qt 5.5. #3034

Merged

waddlesplash mentioned this pull request Nov 2, 2015

[WIP] Basic Qt GUI #3221

Closed

Externals/Qt: Update to Qt 5.5.0.

2d9c5ce

phire added a commit that referenced this pull request Nov 23, 2015

Merge pull request #3032 from waddlesplash/dolphin-qt

ffb9722

Lots more minor DolphinQt stuffs.

phire merged commit ffb9722 into dolphin-emu:master Nov 23, 2015

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Lots more minor DolphinQt stuffs. #3032

Lots more minor DolphinQt stuffs. #3032

waddlesplash commented Sep 12, 2015

waddlesplash commented Sep 12, 2015

This comment was marked as off-topic.

waddlesplash commented Sep 13, 2015

waddlesplash commented Sep 28, 2015

tony971 commented Sep 30, 2015

JosJuice commented Sep 30, 2015

tony971 commented Sep 30, 2015

waddlesplash commented Sep 30, 2015

tony971 commented Sep 30, 2015

waddlesplash commented Sep 30, 2015

tony971 commented Sep 30, 2015

waddlesplash commented Sep 30, 2015

tony971 commented Oct 2, 2015

waddlesplash commented Oct 2, 2015

waddlesplash commented Nov 6, 2015

tony971 commented Nov 9, 2015

waddlesplash commented Nov 9, 2015

rukai commented Nov 22, 2015

BhaaLseN commented Nov 22, 2015

rukai commented Nov 22, 2015

rukai commented Nov 23, 2015

Lots more minor DolphinQt stuffs. #3032

Lots more minor DolphinQt stuffs. #3032

Conversation

waddlesplash commented Sep 12, 2015

waddlesplash commented Sep 12, 2015

This comment was marked as off-topic.

waddlesplash commented Sep 13, 2015

waddlesplash commented Sep 28, 2015

tony971 commented Sep 30, 2015

JosJuice commented Sep 30, 2015

tony971 commented Sep 30, 2015

waddlesplash commented Sep 30, 2015

tony971 commented Sep 30, 2015

waddlesplash commented Sep 30, 2015

tony971 commented Sep 30, 2015

waddlesplash commented Sep 30, 2015

tony971 commented Oct 2, 2015

waddlesplash commented Oct 2, 2015

waddlesplash commented Nov 6, 2015

tony971 commented Nov 9, 2015

waddlesplash commented Nov 9, 2015

rukai commented Nov 22, 2015

BhaaLseN commented Nov 22, 2015

rukai commented Nov 22, 2015

rukai commented Nov 23, 2015