Skip to content

Commit

Permalink
Merge branch 'release/alpha/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@coderarjob
coderarjob committed Mar 24, 2022
2 parents a93f7c3 + 7ee437c commit 07e3bc5
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 39 deletions.
Binary file modified docs/images/screenshot_alpha.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 19 additions & 22 deletions src/coderarjob/kpdfsync/poc/MainFrame.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,19 @@
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="selectPdfFileLabel" pref="152" max="32767" attributes="0"/>
<Component id="selectPdfFileLabel" max="32767" attributes="0"/>
<Component id="pdfSkipPagesLabel" max="32767" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="pdfSkipPagesSpinner" min="-2" pref="63" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="matchThressholdLabel" min="-2" pref="183" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="matchThressholdSpinner" min="-2" pref="63" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="percentLabel" min="-2" pref="18" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="372" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="selectPdfFileTextBox" max="32767" attributes="0"/>
Expand All @@ -78,12 +77,19 @@
<Group type="102" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="selectBookNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="clippingsFileLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="statusLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Group type="102" attributes="0">
<Component id="statusLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="158" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="selectBookNameLabel" max="32767" attributes="0"/>
<Component id="clippingsFileLabel" max="32767" attributes="0"/>
</Group>
<EmptySpace min="37" pref="37" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="selectBookNameComboBox" max="32767" attributes="0"/>
<Component id="clippingsFileTextBox" max="32767" attributes="0"/>
Expand All @@ -98,7 +104,7 @@
</Group>
<Component id="selectHighlightLabel" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="pageNumbersLabel" min="-2" pref="110" max="-2" attributes="0"/>
<Component id="pageNumbersLabel" min="-2" pref="162" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
Expand Down Expand Up @@ -166,7 +172,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="logoLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace pref="552" max="32767" attributes="0"/>
<Component id="optionsButton" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="exitButton" min="-2" max="-2" attributes="0"/>
Expand Down Expand Up @@ -217,9 +223,6 @@
</Container>
<Component class="javax.swing.JLabel" name="clippingsFileLabel">
<Properties>
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="0" green="0" red="0" type="rgb"/>
</Property>
<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
<ComponentRef name="clippingsFileTextBox"/>
</Property>
Expand Down Expand Up @@ -251,9 +254,6 @@
</Component>
<Component class="javax.swing.JLabel" name="selectBookNameLabel">
<Properties>
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="0" green="0" red="0" type="rgb"/>
</Property>
<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
<ComponentRef name="selectBookNameComboBox"/>
</Property>
Expand All @@ -262,9 +262,6 @@
</Component>
<Component class="javax.swing.JLabel" name="selectPdfFileLabel">
<Properties>
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="0" green="0" red="0" type="rgb"/>
</Property>
<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
<ComponentRef name="selectPdfFileTextBox"/>
</Property>
Expand Down Expand Up @@ -316,12 +313,12 @@
</Container>
<Component class="javax.swing.JLabel" name="pageNumbersLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Page numbers:"/>
<Property name="text" type="java.lang.String" value="Pages with highlight/notes:"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="selectHighlightLabel">
<Properties>
<Property name="text" type="java.lang.String" value="Highlight as associated notes. (Double-click to change)"/>
<Property name="text" type="java.lang.String" value="Highlight and notes association. (Double-click to change)"/>
</Properties>
</Component>
<Container class="javax.swing.JScrollPane" name="highlightsScrollPane">
Expand Down Expand Up @@ -432,7 +429,7 @@
<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
<ComponentRef name="pdfSkipPagesSpinner"/>
</Property>
<Property name="text" type="java.lang.String" value="Number of pages to skip:"/>
<Property name="text" type="java.lang.String" value="Number of pages before page 1:"/>
</Properties>
</Component>
<Component class="javax.swing.JSpinner" name="pdfSkipPagesSpinner">
Expand Down
34 changes: 17 additions & 17 deletions src/coderarjob/kpdfsync/poc/MainFrame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
headerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(headerPanelLayout.createSequentialGroup()
.addComponent(logoLabel)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 552, Short.MAX_VALUE)
.addComponent(optionsButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(exitButton)
Expand All @@ -685,7 +685,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addGap(24, 24, 24))
);

clippingsFileLabel.setForeground(new java.awt.Color(0, 0, 0));
clippingsFileLabel.setLabelFor(clippingsFileTextBox);
clippingsFileLabel.setText("Clippings file :");

Expand All @@ -702,11 +701,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}
});

selectBookNameLabel.setForeground(new java.awt.Color(0, 0, 0));
selectBookNameLabel.setLabelFor(selectBookNameComboBox);
selectBookNameLabel.setText("Select book name :");

selectPdfFileLabel.setForeground(new java.awt.Color(0, 0, 0));
selectPdfFileLabel.setLabelFor(selectPdfFileTextBox);
selectPdfFileLabel.setText("Select book PDF file :");

Expand All @@ -730,9 +727,9 @@ public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
});
pageNumbersScrollPane.setViewportView(pageNumbersList);

pageNumbersLabel.setText("Page numbers:");
pageNumbersLabel.setText("Pages with highlight/notes:");

selectHighlightLabel.setText("Highlight as associated notes. (Double-click to change)");
selectHighlightLabel.setText("Highlight and notes association. (Double-click to change)");

highlightsList.setBorder(javax.swing.BorderFactory.createEtchedBorder());
highlightsList.setModel(highlightsListModel);
Expand Down Expand Up @@ -785,7 +782,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
statusLabel.setText("Status:");

pdfSkipPagesLabel.setLabelFor(pdfSkipPagesSpinner);
pdfSkipPagesLabel.setText("Number of pages to skip:");
pdfSkipPagesLabel.setText("Number of pages before page 1:");

pdfSkipPagesSpinner.setModel(new javax.swing.SpinnerNumberModel());

Expand Down Expand Up @@ -814,19 +811,18 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addContainerGap())
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(selectPdfFileLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 152, Short.MAX_VALUE)
.addComponent(selectPdfFileLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(pdfSkipPagesLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(pdfSkipPagesSpinner, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(matchThressholdLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 183, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(matchThressholdSpinner, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(percentLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(372, 372, 372))
.addComponent(percentLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(layout.createSequentialGroup()
.addComponent(selectPdfFileTextBox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
Expand All @@ -838,11 +834,15 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(selectBookNameLabel)
.addComponent(clippingsFileLabel)
.addComponent(statusLabel))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addGroup(layout.createSequentialGroup()
.addComponent(statusLabel)
.addGap(158, 158, 158))
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(selectBookNameLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(clippingsFileLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGap(37, 37, 37)))
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(selectBookNameComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(clippingsFileTextBox))
Expand All @@ -853,7 +853,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addGap(5, 5, 5))
.addComponent(selectHighlightLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup()
.addComponent(pageNumbersLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(pageNumbersLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 162, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, Short.MAX_VALUE))))
);
layout.setVerticalGroup(
Expand Down

0 comments on commit 07e3bc5

Please sign in to comment.