Skip to content

Commit c2dc2fb

Browse files
WetmelonWetmelon
committed
UX Improvements
1 parent 51ff2ca commit c2dc2fb

File tree

11 files changed

+182
-77
lines changed

11 files changed

+182
-77
lines changed

‎build/classes/pdfmerge/MainFrame$1.class‎

0 Bytes
Binary file not shown.

‎build/classes/pdfmerge/MainFrame$2.class‎

0 Bytes
Binary file not shown.

‎build/classes/pdfmerge/MainFrame$3.class‎

37 Bytes
Binary file not shown.

‎build/classes/pdfmerge/MainFrame$4.class‎

0 Bytes
Binary file not shown.

‎build/classes/pdfmerge/MainFrame$5.class‎

0 Bytes
Binary file not shown.

‎build/classes/pdfmerge/MainFrame$6.class‎

219 Bytes
Binary file not shown.

‎build/classes/pdfmerge/MainFrame.class‎

1.55 KB
Binary file not shown.

‎build/classes/pdfmerge/MainFrame.form‎

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
3434
<Dimension value="[350, 250]"/>
3535
</Property>
36-
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
37-
<Dimension value="[500, 250]"/>
38-
</Property>
3936
</Properties>
4037
<SyntheticProperties>
4138
<SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>
@@ -61,19 +58,26 @@
6158
<EmptySpace min="-2" max="-2" attributes="0"/>
6259
<Group type="103" groupAlignment="0" attributes="0">
6360
<Group type="102" alignment="0" attributes="0">
61+
<Component id="bMerge" min="-2" max="-2" attributes="0"/>
62+
<EmptySpace type="separate" max="-2" attributes="0"/>
63+
<Component id="lStatus" min="-2" max="-2" attributes="0"/>
64+
<EmptySpace pref="81" max="32767" attributes="0"/>
65+
<Component id="bClose" min="-2" max="-2" attributes="0"/>
66+
</Group>
67+
<Group type="102" attributes="0">
6468
<Component id="bAddPdf" min="-2" max="-2" attributes="0"/>
6569
<EmptySpace max="-2" attributes="0"/>
6670
<Component id="bRemovePdf" min="-2" max="-2" attributes="0"/>
6771
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
6872
</Group>
6973
<Group type="102" alignment="0" attributes="0">
70-
<Component id="bMerge" min="-2" max="-2" attributes="0"/>
71-
<EmptySpace max="-2" attributes="0"/>
72-
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
73-
<EmptySpace pref="184" max="32767" attributes="0"/>
74-
<Component id="bClose" min="-2" max="-2" attributes="0"/>
74+
<Component id="jScrollPane1" max="32767" attributes="0"/>
75+
<EmptySpace type="unrelated" max="-2" attributes="0"/>
76+
<Group type="103" groupAlignment="0" max="-2" attributes="0">
77+
<Component id="bMoveDown" max="32767" attributes="0"/>
78+
<Component id="bMoveUp" min="-2" pref="89" max="-2" attributes="0"/>
79+
</Group>
7580
</Group>
76-
<Component id="jScrollPane1" alignment="0" max="32767" attributes="0"/>
7781
</Group>
7882
<EmptySpace min="-2" max="-2" attributes="0"/>
7983
</Group>
@@ -83,7 +87,15 @@
8387
<Group type="103" groupAlignment="0" attributes="0">
8488
<Group type="102" alignment="0" attributes="0">
8589
<EmptySpace max="-2" attributes="0"/>
86-
<Component id="jScrollPane1" pref="149" max="32767" attributes="0"/>
90+
<Group type="103" groupAlignment="0" attributes="0">
91+
<Component id="jScrollPane1" pref="149" max="32767" attributes="0"/>
92+
<Group type="102" attributes="0">
93+
<Component id="bMoveUp" min="-2" max="-2" attributes="0"/>
94+
<EmptySpace type="unrelated" max="-2" attributes="0"/>
95+
<Component id="bMoveDown" min="-2" max="-2" attributes="0"/>
96+
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
97+
</Group>
98+
</Group>
8799
<EmptySpace max="-2" attributes="0"/>
88100
<Group type="103" groupAlignment="3" attributes="0">
89101
<Component id="bAddPdf" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -93,7 +105,7 @@
93105
<Group type="103" groupAlignment="3" attributes="0">
94106
<Component id="bMerge" alignment="3" min="-2" max="-2" attributes="0"/>
95107
<Component id="bClose" alignment="3" min="-2" max="-2" attributes="0"/>
96-
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
108+
<Component id="lStatus" alignment="3" min="-2" max="-2" attributes="0"/>
97109
</Group>
98110
<EmptySpace max="-2" attributes="0"/>
99111
</Group>
@@ -104,6 +116,7 @@
104116
<Component class="javax.swing.JButton" name="bMerge">
105117
<Properties>
106118
<Property name="text" type="java.lang.String" value="Merge PDFs"/>
119+
<Property name="enabled" type="boolean" value="false"/>
107120
</Properties>
108121
<Events>
109122
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bMergeActionPerformed"/>
@@ -134,6 +147,9 @@
134147
<Value id="INSERT"/>
135148
</Property>
136149
</Properties>
150+
<Events>
151+
<EventHandler event="valueChanged" listener="javax.swing.event.ListSelectionListener" parameters="javax.swing.event.ListSelectionEvent" handler="pdfListValueChanged"/>
152+
</Events>
137153
<AuxValues>
138154
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="18"/>
139155
</AuxValues>
@@ -151,14 +167,30 @@
151167
<Component class="javax.swing.JButton" name="bRemovePdf">
152168
<Properties>
153169
<Property name="text" type="java.lang.String" value="Remove Selected"/>
170+
<Property name="enabled" type="boolean" value="false"/>
154171
</Properties>
155172
<Events>
156173
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bRemovePdfActionPerformed"/>
157174
</Events>
158175
</Component>
159-
<Component class="javax.swing.JLabel" name="jLabel1">
176+
<Component class="javax.swing.JLabel" name="lStatus">
177+
<Properties>
178+
<Property name="text" type="java.lang.String" value="PDFs will be appended in the order shown above"/>
179+
</Properties>
180+
</Component>
181+
<Component class="javax.swing.JButton" name="bMoveUp">
182+
<Properties>
183+
<Property name="text" type="java.lang.String" value="Move Up"/>
184+
<Property name="enabled" type="boolean" value="false"/>
185+
</Properties>
186+
<Events>
187+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bMoveUpActionPerformed"/>
188+
</Events>
189+
</Component>
190+
<Component class="javax.swing.JButton" name="bMoveDown">
160191
<Properties>
161-
<Property name="text" type="java.lang.String" value="Drag and Drop to Reorder List"/>
192+
<Property name="text" type="java.lang.String" value="Move Down"/>
193+
<Property name="enabled" type="boolean" value="false"/>
162194
</Properties>
163195
</Component>
164196
</SubComponents>

