piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 23:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

filesystemviewer looks better and extracts files correctly. added stdafx.h as a force include for ogl, daco was having problems without it.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@830 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2008-10-10 15:32:23 +00:00
parent 223a77db49
commit 671fb9def1
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/DolphinWX/Src/FilesystemViewer.cpp
View File

@ -153,6 +153,7 @@ void CFilesystemViewer::CreateGUIControls()
// ISO Details // ISO Details
sbISODetails = new wxStaticBoxSizer(wxVERTICAL, this, wxT("ISO Details:")); sbISODetails = new wxStaticBoxSizer(wxVERTICAL, this, wxT("ISO Details:"));
sISODetails = new wxGridBagSizer(0, 0); sISODetails = new wxGridBagSizer(0, 0);
sISODetails->AddGrowableCol(1);
m_NameText = new wxStaticText(this, ID_NAME_TEXT, wxT("Name:"), wxDefaultPosition, wxDefaultSize); m_NameText = new wxStaticText(this, ID_NAME_TEXT, wxT("Name:"), wxDefaultPosition, wxDefaultSize);
m_Name = new wxTextCtrl(this, ID_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY); m_Name = new wxTextCtrl(this, ID_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
m_SerialText = new wxStaticText(this, ID_SERIAL_TEXT, wxT("Serial:"), wxDefaultPosition, wxDefaultSize); m_SerialText = new wxStaticText(this, ID_SERIAL_TEXT, wxT("Serial:"), wxDefaultPosition, wxDefaultSize);
@ -167,7 +168,7 @@ void CFilesystemViewer::CreateGUIControls()
m_TOC = new wxTextCtrl(this, ID_TOC, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY); m_TOC = new wxTextCtrl(this, ID_TOC, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
sISODetails->Add(m_NameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); sISODetails->Add(m_NameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
sISODetails->Add(m_Name, wxGBPosition(0, 1), wxGBSpan(1, 25), wxEXPAND|wxALL, 5); sISODetails->Add(m_Name, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
sISODetails->Add(m_SerialText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); sISODetails->Add(m_SerialText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
sISODetails->Add(m_Serial, wxGBPosition(1, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5); sISODetails->Add(m_Serial, wxGBPosition(1, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
sISODetails->Add(m_CountryText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); sISODetails->Add(m_CountryText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
@ -179,7 +180,7 @@ void CFilesystemViewer::CreateGUIControls()
sISODetails->Add(m_TOCText, wxGBPosition(5, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5); sISODetails->Add(m_TOCText, wxGBPosition(5, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
sISODetails->Add(m_TOC, wxGBPosition(5, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5); sISODetails->Add(m_TOC, wxGBPosition(5, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
sbISODetails->Add(sISODetails, 0, wxEXPAND, 0); sbISODetails->Add(sISODetails, 0, wxEXPAND, 5);
// Banner Details // Banner Details
wxArrayString arrayStringFor_Lang; wxArrayString arrayStringFor_Lang;
@ -265,6 +266,8 @@ void CFilesystemViewer::OnRightClick(wxMouseEvent& WXUNUSED (event))
void CFilesystemViewer::OnRightClickOnTree(wxTreeEvent& event) void CFilesystemViewer::OnRightClickOnTree(wxTreeEvent& event)
{ {
m_Treectrl->SelectItem(event.GetItem());
wxMenu popupMenu; wxMenu popupMenu;
popupMenu.Append(IDM_EXTRACTFILE, wxString::FromAscii("Extract File...")); popupMenu.Append(IDM_EXTRACTFILE, wxString::FromAscii("Extract File..."));
popupMenu.Append(IDM_REPLACEFILE, wxString::FromAscii("Replace File...")); popupMenu.Append(IDM_REPLACEFILE, wxString::FromAscii("Replace File..."));
@ -288,9 +291,12 @@ void CFilesystemViewer::OnExtractFile(wxCommandEvent& WXUNUSED (event))
{ {
wxString Path; wxString Path;
wxString File; wxString File;
File = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
Path = wxFileSelector( Path = wxFileSelector(
_T("Export File"), _T("Export File"),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, File, wxEmptyString,
wxString::Format wxString::Format
( (
_T("All files (%s)|%s"), _T("All files (%s)|%s"),
@ -298,19 +304,28 @@ void CFilesystemViewer::OnExtractFile(wxCommandEvent& WXUNUSED (event))
), ),
wxFD_SAVE, wxFD_SAVE,
this); this);
File = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
if (!Path || !File) if (!Path || !File)
return; return;
while (m_Treectrl->GetItemParent(m_Treectrl->GetSelection()) != m_Treectrl->GetRootItem())
{
wxString temp;
temp = m_Treectrl->GetItemText(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
File = wxString::Format("%s\\%s", temp, File);
m_Treectrl->SelectItem(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
}
pFileSystem->ExportFile(File.mb_str(), Path.mb_str()); pFileSystem->ExportFile(File.mb_str(), Path.mb_str());
} }
void CFilesystemViewer::OnReplaceFile(wxCommandEvent& WXUNUSED (event)) void CFilesystemViewer::OnReplaceFile(wxCommandEvent& WXUNUSED (event))
{ {
wxMessageBox(_T("Not implemented yet."), _T("Sorry"), wxOK, this);
} }
void CFilesystemViewer::OnRenameFile(wxCommandEvent& WXUNUSED (event)) void CFilesystemViewer::OnRenameFile(wxCommandEvent& WXUNUSED (event))
{ {
wxMessageBox(_T("Not implemented yet."), _T("Sorry"), wxOK, this);
} }

4
Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9,00" Version="9.00"
Name="Plugin_VideoOGL" Name="Plugin_VideoOGL"
ProjectGUID="{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}" ProjectGUID="{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}"
RootNamespace="Plugin_VideoOGL" RootNamespace="Plugin_VideoOGL"
@ -285,7 +285,7 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3" DebugInformationFormat="3"
CompileAs="0" CompileAs="0"
ForcedIncludeFiles="" ForcedIncludeFiles="stdafx.h"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"