hasClose = true;
borderStyle = sizable;
text = $"Global Settings";
- minClientSize = { 560, 506 };
+ minClientSize = { 560, 542 };
nativeDecorations = true;
- IDESettings ideSettings;
- IDESettingsContainer settingsContainer;
String workspaceActiveCompiler;
TabControl tabControl { this, background = formColor, anchor = { left = 8, top = 8, right = 8, bottom = 40 } };
bool editorSettingsChanged = false;
bool compilerSettingsChanged = false;
bool projectOptionsChanged = false;
+ AVLTree<String> cfgsToWrite = null;
if(editorTab.modifiedDocument)
{
if(editorTab.useFreeCaret.checked != ideSettings.useFreeCaret ||
editorTab.showLineNumbers.checked != ideSettings.showLineNumbers ||
- editorTab.caretFollowsScrolling.checked != ideSettings.caretFollowsScrolling)
+ editorTab.caretFollowsScrolling.checked != ideSettings.caretFollowsScrolling ||
+ editorTab.fontPicker.fontSize != ideSettings.codeEditorFontSize ||
+ editorTab.fontPicker.faceName.OnCompare(ideSettings.codeEditorFont) ||
+ editorTab.dbColorSchemes.currentRow.string.OnCompare(ideSettings.activeColorScheme)
+ )
{
+ DataRow csRow = editorTab.dbColorSchemes.currentRow;
ideSettings.useFreeCaret = editorTab.useFreeCaret.checked;
ideSettings.showLineNumbers = editorTab.showLineNumbers.checked;
ideSettings.caretFollowsScrolling = editorTab.caretFollowsScrolling.checked;
+ ideSettings.codeEditorFont = editorTab.fontPicker.faceName;
+ ideSettings.codeEditorFontSize = editorTab.fontPicker.fontSize;
+ if(csRow && csRow.string)
+ {
+ ideSettings.activeColorScheme = csRow.string;
+ for(cs : ideSettings.colorSchemes; cs.name && !strcmp(cs.name, csRow.string))
+ {
+ colorScheme = cs;
+ ide.ApplyColorScheme(colorScheme);
+ break;
+ }
+ }
+
+ ide.ApplyFont(ideSettings.codeEditorFont, ideSettings.codeEditorFontSize);
+
editorSettingsChanged = true;
}
}
{
if(strcmp(compilersTab.compilerConfigsDir.path, ideSettings.compilerConfigsDir))
ideSettings.compilerConfigsDir = compilersTab.compilerConfigsDir.path;
- ideSettings.compilerConfigs.Free();
- for(compiler : compilersTab.compilerConfigs)
+ if(compilersTab.compilerConfigs.OnCompare(ideConfig.compilers))
{
- ideSettings.compilerConfigs.Add(compiler.Copy());
+ cfgsToWrite = compilersTab.compilerConfigs.getWriteRequiredList(ideConfig.compilers);
+ ideConfig.compilers.Free();
+ for(compiler : compilersTab.compilerConfigs)
+ {
+ ideConfig.compilers.Add(compiler.Copy());
+ }
+ compilerSettingsChanged = true;
}
-
- compilerSettingsChanged = true;
}
if(projectOptionsTab.modifiedDocument)
}
}
- settingsContainer.Save();
+ if(editorSettingsChanged || projectOptionsChanged)
+ settingsContainer.Save();
if(compilerSettingsChanged)
+ {
+ ideConfig.compilers.write(settingsContainer, cfgsToWrite);
OnGlobalSettingChange(GlobalSettingsChange::compilerSettings);
+ cfgsToWrite.Free();
+ delete cfgsToWrite;
+ }
if(editorSettingsChanged)
OnGlobalSettingChange(GlobalSettingsChange::editorSettings);
if(projectOptionsChanged)
// CompilersTab
if(workspaceActiveCompiler)
{
- for(compiler : ideSettings.compilerConfigs)
+ for(compiler : ideConfig.compilers)
{
if(!activateCompiler && !strcmp(workspaceActiveCompiler, compiler.name))
activateCompiler = compiler;
}
if(!activateCompiler && readonlyCompiler)
activateCompiler = readonlyCompiler;
- if(!activateCompiler && ideSettings.compilerConfigs.count)
- activateCompiler = ideSettings.compilerConfigs[0];
+ if(!activateCompiler && ideConfig.compilers.count)
+ activateCompiler = ideConfig.compilers[0];
- for(compiler : ideSettings.compilerConfigs)
+ for(compiler : ideConfig.compilers)
compilersTab.AddCompiler(compiler.Copy(), compiler == activateCompiler);
compilersTab.compilerConfigsDir.path = ideSettings.compilerConfigsDir;
virtual void OnGlobalSettingChange(GlobalSettingsChange globalSettingsChange);
}
+import "FontPicker"
+
class EditorTab : GlobalSettingsSubTab
{
background = formColor;
text = $"Editor";
+ bool OnCreate()
+ {
+ dbColorSchemes.Clear();
+
+ for(s : ideSettings.colorSchemes)
+ {
+ DataRow row = dbColorSchemes.AddString(s.name);
+ if(!strcmp(s.name, ideSettings.activeColorScheme))
+ dbColorSchemes.currentRow = row;
+ }
+ return true;
+ }
+
+ Label lblColorSchemes { this, anchor = { top = 92, right = 126 }, labeledWindow = dbColorSchemes };
+ DropBox dbColorSchemes
+ {
+ this, text = $"Color Scheme: ", anchor = { top = 92, right = 16 }, size = { 100, 22 };
+
+ bool NotifySelect(DropBox dropBox, DataRow row, Modifiers mods)
+ {
+ if(row)
+ {
+ IDEColorScheme colorScheme = null;
+ for(cs : ideSettings.colorSchemes; cs.name && !strcmp(cs.name, row.string))
+ {
+ colorScheme = cs;
+ break;
+ }
+ fontPicker.SelectColorScheme(colorScheme);
+ modifiedDocument = true;
+ }
+ return true;
+ }
+ };
+
Button useFreeCaret
{
- this, text = $"Move code editor caret freely past end of line", position = { 16, 68 }, isCheckbox = true;
+ this, text = $"Move code editor caret freely past end of line", position = { 16, 58 }, isCheckbox = true;
NotifyClicked = NotifyClickedModifiedDocument;
};
Button caretFollowsScrolling
{
- this, text = $"Keep caret visible (move along) when scrolling", position = { 16, 88 }, isCheckbox = true;
+ this, text = $"Keep caret visible (move along) when scrolling", position = { 16, 78 }, isCheckbox = true;
NotifyClicked = NotifyClickedModifiedDocument;
};
Button showLineNumbers
{
- this, text = $"Show line numbers in code editor", position = { 16, 108 }, isCheckbox = true;
+ this, text = $"Show line numbers in code editor", position = { 16, 98 }, isCheckbox = true;
NotifyClicked = NotifyClickedModifiedDocument;
};
modifiedDocument = true;
return true;
}
+
+ FontPicker fontPicker
+ {
+ this, anchor = { left = 8, right = 8, top = 120, bottom = 8 };
+
+ bool NotifyChanged()
+ {
+ modifiedDocument = true;
+ return true;
+ }
+ };
}
static void DrawStipple(Surface surface, Size clientSize)
{
this, text = $"Compiler Configurations:", anchor = { left = 148, top = 38, right = 99 }; size = { 0, 26 };
opacity = 0;
- direction = horizontal, scrollable = true;
+ direction = horizontal;
+ scrollable = true;
+ endButtons = false;
+ hoverScroll = true;
bool OnKeyDown(Key key, unichar ch)
{
CompilerEnvironmentTab environmentTab { this, tabControl = tabControl };
CompilerOptionsTab optionsTab { this, tabControl = tabControl };
- List<CompilerConfig> compilerConfigs { };
+ CompilerConfigs compilerConfigs { };
CompilerConfig activeCompiler;
Label labelCompilers
text = $"Ecere Archiver", browseDialog = toolchainFileDialog, NotifyModified = NotifyModifiedDocument;
};
Label cppLabel { this, position = { 8, 116 }, labeledWindow = cpp, tabCycle = false, inactive = true };
- PathBox cpp
+ EditBox cpp
{
this, anchor = { left = margin, top = 112, right = 8 };
- text = $"C Preprocessor", browseDialog = toolchainFileDialog, NotifyModified = NotifyModifiedDocument;
+ //text = $"C Preprocessor", browseDialog = toolchainFileDialog, NotifyModified = NotifyModifiedDocument;
+ text = $"C Preprocessor";//, NotifyModified = NotifyModifiedDocument;
+ bool NotifyModified(EditBox editBox)
+ {
+ CompilerConfig compiler = loadedCompiler;
+ if(compiler)
+ {
+ compiler.cppCommand = editBox.contents;
+ modifiedDocument = true;
+ compilersTab.modifiedDocument = true;
+ }
+ return true;
+ }
};
Label ccLabel { this, position = { 8, 142 }, labeledWindow = cc, tabCycle = false, inactive = true };
PathBox cc
this, anchor = { left = margin, top = 164, right = 8 };
text = $"C++ Compiler", browseDialog = toolchainFileDialog, NotifyModified = NotifyModifiedDocument;
};
- Label makeLabel { this, position = { 8, 194 }, labeledWindow = make, tabCycle = false, inactive = true };
- PathBox make
+ Label arLabel { this, position = { 8, 194 }, labeledWindow = ar, tabCycle = false, inactive = true };
+ PathBox ar
{
this, anchor = { left = margin, top = 190, right = 8 };
+ text = $"AR", browseDialog = toolchainFileDialog, NotifyModified = NotifyModifiedDocument;
+ };
+ Label ldLabel { this, position = { 8, 220 }, labeledWindow = ld, tabCycle = false, inactive = true };
+ PathBox ld
+ {
+ this, anchor = { left = margin, top = 216, right = 8 };
+ text = $"Linker", browseDialog = toolchainFileDialog, NotifyModified = NotifyModifiedDocument;
+ };
+ Label makeLabel { this, position = { 8, 246 }, labeledWindow = make, tabCycle = false, inactive = true };
+ PathBox make
+ {
+ this, anchor = { left = margin, top = 242, right = 8 };
text = $"GNU Make", browseDialog = toolchainFileDialog, NotifyModified = NotifyModifiedDocument;
};
- Label gnuToolchainPrefixLabel { this, position = { 8, 220 }, labeledWindow = gnuToolchainPrefix, tabCycle = false, inactive = true };
+ Label gnuToolchainPrefixLabel { this, position = { 8, 272 }, labeledWindow = gnuToolchainPrefix, tabCycle = false, inactive = true };
PathBox gnuToolchainPrefix
{
- this, anchor = { left = margin, top = 216, right = 8 };
- text = $"GNU Toolchain Prefix", browseDialog = toolchainFileDialog, NotifyModified = NotifyModifiedDocument;
+ this, anchor = { left = margin, top = 268, right = 8 };
+ text = $"GNU Toolchain Prefix", typeExpected = directory, browseDialog = toolchainFileDialog, NotifyModified = NotifyModifiedDocument;
};
- Label sysrootLabel { this, position = { 8, 246 }, labeledWindow = sysroot, tabCycle = false, inactive = true };
+ Label sysrootLabel { this, position = { 8, 298 }, labeledWindow = sysroot, tabCycle = false, inactive = true };
PathBox sysroot
{
- this, anchor = { left = margin, top = 242, right = 8 };
- text = $"SYSROOT", typeExpected = directory, browseDialog = toolchainFileDialog, NotifyModified = NotifyModifiedDocument;
+ this, anchor = { left = margin, top = 294, right = 8 };
+ text = $"SYSROOT", browseDialog = toolchainFileDialog, NotifyModified = NotifyModifiedDocument;
};
- Label executableLauncherLabel { this, position = { 8, 272 }, labeledWindow = executableLauncher, tabCycle = false, inactive = true };
+ Label executableLauncherLabel { this, position = { 8, 324 }, labeledWindow = executableLauncher, tabCycle = false, inactive = true };
PathBox executableLauncher
{
- this, anchor = { left = margin, top = 268, right = 8 };
+ this, anchor = { left = margin, top = 320, right = 8 };
text = $"Executable Launcher", browseDialog = toolchainFileDialog, NotifyModified = NotifyModifiedDocument;
};
compiler.ecsCommand = pathBox.slashPath;
else if(pathBox == ear)
compiler.earCommand = pathBox.slashPath;
- else if(pathBox == cpp)
- compiler.cppCommand = pathBox.slashPath;
+ /*else if(pathBox == cpp)
+ compiler.cppCommand = pathBox.slashPath;*/
else if(pathBox == cc)
compiler.ccCommand = pathBox.slashPath;
else if(pathBox == cxx)
compiler.cxxCommand = pathBox.slashPath;
+ else if(pathBox == ld)
+ compiler.ldCommand = pathBox.slashPath;
+ else if(pathBox == ar)
+ compiler.arCommand = pathBox.slashPath;
else if(pathBox == make)
compiler.makeCommand = pathBox.slashPath;
else if(pathBox == executableLauncher)
- compiler.execPrefixCommand = pathBox.slashPath;
+ compiler.executableLauncher = pathBox.slashPath;
else if(pathBox == gnuToolchainPrefix)
compiler.gccPrefix = pathBox.slashPath;
else if(pathBox == sysroot)
ecc.path = compiler.eccCommand;
ecs.path = compiler.ecsCommand;
ear.path = compiler.earCommand;
- cpp.path = compiler.cppCommand;
+ //cpp.path = compiler.cppCommand;
+ cpp.contents = compiler.cppCommand;
cc.path = compiler.ccCommand;
cxx.path = compiler.cxxCommand;
+ ld.path = compiler.ldCommand;
+ ar.path = compiler.arCommand;
make.path = compiler.makeCommand;
executableLauncher.path = compiler.executableLauncher;
gnuToolchainPrefix.path = compiler.gnuToolchainPrefix;
cppLabel.disabled = cpp.disabled = isVC || disabled;
cxxLabel.disabled = cxx.disabled = isVC || disabled;
ccLabel.disabled = cc.disabled = isVC || disabled;
+ ldLabel.disabled = ld.disabled = isVC || disabled;
+ arLabel.disabled = ar.disabled = isVC || disabled;
makeLabel.disabled = make.disabled = disabled;
executableLauncherLabel.disabled = executableLauncher.disabled = disabled;
gnuToolchainPrefixLabel.disabled = gnuToolchainPrefix.disabled = disabled;
Button distccEnabled
{
- this, text = $"Use distcc", hotKey = altD, position = { 158, 68 };
+ this, text = $"Use distcc", position = { 158, 68 };
isCheckbox = true;
bool NotifyClicked(Button button, int x, int y, Modifiers mods)
CompilerConfig compiler = loadedCompiler;
if(compiler)
{
- distccHosts.disabled = !button.checked;
+ distccHostsLabel.disabled = distccHosts.disabled = !button.checked;
compiler.distccEnabled = button.checked;
modifiedDocument = true;
compilersTab.modifiedDocument = true;
}
};
- Label distccHostsLabel { this, position = { 8, 96 }, labeledWindow = distccHosts };
+ Label distccHostsLabel { this, position = { 240, 68 }, labeledWindow = distccHosts };
EditBox distccHosts
{
this, text = $"distcc hosts", hotKey = altH;
- position = { 88, 92 }, size = { 300, 22 };
+ position = { 320, 64 }, size = { 160, 22 };
bool NotifyModified(EditBox editBox)
{
}
};
- Label lblPrepDefs { this, position = { 8, 126 }, labeledWindow = prepDefs };
+ Label lblPrepDefs { this, position = { 8, 96 }, labeledWindow = prepDefs };
StringListBox prepDefs
{
this, text = $"Preprocessor directives", hotKey = altP;
- position = { 168, 124 }, size = { 280, 22 }, anchor = { left = 168, top = 124, right = 8 };
+ position = { 168, 94 }, size = { 280, 22 }, anchor = { left = 168, top = 94, right = 8 };
bool NotifyModified(EditBox editBox)
{
}
};
- Label leCcompilerFlags { this, position = { 8, 156 }, labeledWindow = eCcompilerFlags };
+ Label leCcompilerFlags { this, position = { 8, 126 }, labeledWindow = eCcompilerFlags };
StringListBox eCcompilerFlags
{
this, text = $"Additional eC compiler flags", hotKey = altG;
- position = { 168, 154 }, size = { 280, 22 }, anchor = { left = 168, top = 154, right = 8 };
+ position = { 168, 124 }, size = { 280, 22 }, anchor = { left = 168, top = 124, right = 8 };
bool NotifyModified(EditBox editBox)
{
}
};
- Label lblCompilerFlags { this, position = { 8, 186 }, labeledWindow = compilerFlags };
+ Label lblCompilerFlags { this, position = { 8, 156 }, labeledWindow = compilerFlags };
StringListBox compilerFlags
{
- this, text = $"Additional compiler flags", hotKey = altR;
- position = { 168, 184 }, size = { 280, 22 }, anchor = { left = 168, top = 184, right = 8 };
+ this, text = $"Additional C compiler flags", hotKey = altR;
+ position = { 168, 154 }, size = { 280, 22 }, anchor = { left = 168, top = 154, right = 8 };
bool NotifyModified(EditBox editBox)
{
}
};
+ Label lblcxxFlags { this, position = { 8, 186 }, labeledWindow = cxxFlags };
+ StringListBox cxxFlags
+ {
+ this, text = $"Additional C++ compiler flags", hotKey = altD;
+ position = { 168, 184 }, size = { 280, 22 }, anchor = { left = 168, top = 184, right = 8 };
+
+ bool NotifyModified(EditBox editBox)
+ {
+ if(loadedCompiler)
+ {
+ CompilerConfig compiler = loadedCompiler;
+ compiler.cxxFlags = ((StringListBox)editBox).strings;
+ modifiedDocument = true;
+ compilersTab.modifiedDocument = true;
+ }
+ return true;
+ }
+ };
+
Label lblLinkerFlags { this, position = { 8, 216 }, labeledWindow = linkerFlags };
StringListBox linkerFlags
{
}
};
+ Label objectFileExtLabel { this, position = { 8, 276 }, labeledWindow = objectFileExt };
+ EditBox objectFileExt
+ {
+ this, text = $"Object file extension";//, hotKey = altH;
+ position = { 168, 274 }, size = { 80, 22 };
+
+ bool NotifyModified(EditBox editBox)
+ {
+ CompilerConfig compiler = loadedCompiler;
+ if(compiler)
+ {
+ compiler.objectFileExt = editBox.contents;
+ modifiedDocument = true;
+ compilersTab.modifiedDocument = true;
+ }
+ return true;
+ }
+ };
+
+ Label staticLibFileExtLabel { this, position = { 8, 306 }, labeledWindow = staticLibFileExt };
+ EditBox staticLibFileExt
+ {
+ this, text = $"Target extensions (a, so, exe)";//, hotKey = altH;
+ position = { 168, 304 }, size = { 80, 22 };
+
+ bool NotifyModified(EditBox editBox)
+ {
+ CompilerConfig compiler = loadedCompiler;
+ if(compiler)
+ {
+ compiler.staticLibFileExt = editBox.contents;
+ modifiedDocument = true;
+ compilersTab.modifiedDocument = true;
+ }
+ return true;
+ }
+ };
+ EditBox sharedLibFileExt
+ {
+ this;
+ position = { 256, 304 }, size = { 80, 22 };
+
+ bool NotifyModified(EditBox editBox)
+ {
+ CompilerConfig compiler = loadedCompiler;
+ if(compiler)
+ {
+ compiler.sharedLibFileExt = editBox.contents;
+ modifiedDocument = true;
+ compilersTab.modifiedDocument = true;
+ }
+ return true;
+ }
+ };
+ EditBox executableFileExt
+ {
+ this;
+ position = { 344, 304 }, size = { 80, 22 };
+
+ bool NotifyModified(EditBox editBox)
+ {
+ CompilerConfig compiler = loadedCompiler;
+ if(compiler)
+ {
+ compiler.executableFileExt = editBox.contents;
+ modifiedDocument = true;
+ compilersTab.modifiedDocument = true;
+ }
+ return true;
+ }
+ };
+
+ Button stripTarget
+ {
+ this, text = $"Strip target", hotKey = altC, position = { 168, 332 };
+ isCheckbox = true;
+
+ bool NotifyClicked(Button button, int x, int y, Modifiers mods)
+ {
+ CompilerConfig compiler = loadedCompiler;
+ if(compiler)
+ {
+ compiler.noStripTarget = !button.checked;
+ modifiedDocument = true;
+ compilersTab.modifiedDocument = true;
+ }
+ return true;
+ }
+ };
+
+ Button resourcesDotEar
+ {
+ this, text = $"Use resources.ear", position = { 308, 332 };
+ isCheckbox = true;
+
+ bool NotifyClicked(Button button, int x, int y, Modifiers mods)
+ {
+ CompilerConfig compiler = loadedCompiler;
+ if(compiler)
+ {
+ compiler.resourcesDotEar = button.checked;
+ modifiedDocument = true;
+ compilersTab.modifiedDocument = true;
+ }
+ return true;
+ }
+ };
+
CompilerOptionsTab()
{
Platform p;
numJobsBox.Refresh();
ccacheEnabled.checked = compiler.ccacheEnabled;
distccEnabled.checked = compiler.distccEnabled;
- distccHosts.disabled = !compiler.distccEnabled;
+ distccHostsLabel.disabled = distccHosts.disabled = !compiler.distccEnabled;
distccHosts.contents = compiler.distccHosts;
prepDefs.strings = compiler.prepDirectives;
excludedLibraries.strings = compiler.excludeLibs;
eCcompilerFlags.strings = compiler.eCcompilerFlags;
compilerFlags.strings = compiler.compilerFlags;
+ cxxFlags.strings = compiler.cxxFlags;
linkerFlags.strings = compiler.linkerFlags;
+ objectFileExt.contents = compiler.objectFileExt;
+ staticLibFileExt.contents = compiler.staticLibFileExt;
+ sharedLibFileExt.contents = compiler.sharedLibFileExt;
+ executableFileExt.contents = compiler.executableFileExt;
+ stripTarget.checked = !compiler.noStripTarget;
+ resourcesDotEar.checked = compiler.resourcesDotEar;
labelTargetPlatform.disabled = disabled;
targetPlatform.disabled = disabled;
bool OnCreate()
{
GlobalSettingsDialog dialog = this.dialog;
- if(dialog && dialog.compilersTab.compilerConfigs && dialog.ideSettings)
+ if(dialog && dialog.compilersTab.compilerConfigs && ideSettings)
{
DataRow row;
- for(compiler : dialog.ideSettings.compilerConfigs)
+ for(compiler : ideConfig.compilers)
{
row = defaultCompilerDropBox.AddString(compiler.name);
- if(dialog.ideSettings.defaultCompiler && dialog.ideSettings.defaultCompiler[0] &&
- !strcmp(compiler.name, dialog.ideSettings.defaultCompiler))
+ if(ideSettings.defaultCompiler && ideSettings.defaultCompiler[0] &&
+ !strcmp(compiler.name, ideSettings.defaultCompiler))
defaultCompilerDropBox.currentRow = row;
}
if(!defaultCompilerDropBox.currentRow && defaultCompilerDropBox)
Ecere Software / sdk / blobdiff