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

CtrlCore: Fix of serialization on armhf, ide: lxde terminal support

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14414 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-05-01 10:45:02 +00:00
parent 58d2bd8a9e
commit 820ce4a2aa
8 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Stream.h
View file

@ -120,7 +120,7 @@ public:
#else
int Get16() { return _Get16(); }
int Get32() { return _Get32(); }
int Get64() { return _Get32(); }
int64 Get64() { return _Get64(); }
#endif
#ifdef CPU_LE

4
uppsrc/TabBar/TabBar.cpp
View file

@ -2667,14 +2667,14 @@ void TabBar::Serialize(Stream& s)
int n = groups.GetCount();
s % n;
groups.SetCount(n);
groups.SetCount(clamp(n, 0, 10000));
for(int i = 0; i < groups.GetCount(); i++)
s % groups[i];
n = tabs.GetCount();
s % n;
tabs.SetCount(n);
tabs.SetCount(clamp(n, 0, 10000));
for(int i = 0; i < tabs.GetCount(); i++)
s % tabs[i];

11
uppsrc/ide/Config.cpp
View file

@ -4,7 +4,7 @@
void Ide::SerializeWorkspace(Stream& s) {
int i;
int version = 18;
int version = 19;
s / version;
s.Magic(0x12354);
if(s.IsStoring()) {
@ -62,8 +62,9 @@ void Ide::SerializeWorkspace(Stream& s) {
if(version >= 18)
s % darkmode;
s % editfile;
for(i = 0; i < 10; i++)
for(i = 0; i < 10; i++) {
s % bookmark[i];
}
editor.Serialize(s);
if(version >= 5)
s % editorsplit;
@ -107,9 +108,11 @@ void Ide::SerializeWorkspace(Stream& s) {
SerializeOutputMode(s);
SerializeClosed(s);
if(version >= 10) {
if(tabs_serialize) {
bool dotabs = tabs_serialize;
if(version >= 19)
s % dotabs;
if(dotabs)
s % tabs;
}
}
if(version >= 11) {
s % find_file_search_string;

1
uppsrc/ide/Core/Host.cpp
View file

@ -235,6 +235,7 @@ void LocalHost::Launch(const char *_cmdline, bool console)
"/usr/bin/mate-terminal -x",
"/usr/bin/gnome-terminal --window -x",
"/usr/bin/konsole -e",
"/usr/bin/lxterminal -e",
"/usr/bin/xterm -e",
};
int ii = 0;

1
uppsrc/ide/Debuggers/Terminal.cpp
View file

@ -34,6 +34,7 @@ String CreateDebugTTY()
"/usr/bin/mate-terminal -e 'tail -f /dev/null'",
"/usr/bin/gnome-terminal -e 'tail -f /dev/null'",
"/usr/bin/konsole -e 'tail -f /dev/null'",
"/usr/bin/lxterminal -e 'tail -f /dev/null'",
"/usr/bin/xterm -e 'tail -f /dev/null'",
};

2
uppsrc/ide/Setup.cpp
View file

@ -398,10 +398,12 @@ void Ide::SetupFormat() {
ide.gnome.Hide();
ide.xterm.Hide();
ide.mate.Hide();
ide.lxde.Hide();
#endif
ide.kde <<= callback2(SetConsole, &ide.console, "/usr/bin/konsole -e");
ide.gnome <<= callback2(SetConsole, &ide.console, "/usr/bin/gnome-terminal -x");
ide.mate <<= callback2(SetConsole, &ide.console, "/usr/bin/mate-terminal -x");
ide.lxde <<= callback2(SetConsole, &ide.console, "/usr/bin/lxterminal -e");
ide.xterm <<= callback2(SetConsole, &ide.console, "/usr/bin/xterm -e");
edt.lineends

2
uppsrc/ide/ide.h
View file

@ -490,7 +490,7 @@ public:
String file;
LineEdit::EditPos pos;
void Serialize(Stream& s) { s % file % pos; }
void Serialize(Stream& s) { s % file; s % pos; }
}
bookmark[10];

11
uppsrc/ide/ide.lay
View file

@ -596,24 +596,25 @@ LAYOUT(SetupIdeLayout, 512, 316)
ITEM(Label, dv___8, SetLabel(t_("GUI theme")).LeftPosZ(4, 112).TopPosZ(168, 19))
ITEM(DropList, chstyle, LeftPosZ(120, 144).TopPosZ(168, 19))
ITEM(Label, console_txt, SetLabel(t_("Use console in Linux")).LeftPosZ(4, 112).TopPosZ(216, 19))
ITEM(EditString, console, LeftPosZ(120, 236).TopPosZ(216, 19))
ITEM(EditString, console, LeftPosZ(120, 296).TopPosZ(216, 19))
ITEM(Button, xterm, SetLabel(t_("xterm")).LeftPosZ(120, 56).TopPosZ(240, 20))
ITEM(Button, gnome, SetLabel(t_("Gnome")).LeftPosZ(180, 56).TopPosZ(240, 20))
ITEM(Button, kde, SetLabel(t_("KDE")).LeftPosZ(240, 56).TopPosZ(240, 20))
ITEM(Button, mate, SetLabel(t_("Mate")).LeftPosZ(300, 56).TopPosZ(240, 20))
ITEM(Button, lxde, SetLabel(t_("LXDE")).LeftPosZ(360, 56).TopPosZ(240, 20))
ITEM(Option, output_per_assembly, SetLabel(t_("Use unique output directory per assembly (append assembly name to output directory)")).HSizePosZ(4, 4).TopPosZ(268, 16))
ITEM(Label, dv___17, SetLabel(t_("In editor mode, path for .usc files")).LeftPosZ(4, 192).TopPosZ(288, 20))
ITEM(Label, dv___18, SetLabel(t_("In editor mode, path for .usc files")).LeftPosZ(4, 192).TopPosZ(288, 20))
ITEM(EditString, uscpath, HSizePosZ(172, 4).TopPosZ(288, 19))
ITEM(DropDate, showtimeafter, LeftPosZ(220, 136).TopPosZ(123, 19))
ITEM(Label, dv___20, SetLabel(t_("HYDRA threads")).LeftPosZ(212, 80).TopPosZ(4, 19))
ITEM(Label, dv___21, SetLabel(t_("HYDRA threads")).LeftPosZ(212, 80).TopPosZ(4, 19))
ITEM(EditIntSpin, hydra1_threads, Max(64).Min(1).LeftPosZ(344, 48).TopPosZ(4, 19))
ITEM(Option, gui_font, SetLabel(t_("Override GUI font")).LeftPosZ(4, 112).TopPosZ(192, 19))
ITEM(DropList, face, LeftPosZ(120, 144).TopPosZ(192, 19))
ITEM(DropList, height, LeftPosZ(268, 50).TopPosZ(192, 19))
ITEM(Option, bold, SetLabel(t_("Bold")).LeftPosZ(322, 44).TopPosZ(192, 19))
ITEM(Option, italic, SetLabel(t_("Italic")).LeftPosZ(370, 44).TopPosZ(192, 19))
ITEM(Label, dv___27, SetLabel(t_("(needs restart)")).LeftPosZ(416, 88).TopPosZ(192, 19))
ITEM(Label, dv___28, SetLabel(t_("(needs restart)")).LeftPosZ(272, 88).TopPosZ(168, 19))
ITEM(Label, dv___28, SetLabel(t_("(needs restart)")).LeftPosZ(416, 88).TopPosZ(192, 19))
ITEM(Label, dv___29, SetLabel(t_("(needs restart)")).LeftPosZ(272, 88).TopPosZ(168, 19))
END_LAYOUT
LAYOUT(SetupAstyleLayout, 544, 312)