‎dist/README.TXT‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1 @@
1-
========================
2-
BUILD OUTPUT DESCRIPTION
3-
========================
4-
5-
When you build an Java application project that has a main class, the IDE
6-
automatically copies all of the JAR
7-
files on the projects classpath to your projects dist/lib folder. The IDE
8-
also adds each of the JAR files to the Class-Path element in the application
9-
JAR files manifest file (MANIFEST.MF).
10-
11-
To run the project from the command line, go to the dist folder and
12-
type the following:
13-
14-
java -jar "PDFMerge.jar"
15-
16-
To distribute this project, zip up the dist folder (including the lib folder)
17-
and distribute the ZIP file.
18-
19-
Notes:
20-
21-
* If two JAR files on the project classpath have the same name, only the first
22-
JAR file is copied to the lib folder.
23-
* Only JAR files are copied to the lib folder.
24-
If the classpath contains other types of files or folders, these files (folders)
25-
are not copied.
26-
* If a library on the projects classpath also has a Class-Path element
27-
specified in the manifest,the content of the Class-Path element has to be on
28-
the projects runtime path.
29-
* To set a main class in a standard Java project, right-click the project node
30-
in the Projects window and choose Properties. Then click Run and enter the
31-
class name in the Main Class field. Alternatively, you can manually type the
32-
class name in the manifest Main-Class element.
1+
This is a basic PDF Merging software with GUI. Double click to go!

