- change where logs are saved

- select font for view logs screen

Author: jpage4500

src/main/java/com/jpage4500/devicemanager/MainApplication.java

@@ -65,9 +65,9 @@ private void setupLogging() {
             // set log level that application should log at (and higher)
             logger.setDebugLevel(Log.VERBOSE);
             logger.setLogToFile(true);
-            // save logs to temp folder
-            String tmpDir = Utils.getTempFolder();
-            logger.setFileLog(new File(tmpDir, "device_manager_log.txt"));
+            // save logs to ~/.device_manager folder
+            File deviceManagerFolder = Utils.getDeviceManagerFolder();
+            logger.setFileLog(new File(deviceManagerFolder, "device_manager_log.txt"));
 
             boolean isDebugMode = PreferenceUtils.getPreference(PreferenceUtils.PrefBoolean.PREF_DEBUG_MODE, false);
             logger.setFileLogLevel(isDebugMode ? Log.DEBUG : Log.INFO);
@@ -105,6 +105,7 @@ private void handleLaunchParams() {
                 List<File> files = e.getFiles();
                 if (openFileList == null) openFileList = new ArrayList<>();
                 openFileList.addAll(files);
+                log.debug("handleLaunchParams: {}", openFileList);
                 sendFilesToDevice();
             });
         }

src/main/java/com/jpage4500/devicemanager/table/utils/LogsCellRenderer.java

@@ -104,7 +104,15 @@ public Component getTableCellRendererComponent(JTable table, Object object, bool
     }
 
     public void notifyFontChanged() {
+        String fontName = PreferenceUtils.getPreference(PreferenceUtils.Pref.PREF_LOGS_FONT_NAME, "Courier");
+        int fontStyle = PreferenceUtils.getPreference(PreferenceUtils.PrefInt.PREF_LOGS_FONT_STYLE, Font.PLAIN);
+        int fontSize = PreferenceUtils.getPreference(PreferenceUtils.PrefInt.PREF_LOGS_FONT_SIZE, defaultFontSize);
         int fontOffset = PreferenceUtils.getPreference(PreferenceUtils.PrefInt.PREF_FONT_SIZE_OFFSET, 0);
-        setFont(getFont().deriveFont(Font.PLAIN, fontOffset + defaultFontSize));
+        int size = fontSize + fontOffset;
+        if (size > 25) size = 25;
+        else if (size < 8) size = 8;
+        log.trace("notifyFontChanged: {}, {}, {}, offset:{}", fontName, fontStyle, fontSize, fontOffset);
+        Font font = new Font(fontName, fontStyle, size);
+        setFont(font);
     }
 }

src/main/java/com/jpage4500/devicemanager/ui/DeviceScreen.java

@@ -677,9 +677,12 @@ public void handleFilesOpened(List<File> fileList) {
     }
 
     public void handleFilesDropped(List<File> fileList) {
-        log.debug("handleFilesDropped: {}", fileList.size());
         List<Device> selectedDeviceList = getSelectedDevices(true);
-        if (selectedDeviceList.isEmpty()) return;
+        if (selectedDeviceList.isEmpty()) {
+            log.error("handleFilesDropped: no devices! {}", fileList);
+            return;
+        }
+        log.debug("handleFilesDropped: {}, #devices:{}", fileList, selectedDeviceList.size());
         installOrCopyFiles(selectedDeviceList, fileList, null);
     }
 
