Changeset 10
- Timestamp:
- 12/15/07 22:56:42 (9 months ago)
- Files:
-
- trunk/2bin/ChangeLog.txt (modified) (1 diff)
- trunk/MainForm.cpp (modified) (14 diffs)
- trunk/MainForm.dfm (modified) (1 diff)
- trunk/MainForm.h (modified) (5 diffs)
- trunk/initer.cpp (modified) (11 diffs)
- trunk/initer.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/2bin/ChangeLog.txt
r9 r10 3 3 *  òåêñòå ëèöåíçèè ïîäïðàâëåíî ôîðìàòèðîâàíèå äëÿ íîðìàëüíîãî îòîáðàæåíèÿ â wiki. 4 4 * Èñïðàâëåí íåðàáîòàâøèé ïîèñê. 5 * Óáðàíû ëèøíèå ïóíêòû ìåíþ, ïðåäíàçíà÷àâøèåñÿ äëÿ ðàáîòû ñ "ìîáîì ¹2" - â íèõ íå âîçíêëà íåîáõîäèìîñòü, îáìåí èíôîðìàöèåé ìåæäó ìîáàìè óæå ðåàëèçîâàí ÷åðåç ìàññîâûå èçìåíåíèÿ. 5 6 6 7 Âåðñèÿ 0.3.5 trunk/MainForm.cpp
r9 r10 75 75 { 76 76 //Åñëè îíè åñòü, ïàðàìåòðû åòè... 77 OpenMob 1Comm(ParamStr(1));77 OpenMobComm(ParamStr(1)); 78 78 }; 79 79 } … … 149 149 //--------------------------------------------------------------------------- 150 150 151 void __fastcall TMainF::OpenMob 1MenuClick(TObject *Sender)151 void __fastcall TMainF::OpenMobMenuClick(TObject *Sender) 152 152 { 153 153 //Ýòîò ïóíêò ìåíþ îòêðûâàåò ïåðâûé ìîá. 154 OpenMob 1Comm("NULL");155 } 156 //--------------------------------------------------------------------------- 157 158 void __fastcall TMainF::SaveMob 1_menuClick(TObject *Sender)154 OpenMobComm("NULL"); 155 } 156 //--------------------------------------------------------------------------- 157 158 void __fastcall TMainF::SaveMob_menuClick(TObject *Sender) 159 159 { 160 160 //Ýòîò ïóíêò ìåíþ ñåéâèò ïåðâûé ìîá. 161 if (Mob 1Loaded == true)161 if (MobLoaded == true) 162 162 { 163 163 //Åñëè ðåäàêòèðîâàëîñü çíà÷åíèå â ðåäàêòîðå îáúåêòîâ... … … 168 168 ObjEditorActive = true; 169 169 }; 170 SaveMob 1Comm();171 }; 172 } 173 //--------------------------------------------------------------------------- 174 175 176 void __fastcall TMainF::SaveAsMob 1MenuClick(TObject *Sender)170 SaveMobComm(); 171 }; 172 } 173 //--------------------------------------------------------------------------- 174 175 176 void __fastcall TMainF::SaveAsMobMenuClick(TObject *Sender) 177 177 { 178 178 //Ýòîò ïóíêò ìåíþ ïûòàåòñÿ çàñåéâèòü 1-é ìîá ïîä äðóãèì èìåíåì. … … 184 184 ObjEditorActive = true; 185 185 }; 186 SaveAsMob 1Comm();186 SaveAsMobComm(); 187 187 } 188 188 //--------------------------------------------------------------------------- … … 476 476 Application->Title = MobSurgeon_AppName; 477 477 UpdateEditMenu(); //ìåíþõà ðåäàêòèðîâàíèÿ. 478 if (Mob 1Loaded == true)478 if (MobLoaded == true) 479 479 { 480 480 //Ïåðâûé ìîá çàãðóæåí - âûâåñòè åãî èìÿ ôàéëà... 481 Caption = Caption + ' ' + ExtractFileName(Mob 1FileName);482 Application->Title = ExtractFileName(Mob 1FileName);481 Caption = Caption + ' ' + ExtractFileName(MobFileName); 482 Application->Title = ExtractFileName(MobFileName); 483 483 }; 484 484 485 485 //Òåïåðü - áëîêèðîâêà ýëåìåíòîâ èíòåðôåéñà â çàâèñèìîñòè îò òîãî êàêèå ôàéëû áûëè îòêðûòû... 486 if (Mob 1Loaded == true)486 if (MobLoaded == true) 487 487 { 488 488 //Ïåðâûé ìîá çàãðóæåí. 489 489 490 490 //Ðàçáëîêèðîâàòü ìåíþõó... 491 SaveMob 1_menu->Enabled = true;492 SaveAsMob 1Menu->Enabled = true;493 BackupMob 1Menu->Enabled = true;491 SaveMob_menu->Enabled = true; 492 SaveAsMobMenu->Enabled = true; 493 BackupMobMenu->Enabled = true; 494 494 495 495 //Ðàçáëîêèðîâàòü ðåäàêòîð ñêðèïòà... … … 572 572 573 573 //Çàáëîêèðîâàòü ìåíþõó... 574 SaveMob 1_menu->Enabled = false;575 SaveAsMob 1Menu->Enabled = false;576 BackupMob 1Menu->Enabled = false;574 SaveMob_menu->Enabled = false; 575 SaveAsMobMenu->Enabled = false; 576 BackupMobMenu->Enabled = false; 577 577 578 578 //Çàáëîêèðîâàòü ðåäàêòîð ñêðèïòà... … … 655 655 { 656 656 //Òèïà ñàâ äëÿ 1-ãî ìîáà... 657 if (SaveMob 1_menu->Enabled == true)658 { 659 SaveMob 1_menuClick(Sender);657 if (SaveMob_menu->Enabled == true) 658 { 659 SaveMob_menuClick(Sender); 660 660 }; 661 661 … … 667 667 { 668 668 //Òèïà ñàâ àç äëÿ 1-ãî ìîáà... 669 if (SaveAsMob 1Menu->Enabled == true)670 { 671 SaveAsMob 1MenuClick(Sender);669 if (SaveAsMobMenu->Enabled == true) 670 { 671 SaveAsMobMenuClick(Sender); 672 672 }; 673 673 … … 679 679 { 680 680 //Òèïà ëîàä äëÿ 1-ãî ìîáà... 681 if (OpenMob 1Menu->Enabled == true)682 { 683 OpenMob 1MenuClick(Sender);681 if (OpenMobMenu->Enabled == true) 682 { 683 OpenMobMenuClick(Sender); 684 684 }; 685 685 … … 726 726 if ( (Key == 'K') && ( Shift.Contains(ssCtrl)) && (Shift.Contains(ssShift)) && (Shift.Contains(ssAlt)) ) 727 727 { 728 if (Mob 1Loaded == true)728 if (MobLoaded == true) 729 729 { 730 730 //Òèïà çàìåíà êëþ÷à ñêðèïòà. … … 746 746 //--------------------------------------------------------------------------- 747 747 748 void __fastcall TMainF::BackupMob 1MenuClick(TObject *Sender)748 void __fastcall TMainF::BackupMobMenuClick(TObject *Sender) 749 749 { 750 750 //Çàáåêàïèòü ìîá¹1 751 MakeUserBackup(Mob 1FileName);751 MakeUserBackup(MobFileName); 752 752 } 753 753 //--------------------------------------------------------------------------- … … 1151 1151 //èçìåíåíèè - áëîêèðóåò \ ðàçáëîêèðóåò èíòåðôåéñ. 1152 1152 { 1153 if (Mob 1Loaded == true)1153 if (MobLoaded == true) 1154 1154 { 1155 1155 //Òîêà åñëè ìîá-1 çàãðóæåí. … … 1468 1468 1469 1469 //Òåïåðü ïðîâåðèì, çàãðóæåí ëè ìîá... 1470 if (Mob 1Loaded == true)1470 if (MobLoaded == true) 1471 1471 { 1472 1472 //Ìîá òèïî çàãðóæåí... … … 1504 1504 1505 1505 //Ñðàáàòûâàåì òîëüêî åñëè ìîá çàãðóæåí... 1506 if (Mob 1Loaded == true)1506 if (MobLoaded == true) 1507 1507 { 1508 1508 //Ïîåõàëè. trunk/MainForm.dfm
r9 r10 798 798 object FileMenu: TMenuItem 799 799 Caption = #1060#1072#1081#1083 800 object OpenMob1Menu: TMenuItem 801 Caption = #1054#1090#1082#1088#1099#1090#1100' mob'#8470'1... Ctrl+O' 802 OnClick = OpenMob1MenuClick 803 end 804 object OpenMob2Menu: TMenuItem 805 Caption = #1054#1090#1082#1088#1099#1090#1100' mob'#8470'2...' 806 Enabled = False 800 object OpenMobMenu: TMenuItem 801 Caption = #1054#1090#1082#1088#1099#1090#1100' mob... Ctrl+O' 802 OnClick = OpenMobMenuClick 807 803 end 808 804 object N5: TMenuItem 809 805 Caption = '-' 810 806 end 811 object SaveMob1_menu: TMenuItem 812 Caption = #1057#1086#1093#1088#1072#1085#1080#1090#1100' mob'#8470'1 Ctrl+S' 813 OnClick = SaveMob1_menuClick 814 end 815 object SaveAsMob1Menu: TMenuItem 816 Caption = #1057#1086#1093#1088#1072#1085#1080#1090#1100' mob'#8470'1 '#1082#1072#1082'... Ctrl+Shift+S' 817 OnClick = SaveAsMob1MenuClick 818 end 819 object SaveMob2_menu: TMenuItem 820 Caption = #1057#1086#1093#1088#1072#1085#1080#1090#1100' mob'#8470'2' 821 Enabled = False 822 end 823 object SaveAsMob2Menu: TMenuItem 824 Caption = #1057#1086#1093#1088#1072#1085#1080#1090#1100' mob'#8470'2 '#1082#1072#1082'...' 825 Enabled = False 807 object SaveMob_menu: TMenuItem 808 Caption = #1057#1086#1093#1088#1072#1085#1080#1090#1100' mob Ctrl+S' 809 OnClick = SaveMob_menuClick 810 end 811 object SaveAsMobMenu: TMenuItem 812 Caption = #1057#1086#1093#1088#1072#1085#1080#1090#1100' mob '#1082#1072#1082'... Ctrl+Shift+S' 813 OnClick = SaveAsMobMenuClick 826 814 end 827 815 object N1: TMenuItem 828 816 Caption = '-' 829 817 end 830 object BackupMob1Menu: TMenuItem 831 Caption = #1057#1076#1077#1083#1072#1090#1100' '#1073#1077#1082#1072#1087' mob'#8470'1' 832 OnClick = BackupMob1MenuClick 833 end 834 object BackupMob2Menu: TMenuItem 835 Caption = #1057#1076#1077#1083#1072#1090#1100' '#1073#1077#1082#1072#1087' mob'#8470'2' 836 Enabled = False 818 object BackupMobMenu: TMenuItem 819 Caption = #1057#1076#1077#1083#1072#1090#1100' '#1073#1077#1082#1072#1087 820 OnClick = BackupMobMenuClick 837 821 end 838 822 object N3: TMenuItem trunk/MainForm.h
r9 r10 58 58 TMenuItem *FileMenu; 59 59 TMenuItem *HelpMenu; 60 TMenuItem *OpenMob1Menu; 61 TMenuItem *OpenMob2Menu; 60 TMenuItem *OpenMobMenu; 62 61 TMenuItem *ExitMenu; 63 62 TMenuItem *AboutMenu; … … 72 71 TOpenDialog *OpenDialog1; 73 72 TMenuItem *N5; 74 TMenuItem *SaveMob1_menu; 75 TMenuItem *SaveMob2_menu; 76 TMenuItem *SaveAsMob1Menu; 77 TMenuItem *SaveAsMob2Menu; 73 TMenuItem *SaveMob_menu; 74 TMenuItem *SaveAsMobMenu; 78 75 TSaveDialog *SaveDialog1; 79 76 TTabSheet *ScriptSh; … … 85 82 TMenuItem *ProgSettsMenu; 86 83 TMenuItem *N1; 87 TMenuItem *BackupMob1Menu; 88 TMenuItem *BackupMob2Menu; 84 TMenuItem *BackupMobMenu; 89 85 TSynEdit *ScriptEd; 90 86 TSynEIScriptSyn *SynEIScriptSyn1; … … 187 183 void __fastcall AboutMenuClick(TObject *Sender); 188 184 void __fastcall TestMenuMenuClick(TObject *Sender); 189 void __fastcall OpenMob 1MenuClick(TObject *Sender);190 void __fastcall SaveMob 1_menuClick(TObject *Sender);191 void __fastcall SaveAsMob 1MenuClick(TObject *Sender);185 void __fastcall OpenMobMenuClick(TObject *Sender); 186 void __fastcall SaveMob_menuClick(TObject *Sender); 187 void __fastcall SaveAsMobMenuClick(TObject *Sender); 192 188 void __fastcall LogShShow(TObject *Sender); 193 189 void __fastcall FormClose(TObject *Sender, TCloseAction &Action); … … 197 193 void __fastcall FormKeyDown(TObject *Sender, WORD &Key, 198 194 TShiftState Shift); 199 void __fastcall BackupMob 1MenuClick(TObject *Sender);195 void __fastcall BackupMobMenuClick(TObject *Sender); 200 196 void __fastcall SearchRepMenuClick(TObject *Sender); 201 197 void __fastcall UndoMenuClick(TObject *Sender); trunk/initer.cpp
r3 r10 98 98 //Òèïà ãëîáàëüíûå ïåðåìåííûå...; 99 99 TVerInfoTxtFormat *VitInfo; 100 String ProgPath, Mob 1FileName, Mob2FileName;100 String ProgPath, MobFileName; 101 101 TMob *MobInMem1, *TargetMob; 102 bool Mob 1Loaded, Mob2Loaded, SearchDialCanceled, MakeSLBlockInterf;102 bool MobLoaded, SearchDialCanceled, MakeSLBlockInterf; 103 103 TIniFile *MainIni; 104 104 … … 109 109 110 110 //Èíèöèàëèçîâàòü ïåðåìåííûå... 111 Mob1Loaded = false; 112 Mob2Loaded = false; 113 Mob1FileName = ""; 114 Mob2FileName = ""; 111 MobLoaded = false; 112 MobFileName = ""; 115 113 MakeSLBlockInterf = true; 116 114 … … 538 536 }; 539 537 540 void OpenMob 1Comm(const AnsiString FileName)538 void OpenMobComm(const AnsiString FileName) 541 539 //Ýòà ôóíêöèÿ âûçûâàåòñÿ ïðè îòêðûòèè 1-ãî ìîáà. 542 540 { … … 590 588 SaveProgSetts(); 591 589 592 Mob 1Loaded = false; //Âñå, òèïà ñòàðûé ìîá åñëè îí è áûë çàãðóæåí590 MobLoaded = false; //Âñå, òèïà ñòàðûé ìîá åñëè îí è áûë çàãðóæåí 593 591 // - óæå óáèò :). 594 592 … … 614 612 if (LoadResult == true) 615 613 { 616 Mob 1FileName = FName;617 Mob 1Loaded = true; //È åññíî ïîìåòèòü ÷òî ìîá çàãðóæåí.614 MobFileName = FName; 615 MobLoaded = true; //È åññíî ïîìåòèòü ÷òî ìîá çàãðóæåí. 618 616 619 617 //Çàãðóçèòü èíôó ìîáà â èíòåðôåéñ ïðîãè... … … 649 647 }; 650 648 651 void SaveMob 1Comm()649 void SaveMobComm() 652 650 //Ýòà ôóíêöèÿ âûçûâàåòñÿ ïðè ñåéâå 1-ãî ìîáà. 653 651 { … … 660 658 if ((UseTMobThreads == true) && (MakeSLBlockInterf == true)) MainF->BlockInterf(); 661 659 //Åñëè íàäî äåëàòü áåêàïû - çàáåêàïèòü... 662 if (MakeAutoBackups == true) MakeAutoBackup(Mob 1FileName);663 if (MobInMem1->SaveMob(Mob 1FileName) == false)660 if (MakeAutoBackups == true) MakeAutoBackup(MobFileName); 661 if (MobInMem1->SaveMob(MobFileName) == false) 664 662 { 665 663 //Åñëè çàñàâèòü íå óäàëîñü - ïîêàçàòü þçâåðþ òàá ñ ëîãîì. … … 680 678 }; 681 679 682 void SaveAsMob 1Comm()680 void SaveAsMobComm() 683 681 //Ýòà ôóíêöèÿ âûçûâàåòñÿ ïðè ïîïûòêå ñîõðàíèòü 1-é ìîá ïîä äðóãèì èìåíåì. 684 682 { … … 735 733 { 736 734 //Åñëè ñåéâ áûë óñïåøíûì - çàïîìíèòü íîâîå èìÿ ìîáà. 737 Mob 1FileName = FName;735 MobFileName = FName; 738 736 //Îáíîâèòü îñíîâíîé èíòåðôåéñ :). 739 737 MainF->UpdateMainInterf(); … … 1066 1064 //Íà âñÿêèé ñëó÷àé çàñàâèòü öåëåâîé ìîá. 1067 1065 MainF->LogEd->Lines->Add("Ñîõðàíÿþ îòêðûòûé ìîá."); 1068 SaveMob 1Comm();1066 SaveMobComm(); 1069 1067 // íà÷àëå - åñëè íàäî îòêðûâàòü öåëåâîé ìîá - îòêðûòü åãî. 1070 1068 if ( (MainF->MC_AS_Obj_CopyRB->Checked == true) || … … 1350 1348 if (!(MainF->MC_AS_Obj_CopyRB->Checked == true)) 1351 1349 { 1352 SaveMob 1Comm();1350 SaveMobComm(); 1353 1351 }; 1354 OpenMob 1Comm(Mob1FileName);1352 OpenMobComm(MobFileName); 1355 1353 //È îáíîâèòü èíòåðôåéñ ïðîãè èç êëàññà ìîáà. 1356 1354 //MainF->UpdateMainInterf(); trunk/initer.h
r3 r10 170 170 //Òèïà îáúÿâèòü ãëîáàëüíûå ïåðåìåííûå... 171 171 extern TVerInfoTxtFormat *VitInfo; 172 extern String ProgPath, Mob 1FileName, Mob2FileName;172 extern String ProgPath, MobFileName; 173 173 extern TMob *MobInMem1, *TargetMob; 174 extern bool Mob 1Loaded, Mob2Loaded, SearchDialCanceled, MakeSLBlockInterf;174 extern bool MobLoaded, SearchDialCanceled, MakeSLBlockInterf; 175 175 extern TIniFile *MainIni; 176 176 … … 180 180 void AppInit(); //Ñðàáàòûâàåò äî RUN 181 181 void AppDeInit(); //Ñðàáàòûâàåò ïîñëå RUN 182 void OpenMob 1Comm(const AnsiString FileName); //Ýòà ôóíêöèÿ âûçûâàåòñÿ ïðè îòêðûòèè 1-ãî ìîáà.183 void SaveMob 1Comm(); //Ýòà ôóíêöèÿ âûçûâàåòñÿ ïðè ñåéâå 1-ãî ìîáà.184 void SaveAsMob 1Comm(); //Ýòà ôóíêöèÿ âûçûâàåòñÿ ïðè ïîïûòêå ñîõðàíèòü 1-é ìîá ïîä äðóãèì èìåíåì.182 void OpenMobComm(const AnsiString FileName); //Ýòà ôóíêöèÿ âûçûâàåòñÿ ïðè îòêðûòèè 1-ãî ìîáà. 183 void SaveMobComm(); //Ýòà ôóíêöèÿ âûçûâàåòñÿ ïðè ñåéâå 1-ãî ìîáà. 184 void SaveAsMobComm(); //Ýòà ôóíêöèÿ âûçûâàåòñÿ ïðè ïîïûòêå ñîõðàíèòü 1-é ìîá ïîä äðóãèì èìåíåì. 185 185 void SaveInterfInfo(); //Ýòà ôóíêöèÿ ñîõðàíÿåò èíôó èç èíòåðôåéñà â êëàññ ìîáà... 186 186 void SetStandProgSetts(); //Ýòà ôóíêöèÿ ãåíåðèò ñòàíäàðòíûé íàáîð íàñòðîåê ïðîãè.
