Skip to content

Commit b196b9b

Browse files
m-mohrm-mohr
committed
Version 1.1
- Download process about 10 times faster - Pause & Resume the download process at any time - Store files in a separate directory per user
1 parent e1c6ee7 commit b196b9b

File tree

8 files changed

+189
-41
lines changed

8 files changed

+189
-41
lines changed

‎CHANGELOG

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Version 1.1
2+
- Download process about 10 times faster
3+
- Pause & Resume the download process at any time
4+
- Store files in a separate directory per user
5+
6+
Version 1.0
7+
- Initial release

‎EasyFlickrBackup.jar

1.62 KB
Binary file not shown.

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# EasyFlickrBackup
22
Easy to use application to download and backup all your photos in original size from flickr.
33

4-
* Current version: 1.0
4+
* Current version: 1.1
55
* License: MIT License
66

77
![Screenshot](https://farm2.staticflickr.com/1701/25533200184_03355b0172_o_d.png)

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>de.lutana</groupId>
55
<artifactId>EasyFlickrBackup</artifactId>
6-
<version>1.0</version>
6+
<version>1.1</version>
77
<packaging>jar</packaging>
88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎src/main/java/de/lutana/easyflickrbackup/AboutDlg.form

Lines changed: 76 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,21 @@
2828
<Group type="102" attributes="0">
2929
<EmptySpace max="-2" attributes="0"/>
3030
<Group type="103" groupAlignment="0" attributes="0">
31-
<Component id="jLabel1" max="32767" attributes="0"/>
32-
<Component id="jLabel2" max="32767" attributes="0"/>
31+
<Component id="jScrollPane1" alignment="1" max="32767" attributes="0"/>
32+
<Component id="jLabel6" alignment="0" max="32767" attributes="0"/>
33+
<Component id="jLabel1" alignment="0" max="32767" attributes="0"/>
3334
<Group type="102" alignment="0" attributes="0">
34-
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
35-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
3635
<Group type="103" groupAlignment="0" attributes="0">
37-
<Component id="jLabel5" pref="163" max="32767" attributes="0"/>
38-
<Component id="jLabel4" max="32767" attributes="0"/>
36+
<Component id="jLabel9" pref="87" max="32767" attributes="0"/>
37+
<Component id="jLabel3" max="32767" attributes="0"/>
38+
<Component id="jLabel7" alignment="0" max="32767" attributes="0"/>
39+
</Group>
40+
<EmptySpace type="unrelated" max="-2" attributes="0"/>
41+
<Group type="103" groupAlignment="0" max="-2" attributes="0">
42+
<Component id="jLabel5" alignment="1" max="32767" attributes="0"/>
43+
<Component id="jLabel4" alignment="1" max="32767" attributes="0"/>
44+
<Component id="jLabel2" alignment="1" max="32767" attributes="0"/>
45+
<Component id="jLabel8" pref="362" max="32767" attributes="0"/>
3946
</Group>
4047
</Group>
4148
</Group>
@@ -46,18 +53,30 @@
4653
<DimensionLayout dim="1">
4754
<Group type="103" groupAlignment="0" attributes="0">
4855
<Group type="102" alignment="0" attributes="0">
49-
<EmptySpace max="-2" attributes="0"/>
56+
<EmptySpace min="-2" max="-2" attributes="0"/>
5057
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
51-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
52-
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
53-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
58+
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
59+
<Group type="103" groupAlignment="3" attributes="0">
60+
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
61+
<Component id="jLabel7" alignment="3" min="-2" max="-2" attributes="0"/>
62+
</Group>
63+
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
5464
<Group type="103" groupAlignment="3" attributes="0">
5565
<Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
5666
<Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>
5767
</Group>
58-
<EmptySpace max="-2" attributes="0"/>
68+
<EmptySpace min="-2" max="-2" attributes="0"/>
5969
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
60-
<EmptySpace max="32767" attributes="0"/>
70+
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
71+
<Group type="103" groupAlignment="3" attributes="0">
72+
<Component id="jLabel8" alignment="3" min="-2" max="-2" attributes="0"/>
73+
<Component id="jLabel9" alignment="3" min="-2" max="-2" attributes="0"/>
74+
</Group>
75+
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
76+
<Component id="jLabel6" min="-2" max="-2" attributes="0"/>
77+
<EmptySpace min="-2" max="-2" attributes="0"/>
78+
<Component id="jScrollPane1" pref="155" max="32767" attributes="0"/>
79+
<EmptySpace min="-2" max="-2" attributes="0"/>
6180
</Group>
6281
</Group>
6382
</DimensionLayout>
@@ -70,12 +89,12 @@
7089
<Font bold="true" component="jLabel1" property="font" relativeSize="true" size="0"/>
7190
</FontInfo>
7291
</Property>
73-
<Property name="text" type="java.lang.String" value="EasyFlickrBackup 1.0"/>
92+
<Property name="text" type="java.lang.String" value="EasyFlickrBackup 1.1"/>
7493
</Properties>
7594
</Component>
7695
<Component class="javax.swing.JLabel" name="jLabel2">
7796
<Properties>
78-
<Property name="text" type="java.lang.String" value="License: MIT License"/>
97+
<Property name="text" type="java.lang.String" value="MIT License"/>
7998
</Properties>
8099
</Component>
81100
<Component class="javax.swing.JLabel" name="jLabel3">
@@ -99,5 +118,48 @@
99118
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel5MouseClicked"/>
100119
</Events>
101120
</Component>
121+
<Component class="javax.swing.JLabel" name="jLabel6">
122+
<Properties>
123+
<Property name="text" type="java.lang.String" value="Changelog:"/>
124+
</Properties>
125+
</Component>
126+
<Container class="javax.swing.JScrollPane" name="jScrollPane1">
127+
<AuxValues>
128+
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
129+
</AuxValues>
130+
131+
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
132+
<SubComponents>
133+
<Component class="javax.swing.JTextArea" name="jTextArea1">
134+
<Properties>
135+
<Property name="editable" type="boolean" value="false"/>
136+
<Property name="columns" type="int" value="20"/>
137+
<Property name="rows" type="int" value="5"/>
138+
<Property name="text" type="java.lang.String" value="Version 1.1&#xa;- Download process about 10 times faster&#xa;- Pause &amp; Resume the download process at any time&#xa;- Store files in a separate directory per user&#xa;&#xa;Version 1.0&#xa;- Initial release"/>
139+
</Properties>
140+
</Component>
141+
</SubComponents>
142+
</Container>
143+
<Component class="javax.swing.JLabel" name="jLabel7">
144+
<Properties>
145+
<Property name="text" type="java.lang.String" value="License:"/>
146+
</Properties>
147+
</Component>
148+
<Component class="javax.swing.JLabel" name="jLabel8">
149+
<Properties>
150+
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
151+
<Color blue="ff" green="33" red="0" type="rgb"/>
152+
</Property>
153+
<Property name="text" type="java.lang.String" value="https://github.com/lutana-de/easyflickrbackup"/>
154+
</Properties>
155+
<Events>
156+
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel8MouseClicked"/>
157+
</Events>
158+
</Component>
159+
<Component class="javax.swing.JLabel" name="jLabel9">
160+
<Properties>
161+
<Property name="text" type="java.lang.String" value="Homepage:"/>
162+
</Properties>
163+
</Component>
102164
</SubComponents>
103165
</Form>

‎src/main/java/de/lutana/easyflickrbackup/AboutDlg.java

Lines changed: 64 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,21 @@ private void initComponents() {
4949
jLabel3 = new javax.swing.JLabel();
5050
jLabel4 = new javax.swing.JLabel();
5151
jLabel5 = new javax.swing.JLabel();
52+
jLabel6 = new javax.swing.JLabel();
53+
jScrollPane1 = new javax.swing.JScrollPane();
54+
jTextArea1 = new javax.swing.JTextArea();
55+
jLabel7 = new javax.swing.JLabel();
56+
jLabel8 = new javax.swing.JLabel();
57+
jLabel9 = new javax.swing.JLabel();
5258

5359
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
5460
setTitle("About...");
5561
setResizable(false);
5662

5763
jLabel1.setFont(jLabel1.getFont().deriveFont(jLabel1.getFont().getStyle() | java.awt.Font.BOLD));
58-
jLabel1.setText("EasyFlickrBackup 1.0");
64+
jLabel1.setText("EasyFlickrBackup 1.1");
5965

60-
jLabel2.setText("License: MIT License");
66+
jLabel2.setText("MIT License");
6167

6268
jLabel3.setText("Author:");
6369

@@ -71,21 +77,47 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
7177
}
7278
});
7379