@@ -1135,9 +1138,7 @@ private boolean isToobarHidden(ToolbarButton toolbarButton) {
     }
 
     private List<File> getCustomScripts() {
-        String homeFolder = Utils.getUserHomeFolder();
-        File customFolder = new File(homeFolder, ".device_manager");
-        if (!customFolder.exists()) return null;
+        File customFolder = Utils.getDeviceManagerFolder();
         File[] files = customFolder.listFiles();
         if (files == null) return null;
         List<File> scriptList = new ArrayList<>();

src/main/java/com/jpage4500/devicemanager/ui/ViewLogsScreen.java

@@ -65,6 +65,7 @@ public ViewLogsScreen(DeviceScreen deviceScreen, Device device) {
         this.deviceScreen = deviceScreen;
         this.device = device;
         setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
         initalizeUi();
         updateDeviceState();
     }
@@ -190,6 +191,8 @@ private void setupMenuBar() {
 
         JMenu editMenu = new JMenu("Edit");
 
+        createMenuItem(editMenu, "Select Font", null, e -> showFontSelection());
+
         // [CMD + +] = increase font size
         createCmdMenuItem(editMenu, "Increase Font Size", KeyEvent.VK_EQUALS, e -> increaseFontSize());
 
@@ -291,12 +294,12 @@ private void findNext(boolean isForward) {
     public void increaseFontSize() {
         int fontOffset = PreferenceUtils.getPreference(PreferenceUtils.PrefInt.PREF_FONT_SIZE_OFFSET, 0);
         fontOffset++;
-        setFontSize(fontOffset);
-    }
-
-    private void setFontSize(int fontOffset) {
+        if (fontOffset > 10) fontOffset = 10;
         PreferenceUtils.setPreference(PreferenceUtils.PrefInt.PREF_FONT_SIZE_OFFSET, fontOffset);
+        notifyFontChanged();
+    }
 
+    private void notifyFontChanged() {
         LogsCellRenderer cellRenderer = (LogsCellRenderer) table.getDefaultRenderer(LogEntry.class);
         cellRenderer.notifyFontChanged();
         model.fireTableDataChanged();
@@ -305,7 +308,24 @@ private void setFontSize(int fontOffset) {
     public void decreaseFontSize() {
         int fontOffset = PreferenceUtils.getPreference(PreferenceUtils.PrefInt.PREF_FONT_SIZE_OFFSET, 0);
         fontOffset--;
-        setFontSize(fontOffset);
+        if (fontOffset < -10) fontOffset = -10;
+        PreferenceUtils.setPreference(PreferenceUtils.PrefInt.PREF_FONT_SIZE_OFFSET, fontOffset);
+        notifyFontChanged();
+    }
+
+    private void showFontSelection() {
+        JFontChooser fontChooser = new JFontChooser();
+        LogsCellRenderer cellRenderer = (LogsCellRenderer) table.getDefaultRenderer(LogEntry.class);
+        fontChooser.setSelectedFont(cellRenderer.getFont());
+        int rc = fontChooser.showDialog(deviceScreen);
+        if (rc != JOptionPane.YES_OPTION) return;
+        Font font = fontChooser.getSelectedFont();
+        log.trace("showFontSelection: font:{}", font);
+        PreferenceUtils.setPreference(PreferenceUtils.Pref.PREF_LOGS_FONT_NAME, font.getName());
+        PreferenceUtils.setPreference(PreferenceUtils.PrefInt.PREF_LOGS_FONT_STYLE, font.getStyle());
+        PreferenceUtils.setPreference(PreferenceUtils.PrefInt.PREF_LOGS_FONT_SIZE, font.getSize());
+        PreferenceUtils.setPreference(PreferenceUtils.PrefInt.PREF_FONT_SIZE_OFFSET, 0);
+        notifyFontChanged();
     }
 
     private void closeWindow() {
@@ -335,6 +355,10 @@ private void setupTable() {
         table.setModel(model);
         table.setDefaultRenderer(LogEntry.class, new LogsCellRenderer());
 
+        int unitIncrement = table.getScrollPane().getHorizontalScrollBar().getUnitIncrement();
+        log.trace("setupTable: {}", unitIncrement);
+        table.getScrollPane().getHorizontalScrollBar().setUnitIncrement(unitIncrement * 4);
+
         // restore user-defined column sizes
         if (!table.restoreTable()) {
             // use some default column sizes