Mercurial > mercurial > hgweb_rsearcher.cgi
changeset 16:b651aa41b9d4 default tip
hhsinfo method (server)
| author | pyon@macmini |
|---|---|
| date | Mon, 15 Jul 2019 07:03:05 +0900 |
| parents | c262e17de9b1 |
| children | |
| files | Makefile app.conf go/mkidx.go go/server.go include/auth.h include/batchprint.h include/id.h include/index.h include/main.h include/mngdb.h include/net.h include/rsearcher.h searcherR.fbp src/batchprint.cpp src/index.cpp src/mngdb.cpp src/rsearcher.cpp |
| diffstat | 17 files changed, 2054 insertions(+), 248 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Jun 08 15:50:59 2019 +0900 +++ b/Makefile Mon Jul 15 07:03:05 2019 +0900 @@ -1,5 +1,5 @@ # Makefile for wxWidgets Application -# Last Change: 2019-05-29 … 15:43:02. +# Last Change: 2019-07-08 ŒŽ 17:58:49. # by Takayuki Mutoh # @@ -8,8 +8,8 @@ ### Variables ### OBJDIR = ./obj CXX = g++ -ARCH = 32 -#ARCH = 64 +#ARCH = 32 +ARCH = 64 LOCAL = C:/msys64/home/muto/local$(ARCH) vpath %.cpp ./src vpath %.h ./include @@ -40,6 +40,7 @@ $(OBJDIR)/auth.o \ $(OBJDIR)/mngdb.o \ $(OBJDIR)/index.o \ + $(OBJDIR)/batchprint.o \ $(OBJDIR)/net.o ifdef COMSPEC @@ -66,6 +67,9 @@ $(OBJDIR)/auth.o: auth.cpp auth.h id.h $(CXX) -c $< -o $@ $(CXXFLAGS) +$(OBJDIR)/batchprint.o: batchprint.cpp batchprint.h id.h + $(CXX) -c $< -o $@ $(CXXFLAGS) + $(OBJDIR)/index.o: index.cpp index.h id.h $(CXX) -c $< -o $@ $(CXXFLAGS) @@ -84,7 +88,6 @@ $(EXECUTABLE): $(PROGNAME) ifdef COMSPEC - strip --strip-all $(EXECUTABLE) ./$(PROGNAME).exe else -mkdir -p $(PROGNAME).app/Contents @@ -104,13 +107,20 @@ open $(PROGNAME).app endif +# for archive +TARFILE=$(shell date "+del_%Y%m%d.tgz") tgz: - tar cvfz a.tgz src include Makefile memo.txt + tar cvfz $(TARFILE) src include manual.pdf Makefile app.conf +# for release +release: + strip --strip-all $(EXECUTABLE) + +# clean clean: rm -f $(PROGNAME) $(PROGNAME).exe rm -f $(OBJDIR)/*.o rm -rf $(PROGNAME).app -.PHONY: all clean +.PHONY: all release tgz clean
--- a/app.conf Sat Jun 08 15:50:59 2019 +0900 +++ b/app.conf Mon Jul 15 07:03:05 2019 +0900 @@ -21,3 +21,9 @@ [Print] zoom=99 +[BatchPrint] +excel=E:\\hoge.xlsx +mask_name=1200x80+1000+75 +mask_no=960x80+1300+120 +mask_barcode=450x60+1000+160 +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/go/mkidx.go Mon Jul 15 07:03:05 2019 +0900 @@ -0,0 +1,96 @@ +package main + +import ( + "fmt" + "flag" + "io/ioutil" + "log" + "os" + "path/filepath" + "regexp" + "sort" + "strings" +) + +func main() { + var list = flag.Bool( "l", false, "list db." ) + var newest = flag.Bool( "n", false, "only save newest." ) + var output = flag.String( "o", "", "output filename." ) + var help = flag.Bool( "h", false, "print help." ) + flag.Parse() + + idxdb := "index.db" + + content, err := ioutil.ReadFile( idxdb ) + if err != nil { + log.Fatal( err ) + } + + if *list { + fmt.Printf( "%s", content ) + os.Exit( 0 ) + } + + if *help || flag.NArg()!= 1 { + fmt.Fprintf( os.Stderr, "$ mkidx [20201231]\n" ) + flag.PrintDefaults() + os.Exit( 1 ) + } + + if *output == "" { + *output = idxdb + } + + d := flag.Args()[0] + r, err := regexp.Compile( "^20[0-9]{6}$" ) + if err != nil { + log.Fatal( err ) + } + m := r.FindString( d ) + if len( m ) == 0 { + fmt.Fprintf( os.Stderr, "bad directory.\n" ) + os.Exit( 1 ) + } + + var hs []string + + fi, _ := os.Stat( d ) + if fi.IsDir() { + filepath.Walk( d, func( path string, info os.FileInfo, err error ) error { + if !info.IsDir() && strings.HasSuffix( path, ".tgz" ) { + h := strings.TrimSuffix( path, ".tgz" )[9:] + hs = append( hs, h + ":" + d ) + } + return nil + } ) + } else { + fmt.Fprintf( os.Stderr, "%s: not directory\n", d ) + log.Fatal( err ) + } + + for _, s := range strings.Split( string( content ), "\n" ) { + hs = append( hs, s ) + } + + sort.Strings( hs ) + var str string + + if !*newest { + for _, s := range hs { + str += s + "\n" + } + } else { + seen := make( map[string]int ) + for _, s := range hs { + if seen[s] == 0 { + str += s + "\n" + } + seen[s]++ + } + } + + if err := ioutil.WriteFile( *output, []byte( str ), 0644 ); err !=nil { + log.Fatal( err ) + } +} +
--- a/go/server.go Sat Jun 08 15:50:59 2019 +0900 +++ b/go/server.go Mon Jul 15 07:03:05 2019 +0900 @@ -1,7 +1,7 @@ /* server.go : server-program. - Version : 1.5 - Last Change: 2019-05-29 æ°´ 08:58:19. + Version : 1.6 + Last Change: 2019-07-15 Mon 06:34:42. install to: server_root/ @@ -14,9 +14,13 @@ import( "bufio" + "crypto/aes" + "crypto/cipher" + "encoding/hex" "flag" "fmt" "io" + "io/ioutil" "log" "net" "net/http" @@ -26,22 +30,49 @@ "time" ) +type hhs struct { + no string + name string + kana string + addr string + birth string + sex string +} + +func (h *hhs) String() string { + s := []string{h.no, h.name, h.kana, h.addr, h.birth, h.sex} + return strings.Join(s, ",") +} + +func (h *hhs) SString() string { + s := []string{h.no, h.name, h.kana} + return strings.Join(s, ",") +} + var ( version string server string - port string + port string server_root string logfile string not_ac bool wlfile string + + hdbfile string + key string + hhash map[string]hhs ) func init() { - version = "1.5" // piece-image version + version = "1.6" // 1.6: hhs info version port = ":3910" server_root = filepath.Dir(os.Args[0]) logfile = filepath.Join(server_root, "rsearcher.log") - wlfile = "rsearcher.whitelist" + wlfile = filepath.Join(server_root, "rsearcher.whitelist") + + hdbfile = filepath.Join(server_root, "db", "hhs.db") + key = "1234567890abcdef1234567890abcdef" // len = 32 + read_hhsdb() } func main() { @@ -67,12 +98,16 @@ // start Web-server fmt.Println("server start [", server, "] ( program version", version, ")") - http.HandleFunc("/", handler ) + http.HandleFunc("/", handler) http.HandleFunc("/upload/", upload_handler) - http.HandleFunc("/mngdb/", mngdb_handler ) + http.HandleFunc("/mngdb/", mngdb_handler) + http.HandleFunc("/hinfo/", hinfo_handler) + http.HandleFunc("/hlist/", hlist_handler) log.Fatal(http.ListenAndServe(server, nil)) } +/* å„種ãƒãƒ³ãƒ‰ãƒ© */ +// é™çš„ファイル func handler(w http.ResponseWriter, r *http.Request) { if !not_ac && !is_valid_host(r.RemoteAddr) { http.NotFound(w, r) @@ -100,6 +135,7 @@ io.Copy(w, f) } +// アップãƒãƒ¼ãƒ€ func upload_handler(w http.ResponseWriter, r *http.Request) { if !not_ac && !is_valid_host(r.RemoteAddr) { http.NotFound(w, r) @@ -123,6 +159,7 @@ w.Write([]byte(fmt.Sprintf("%d bytes are recieved.\n", n))) } +// データベースä¿å˜ func mngdb_handler(w http.ResponseWriter, r *http.Request) { if !not_ac && !is_valid_host(r.RemoteAddr) { http.NotFound(w, r) @@ -131,6 +168,7 @@ fmt.Println("[access]", r.RemoteAddr, "|", time.Now().Format("2006-01-02 15:04" ), "|", "/mngdb") write_log("[access] " + r.RemoteAddr + "manage-db") + db := r.URL.Path[len("/mngdb/"):] file := filepath.Join(server_root, "db", db) @@ -148,6 +186,40 @@ f.Close() } +// 被ä¿é™ºè€…æƒ…å ±å–å¾— +func hinfo_handler(w http.ResponseWriter, r *http.Request) { + if !not_ac && !is_valid_host(r.RemoteAddr) { + http.NotFound(w, r) + return + } + fmt.Println("[access]", r.RemoteAddr, "|", time.Now().Format("2006-01-02 15:04" ), "|", "/hinfo") + write_log("[access] " + r.RemoteAddr + "hinfo") + + h := r.URL.Path[len("/hinfo/"):] + hhs := hhash[h] + + w.Write([]byte(hhs.String())) +} + +func hlist_handler(w http.ResponseWriter, r *http.Request) { + if !not_ac && !is_valid_host(r.RemoteAddr) { + http.NotFound(w, r) + return + } + fmt.Println("[access]", r.RemoteAddr, "|", time.Now().Format("2006-01-02 15:04" ), "|", "/hlist") + write_log("[access] " + r.RemoteAddr + "list") + + hlist := r.URL.Path[len("/hlist/"):] + var s string + for _, h := range strings.Split(hlist, ":") { + hhs := hhash[h] + s += hhs.SString() + "\n" + } + + w.Write([]byte(s)) +} + +// ホワイトリスト判定 func is_valid_host(host string) bool { f, _ := os.Open(wlfile) defer f.Close() @@ -160,6 +232,39 @@ return false } +// 被ä¿é™ºè€…DBèªã¿è¾¼ã¿ +func read_hhsdb() { + hhash = make(map[string]hhs) + pt := decrypto(key, hdbfile) + for _, line := range strings.Split(pt, "\n") { + c := strings.Split(line, ",") + if len(c) == 6 { + hhash[c[0]] = hhs{no: c[0], name: c[1], kana: c[2], addr: c[3], birth: c[4], sex: c[5]} + } + } +} + +// 復å·åŒ– +func decrypto( key, file string ) string { + k, _ := hex.DecodeString(key) + block, err := aes.NewCipher(k) + if err != nil { + panic( err ) + } + ciphertext, err := ioutil.ReadFile(file) + if err != nil { + log.Fatal(err) + } + + iv := ciphertext[ :aes.BlockSize ] + plaintext := make([]byte, len(ciphertext[ aes.BlockSize: ])) + stream := cipher.NewCTR(block, iv) + stream.XORKeyStream(plaintext, ciphertext[ aes.BlockSize: ]) + + return string(plaintext) +} + +// ãƒã‚° func write_log(msg string) { f, err := os.OpenFile(logfile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if err != nil {
--- a/include/auth.h Sat Jun 08 15:50:59 2019 +0900 +++ b/include/auth.h Mon Jul 15 07:03:05 2019 +0900 @@ -1,9 +1,8 @@ // Filename : auth.h -// Last Change: 2018-10-31 … 11:06:01. +// Last Change: 2019-07-08 ŒŽ 08:46:18. // -#ifndef __AUTH_H__ -#define __AUTH_H__ +#pragma once #include <wx/gdicmn.h> #include <wx/font.h> @@ -53,5 +52,3 @@ void OnCheckPassword( wxCommandEvent& event ); }; -#endif //__AUTH_H__ -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/batchprint.h Mon Jul 15 07:03:05 2019 +0900 @@ -0,0 +1,59 @@ +// Filename : batchprint.h +// Last Change: 2019-07-09 ‰Î 08:18:52. +// + +#pragma once + +#include <wx/artprov.h> +#include <wx/xrc/xmlres.h> +#include <wx/gdicmn.h> +#include <wx/font.h> +#include <wx/colour.h> +#include <wx/settings.h> +#include <wx/string.h> +#include <wx/dataview.h> +#include <wx/listbox.h> +#include <wx/button.h> +#include <wx/sizer.h> +#include <wx/gbsizer.h> +#include <wx/frame.h> +#include <wx/stattext.h> +#include <wx/datectrl.h> +#include <wx/dateevt.h> +#include <wx/filepicker.h> + +class BatchPrintFrame : public wxFrame +{ + DECLARE_EVENT_TABLE() + private: + + protected: + wxStaticText* m_staticText; + wxFilePickerCtrl* m_filePicker; + wxButton* m_buttonLoad; + + wxDataViewListCtrl* m_dataViewListCtrl; + wxDataViewColumn* m_dataViewListColumnCheck; + wxDataViewColumn* m_dataViewListColumnNo; + wxDataViewColumn* m_dataViewListColumnHno; + wxDataViewColumn* m_dataViewListColumnName; + wxDataViewColumn* m_dataViewListColumnKana; + wxDataViewColumn* m_dataViewListColumnStatus; + + wxButton* m_buttonMaskPrint; + wxButton* m_buttonPrint; + wxButton* m_buttonUnCheckAll; + wxButton* m_buttonCheckAll; + wxButton* m_buttonClear; + wxButton* m_buttonDel; + wxButton* m_buttonClose; + + public: + BatchPrintFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL ); + ~BatchPrintFrame(); + + void OnCheckAll(); + void OnUnCheckAll(); + void OnClear(); +}; +
--- a/include/id.h Sat Jun 08 15:50:59 2019 +0900 +++ b/include/id.h Mon Jul 15 07:03:05 2019 +0900 @@ -1,9 +1,8 @@ // Filename : id.h -// Last Change: 2019-05-28 ‰Î 10:01:22. +// Last Change: 2019-07-09 ‰Î 08:08:05. // -#ifndef __ID_H__ -#define __ID_H__ +#pragma once #include <wx/wx.h> @@ -22,6 +21,8 @@ // invisible for shortcut-key ID_DLMAN, + ID_INDEX, + ID_BPRINT, ID_SLDR, ID_FOCUS, ID_PZOOM, @@ -43,9 +44,18 @@ ID_MNGEXIT, /* for index */ - ID_DPBGN, - ID_DPEND, + ID_DRIVE, + ID_YEAR, + ID_DATE, + ID_CCN, + + /* for batch-print */ + ID_LOAD, + ID_MANDP, + ID_CHECKALL, + ID_UNCHECKALL, + ID_CLEAR, + ID_DELETE, }; -#endif // __ID_H__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/index.h Mon Jul 15 07:03:05 2019 +0900 @@ -0,0 +1,56 @@ +// Filename : index.h +// Last Change: 2019-07-09 ‰Î 12:59:22. +// + +#pragma once + +#include <wx/xrc/xmlres.h> +#include <wx/scrolwin.h> +#include <wx/gdicmn.h> +#include <wx/font.h> +#include <wx/colour.h> +#include <wx/settings.h> +#include <wx/string.h> +#include <wx/icon.h> +#include <wx/textctrl.h> +#include <wx/dataview.h> +#include <wx/sizer.h> +#include <wx/frame.h> +#include <wx/stattext.h> +#include <wx/datectrl.h> +#include <wx/listbox.h> +#include <wx/dateevt.h> + +class IndexFrame : public wxFrame +{ + DECLARE_EVENT_TABLE() + private: + + protected: + wxStaticText* m_staticTextDrive; + wxChoice* m_choiceDrive; + wxStaticText* m_staticTextYear; + wxChoice* m_choiceYear; + wxStaticText* m_staticTextDate; + wxListBox* m_listBoxDate; + wxStaticText* m_staticTextCcn; + wxListBox* m_listBoxCcn; + + wxDataViewListCtrl* m_dataViewListCtrl; + wxDataViewColumn* m_dataViewListColumnNo; + wxDataViewColumn* m_dataViewListColumnHno; + wxDataViewColumn* m_dataViewListColumnName; + wxDataViewColumn* m_dataViewListColumnKana; + + public: + IndexFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxCAPTION|wxCLOSE_BOX|wxRESIZE_BORDER|wxTAB_TRAVERSAL ); + ~IndexFrame(); + + void OnDrive( wxCommandEvent& event ); + void OnYear( wxCommandEvent& event ); + void OnDate( wxCommandEvent& event ); + void OnCcn( wxCommandEvent& event ); + + void CreateControls( void ); +}; +
--- a/include/main.h Sat Jun 08 15:50:59 2019 +0900 +++ b/include/main.h Mon Jul 15 07:03:05 2019 +0900 @@ -1,6 +1,8 @@ // Filename : main.h -// Last Change: 2019-05-28 ‰Î 10:08:07. +// Last Change: 2019-07-08 ŒŽ 08:45:17. // +#pragma once + #include <wx/wx.h> #include <wx/config.h> #include <wx/fileconf.h>
--- a/include/mngdb.h Sat Jun 08 15:50:59 2019 +0900 +++ b/include/mngdb.h Mon Jul 15 07:03:05 2019 +0900 @@ -1,9 +1,8 @@ // Filename : mngdb.h -// Last Change: 2018-11-21 … 08:27:58. +// Last Change: 2019-07-15 Mon 06:54:37. // -#ifndef __MNGDB_H__ -#define __MNGDB_H__ +#pragma once #include <wx/gdicmn.h> #include <wx/font.h> @@ -46,10 +45,9 @@ void OnIndex( wxCommandEvent& event ); void OnExit( wxCommandEvent& event ); + void CreateControls( void ); void SetDBdir( wxString dir ); void SetServer( wxString server ) { m_server = server; }; void Upload( wxString file ); }; -#endif //__MNGDB_H__ -
--- a/include/net.h Sat Jun 08 15:50:59 2019 +0900 +++ b/include/net.h Mon Jul 15 07:03:05 2019 +0900 @@ -1,9 +1,8 @@ // Filename : net.h -// Last Change: 2019-05-24 金 16:03:16. +// Last Change: 2019-07-08 月 08:45:51. // -#ifndef __NET_H__ -#define __NET_H__ +#pragma once #include <wx/msgdlg.h> #include <wx/wfstream.h> @@ -25,5 +24,3 @@ void GetImages( wxString hhs, wxString date, wxString flag ); }; -#endif //__NET_H__ -
--- a/include/rsearcher.h Sat Jun 08 15:50:59 2019 +0900 +++ b/include/rsearcher.h Mon Jul 15 07:03:05 2019 +0900 @@ -1,9 +1,8 @@ // Filename : rsearcher.h -// Last Change: 2019-05-28 ‰Î 09:29:59. +// Last Change: 2019-07-08 ŒŽ 15:42:44. // -#ifndef __RSEARCH_H__ -#define __RSEARCH_H__ +#pragma once #include <wx/artprov.h> #include <wx/xrc/xmlres.h> @@ -165,6 +164,8 @@ wxButton* m_buttonSatellite; wxButton* m_buttonUpdateIndex; wxButton* m_buttonDLMan; + wxButton* m_buttonBPrint; + wxButton* m_buttonIndex; wxButton* m_buttonHelp; wxButton* m_buttonClose; wxButton* m_buttonLogout; @@ -217,9 +218,9 @@ void OnSatellite( wxCommandEvent& event ); void OnUpdateIndex( wxCommandEvent& event ); void OnDownloadManual( wxCommandEvent& event ); + void OnBatchPrint( wxCommandEvent& event ); + void OnIndex( wxCommandEvent& event ); void OnHelp( wxCommandEvent& event ); void OnLogout( wxCommandEvent& event ); }; -#endif // __RSEARCH_H__ -
--- a/searcherR.fbp Sat Jun 08 15:50:59 2019 +0900 +++ b/searcherR.fbp Mon Jul 15 07:03:05 2019 +0900 @@ -27,7 +27,7 @@ <property name="ui_table">UI</property> <property name="use_enum">1</property> <property name="use_microsoft_bom">0</property> - <object class="Frame" expanded="1"> + <object class="Frame" expanded="0"> <property name="aui_managed">0</property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="bg">0,153,227</property> @@ -54,16 +54,16 @@ <property name="window_name"></property> <property name="window_style">wxTAB_TRAVERSAL</property> <property name="xrc_skip_sizer">1</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">bSizerTop</property> <property name="orient">wxHORIZONTAL</property> <property name="permission">none</property> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxEXPAND | wxALL</property> <property name="proportion">1</property> - <object class="wxNotebook" expanded="1"> + <object class="wxNotebook" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -116,11 +116,11 @@ <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <object class="notebookpage" expanded="1"> + <object class="notebookpage" expanded="0"> <property name="bitmap"></property> <property name="label">Image-01</property> <property name="select">0</property> - <object class="wxScrolledWindow" expanded="1"> + <object class="wxScrolledWindow" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -175,11 +175,11 @@ <property name="window_style">wxHSCROLL|wxVSCROLL</property> </object> </object> - <object class="notebookpage" expanded="1"> + <object class="notebookpage" expanded="0"> <property name="bitmap"></property> <property name="label">Image-02</property> <property name="select">0</property> - <object class="wxScrolledWindow" expanded="1"> + <object class="wxScrolledWindow" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -234,11 +234,11 @@ <property name="window_style">wxHSCROLL|wxVSCROLL</property> </object> </object> - <object class="notebookpage" expanded="1"> + <object class="notebookpage" expanded="0"> <property name="bitmap"></property> <property name="label">Image-03</property> <property name="select">0</property> - <object class="wxScrolledWindow" expanded="1"> + <object class="wxScrolledWindow" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -293,11 +293,11 @@ <property name="window_style">wxHSCROLL|wxVSCROLL</property> </object> </object> - <object class="notebookpage" expanded="1"> + <object class="notebookpage" expanded="0"> <property name="bitmap"></property> <property name="label">a page</property> <property name="select">0</property> - <object class="wxScrolledWindow" expanded="1"> + <object class="wxScrolledWindow" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -352,11 +352,11 @@ <property name="window_style">wxHSCROLL|wxVSCROLL</property> </object> </object> - <object class="notebookpage" expanded="1"> + <object class="notebookpage" expanded="0"> <property name="bitmap"></property> <property name="label">a page</property> <property name="select">0</property> - <object class="wxScrolledWindow" expanded="1"> + <object class="wxScrolledWindow" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -411,11 +411,11 @@ <property name="window_style">wxHSCROLL|wxVSCROLL</property> </object> </object> - <object class="notebookpage" expanded="1"> + <object class="notebookpage" expanded="0"> <property name="bitmap"></property> <property name="label">Image-06</property> <property name="select">0</property> - <object class="wxScrolledWindow" expanded="1"> + <object class="wxScrolledWindow" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -472,20 +472,20 @@ </object> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxEXPAND</property> <property name="proportion">0</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">bSizerRight</property> <property name="orient">wxVERTICAL</property> <property name="permission">none</property> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL</property> <property name="proportion">0</property> - <object class="wxSearchCtrl" expanded="1"> + <object class="wxSearchCtrl" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -546,11 +546,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL</property> <property name="proportion">0</property> - <object class="wxTextCtrl" expanded="1"> + <object class="wxTextCtrl" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -610,11 +610,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> <property name="proportion">0</property> - <object class="wxTextCtrl" expanded="1"> + <object class="wxTextCtrl" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -674,11 +674,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> <property name="proportion">1</property> - <object class="wxDataViewListCtrl" expanded="1"> + <object class="wxDataViewListCtrl" expanded="0"> <property name="bg"></property> <property name="context_help"></property> <property name="context_menu">1</property> @@ -699,7 +699,7 @@ <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <object class="dataViewListColumn" expanded="1"> + <object class="dataViewListColumn" expanded="0"> <property name="align">wxALIGN_LEFT</property> <property name="ellipsize"></property> <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> @@ -710,7 +710,7 @@ <property name="type">Text</property> <property name="width">-1</property> </object> - <object class="dataViewListColumn" expanded="1"> + <object class="dataViewListColumn" expanded="0"> <property name="align">wxALIGN_LEFT</property> <property name="ellipsize"></property> <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> @@ -723,11 +723,11 @@ </object> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> <property name="proportion">0</property> - <object class="wxDataViewListCtrl" expanded="1"> + <object class="wxDataViewListCtrl" expanded="0"> <property name="bg"></property> <property name="context_help"></property> <property name="context_menu">1</property> @@ -748,7 +748,7 @@ <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <object class="dataViewListColumn" expanded="1"> + <object class="dataViewListColumn" expanded="0"> <property name="align">wxALIGN_LEFT</property> <property name="ellipsize"></property> <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> @@ -759,7 +759,7 @@ <property name="type">Text</property> <property name="width">-1</property> </object> - <object class="dataViewListColumn" expanded="1"> + <object class="dataViewListColumn" expanded="0"> <property name="align">wxALIGN_LEFT</property> <property name="ellipsize"></property> <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> @@ -770,7 +770,7 @@ <property name="type">Text</property> <property name="width">-1</property> </object> - <object class="dataViewListColumn" expanded="1"> + <object class="dataViewListColumn" expanded="0"> <property name="align">wxALIGN_LEFT</property> <property name="ellipsize"></property> <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> @@ -783,11 +783,11 @@ </object> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> <property name="proportion">0</property> - <object class="wxListBox" expanded="1"> + <object class="wxListBox" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -846,11 +846,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> <property name="proportion">1</property> - <object class="wxTextCtrl" expanded="1"> + <object class="wxTextCtrl" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -910,11 +910,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL</property> <property name="proportion">0</property> - <object class="wxSlider" expanded="1"> + <object class="wxSlider" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -975,11 +975,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="wxFlexGridSizer" expanded="1"> + <object class="wxFlexGridSizer" expanded="0"> <property name="cols">2</property> <property name="flexible_direction">wxBOTH</property> <property name="growablecols"></property> @@ -991,11 +991,11 @@ <property name="permission">none</property> <property name="rows">0</property> <property name="vgap">0</property> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL</property> <property name="proportion">0</property> - <object class="wxButton" expanded="1"> + <object class="wxButton" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1063,21 +1063,21 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxEXPAND</property> <property name="proportion">1</property> - <object class="spacer" expanded="1"> + <object class="spacer" expanded="0"> <property name="height">0</property> <property name="permission">protected</property> <property name="width">0</property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL</property> <property name="proportion">0</property> - <object class="wxButton" expanded="1"> + <object class="wxButton" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1145,11 +1145,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL</property> <property name="proportion">0</property> - <object class="wxSpinCtrl" expanded="1"> + <object class="wxSpinCtrl" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1213,7 +1213,7 @@ </object> </object> </object> - <object class="Dialog" expanded="1"> + <object class="Dialog" expanded="0"> <property name="aui_managed">0</property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="bg"></property> @@ -1239,7 +1239,7 @@ <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <object class="wxGridSizer" expanded="1"> + <object class="wxGridSizer" expanded="0"> <property name="cols">3</property> <property name="hgap">0</property> <property name="minimum_size"></property> @@ -1247,11 +1247,11 @@ <property name="permission">none</property> <property name="rows">0</property> <property name="vgap">0</property> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</property> <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> + <object class="wxStaticText" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1308,11 +1308,11 @@ <property name="wrap">-1</property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property> <property name="proportion">0</property> - <object class="wxTextCtrl" expanded="1"> + <object class="wxTextCtrl" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1372,11 +1372,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> + <object class="wxStaticText" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1433,11 +1433,11 @@ <property name="wrap">-1</property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</property> <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> + <object class="wxStaticText" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1494,11 +1494,11 @@ <property name="wrap">-1</property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property> <property name="proportion">0</property> - <object class="wxTextCtrl" expanded="1"> + <object class="wxTextCtrl" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1558,11 +1558,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> + <object class="wxStaticText" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1621,7 +1621,7 @@ </object> </object> </object> - <object class="Frame" expanded="1"> + <object class="Frame" expanded="0"> <property name="aui_managed">0</property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="bg"></property> @@ -1648,16 +1648,16 @@ <property name="window_name"></property> <property name="window_style">wxTAB_TRAVERSAL</property> <property name="xrc_skip_sizer">1</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">bSizerTop</property> <property name="orient">wxVERTICAL</property> <property name="permission">none</property> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALIGN_CENTER_HORIZONTAL</property> <property name="proportion">0</property> - <object class="wxFlexGridSizer" expanded="1"> + <object class="wxFlexGridSizer" expanded="0"> <property name="cols">2</property> <property name="flexible_direction">wxBOTH</property> <property name="growablecols"></property> @@ -1669,11 +1669,11 @@ <property name="permission">none</property> <property name="rows">0</property> <property name="vgap">0</property> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</property> <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> + <object class="wxStaticText" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1730,11 +1730,11 @@ <property name="wrap">-1</property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> <property name="proportion">0</property> - <object class="wxDatePickerCtrl" expanded="1"> + <object class="wxDatePickerCtrl" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1792,11 +1792,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</property> <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> + <object class="wxStaticText" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1853,11 +1853,11 @@ <property name="wrap">-1</property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property> <property name="proportion">0</property> - <object class="wxFilePickerCtrl" expanded="1"> + <object class="wxFilePickerCtrl" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1918,11 +1918,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</property> <property name="proportion">0</property> - <object class="wxStaticText" expanded="1"> + <object class="wxStaticText" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -1979,11 +1979,11 @@ <property name="wrap">-1</property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> <property name="proportion">0</property> - <object class="wxFilePickerCtrl" expanded="1"> + <object class="wxFilePickerCtrl" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -2046,11 +2046,11 @@ </object> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxEXPAND | wxALL</property> <property name="proportion">0</property> - <object class="wxStaticLine" expanded="1"> + <object class="wxStaticLine" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -2104,20 +2104,20 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALIGN_CENTER_HORIZONTAL</property> <property name="proportion">0</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">bSizerBtn</property> <property name="orient">wxHORIZONTAL</property> <property name="permission">none</property> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL</property> <property name="proportion">0</property> - <object class="wxButton" expanded="1"> + <object class="wxButton" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -2185,11 +2185,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL</property> <property name="proportion">0</property> - <object class="wxButton" expanded="1"> + <object class="wxButton" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -2257,11 +2257,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL</property> <property name="proportion">0</property> - <object class="wxButton" expanded="1"> + <object class="wxButton" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -2363,22 +2363,29 @@ <object class="wxBoxSizer" expanded="1"> <property name="minimum_size"></property> <property name="name">bSizerTop</property> - <property name="orient">wxVERTICAL</property> + <property name="orient">wxHORIZONTAL</property> <property name="permission">none</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALIGN_CENTER_HORIZONTAL</property> + <property name="flag">wxEXPAND</property> <property name="proportion">0</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxFlexGridSizer" expanded="1"> + <property name="cols">2</property> + <property name="flexible_direction">wxBOTH</property> + <property name="growablecols"></property> + <property name="growablerows"></property> + <property name="hgap">0</property> <property name="minimum_size"></property> - <property name="name">bSizerFilter</property> - <property name="orient">wxHORIZONTAL</property> + <property name="name">fgSizerSelect</property> + <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property> <property name="permission">none</property> + <property name="rows">0</property> + <property name="vgap">0</property> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> + <property name="flag">wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</property> <property name="proportion">0</property> - <object class="wxDatePickerCtrl" expanded="1"> + <object class="wxStaticText" expanded="1"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -2405,7 +2412,9 @@ <property name="font"></property> <property name="gripper">0</property> <property name="hidden">0</property> - <property name="id">ID_DPBGN</property> + <property name="id">wxID_ANY</property> + <property name="label">Drive</property> + <property name="markup">0</property> <property name="max_size"></property> <property name="maximize_button">0</property> <property name="maximum_size"></property> @@ -2413,7 +2422,7 @@ <property name="minimize_button">0</property> <property name="minimum_size"></property> <property name="moveable">1</property> - <property name="name">m_datePickerBgn</property> + <property name="name">m_staticTextDrive</property> <property name="pane_border">1</property> <property name="pane_position"></property> <property name="pane_size"></property> @@ -2423,7 +2432,68 @@ <property name="resize">Resizable</property> <property name="show">1</property> <property name="size"></property> - <property name="style">wxDP_DEFAULT</property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> + <property name="proportion">0</property> + <object class="wxChoice" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="choices">"server" "C:\\" "Y:\\" "Z:\\"</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="default_pane">0</property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">ID_DRIVE</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_choiceDrive</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="resize">Resizable</property> + <property name="selection">0</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> <property name="subclass">; ; forward_declare</property> <property name="toolbar_pane">0</property> <property name="tooltip"></property> @@ -2438,7 +2508,7 @@ </object> <object class="sizeritem" expanded="1"> <property name="border">5</property> - <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> + <property name="flag">wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</property> <property name="proportion">0</property> <object class="wxStaticText" expanded="1"> <property name="BottomDockable">1</property> @@ -2468,7 +2538,7 @@ <property name="gripper">0</property> <property name="hidden">0</property> <property name="id">wxID_ANY</property> - <property name="label">〜</property> + <property name="label">Year</property> <property name="markup">0</property> <property name="max_size"></property> <property name="maximize_button">0</property> @@ -2477,7 +2547,7 @@ <property name="minimize_button">0</property> <property name="minimum_size"></property> <property name="moveable">1</property> - <property name="name">m_staticText</property> + <property name="name">m_staticTextYear</property> <property name="pane_border">1</property> <property name="pane_position"></property> <property name="pane_size"></property> @@ -2501,7 +2571,71 @@ <property name="border">5</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> <property name="proportion">0</property> - <object class="wxDatePickerCtrl" expanded="1"> + <object class="wxChoice" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="choices"></property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="default_pane">0</property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">ID_DATE</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_choiceYear</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="resize">Resizable</property> + <property name="selection">0</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxALIGN_RIGHT</property> + <property name="proportion">0</property> + <object class="wxStaticText" expanded="1"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -2528,7 +2662,9 @@ <property name="font"></property> <property name="gripper">0</property> <property name="hidden">0</property> - <property name="id">ID_DPEND</property> + <property name="id">wxID_ANY</property> + <property name="label">Date</property> + <property name="markup">0</property> <property name="max_size"></property> <property name="maximize_button">0</property> <property name="maximum_size"></property> @@ -2536,7 +2672,67 @@ <property name="minimize_button">0</property> <property name="minimum_size"></property> <property name="moveable">1</property> - <property name="name">m_datePickerEnd</property> + <property name="name">m_staticTextDate</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">0</property> + <object class="wxListBox" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="choices"></property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="default_pane">0</property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_listBoxDate</property> <property name="pane_border">1</property> <property name="pane_position"></property> <property name="pane_size"></property> @@ -2546,7 +2742,131 @@ <property name="resize">Resizable</property> <property name="show">1</property> <property name="size"></property> - <property name="style">wxDP_DEFAULT</property> + <property name="style">wxLB_ALWAYS_SB|wxLB_SINGLE</property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL|wxALIGN_RIGHT</property> + <property name="proportion">0</property> + <object class="wxStaticText" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="default_pane">0</property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">Ccn</property> + <property name="markup">0</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_staticTextCcn</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">0</property> + <object class="wxListBox" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="choices"></property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="default_pane">0</property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_listBoxCcn</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style">wxLB_ALWAYS_SB|wxLB_SINGLE</property> <property name="subclass">; ; forward_declare</property> <property name="toolbar_pane">0</property> <property name="tooltip"></property> @@ -2587,10 +2907,21 @@ <property name="window_name"></property> <property name="window_style"></property> <object class="dataViewListColumn" expanded="1"> + <property name="align">wxALIGN_RIGHT</property> + <property name="ellipsize"></property> + <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> + <property name="label">No</property> + <property name="mode">wxDATAVIEW_CELL_INERT</property> + <property name="name">m_dataViewListColumnNo</property> + <property name="permission">protected</property> + <property name="type">Text</property> + <property name="width">-1</property> + </object> + <object class="dataViewListColumn" expanded="1"> <property name="align">wxALIGN_CENTER</property> <property name="ellipsize"></property> <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> - <property name="label">No</property> + <property name="label">HNo</property> <property name="mode">wxDATAVIEW_CELL_INERT</property> <property name="name">m_dataViewListColumnHno</property> <property name="permission">protected</property> @@ -2619,16 +2950,904 @@ <property name="type">Text</property> <property name="width">-1</property> </object> - <object class="dataViewListColumn" expanded="1"> - <property name="align">wxALIGN_LEFT</property> - <property name="ellipsize"></property> - <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> - <property name="label">Addr</property> - <property name="mode">wxDATAVIEW_CELL_INERT</property> - <property name="name">m_dataViewListColumnAddr</property> - <property name="permission">protected</property> - <property name="type">Text</property> - <property name="width">-1</property> + </object> + </object> + </object> + </object> + <object class="Frame" expanded="1"> + <property name="aui_managed">0</property> + <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> + <property name="bg"></property> + <property name="center">wxBOTH</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="enabled">1</property> + <property name="event_handler">impl_virtual</property> + <property name="extra_style"></property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">BatchPrintFrame</property> + <property name="pos"></property> + <property name="size">500,300</property> + <property name="style">wxDEFAULT_FRAME_STYLE</property> + <property name="subclass">; ; forward_declare</property> + <property name="title"></property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxTAB_TRAVERSAL</property> + <property name="xrc_skip_sizer">1</property> + <object class="wxBoxSizer" expanded="1"> + <property name="minimum_size"></property> + <property name="name">bSizerTop</property> + <property name="orient">wxHORIZONTAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="wxGridBagSizer" expanded="1"> + <property name="empty_cell_size"></property> + <property name="flexible_direction">wxBOTH</property> + <property name="growablecols"></property> + <property name="growablerows"></property> + <property name="hgap">0</property> + <property name="minimum_size"></property> + <property name="name">gbSizer</property> + <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property> + <property name="permission">none</property> + <property name="vgap">0</property> + <object class="gbsizeritem" expanded="1"> + <property name="border">5</property> + <property name="colspan">1</property> + <property name="column">0</property> + <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</property> + <property name="row">0</property> + <property name="rowspan">1</property> + <object class="wxStaticText" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="default_pane">0</property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="label">Excel File</property> + <property name="markup">0</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_staticText</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <property name="wrap">-1</property> + </object> + </object> + <object class="gbsizeritem" expanded="1"> + <property name="border">5</property> + <property name="colspan">1</property> + <property name="column">1</property> + <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> + <property name="row">0</property> + <property name="rowspan">1</property> + <object class="wxFilePickerCtrl" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="default_pane">0</property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="message">Select a file</property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_filePicker</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style">wxFLP_CHANGE_DIR|wxFLP_FILE_MUST_EXIST|wxFLP_OPEN|wxFLP_SMALL|wxFLP_USE_TEXTCTRL</property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="value"></property> + <property name="wildcard">*.xlsx</property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> + </object> + <object class="gbsizeritem" expanded="1"> + <property name="border">5</property> + <property name="colspan">1</property> + <property name="column">2</property> + <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> + <property name="row">0</property> + <property name="rowspan">1</property> + <object class="wxButton" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="bitmap"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="current"></property> + <property name="default">0</property> + <property name="default_pane">0</property> + <property name="disabled"></property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="focus"></property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">ID_LOAD</property> + <property name="label">Load</property> + <property name="margins"></property> + <property name="markup">0</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_buttonLoad</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="position"></property> + <property name="pressed"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> + </object> + <object class="gbsizeritem" expanded="1"> + <property name="border">5</property> + <property name="colspan">3</property> + <property name="column">0</property> + <property name="flag">wxALL|wxEXPAND</property> + <property name="row">1</property> + <property name="rowspan">1</property> + <object class="wxDataViewListCtrl" expanded="1"> + <property name="bg"></property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">m_dataViewListCtrl</property> + <property name="permission">protected</property> + <property name="pos"></property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <object class="dataViewListColumn" expanded="1"> + <property name="align">wxALIGN_CENTER|wxALIGN_LEFT</property> + <property name="ellipsize"></property> + <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> + <property name="label">Check</property> + <property name="mode">wxDATAVIEW_CELL_INERT</property> + <property name="name">m_dataViewListColumnCheck</property> + <property name="permission">protected</property> + <property name="type">Toggle</property> + <property name="width">-1</property> + </object> + <object class="dataViewListColumn" expanded="1"> + <property name="align">wxALIGN_RIGHT</property> + <property name="ellipsize"></property> + <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> + <property name="label">No</property> + <property name="mode">wxDATAVIEW_CELL_INERT</property> + <property name="name">m_dataViewListColumnNo</property> + <property name="permission">protected</property> + <property name="type">Text</property> + <property name="width">60</property> + </object> + <object class="dataViewListColumn" expanded="1"> + <property name="align">wxALIGN_CENTER</property> + <property name="ellipsize"></property> + <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> + <property name="label">Hno</property> + <property name="mode">wxDATAVIEW_CELL_INERT</property> + <property name="name">m_dataViewListColumnHno</property> + <property name="permission">protected</property> + <property name="type">Text</property> + <property name="width">100</property> + </object> + <object class="dataViewListColumn" expanded="1"> + <property name="align">wxALIGN_LEFT</property> + <property name="ellipsize"></property> + <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> + <property name="label">Name</property> + <property name="mode">wxDATAVIEW_CELL_INERT</property> + <property name="name">m_dataViewListColumnName</property> + <property name="permission">protected</property> + <property name="type">Text</property> + <property name="width">200</property> + </object> + <object class="dataViewListColumn" expanded="1"> + <property name="align">wxALIGN_LEFT</property> + <property name="ellipsize"></property> + <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> + <property name="label">Kana</property> + <property name="mode">wxDATAVIEW_CELL_INERT</property> + <property name="name">m_dataViewListColumnKana</property> + <property name="permission">protected</property> + <property name="type">Text</property> + <property name="width">200</property> + </object> + <object class="dataViewListColumn" expanded="1"> + <property name="align">wxALIGN_LEFT</property> + <property name="ellipsize"></property> + <property name="flags">wxDATAVIEW_COL_RESIZABLE</property> + <property name="label">Status</property> + <property name="mode">wxDATAVIEW_CELL_INERT</property> + <property name="name">m_dataViewListColumnStatus</property> + <property name="permission">protected</property> + <property name="type">Progress</property> + <property name="width">-1</property> + </object> + </object> + </object> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">0</property> + <object class="wxBoxSizer" expanded="1"> + <property name="minimum_size"></property> + <property name="name">bSizerButton</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">0</property> + <object class="wxButton" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="bitmap"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="current"></property> + <property name="default">0</property> + <property name="default_pane">0</property> + <property name="disabled"></property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="focus"></property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">ID_MANDP</property> + <property name="label">Mask & Print</property> + <property name="margins"></property> + <property name="markup">0</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_buttonMaskPrint</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="position"></property> + <property name="pressed"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">0</property> + <object class="wxButton" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="bitmap"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="current"></property> + <property name="default">0</property> + <property name="default_pane">0</property> + <property name="disabled"></property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="focus"></property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">wxID_PRINT</property> + <property name="label">Print</property> + <property name="margins"></property> + <property name="markup">0</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_buttonPrint</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="position"></property> + <property name="pressed"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag"></property> + <property name="proportion">0</property> + <object class="spacer" expanded="1"> + <property name="height">30</property> + <property name="permission">protected</property> + <property name="width">0</property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">0</property> + <object class="wxButton" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="bitmap"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="current"></property> + <property name="default">0</property> + <property name="default_pane">0</property> + <property name="disabled"></property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="focus"></property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">ID_UNALL</property> + <property name="label">UnCheck All</property> + <property name="margins"></property> + <property name="markup">0</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_buttonUnCheckAll</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="position"></property> + <property name="pressed"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">0</property> + <object class="wxButton" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="bitmap"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="current"></property> + <property name="default">0</property> + <property name="default_pane">0</property> + <property name="disabled"></property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="focus"></property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">ID_CHECKALL</property> + <property name="label">Check All</property> + <property name="margins"></property> + <property name="markup">0</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_buttonCheckAll</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="position"></property> + <property name="pressed"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="spacer" expanded="1"> + <property name="height">50</property> + <property name="permission">protected</property> + <property name="width">0</property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">0</property> + <object class="wxButton" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="bitmap"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="current"></property> + <property name="default">0</property> + <property name="default_pane">0</property> + <property name="disabled"></property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="focus"></property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">ID_CLEAR</property> + <property name="label">Clear</property> + <property name="margins"></property> + <property name="markup">0</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_buttonClear</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="position"></property> + <property name="pressed"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">0</property> + <object class="wxButton" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="bitmap"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="current"></property> + <property name="default">0</property> + <property name="default_pane">0</property> + <property name="disabled"></property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="focus"></property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">ID_DELETE</property> + <property name="label">Delete</property> + <property name="margins"></property> + <property name="markup">0</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_buttonDel</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="position"></property> + <property name="pressed"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND</property> + <property name="proportion">1</property> + <object class="spacer" expanded="1"> + <property name="height">0</property> + <property name="permission">protected</property> + <property name="width">0</property> + </object> + </object> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxALL</property> + <property name="proportion">0</property> + <object class="wxButton" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="bitmap"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="current"></property> + <property name="default">0</property> + <property name="default_pane">0</property> + <property name="disabled"></property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="focus"></property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">wxID_CLOSE</property> + <property name="label">Close</property> + <property name="margins"></property> + <property name="markup">0</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_buttonClose</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="position"></property> + <property name="pressed"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + </object> </object> </object> </object>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/batchprint.cpp Mon Jul 15 07:03:05 2019 +0900 @@ -0,0 +1,91 @@ +// Filename : batchprint.h +// Last Change: 2019-07-09 ‰Î 08:16:04. +// + +#include "id.h" +#include "batchprint.h" + +BatchPrintFrame::BatchPrintFrame( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) + : wxFrame( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + this->SetBackgroundColour( wxColour( 0, 0, 0 ) ); + + wxBoxSizer* bSizerTop = new wxBoxSizer( wxHORIZONTAL ); + + wxGridBagSizer* gbSizer; + gbSizer = new wxGridBagSizer( 0, 0 ); + gbSizer->SetFlexibleDirection( wxBOTH ); + gbSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + // Head + m_staticText = new wxStaticText( this, wxID_ANY, wxT("Excel File"), wxDefaultPosition, wxDefaultSize, 0 ); + gbSizer->Add( m_staticText, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + + m_filePicker = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, wxT("Select a file"), wxT("*.xlsx"), wxDefaultPosition, wxDefaultSize, wxFLP_CHANGE_DIR|wxFLP_FILE_MUST_EXIST|wxFLP_OPEN|wxFLP_SMALL|wxFLP_USE_TEXTCTRL ); + gbSizer->Add( m_filePicker, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_buttonLoad = new wxButton( this, ID_LOAD, wxT("Load"), wxDefaultPosition, wxDefaultSize, 0 ); + gbSizer->Add( m_buttonLoad, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + // Left + m_dataViewListCtrl = new wxDataViewListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_dataViewListColumnCheck = m_dataViewListCtrl->AppendToggleColumn( wxT("Check"), wxDATAVIEW_CELL_INERT, -1, static_cast<wxAlignment>(wxALIGN_CENTER), wxDATAVIEW_COL_RESIZABLE ); + m_dataViewListColumnNo = m_dataViewListCtrl->AppendTextColumn( wxT("No"), wxDATAVIEW_CELL_INERT, 60, static_cast<wxAlignment>(wxALIGN_RIGHT), wxDATAVIEW_COL_RESIZABLE ); + m_dataViewListColumnHno = m_dataViewListCtrl->AppendTextColumn( wxT("Hno"), wxDATAVIEW_CELL_INERT, 100, static_cast<wxAlignment>(wxALIGN_CENTER), wxDATAVIEW_COL_RESIZABLE ); + m_dataViewListColumnName = m_dataViewListCtrl->AppendTextColumn( wxT("Name"), wxDATAVIEW_CELL_INERT, 200, static_cast<wxAlignment>(wxALIGN_LEFT), wxDATAVIEW_COL_RESIZABLE ); + m_dataViewListColumnKana = m_dataViewListCtrl->AppendTextColumn( wxT("Kana"), wxDATAVIEW_CELL_INERT, 200, static_cast<wxAlignment>(wxALIGN_LEFT), wxDATAVIEW_COL_RESIZABLE ); + m_dataViewListColumnStatus = m_dataViewListCtrl->AppendProgressColumn( wxT("Status"), wxDATAVIEW_CELL_INERT, -1, static_cast<wxAlignment>(wxALIGN_LEFT), wxDATAVIEW_COL_RESIZABLE ); + gbSizer->Add( m_dataViewListCtrl, wxGBPosition( 1, 0 ), wxGBSpan( 1, 3 ), wxALL|wxEXPAND, 5 ); + + bSizerTop->Add( gbSizer, 1, wxEXPAND, 5 ); + + // Right + wxBoxSizer* bSizerButton = new wxBoxSizer( wxVERTICAL ); + + m_buttonMaskPrint = new wxButton( this, ID_MANDP, wxT("Mask & Print"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerButton->Add( m_buttonMaskPrint, 0, wxALL, 5 ); + + m_buttonPrint = new wxButton( this, wxID_PRINT, wxT("Print"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerButton->Add( m_buttonPrint, 0, wxALL, 5 ); + + bSizerButton->Add( 0, 30, 0, 0, 5 ); + + m_buttonUnCheckAll = new wxButton( this, ID_UNCHECKALL, wxT("UnCheck All"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerButton->Add( m_buttonUnCheckAll, 0, wxALL, 5 ); + + m_buttonCheckAll = new wxButton( this, ID_CHECKALL, wxT("Check All"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerButton->Add( m_buttonCheckAll, 0, wxALL, 5 ); + + bSizerButton->Add( 0, 50, 1, wxEXPAND, 5 ); + + m_buttonClear = new wxButton( this, ID_CLEAR, wxT("Clear"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerButton->Add( m_buttonClear, 0, wxALL, 5 ); + + m_buttonDel = new wxButton( this, ID_DELETE, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerButton->Add( m_buttonDel, 0, wxALL, 5 ); + + bSizerButton->Add( 0, 0, 1, wxEXPAND, 5 ); + + m_buttonClose = new wxButton( this, wxID_CLOSE, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerButton->Add( m_buttonClose, 0, wxALL, 5 ); + + + bSizerTop->Add( bSizerButton, 0, wxEXPAND, 5 ); + + + this->SetSizer( bSizerTop ); + this->Layout(); + + this->Centre( wxBOTH ); +} + +BatchPrintFrame::~BatchPrintFrame() +{ +} + +// Event Table +BEGIN_EVENT_TABLE( BatchPrintFrame, wxFrame ) +END_EVENT_TABLE() + +// Event Handlers & Functions
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/index.cpp Mon Jul 15 07:03:05 2019 +0900 @@ -0,0 +1,130 @@ +// Filename : id.cpp +// Last Change: 2019-07-15 Mon 07:00:57. +// +#include <wx/textfile.h> +#include "id.h" +#include "index.h" + +IndexFrame::IndexFrame( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) + : wxFrame( parent, id, title, pos, size, style ) +{ + wxTextFile file; + file.Open( wxT( "index.db" ) ); + for ( int i = 0; i < file.GetLineCount(); i++ ) { + wxArrayString buf = wxSplit( file.GetLine( i ), ':', '\\' ); + } + file.Close(); + + CreateControls(); +} + +IndexFrame::~IndexFrame() +{ +} + +// Event Table +BEGIN_EVENT_TABLE( IndexFrame, wxFrame ) + EVT_CHOICE( ID_DRIVE, IndexFrame::OnDrive ) + EVT_CHOICE( ID_YEAR, IndexFrame::OnYear ) + EVT_LISTBOX( ID_DATE, IndexFrame::OnDate ) + EVT_LISTBOX( ID_CCN, IndexFrame::OnCcn ) +END_EVENT_TABLE() + +// Event Handlers & Functions +// Event Handlers +void IndexFrame::OnDrive( wxCommandEvent& event ) +{ + m_dataViewListCtrl->DeleteAllItems(); + m_choiceYear->SetSelection( 0 ); + m_listBoxDate->Clear(); + + if ( m_choiceDrive->GetSelection() == 0 ) { + m_listBoxCcn->Enable( false ); + } else { + m_listBoxCcn->Enable( true ); + } +} + +void IndexFrame::OnYear( wxCommandEvent& event ) +{ + m_dataViewListCtrl->DeleteAllItems(); + + if ( m_choiceDrive->GetSelection() == 0 ) { + } else { + wxString drive = m_choiceDrive->GetStringSelection(); + wxString year = m_choiceYear->GetStringSelection(); + } +} + +void IndexFrame::OnDate( wxCommandEvent& event ) +{ +} + +void IndexFrame::OnCcn( wxCommandEvent& event ) +{ + m_dataViewListCtrl->DeleteAllItems(); +} + +// Functions +void IndexFrame::CreateControls() +{ + this->SetBackgroundColour( wxColour( 166, 126, 66 ) ); + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bSizerTop = new wxBoxSizer( wxHORIZONTAL ); + + wxFlexGridSizer* fgSizerSelect; + fgSizerSelect = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizerSelect->SetFlexibleDirection( wxBOTH ); + fgSizerSelect->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + // Left + m_dataViewListCtrl = new wxDataViewListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_HORIZ_RULES|wxDV_ROW_LINES|wxDV_VERT_RULES ); + m_dataViewListColumnNo = m_dataViewListCtrl->AppendTextColumn( wxT("No"), wxDATAVIEW_CELL_INERT, 30, static_cast<wxAlignment>(wxALIGN_RIGHT), wxDATAVIEW_COL_RESIZABLE|wxDATAVIEW_COL_SORTABLE ); + m_dataViewListColumnHno = m_dataViewListCtrl->AppendTextColumn( wxT("HNo"), wxDATAVIEW_CELL_INERT, 100, static_cast<wxAlignment>(wxALIGN_LEFT), wxDATAVIEW_COL_RESIZABLE|wxDATAVIEW_COL_SORTABLE ); + m_dataViewListColumnName = m_dataViewListCtrl->AppendTextColumn( wxT("Name"), wxDATAVIEW_CELL_INERT, 120, static_cast<wxAlignment>(wxALIGN_LEFT), wxDATAVIEW_COL_RESIZABLE|wxDATAVIEW_COL_SORTABLE ); + m_dataViewListColumnKana = m_dataViewListCtrl->AppendTextColumn( wxT("Kana"), wxDATAVIEW_CELL_INERT, 120, static_cast<wxAlignment>(wxALIGN_LEFT), wxDATAVIEW_COL_RESIZABLE|wxDATAVIEW_COL_SORTABLE ); + bSizerTop->Add( m_dataViewListCtrl, 1, wxALL|wxEXPAND, 5 ); + + // Right + m_staticTextDrive = new wxStaticText( this, wxID_ANY, wxT("Drive"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizerSelect->Add( m_staticTextDrive, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + + wxString choiceDrive[] = { wxT("server"), wxT("C:\\"), wxT("Y:\\"), wxT("Z:\\") }; + int n = sizeof( choiceDrive ) / sizeof( wxString ); + m_choiceDrive = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxSize( 100, -1 ), n, choiceDrive, 0 ); + m_choiceDrive->SetSelection( 0 ); + fgSizerSelect->Add( m_choiceDrive, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_staticTextYear = new wxStaticText( this, wxID_ANY, wxT("Year"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizerSelect->Add( m_staticTextYear, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + + wxArrayString m_choiceYearChoices; + for ( int y = 2005; y < 2030; y++ ) + m_choiceYearChoices.Add( wxString::Format( "%d", y ) ); + m_choiceYear = new wxChoice( this, ID_DATE, wxDefaultPosition, wxSize( 100, -1 ), m_choiceYearChoices, 0 ); + m_choiceYear->SetSelection( 0 ); + fgSizerSelect->Add( m_choiceYear, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_staticTextDate = new wxStaticText( this, wxID_ANY, wxT("Date"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizerSelect->Add( m_staticTextDate, 0, wxALL|wxALIGN_RIGHT, 5 ); + + m_listBoxDate = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxSize( 100, 300 ), 0, NULL, wxLB_ALWAYS_SB|wxLB_SINGLE ); + fgSizerSelect->Add( m_listBoxDate, 0, wxALL, 5 ); + + m_staticTextCcn = new wxStaticText( this, wxID_ANY, wxT("Ccn"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizerSelect->Add( m_staticTextCcn, 0, wxALL|wxALIGN_RIGHT, 5 ); + + m_listBoxCcn = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxSize( 100, 100 ), 0, NULL, wxLB_ALWAYS_SB|wxLB_SINGLE ); + fgSizerSelect->Add( m_listBoxCcn, 0, wxALL, 5 ); + m_listBoxCcn->Enable( false ); + + bSizerTop->Add( fgSizerSelect, 0, wxEXPAND, 5 ); + + + this->SetSizer( bSizerTop ); + this->Layout(); + + this->Centre( wxBOTH ); +} +
--- a/src/mngdb.cpp Sat Jun 08 15:50:59 2019 +0900 +++ b/src/mngdb.cpp Mon Jul 15 07:03:05 2019 +0900 @@ -1,5 +1,5 @@ // Filename : mngdeb.cpp -// Last Change: 2018-11-21 æ°´ 08:36:02. +// Last Change: 2019-07-15 Mon 06:58:48. // #include <wx/datetime.h> @@ -11,60 +11,7 @@ ManageDBFrame::ManageDBFrame( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style ) { - this->SetBackgroundColour( wxColour( 140, 240, 140 ) ); - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bSizerTop = new wxBoxSizer( wxVERTICAL ); - - wxFlexGridSizer* fgSizer = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer->SetFlexibleDirection( wxBOTH ); - fgSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticTextDate = new wxStaticText( this, wxID_ANY, wxT( "Date" ), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer->Add( m_staticTextDate, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - - m_datePicker = new wxDatePickerCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxSize( 180, -1 ), wxDP_DROPDOWN|wxDP_SHOWCENTURY ); - fgSizer->Add( m_datePicker, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_staticTextHhs = new wxStaticText( this, wxID_ANY, wxT( "HHS" ), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer->Add( m_staticTextHhs, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - - m_filePickerHhs = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, wxT( "Select a file" ), wxT( "*.db" ), wxDefaultPosition, wxSize( 180, -1 ), wxFLP_FILE_MUST_EXIST|wxFLP_OPEN|wxFLP_SMALL|wxFLP_USE_TEXTCTRL ); - fgSizer->Add( m_filePickerHhs, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - - m_staticTextCcn = new wxStaticText( this, wxID_ANY, wxT( "CCN" ), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer->Add( m_staticTextCcn, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - - m_filePickerCcn = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, wxT( "Select a file" ), wxT( "*.db" ), wxDefaultPosition, wxSize( 180, -1 ), wxFLP_FILE_MUST_EXIST|wxFLP_OPEN|wxFLP_SMALL|wxFLP_USE_TEXTCTRL ); - fgSizer->Add( m_filePickerCcn, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - bSizerTop->Add( fgSizer, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); - - //--- - m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerTop->Add( m_staticline, 0, wxEXPAND|wxALL, 5 ); - - wxBoxSizer* bSizerBtn = new wxBoxSizer( wxHORIZONTAL ); - - m_buttonBuild = new wxButton( this, ID_MNGBLD, wxT( "Build" ), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerBtn->Add( m_buttonBuild, 0, wxALL, 5 ); - - m_buttonUpld = new wxButton( this, ID_MNGUPLD, wxT( "Upload" ), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerBtn->Add( m_buttonUpld, 0, wxALL, 5 ); - - m_buttonIdx = new wxButton( this, ID_MNGIDX, wxT( "Index" ), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerBtn->Add( m_buttonIdx, 0, wxALL, 5 ); - - m_buttonExit = new wxButton( this, ID_MNGEXIT, wxT( "Exit" ), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerBtn->Add( m_buttonExit, 0, wxALL, 5 ); - - bSizerTop->Add( bSizerBtn, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); - - this->SetSizer( bSizerTop ); - this->Layout(); - - this->Centre( wxBOTH ); - m_buttonUpld->Enable( false ); + CreateControls(); } ManageDBFrame::~ManageDBFrame() @@ -163,3 +110,61 @@ m_filePickerCcn->SetPath( dir + wxFILE_SEP_PATH + wxT( "ccn.db") ); } +void ManageDBFrame::CreateControls() +{ + this->SetBackgroundColour( wxColour( 140, 240, 140 ) ); + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bSizerTop = new wxBoxSizer( wxVERTICAL ); + + wxFlexGridSizer* fgSizer = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer->SetFlexibleDirection( wxBOTH ); + fgSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_staticTextDate = new wxStaticText( this, wxID_ANY, wxT( "Date" ), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer->Add( m_staticTextDate, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + + m_datePicker = new wxDatePickerCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxSize( 180, -1 ), wxDP_DROPDOWN|wxDP_SHOWCENTURY ); + fgSizer->Add( m_datePicker, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_staticTextHhs = new wxStaticText( this, wxID_ANY, wxT( "HHS" ), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer->Add( m_staticTextHhs, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + + m_filePickerHhs = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, wxT( "Select a file" ), wxT( "*.db" ), wxDefaultPosition, wxSize( 180, -1 ), wxFLP_FILE_MUST_EXIST|wxFLP_OPEN|wxFLP_SMALL|wxFLP_USE_TEXTCTRL ); + fgSizer->Add( m_filePickerHhs, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + m_staticTextCcn = new wxStaticText( this, wxID_ANY, wxT( "CCN" ), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer->Add( m_staticTextCcn, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + + m_filePickerCcn = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, wxT( "Select a file" ), wxT( "*.db" ), wxDefaultPosition, wxSize( 180, -1 ), wxFLP_FILE_MUST_EXIST|wxFLP_OPEN|wxFLP_SMALL|wxFLP_USE_TEXTCTRL ); + fgSizer->Add( m_filePickerCcn, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + bSizerTop->Add( fgSizer, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); + + //--- + m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bSizerTop->Add( m_staticline, 0, wxEXPAND|wxALL, 5 ); + + wxBoxSizer* bSizerBtn = new wxBoxSizer( wxHORIZONTAL ); + + m_buttonBuild = new wxButton( this, ID_MNGBLD, wxT( "Build" ), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerBtn->Add( m_buttonBuild, 0, wxALL, 5 ); + + m_buttonUpld = new wxButton( this, ID_MNGUPLD, wxT( "Upload" ), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerBtn->Add( m_buttonUpld, 0, wxALL, 5 ); + m_buttonUpld->Enable( false ); + + m_buttonIdx = new wxButton( this, ID_MNGIDX, wxT( "Index" ), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerBtn->Add( m_buttonIdx, 0, wxALL, 5 ); + + m_buttonExit = new wxButton( this, ID_MNGEXIT, wxT( "Exit" ), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerBtn->Add( m_buttonExit, 0, wxALL, 5 ); + + bSizerTop->Add( bSizerBtn, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); + + this->SetSizer( bSizerTop ); + this->Layout(); + + this->Centre( wxBOTH ); +} +
--- a/src/rsearcher.cpp Sat Jun 08 15:50:59 2019 +0900 +++ b/src/rsearcher.cpp Mon Jul 15 07:03:05 2019 +0900 @@ -1,5 +1,5 @@ // Filename : rsearcher.cpp -// Last Change: 2019-05-29 æ°´ 15:37:32. +// Last Change: 2019-07-15 Mon 06:58:17. // #include <wx/arrstr.h> @@ -7,6 +7,8 @@ #include <wx/clipbrd.h> #include "id.h" #include "mngdb.h" +#include "batchprint.h" +#include "index.h" #include "rsearcher.h" #include "main.h" @@ -92,26 +94,26 @@ : wxStaticBitmap( parent, id, label, pos, size, style, name ) { m_parent = parent; - Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( OnLeftDown ), NULL, this ); - Connect( wxEVT_LEFT_UP, wxMouseEventHandler( OnLeftUp ), NULL, this ); - Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( OnLeftDClick ), NULL, this ); - Connect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( OnRightDClick ), NULL, this ); - Connect( wxEVT_MOTION, wxMouseEventHandler( OnMotion ), NULL, this ); - Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( OnWheel ), NULL, this ); - Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( OnStartRGesture ), NULL, this ); - Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( OnEndRGesture ), NULL, this ); + Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( MyStaticBitmap::OnLeftDown ), NULL, this ); + Connect( wxEVT_LEFT_UP, wxMouseEventHandler( MyStaticBitmap::OnLeftUp ), NULL, this ); + Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( MyStaticBitmap::OnLeftDClick ), NULL, this ); + Connect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( MyStaticBitmap::OnRightDClick ), NULL, this ); + Connect( wxEVT_MOTION, wxMouseEventHandler( MyStaticBitmap::OnMotion ), NULL, this ); + Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( MyStaticBitmap::OnWheel ), NULL, this ); + Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MyStaticBitmap::OnStartRGesture ), NULL, this ); + Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( MyStaticBitmap::OnEndRGesture ), NULL, this ); } MyStaticBitmap::~MyStaticBitmap() { - Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( OnLeftDown ), NULL, this ); - Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( OnLeftUp ), NULL, this ); - Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( OnLeftDClick ), NULL, this ); - Disconnect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( OnRightDClick ), NULL, this ); - Disconnect( wxEVT_MOTION, wxMouseEventHandler( OnMotion ), NULL, this ); - Disconnect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( OnWheel ), NULL, this ); - Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( OnStartRGesture ), NULL, this ); - Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( OnEndRGesture ), NULL, this ); + Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( MyStaticBitmap::OnLeftDown ), NULL, this ); + Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( MyStaticBitmap::OnLeftUp ), NULL, this ); + Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( MyStaticBitmap::OnLeftDClick ), NULL, this ); + Disconnect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( MyStaticBitmap::OnRightDClick ), NULL, this ); + Disconnect( wxEVT_MOTION, wxMouseEventHandler( MyStaticBitmap::OnMotion ), NULL, this ); + Disconnect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( MyStaticBitmap::OnWheel ), NULL, this ); + Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MyStaticBitmap::OnStartRGesture ), NULL, this ); + Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( MyStaticBitmap::OnEndRGesture ), NULL, this ); } // Event Handlers @@ -285,16 +287,18 @@ EVT_IDLE( MainFrame::OnIdle ) EVT_TIMER( ID_TIMER, MainFrame::OnTimer ) // shortcut-key - EVT_BUTTON( ID_FOCUS, MainFrame::OnFocus ) - EVT_BUTTON( ID_PZOOM, MainFrame::OnPlusZoom ) - EVT_BUTTON( ID_MZOOM, MainFrame::OnMinusZoom ) - EVT_BUTTON( ID_DARK, MainFrame::OnDark ) - EVT_BUTTON( ID_SWIN, MainFrame::OnSatellite ) - EVT_BUTTON( ID_UPIDX, MainFrame::OnUpdateIndex ) - EVT_BUTTON( ID_DLMAN, MainFrame::OnDownloadManual ) - EVT_BUTTON( wxID_HELP, MainFrame::OnHelp ) + EVT_BUTTON( ID_FOCUS, MainFrame::OnFocus ) + EVT_BUTTON( ID_PZOOM, MainFrame::OnPlusZoom ) + EVT_BUTTON( ID_MZOOM, MainFrame::OnMinusZoom ) + EVT_BUTTON( ID_DARK, MainFrame::OnDark ) + EVT_BUTTON( ID_SWIN, MainFrame::OnSatellite ) + EVT_BUTTON( ID_UPIDX, MainFrame::OnUpdateIndex ) + EVT_BUTTON( ID_DLMAN, MainFrame::OnDownloadManual ) + EVT_BUTTON( ID_BPRINT, MainFrame::OnBatchPrint ) + EVT_BUTTON( ID_INDEX, MainFrame::OnIndex ) + EVT_BUTTON( wxID_HELP, MainFrame::OnHelp ) EVT_BUTTON( wxID_CLOSE, MainFrame::OnBClose ) - EVT_BUTTON( ID_LOGOUT, MainFrame::OnLogout ) + EVT_BUTTON( ID_LOGOUT, MainFrame::OnLogout ) END_EVENT_TABLE() @@ -442,6 +446,20 @@ wxExecute( execmd ); } +void MainFrame::OnIndex( wxCommandEvent& WXUNUSED(event) ) +{ + IndexFrame *idx = new IndexFrame( NULL, wxID_ANY, wxT( "Index" ), wxPoint( 0, 0 ), wxSize( 800, 500 ), wxDEFAULT_FRAME_STYLE ); + idx->Show( true ); + idx->Raise(); +} + +void MainFrame::OnBatchPrint( wxCommandEvent& WXUNUSED(event) ) +{ + BatchPrintFrame *bp = new BatchPrintFrame( NULL, wxID_ANY, wxT( "Batch Print" ), wxPoint( 0, 0 ), wxSize( 800, 500 ), wxDEFAULT_FRAME_STYLE ); + bp->Show( true ); + bp->Raise(); +} + void MainFrame::OnHelp( wxCommandEvent& WXUNUSED(event) ) { wxString version, build; @@ -606,6 +624,10 @@ m_buttonDark->Hide(); m_buttonSatellite = new wxButton( this, ID_SWIN, wxT( "Satellite" ), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonSatellite->Hide(); + m_buttonIndex = new wxButton( this, ID_INDEX, wxT( "Index" ), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonIndex->Hide(); + m_buttonBPrint = new wxButton( this, ID_BPRINT, wxT( "Batch Print" ), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonBPrint->Hide(); m_buttonDLMan = new wxButton( this, ID_DLMAN, wxT( "Manual" ), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonDLMan->Hide(); m_buttonUpdateIndex = new wxButton( this, ID_UPIDX, wxT( "Update Index" ), wxDefaultPosition, wxDefaultSize, 0 ); @@ -644,19 +666,21 @@ void MainFrame::SetAccelerator( void ) { - wxAcceleratorEntry entries[11]; + wxAcceleratorEntry entries[13]; entries[0].Set( wxACCEL_CTRL, (int)'P', wxID_PRINT ); entries[1].Set( wxACCEL_NORMAL, WXK_F1, wxID_HELP ); entries[2].Set( wxACCEL_NORMAL, WXK_F2, ID_DLMAN ); - entries[3].Set( wxACCEL_NORMAL, WXK_F4, ID_FOCUS ); - entries[4].Set( wxACCEL_NORMAL, (int)'Z', ID_PZOOM ); - entries[5].Set( wxACCEL_NORMAL, (int)'X', ID_MZOOM ); - entries[6].Set( wxACCEL_NORMAL, (int)'D', ID_DARK ); - entries[7].Set( wxACCEL_CTRL, (int)'Q', wxID_CLOSE ); - entries[8].Set( wxACCEL_SHIFT, (int)'W', ID_SWIN ); - entries[9].Set( wxACCEL_SHIFT, (int)'R', ID_UPIDX ); - entries[10].Set( wxACCEL_SHIFT, (int)'L', ID_DARK ); // now building ( logout ) - wxAcceleratorTable accel( 10, entries ); + entries[3].Set( wxACCEL_NORMAL, WXK_F3, ID_BPRINT ); + entries[4].Set( wxACCEL_NORMAL, WXK_F4, ID_FOCUS ); + entries[5].Set( wxACCEL_NORMAL, WXK_F7, ID_INDEX ); + entries[6].Set( wxACCEL_NORMAL, (int)'Z', ID_PZOOM ); + entries[7].Set( wxACCEL_NORMAL, (int)'X', ID_MZOOM ); + entries[8].Set( wxACCEL_NORMAL, (int)'D', ID_DARK ); + entries[9].Set( wxACCEL_CTRL, (int)'Q', wxID_CLOSE ); + entries[10].Set( wxACCEL_SHIFT, (int)'W', ID_SWIN ); + entries[11].Set( wxACCEL_SHIFT, (int)'R', ID_UPIDX ); + entries[12].Set( wxACCEL_SHIFT, (int)'L', ID_DARK ); // now building ( logout ) + wxAcceleratorTable accel( 13, entries ); SetAcceleratorTable( accel ); }