From 12b172d56dd4369878ec29384c9c358f5abaf1e4 Mon Sep 17 00:00:00 2001 From: sirakaba Date: Sun, 18 Oct 2009 07:39:37 +0000 Subject: [PATCH] =?utf8?q?=E3=82=B9=E3=83=86=E3=83=BC=E3=82=BF=E3=82=B9?= =?utf8?q?=E3=83=90=E3=83=BC=E3=81=AE=E5=A4=89=E6=9B=B4=E3=81=AB=E4=BC=B4?= =?utf8?q?=E3=81=86=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@65 9df91469-1e22-0410-86e7-ea8537beb833 --- src/frontend/dlg_make.cpp | 4 ++-- src/frontend/frm_main.cpp | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/frontend/dlg_make.cpp b/src/frontend/dlg_make.cpp index d837c3f..1cfafc6 100644 --- a/src/frontend/dlg_make.cpp +++ b/src/frontend/dlg_make.cpp @@ -115,7 +115,7 @@ void MakeDialog::OnInit(wxInitDialogEvent&) this->tcComment->SetEditable(false); // ‰Šú’l‚ðÝ’èB - wxFileName fnArchive(((MainFrame *) this->GetParent())->statusbar->GetStatusText(5)); + wxFileName fnArchive(((MainFrame *) this->GetParent())->statusbar->GetStatusText(4)); this->cbDir->SetValue(fnArchive.GetPath()); this->cbFileName->SetValue(fnArchive.GetFullName()); @@ -178,7 +178,7 @@ void MakeDialog::OnBtnDesktop(wxCommandEvent&) void MakeDialog::OnBtnCurrent(wxCommandEvent&) { - this->cbDir->SetValue(wxFileName::FileName(((MainFrame *) this->GetParent())->statusbar->GetStatusText(5)).GetPath()); + this->cbDir->SetValue(wxFileName::FileName(((MainFrame *) this->GetParent())->statusbar->GetStatusText(4)).GetPath()); } void MakeDialog::OnBtnBrowse(wxCommandEvent&) diff --git a/src/frontend/frm_main.cpp b/src/frontend/frm_main.cpp index c45c3c9..f643d3d 100644 --- a/src/frontend/frm_main.cpp +++ b/src/frontend/frm_main.cpp @@ -249,7 +249,7 @@ void MainFrame::OnArcCreate(wxCommandEvent& e) // ‚ ‚Ü‚è‚æ‚¢Žd—l‚Å‚Í‚È‚¢‚ª“®‚­‚Ì‚Å‚Æ‚è‚ ‚¦‚¸•ú’uB this->fnLastOpenPath = wxFileName::FileName(fd.GetDirectory()); swInfo.fnDestinationDirectory = wxFileName::DirName(this->fnLastOpenPath.GetFullPath()); - this->statusbar->SetStatusText(swInfo.fnDestinationDirectory.GetFullPath(), 5); + this->statusbar->SetStatusText(swInfo.fnDestinationDirectory.GetFullPath(), 4); fd.GetFilenames(mkDlg.files); } @@ -280,10 +280,10 @@ void MainFrame::OnArcCreate(wxCommandEvent& e) // ƒ_ƒCƒAƒƒO‚ð•\Ž¦B if (mkDlg.ShowModal() == wxID_CANCEL) { - this->statusbar->SetStatusText(wxEmptyString, 5); + this->statusbar->SetStatusText(wxEmptyString, 4); return; } - this->statusbar->SetStatusText(wxEmptyString, 5); + this->statusbar->SetStatusText(wxEmptyString, 4); // ŠeŽíÝ’èB swInfo.fStoreDirectoryPathes= ! mkDlg.cbIgnorePath->IsChecked(); @@ -572,7 +572,7 @@ void MainFrame::OnArcAdd(wxCommandEvent& e) swInfo.fnDestinationDirectory = wxFileName::DirName(fd.GetDirectory()); swInfo.fMakeSFX = false; swInfo.pCustomSwitches = NULL; - wxString szArcName = this->statusbar->GetStatusText(5); + wxString szArcName = this->statusbar->GetStatusText(4); ProcessDialog procDlg; ::wxXmlResource::Get()->Load(FE_DIR_S_XRC wxT("dlg_process.xrc")); @@ -653,7 +653,7 @@ void MainFrame::OnArcExtract(wxCommandEvent& e) // •K—v‚Ȃ珑ŒÉ–¼‚ŃfƒBƒŒƒNƒgƒŠ‚ðì¬‚·‚éB if (WillMakeDirByArcName(this, & mkDlg)) { - swInfo.fnDestinationDirectory = MakeDirPath(swInfo.fnDestinationDirectory, wxFileName::FileName(this->statusbar->GetStatusText(5)).GetName(), true); + swInfo.fnDestinationDirectory = MakeDirPath(swInfo.fnDestinationDirectory, wxFileName::FileName(this->statusbar->GetStatusText(4)).GetName(), true); if (! swInfo.fnDestinationDirectory.IsOk()) { ::ErrDlg(wxT("Unable to make the destination directory!"), this); @@ -667,7 +667,7 @@ void MainFrame::OnArcExtract(wxCommandEvent& e) ::wxXmlResource::Get()->LoadDialog(& procDlg, this, wxT("dlg_process")); procDlg.InitDialog(); procDlg.Show(true); - int nErrorCode = this->ErrorCheck(this->tpi.Command(TPI_COMMAND_EXTRACT, & swInfo, this->statusbar->GetStatusText(5), mkDlg.files)); + int nErrorCode = this->ErrorCheck(this->tpi.Command(TPI_COMMAND_EXTRACT, & swInfo, this->statusbar->GetStatusText(4), mkDlg.files)); procDlg.Show(false); if (nMode == 0) @@ -744,7 +744,7 @@ void MainFrame::OnArcDelete(wxCommandEvent& e) // ŠeŽíÝ’èB TPI_SWITCHES swInfo; - wxString szArcName = this->statusbar->GetStatusText(5); + wxString szArcName = this->statusbar->GetStatusText(4); wxArrayString files = MakeTargetFileList(this, false); ProcessDialog procDlg; @@ -771,7 +771,7 @@ void MainFrame::OnArcTest(wxCommandEvent&) ::wxXmlResource::Get()->LoadDialog(& procDlg, this, wxT("dlg_process")); procDlg.InitDialog(); procDlg.Show(true); - if (this->ErrorCheck(this->tpi.Command(TPI_COMMAND_TEST, & swInfo, this->statusbar->GetStatusText(5), files)) == TPI_ERROR_SUCCESS) + if (this->ErrorCheck(this->tpi.Command(TPI_COMMAND_TEST, & swInfo, this->statusbar->GetStatusText(4), files)) == TPI_ERROR_SUCCESS) { ::MsgDlg(wxT("This is a correct archive."), & procDlg, wxICON_INFORMATION); } @@ -789,7 +789,7 @@ void MainFrame::OnArcRepair(wxCommandEvent&) ::wxXmlResource::Get()->LoadDialog(& procDlg, this, wxT("dlg_process")); procDlg.InitDialog(); procDlg.Show(true); - this->ErrorCheck(this->tpi.Command(TPI_COMMAND_REPAIR, & swInfo, this->statusbar->GetStatusText(5), files)); + this->ErrorCheck(this->tpi.Command(TPI_COMMAND_REPAIR, & swInfo, this->statusbar->GetStatusText(4), files)); procDlg.Show(false); } @@ -918,7 +918,7 @@ int MainFrame::LoadTPI(wxString & szFileName) void MainFrame::ConvertArc(bool fToSFX) { // •Û‘¶æ‚ðq‚Ë‚éB - wxFileName fnArchive(this->statusbar->GetStatusText(5)); + wxFileName fnArchive(this->statusbar->GetStatusText(4)); wxFileDialog fd(this, fToSFX ? wxT("Save as SFX") : wxT("Save as normal archive"), fnArchive.GetPath(wxPATH_GET_VOLUME), fnArchive.GetName() + (fToSFX ? EXE_EXT : (wxString) wxEmptyString)); fd.SetWindowStyleFlag(wxFD_SAVE | wxFD_OVERWRITE_PROMPT); if (fd.ShowModal() == wxID_CANCEL) -- 2.11.0