рефакторинг. вынес часть иконок в общую часть
This commit is contained in:
@@ -164,11 +164,11 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="65" height="30"/>
|
||||
<minimumSize width="65" height="30"/>
|
||||
<preferredSize width="65" height="30"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="свои"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
</properties>
|
||||
@@ -178,11 +178,11 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="100" height="30"/>
|
||||
<minimumSize width="100" height="30"/>
|
||||
<preferredSize width="100" height="30"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="открытые"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
</properties>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Apply.png"/>
|
||||
<icon value="Common/icons/Apply.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
@@ -39,7 +39,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Close.png"/>
|
||||
<icon value="Common/icons/Close.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
@@ -55,7 +55,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Prev.png"/>
|
||||
<icon value="Common/icons/Previous.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
@@ -67,7 +67,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Next.png"/>
|
||||
<icon value="Common/icons/Next.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</constraints>
|
||||
<properties>
|
||||
<enabled value="true"/>
|
||||
<icon value="icons/LastOpened.png"/>
|
||||
<icon value="Common/icons/Search.png"/>
|
||||
<text value=""/>
|
||||
<toolTipText value="Обзор..."/>
|
||||
</properties>
|
||||
@@ -59,8 +59,8 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="16" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value=""/>
|
||||
<verticalTextPosition value="0"/>
|
||||
</properties>
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
<grid id="b52a6" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<tabbedpane title="GCOV" icon="icons/GCOV.PNG">
|
||||
<tabbedpane title="GCOV" icon="icons/GCOV.png">
|
||||
<tooltip value="GCOV"/>
|
||||
</tabbedpane>
|
||||
</constraints>
|
||||
|
||||
@@ -139,12 +139,12 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="115" height="30"/>
|
||||
<minimumSize width="115" height="30"/>
|
||||
<preferredSize width="115" height="30"/>
|
||||
<selected value="true"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="стандартные"/>
|
||||
<toolTipText value="Отображать стандартные процедуры"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
@@ -155,12 +155,12 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="85" height="30"/>
|
||||
<minimumSize width="85" height="30"/>
|
||||
<preferredSize width="85" height="30"/>
|
||||
<selected value="true"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="внешние"/>
|
||||
<toolTipText value="Отображать внешние процедуры"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
@@ -171,12 +171,12 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="124" height="30"/>
|
||||
<minimumSize width="124" height="30"/>
|
||||
<preferredSize width="124" height="30"/>
|
||||
<selected value="true"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="недостижимые"/>
|
||||
<toolTipText value="Отображать недостижимые процедуры"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
@@ -187,12 +187,12 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="154" height="30"/>
|
||||
<minimumSize width="154" height="30"/>
|
||||
<preferredSize width="154" height="30"/>
|
||||
<selected value="false"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="смежные c текущей: "/>
|
||||
<toolTipText value="будут отображены только процедуры смежные с текущей"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
@@ -229,12 +229,12 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="91" height="30"/>
|
||||
<minimumSize width="91" height="30"/>
|
||||
<preferredSize width="91" height="30"/>
|
||||
<selected value="true"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="входящие"/>
|
||||
<toolTipText value="Отображать входящие в текущую процедуру вызовы"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
@@ -245,12 +245,12 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="97" height="30"/>
|
||||
<minimumSize width="97" height="30"/>
|
||||
<preferredSize width="97" height="30"/>
|
||||
<selected value="true"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="исходящие"/>
|
||||
<toolTipText value="Отображать исходящие из текущей процедуры вызовы"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
|
||||
@@ -112,7 +112,7 @@ public class MainForm extends Form implements MainWindow {
|
||||
}
|
||||
private void InstallTestsPanel() {
|
||||
globalTabs.insertTab("Тесты",
|
||||
Utils_.getIcon("/icons/Library.PNG"),
|
||||
Utils_.getIcon("/Common/icons/Library.png"),
|
||||
(testsForm = new TestsForm()).getContent(),
|
||||
"Библиотека тестов на сервере", 2);
|
||||
}
|
||||
|
||||
@@ -139,7 +139,7 @@
|
||||
</grid>
|
||||
<grid id="3cb4d" binding="analysisFormPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
|
||||
<constraints>
|
||||
<tabbedpane title="" icon="icons/Metrics.png">
|
||||
<tabbedpane title="" icon="Common/icons/Metrics.png">
|
||||
<tooltip value="Анализ"/>
|
||||
</tabbedpane>
|
||||
</constraints>
|
||||
@@ -154,7 +154,7 @@
|
||||
<grid id="59473" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<tabbedpane title="" icon="icons/Log.png">
|
||||
<tabbedpane title="" icon="Common/icons/Log.png">
|
||||
<tooltip value="Журнал"/>
|
||||
</tabbedpane>
|
||||
</constraints>
|
||||
|
||||
@@ -281,7 +281,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
|
||||
}
|
||||
private void InstallDebugPanel() {
|
||||
projectTabs.insertTab("",
|
||||
Utils_.getIcon("/icons/Command.png"),
|
||||
Utils_.getIcon("/Common/icons/Command.png"),
|
||||
Global.mainModule.getUI().getDebugWindow().getContent(),
|
||||
"Компиляция и запуск", 6);
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Apply.png"/>
|
||||
<icon value="Common/icons/Apply.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
@@ -44,7 +44,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Close.png"/>
|
||||
<icon value="Common/icons/Close.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
@@ -60,7 +60,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Prev.png"/>
|
||||
<icon value="Common/icons/Previous.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
@@ -72,7 +72,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Next.png"/>
|
||||
<icon value="Common/icons/Next.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
|
||||
@@ -34,7 +34,7 @@ public class VariantsForm implements VariantsWindow {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
Global.mainModule.getProject().SwitchFilterDistributed();
|
||||
BDistributed.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
|
||||
BDistributed.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_distributed() ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
|
||||
ShowVariantsFilter();
|
||||
ShowFilteredVariantsCount();
|
||||
}
|
||||
@@ -43,7 +43,7 @@ public class VariantsForm implements VariantsWindow {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
Global.mainModule.getProject().SwitchFilterMultiplied();
|
||||
bMultiplied.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
|
||||
bMultiplied.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_multiplied() ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
|
||||
ShowVariantsFilter();
|
||||
ShowFilteredVariantsCount();
|
||||
}
|
||||
@@ -68,8 +68,8 @@ public class VariantsForm implements VariantsWindow {
|
||||
}
|
||||
@Override
|
||||
public void ShowVariantsFilterButtons() {
|
||||
BDistributed.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
|
||||
bMultiplied.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
|
||||
BDistributed.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_distributed() ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
|
||||
bMultiplied.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_multiplied() ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
|
||||
}
|
||||
@Override
|
||||
public void ShowVariantsFilter() {
|
||||
|
||||
Reference in New Issue
Block a user