80+
jLabel6.setText("Changelog:");
81+
82+
jTextArea1.setEditable(false);
83+
jTextArea1.setColumns(20);
84+
jTextArea1.setRows(5);
85+
jTextArea1.setText("Version 1.1\n- Download process about 10 times faster\n- Pause & Resume the download process at any time\n- Store files in a separate directory per user\n\nVersion 1.0\n- Initial release");
86+
jScrollPane1.setViewportView(jTextArea1);
87+
88+
jLabel7.setText("License:");
89+
90+
jLabel8.setForeground(new java.awt.Color(0, 51, 255));
91+
jLabel8.setText("https://github.com/lutana-de/easyflickrbackup");
92+
jLabel8.addMouseListener(new java.awt.event.MouseAdapter() {
93+
public void mouseClicked(java.awt.event.MouseEvent evt) {
94+
jLabel8MouseClicked(evt);
95+
}
96+
});
97+
98+
jLabel9.setText("Homepage:");
99+
74100
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
75101
getContentPane().setLayout(layout);
76102
layout.setHorizontalGroup(
77103
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
78104
.addGroup(layout.createSequentialGroup()
79105
.addContainerGap()
80106
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
107+
.addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.TRAILING)
108+
.addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
81109
.addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
82-
.addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
83110
.addGroup(layout.createSequentialGroup()
84-
.addComponent(jLabel3)
85-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
86111
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
87-
.addComponent(jLabel5, javax.swing.GroupLayout.DEFAULT_SIZE, 163, Short.MAX_VALUE)
88-
.addComponent(jLabel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
112+
.addComponent(jLabel9, javax.swing.GroupLayout.DEFAULT_SIZE, 87, Short.MAX_VALUE)
113+
.addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
114+
.addComponent(jLabel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
115+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
116+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
117+
.addComponent(jLabel5, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
118+
.addComponent(jLabel4, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
119+
.addComponent(jLabel2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
120+
.addComponent(jLabel8, javax.swing.GroupLayout.DEFAULT_SIZE, 362, Short.MAX_VALUE))))
89121
.addContainerGap())
90122
);
91123
layout.setVerticalGroup(
@@ -94,14 +126,24 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
94126
.addContainerGap()
95127
.addComponent(jLabel1)
96128
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
97-
.addComponent(jLabel2)
129+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
130+
.addComponent(jLabel2)
131+
.addComponent(jLabel7))
98132
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
99133
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
100134
.addComponent(jLabel3)
101135
.addComponent(jLabel4))
102136
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
103137
.addComponent(jLabel5)
104-
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
138+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
139+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
140+
.addComponent(jLabel8)
141+
.addComponent(jLabel9))
142+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
143+
.addComponent(jLabel6)
144+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
145+
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 155, Short.MAX_VALUE)
146+
.addContainerGap())
105147
);
106148

