commit 49aef6b5482499658923275d08c4b4ff6090dbc7
parent bfc358309ae6c624f2d71e9c7c89cca8502bb626
Author: Michael Neuper <michael@michaelneuper.com>
Date: Sun, 30 Apr 2023 18:47:13 +0200
Update display icon for login screen
Diffstat:
4 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/src/assets/heart_card.png b/src/assets/heart_card.png
Binary files differ.
diff --git a/src/assets/heart_card_resized.png b/src/assets/heart_card_resized.png
Binary files differ.
diff --git a/src/view/Login.form b/src/view/Login.form
@@ -10,9 +10,6 @@
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Default Cursor"/>
</Property>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[835, 430]"/>
- </Property>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
@@ -28,7 +25,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-82,0,0,5,44"/>
+ <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-82,0,0,5,76"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -216,7 +213,7 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="jSeparatorPassword" min="-2" pref="10" max="-2" attributes="0"/>
- <EmptySpace pref="52" max="32767" attributes="0"/>
+ <EmptySpace pref="100" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -444,26 +441,26 @@
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
- <Component id="jLabelCardsIcon" min="-2" pref="324" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="62" max="-2" attributes="0"/>
+ <Component id="jLabelCardsIcon" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" pref="145" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="164" max="-2" attributes="0"/>
<Component id="jButtonPlay" min="-2" pref="98" max="-2" attributes="0"/>
</Group>
</Group>
- <EmptySpace max="32767" attributes="0"/>
+ <EmptySpace pref="579" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
- <EmptySpace pref="53" max="32767" attributes="0"/>
- <Component id="jLabelCardsIcon" min="-2" pref="264" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="34" max="-2" attributes="0"/>
+ <EmptySpace pref="40" max="32767" attributes="0"/>
+ <Component id="jLabelCardsIcon" min="-2" pref="306" max="-2" attributes="0"/>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="jButtonPlay" min="-2" pref="50" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="16" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -472,14 +469,14 @@
<Component class="javax.swing.JLabel" name="jLabelCardsIcon">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
- <Image iconType="3" name="/assets/cards_resized.png"/>
+ <Image iconType="3" name="/assets/heart_card_resized.png"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="jButtonPlay">
<Properties>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
- <Color blue="0" green="66" red="0" type="rgb"/>
+ <Color blue="cc" green="0" red="66" type="rgb"/>
</Property>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Segoe UI" size="24" style="0"/>
diff --git a/src/view/Login.java b/src/view/Login.java
@@ -60,7 +60,6 @@ public class Login extends javax.swing.JFrame {
setTitle("librejack login");
setBackground(new java.awt.Color(0, 153, 0));
setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
- setPreferredSize(new java.awt.Dimension(835, 430));
jPanelWest.setBackground(new java.awt.Color(0, 102, 0));
jPanelWest.setPreferredSize(new java.awt.Dimension(415, 430));
@@ -271,7 +270,7 @@ public class Login extends javax.swing.JFrame {
.addComponent(jPasswordField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jSeparatorPassword, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(52, Short.MAX_VALUE))
+ .addContainerGap(100, Short.MAX_VALUE))
);
jPanelWest.add(jPanelFields);
@@ -281,9 +280,9 @@ public class Login extends javax.swing.JFrame {
jPanelCenter.setBackground(new java.awt.Color(0, 153, 51));
jPanelCenter.setPreferredSize(new java.awt.Dimension(550, 430));
- jLabelCardsIcon.setIcon(new javax.swing.ImageIcon(getClass().getResource("/assets/cards_resized.png"))); // NOI18N
+ jLabelCardsIcon.setIcon(new javax.swing.ImageIcon(getClass().getResource("/assets/heart_card_resized.png"))); // NOI18N
- jButtonPlay.setBackground(new java.awt.Color(0, 102, 0));
+ jButtonPlay.setBackground(new java.awt.Color(102, 0, 204));
jButtonPlay.setFont(new java.awt.Font("Segoe UI", 0, 24)); // NOI18N
jButtonPlay.setForeground(new java.awt.Color(204, 204, 204));
jButtonPlay.setText("PLAY");
@@ -301,21 +300,21 @@ public class Login extends javax.swing.JFrame {
.addGroup(jPanelCenterLayout.createSequentialGroup()
.addGroup(jPanelCenterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanelCenterLayout.createSequentialGroup()
- .addContainerGap()
- .addComponent(jLabelCardsIcon, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(62, 62, 62)
+ .addComponent(jLabelCardsIcon))
.addGroup(jPanelCenterLayout.createSequentialGroup()
- .addGap(145, 145, 145)
+ .addGap(164, 164, 164)
.addComponent(jButtonPlay, javax.swing.GroupLayout.PREFERRED_SIZE, 98, javax.swing.GroupLayout.PREFERRED_SIZE)))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(579, Short.MAX_VALUE))
);
jPanelCenterLayout.setVerticalGroup(
jPanelCenterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanelCenterLayout.createSequentialGroup()
- .addContainerGap(53, Short.MAX_VALUE)
- .addComponent(jLabelCardsIcon, javax.swing.GroupLayout.PREFERRED_SIZE, 264, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(34, 34, 34)
+ .addContainerGap(40, Short.MAX_VALUE)
+ .addComponent(jLabelCardsIcon, javax.swing.GroupLayout.PREFERRED_SIZE, 306, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(18, 18, 18)
.addComponent(jButtonPlay, javax.swing.GroupLayout.PREFERRED_SIZE, 50, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(29, 29, 29))
+ .addGap(16, 16, 16))
);
getContentPane().add(jPanelCenter, java.awt.BorderLayout.CENTER);
