minor changes

hvdwolf · hvdwolf · commit 87ef703a58b0 · 2022-03-13T19:25:29.000+01:00
diff --git a/packaging/macos-packr/make_full_bundle.sh b/packaging/macos-packr/make_full_bundle.sh
diff --git a/packaging/macos/create_full_bundle_and_dmg.sh b/packaging/macos/create_full_bundle_and_dmg.sh
@@ -42,10 +42,10 @@ rm -rf $App/Contents/MacOS/ExifTool/t $App/Contents/MacOS/ExifTool/html $App/Con
 
 
 
-printf "Create the 145MB (full) dmg\n\n"
+printf "Create the 150MB (full) dmg\n\n"
 mkdir -p tmp/dmg
 # 125MB dmg
-dd if=/dev/zero of=tmp/jExifToolGUI.dmg bs=1M count=145
+dd if=/dev/zero of=tmp/jExifToolGUI.dmg bs=1M count=150
 
 /sbin/mkfs.hfsplus -v "jExifToolGUI-x86_64 $Version" tmp/jExifToolGUI.dmg
 
diff --git a/src/main/java/org/hvdw/jexiftoolgui/Application.java b/src/main/java/org/hvdw/jexiftoolgui/Application.java
@@ -1,8 +1,8 @@
 package org.hvdw.jexiftoolgui;
 
-import ch.qos.logback.classic.Level;
 import org.hvdw.jexiftoolgui.controllers.SingletonEnum;
 import org.hvdw.jexiftoolgui.facades.IPreferencesFacade;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
@@ -30,11 +30,7 @@ public static void main(String[] args)  {
 
         // Doesn't work but leave in
         System.out.println(SingletonEnum.INSTANCE);
-
-        /*String logLevel = prefs.getByKey(LOG_LEVEL, "Info");
-        ch.qos.logback.classic.Logger root = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(ch.qos.logback.classic.Logger.ROOT_LOGGER_NAME);
-        Level level = Level.toLevel(logLevel.toUpperCase());
-        root.setLevel(level); */
+        
         Utils.SetApplicationWideLogLevel();
         logger.info("Start application jExifToolGUI");
 
diff --git a/src/main/java/org/hvdw/jexiftoolgui/ExiftoolDatabase.java b/src/main/java/org/hvdw/jexiftoolgui/ExiftoolDatabase.java
@@ -446,6 +446,11 @@ public void DisplayDiagram() {
         frame.setIconImage(Utils.getFrameIcon());
         frame.setLocationByPlatform(true);
         frame.setDefaultLookAndFeelDecorated(true);
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        } catch (Exception weTried) {
+            logger.error("Could not start GUI.", weTried);
+        }
         Locale currentLocale = new Locale.Builder().setLocale(MyVariables.getCurrentLocale()).build();
         frame.applyComponentOrientation(ComponentOrientation.getOrientation(currentLocale));
 
diff --git a/src/main/java/org/hvdw/jexiftoolgui/ProgramTexts.java b/src/main/java/org/hvdw/jexiftoolgui/ProgramTexts.java
@@ -6,9 +6,9 @@ public class ProgramTexts {
      */
     public static final String Author = "Harry van der Wolf";
     public static final String ProjectWebSite = "http://hvdwolf.github.io/jExifToolGUI";
-    public static final String Version = "1.11.1";
+    public static final String Version = "2.0.0-beta2";
     public static final String HTML = "<html><body style='width: %1spx'>%1s";
-    public static final String downloadInstallET = "I will now open the ExifTool website in your browser and then close jExifToolGUI.<br>"
+    public static final String downloadInstallET = "The program will now open the ExifTool website in your browser and then the program will close itself.<br>"
             +"After having downloaded and installed ExifTool you can reopen jExifToolGUI.<br><br>If ExifTool is in your PATH, jExifToolGUI will simply continue.<br><br>"
             +"If ExifTool is NOT in your PATH, you need to specify the location where you installed ExifTool.";
     public static final String CreateArgsMetaDataUiText = "Which metadata from your selected image(s) do you want to add to your args file(s)?";
diff --git a/src/main/java/org/hvdw/jexiftoolgui/Utils.java b/src/main/java/org/hvdw/jexiftoolgui/Utils.java
@@ -121,6 +121,7 @@ public static boolean containsIndices(int[] selectedIndices) {
     static public void SetLoggingLevel(Class usedClass) {
         String logLevel = prefs.getByKey(LOG_LEVEL, "Info");
         ch.qos.logback.classic.Logger logger = (ch.qos.logback.classic.Logger) getLogger(usedClass);
+        //Logger logger = getLogger(usedClass);
         // hardcode in case of debugging/troubleshooting
         //logLevel = "Trace";
 
diff --git a/src/main/java/org/hvdw/jexiftoolgui/mainScreen.java b/src/main/java/org/hvdw/jexiftoolgui/mainScreen.java
@@ -46,8 +46,7 @@
 
 
 public class mainScreen {
-    //private static final ch.qos.logback.classic.Logger logger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(mainScreen.class);
-    private final static Logger logger = (Logger) LoggerFactory.getLogger(mainScreen.class);
+    private static final Logger logger = (Logger) LoggerFactory.getLogger(mainScreen.class);
 
     private IPreferencesFacade prefs = IPreferencesFacade.defaultInstance;
     //private JFrame rootFrame;
diff --git a/src/main/java/org/hvdw/jexiftoolgui/view/CompareImagesWindow.java b/src/main/java/org/hvdw/jexiftoolgui/view/CompareImagesWindow.java
@@ -37,6 +37,11 @@ public static void Initialize(List<String[]> tableMetadata, List<String[]> allMe
 
         // Define the frame, the ScrollPanel with the table, the buttonpanel with the close button
         JFrame frame = new JFrame();
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        } catch (Exception weTried) {
+            logger.error("Could not start GUI.", weTried);
+        }
         Locale currentLocale = new Locale.Builder().setLocale(MyVariables.getCurrentLocale()).build();
         frame.applyComponentOrientation(ComponentOrientation.getOrientation(currentLocale));
         frame.setTitle(ResourceBundle.getBundle("translations/program_strings").getString("cmpimg.comparetitle"));
diff --git a/src/main/java/org/hvdw/jexiftoolgui/view/JavaImageViewer.java b/src/main/java/org/hvdw/jexiftoolgui/view/JavaImageViewer.java
@@ -169,6 +169,11 @@ public void ViewImageInFullscreenFrame (boolean isSlideshow) {
         JPanel imageViewPane = new JPanel();
         frame.setContentPane(imageViewPane);
         frame.setIconImage(Utils.getFrameIcon());
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        } catch (Exception weTried) {
+            logger.error("Could not set getSystemLookAndFeelClassName.", weTried);
+        }
 
         /* Get screen size */
         int[] resolution = Utils.getResolution();