107149
pack();
@@ -114,11 +156,24 @@ private void jLabel5MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve
114156
}
115157
}//GEN-LAST:event_jLabel5MouseClicked
116158

159+
private void jLabel8MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel8MouseClicked
160+
try {
161+
Desktop.getDesktop().browse(new URI("https://github.com/lutana-de/easyflickrbackup"));
162+
} catch (URISyntaxException | IOException ex) {
163+
}
164+
}//GEN-LAST:event_jLabel8MouseClicked
165+
117166
// Variables declaration - do not modify//GEN-BEGIN:variables
118167
private javax.swing.JLabel jLabel1;
119168
private javax.swing.JLabel jLabel2;
120169
private javax.swing.JLabel jLabel3;
121170
private javax.swing.JLabel jLabel4;
122171
private javax.swing.JLabel jLabel5;
172+
private javax.swing.JLabel jLabel6;
173+
private javax.swing.JLabel jLabel7;
174+
private javax.swing.JLabel jLabel8;
175+
private javax.swing.JLabel jLabel9;
176+
private javax.swing.JScrollPane jScrollPane1;
177+
private javax.swing.JTextArea jTextArea1;
123178
// End of variables declaration//GEN-END:variables
124179
}

‎src/main/java/de/lutana/easyflickrbackup/GUI.form

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<Component id="startBtn" max="32767" attributes="0"/>
165165
<Component id="backupSep" max="32767" attributes="0"/>
166166
<Group type="102" alignment="0" attributes="0">
167-
<Component id="statusLabel" pref="491" max="32767" attributes="0"/>
167+
<Component id="statusLabel" pref="501" max="32767" attributes="0"/>
168168
<EmptySpace max="-2" attributes="0"/>
169169
<Component id="cancelBtn" min="-2" max="-2" attributes="0"/>
170170
</Group>
@@ -213,7 +213,7 @@
213213
</Component>
214214
<Component class="javax.swing.JButton" name="cancelBtn">
215215
<Properties>
216-
<Property name="text" type="java.lang.String" value="Cancel"/>
216+
<Property name="text" type="java.lang.String" value="Stop"/>
217217
</Properties>
218218
<Events>
219219
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelBtnActionPerformed"/>

0 commit comments

Comments
 (0)