• R/O
  • SSH
  • HTTPS

vima19: Commit


Commit MetaInfo

Revision749 (tree)
Time2022-08-12 23:14:55
Authorhgtterry

Log Message

Equity_SB 120822 Project (WIP)

Change Summary

Incremental Difference

--- Anim19_OSDN/GD19_OSDN.cpp (revision 748)
+++ Anim19_OSDN/GD19_OSDN.cpp (revision 749)
@@ -227,6 +227,7 @@
227227 App->Say("ok");
228228
229229 remove(App->ETemp_Folder);*/
230+ App->Say(App->CL_Vm_ImGui->poo());
230231
231232 return 1;
232233 }
@@ -280,7 +281,7 @@
280281 // ------------------------------------------------------------
281282 case ID_NEW_PROJECT:
282283 {
283- App->SBC_Project->Start_Create_Project();
284+ App->SBC_Project->Start_Save_Project_Dialog(1);
284285 return 1;
285286 }
286287
@@ -304,7 +305,7 @@
304305
305306 case ID_FILE_SAVEPROJECT:
306307 {
307- App->SBC_Project->Start_Create_Project();
308+ App->SBC_Project->Start_Save_Project_Dialog(0);
308309 return 1;
309310 }
310311
--- Anim19_OSDN/SB_Project.cpp (revision 748)
+++ Anim19_OSDN/SB_Project.cpp (revision 749)
@@ -57,7 +57,7 @@
5757 Write_Object_Ini = NULL;
5858
5959 Project_Loaded = 0;
60-
60+ m_Create_Flag = 0;
6161 }
6262
6363
@@ -66,10 +66,12 @@
6666 }
6767
6868 // *************************************************************************
69-// * Start_Create_Project Terry Flanigan *
69+// * Start_Save_Project_Dialog Terry Flanigan *
7070 // *************************************************************************
71-bool SB_Project::Start_Create_Project()
71+bool SB_Project::Start_Save_Project_Dialog(bool Create)
7272 {
73+ m_Create_Flag = Create;
74+
7375 DialogBox(App->hInst, (LPCTSTR)IDD_PROJECT, App->Fdlg, (DLGPROC)Create_Project_Proc);
7476 return 1;
7577 }
@@ -96,12 +98,22 @@
9698
9799 SendDlgItemMessage(hDlg, IDC_BTPJBROWSE, WM_SETFONT, (WPARAM)App->Font_CB15, MAKELPARAM(TRUE, 0));
98100 SendDlgItemMessage(hDlg, IDC_BTDESKTOP, WM_SETFONT, (WPARAM)App->Font_CB15, MAKELPARAM(TRUE, 0));
101+ SendDlgItemMessage(hDlg, IDC_STBANNER, WM_SETFONT, (WPARAM)App->Font_Arial20, MAKELPARAM(TRUE, 0));
99102
100-
101103 SetDlgItemText(hDlg, IDC_STPROJECTNAME, (LPCTSTR)App->SBC_Project->m_Project_Name);
102104 SetDlgItemText(hDlg, IDC_STLEVELNAME, (LPCTSTR)App->SBC_Project->m_Level_Name);
103105 SetDlgItemText(hDlg, IDC_STPJFOLDERPATH, (LPCTSTR)App->SBC_Project->m_Project_Folder_Path);
104106
107+ if (App->SBC_Project->m_Create_Flag == 1)
108+ {
109+ SetDlgItemText(hDlg, IDC_STBANNER, (LPCTSTR)"Create Project");
110+ }
111+ else
112+ {
113+ SetDlgItemText(hDlg, IDC_STBANNER, (LPCTSTR)"Save Project As");
114+ }
115+
116+
105117 return TRUE;
106118 }
107119
@@ -155,6 +167,14 @@
155167 SetBkMode((HDC)wParam, TRANSPARENT);
156168 return (UINT)App->AppBackground;
157169 }
170+
171+ if (GetDlgItem(hDlg, IDC_STBANNER) == (HWND)lParam)
172+ {
173+ SetBkColor((HDC)wParam, RGB(0, 0, 0));
174+ SetTextColor((HDC)wParam, RGB(0, 0, 255));
175+ SetBkMode((HDC)wParam, TRANSPARENT);
176+ return (UINT)App->AppBackground;
177+ }
158178 return FALSE;
159179 }
160180
@@ -277,10 +297,16 @@
277297
278298 if (LOWORD(wParam) == IDOK)
279299 {
280- //App->SBC_Project->Create_Project();
300+
301+ if (App->SBC_Project->m_Create_Flag == 1)
302+ {
303+ App->SBC_Project->Create_Project();
304+ }
305+ else
306+ {
307+ App->SBC_Project->N_Save_Project();
308+ }
281309
282- App->SBC_Project->N_Save_Project();
283-
284310 EndDialog(hDlg, LOWORD(wParam));
285311 return TRUE;
286312 }
--- Anim19_OSDN/SB_Project.h (revision 748)
+++ Anim19_OSDN/SB_Project.h (revision 749)
@@ -39,7 +39,7 @@
3939 SB_Project();
4040 ~SB_Project();
4141
42- bool Start_Create_Project();
42+ bool Start_Save_Project_Dialog(bool Create);
4343
4444 bool N_Save_Project();
4545 bool N_Save_Project_Ini();
@@ -106,6 +106,8 @@
106106 bool Read_Player();
107107 bool Read_Camera();
108108
109+ bool m_Create_Flag;
110+
109111 FILE *Write_Ini;
110112 FILE *Write_Player_Ini;
111113 FILE *Write_Object_Ini;
--- Anim19_OSDN/VM_ImGui.cpp (revision 748)
+++ Anim19_OSDN/VM_ImGui.cpp (revision 749)
@@ -40,6 +40,8 @@
4040 progress = 0;
4141 Progress_Count = 0;
4242 Progress_Delta = 0;
43+
44+ strcpy(test, "poopoo");
4345 }
4446
4547
@@ -1007,3 +1009,9 @@
10071009 ImGui::EndPopup();
10081010 }
10091011 }
1012+
1013+
1014+char* VM_ImGui::poo()
1015+{
1016+ return test;
1017+}
--- Anim19_OSDN/VM_ImGui.h (revision 748)
+++ Anim19_OSDN/VM_ImGui.h (revision 749)
@@ -71,5 +71,8 @@
7171 bool Block;
7272 bool Block_Motion;
7373 bool Reset_Groups;
74+
75+ char test[250];
76+ char* poo();
7477 };
7578
Show on old repository browser