github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-15 22:02:51 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*ide: fixed more config issues

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@4524 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-02-03 12:32:07 +00:00
parent f3c9b11ba0
commit 97765fa9a2
5 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
uppsrc/ide/Config.cpp
View file

@ -92,11 +92,31 @@ void Ide::SerializeWorkspace(Stream& s) {
}
void Ide::Serialize(Stream& s) {
void Ide::SerializeLastMain(Stream& s)
{
s % main;
String varsname = GetVarsName();
s % varsname;
s % pocfg;
if(s.IsLoading())
LoadVars(varsname);
}
void Ide::SaveLastMain()
{
StoreToFile(THISBACK(SerializeLastMain), ConfigFile("lastmain.cfg"));
}
void Ide::LoadLastMain()
{
LoadFromFile(THISBACK(SerializeLastMain), ConfigFile("lastmain.cfg"));
}
void Ide::Serialize(Stream& s)
{
int version = 0;
s.Magic(0x2345432);
s.Magic(0x12341234);
s / version;
s % last_main;
s % AnySourceFs();
s % BasedSourceFs();
s % AnyPackageFs();
@ -136,11 +156,6 @@ void Ide::Serialize(Stream& s) {
s % default_charset;
s % header_guards;
s % insert_include;
String varsname = GetVarsName();
s % varsname; // What is the point of this?!
s % pocfg;
// if(s.IsLoading())
// LoadVars(varsname);
SerializeGlobalConfigs(s);
doc.Serialize(s);
s % right_split;

2
uppsrc/ide/UppDlg.h
View file

@ -132,7 +132,7 @@ struct WorkspaceWork {
UppList filelist;
Vector<int> fileindex;
String main, last_main;
String main;
String actualpackage;
int actualfileindex;
Package actual;

3
uppsrc/ide/ide.cpp
View file

@ -165,13 +165,12 @@ bool Ide::OpenMainPackage()
#else
tt << " (TheIDE " << IDE_VERSION << ')';
#endif
String p = SelectPackage(tt, last_main, true, true);
String p = SelectPackage(tt, main, true, true);
if(p.IsEmpty()) return false;
main.Clear();
if(!IsOpen())
Open();
SetMain(p);
last_main = main;
return true;
}

4
uppsrc/ide/ide.h
View file

@ -961,6 +961,10 @@ public:
String WorkspaceFile();
void SerializeWorkspace(Stream& s);
void SerializeLastMain(Stream& s);
void SaveLastMain();
void LoadLastMain();
// void PrintTime(dword time);
void SetIdeState(int newstate);

4
uppsrc/ide/idewin.cpp
View file

@ -893,13 +893,15 @@ void AppMain___()
#endif
ActivateUsrLog();
}
ide.LoadLastMain();
if(clset || ide.OpenMainPackage()) {
ide.SaveConfig();
ide.SaveLastMain();
SyncRefs();
ide.FileSelected();
ide.Run();
}
ide.SaveConfig();
ide.SaveLastMain();
#ifdef PLATFORM_POSIX
StoreAsXMLFile(UpdaterCfg(),"SourceUpdater",ConfigFile("updates.xml"));
#endif