Options for selecting which columns are visible in the game list. #435

YourGamesBeOver · 2014-05-29T22:46:02Z

Also added optional extra column, game ID, disabled by default. also added a config entry to disable coloring compressed games in blue ("ColorCompressed"). I am resubmitting this because I changed a lot of stuff from the last pull request.

Source/Core/DolphinWX/FrameTools.cpp

+	columnsMenu->Check(IDM_SHOW_ID, SConfig::GetInstance().m_showID);
+	columnsMenu->AppendCheckItem(IDM_SHOW_REGION, _("Region"));
+	columnsMenu->Check(IDM_SHOW_REGION, SConfig::GetInstance().m_showRegion);
+	columnsMenu->AppendCheckItem(IDM_SHOW_SIZE, _("Filesize"));


delroth · 2014-05-29T22:52:34Z

@dolphin-emu-bot rebuild

Source/Core/Core/ConfigManager.h

@@ -72,6 +72,16 @@ struct SConfig : NonCopyable
 	int m_ListSort;
 	int m_ListSort2;

+	bool m_showSystem;


YourGamesBeOver · 2014-05-29T23:35:04Z

alright, I think I've fixed everything you've pointed out

Source/Core/DolphinWX/GameListCtrl.cpp

+		SetColumnWidth(COLUMN_ID, SConfig::GetInstance().m_showIDColumn ? 75 + platform_padding : 0);
+		SetColumnWidth(COLUMN_COUNTRY, SConfig::GetInstance().m_showRegionColumn ? 32 + platform_padding : 0);
+		SetColumnWidth(COLUMN_EMULATION_STATE, SConfig::GetInstance().m_showStateColumn ? 50 + platform_padding : 0);
+		SetColumnWidth(COLUMN_EMULATION_STATE, 0);


YourGamesBeOver · 2014-05-29T23:46:54Z

and now everything is working too :D

lioncash · 2014-05-29T23:49:17Z

Is it possible that you can squash the formatting change commits into each other? If that's more trouble at this point than it's worth (never had to squash range commits so I don't know) then I guess it's OK as is.

delroth · 2014-05-29T23:50:50Z

Shouldn't be difficult: git rebase -i origin/master and just use "f" to squash.

YourGamesBeOver · 2014-05-30T00:26:38Z

I've been trying, but I can't seem to get the rebase to work.

YourGamesBeOver · 2014-05-30T01:01:07Z

yeah... its not working :( sorry

Source/Core/Core/ConfigManager.h

+	bool m_showSizeColumn;
+	bool m_showStateColumn;
+
+	// Toggles wether compressed titles show up in blue in the game list


neobrain · 2014-05-30T07:31:18Z

GUI looks okay to me.

YourGamesBeOver · 2014-06-02T18:34:38Z

Is there any more that needs to be done that I missed?

Linktothepast · 2014-06-03T02:30:07Z

If wx will be dropped eventually the sooner this pr gets merged the better.

YourGamesBeOver · 2014-06-03T12:02:41Z

Agreed

On Jun 2, 2014, at 10:30 PM, Linktothepast notifications@github.com wrote:

If wx will be dropped eventually the sooner this pr gets merged the better.

—
Reply to this email directly or view it on GitHub.

neobrain · 2014-06-04T10:57:20Z

Again, please try to squash your changes together. As far as I can see, there really is only one logical change in this branch - hence there's no need to have 11 commits for that.

git fetch origin && git rebase -i origin/master and mark all commits but the first one as "fixup". That should work.

YourGamesBeOver · 2014-06-04T13:31:41Z

I'm not sure how well that worked. stupid git extensions making things more complicated...

neobrain · 2014-06-04T13:38:07Z

It didn't work at all. The pull request should have one commit instead of 11, but you actually just added two new ones. I can't really help you with git extensions unfortunately, but I'd really like to have this resolved. Fwiw, I suggest you create a backup branch if you're unsure whether what you're doing works (if you don't know how to do that, just copying the whole dolphin directory including hidden .git files will be sufficient).

YourGamesBeOver · 2014-06-04T13:55:04Z

I did it!

YourGamesBeOver · 2014-06-04T19:36:59Z

I made a backup, and then moved the remote branch back to the commit before I started. then I copied the backup back over, committed and pushed. magic. You'd think I'd be better at using git seeing as I use it every day here at work :P

Either way, the PR should be good to go now!

neobrain · 2014-06-04T22:11:04Z

@dolphin-emu-bot rebuild

YourGamesBeOver · 2014-06-05T19:24:36Z

I am confused by that build failure, could you explain it?

delroth · 2014-06-05T19:25:51Z

The line it indicates has trailing whitespaces, aka. useless whitespace
characters at the end of a line. Fix it, squash the fix into your commit,
and ping us when it's done.

On Thu, Jun 5, 2014 at 9:24 PM, Steven notifications@github.com wrote:

I am confused by that build failure, could you explain it?

—
Reply to this email directly or view it on GitHub
#435 (comment).

Pierre "delroth" Bourdon delroth@gmail.com
Software Engineer @ Zürich, Switzerland
http://code.delroth.net/

…t, added optional game id column, and added config entry to disable making compressed games blue

YourGamesBeOver · 2014-06-05T19:47:14Z

All fixed

delroth · 2014-06-05T20:02:21Z

@dolphin-emu-bot rebuild

Options for selecting which columns are visible in the game list.

delroth · 2014-06-05T22:46:46Z

Thanks for putting up with our nitpicking :)

