Skip to content

Commit

Permalink
mark
Browse files Browse the repository at this point in the history
  • Loading branch information
jxmp committed Nov 20, 2014
1 parent 20cc2c6 commit 5469f7b
Show file tree
Hide file tree
Showing 8 changed files with 726 additions and 85 deletions.
2 changes: 2 additions & 0 deletions MpcAsfTool.cbp
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@
<Unit filename="resource.rc">
<Option compilerVar="WINDRES" />
</Unit>
<Unit filename="wxFormBuilder/FileExplorerPanelBase.cpp" />
<Unit filename="wxFormBuilder/FileExplorerPanelBase.h" />
<Unit filename="wxsmith/About.wxs" />
<Unit filename="wxsmith/AdjustPositionDialog.wxs" />
<Unit filename="wxsmith/BatDialog.wxs" />
Expand Down
32 changes: 32 additions & 0 deletions MpcAsfTool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,10 @@ MpcAsfTool::MpcAsfTool(wxWindow* parent,wxWindowID id,const wxPoint& pos,const w
//Tab Sequence
InitTabSequence();

//Pnaels
m_fileExplorer = new FileExplorerPanel(this);
m_fileExplorer->Show();

manager.Init();
}

Expand Down Expand Up @@ -2061,3 +2065,31 @@ void MpcAsfTool::OnCheckBox_LockPicOffsetClick(wxCommandEvent& event)
}
RefreshBmpShow();
}

void FileExplorerPanel::OnFilterChange(wxCommandEvent& event)
{
switch(event.GetSelection())
{
case -1:
case 0:
m_genericDirCtrl1->SetFilterIndex(0);
break;
default:
m_genericDirCtrl1->SetFilterIndex(event.GetSelection());
break;
}
wxString path = m_genericDirCtrl1->GetPath();
m_genericDirCtrl1->ReCreateTree();
m_genericDirCtrl1->ExpandPath(path);
}

void FileExplorerPanel::OnTreeItemActivated(wxTreeEvent& event)
{
event.Skip();
wxString path = m_genericDirCtrl1->GetPath();
if(!wxFileName(path).IsDir())
{
m_parent->OpenFile(path);
}
}

104 changes: 101 additions & 3 deletions MpcAsfTool.depend
Original file line number Diff line number Diff line change
Expand Up @@ -9555,7 +9555,7 @@
1362620473 e:\programmingworkshop\_store_\jxqy\mpcasftool\app.h
<wx/app.h>

1416447329 e:\programmingworkshop\_store_\jxqy\mpcasftool\mpcasftool.h
1416470433 e:\programmingworkshop\_store_\jxqy\mpcasftool\mpcasftool.h
<wx/scrolwin.h>
<wx/sizer.h>
<wx/stattext.h>
Expand All @@ -9575,6 +9575,7 @@
"WorkManager.hpp"
"FocusSequence.h"
"AdjustPositionDialog.h"
"wxFormBuilder/FileExplorerPanelBase.h"

1416449794 e:\programmingworkshop\_store_\jxqy\mpcasftool\workmanager.hpp
"wx/image.h"
Expand Down Expand Up @@ -9644,7 +9645,7 @@
"wx/filename.h"
<fstream>

1416446556 source:e:\programmingworkshop\_store_\jxqy\mpcasftool\batdialog.cpp
1416451195 source:e:\programmingworkshop\_store_\jxqy\mpcasftool\batdialog.cpp
"BatDialog.h"
"wx/filedlg.h"
<wx/string.h>
Expand Down Expand Up @@ -9705,7 +9706,7 @@
"wx/filename.h"
<cstdlib>

1416451063 source:e:\programmingworkshop\_store_\jxqy\mpcasftool\mpcasftool.cpp
1416468809 source:e:\programmingworkshop\_store_\jxqy\mpcasftool\mpcasftool.cpp
"MpcAsfTool.h"
"DlgAddFrames.h"
"wx/filedlg.h"
Expand Down Expand Up @@ -13100,3 +13101,100 @@
"ResizeDialog.h"
<wx/string.h>

1416470269 e:\programmingworkshop\_store_\jxqy\mpcasftool\wxformbuilder\fileexplorerpanel.h
"FileExplorerPanelBase.h"
"../MpcAsfTool.h"

1416470097 source:e:\programmingworkshop\_store_\jxqy\mpcasftool\wxformbuilder\fileexplorerpanelbase.cpp
"FileExplorerPanelBase.h"

