diff --git a/uppsrc/ide/ide.upp b/uppsrc/ide/ide.upp index c0319a12b..413455826 100644 --- a/uppsrc/ide/ide.upp +++ b/uppsrc/ide/ide.upp @@ -10,6 +10,7 @@ uses ide\Browser, CodeEditor, CtrlLib, + Web, plugin\bz2, HexView, art\BlueBar, @@ -88,12 +89,13 @@ file Copying; mainconfig - "" = "GUI SSE2", + "" = "GUI", "" = "GUI .USEMALLOC", "" = ".NOGTK GUI", "" = "GUI HEAPDBG CHECKINIT", "" = "GUI TESTINSTALL", - "" = "GUI CHECKCLIPBOARD"; + "" = "GUI CHECKCLIPBOARD", + "" = "GUI SVO_VALUE"; custom() "", "", diff --git a/uppsrc/ide/init b/uppsrc/ide/init index 7b9c15caf..c1fe1e9f4 100644 --- a/uppsrc/ide/init +++ b/uppsrc/ide/init @@ -9,6 +9,7 @@ #include "ide\Browser/init" #include "CodeEditor/init" #include "CtrlLib/init" +#include "Web/init" #include "plugin\bz2/init" #include "HexView/init" #include "art\BlueBar/init" diff --git a/uppsrc/ide/t.cpp b/uppsrc/ide/t.cpp index 5602a5216..c3c8f92af 100644 --- a/uppsrc/ide/t.cpp +++ b/uppsrc/ide/t.cpp @@ -130,9 +130,13 @@ bool LngParseTFile(const String& fn, VectorMap& lng) String CreateTFile(const VectorMap& map, const Vector& lngset, bool rep, bool obsolete, bool java) { + const char *linepfx = (java ? " + " : " "); + int ascflags = (java ? 0 : ASCSTRING_OCTALHI) | ASCSTRING_SMART; + String out; String cfile; out << "#ifdef _MSC_VER\r\n#pragma setlocale(\"C\")\r\n#endif"; + for(int i = 0; i < map.GetCount(); i++) { if(i) out << "\r\n"; const LngEntry& e = map[i]; @@ -148,10 +152,7 @@ String CreateTFile(const VectorMap& map, const Vector& ln } if(!IsNull(cfile) || rep || obsolete) { String id = map.GetKey(i); - out << "T_(" << AsCString(id, 70, - java ? " + " : " ", - ASCSTRING_OCTALHI | ASCSTRING_SMART) - << ")\r\n"; + out << "T_(" << AsCString(id, 70, linepfx, ascflags) << ")\r\n"; for(int j = 0; j < lngset.GetCount(); j++) { int lang = lngset[j]; if(rep || lang != LNG_enUS) { @@ -172,8 +173,7 @@ String CreateTFile(const VectorMap& map, const Vector& ln } } out << '(' << AsCString(q >= 0 ? e.text[q] : String(), 70, - java ? " + " : " ", - ASCSTRING_OCTALHI | ASCSTRING_SMART) << ")\r\n"; + linepfx, ascflags) << ")\r\n"; } } }