[UI] Remove browse toolbar button and tweak empty gamelist message

Removed some related functions
dolphin-emu · Apr 30, 2016 · a8eb3e3 · a8eb3e3
1 parent 3033096
commit a8eb3e3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 18 deletions.
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
@@ -272,7 +272,6 @@ EVT_MENU(IDM_NO_DOCKING, CFrame::OnPerspectiveMenu)
 EVT_MENU_RANGE(IDM_FLOAT_LOG_WINDOW, IDM_FLOAT_CODE_WINDOW, CFrame::OnFloatWindow)
 
 EVT_MENU(IDM_NETPLAY, CFrame::OnNetPlay)
-EVT_MENU(IDM_BROWSE, CFrame::OnBrowse)
 EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard)
 EVT_MENU(IDM_IMPORT_SAVE, CFrame::OnImportSave)
 EVT_MENU(IDM_EXPORT_ALL_SAVE, CFrame::OnExportAllSaves)

diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h
@@ -174,7 +174,6 @@ class CFrame : public CRenderFrame
 	{
 		Toolbar_FileOpen,
 		Toolbar_Refresh,
-		Toolbar_Browse,
 		Toolbar_Play,
 		Toolbar_Stop,
 		Toolbar_Pause,

diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
@@ -134,8 +134,6 @@ wxMenuBar* CFrame::CreateMenu()
 	fileMenu->AppendSeparator();
 	fileMenu->Append(wxID_REFRESH, GetMenuLabel(HK_REFRESH_LIST));
 	fileMenu->AppendSeparator();
-	fileMenu->Append(IDM_BROWSE, _("&Browse for ISOs..."));
-	fileMenu->AppendSeparator();
 	fileMenu->Append(wxID_EXIT, _("E&xit") + wxString("\tAlt+F4"));
 	menubar->Append(fileMenu, _("&File"));
 
@@ -544,7 +542,6 @@ void CFrame::PopulateToolbar(wxToolBar* ToolBar)
 
 	WxUtils::AddToolbarButton(ToolBar, wxID_OPEN,               _("Open"),        m_Bitmaps[Toolbar_FileOpen],    _("Open file..."));
 	WxUtils::AddToolbarButton(ToolBar, wxID_REFRESH,            _("Refresh"),     m_Bitmaps[Toolbar_Refresh],     _("Refresh game list"));
-	WxUtils::AddToolbarButton(ToolBar, IDM_BROWSE,              _("Browse"),      m_Bitmaps[Toolbar_Browse],      _("Browse for an ISO directory..."));
 	ToolBar->AddSeparator();
 	WxUtils::AddToolbarButton(ToolBar, IDM_PLAY,                _("Play"),        m_Bitmaps[Toolbar_Play],        _("Play"));
 	WxUtils::AddToolbarButton(ToolBar, IDM_STOP,                _("Stop"),        m_Bitmaps[Toolbar_Stop],        _("Stop"));
@@ -590,7 +587,6 @@ void CFrame::InitBitmaps()
 
 	m_Bitmaps[Toolbar_FileOpen   ].LoadFile(dir + "open.png",       wxBITMAP_TYPE_PNG);
 	m_Bitmaps[Toolbar_Refresh    ].LoadFile(dir + "refresh.png",    wxBITMAP_TYPE_PNG);
-	m_Bitmaps[Toolbar_Browse     ].LoadFile(dir + "browse.png",     wxBITMAP_TYPE_PNG);
 	m_Bitmaps[Toolbar_Play       ].LoadFile(dir + "play.png",       wxBITMAP_TYPE_PNG);
 	m_Bitmaps[Toolbar_Stop       ].LoadFile(dir + "stop.png",       wxBITMAP_TYPE_PNG);
 	m_Bitmaps[Toolbar_Pause      ].LoadFile(dir + "pause.png",      wxBITMAP_TYPE_PNG);
@@ -1071,15 +1067,6 @@ void CFrame::OnRefresh(wxCommandEvent& WXUNUSED (event))
 	}
 }
 
-
-void CFrame::OnBrowse(wxCommandEvent& WXUNUSED (event))
-{
-	if (m_GameListCtrl)
-	{
-		m_GameListCtrl->BrowseForDirectory();
-	}
-}
-
 // Create screenshot
 void CFrame::OnScreenshot(wxCommandEvent& WXUNUSED (event))
 {
@@ -1727,7 +1714,6 @@ void CFrame::UpdateGUI()
 	GetMenuBar()->FindItem(wxID_OPEN)->Enable(!Initialized);
 	GetMenuBar()->FindItem(IDM_DRIVES)->Enable(!Initialized);
 	GetMenuBar()->FindItem(wxID_REFRESH)->Enable(!Initialized);
-	GetMenuBar()->FindItem(IDM_BROWSE)->Enable(!Initialized);
 
 	// Emulation
 	GetMenuBar()->FindItem(IDM_STOP)->Enable(Running || Paused);

diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp
@@ -329,7 +329,7 @@ void CGameListCtrl::Update()
 		}
 		else
 		{
-			errorString = _("Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to browse for files...");
+			errorString = _("Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to set a games directory...");
 		}
 		InsertColumn(0, "");
 		long index = InsertItem(0, errorString);

diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h
@@ -105,7 +105,6 @@ enum
 	IDM_TOGGLE_DUMP_AUDIO,
 
 	// File menu
-	IDM_BROWSE,
 	IDM_DRIVES,
 	IDM_DRIVE1,
 	IDM_DRIVE24 = IDM_DRIVE1 + 23,//248,