delroth reviewed May 29, 2014
View reviewed changes

Source/Core/Core/ConfigManager.h

@@ -72,6 +72,16 @@ struct SConfig : NonCopyable

int m_ListSort;

int m_ListSort2;

bool m_showSystem;

This comment was marked as off-topic.

Sign in to view

delroth reviewed May 29, 2014
View reviewed changes

neobrain reviewed May 30, 2014
View reviewed changes

Source/Core/Core/ConfigManager.h

bool m_showSizeColumn;

bool m_showStateColumn;

// Toggles wether compressed titles show up in blue in the game list

This comment was marked as off-topic.

Sign in to view

added option for selecting which column are displayed in the game lis…

91840cb

…t, added optional game id column, and added config entry to disable making compressed games blue

delroth added a commit that referenced this pull request Jun 5, 2014

Merge pull request #435 from YourGamesBeOver/master

b780ef9

Options for selecting which columns are visible in the game list.

delroth merged commit b780ef9 into dolphin-emu:master Jun 5, 2014

Options for selecting which columns are visible in the game list. #435

Options for selecting which columns are visible in the game list. #435

YourGamesBeOver commented May 29, 2014

This comment was marked as off-topic.

delroth commented May 29, 2014

This comment was marked as off-topic.

YourGamesBeOver commented May 29, 2014

This comment was marked as off-topic.

This comment was marked as off-topic.

YourGamesBeOver commented May 29, 2014

lioncash commented May 29, 2014

delroth commented May 29, 2014

YourGamesBeOver commented May 30, 2014

YourGamesBeOver commented May 30, 2014

This comment was marked as off-topic.

neobrain commented May 30, 2014

YourGamesBeOver commented Jun 2, 2014

Linktothepast commented Jun 3, 2014

YourGamesBeOver commented Jun 3, 2014

neobrain commented Jun 4, 2014

YourGamesBeOver commented Jun 4, 2014

neobrain commented Jun 4, 2014

YourGamesBeOver commented Jun 4, 2014

YourGamesBeOver commented Jun 4, 2014

neobrain commented Jun 4, 2014

YourGamesBeOver commented Jun 5, 2014

delroth commented Jun 5, 2014

YourGamesBeOver commented Jun 5, 2014

delroth commented Jun 5, 2014

delroth commented Jun 5, 2014

Options for selecting which columns are visible in the game list. #435

Options for selecting which columns are visible in the game list. #435

Conversation

YourGamesBeOver commented May 29, 2014

This comment was marked as off-topic.

delroth commented May 29, 2014

This comment was marked as off-topic.

YourGamesBeOver commented May 29, 2014

This comment was marked as off-topic.

This comment was marked as off-topic.

YourGamesBeOver commented May 29, 2014

lioncash commented May 29, 2014

delroth commented May 29, 2014

YourGamesBeOver commented May 30, 2014

YourGamesBeOver commented May 30, 2014

This comment was marked as off-topic.

neobrain commented May 30, 2014

YourGamesBeOver commented Jun 2, 2014

Linktothepast commented Jun 3, 2014

YourGamesBeOver commented Jun 3, 2014

neobrain commented Jun 4, 2014

YourGamesBeOver commented Jun 4, 2014

neobrain commented Jun 4, 2014

YourGamesBeOver commented Jun 4, 2014

YourGamesBeOver commented Jun 4, 2014

neobrain commented Jun 4, 2014

YourGamesBeOver commented Jun 5, 2014

delroth commented Jun 5, 2014

YourGamesBeOver commented Jun 5, 2014

delroth commented Jun 5, 2014

delroth commented Jun 5, 2014