added folder offset option, fixed titlebar

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.slimtrade</groupId>
     <artifactId>slim-trade</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
     <packaging>jar</packaging>
 
     <name>slimtrade</name>

src/main/java/com/slimtrade/core/saving/savefiles/SettingsSaveFile.java

@@ -25,6 +25,7 @@ public class SettingsSaveFile {
     // Basics
     public String characterName = "";
     public boolean showGuildName = false;
+    public boolean folderOffset = true;
     public boolean colorBlindMode = false;
     public ColorTheme colorTheme = ColorTheme.SOLARIZED_LIGHT;
     public QuickPasteSetting quickPasteSetting = QuickPasteSetting.DISABLED;

src/main/java/com/slimtrade/core/update/UpdateManager.java

@@ -96,14 +96,6 @@ public String getVersionTag() {
         return patcher.getLatestVersion();
     }
 
-//    public void setLatestVersion(String version) {
-//        latestVersion = version;
-//    }
-
-//    public String getLatestVersion() {
-//        return latestVersion;
-//    }
-
     public ArrayList<ReleaseData> getReleaseData() {
         if (releases == null) {
             releases = fetchReleaseData();
@@ -181,8 +173,8 @@ public void runProcess(String... args) {
 
     public void runDelayedUpdateCheck() {
         scheduler.schedule(() -> {
+            System.out.println("Running daily update check...");
             App.update = App.updateManager.isUpdateAvailable(true);
-            System.out.println("CHECKING UPDATE!!");
             System.out.println("Latest Version : " + App.updateManager.patcher.getLatestVersion());
             if (App.update) {
                 FrameManager.optionsWindow.showUpdateButton();

src/main/java/com/slimtrade/gui/basic/AbstractWindow.java

@@ -46,6 +46,7 @@ public AbstractWindow(String title, boolean makeCloseButton) {
     }
 
     public AbstractWindow(String title, boolean makeCloseButton, boolean makePinButton) {
+        super(false);
         String fullTitle = "SlimTrade - " + title;
         this.setTitle(fullTitle);
 

src/main/java/com/slimtrade/gui/basic/BasicMovableDialog.java

@@ -25,7 +25,7 @@ public BasicMovableDialog() {
 
     public BasicMovableDialog(boolean createListeners) {
         if (createListeners) {
-            createListeners((JPanel) this.getContentPane());
+            createListeners((JPanel) getContentPane());
         }
     }
 

src/main/java/com/slimtrade/gui/menubar/MenubarDialog.java

@@ -90,8 +90,6 @@ public void click(MouseEvent evt) {
                 FrameManager.messageManager.addMessage(t3, false);
 
                 FrameManager.messageManager.addMessage(new TradeOffer(MessageType.NOTIFICATION, "Update Available!", "Check the options menu to install."));
-//                FrameManager.messageManager.addMessage(t5, false);
-//                FrameManager.messageManager.setPlayerJoinedArea("HighlightTrader123");
             }
         });
 

src/main/java/com/slimtrade/gui/options/OptionsWindow.java

@@ -242,6 +242,9 @@ public OptionsWindow() {
             // Set menubar visibility
             FrameManager.menubarToggle.setShow(App.saveManager.settingsSaveFile.enableMenubar);
 
+            // Update Stash Helper Container
+            FrameManager.stashHelperContainer.updateLocation();
+
             if (reloadHistory) {
                 new Thread(() -> {
                     // Restart file monitor

src/main/java/com/slimtrade/gui/options/general/BasicsPanel.java

@@ -26,6 +26,7 @@ public class BasicsPanel extends ContainerPanel implements ISaveable, IColorable
 
     private JTextField characterInput = new LimitTextField(32);
     private JCheckBox guildCheckbox = new CustomCheckbox();
+    private JCheckBox folderOffsetCheckbox = new CustomCheckbox();
     private JCheckBox colorBlindCheckbox = new CustomCheckbox();
     private CustomCombo<ColorTheme> colorThemeCombo = new CustomCombo<>();
     private CustomCombo<QuickPasteSetting> quickPasteCombo = new CustomCombo<>();
@@ -35,6 +36,7 @@ public class BasicsPanel extends ContainerPanel implements ISaveable, IColorable
     //Labels
     private JLabel characterLabel;
     private JLabel guildLabel;
+    private JLabel folderOffsetLabel;
     private JLabel colorBlindLabel;
     private JLabel colorThemeLabel;
     private JLabel quickPasteLabel;
@@ -46,8 +48,11 @@ public BasicsPanel() {
         colorBlindLabel = new CustomLabel("Color Blind Mode");
         colorThemeLabel = new CustomLabel("Color Theme");
         quickPasteLabel = new CustomLabel("Quick Paste");
+        folderOffsetLabel = new CustomLabel("Folder Offset");
         quickPasteHotkeyLabel = new CustomLabel("Quick Paste Hotkey");
 
+        folderOffsetLabel.setToolTipText("Increases the stash helper offset to account for tabs inside folders");
+
         JPanel showGuildContainer = new JPanel(new BorderLayout());
         guildCheckbox.setOpaque(false);
         showGuildContainer.setOpaque(false);
@@ -70,6 +75,10 @@ public BasicsPanel() {
         quickPasteHotkeyContainer.setOpaque(false);
         quickPasteHotkeyContainer.add(quickPasteHotkeyInput, BorderLayout.EAST);
 
+        JPanel folderOffsetContainer = new JPanel(new BorderLayout());
+        folderOffsetContainer.setOpaque(false);
+        folderOffsetContainer.add(folderOffsetCheckbox, BorderLayout.EAST);
+
         editOverlayButton.setText("Edit Overlay Size & Location");
 
         for (ColorTheme theme : ColorTheme.values()) {
@@ -104,7 +113,7 @@ public BasicsPanel() {
         gc.gridx = 0;
         gc.gridy++;
 
-        // show Guild
+        // Show Guild
         gc.insets.bottom = 0;
         container.add(guildLabel, gc);
         gc.gridx = 2;
@@ -113,6 +122,14 @@ public BasicsPanel() {
         gc.gridx = 0;
         gc.gridy++;
 
+        // Folder Offset
+        container.add(folderOffsetLabel, gc);
+        gc.gridx = 2;
+
+        container.add(folderOffsetContainer, gc);
+        gc.gridx = 0;
+        gc.gridy++;
+
         // Colorblind Mode
         container.add(colorBlindLabel, gc);
         gc.gridx = 2;
@@ -198,6 +215,7 @@ public void save() {
         ColorTheme colorTheme = (ColorTheme) colorThemeCombo.getSelectedItem();
         App.saveManager.settingsSaveFile.characterName = characterName;
         App.saveManager.settingsSaveFile.showGuildName = guildCheckbox.isSelected();
+        App.saveManager.settingsSaveFile.folderOffset = folderOffsetCheckbox.isSelected();
         App.saveManager.settingsSaveFile.colorBlindMode = colorBlindCheckbox.isSelected();
         App.saveManager.settingsSaveFile.colorTheme = colorTheme;
         App.saveManager.settingsSaveFile.quickPasteSetting = (QuickPasteSetting) quickPasteCombo.getSelectedItem();
@@ -209,6 +227,7 @@ public void load() {
         String characterName = App.saveManager.settingsSaveFile.characterName;
         characterInput.setText(characterName);
         guildCheckbox.setSelected(App.saveManager.settingsSaveFile.showGuildName);
+        folderOffsetCheckbox.setSelected(App.saveManager.settingsSaveFile.folderOffset);
         colorBlindCheckbox.setSelected(App.saveManager.settingsSaveFile.colorBlindMode);
         ColorManager.setColorBlindMode(App.saveManager.settingsSaveFile.colorBlindMode);
         colorThemeCombo.setSelectedItem(App.saveManager.settingsSaveFile.colorTheme);

src/main/java/com/slimtrade/gui/scanner/SearchTermsPanel.java

@@ -17,7 +17,7 @@ public class SearchTermsPanel extends JPanel implements IColorable {
 
     private JLabel searchTermsLabel = new CustomLabel("Search Terms");
     private JLabel ignoreTermsLabel = new CustomLabel("Ignore Terms");
-    private JLabel info1 = new CustomLabel("Separate terms using commas, semicolons, or new lines.");
+    private JLabel info1 = new CustomLabel("Separate phrases using commas, semicolons, or new lines.");
     private JLabel info2 = new CustomLabel("Scanning is case insensitive. Irregular spacing is ignored.");
 
     public JTextArea searchTermsInput = new CustomTextArea(2, 45);

src/main/java/com/slimtrade/gui/stash/helper/StashHelperContainer.java

@@ -12,13 +12,15 @@ public class StashHelperContainer extends BasicDialog {
     //TODO : Should probably get spacing X directly from stash overlay left buffer
     private static final long serialVersionUID = 1L;
     public static int height = StashHelper.height;
-    private int spacingX = 5;
+    private int SPACING_X = 5;
+    private final int SMALL_OFFSET_Y = 20;
+    private final int LARGE_OFFSET_Y = 55;
 
     //TODO : Recheck all resizing
     public StashHelperContainer() {
         this.setBackground(ColorManager.CLEAR);
         this.setBounds(0, 0, 0, 0);
-        this.setLayout(new FlowLayout(FlowLayout.LEFT, spacingX, 0));
+        this.setLayout(new FlowLayout(FlowLayout.LEFT, SPACING_X, 0));
         this.pack();
         this.addMouseListener(new MouseAdapter() {
             public void mouseEntered(MouseEvent e) {
@@ -29,7 +31,8 @@ public void mouseEntered(MouseEvent e) {
     }
 
     public void updateLocation() {
-        this.setLocation(App.saveManager.stashSaveFile.windowX, App.saveManager.stashSaveFile.windowY - 15);
+        int offset = App.saveManager.settingsSaveFile.folderOffset ? LARGE_OFFSET_Y : SMALL_OFFSET_Y;
+        this.setLocation(App.saveManager.stashSaveFile.windowX, App.saveManager.stashSaveFile.windowY - offset);
         this.pack();
     }