uppsrc_ide_LayDes.diff

Proposed patch for uppsrc/ide/LayDes files (since 13628 revision) - Sender Ghost, 10/07/2019 04:10 AM

     	virtual void   Layout() override;
     	virtual bool   HotKey(dword key) override;
     	static String EOL;
     	static void SetEOL(const String& le) { EOL = le; }
     private:
     	bool   DoKey(dword key, int count);
     	bool   DoHotKey(dword key);

     	else
     		out << "\tITEM(" << type << ", ";
     	String var = variable.IsEmpty() ? Format("dv___%d", i) : variable;
     	out << var << ", " << SaveProperties(y) << ")\r\n";
     	out << var << ", " << SaveProperties(y) << ")" << LayDes::EOL;
     	return out;
+    }

     bool LayDes::Load(const char *file, byte _charset)
+    {
     	charset = _charset;
     	SetEOL("\r\n");
     	if(charset == CHARSET_UTF8_BOM)
     		charset = CHARSET_UTF8;
     	layout.Clear();
-...
     		newfile = false;
     		filetime = in.GetTime();
     		fileerror.Clear();
     		int q = layfile.ReverseFind("\n");
     		if(q >= 0) {
     			if(layfile.Mid(q - 1, 1) != "\r")
     				SetEOL("\n");
+    		}
     #if 0
     		else if(layfile.ReverseFind("\r") >= 0)
     			SetEOL("\r");
     #endif
     		try {
     			CParser p(layfile);
     			if(p.Char('#') && p.Id("ifdef")) {
-...
     	String r;
     	for(int i = 0; i < layout.GetCount(); i++) {
     		layout[i].SetCharset(charset);
     		r << layout[i].Save(0) << "\r\n";
     		r << layout[i].Save(0) << LayDes::EOL;
+    	}
     	layfile = r;
     	if(!SaveChangedFileFinish(filename, r))

     String LayoutData::Save(int y)
+    {
     	String out;
     	out << "LAYOUT(" << name << ", " << size.cx << ", " << size.cy << ")\r\n";
     	out << "LAYOUT(" << name << ", " << size.cx << ", " << size.cy << ")" << LayDes::EOL;
     	for(int i = 0; i < item.GetCount(); i++) {
     		out << item[i].Save(i, y);
+    	}
     	out << "END_LAYOUT\r\n";
     	out << "END_LAYOUT" << LayDes::EOL;
     	return out;
+    }
-...
     	Vector<int> cs(sel, 1);
     	Sort(cs);
     	String out;
     	out << "LAYOUT(" << name << ", " << size.cx << ", " << size.cy << ")\r\n";
     	out << "LAYOUT(" << name << ", " << size.cx << ", " << size.cy << ")" << LayDes::EOL;
     	for(int i = 0; i < cs.GetCount(); i++)
     		out << item[cs[i]].Save(cs[i], y);
     	out << "END_LAYOUT\r\n";
     	out << "END_LAYOUT" << LayDes::EOL;
     	return out;
+    }