• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン334 (tree)
日時2007-06-16 00:02:57
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/MapEditorWX/src/AnnotationDialog.h (revision 333)
+++ marathon/trunk/MapEditorWX/src/AnnotationDialog.h (revision 334)
@@ -20,23 +20,13 @@
2020 */
2121 class AnnotationDialog: public wxDialog{
2222 private:
23-// wxBoxSizer* boxSizer;
24- //テキストデータ
25- wxTextCtrl* textArea;
26-
27- //タイプ選択
28- wxChoice* typeChoice;
29-
30- //ワールド座標
31- wxTextCtrl* worldX;
32- wxTextCtrl* worldY;
33-
34- //ビュー座標
35- wxTextCtrl* viewX;
36- wxTextCtrl* viewY;
37-
38- //ポリゴン依存
39- wxChoice* polyChoice;
23+ wxStaticText* label_12;
24+ wxChoice* choice_8;
25+ wxTextCtrl* text_ctrl_7;
26+ wxStaticText* label_11;
27+ wxChoice* choice_7;
28+ wxButton* button_3;
29+ wxButton* button_4;
4030 public:
4131 AnnotationDialog();
4232 /**
--- marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.h (revision 333)
+++ marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.h (revision 334)
@@ -5,11 +5,40 @@
55
66 class ColorCustomizeDialog: public wxDialog{
77 public:
8+ wxStaticText* label_13;
9+ wxButton* button_7;
10+ wxPanel* panel_1;
11+ wxStaticText* label_14;
12+ wxButton* button_8;
13+ wxPanel* panel_2;
14+ wxStaticText* label_16;
15+ wxButton* button_9;
16+ wxPanel* panel_3;
17+ wxStaticText* label_15;
18+ wxButton* button_10;
19+ wxPanel* panel_4;
20+ wxStaticText* label_17;
21+ wxButton* button_11;
22+ wxPanel* panel_5;
23+ wxStaticText* label_18;
24+ wxButton* button_12;
25+ wxPanel* panel_6;
26+ wxButton* button_5;
27+ wxButton* button_6;
28+
829 ColorCustomizeDialog();
930 bool Create(wxWindow* parent, wxWindowID id);
1031 virtual ~ColorCustomizeDialog();
1132 //イベントテーブル作成<en>declare
1233 DECLARE_EVENT_TABLE()
34+ void OnOk(wxCommandEvent& wv);
35+ void OnCancel(wxCommandEvent &ev);
36+ void OnBackground(wxCommandEvent &event); // wxGlade: <event_handler>
37+ void OnGrid(wxCommandEvent &event); // wxGlade: <event_handler>
38+ void OnLines(wxCommandEvent &event); // wxGlade: <event_handler>
39+ void OnPolygons(wxCommandEvent &event); // wxGlade: <event_handler>
40+ void OnStrings(wxCommandEvent &event); // wxGlade: <event_handler>
41+ void OnPoints(wxCommandEvent &event); // wxGlade: <event_handler>
1342 };
1443
1544 #endif
--- marathon/trunk/MapEditorWX/src/PointPropDialog.h (revision 333)
+++ marathon/trunk/MapEditorWX/src/PointPropDialog.h (revision 334)
@@ -4,6 +4,25 @@
44 #include "DlgCommon.h"
55
66 class PointPropDialog: public wxDialog{
7+private:
8+ wxStaticBox* sizer_52_staticbox;
9+ wxRadioButton* radio_btn_7;
10+ wxRadioButton* radio_btn_8;
11+ wxCheckBox* checkbox_40;
12+ wxStaticText* label_29;
13+ wxTextCtrl* text_ctrl_14;
14+ wxPanel* panel_8;
15+ wxStaticText* label_30;
16+ wxTextCtrl* text_ctrl_15;
17+ wxPanel* panel_9;
18+ wxStaticText* label_31;
19+ wxTextCtrl* text_ctrl_16;
20+ wxTextCtrl* text_ctrl_18;
21+ wxStaticText* label_32;
22+ wxTextCtrl* text_ctrl_17;
23+ wxTextCtrl* text_ctrl_19;
24+ wxStaticText* label_33;
25+ wxChoice* choice_11;
726 public:
827 PointPropDialog();
928 bool Create(wxWindow* parent, wxWindowID id);
@@ -10,6 +29,13 @@
1029 virtual ~PointPropDialog();
1130 //イベントテーブル作成<en>declare
1231 DECLARE_EVENT_TABLE()
32+ void OnEditFloor(wxCommandEvent &event); // wxGlade: <event_handler>
33+ void OnEditCeiling(wxCommandEvent &event); // wxGlade: <event_handler>
34+ void OnEditX(wxCommandEvent &event); // wxGlade: <event_handler>
35+ void OnEditY(wxCommandEvent &event); // wxGlade: <event_handler>
36+ void OnEditTX(wxCommandEvent &event); // wxGlade: <event_handler>
37+ void OnEditTY(wxCommandEvent &event); // wxGlade: <event_handler>
38+ void OnPolyChoice(wxCommandEvent &event); // wxGlade: <event_handler>
1339 };
1440
1541 #endif
--- marathon/trunk/MapEditorWX/src/PlacementDialog.cpp (nonexistent)
+++ marathon/trunk/MapEditorWX/src/PlacementDialog.cpp (revision 334)
@@ -0,0 +1,134 @@
1+#include "PlacementDialog.h"
2+
3+enum{
4+ ID_INITIAL,
5+ ID_MINIMUM,
6+ ID_MAXIMUM,
7+ ID_RANDOM_COUNT,
8+ ID_RANDOM_CHANCE,
9+ ID_INF,
10+ ID_ALL_INF,
11+ ID_SET_INITIAL,
12+};
13+
14+BEGIN_EVENT_TABLE(PlacementDialog, wxDialog)
15+ EVT_TEXT(ID_INITIAL, PlacementDialog::OnEditInitial)
16+ EVT_TEXT(ID_MINIMUM, PlacementDialog::OnEditMinimum)
17+ EVT_TEXT(ID_MAXIMUM, PlacementDialog::OnEditMaximum)
18+ EVT_TEXT(ID_RANDOM_COUNT, PlacementDialog::OnEditRandomCount)
19+ EVT_TEXT(ID_RANDOM_CHANCE, PlacementDialog::OnRandomChance)
20+ EVT_BUTTON(ID_INF, PlacementDialog::OnOk)
21+ EVT_BUTTON(ID_ALL_INF, PlacementDialog::OnOk)
22+ EVT_BUTTON(ID_SET_INITIAL, PlacementDialog::OnOk)
23+ EVT_BUTTON(wxID_OK, PlacementDialog::OnOk)
24+END_EVENT_TABLE()
25+
26+PlacementDialog::PlacementDialog():wxDialog()
27+{
28+}
29+
30+PlacementDialog::~PlacementDialog()
31+{
32+}
33+bool PlacementDialog::Create(wxWindow* parent, wxWindowID id)
34+{
35+ bool result = wxDialog::Create(parent, id, _T("Placement"));
36+ if(!result){
37+ return result;
38+ }
39+ label_21 = new wxStaticText(this, wxID_ANY, wxT("Initial"));
40+ text_ctrl_8 = new wxTextCtrl(this, ID_INITIAL, wxEmptyString);
41+ label_22 = new wxStaticText(this, wxID_ANY, wxT("Minimum"));
42+ text_ctrl_9 = new wxTextCtrl(this, ID_MINIMUM, wxEmptyString);
43+ label_23 = new wxStaticText(this, wxID_ANY, wxT("Maximum"));
44+ text_ctrl_10 = new wxTextCtrl(this, ID_MAXIMUM, wxEmptyString);
45+ label_24 = new wxStaticText(this, wxID_ANY, wxT("Random count"));
46+ text_ctrl_11 = new wxTextCtrl(this, ID_RANDOM_COUNT, wxEmptyString);
47+ label_25 = new wxStaticText(this, wxID_ANY, wxT("Random chance"));
48+ text_ctrl_12 = new wxTextCtrl(this, ID_RANDOM_CHANCE, wxEmptyString);
49+ button_17 = new wxButton(this, ID_INF, wxT("Supply this infinitly"));
50+ button_18 = new wxButton(this, ID_ALL_INF, wxT("We cannot exterminate all monsters"));
51+ button_19 = new wxButton(this, ID_SET_INITIAL, wxT("Set the number of monster to initial"));
52+ checkbox_39 = new wxCheckBox(this, wxID_ANY, wxT("place at random location"));
53+ list_ctrl_1 = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER);
54+ button_16 = new wxButton(this, wxID_OK, wxT("OK"));
55+
56+ list_ctrl_1->SetMinSize(wxSize(600, 300));
57+
58+ wxFlexGridSizer* grid_sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
59+ wxFlexGridSizer* grid_sizer_2 = new wxFlexGridSizer(1, 3, 0, 0);
60+ wxFlexGridSizer* grid_sizer_4 = new wxFlexGridSizer(4, 1, 0, 0);
61+ wxFlexGridSizer* grid_sizer_3 = new wxFlexGridSizer(5, 2, 0, 0);
62+ grid_sizer_3->Add(label_21, 0, 0, 0);
63+ grid_sizer_3->Add(text_ctrl_8, 0, 0, 0);
64+ grid_sizer_3->Add(label_22, 0, 0, 0);
65+ grid_sizer_3->Add(text_ctrl_9, 0, 0, 0);
66+ grid_sizer_3->Add(label_23, 0, 0, 0);
67+ grid_sizer_3->Add(text_ctrl_10, 0, 0, 0);
68+ grid_sizer_3->Add(label_24, 0, 0, 0);
69+ grid_sizer_3->Add(text_ctrl_11, 0, 0, 0);
70+ grid_sizer_3->Add(label_25, 0, 0, 0);
71+ grid_sizer_3->Add(text_ctrl_12, 0, 0, 0);
72+ grid_sizer_2->Add(grid_sizer_3, 1, wxEXPAND, 0);
73+ grid_sizer_4->Add(button_17, 0, 0, 0);
74+ grid_sizer_4->Add(button_18, 0, 0, 0);
75+ grid_sizer_4->Add(button_19, 0, 0, 0);
76+ grid_sizer_4->Add(checkbox_39, 0, 0, 0);
77+ grid_sizer_2->Add(grid_sizer_4, 1, wxEXPAND, 0);
78+ grid_sizer_1->Add(grid_sizer_2, 1, wxEXPAND, 0);
79+ grid_sizer_1->Add(list_ctrl_1, 1, wxEXPAND, 0);
80+ grid_sizer_1->Add(button_16, 0, wxALIGN_RIGHT, 0);
81+ SetSizer(grid_sizer_1);
82+ grid_sizer_1->Fit(this);
83+ Layout();
84+
85+ return result;
86+}
87+//OKボタン押した時
88+void PlacementDialog::OnOk(wxCommandEvent& ev)
89+{
90+ SetReturnCode(wxID_OK);
91+ Destroy();
92+}
93+void PlacementDialog::OnInf(wxCommandEvent &ev)
94+{
95+}
96+void PlacementDialog::OnAllInf(wxCommandEvent &ev)
97+{
98+}
99+void PlacementDialog::OnSetInitial(wxCommandEvent &ev)
100+{
101+}
102+void PlacementDialog::OnEditInitial(wxCommandEvent &event)
103+{
104+ event.Skip();
105+ std::cout<<"Event handler (PlacementDialog::OnEditInitial) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
106+}
107+
108+
109+void PlacementDialog::OnEditMinimum(wxCommandEvent &event)
110+{
111+ event.Skip();
112+ std::cout<<"Event handler (PlacementDialog::OnEditMinimum) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
113+}
114+
115+
116+void PlacementDialog::OnEditMaximum(wxCommandEvent &event)
117+{
118+ event.Skip();
119+ std::cout<<"Event handler (PlacementDialog::OnEditMaximum) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
120+}
121+
122+
123+void PlacementDialog::OnEditRandomCount(wxCommandEvent &event)
124+{
125+ event.Skip();
126+ std::cout<<"Event handler (PlacementDialog::OnEditRandomCount) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
127+}
128+
129+
130+void PlacementDialog::OnRandomChance(wxCommandEvent &event)
131+{
132+ event.Skip();
133+ std::cout<<"Event handler (PlacementDialog::OnRandomChance) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
134+}
--- marathon/trunk/MapEditorWX/src/AnnotationDialog.cpp (revision 333)
+++ marathon/trunk/MapEditorWX/src/AnnotationDialog.cpp (revision 334)
@@ -27,57 +27,40 @@
2727 bool AnnotationDialog::Create(wxWindow* parent, wxWindowID id, map_annotation& annotation)
2828 {
2929 bool result = wxDialog::Create(parent, id, _T("Annotation"));
30- //アイテム貼り付け
30+ label_12 = new wxStaticText(this, wxID_ANY, wxT("Type"));
31+ const wxString choice_8_choices[] = {
32+ wxT("Normal")
33+ };
34+ choice_8 = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 1, choice_8_choices, 0);
35+ text_ctrl_7 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxHSCROLL);
36+ label_11 = new wxStaticText(this, wxID_ANY, wxT("Dependency polygon index"));
37+ choice_7 = new wxChoice(this, wxID_ANY);
38+ button_3 = new wxButton(this, wxID_OK, wxT("OK"));
39+ button_4 = new wxButton(this, wxID_CANCEL, wxT("Cancel"));
3140
32- //縦置きサイザー
33- wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL);
34- this->SetSizer(boxSizer);
41+ //setup
42+ choice_8->SetSelection(0);
43+ text_ctrl_7->SetMinSize(wxSize(250, 60));
3544
36- //タイプ選択
37- //横置きサイザー
38- wxBoxSizer* typeBox = new wxBoxSizer(wxHORIZONTAL);
39- boxSizer->Add(typeBox);
40-// typeBox->Fit(boxSizer);
41- //スタティックテキスト
42- wxStaticText* typeSt = new wxStaticText(this, wxID_ANY, _T("Type"));
43- typeBox->Add(typeSt);
44- //チョイス
45- this->typeChoice = new wxChoice(this, ID_TYPE_CHOICE);
46- typeBox->Add(this->typeChoice);
47- //タイプ項目追加
48- this->typeChoice->Insert(wxString(_T("Normal")), 0 );
49-
50- //テキストボックス
51- this->textArea = new wxTextCtrl(this, ID_ANNOTATION_TEXT_AREA);
52- boxSizer->Add(textArea);
45+ //layout
46+ wxFlexGridSizer* sizer_33 = new wxFlexGridSizer(4, 1, 0, 0);
47+ wxBoxSizer* sizer_34 = new wxBoxSizer(wxHORIZONTAL);
48+ wxBoxSizer* sizer_35 = new wxBoxSizer(wxHORIZONTAL);
49+ wxBoxSizer* sizer_36 = new wxBoxSizer(wxHORIZONTAL);
50+ sizer_36->Add(label_12, 0, 0, 0);
51+ sizer_36->Add(choice_8, 0, 0, 0);
52+ sizer_33->Add(sizer_36, 1, wxEXPAND, 0);
53+ sizer_33->Add(text_ctrl_7, 0, wxEXPAND, 0);
54+ sizer_35->Add(label_11, 0, 0, 0);
55+ sizer_35->Add(choice_7, 0, 0, 0);
56+ sizer_33->Add(sizer_35, 1, wxEXPAND, 0);
57+ sizer_34->Add(button_3, 0, 0, 0);
58+ sizer_34->Add(button_4, 0, 0, 0);
59+ sizer_33->Add(sizer_34, 1, wxEXPAND, 0);
60+ SetSizer(sizer_33);
61+ sizer_33->Fit(this);
62+ Layout();
5363
54- //依存ポリゴン指定
55- wxBoxSizer* polygonBox = new wxBoxSizer(wxHORIZONTAL);
56- boxSizer->Add(polygonBox);
57-// polygonBox->Fit(boxSizer);
58- wxStaticText* polySt = new wxStaticText(this, wxID_ANY, wxString(_T("Depend polygon")));
59- polygonBox->Add(polySt);
60- //ポリゴンチョイス
61- this->polyChoice = new wxChoice();
62- //現存するポリゴン番号を追加
63- //最後にNONEを付加
64- int n = (int)PolygonList.size();
65- for(int i = 0; i < n; i ++){
66- char buf[BUF_MAX];
67- sprintf(buf, "%d", i);
68- polyChoice->Insert(wxConvCurrent->cMB2WX(buf), i);
69- }
70- polyChoice->Insert(wxString(_T("NONE")), n);
71- polygonBox->Add(polyChoice);
72-
73- //ボタンは横置き!
74- wxBoxSizer* btnBox = new wxBoxSizer(wxHORIZONTAL);
75- //OKボタン
76- btnBox->Add(new wxButton(this, wxID_OK, _T("OK")));
77- btnBox->Add(new wxButton(this, wxID_CANCEL, _T("Cancel")));
78- boxSizer->Add(btnBox);
79- boxSizer->Fit(this);
80- Layout();
8164 return result;
8265 }
8366 /**
@@ -86,7 +69,7 @@
8669 map_annotation AnnotationDialog::getAnnotation()
8770 {
8871 //TODO
89- map_annotation annotation;
72+ map_annotation annotation = {NULL};
9073 return annotation;
9174 }
9275 //OKボタン押した時
--- marathon/trunk/MapEditorWX/src/HeightDialog.h (revision 333)
+++ marathon/trunk/MapEditorWX/src/HeightDialog.h (revision 334)
@@ -18,6 +18,13 @@
1818 virtual ~HeightDialog();
1919 //イベントテーブル作成<en>declare
2020 DECLARE_EVENT_TABLE()
21+
22+ void OnEditFloor(wxCommandEvent& ev);
23+ void OnEditCeiling(wxCommandEvent& ev);
24+ void OnSliderFloor(wxCommandEvent& ev);
25+ void OnSliderCeiling(wxCommandEvent& ev);
26+ void OnDrawCheck(wxCommandEvent& ev);
27+
2128 };
2229
2330 #endif
--- marathon/trunk/MapEditorWX/src/EditorPreferencesDialog.h (revision 333)
+++ marathon/trunk/MapEditorWX/src/EditorPreferencesDialog.h (revision 334)
@@ -5,11 +5,33 @@
55
66 class EditorPreferencesDialog: public wxDialog{
77 public:
8+ wxStaticText* label_19;
9+ wxChoice* choice_9;
10+ wxCheckBox* checkbox_27;
11+ wxCheckBox* checkbox_28;
12+ wxCheckBox* checkbox_31;
13+ wxCheckBox* checkbox_30;
14+ wxCheckBox* checkbox_32;
15+ wxCheckBox* checkbox_33;
16+ wxCheckBox* checkbox_34;
17+ wxCheckBox* checkbox_35;
18+ wxCheckBox* checkbox_36;
19+ wxCheckBox* checkbox_29;
20+ wxStaticText* label_20;
21+ wxChoice* choice_10;
22+ wxCheckBox* checkbox_37;
23+ wxCheckBox* checkbox_38;
24+ wxButton* button_15;
25+ wxButton* button_13;
26+ wxButton* button_14;
827 EditorPreferencesDialog();
928 bool Create(wxWindow* parent, wxWindowID id);
1029 virtual ~EditorPreferencesDialog();
1130 //イベントテーブル作成<en>declare
1231 DECLARE_EVENT_TABLE()
32+ void OnDefault(wxCommandEvent &event); // wxGlade: <event_handler>
33+ void OnOk(wxCommandEvent &event); // wxGlade: <event_handler>
34+ void OnCancel(wxCommandEvent &event); // wxGlade: <event_handler>
1335 };
1436
1537 #endif
--- marathon/trunk/MapEditorWX/src/TerminalDialog.h (nonexistent)
+++ marathon/trunk/MapEditorWX/src/TerminalDialog.h (revision 334)
@@ -0,0 +1,28 @@
1+#ifndef _TERMINAL_DIALOG_
2+#define _TERMINAL_DIALOG_
3+
4+#include "DlgCommon.h"
5+
6+class TerminalDialog: public wxDialog{
7+private:
8+ wxListBox* list_box_1;
9+ wxListBox* list_box_2;
10+ wxListBox* list_box_3;
11+ wxPanel* panel_7;
12+ wxTextCtrl* text_ctrl_13;
13+ wxButton* button_20;
14+public:
15+ TerminalDialog();
16+ virtual ~TerminalDialog();
17+
18+ bool Create(wxWindow* parent, wxWindowID id);
19+ void OnOk(wxCommandEvent& ev);
20+ //イベントテーブル作成<en>declare
21+ DECLARE_EVENT_TABLE()
22+ void OnSelTerminal(wxCommandEvent &event); // wxGlade: <event_handler>
23+ void OnSelScreen(wxCommandEvent &event); // wxGlade: <event_handler>
24+ void OnSelInfo(wxCommandEvent &event); // wxGlade: <event_handler>
25+ void OnEdit(wxCommandEvent &event); // wxGlade: <event_handler>
26+};
27+
28+#endif
--- marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.cpp (revision 333)
+++ marathon/trunk/MapEditorWX/src/ColorCustomizeDialog.cpp (revision 334)
@@ -1,6 +1,22 @@
11 #include "ColorCustomizeDialog.h"
22 #include "MapEditorWX.h"
3+enum{
4+ ID_BACKGROUND,
5+ ID_GRID,
6+ ID_LINES,
7+ ID_POLYGONS,
8+ ID_STRINGS,
9+ ID_POINTS,
10+};
311 BEGIN_EVENT_TABLE(ColorCustomizeDialog, wxDialog)
12+ EVT_BUTTON(ID_BACKGROUND, ColorCustomize::OnBackground)
13+ EVT_BUTTON(ID_GRID, ColorCustomize::OnGrid)
14+ EVT_BUTTON(ID_LINES, ColorCustomize::OnLines)
15+ EVT_BUTTON(ID_POLYGONS, ColorCustomize::OnPolygons)
16+ EVT_BUTTON(ID_STRINGS, ColorCustomize::OnStrings)
17+ EVT_BUTTON(ID_POINTS, ColorCustomize::OnPoints)
18+ EVT_COMMAND(wxID_OK, ColorCustomizeDialog::OnOk)
19+ EVT_COMMAND(wxID_CANCEL, ColorCustomizeDialog::OnCancel)
420 END_EVENT_TABLE()
521 ColorCustomizeDialog::ColorCustomizeDialog()
622 {
@@ -11,6 +27,118 @@
1127 bool ColorCustomizeDialog::Create(wxWindow* parent, wxWindowID id)
1228 {
1329 bool result = wxDialog::Create(parent, id, wxT("Color Customize"));
30+ label_13 = new wxStaticText(this, wxID_ANY, wxT("Background"));
31+ button_7 = new wxButton(this, wxID_ANY, wxT("Choose color"));
32+ panel_1 = new wxPanel(this, wxID_ANY);
33+ label_14 = new wxStaticText(this, wxID_ANY, wxT("Grid line"));
34+ button_8 = new wxButton(this, wxID_ANY, wxT("Choose color"));
35+ panel_2 = new wxPanel(this, wxID_ANY);
36+ label_16 = new wxStaticText(this, wxID_ANY, wxT("Lines"));
37+ button_9 = new wxButton(this, wxID_ANY, wxT("Choose color"));
38+ panel_3 = new wxPanel(this, wxID_ANY);
39+ label_15 = new wxStaticText(this, wxID_ANY, wxT("Polygons"));
40+ button_10 = new wxButton(this, wxID_ANY, wxT("Choose color"));
41+ panel_4 = new wxPanel(this, wxID_ANY);
42+ label_17 = new wxStaticText(this, wxID_ANY, wxT("Strings"));
43+ button_11 = new wxButton(this, wxID_ANY, wxT("Choose color"));
44+ panel_5 = new wxPanel(this, wxID_ANY);
45+ label_18 = new wxStaticText(this, wxID_ANY, wxT("Points"));
46+ button_12 = new wxButton(this, wxID_ANY, wxT("Choose color"));
47+ panel_6 = new wxPanel(this, wxID_ANY);
48+ button_5 = new wxButton(this, wxID_ANY, wxT("OK"));
49+ button_6 = new wxButton(this, wxID_ANY, wxT("Cancel"));
1450
51+ //setup
52+
53+ //layout
54+ wxFlexGridSizer* sizer_37 = new wxFlexGridSizer(7, 1, 0, 0);
55+ wxBoxSizer* sizer_44 = new wxBoxSizer(wxHORIZONTAL);
56+ wxGridSizer* sizer_43 = new wxGridSizer(1, 3, 0, 0);
57+ wxGridSizer* sizer_42 = new wxGridSizer(1, 3, 0, 0);
58+ wxGridSizer* sizer_41 = new wxGridSizer(1, 3, 0, 0);
59+ wxGridSizer* sizer_40 = new wxGridSizer(1, 3, 0, 0);
60+ wxGridSizer* sizer_39 = new wxGridSizer(1, 3, 0, 0);
61+ wxGridSizer* sizer_38 = new wxGridSizer(1, 3, 0, 0);
62+ sizer_38->Add(label_13, 0, 0, 0);
63+ sizer_38->Add(button_7, 0, 0, 0);
64+ sizer_38->Add(panel_1, 1, wxEXPAND, 0);
65+ sizer_37->Add(sizer_38, 1, wxEXPAND, 0);
66+ sizer_39->Add(label_14, 0, 0, 0);
67+ sizer_39->Add(button_8, 0, 0, 0);
68+ sizer_39->Add(panel_2, 1, 0, 0);
69+ sizer_37->Add(sizer_39, 1, wxEXPAND, 0);
70+ sizer_40->Add(label_16, 0, 0, 0);
71+ sizer_40->Add(button_9, 0, 0, 0);
72+ sizer_40->Add(panel_3, 1, wxEXPAND, 0);
73+ sizer_37->Add(sizer_40, 1, wxEXPAND, 0);
74+ sizer_41->Add(label_15, 0, 0, 0);
75+ sizer_41->Add(button_10, 0, 0, 0);
76+ sizer_41->Add(panel_4, 1, wxEXPAND, 0);
77+ sizer_37->Add(sizer_41, 1, wxEXPAND, 0);
78+ sizer_42->Add(label_17, 0, 0, 0);
79+ sizer_42->Add(button_11, 0, 0, 0);
80+ sizer_42->Add(panel_5, 1, wxEXPAND, 0);
81+ sizer_37->Add(sizer_42, 1, wxEXPAND, 0);
82+ sizer_43->Add(label_18, 0, 0, 0);
83+ sizer_43->Add(button_12, 0, 0, 0);
84+ sizer_43->Add(panel_6, 1, wxEXPAND, 0);
85+ sizer_37->Add(sizer_43, 1, wxEXPAND, 0);
86+ sizer_44->Add(button_5, 0, 0, 0);
87+ sizer_44->Add(button_6, 0, 0, 0);
88+ sizer_37->Add(sizer_44, 1, wxEXPAND, 0);
89+ SetSizer(sizer_37);
90+ sizer_37->Fit(this);
91+ Layout();
92+
1593 return result;
1694 }
95+void ColorCustomize::OnOk(wxCommandEvent& wv)
96+{
97+ SetReturnCode(wxID_OK);
98+ Destroy();
99+}
100+void ColorCustomize::OnCancel(wxCommandEvent &ev)
101+{
102+ SetReturnCode(wxID_OK);
103+ Destroy();
104+}
105+void ColorCustomize::OnBackground(wxCommandEvent &event)
106+{
107+ event.Skip();
108+ std::cout<<"Event handler (ColorCustomize::OnBackground) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
109+}
110+
111+
112+void ColorCustomize::OnGrid(wxCommandEvent &event)
113+{
114+ event.Skip();
115+ std::cout<<"Event handler (ColorCustomize::OnGrid) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
116+}
117+
118+
119+void ColorCustomize::OnLines(wxCommandEvent &event)
120+{
121+ event.Skip();
122+ std::cout<<"Event handler (ColorCustomize::OnLines) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
123+}
124+
125+
126+void ColorCustomize::OnPolygons(wxCommandEvent &event)
127+{
128+ event.Skip();
129+ std::cout<<"Event handler (ColorCustomize::OnPolygons) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
130+}
131+
132+
133+void ColorCustomize::OnStrings(wxCommandEvent &event)
134+{
135+ event.Skip();
136+ std::cout<<"Event handler (ColorCustomize::OnStrings) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
137+}
138+
139+
140+void ColorCustomize::OnPoints(wxCommandEvent &event)
141+{
142+ event.Skip();
143+ std::cout<<"Event handler (ColorCustomize::OnPoints) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
144+}
--- marathon/trunk/MapEditorWX/src/res/Dialogues.h (revision 333)
+++ marathon/trunk/MapEditorWX/src/res/Dialogues.h (revision 334)
@@ -1,8 +1,9 @@
1-// -*- C++ -*- generated by wxGlade 0.5 on Fri Jun 15 14:25:30 2007 from C:\0save\marathon\MapEditorWX\src\res\MapEditorWX.wxg
1+// -*- C++ -*- generated by wxGlade 0.5 on Fri Jun 15 22:36:02 2007 from C:\Documents and Settings\koji\My Documents\saved_\repository_\marathon\MapEditorWX\src\res\MapEditorWX.wxg
22
33 #include <wx/wx.h>
44 #include <wx/image.h>
55 // begin wxGlade: ::dependencies
6+#include <wx/listctrl.h>
67 // end wxGlade
78
89
@@ -180,6 +181,18 @@
180181 wxButton* button_5;
181182 wxButton* button_6;
182183 // end wxGlade
184+
185+ DECLARE_EVENT_TABLE();
186+
187+public:
188+ void OnBackground(wxCommandEvent &event); // wxGlade: <event_handler>
189+ void OnGrid(wxCommandEvent &event); // wxGlade: <event_handler>
190+ void OnLines(wxCommandEvent &event); // wxGlade: <event_handler>
191+ void OnPolygons(wxCommandEvent &event); // wxGlade: <event_handler>
192+ void OnStrings(wxCommandEvent &event); // wxGlade: <event_handler>
193+ void OnPoints(wxCommandEvent &event); // wxGlade: <event_handler>
194+ void OnOk(wxCommandEvent &event); // wxGlade: <event_handler>
195+ void OnCancel(wxCommandEvent &event); // wxGlade: <event_handler>
183196 }; // wxGlade: end class
184197
185198
@@ -218,7 +231,182 @@
218231 wxButton* button_13;
219232 wxButton* button_14;
220233 // end wxGlade
234+
235+ DECLARE_EVENT_TABLE();
236+
237+public:
238+ void OnDefault(wxCommandEvent &event); // wxGlade: <event_handler>
239+ void OnOk(wxCommandEvent &event); // wxGlade: <event_handler>
240+ void OnCancel(wxCommandEvent &event); // wxGlade: <event_handler>
221241 }; // wxGlade: end class
222242
223243
244+class PlacementDialog: public wxDialog {
245+public:
246+ // begin wxGlade: PlacementDialog::ids
247+ // end wxGlade
248+
249+ PlacementDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
250+
251+private:
252+ // begin wxGlade: PlacementDialog::methods
253+ void set_properties();
254+ void do_layout();
255+ // end wxGlade
256+
257+protected:
258+ // begin wxGlade: PlacementDialog::attributes
259+ wxStaticText* label_21;
260+ wxTextCtrl* text_ctrl_8;
261+ wxStaticText* label_22;
262+ wxTextCtrl* text_ctrl_9;
263+ wxStaticText* label_23;
264+ wxTextCtrl* text_ctrl_10;
265+ wxStaticText* label_24;
266+ wxTextCtrl* text_ctrl_11;
267+ wxStaticText* label_25;
268+ wxTextCtrl* text_ctrl_12;
269+ wxButton* button_17;
270+ wxButton* button_18;
271+ wxButton* button_19;
272+ wxCheckBox* checkbox_39;
273+ wxListCtrl* list_ctrl_1;
274+ wxButton* button_16;
275+ // end wxGlade
276+
277+ DECLARE_EVENT_TABLE();
278+
279+public:
280+ void OnEditInitial(wxCommandEvent &event); // wxGlade: <event_handler>
281+ void OnEditMinimum(wxCommandEvent &event); // wxGlade: <event_handler>
282+ void OnEditMaximum(wxCommandEvent &event); // wxGlade: <event_handler>
283+ void OnEditRandomCount(wxCommandEvent &event); // wxGlade: <event_handler>
284+ void OnRandomChance(wxCommandEvent &event); // wxGlade: <event_handler>
285+ void OnOk(wxCommandEvent &event); // wxGlade: <event_handler>
286+}; // wxGlade: end class
287+
288+
289+class TerminalDialog: public wxDialog {
290+public:
291+ // begin wxGlade: TerminalDialog::ids
292+ // end wxGlade
293+
294+ TerminalDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
295+
296+private:
297+ // begin wxGlade: TerminalDialog::methods
298+ void set_properties();
299+ void do_layout();
300+ // end wxGlade
301+
302+protected:
303+ // begin wxGlade: TerminalDialog::attributes
304+ wxListBox* list_box_1;
305+ wxListBox* list_box_2;
306+ wxListBox* list_box_3;
307+ wxPanel* panel_7;
308+ wxTextCtrl* text_ctrl_13;
309+ wxButton* button_20;
310+ // end wxGlade
311+
312+ DECLARE_EVENT_TABLE();
313+
314+public:
315+ void OnSelTerminal(wxCommandEvent &event); // wxGlade: <event_handler>
316+ void OnSelScreen(wxCommandEvent &event); // wxGlade: <event_handler>
317+ void OnSelInfo(wxCommandEvent &event); // wxGlade: <event_handler>
318+ void OnEdit(wxCommandEvent &event); // wxGlade: <event_handler>
319+ void OnOk(wxCommandEvent &event); // wxGlade: <event_handler>
320+}; // wxGlade: end class
321+
322+
323+class PointPropDialog: public wxDialog {
324+public:
325+ // begin wxGlade: PointPropDialog::ids
326+ // end wxGlade
327+
328+ PointPropDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
329+
330+private:
331+ // begin wxGlade: PointPropDialog::methods
332+ void set_properties();
333+ void do_layout();
334+ // end wxGlade
335+
336+protected:
337+ // begin wxGlade: PointPropDialog::attributes
338+ wxStaticBox* sizer_52_staticbox;
339+ wxRadioButton* radio_btn_7;
340+ wxRadioButton* radio_btn_8;
341+ wxCheckBox* checkbox_40;
342+ wxStaticText* label_29;
343+ wxTextCtrl* text_ctrl_14;
344+ wxPanel* panel_8;
345+ wxStaticText* label_30;
346+ wxTextCtrl* text_ctrl_15;
347+ wxPanel* panel_9;
348+ wxStaticText* label_31;
349+ wxTextCtrl* text_ctrl_16;
350+ wxTextCtrl* text_ctrl_18;
351+ wxStaticText* label_32;
352+ wxTextCtrl* text_ctrl_17;
353+ wxTextCtrl* text_ctrl_19;
354+ wxStaticText* label_33;
355+ wxChoice* choice_11;
356+ // end wxGlade
357+
358+ DECLARE_EVENT_TABLE();
359+
360+public:
361+ void OnEditFloor(wxCommandEvent &event); // wxGlade: <event_handler>
362+ void OnEditCeiling(wxCommandEvent &event); // wxGlade: <event_handler>
363+ void OnEdit(wxCommandEvent &event); // wxGlade: <event_handler>
364+ void OnEditY(wxCommandEvent &event); // wxGlade: <event_handler>
365+ void OnEditTX(wxCommandEvent &event); // wxGlade: <event_handler>
366+ void OnEditTY(wxCommandEvent &event); // wxGlade: <event_handler>
367+ void OnPolyChoice(wxCommandEvent &event); // wxGlade: <event_handler>
368+}; // wxGlade: end class
369+
370+
371+class PolygonPropDialog: public wxDialog {
372+public:
373+ // begin wxGlade: PolygonPropDialog::ids
374+ // end wxGlade
375+
376+ PolygonPropDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
377+
378+private:
379+ // begin wxGlade: PolygonPropDialog::methods
380+ void set_properties();
381+ void do_layout();
382+ // end wxGlade
383+
384+protected:
385+ // begin wxGlade: PolygonPropDialog::attributes
386+ wxStaticText* label_34;
387+ wxStaticText* label_46;
388+ wxStaticText* label_35;
389+ wxStaticText* label_47;
390+ wxStaticText* label_36;
391+ wxStaticText* label_48;
392+ wxStaticText* label_37;
393+ wxStaticText* label_49;
394+ wxStaticText* label_38;
395+ wxStaticText* label_39;
396+ wxStaticText* label_55;
397+ wxStaticText* label_40;
398+ wxStaticText* label_54;
399+ wxStaticText* label_41;
400+ wxStaticText* label_53;
401+ wxStaticText* label_42;
402+ wxStaticText* label_52;
403+ wxStaticText* label_43;
404+ wxStaticText* label_51;
405+ wxStaticText* label_44;
406+ wxStaticText* label_50;
407+ wxStaticText* label_45;
408+ // end wxGlade
409+}; // wxGlade: end class
410+
411+
224412 #endif // DIALOGUES_H
--- marathon/trunk/MapEditorWX/src/res/Dialogues.cpp (revision 333)
+++ marathon/trunk/MapEditorWX/src/res/Dialogues.cpp (revision 334)
@@ -1,4 +1,4 @@
1-// -*- C++ -*- generated by wxGlade 0.5 on Fri Jun 15 14:25:30 2007 from C:\0save\marathon\MapEditorWX\src\res\MapEditorWX.wxg
1+// -*- C++ -*- generated by wxGlade 0.5 on Fri Jun 15 22:36:02 2007 from C:\Documents and Settings\koji\My Documents\saved_\repository_\marathon\MapEditorWX\src\res\MapEditorWX.wxg
22
33 #include "Dialogues.h"
44
@@ -382,6 +382,79 @@
382382 }
383383
384384
385+BEGIN_EVENT_TABLE(ColorCustomize, wxDialog)
386+ // begin wxGlade: ColorCustomize::event_table
387+ EVT_BUTTON(wxID_ANY, ColorCustomize::OnBackground)
388+ EVT_BUTTON(wxID_ANY, ColorCustomize::OnGrid)
389+ EVT_BUTTON(wxID_ANY, ColorCustomize::OnLines)
390+ EVT_BUTTON(wxID_ANY, ColorCustomize::OnPolygons)
391+ EVT_BUTTON(wxID_ANY, ColorCustomize::OnStrings)
392+ EVT_BUTTON(wxID_ANY, ColorCustomize::OnPoints)
393+ EVT_BUTTON(wxID_ANY, ColorCustomize::OnOk)
394+ EVT_BUTTON(wxID_ANY, ColorCustomize::OnCancel)
395+ // end wxGlade
396+END_EVENT_TABLE();
397+
398+
399+void ColorCustomize::OnBackground(wxCommandEvent &event)
400+{
401+ event.Skip();
402+ std::cout<<"Event handler (ColorCustomize::OnBackground) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
403+}
404+
405+
406+void ColorCustomize::OnGrid(wxCommandEvent &event)
407+{
408+ event.Skip();
409+ std::cout<<"Event handler (ColorCustomize::OnGrid) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
410+}
411+
412+
413+void ColorCustomize::OnLines(wxCommandEvent &event)
414+{
415+ event.Skip();
416+ std::cout<<"Event handler (ColorCustomize::OnLines) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
417+}
418+
419+
420+void ColorCustomize::OnPolygons(wxCommandEvent &event)
421+{
422+ event.Skip();
423+ std::cout<<"Event handler (ColorCustomize::OnPolygons) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
424+}
425+
426+
427+void ColorCustomize::OnStrings(wxCommandEvent &event)
428+{
429+ event.Skip();
430+ std::cout<<"Event handler (ColorCustomize::OnStrings) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
431+}
432+
433+
434+void ColorCustomize::OnPoints(wxCommandEvent &event)
435+{
436+ event.Skip();
437+ std::cout<<"Event handler (ColorCustomize::OnPoints) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
438+}
439+
440+
441+void ColorCustomize::OnOk(wxCommandEvent &event)
442+{
443+ event.Skip();
444+ std::cout<<"Event handler (ColorCustomize::OnOk) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
445+}
446+
447+
448+void ColorCustomize::OnCancel(wxCommandEvent &event)
449+{
450+ event.Skip();
451+ std::cout<<"Event handler (ColorCustomize::OnCancel) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
452+}
453+
454+
455+// wxGlade: add ColorCustomize event handlers
456+
457+
385458 void ColorCustomize::set_properties()
386459 {
387460 // begin wxGlade: ColorCustomize::set_properties
@@ -471,6 +544,39 @@
471544 }
472545
473546
547+BEGIN_EVENT_TABLE(EditorPreferences, wxDialog)
548+ // begin wxGlade: EditorPreferences::event_table
549+ EVT_BUTTON(wxID_ANY, EditorPreferences::OnDefault)
550+ EVT_BUTTON(wxID_ANY, EditorPreferences::OnOk)
551+ EVT_BUTTON(wxID_ANY, EditorPreferences::OnCancel)
552+ // end wxGlade
553+END_EVENT_TABLE();
554+
555+
556+void EditorPreferences::OnDefault(wxCommandEvent &event)
557+{
558+ event.Skip();
559+ std::cout<<"Event handler (EditorPreferences::OnDefault) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
560+}
561+
562+
563+void EditorPreferences::OnOk(wxCommandEvent &event)
564+{
565+ event.Skip();
566+ std::cout<<"Event handler (EditorPreferences::OnOk) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
567+}
568+
569+
570+void EditorPreferences::OnCancel(wxCommandEvent &event)
571+{
572+ event.Skip();
573+ std::cout<<"Event handler (EditorPreferences::OnCancel) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
574+}
575+
576+
577+// wxGlade: add EditorPreferences event handlers
578+
579+
474580 void EditorPreferences::set_properties()
475581 {
476582 // begin wxGlade: EditorPreferences::set_properties
@@ -520,3 +626,450 @@
520626 // end wxGlade
521627 }
522628
629+
630+PlacementDialog::PlacementDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
631+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
632+{
633+ // begin wxGlade: PlacementDialog::PlacementDialog
634+ label_21 = new wxStaticText(this, wxID_ANY, wxT("Initial"));
635+ text_ctrl_8 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
636+ label_22 = new wxStaticText(this, wxID_ANY, wxT("Minimum"));
637+ text_ctrl_9 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
638+ label_23 = new wxStaticText(this, wxID_ANY, wxT("Maximum"));
639+ text_ctrl_10 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
640+ label_24 = new wxStaticText(this, wxID_ANY, wxT("Random count"));
641+ text_ctrl_11 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
642+ label_25 = new wxStaticText(this, wxID_ANY, wxT("Random chance"));
643+ text_ctrl_12 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
644+ button_17 = new wxButton(this, wxID_ANY, wxT("Supply this infinitly"));
645+ button_18 = new wxButton(this, wxID_ANY, wxT("We cannot exterminate all monsters"));
646+ button_19 = new wxButton(this, wxID_ANY, wxT("Set the number of monster to initial"));
647+ checkbox_39 = new wxCheckBox(this, wxID_ANY, wxT("place at random location"));
648+ list_ctrl_1 = new wxListCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER);
649+ button_16 = new wxButton(this, wxID_ANY, wxT("OK"));
650+
651+ set_properties();
652+ do_layout();
653+ // end wxGlade
654+}
655+
656+
657+BEGIN_EVENT_TABLE(PlacementDialog, wxDialog)
658+ // begin wxGlade: PlacementDialog::event_table
659+ EVT_TEXT(wxID_ANY, PlacementDialog::OnEditInitial)
660+ EVT_TEXT(wxID_ANY, PlacementDialog::OnEditMinimum)
661+ EVT_TEXT(wxID_ANY, PlacementDialog::OnEditMaximum)
662+ EVT_TEXT(wxID_ANY, PlacementDialog::OnEditRandomCount)
663+ EVT_TEXT(wxID_ANY, PlacementDialog::OnRandomChance)
664+ EVT_BUTTON(wxID_ANY, PlacementDialog::OnOk)
665+ // end wxGlade
666+END_EVENT_TABLE();
667+
668+
669+void PlacementDialog::OnEditInitial(wxCommandEvent &event)
670+{
671+ event.Skip();
672+ std::cout<<"Event handler (PlacementDialog::OnEditInitial) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
673+}
674+
675+
676+void PlacementDialog::OnEditMinimum(wxCommandEvent &event)
677+{
678+ event.Skip();
679+ std::cout<<"Event handler (PlacementDialog::OnEditMinimum) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
680+}
681+
682+
683+void PlacementDialog::OnEditMaximum(wxCommandEvent &event)
684+{
685+ event.Skip();
686+ std::cout<<"Event handler (PlacementDialog::OnEditMaximum) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
687+}
688+
689+
690+void PlacementDialog::OnEditRandomCount(wxCommandEvent &event)
691+{
692+ event.Skip();
693+ std::cout<<"Event handler (PlacementDialog::OnEditRandomCount) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
694+}
695+
696+
697+void PlacementDialog::OnRandomChance(wxCommandEvent &event)
698+{
699+ event.Skip();
700+ std::cout<<"Event handler (PlacementDialog::OnRandomChance) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
701+}
702+
703+
704+void PlacementDialog::OnOk(wxCommandEvent &event)
705+{
706+ event.Skip();
707+ std::cout<<"Event handler (PlacementDialog::OnOk) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
708+}
709+
710+
711+// wxGlade: add PlacementDialog event handlers
712+
713+
714+void PlacementDialog::set_properties()
715+{
716+ // begin wxGlade: PlacementDialog::set_properties
717+ SetTitle(wxT("dialog_6"));
718+ list_ctrl_1->SetMinSize(wxSize(600, 300));
719+ // end wxGlade
720+}
721+
722+
723+void PlacementDialog::do_layout()
724+{
725+ // begin wxGlade: PlacementDialog::do_layout
726+ wxFlexGridSizer* grid_sizer_1 = new wxFlexGridSizer(3, 1, 0, 0);
727+ wxFlexGridSizer* grid_sizer_2 = new wxFlexGridSizer(1, 3, 0, 0);
728+ wxFlexGridSizer* grid_sizer_4 = new wxFlexGridSizer(4, 1, 0, 0);
729+ wxFlexGridSizer* grid_sizer_3 = new wxFlexGridSizer(5, 2, 0, 0);
730+ grid_sizer_3->Add(label_21, 0, 0, 0);
731+ grid_sizer_3->Add(text_ctrl_8, 0, 0, 0);
732+ grid_sizer_3->Add(label_22, 0, 0, 0);
733+ grid_sizer_3->Add(text_ctrl_9, 0, 0, 0);
734+ grid_sizer_3->Add(label_23, 0, 0, 0);
735+ grid_sizer_3->Add(text_ctrl_10, 0, 0, 0);
736+ grid_sizer_3->Add(label_24, 0, 0, 0);
737+ grid_sizer_3->Add(text_ctrl_11, 0, 0, 0);
738+ grid_sizer_3->Add(label_25, 0, 0, 0);
739+ grid_sizer_3->Add(text_ctrl_12, 0, 0, 0);
740+ grid_sizer_2->Add(grid_sizer_3, 1, wxEXPAND, 0);
741+ grid_sizer_4->Add(button_17, 0, 0, 0);
742+ grid_sizer_4->Add(button_18, 0, 0, 0);
743+ grid_sizer_4->Add(button_19, 0, 0, 0);
744+ grid_sizer_4->Add(checkbox_39, 0, 0, 0);
745+ grid_sizer_2->Add(grid_sizer_4, 1, wxEXPAND, 0);
746+ grid_sizer_1->Add(grid_sizer_2, 1, wxEXPAND, 0);
747+ grid_sizer_1->Add(list_ctrl_1, 1, wxEXPAND, 0);
748+ grid_sizer_1->Add(button_16, 0, wxALIGN_RIGHT, 0);
749+ SetSizer(grid_sizer_1);
750+ grid_sizer_1->Fit(this);
751+ Layout();
752+ // end wxGlade
753+}
754+
755+
756+TerminalDialog::TerminalDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
757+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
758+{
759+ // begin wxGlade: TerminalDialog::TerminalDialog
760+ const wxString list_box_1_choices[] = {
761+
762+ };
763+ list_box_1 = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_1_choices, 0);
764+ const wxString list_box_2_choices[] = {
765+
766+ };
767+ list_box_2 = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_2_choices, 0);
768+ const wxString list_box_3_choices[] = {
769+
770+ };
771+ list_box_3 = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, list_box_3_choices, 0);
772+ panel_7 = new wxPanel(this, wxID_ANY);
773+ text_ctrl_13 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
774+ button_20 = new wxButton(this, wxID_OK, wxEmptyString);
775+
776+ set_properties();
777+ do_layout();
778+ // end wxGlade
779+}
780+
781+
782+BEGIN_EVENT_TABLE(TerminalDialog, wxDialog)
783+ // begin wxGlade: TerminalDialog::event_table
784+ EVT_LISTBOX(wxID_ANY, TerminalDialog::OnSelTerminal)
785+ EVT_LISTBOX(wxID_ANY, TerminalDialog::OnSelScreen)
786+ EVT_LISTBOX(wxID_ANY, TerminalDialog::OnSelInfo)
787+ EVT_TEXT(wxID_ANY, TerminalDialog::OnEdit)
788+ EVT_BUTTON(wxID_ANY, TerminalDialog::OnOk)
789+ // end wxGlade
790+END_EVENT_TABLE();
791+
792+
793+void TerminalDialog::OnSelTerminal(wxCommandEvent &event)
794+{
795+ event.Skip();
796+ std::cout<<"Event handler (TerminalDialog::OnSelTerminal) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
797+}
798+
799+
800+void TerminalDialog::OnSelScreen(wxCommandEvent &event)
801+{
802+ event.Skip();
803+ std::cout<<"Event handler (TerminalDialog::OnSelScreen) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
804+}
805+
806+
807+void TerminalDialog::OnSelInfo(wxCommandEvent &event)
808+{
809+ event.Skip();
810+ std::cout<<"Event handler (TerminalDialog::OnSelInfo) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
811+}
812+
813+
814+void TerminalDialog::OnEdit(wxCommandEvent &event)
815+{
816+ event.Skip();
817+ std::cout<<"Event handler (TerminalDialog::OnEdit) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
818+}
819+
820+
821+void TerminalDialog::OnOk(wxCommandEvent &event)
822+{
823+ event.Skip();
824+ std::cout<<"Event handler (TerminalDialog::OnOk) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
825+}
826+
827+
828+// wxGlade: add TerminalDialog event handlers
829+
830+
831+void TerminalDialog::set_properties()
832+{
833+ // begin wxGlade: TerminalDialog::set_properties
834+ SetTitle(wxT("dialog_7"));
835+ list_box_1->SetMinSize(wxSize(-1, 200));
836+ list_box_2->SetMinSize(wxSize(-1, 100));
837+ panel_7->SetMinSize(wxSize(500, 200));
838+ text_ctrl_13->SetMinSize(wxSize(500, 200));
839+ // end wxGlade
840+}
841+
842+
843+void TerminalDialog::do_layout()
844+{
845+ // begin wxGlade: TerminalDialog::do_layout
846+ wxFlexGridSizer* grid_sizer_5 = new wxFlexGridSizer(1, 2, 0, 0);
847+ wxFlexGridSizer* grid_sizer_7 = new wxFlexGridSizer(3, 1, 0, 0);
848+ wxFlexGridSizer* grid_sizer_6 = new wxFlexGridSizer(3, 1, 0, 0);
849+ grid_sizer_6->Add(list_box_1, 0, 0, 0);
850+ grid_sizer_6->Add(list_box_2, 0, 0, 0);
851+ grid_sizer_6->Add(list_box_3, 0, 0, 0);
852+ grid_sizer_5->Add(grid_sizer_6, 1, wxEXPAND, 0);
853+ grid_sizer_7->Add(panel_7, 1, wxEXPAND, 0);
854+ grid_sizer_7->Add(text_ctrl_13, 0, 0, 0);
855+ grid_sizer_7->Add(button_20, 0, wxALIGN_RIGHT, 0);
856+ grid_sizer_5->Add(grid_sizer_7, 1, wxEXPAND, 0);
857+ SetSizer(grid_sizer_5);
858+ grid_sizer_5->Fit(this);
859+ Layout();
860+ // end wxGlade
861+}
862+
863+
864+PointPropDialog::PointPropDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
865+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
866+{
867+ // begin wxGlade: PointPropDialog::PointPropDialog
868+ sizer_52_staticbox = new wxStaticBox(this, -1, wxT("Flags"));
869+ radio_btn_7 = new wxRadioButton(this, wxID_ANY, wxT("Solid"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
870+ radio_btn_8 = new wxRadioButton(this, wxID_ANY, wxT("Transparent"));
871+ checkbox_40 = new wxCheckBox(this, wxID_ANY, wxT("Elevation"));
872+ label_29 = new wxStaticText(this, wxID_ANY, wxT("Floor height"));
873+ text_ctrl_14 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
874+ panel_8 = new wxPanel(this, wxID_ANY);
875+ label_30 = new wxStaticText(this, wxID_ANY, wxT("Ceiling hegiht"));
876+ text_ctrl_15 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
877+ panel_9 = new wxPanel(this, wxID_ANY);
878+ label_31 = new wxStaticText(this, wxID_ANY, wxT("Vertex"));
879+ text_ctrl_16 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
880+ text_ctrl_18 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
881+ label_32 = new wxStaticText(this, wxID_ANY, wxT("Transformed"));
882+ text_ctrl_17 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
883+ text_ctrl_19 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
884+ label_33 = new wxStaticText(this, wxID_ANY, wxT("Supporting polygon index"));
885+ const wxString choice_11_choices[] = {
886+
887+ };
888+ choice_11 = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, choice_11_choices, 0);
889+
890+ set_properties();
891+ do_layout();
892+ // end wxGlade
893+}
894+
895+
896+BEGIN_EVENT_TABLE(PointPropDialog, wxDialog)
897+ // begin wxGlade: PointPropDialog::event_table
898+ EVT_TEXT(wxID_ANY, PointPropDialog::OnEditFloor)
899+ EVT_TEXT(wxID_ANY, PointPropDialog::OnEditCeiling)
900+ EVT_TEXT(wxID_ANY, PointPropDialog::OnEdit)
901+ EVT_TEXT(wxID_ANY, PointPropDialog::OnEditY)
902+ EVT_TEXT(wxID_ANY, PointPropDialog::OnEditTX)
903+ EVT_TEXT(wxID_ANY, PointPropDialog::OnEditTY)
904+ EVT_CHOICE(wxID_ANY, PointPropDialog::OnPolyChoice)
905+ // end wxGlade
906+END_EVENT_TABLE();
907+
908+
909+void PointPropDialog::OnEditFloor(wxCommandEvent &event)
910+{
911+ event.Skip();
912+ std::cout<<"Event handler (PointPropDialog::OnEditFloor) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
913+}
914+
915+
916+void PointPropDialog::OnEditCeiling(wxCommandEvent &event)
917+{
918+ event.Skip();
919+ std::cout<<"Event handler (PointPropDialog::OnEditCeiling) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
920+}
921+
922+
923+void PointPropDialog::OnEdit(wxCommandEvent &event)
924+{
925+ event.Skip();
926+ std::cout<<"Event handler (PointPropDialog::OnEdit) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
927+}
928+
929+
930+void PointPropDialog::OnEditY(wxCommandEvent &event)
931+{
932+ event.Skip();
933+ std::cout<<"Event handler (PointPropDialog::OnEditY) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
934+}
935+
936+
937+void PointPropDialog::OnEditTX(wxCommandEvent &event)
938+{
939+ event.Skip();
940+ std::cout<<"Event handler (PointPropDialog::OnEditTX) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
941+}
942+
943+
944+void PointPropDialog::OnEditTY(wxCommandEvent &event)
945+{
946+ event.Skip();
947+ std::cout<<"Event handler (PointPropDialog::OnEditTY) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
948+}
949+
950+
951+void PointPropDialog::OnPolyChoice(wxCommandEvent &event)
952+{
953+ event.Skip();
954+ std::cout<<"Event handler (PointPropDialog::OnPolyChoice) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
955+}
956+
957+
958+// wxGlade: add PointPropDialog event handlers
959+
960+
961+void PointPropDialog::set_properties()
962+{
963+ // begin wxGlade: PointPropDialog::set_properties
964+ SetTitle(wxT("dialog_8"));
965+ // end wxGlade
966+}
967+
968+
969+void PointPropDialog::do_layout()
970+{
971+ // begin wxGlade: PointPropDialog::do_layout
972+ wxFlexGridSizer* grid_sizer_10 = new wxFlexGridSizer(3, 1, 0, 0);
973+ wxGridSizer* grid_sizer_12 = new wxGridSizer(1, 2, 0, 0);
974+ wxGridSizer* grid_sizer_11 = new wxGridSizer(4, 3, 0, 0);
975+ wxStaticBoxSizer* sizer_52 = new wxStaticBoxSizer(sizer_52_staticbox, wxVERTICAL);
976+ sizer_52->Add(radio_btn_7, 0, 0, 0);
977+ sizer_52->Add(radio_btn_8, 0, 0, 0);
978+ sizer_52->Add(checkbox_40, 0, 0, 0);
979+ grid_sizer_10->Add(sizer_52, 1, wxEXPAND, 0);
980+ grid_sizer_11->Add(label_29, 0, 0, 0);
981+ grid_sizer_11->Add(text_ctrl_14, 0, 0, 0);
982+ grid_sizer_11->Add(panel_8, 1, wxEXPAND, 0);
983+ grid_sizer_11->Add(label_30, 0, 0, 0);
984+ grid_sizer_11->Add(text_ctrl_15, 0, 0, 0);
985+ grid_sizer_11->Add(panel_9, 1, wxEXPAND, 0);
986+ grid_sizer_11->Add(label_31, 0, 0, 0);
987+ grid_sizer_11->Add(text_ctrl_16, 0, 0, 0);
988+ grid_sizer_11->Add(text_ctrl_18, 0, 0, 0);
989+ grid_sizer_11->Add(label_32, 0, 0, 0);
990+ grid_sizer_11->Add(text_ctrl_17, 0, 0, 0);
991+ grid_sizer_11->Add(text_ctrl_19, 0, 0, 0);
992+ grid_sizer_10->Add(grid_sizer_11, 1, wxEXPAND, 0);
993+ grid_sizer_12->Add(label_33, 0, 0, 0);
994+ grid_sizer_12->Add(choice_11, 0, 0, 0);
995+ grid_sizer_10->Add(grid_sizer_12, 1, wxEXPAND, 0);
996+ SetSizer(grid_sizer_10);
997+ grid_sizer_10->Fit(this);
998+ Layout();
999+ // end wxGlade
1000+}
1001+
1002+
1003+PolygonPropDialog::PolygonPropDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
1004+ wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE)
1005+{
1006+ // begin wxGlade: PolygonPropDialog::PolygonPropDialog
1007+ label_34 = new wxStaticText(this, wxID_ANY, wxT("label_34"));
1008+ label_46 = new wxStaticText(this, wxID_ANY, wxT("label_46"));
1009+ label_35 = new wxStaticText(this, wxID_ANY, wxT("label_35"));
1010+ label_47 = new wxStaticText(this, wxID_ANY, wxT("label_47"));
1011+ label_36 = new wxStaticText(this, wxID_ANY, wxT("label_36"));
1012+ label_48 = new wxStaticText(this, wxID_ANY, wxT("label_48"));
1013+ label_37 = new wxStaticText(this, wxID_ANY, wxT("label_37"));
1014+ label_49 = new wxStaticText(this, wxID_ANY, wxT("label_49"));
1015+ label_38 = new wxStaticText(this, wxID_ANY, wxT("label_38"));
1016+ label_39 = new wxStaticText(this, wxID_ANY, wxT("label_39"));
1017+ label_55 = new wxStaticText(this, wxID_ANY, wxT("label_55"));
1018+ label_40 = new wxStaticText(this, wxID_ANY, wxT("label_40"));
1019+ label_54 = new wxStaticText(this, wxID_ANY, wxT("label_54"));
1020+ label_41 = new wxStaticText(this, wxID_ANY, wxT("label_41"));
1021+ label_53 = new wxStaticText(this, wxID_ANY, wxT("label_53"));
1022+ label_42 = new wxStaticText(this, wxID_ANY, wxT("label_42"));
1023+ label_52 = new wxStaticText(this, wxID_ANY, wxT("label_52"));
1024+ label_43 = new wxStaticText(this, wxID_ANY, wxT("label_43"));
1025+ label_51 = new wxStaticText(this, wxID_ANY, wxT("label_51"));
1026+ label_44 = new wxStaticText(this, wxID_ANY, wxT("label_44"));
1027+ label_50 = new wxStaticText(this, wxID_ANY, wxT("label_50"));
1028+ label_45 = new wxStaticText(this, wxID_ANY, wxT("label_45"));
1029+
1030+ set_properties();
1031+ do_layout();
1032+ // end wxGlade
1033+}
1034+
1035+
1036+void PolygonPropDialog::set_properties()
1037+{
1038+ // begin wxGlade: PolygonPropDialog::set_properties
1039+ SetTitle(wxT("dialog_9"));
1040+ // end wxGlade
1041+}
1042+
1043+
1044+void PolygonPropDialog::do_layout()
1045+{
1046+ // begin wxGlade: PolygonPropDialog::do_layout
1047+ wxFlexGridSizer* grid_sizer_13 = new wxFlexGridSizer(12, 4, 0, 0);
1048+ grid_sizer_13->Add(label_34, 0, 0, 0);
1049+ grid_sizer_13->Add(label_46, 0, 0, 0);
1050+ grid_sizer_13->Add(label_35, 0, 0, 0);
1051+ grid_sizer_13->Add(label_47, 0, 0, 0);
1052+ grid_sizer_13->Add(label_36, 0, 0, 0);
1053+ grid_sizer_13->Add(label_48, 0, 0, 0);
1054+ grid_sizer_13->Add(label_37, 0, 0, 0);
1055+ grid_sizer_13->Add(label_49, 0, 0, 0);
1056+ grid_sizer_13->Add(label_38, 0, 0, 0);
1057+ grid_sizer_13->Add(label_39, 0, 0, 0);
1058+ grid_sizer_13->Add(label_55, 0, 0, 0);
1059+ grid_sizer_13->Add(label_40, 0, 0, 0);
1060+ grid_sizer_13->Add(label_54, 0, 0, 0);
1061+ grid_sizer_13->Add(label_41, 0, 0, 0);
1062+ grid_sizer_13->Add(label_53, 0, 0, 0);
1063+ grid_sizer_13->Add(label_42, 0, 0, 0);
1064+ grid_sizer_13->Add(label_52, 0, 0, 0);
1065+ grid_sizer_13->Add(label_43, 0, 0, 0);
1066+ grid_sizer_13->Add(label_51, 0, 0, 0);
1067+ grid_sizer_13->Add(label_44, 0, 0, 0);
1068+ grid_sizer_13->Add(label_50, 0, 0, 0);
1069+ grid_sizer_13->Add(label_45, 0, 0, 0);
1070+ SetSizer(grid_sizer_13);
1071+ grid_sizer_13->Fit(this);
1072+ Layout();
1073+ // end wxGlade
1074+}
1075+
--- marathon/trunk/MapEditorWX/src/PointPropDialog.cpp (revision 333)
+++ marathon/trunk/MapEditorWX/src/PointPropDialog.cpp (revision 334)
@@ -1,7 +1,23 @@
11 #include "PointPropDialog.h"
22 #include "MapEditorWX.h"
3+enum{
4+ ID_FLOOR,
5+ ID_CEILING,
6+ ID_X,
7+ ID_Y,
8+ ID_TX,
9+ ID_TY,
10+ ID_POLY_INDEX,
11+};
12+
313 BEGIN_EVENT_TABLE(PointPropDialog, wxDialog)
4-END_EVENT_TABLE()
14+ EVT_TEXT(ID_FLOOR, PointPropDialog::OnEditFloor)
15+ EVT_TEXT(ID_CEILING, PointPropDialog::OnEditCeiling)
16+ EVT_TEXT(ID_X, PointPropDialog::OnEditX)
17+ EVT_TEXT(ID_Y, PointPropDialog::OnEditY)
18+ EVT_TEXT(ID_TX, PointPropDialog::OnEditTX)
19+ EVT_TEXT(ID_TY, PointPropDialog::OnEditTY)
20+ EVT_CHOICE(ID_POLY_INDEX, PointPropDialog::OnPolyChoice)
521 PointPropDialog::PointPropDialog()
622 {
723 }
@@ -11,6 +27,99 @@
1127 bool PointPropDialog::Create(wxWindow* parent, wxWindowID id)
1228 {
1329 bool result = wxDialog::Create(parent, id, _T("Point Properties"));
30+ sizer_52_staticbox = new wxStaticBox(this, -1, wxT("Flags"));
31+ radio_btn_7 = new wxRadioButton(this, wxID_ANY, wxT("Solid"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
32+ radio_btn_8 = new wxRadioButton(this, wxID_ANY, wxT("Transparent"));
33+ checkbox_40 = new wxCheckBox(this, wxID_ANY, wxT("Elevation"));
34+ label_29 = new wxStaticText(this, wxID_ANY, wxT("Floor height"));
35+ text_ctrl_14 = new wxTextCtrl(this, ID_FLOOR, wxEmptyString);
36+ panel_8 = new wxPanel(this, wxID_ANY);
37+ label_30 = new wxStaticText(this, wxID_ANY, wxT("Ceiling hegiht"));
38+ text_ctrl_15 = new wxTextCtrl(this, ID_CEILING, wxEmptyString);
39+ panel_9 = new wxPanel(this, wxID_ANY);
40+ label_31 = new wxStaticText(this, wxID_ANY, wxT("Vertex"));
41+ text_ctrl_16 = new wxTextCtrl(this, ID_X, wxEmptyString);
42+ text_ctrl_18 = new wxTextCtrl(this, ID_Y, wxEmptyString);
43+ label_32 = new wxStaticText(this, wxID_ANY, wxT("Transformed"));
44+ text_ctrl_17 = new wxTextCtrl(this, ID_TX, wxEmptyString);
45+ text_ctrl_19 = new wxTextCtrl(this, ID_TY, wxEmptyString);
46+ label_33 = new wxStaticText(this, wxID_ANY, wxT("Supporting polygon index"));
47+ choice_11 = new wxChoice(this, ID_POLY_INDEX);
1448
49+ wxFlexGridSizer* grid_sizer_10 = new wxFlexGridSizer(3, 1, 0, 0);
50+ wxGridSizer* grid_sizer_12 = new wxGridSizer(1, 2, 0, 0);
51+ wxGridSizer* grid_sizer_11 = new wxGridSizer(4, 3, 0, 0);
52+ wxStaticBoxSizer* sizer_52 = new wxStaticBoxSizer(sizer_52_staticbox, wxVERTICAL);
53+ sizer_52->Add(radio_btn_7, 0, 0, 0);
54+ sizer_52->Add(radio_btn_8, 0, 0, 0);
55+ sizer_52->Add(checkbox_40, 0, 0, 0);
56+ grid_sizer_10->Add(sizer_52, 1, wxEXPAND, 0);
57+ grid_sizer_11->Add(label_29, 0, 0, 0);
58+ grid_sizer_11->Add(text_ctrl_14, 0, 0, 0);
59+ grid_sizer_11->Add(panel_8, 1, wxEXPAND, 0);
60+ grid_sizer_11->Add(label_30, 0, 0, 0);
61+ grid_sizer_11->Add(text_ctrl_15, 0, 0, 0);
62+ grid_sizer_11->Add(panel_9, 1, wxEXPAND, 0);
63+ grid_sizer_11->Add(label_31, 0, 0, 0);
64+ grid_sizer_11->Add(text_ctrl_16, 0, 0, 0);
65+ grid_sizer_11->Add(text_ctrl_18, 0, 0, 0);
66+ grid_sizer_11->Add(label_32, 0, 0, 0);
67+ grid_sizer_11->Add(text_ctrl_17, 0, 0, 0);
68+ grid_sizer_11->Add(text_ctrl_19, 0, 0, 0);
69+ grid_sizer_10->Add(grid_sizer_11, 1, wxEXPAND, 0);
70+ grid_sizer_12->Add(label_33, 0, 0, 0);
71+ grid_sizer_12->Add(choice_11, 0, 0, 0);
72+ grid_sizer_10->Add(grid_sizer_12, 1, wxEXPAND, 0);
73+ SetSizer(grid_sizer_10);
74+ grid_sizer_10->Fit(this);
75+ Layout();
76+
1577 return result;
1678 }
79+void PointPropDialog::OnEditFloor(wxCommandEvent &event)
80+{
81+ event.Skip();
82+ std::cout<<"Event handler (PointPropDialog::OnEditFloor) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
83+}
84+
85+
86+void PointPropDialog::OnEditCeiling(wxCommandEvent &event)
87+{
88+ event.Skip();
89+ std::cout<<"Event handler (PointPropDialog::OnEditCeiling) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
90+}
91+
92+
93+void PointPropDialog::OnEditX(wxCommandEvent &event)
94+{
95+ event.Skip();
96+ std::cout<<"Event handler (PointPropDialog::OnEdit) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
97+}
98+
99+
100+void PointPropDialog::OnEditY(wxCommandEvent &event)
101+{
102+ event.Skip();
103+ std::cout<<"Event handler (PointPropDialog::OnEditY) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
104+}
105+
106+
107+void PointPropDialog::OnEditTX(wxCommandEvent &event)
108+{
109+ event.Skip();
110+ std::cout<<"Event handler (PointPropDialog::OnEditTX) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
111+}
112+
113+
114+void PointPropDialog::OnEditTY(wxCommandEvent &event)
115+{
116+ event.Skip();
117+ std::cout<<"Event handler (PointPropDialog::OnEditTY) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
118+}
119+
120+
121+void PointPropDialog::OnPolyChoice(wxCommandEvent &event)
122+{
123+ event.Skip();
124+ std::cout<<"Event handler (PointPropDialog::OnPolyChoice) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
125+}
--- marathon/trunk/MapEditorWX/src/EditorPreferencesDialog.cpp (revision 333)
+++ marathon/trunk/MapEditorWX/src/EditorPreferencesDialog.cpp (revision 334)
@@ -1,7 +1,16 @@
11 #include "EditorPreferencesDialog.h"
22 #include "MapEditorWX.h"
3+enum{
4+ ID_DEFAULT,
5+};
6+
37 BEGIN_EVENT_TABLE(EditorPreferencesDialog, wxDialog)
4-END_EVENT_TABLE()
8+ // begin wxGlade: EditorPreferences::event_table
9+ EVT_BUTTON(wxID_DEFAULT, EditorPreferencesDialog::OnDefault)
10+ EVT_BUTTON(wxID_OK, EditorPreferencesDialog::OnOk)
11+ EVT_BUTTON(wxID_CANCEL, EditorPreferencesDialog::OnCancel)
12+ // end wxGlade
13+END_EVENT_TABLE();
514 EditorPreferencesDialog::EditorPreferencesDialog()
615 {
716 }
@@ -11,6 +20,75 @@
1120 bool EditorPreferencesDialog::Create(wxWindow* parent, wxWindowID id)
1221 {
1322 bool result = wxDialog::Create(parent, id, _T("Editor Preferences"));
23+ label_19 = new wxStaticText(this, wxID_ANY, wxT("Grid size"));
24+ choice_9 = new wxChoice(this, wxID_ANY);
25+ checkbox_27 = new wxCheckBox(this, wxID_ANY, wxT("Show grid"));
26+ checkbox_28 = new wxCheckBox(this, wxID_ANY, wxT("Fit to grid"));
27+ checkbox_31 = new wxCheckBox(this, wxID_ANY, wxT("Show monsters"));
28+ checkbox_30 = new wxCheckBox(this, wxID_ANY, wxT("Show items"));
29+ checkbox_32 = new wxCheckBox(this, wxID_ANY, wxT("Show scenery"));
30+ checkbox_33 = new wxCheckBox(this, wxID_ANY, wxT("Show players"));
31+ checkbox_34 = new wxCheckBox(this, wxID_ANY, wxT("Show goals"));
32+ checkbox_35 = new wxCheckBox(this, wxID_ANY, wxT("Show sounds"));
33+ checkbox_36 = new wxCheckBox(this, wxID_ANY, wxT("Show annotations"));
34+ checkbox_29 = new wxCheckBox(this, wxID_ANY, wxT("Visual mode-Crossfair"));
35+ label_20 = new wxStaticText(this, wxID_ANY, wxT("Color set"));
36+ choice_10 = new wxChoice(this, wxID_ANY);
37+ checkbox_37 = new wxCheckBox(this, wxID_ANY, wxT("Show polygons"));
38+ checkbox_38 = new wxCheckBox(this, wxID_ANY, wxT("Show lines"));
39+ button_15 = new wxButton(this, wxID_ANY, wxT("Set as default"));
40+ button_13 = new wxButton(this, wxID_ANY, wxT("OK"));
41+ button_14 = new wxButton(this, wxID_ANY, wxT("Cancel"));
1442
43+ wxFlexGridSizer* sizer_45 = new wxFlexGridSizer(3, 1, 0, 0);
44+ wxBoxSizer* sizer_48 = new wxBoxSizer(wxHORIZONTAL);
45+ wxBoxSizer* sizer_47 = new wxBoxSizer(wxHORIZONTAL);
46+ wxFlexGridSizer* sizer_50 = new wxFlexGridSizer(3, 1, 0, 0);
47+ wxBoxSizer* sizer_51 = new wxBoxSizer(wxHORIZONTAL);
48+ wxBoxSizer* sizer_49 = new wxBoxSizer(wxVERTICAL);
49+ wxBoxSizer* sizer_46 = new wxBoxSizer(wxHORIZONTAL);
50+ sizer_46->Add(label_19, 0, 0, 0);
51+ sizer_46->Add(choice_9, 0, 0, 0);
52+ sizer_45->Add(sizer_46, 1, wxEXPAND, 0);
53+ sizer_49->Add(checkbox_27, 0, 0, 0);
54+ sizer_49->Add(checkbox_28, 0, 0, 0);
55+ sizer_49->Add(checkbox_31, 0, 0, 0);
56+ sizer_49->Add(checkbox_30, 0, 0, 0);
57+ sizer_49->Add(checkbox_32, 0, 0, 0);
58+ sizer_49->Add(checkbox_33, 0, 0, 0);
59+ sizer_49->Add(checkbox_34, 0, 0, 0);
60+ sizer_49->Add(checkbox_35, 0, 0, 0);
61+ sizer_49->Add(checkbox_36, 0, 0, 0);
62+ sizer_49->Add(checkbox_29, 0, 0, 0);
63+ sizer_47->Add(sizer_49, 1, wxEXPAND, 0);
64+ sizer_51->Add(label_20, 0, 0, 0);
65+ sizer_51->Add(choice_10, 0, 0, 0);
66+ sizer_50->Add(sizer_51, 1, wxEXPAND, 0);
67+ sizer_50->Add(checkbox_37, 0, 0, 0);
68+ sizer_50->Add(checkbox_38, 0, 0, 0);
69+ sizer_50->Add(button_15, 0, 0, 0);
70+ sizer_47->Add(sizer_50, 1, wxEXPAND, 0);
71+ sizer_45->Add(sizer_47, 1, wxEXPAND, 0);
72+ sizer_48->Add(button_13, 0, 0, 0);
73+ sizer_48->Add(button_14, 0, 0, 0);
74+ sizer_45->Add(sizer_48, 1, wxEXPAND, 0);
75+ SetSizer(sizer_45);
76+ sizer_45->Fit(this);
77+ Layout();
1578 return result;
1679 }
80+void EditorPreferencesDialog::OnOk(wxCommandEvent& wv)
81+{
82+ SetReturnCode(wxID_OK);
83+ Destroy();
84+}
85+void EditorPreferencesDialog::OnCancel(wxCommandEvent &ev)
86+{
87+ SetReturnCode(wxID_CANCEL);
88+ Destroy();
89+}
90+void EditorPreferencesDialog::OnDefault(wxCommandEvent &event)
91+{
92+ event.Skip();
93+ std::cout<<"Event handler (EditorPreferences::OnDefault) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
94+}
--- marathon/trunk/MapEditorWX/src/HeightDialog.cpp (revision 333)
+++ marathon/trunk/MapEditorWX/src/HeightDialog.cpp (revision 334)
@@ -6,11 +6,16 @@
66 ID_FLOOR_SLIDER,
77 ID_CEILING_SLIDER,
88 ID_DRAW_HIDDEN_CHECK,
9+ ID_FLOOR_EDIT,
10+ ID_CEILING_EDIT,
911 };
1012
1113 BEGIN_EVENT_TABLE(HeightDialog, wxDialog)
12-EVT_BUTTON(wxID_OK, HeightDialog::OnOk)
13-EVT_BUTTON(wxID_CANCEL, HeightDialog::OnCancel)
14+ EVT_TEXT(ID_FLOOR_EDIT, HeightDialog::OnEditFloor)
15+ EVT_TEXT(ID_CEILING_EDIT, HeightDialog::OnEditCeiling)
16+ EVT_SLIDER(ID_FLOOR_SLIDER, HeightDialog::OnSliderFloor)
17+ EVT_SLIDER(ID_CEILING_SLIDER, HeightDialog::OnSliderCeiling)
18+ EVT_CHECKBOX(ID_DRAW_HIDDEN_CHECK, HeightDialog::OnDrawCheck)
1419 END_EVENT_TABLE()
1520 HeightDialog::HeightDialog()
1621 {
@@ -24,12 +29,12 @@
2429
2530 //create items
2631 label_9 = new wxStaticText(this, wxID_ANY, wxT("Floor"));
27- text_ctrl_5 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
28- slider_2 = new wxSlider(this, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL);
29- slider_3 = new wxSlider(this, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL);
32+ text_ctrl_5 = new wxTextCtrl(this, ID_FLOOR_EDIT, wxEmptyString);
33+ slider_2 = new wxSlider(this, ID_FLOOR_SLIDER, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL);
34+ slider_3 = new wxSlider(this, ID_CEILING_SLIDER, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL);
3035 label_10 = new wxStaticText(this, wxID_ANY, wxT("Ceiling"));
31- text_ctrl_6 = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
32- checkbox_11 = new wxCheckBox(this, wxID_ANY, wxT("Draw hidden lines"));
36+ text_ctrl_6 = new wxTextCtrl(this, ID_CEILING_EDIT, wxEmptyString);
37+ checkbox_11 = new wxCheckBox(this, ID_DRAW_HIDDEN_CHECK, wxT("Draw hidden lines"));
3338
3439 //set properties
3540 text_ctrl_5->SetMinSize(wxSize(50, -1));
@@ -58,3 +63,24 @@
5863
5964 return result;
6065 }
66+
67+void HeightDialog::OnEditFloor(wxCommandEvent& ev)
68+{
69+ //TODO
70+}
71+void HeightDialog::OnEditCeiling(wxCommandEvent& ev)
72+{
73+ //TODO
74+}
75+void HeightDialog::OnSliderFloor(wxCommandEvent& ev)
76+{
77+ //TODO
78+}
79+void HeightDialog::OnSliderCeiling(wxCommandEvent& ev)
80+{
81+ //TODO
82+}
83+void HeightDialog::OnDrawCheck(wxCommandEvent& ev)
84+{
85+ //TODO
86+}
--- marathon/trunk/MapEditorWX/src/TerminalDialog.cpp (nonexistent)
+++ marathon/trunk/MapEditorWX/src/TerminalDialog.cpp (revision 334)
@@ -0,0 +1,89 @@
1+#include "TerminalDialog.h"
2+
3+enum{
4+ ID_TERMINAL,
5+ ID_SCREEN,
6+ ID_INFO,
7+ ID_TEXT_EDIT
8+};
9+
10+BEGIN_EVENT_TABLE(TerminalDialog, wxDialog)
11+ EVT_LISTBOX(ID_TERMINAL, TerminalDialog::OnSelTerminal)
12+ EVT_LISTBOX(ID_SCREEN, TerminalDialog::OnSelScreen)
13+ EVT_LISTBOX(ID_INFO, TerminalDialog::OnSelInfo)
14+ EVT_TEXT(ID_TEXT_EDIT, TerminalDialog::OnEdit)
15+ EVT_BUTTON(wxID_OK, TerminalDialog::OnOk)
16+END_EVENT_TABLE()
17+
18+TerminalDialog::TerminalDialog():wxDialog()
19+{
20+}
21+
22+TerminalDialog::~TerminalDialog()
23+{
24+}
25+bool TerminalDialog::Create(wxWindow* parent, wxWindowID id)
26+{
27+ bool result = wxDialog::Create(parent, id, _T("Terminal"));
28+ if(!result){
29+ return result;
30+ }
31+ list_box_1 = new wxListBox(this, ID_TERMINAL);
32+ list_box_2 = new wxListBox(this, ID_SCREEN);
33+ list_box_3 = new wxListBox(this, ID_INFO);
34+ panel_7 = new wxPanel(this, wxID_ANY);
35+ text_ctrl_13 = new wxTextCtrl(this, ID_TEXT_EDIT, wxEmptyString);
36+ button_20 = new wxButton(this, wxID_OK, wxEmptyString);
37+
38+ list_box_1->SetMinSize(wxSize(-1, 200));
39+ list_box_2->SetMinSize(wxSize(-1, 100));
40+ panel_7->SetMinSize(wxSize(500, 200));
41+ text_ctrl_13->SetMinSize(wxSize(500, 200));
42+
43+ wxFlexGridSizer* grid_sizer_5 = new wxFlexGridSizer(1, 2, 0, 0);
44+ wxFlexGridSizer* grid_sizer_7 = new wxFlexGridSizer(3, 1, 0, 0);
45+ wxFlexGridSizer* grid_sizer_6 = new wxFlexGridSizer(3, 1, 0, 0);
46+ grid_sizer_6->Add(list_box_1, 0, 0, 0);
47+ grid_sizer_6->Add(list_box_2, 0, 0, 0);
48+ grid_sizer_6->Add(list_box_3, 0, 0, 0);
49+ grid_sizer_5->Add(grid_sizer_6, 1, wxEXPAND, 0);
50+ grid_sizer_7->Add(panel_7, 1, wxEXPAND, 0);
51+ grid_sizer_7->Add(text_ctrl_13, 0, 0, 0);
52+ grid_sizer_7->Add(button_20, 0, wxALIGN_RIGHT, 0);
53+ grid_sizer_5->Add(grid_sizer_7, 1, wxEXPAND, 0);
54+ SetSizer(grid_sizer_5);
55+ grid_sizer_5->Fit(this);
56+ Layout();
57+ return result;
58+}
59+void PlacementDialog::OnOk(wxCommandEvent& ev)
60+{
61+ SetReturnCode(wxID_OK);
62+ Destroy();
63+}
64+void TerminalDialog::OnSelTerminal(wxCommandEvent &event)
65+{
66+ event.Skip();
67+ std::cout<<"Event handler (TerminalDialog::OnSelTerminal) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
68+}
69+
70+
71+void TerminalDialog::OnSelScreen(wxCommandEvent &event)
72+{
73+ event.Skip();
74+ std::cout<<"Event handler (TerminalDialog::OnSelScreen) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
75+}
76+
77+
78+void TerminalDialog::OnSelInfo(wxCommandEvent &event)
79+{
80+ event.Skip();
81+ std::cout<<"Event handler (TerminalDialog::OnSelInfo) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
82+}
83+
84+
85+void TerminalDialog::OnEdit(wxCommandEvent &event)
86+{
87+ event.Skip();
88+ std::cout<<"Event handler (TerminalDialog::OnEdit) not implemented yet"<<std::endl; //notify the user that he hasn't implemented the event handler yet
89+}
--- marathon/trunk/MapEditorWX/src/PlacementDialog.h (nonexistent)
+++ marathon/trunk/MapEditorWX/src/PlacementDialog.h (revision 334)
@@ -0,0 +1,42 @@
1+#ifndef _PLACEMENT_DIALOG_
2+#define _PLACEMENT_DIALOG_
3+
4+#include "DlgCommon.h"
5+
6+class PlacementDialog: public wxDialog{
7+private:
8+ wxStaticText* label_21;
9+ wxTextCtrl* text_ctrl_8;
10+ wxStaticText* label_22;
11+ wxTextCtrl* text_ctrl_9;
12+ wxStaticText* label_23;
13+ wxTextCtrl* text_ctrl_10;
14+ wxStaticText* label_24;
15+ wxTextCtrl* text_ctrl_11;
16+ wxStaticText* label_25;
17+ wxTextCtrl* text_ctrl_12;
18+ wxButton* button_17;
19+ wxButton* button_18;
20+ wxButton* button_19;
21+ wxCheckBox* checkbox_39;
22+ wxListCtrl* list_ctrl_1;
23+ wxButton* button_16;
24+public:
25+ PlacementDialog();
26+ virtual ~PlacementDialog();
27+
28+ bool Create(wxWindow* parent, wxWindowID id);
29+ void OnOk(wxCommandEvent& ev);
30+ void OnEditInitial(wxCommandEvent &event); // wxGlade: <event_handler>
31+ void OnEditMinimum(wxCommandEvent &event); // wxGlade: <event_handler>
32+ void OnEditMaximum(wxCommandEvent &event); // wxGlade: <event_handler>
33+ void OnEditRandomCount(wxCommandEvent &event); // wxGlade: <event_handler>
34+ void OnRandomChance(wxCommandEvent &event); // wxGlade: <event_handler>
35+ void OnInf(wxCommandEvent &ev);
36+ void OnAllInf(wxCommandEvent &ev);
37+ void OnSetInitial(wxCommandEvent &ev);
38+ //イベントテーブル作成<en>declare
39+ DECLARE_EVENT_TABLE()
40+};
41+
42+#endif
--- marathon/trunk/MapEditorWX/WXTODOリスト.txt (revision 333)
+++ marathon/trunk/MapEditorWX/WXTODOリスト.txt (revision 334)
@@ -24,4 +24,28 @@
2424
2525 -?E?N???b?Nor Alt+?N???b?N?Ń??j???[
2626
27-///MAXIMUM_VERTICES_PER_POLYGON=8
\ No newline at end of file
27+///MAXIMUM_VERTICES_PER_POLYGON=8
28+
29+?E?z?u
30+?E?f?[?^?ǂݍ??ݕ????쐬
31+?E?f?[?^?????o???????쐬
32+Annotation :?z?u?ς?
33+ColorCustomize :?z?u?ς?
34+EditPreferences :?z?u?ς?
35+Height :?z?u?ς݁B
36+HeightPallet :
37+LevelInfo
38+LineProp
39+ObjectProp
40+Placement :?z?u?ς?
41+Platform :?z?u?ς݁B
42+PointProp
43+PolygonNum
44+PolygonProp
45+PolygonType
46+SelectLevel
47+SideProp
48+Terminal :?z?u?ς?
49+Texture
50+Tool :?z?u?ς?
51+Visual
\ No newline at end of file
旧リポジトリブラウザで表示