V1.7.1

About.cpp

@@ -41,13 +41,13 @@ About::About(wxWindow* parent,wxWindowID id,const wxPoint& pos,const wxSize& siz
 	Panel1 = new wxPanel(this, ID_PANEL1, wxPoint(0,0), wxSize(400,200), wxTAB_TRAVERSAL, _T("ID_PANEL1"));
 	Panel1->SetBackgroundColour(wxColour(202,209,247));
 	StaticBitmap1 = new wxStaticBitmap(Panel1, ID_STATICBITMAP1, showbitmap, wxPoint(250,50), wxSize(96,96), wxNO_BORDER, _T("ID_STATICBITMAP1"));
-	StaticText2 = new wxStaticText(Panel1, ID_STATICTEXT2, _T("MPC ASF 编辑器 V1.7"), wxPoint(130,24), wxDefaultSize, 0, _T("ID_STATICTEXT2"));
+	StaticText2 = new wxStaticText(Panel1, ID_STATICTEXT2, _T("MPC ASF 编辑器 V1.7.1"), wxPoint(130,24), wxDefaultSize, 0, _T("ID_STATICTEXT2"));
 	StaticText1 = new wxStaticText(Panel1, ID_STATICTEXT1, _T("GUI Framework："), wxPoint(55,60), wxDefaultSize, 0, _T("ID_STATICTEXT1"));
 	StaticText3 = new wxStaticText(Panel1, ID_STATICTEXT3, _T("图片解码库："), wxPoint(55,85), wxDefaultSize, 0, _T("ID_STATICTEXT3"));
 	StaticText4 = new wxStaticText(Panel1, ID_STATICTEXT4, _T("程序："), wxPoint(55,110), wxDefaultSize, 0, _T("ID_STATICTEXT4"));
 	StaticText5 = new wxStaticText(Panel1, ID_STATICTEXT5, _T("感谢："), wxPoint(55,135), wxDefaultSize, 0, _T("ID_STATICTEXT5"));
 	Button_OK = new wxButton(Panel1, ID_BUTTON1, _T("不忍直视"), wxPoint(265,165), wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON1"));
-	StaticText6 = new wxStaticText(Panel1, ID_STATICTEXT6, _T("2014.11.19"), wxPoint(136,160), wxDefaultSize, 0, _T("ID_STATICTEXT6"));
+	StaticText6 = new wxStaticText(Panel1, ID_STATICTEXT6, _T("2014.11.20"), wxPoint(136,160), wxDefaultSize, 0, _T("ID_STATICTEXT6"));
 	HyperlinkCtrl_MyWebPage = new wxHyperlinkCtrl(Panel1, ID_HYPERLINKCTRL1, _T("小试刀剑"), _T("http://hi.baidu.com/qndryqnqbmbbceq"), wxPoint(100,109), wxDefaultSize, wxHL_CONTEXTMENU|wxHL_ALIGN_CENTRE|wxNO_BORDER, _T("ID_HYPERLINKCTRL1"));
 	HyperlinkCtrl1 = new wxHyperlinkCtrl(Panel1, ID_HYPERLINKCTRL2, _T("Upwinded"), _T("http://tieba.baidu.com/p/2279039886"), wxPoint(100,134), wxDefaultSize, wxHL_CONTEXTMENU|wxHL_ALIGN_CENTRE|wxNO_BORDER, _T("ID_HYPERLINKCTRL2"));
 	HyperlinkCtrl2 = new wxHyperlinkCtrl(Panel1, ID_HYPERLINKCTRL3, _T("FreeImage"), _T("http://sourceforge.net/projects/freeimage/"), wxPoint(138,84), wxDefaultSize, wxHL_CONTEXTMENU|wxHL_ALIGN_CENTRE|wxNO_BORDER, _T("ID_HYPERLINKCTRL3"));

MpcAsfTool.cpp

@@ -120,6 +120,7 @@ BEGIN_EVENT_TABLE(MpcAsfTool,wxFrame)
     EVT_MENU(ID_FRAME_NEXT, MpcAsfTool::NextFrame)
     EVT_MENU(ID_RESIZE, MpcAsfTool::Resize)
     EVT_MENU(ID_RESIZECURRENT, MpcAsfTool::ResizeCurrent)
+    EVT_MENU(ID_SHOWHIDE_FILEEXPLORER, MpcAsfTool::OnFileExplorerWindow)
     EVT_MENU(wxID_HELP, MpcAsfTool::OnHelp)
     EVT_MENU(wxID_ABOUT, MpcAsfTool::OnAbout)
     EVT_MENU(ID_TRAVESAL, MpcAsfTool::OnTravesal)
@@ -529,6 +530,7 @@ MpcAsfTool::MpcAsfTool(wxWindow* parent,wxWindowID id,const wxPoint& pos,const w
     MpcAsfDrop *droptag = new MpcAsfDrop(this);
     SetDropTarget(droptag);
 
+	//Menu start
     wxMenu *menu_file = new wxMenu;
     menu_file->Append(wxID_NEW, wxT("新建...\tCtrl+N"));
     menu_file->Append(wxID_OPEN, wxT("打开...\tCtrl+O"));
@@ -537,31 +539,36 @@ MpcAsfTool::MpcAsfTool(wxWindow* parent,wxWindowID id,const wxPoint& pos,const w
     menu_file->Append(ID_EXPORT_TO_GIF, wxT("导出为 GIF..."));
     menu_file->Append(ID_EXPORT_TO_PNG, wxT("导出为 PNG..."));
     menu_file->Append(ID_BAT, wxT("图片批量导出...\tCtrl+P"));
-    menu_file->Append(wxID_EXIT, wxT("退出\tAlt+f4"));
+    menu_file->Append(wxID_EXIT, wxT("退出\tAlt+F4"));
     menu_file->Enable(wxID_SAVE, false);
     menu_file->Enable(wxID_SAVEAS, false);
     menu_file->Enable(ID_EXPORT_TO_GIF, false);
     menu_file->Enable(ID_EXPORT_TO_PNG, false);
+
     wxMenu *menu_frame = new wxMenu;
     menu_frame->Append(ID_FRAME_PREVIOUS, wxT("上一帧\tA"));
     menu_frame->Append(ID_FRAME_NEXT, wxT("下一帧\tD"));
     wxMenu *menu_process = new wxMenu;
-    menu_process->Append(ID_RESIZE, wxT("缩放所有..."));
-    menu_process->Append(ID_RESIZECURRENT, wxT("缩放当前帧..."));
+    menu_process->Append(ID_RESIZE, wxT("缩放所有...\tCtrl+R"));
+    menu_process->Append(ID_RESIZECURRENT, wxT("缩放当前帧...\tCtrl+L"));
+
+    wxMenu *menu_window = new wxMenu;
+    menu_window->Append(ID_SHOWHIDE_FILEEXPLORER, wxT("文件浏览窗口\tCtrl+E"));
+
     wxMenu *menu_help = new wxMenu;
     menu_help->Append(wxID_HELP,  wxT("帮助\tF1"));
     menu_help->Append(wxID_ABOUT, wxT("关于..."));
     wxMenu *menu_batpicconv = new wxMenu;
     menu_batpicconv->Append(ID_BAT_PIC_CANCLE, wxT("取消"));
 
     MenuBar_BatPicConv = new wxMenuBar();
-
     MenuBar_MpcAsfTool->Append(menu_file, wxT("文件(&F)"));
     MenuBar_MpcAsfTool->Append(menu_frame, wxT("帧(&I)"));
     MenuBar_MpcAsfTool->Append(menu_process, wxT("图像处理"));
+    MenuBar_MpcAsfTool->Append(menu_window, wxT("窗口"));
     MenuBar_MpcAsfTool->Append(menu_help, wxT("帮助(&H)"));
     MenuBar_BatPicConv->Append(menu_batpicconv, wxT("批处理"));
-
+	//Menu end
 
     ScrolledWindow_Setting->SetScrollRate(0, 20);
     ScrolledWindow_BmpShow->SetScrollRate(20, 20);
@@ -575,7 +582,6 @@ MpcAsfTool::MpcAsfTool(wxWindow* parent,wxWindowID id,const wxPoint& pos,const w
 
     //Pnaels
     m_fileExplorer = new FileExplorerPanel(this);
-    m_fileExplorer->Show();
 
     manager.Init();
 }
@@ -1109,6 +1115,11 @@ void MpcAsfTool::ResizeCurrent(wxCommandEvent& event)
     }
 }
 
+void MpcAsfTool::OnFileExplorerWindow(wxCommandEvent& event)
+{
+	m_fileExplorer->Show();
+}
+
 void MpcAsfTool::OnHelp(wxCommandEvent &event)
 {
     wxString exepath, execmd;

MpcAsfTool.depend

@@ -9555,7 +9555,7 @@
 1362620473 e:\programmingworkshop\_store_\jxqy\mpcasftool\app.h
 	<wx/app.h>
 
-1416470433 e:\programmingworkshop\_store_\jxqy\mpcasftool\mpcasftool.h
+1416472038 e:\programmingworkshop\_store_\jxqy\mpcasftool\mpcasftool.h
 	<wx/scrolwin.h>
 	<wx/sizer.h>
 	<wx/stattext.h>
@@ -9706,7 +9706,7 @@
 	"wx/filename.h"
 	<cstdlib>
 
-1416468809 source:e:\programmingworkshop\_store_\jxqy\mpcasftool\mpcasftool.cpp
+1416472160 source:e:\programmingworkshop\_store_\jxqy\mpcasftool\mpcasftool.cpp
 	"MpcAsfTool.h"
 	"DlgAddFrames.h"
 	"wx/filedlg.h"
@@ -13105,10 +13105,10 @@
 	"FileExplorerPanelBase.h"
 	"../MpcAsfTool.h"
 
-1416470097 source:e:\programmingworkshop\_store_\jxqy\mpcasftool\wxformbuilder\fileexplorerpanelbase.cpp
+1416472036 source:e:\programmingworkshop\_store_\jxqy\mpcasftool\wxformbuilder\fileexplorerpanelbase.cpp
 	"FileExplorerPanelBase.h"
 
-1416470125 e:\programmingworkshop\_store_\jxqy\mpcasftool\wxformbuilder\fileexplorerpanelbase.h
+1416471998 e:\programmingworkshop\_store_\jxqy\mpcasftool\wxformbuilder\fileexplorerpanelbase.h
 	<wx/artprov.h>
 	<wx/xrc/xmlres.h>
 	<wx/string.h>

MpcAsfTool.h

@@ -251,6 +251,7 @@ class MpcAsfTool: public wxFrame
 		void NextFrame(wxCommandEvent &event);
 		void Resize(wxCommandEvent &event);
 		void ResizeCurrent(wxCommandEvent &event);
+		void OnFileExplorerWindow(wxCommandEvent &event);
 		void OnHelp(wxCommandEvent &event);
 		void OnAbout(wxCommandEvent &event);
 		void OnTravesal(wxCommandEvent &event);
@@ -299,7 +300,8 @@ class MpcAsfTool: public wxFrame
             ID_RETURN,
             ID_BAT,
             ID_BAT_PIC_CANCLE,
-            ID_ANIMATE_TIMER
+            ID_ANIMATE_TIMER,
+            ID_SHOWHIDE_FILEEXPLORER
         };
 
         WorkManager manager;
@@ -338,12 +340,15 @@ class FileExplorerPanel: public FileExplorerPanelBase
 	FileExplorerPanel(wxWindow *parent)
 		:FileExplorerPanelBase(parent)
 	{
+		SetTitle(wxT("Îļþä¯ÀÀ"));
 		m_genericDirCtrl1->SetFilter(wxT("ALL|*.*|MPC ASF SPR RPC(*.mpc,*.asf,*.spr,*.rpc)|*.mpc;*.asf;*.spr;*.rpc|MPC(*.mpc)|*.mpc|ASF(*.asf)|*.asf|SPR(*.spr)|*.spr|RPC(*.rpc)|*.rpc"));
+		m_genericDirCtrl1->SetFilterIndex(1);
 		m_parent = (MpcAsfTool*)parent;
 	}
 protected:
 	virtual void OnFilterChange( wxCommandEvent& event );
 	virtual void OnTreeItemActivated( wxTreeEvent& event );
+	virtual void OnClose( wxCloseEvent& event ) { Show(false); }
 
 	MpcAsfTool *m_parent;
 };