Skip to content

Commit c147326

Browse files
author
berdal84
committed
feat(ui): add logo, fix resource folder
1 parent 7adb518 commit c147326

File tree

8 files changed

+56
-105
lines changed

8 files changed

+56
-105
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
[![CI](https://github.com/berdal84/Mageek-Java/actions/workflows/ci.yml/badge.svg)](https://github.com/berdal84/Mageek-Java/actions/workflows/ci.yml)
1+
![image](https://github.com/berdal84/Mageek-Java/blob/master/img/logo.svg)
22

3-
# Mageek (Java)
3+
[![CI](https://github.com/berdal84/Mageek-Java/actions/workflows/ci.yml/badge.svg)](https://github.com/berdal84/Mageek-Java/actions/workflows/ci.yml)
4+
# Introduction:
45

56
Mageek is an ImageJ Plugin to process microscope images files in Fiji.
67

images/logo.png

-15.5 KB
Binary file not shown.

images/logo.svg renamed to img/logo.svg

Lines changed: 43 additions & 87 deletions
Loading

pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<groupId>com.berdal84</groupId>
1616
<artifactId>Mageek</artifactId>
17-
<version>1.1.2</version>
17+
<version>1.1.3</version>
1818

1919
<name>Mageek</name>
2020
<description>A small plugin to colorize images channels, works with multi series/channels/slices.</description>
@@ -150,11 +150,6 @@
150150
<directory>src/main/resources</directory>
151151
<filtering>true</filtering>
152152
</resource>
153-
154-
<resource>
155-
<directory>src/main/resources</directory>
156-
<filtering>false</filtering>
157-
</resource>
158153
</resources>
159154
</build>
160155

src/main/java/com/berdal84/mageek/GUI.form

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<Group type="102" attributes="0">
6565
<Component id="filler1" min="-2" max="-2" attributes="0"/>
6666
<EmptySpace min="-2" max="-2" attributes="0"/>
67-
<Component id="jLabel1" min="-2" pref="49" max="-2" attributes="0"/>
67+
<Component id="jLabel1" min="-2" pref="64" max="-2" attributes="0"/>
6868
<EmptySpace min="-2" max="-2" attributes="0"/>
6969
<Component id="srcDirPanel" min="-2" max="-2" attributes="0"/>
7070
<EmptySpace min="-2" max="-2" attributes="0"/>
@@ -295,7 +295,9 @@
295295
<Font name="Lucida Grande" size="24" style="0"/>
296296
</Property>
297297
<Property name="horizontalAlignment" type="int" value="0"/>
298-
<Property name="text" type="java.lang.String" value="Mageek"/>
298+
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
299+
<Image iconType="3" name="/com/berdal84/mageek/logo-256x64px.png"/>
300+
</Property>
299301
</Properties>
300302
</Component>
301303
<Container class="javax.swing.JPanel" name="colorPanel">

src/main/java/com/berdal84/mageek/GUI.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ public GUI(final Context ctx)
7070
*/
7171
@SuppressWarnings("unchecked")
7272
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
73-
private void initComponents()
74-
{
73+
private void initComponents() {
7574

7675
jTabbedPane1 = new javax.swing.JTabbedPane();
7776
filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 32767));
@@ -178,10 +177,8 @@ private void initComponents()
178177

179178
extensionList.setModel(listModel);
180179
extensionList.setAlignmentX(0.0F);
181-
extensionList.addListSelectionListener(new javax.swing.event.ListSelectionListener()
182-
{
183-
public void valueChanged(javax.swing.event.ListSelectionEvent evt)
184-
{
180+
extensionList.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
181+
public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
185182
extensionListValueChanged(evt);
186183
}
187184
});
@@ -206,7 +203,7 @@ public void valueChanged(javax.swing.event.ListSelectionEvent evt)
206203

207204
jLabel1.setFont(new java.awt.Font("Lucida Grande", 0, 24)); // NOI18N
208205
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
209-
jLabel1.setText("Mageek");
206+
jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/berdal84/mageek/logo-256x64px.png"))); // NOI18N
210207

211208
colorPanel.setAutoscrolls(true);
212209

@@ -345,7 +342,7 @@ public void valueChanged(javax.swing.event.ListSelectionEvent evt)
345342
.addGroup(layout.createSequentialGroup()
346343
.addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
347344
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
348-
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 49, javax.swing.GroupLayout.PREFERRED_SIZE)
345+
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 64, javax.swing.GroupLayout.PREFERRED_SIZE)
349346
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
350347
.addComponent(srcDirPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
351348
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
11.9 KB
Loading

0 commit comments

Comments
 (0)