1416470125 e:\programmingworkshop\_store_\jxqy\mpcasftool\wxformbuilder\fileexplorerpanelbase.h
<wx/artprov.h>
<wx/xrc/xmlres.h>
<wx/string.h>
<wx/dirctrl.h>
<wx/gdicmn.h>
<wx/font.h>
<wx/colour.h>
<wx/settings.h>
<wx/combobox.h>
<wx/sizer.h>
<wx/panel.h>
<wx/frame.h>

1412631243 d:\protools\wxwidgets\wxwidgets-3.0\include\wx\xrc\xmlres.h
"wx/defs.h"
"wx/string.h"
"wx/dynarray.h"
"wx/arrstr.h"
"wx/datetime.h"
"wx/list.h"
"wx/gdicmn.h"
"wx/filesys.h"
"wx/bitmap.h"
"wx/icon.h"
"wx/artprov.h"
"wx/colour.h"
"wx/vector.h"
"wx/xrc/xmlreshandler.h"

1412631242 d:\protools\wxwidgets\wxwidgets-3.0\include\wx\filesys.h
"wx/defs.h"
"wx/stream.h"
"wx/datetime.h"
"wx/filename.h"
"wx/hashmap.h"

1412631243 d:\protools\wxwidgets\wxwidgets-3.0\include\wx\xrc\xmlreshandler.h
"wx/defs.h"
"wx/string.h"
"wx/artprov.h"
"wx/colour.h"
"wx/filesys.h"
"wx/imaglist.h"
"wx/window.h"

1412631242 d:\protools\wxwidgets\wxwidgets-3.0\include\wx\dirctrl.h
"wx/generic/dirctrlg.h"

1412631242 d:\protools\wxwidgets\wxwidgets-3.0\include\wx\generic\dirctrlg.h
"wx/treectrl.h"
"wx/dialog.h"
"wx/dirdlg.h"
"wx/choice.h"

1412631243 d:\protools\wxwidgets\wxwidgets-3.0\include\wx\treectrl.h
"wx/defs.h"
"wx/control.h"
"wx/treebase.h"
"wx/textctrl.h"
"wx/generic/treectlg.h"
"wx/msw/treectrl.h"
"wx/generic/treectlg.h"
"wx/generic/treectlg.h"
"wx/generic/treectlg.h"
"wx/generic/treectlg.h"
"wx/generic/treectlg.h"

1412631243 d:\protools\wxwidgets\wxwidgets-3.0\include\wx\treebase.h
"wx/defs.h"
"wx/window.h"
"wx/event.h"
"wx/dynarray.h"
"wx/itemid.h"

1412631242 d:\protools\wxwidgets\wxwidgets-3.0\include\wx\itemid.h

1412631242 d:\protools\wxwidgets\wxwidgets-3.0\include\wx\generic\treectlg.h
"wx/scrolwin.h"
"wx/pen.h"

1412631243 d:\protools\wxwidgets\wxwidgets-3.0\include\wx\msw\treectrl.h
"wx/textctrl.h"
"wx/dynarray.h"
"wx/treebase.h"
"wx/hashmap.h"

1416469083 source:e:\programmingworkshop\_store_\jxqy\mpcasftool\wxformbuilder\fileexplorerpanel.cpp
"FileExplorerPanel.h"

24 changes: 22 additions & 2 deletions MpcAsfTool.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
#include "WorkManager.hpp"
#include "FocusSequence.h"
#include "AdjustPositionDialog.h"


class FileExplorerPanel;
class MpcAsfTool: public wxFrame
{
public:
Expand Down Expand Up @@ -313,7 +314,8 @@ class MpcAsfTool: public wxFrame
unsigned long animateindex;
bool isplay;

AdjustPositionDialog *m_adjustPosDlg;
AdjustPositionDialog *m_adjustPosDlg;
FileExplorerPanel *m_fileExplorer;
};

class MpcAsfDrop:public wxFileDropTarget
Expand All @@ -326,6 +328,24 @@ class MpcAsfDrop:public wxFileDropTarget
private:
MpcAsfTool *mainfram;

};

#include "wxFormBuilder/FileExplorerPanelBase.h"

class FileExplorerPanel: public FileExplorerPanelBase
{
public:
FileExplorerPanel(wxWindow *parent)
:FileExplorerPanelBase(parent)
{
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_parent = (MpcAsfTool*)parent;
}
protected:
virtual void OnFilterChange( wxCommandEvent& event );
virtual void OnTreeItemActivated( wxTreeEvent& event );

MpcAsfTool *m_parent;
};

#endif
Loading

0 comments on commit 5469f7b

Please sign in to comment.