‎src/pdfmerge/MainFrame.form‎

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
3434
<Dimension value="[350, 250]"/>
3535
</Property>
36-
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
37-
<Dimension value="[500, 250]"/>
38-
</Property>
3936
</Properties>
4037
<SyntheticProperties>
4138
<SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>
@@ -61,19 +58,26 @@
6158
<EmptySpace min="-2" max="-2" attributes="0"/>
6259
<Group type="103" groupAlignment="0" attributes="0">
6360
<Group type="102" alignment="0" attributes="0">
61+
<Component id="bMerge" min="-2" max="-2" attributes="0"/>
62+
<EmptySpace type="separate" max="-2" attributes="0"/>
63+
<Component id="lStatus" min="-2" max="-2" attributes="0"/>
64+
<EmptySpace pref="81" max="32767" attributes="0"/>
65+
<Component id="bClose" min="-2" max="-2" attributes="0"/>
66+
</Group>
67+
<Group type="102" attributes="0">
6468
<Component id="bAddPdf" min="-2" max="-2" attributes="0"/>
6569
<EmptySpace max="-2" attributes="0"/>
6670
<Component id="bRemovePdf" min="-2" max="-2" attributes="0"/>
6771
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
6872
</Group>
6973
<Group type="102" alignment="0" attributes="0">
70-
<Component id="bMerge" min="-2" max="-2" attributes="0"/>
71-
<EmptySpace max="-2" attributes="0"/>
72-
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
73-
<EmptySpace pref="184" max="32767" attributes="0"/>
74-
<Component id="bClose" min="-2" max="-2" attributes="0"/>
74+
<Component id="jScrollPane1" max="32767" attributes="0"/>
75+
<EmptySpace type="unrelated" max="-2" attributes="0"/>
76+
<Group type="103" groupAlignment="0" max="-2" attributes="0">
77+
<Component id="bMoveDown" max="32767" attributes="0"/>
78+
<Component id="bMoveUp" min="-2" pref="89" max="-2" attributes="0"/>
79+
</Group>
7580
</Group>
76-
<Component id="jScrollPane1" alignment="0" max="32767" attributes="0"/>
7781
</Group>
7882
<EmptySpace min="-2" max="-2" attributes="0"/>
7983
</Group>
@@ -83,7 +87,15 @@
8387
<Group type="103" groupAlignment="0" attributes="0">
8488
<Group type="102" alignment="0" attributes="0">
8589
<EmptySpace max="-2" attributes="0"/>
86-
<Component id="jScrollPane1" pref="149" max="32767" attributes="0"/>
90+
<Group type="103" groupAlignment="0" attributes="0">
91+
<Component id="jScrollPane1" pref="149" max="32767" attributes="0"/>
92+
<Group type="102" attributes="0">
93+
<Component id="bMoveUp" min="-2" max="-2" attributes="0"/>
94+
<EmptySpace type="unrelated" max="-2" attributes="0"/>
95+
<Component id="bMoveDown" min="-2" max="-2" attributes="0"/>
96+
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
97+
</Group>
98+
</Group>
8799
<EmptySpace max="-2" attributes="0"/>
88100
<Group type="103" groupAlignment="3" attributes="0">
89101
<Component id="bAddPdf" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -93,7 +105,7 @@
93105
<Group type="103" groupAlignment="3" attributes="0">
94106
<Component id="bMerge" alignment="3" min="-2" max="-2" attributes="0"/>
95107
<Component id="bClose" alignment="3" min="-2" max="-2" attributes="0"/>
96-
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
108+
<Component id="lStatus" alignment="3" min="-2" max="-2" attributes="0"/>
97109
</Group>
98110
<EmptySpace max="-2" attributes="0"/>
99111
</Group>
@@ -104,6 +116,7 @@
104116
<Component class="javax.swing.JButton" name="bMerge">
105117
<Properties>
106118
<Property name="text" type="java.lang.String" value="Merge PDFs"/>
119+
<Property name="enabled" type="boolean" value="false"/>
107120
</Properties>
108121
<Events>
109122
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bMergeActionPerformed"/>
@@ -134,6 +147,9 @@
134147
<Value id="INSERT"/>
135148
</Property>
136149
</Properties>
150+
<Events>
151+
<EventHandler event="valueChanged" listener="javax.swing.event.ListSelectionListener" parameters="javax.swing.event.ListSelectionEvent" handler="pdfListValueChanged"/>
152+
</Events>
137153
<AuxValues>
138154
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="18"/>
139155
</AuxValues>
@@ -151,14 +167,30 @@
151167
<Component class="javax.swing.JButton" name="bRemovePdf">
152168
<Properties>
153169
<Property name="text" type="java.lang.String" value="Remove Selected"/>
170+
<Property name="enabled" type="boolean" value="false"/>
154171
</Properties>
155172
<Events>
156173
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bRemovePdfActionPerformed"/>
157174
</Events>
158175
</Component>
159-
<Component class="javax.swing.JLabel" name="jLabel1">
176+
<Component class="javax.swing.JLabel" name="lStatus">
177+
<Properties>
178+
<Property name="text" type="java.lang.String" value="PDFs will be appended in the order shown above"/>
179+
</Properties>
180+
</Component>
181+
<Component class="javax.swing.JButton" name="bMoveUp">
182+
<Properties>
183+
<Property name="text" type="java.lang.String" value="Move Up"/>
184+
<Property name="enabled" type="boolean" value="false"/>
185+
</Properties>
186+
<Events>
187+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bMoveUpActionPerformed"/>
188+
</Events>
189+
</Component>
190+
<Component class="javax.swing.JButton" name="bMoveDown">
160191
<Properties>
161-
<Property name="text" type="java.lang.String" value="Drag and Drop to Reorder List"/>
192+
<Property name="text" type="java.lang.String" value="Move Down"/>
193+
<Property name="enabled" type="boolean" value="false"/>
162194
</Properties>
163195
</Component>
164196
</SubComponents>

0 commit comments

Comments
 (0)