Permalink
Browse files

Remove Pict references

  • Loading branch information...
1 parent 8bd1173 commit 2fcb0ac0bd073b19779e96ef264f5c0ba10a6d5c @trixon committed Jan 15, 2017
@@ -81,9 +81,6 @@
</Component>
<Component class="javax.swing.JToggleButton" name="toggleButton">
<Properties>
- <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection code="Pict.Actions.CHRONOMETER.get(ICON_SIZE)" type="code"/>
- </Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="Dict.SCHEDULE.getString()" type="code"/>
</Property>
@@ -23,7 +23,6 @@
import se.trixon.almond.util.AlmondOptions;
import se.trixon.almond.util.AlmondUI;
import se.trixon.almond.util.Dict;
-import se.trixon.almond.util.icon.Pict;
import se.trixon.almond.util.icons.IconColor;
import se.trixon.almond.util.icons.material.MaterialIcon;
@@ -80,6 +79,7 @@ private void init() {
IconColor iconColor = mAlmondOptions.getIconColor();
+ toggleButton.setIcon(MaterialIcon._Action.SCHEDULE.get(ICON_SIZE, iconColor));
addButton.setIcon(MaterialIcon._Content.ADD.get(ICON_SIZE, iconColor));
cloneButton.setIcon(MaterialIcon._Content.CONTENT_COPY.get(ICON_SIZE, iconColor));
editButton.setIcon(MaterialIcon._Editor.MODE_EDIT.get(ICON_SIZE, iconColor));
@@ -133,7 +133,6 @@ private void initComponents() {
toolBar.setRollover(true);
toolBar.add(filler1);
- toggleButton.setIcon(Pict.Actions.CHRONOMETER.get(ICON_SIZE));
toggleButton.setToolTipText(Dict.SCHEDULE.getString());
toggleButton.setFocusable(false);
toggleButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
@@ -59,9 +59,6 @@
</Component>
<Component class="javax.swing.JButton" name="activateButton">
<Properties>
- <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection code="Pict.Actions.GO_PREVIOUS.get(ICON_SIZE)" type="code"/>
- </Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="Dict.ACTIVATE.toString()" type="code"/>
</Property>
@@ -75,9 +72,6 @@
</Component>
<Component class="javax.swing.JButton" name="deactivateButton">
<Properties>
- <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection code="Pict.Actions.GO_NEXT.get(ICON_SIZE)" type="code"/>
- </Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="Dict.DEACTIVATE.toString()" type="code"/>
</Property>
@@ -91,9 +85,6 @@
</Component>
<Component class="javax.swing.JButton" name="removeAllButton">
<Properties>
- <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection code="Pict.Actions.EDIT_DELETE.get(ICON_SIZE)&#xa;" type="code"/>
- </Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="Dict.REMOVE_ALL.toString()" type="code"/>
</Property>
@@ -23,7 +23,6 @@
import se.trixon.almond.util.AlmondOptions;
import se.trixon.almond.util.AlmondUI;
import se.trixon.almond.util.Dict;
-import se.trixon.almond.util.icon.Pict;
import se.trixon.almond.util.icons.IconColor;
import se.trixon.almond.util.icons.material.MaterialIcon;
import se.trixon.almond.util.swing.dialogs.Message;
@@ -90,8 +89,8 @@ private void deactivate() {
private void init() {
IconColor iconColor = mAlmondOptions.getIconColor();
- removeAllButton.setIcon(MaterialIcon._Content.CLEAR.get(ICON_SIZE, iconColor));
+ removeAllButton.setIcon(MaterialIcon._Content.CLEAR.get(ICON_SIZE, iconColor));
activateButton.setIcon(MaterialIcon._Navigation.ARROW_BACK.get(ICON_SIZE, iconColor));
deactivateButton.setIcon(MaterialIcon._Navigation.ARROW_FORWARD.get(ICON_SIZE, iconColor));
}
@@ -188,7 +187,6 @@ private void initComponents() {
toolBar.setRollover(true);
toolBar.add(filler1);
- activateButton.setIcon(Pict.Actions.GO_PREVIOUS.get(ICON_SIZE));
activateButton.setToolTipText(Dict.ACTIVATE.toString());
activateButton.setFocusable(false);
activateButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
@@ -200,7 +198,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
});
toolBar.add(activateButton);
- deactivateButton.setIcon(Pict.Actions.GO_NEXT.get(ICON_SIZE));
deactivateButton.setToolTipText(Dict.DEACTIVATE.toString());
deactivateButton.setFocusable(false);
deactivateButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
@@ -212,8 +209,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
});
toolBar.add(deactivateButton);
- removeAllButton.setIcon(Pict.Actions.EDIT_DELETE.get(ICON_SIZE)
- );
removeAllButton.setToolTipText(Dict.REMOVE_ALL.toString());
removeAllButton.setFocusable(false);
removeAllButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);

0 comments on commit 2fcb0ac

Please sign in to comment.