промежуточный. перенос настроек в проект. есть баги. завтра доделываю, версия не вполне рабочая

This commit is contained in:
2025-01-16 02:26:51 +03:00
parent 483089e954
commit 0f7b65f467
92 changed files with 511 additions and 648 deletions

View File

@@ -415,7 +415,9 @@ public class DBProjectFile extends ProjectFile {
break;
}
languageName = parent.languageName;
if (sapforStyle) style = Global.mainModule.getSapfor().getStyle();
if (sapforStyle) style = father.sapforProperties.FREE_FORM? LanguageStyle.free : LanguageStyle.fixed;
// Global.mainModule.getSapfor().getStyle();
else style = parent.style;
}
public void importSourceCodeSettings(DBProjectFile parent, boolean sapforStyle) throws Exception {
@@ -429,7 +431,8 @@ public class DBProjectFile extends ProjectFile {
break;
}
languageName = parent.languageName;
if (sapforStyle) style = Global.mainModule.getSapfor().getStyle();
// if (sapforStyle) style = Global.mainModule.getSapfor().getStyle();
if (sapforStyle) style = father.sapforProperties.FREE_FORM? LanguageStyle.free : LanguageStyle.fixed;
else style = parent.style;
}
//------------------

View File

@@ -2,7 +2,6 @@ package _VisualDVM.ProjectData.Files.UI.Editor;
import Common.Utils.Utils_;
import Common.Visual.Menus.StyledPopupMenu;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
@@ -169,7 +168,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
Pair<Long, Integer> p = file.gcov_info.line_info.get(lineNum);
Color color = never;
if (p.getKey() > 0) {
color = (p.getValue() >= (Global.mainModule.getDb()).settings.get(SettingName.GCOVLimit).toInt32()) ?
color = (p.getValue() >= Global.mainModule.getProject().sapforProperties.GCOVLimit) ?
new Color(255, 255, (100 - p.getValue()), 90) : null;
}
if (color != null) {