書庫を複製する機能を追加。

[tpi/lychee.git] / src / lychee / dlg_make.cpp

diff --git a/src/lychee/dlg_make.cpp b/src/lychee/dlg_make.cpp
index 04bd78f..f9c0449 100644 (file)
--- a/src/lychee/dlg_make.cpp
+++ b/src/lychee/dlg_make.cpp
@@ -107,28 +107,9 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
        MainFrame * frm_main = (MainFrame *) this->GetParent();\r
        wxString szArcPath = frm_main->fnArchive.GetPath();\r
 \r
-       // パス履歴読み込み。\r
-       for (size_t i = 0; i < frm_main->conf.GetHistoryCount(CONF_HISTORY_PATH); i++)\r
-       {\r
-               wxString sz = frm_main->conf.ReadHistory(CONF_HISTORY_PATH, i);\r
-               if (sz.IsEmpty())\r
-               {\r
-                       continue;\r
-               }\r
-\r
-               this->cbDir->Append(sz);\r
-       }\r
-       // 書庫名履歴読み込み。\r
-       for (size_t i = 0; i < frm_main->conf.GetHistoryCount(CONF_HISTORY_NAME); i++)\r
-       {\r
-               wxString sz = frm_main->conf.ReadHistory(CONF_HISTORY_NAME, i);\r
-               if (sz.IsEmpty())\r
-               {\r
-                       continue;\r
-               }\r
-\r
-               this->cbFileName->Append(sz);\r
-       }\r
+       // 履歴読み込み。\r
+       this->myLoadHistory(CONF_HISTORY_PATH, this->cbDir);\r
+       this->myLoadHistory(CONF_HISTORY_NAME, this->cbFileName);\r
 \r
        // パスを設定。\r
        this->cbDir->SetValue(szArcPath);\r
@@ -268,8 +249,7 @@ void MakeDialog::OnBtnDefault(wxCommandEvent&)
 \r
 void MakeDialog::OnBtnDesktop(wxCommandEvent&)\r
 {\r
-       wxFileName fn(wxFileName::GetHomeDir(), wxT("Desktop"));\r
-       this->cbDir->SetValue(fn.GetFullPath());\r
+       this->cbDir->SetValue(wxFileName(wxFileName::GetHomeDir(), wxT("Desktop")).GetFullPath());\r
 }\r
 \r
 void MakeDialog::OnBtnCurrent(wxCommandEvent&)\r
@@ -289,8 +269,7 @@ void MakeDialog::OnBtnBrowse(wxCommandEvent&)
 \r
 void MakeDialog::OnBtnBrowseKF(wxCommandEvent&)\r
 {\r
-       wxFileDialog fd(this);\r
-       fd.SetWindowStyleFlag(wxFD_OPEN | wxFD_FILE_MUST_EXIST);\r
+       wxFileDialog fd(this, _("Choose a key file"), wxEmptyString, wxEmptyString, wxFileSelectorDefaultWildcardStr, wxFD_OPEN | wxFD_FILE_MUST_EXIST);\r
        if (fd.ShowModal() == wxID_OK)\r
        {\r
                this->tcKeyfile->SetValue(fd.GetPath());\r
@@ -455,6 +434,19 @@ void MakeDialog::OnTabChanged(wxNotebookEvent& e)
        this->lcFiles->SetItemCount(this->lcFiles->asInput->GetCount());\r
 }\r
 \r
+void MakeDialog::myLoadHistory(myConfigId confId, wxComboBox * cb)\r
+{\r
+       MainFrame * frm_main = (MainFrame *) this->GetParent();\r
+       for (size_t i = 0; i < frm_main->conf.GetHistoryCount(confId); i++)\r
+       {\r
+               wxString sz = frm_main->conf.ReadHistory(confId, i);\r
+               if (! sz.IsEmpty())\r
+               {\r
+                       cb->Append(sz);\r
+               }\r
+       }\r
+}\r
+\r
 //******************************************************************************\r
 // myListCtrl2\r
 //******************************************************************************\r