piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3801 from Helios747/the_30_minute_blocker_fix

Browse Source 
[UI] Remove browse toolbar button and tweak empty gamelist message
This commit is contained in:
Mat M 2016-05-08 17:24:40 -04:00
commit c299a6a8cc
5 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/DolphinWX/Frame.cpp
View File

@ -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_RANGE(IDM_FLOAT_LOG_WINDOW, IDM_FLOAT_CODE_WINDOW, CFrame::OnFloatWindow)
EVT_MENU(IDM_NETPLAY, CFrame::OnNetPlay) EVT_MENU(IDM_NETPLAY, CFrame::OnNetPlay)
EVT_MENU(IDM_BROWSE, CFrame::OnBrowse)
EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard) EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard)
EVT_MENU(IDM_IMPORT_SAVE, CFrame::OnImportSave) EVT_MENU(IDM_IMPORT_SAVE, CFrame::OnImportSave)
EVT_MENU(IDM_EXPORT_ALL_SAVE, CFrame::OnExportAllSaves) EVT_MENU(IDM_EXPORT_ALL_SAVE, CFrame::OnExportAllSaves)

2
Source/Core/DolphinWX/Frame.h
View File

@ -174,7 +174,6 @@ private:
{ {
Toolbar_FileOpen, Toolbar_FileOpen,
Toolbar_Refresh, Toolbar_Refresh,
Toolbar_Browse,
Toolbar_Play, Toolbar_Play,
Toolbar_Stop, Toolbar_Stop,
Toolbar_Pause, Toolbar_Pause,
@ -259,7 +258,6 @@ private:
void OnOpen(wxCommandEvent& event); // File menu void OnOpen(wxCommandEvent& event); // File menu
void DoOpen(bool Boot); void DoOpen(bool Boot);
void OnRefresh(wxCommandEvent& event); void OnRefresh(wxCommandEvent& event);
void OnBrowse(wxCommandEvent& event);
void OnBootDrive(wxCommandEvent& event); void OnBootDrive(wxCommandEvent& event);
void OnPlay(wxCommandEvent& event); // Emulation void OnPlay(wxCommandEvent& event); // Emulation

14
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -134,8 +134,6 @@ wxMenuBar* CFrame::CreateMenu()
fileMenu->AppendSeparator(); fileMenu->AppendSeparator();
fileMenu->Append(wxID_REFRESH, GetMenuLabel(HK_REFRESH_LIST)); fileMenu->Append(wxID_REFRESH, GetMenuLabel(HK_REFRESH_LIST));
fileMenu->AppendSeparator(); fileMenu->AppendSeparator();
fileMenu->Append(IDM_BROWSE, _("&Browse for ISOs..."));
fileMenu->AppendSeparator();
fileMenu->Append(wxID_EXIT, _("E&xit") + wxString("\tAlt+F4")); fileMenu->Append(wxID_EXIT, _("E&xit") + wxString("\tAlt+F4"));
menubar->Append(fileMenu, _("&File")); 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_OPEN, _("Open"), m_Bitmaps[Toolbar_FileOpen], _("Open file..."));
WxUtils::AddToolbarButton(ToolBar, wxID_REFRESH, _("Refresh"), m_Bitmaps[Toolbar_Refresh], _("Refresh game list")); 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(); ToolBar->AddSeparator();
WxUtils::AddToolbarButton(ToolBar, IDM_PLAY, _("Play"), m_Bitmaps[Toolbar_Play], _("Play")); WxUtils::AddToolbarButton(ToolBar, IDM_PLAY, _("Play"), m_Bitmaps[Toolbar_Play], _("Play"));
WxUtils::AddToolbarButton(ToolBar, IDM_STOP, _("Stop"), m_Bitmaps[Toolbar_Stop], _("Stop")); 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_FileOpen ].LoadFile(dir + "open.png", wxBITMAP_TYPE_PNG);
m_Bitmaps[Toolbar_Refresh ].LoadFile(dir + "refresh.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_Play ].LoadFile(dir + "play.png", wxBITMAP_TYPE_PNG);
m_Bitmaps[Toolbar_Stop ].LoadFile(dir + "stop.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); 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 // Create screenshot
void CFrame::OnScreenshot(wxCommandEvent& WXUNUSED (event)) void CFrame::OnScreenshot(wxCommandEvent& WXUNUSED (event))
{ {
@ -1727,7 +1714,6 @@ void CFrame::UpdateGUI()
GetMenuBar()->FindItem(wxID_OPEN)->Enable(!Initialized); GetMenuBar()->FindItem(wxID_OPEN)->Enable(!Initialized);
GetMenuBar()->FindItem(IDM_DRIVES)->Enable(!Initialized); GetMenuBar()->FindItem(IDM_DRIVES)->Enable(!Initialized);
GetMenuBar()->FindItem(wxID_REFRESH)->Enable(!Initialized); GetMenuBar()->FindItem(wxID_REFRESH)->Enable(!Initialized);
GetMenuBar()->FindItem(IDM_BROWSE)->Enable(!Initialized);
// Emulation // Emulation
GetMenuBar()->FindItem(IDM_STOP)->Enable(Running || Paused); GetMenuBar()->FindItem(IDM_STOP)->Enable(Running || Paused);

2
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -330,7 +330,7 @@ void CGameListCtrl::Update()
} }
else 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, ""); InsertColumn(0, "");
long index = InsertItem(0, errorString); long index = InsertItem(0, errorString);

1
Source/Core/DolphinWX/Globals.h
View File

@ -105,7 +105,6 @@ enum
IDM_TOGGLE_DUMP_AUDIO, IDM_TOGGLE_DUMP_AUDIO,
// File menu // File menu
IDM_BROWSE,
IDM_DRIVES, IDM_DRIVES,
IDM_DRIVE1, IDM_DRIVE1,
IDM_DRIVE24 = IDM_DRIVE1 + 23,//248, IDM_DRIVE24 = IDM_DRIVE1 + 23,//248,