README.TXT

-FURNITURE LIBRARY EDITOR v 1.23
+FURNITURE LIBRARY EDITOR v 1.24
 -------------------------------
 
 This archive contains source code of the Furniture Library Editor for Sweet Home 3D.
 
 You may also download this source code with the following SVN command:
 
-svn checkout https://svn.code.sf.net/p/sweethome3d/code/tags/V_1_23/FurnitureLibraryEditor FurnitureLibraryEditor
+svn checkout https://svn.code.sf.net/p/sweethome3d/code/tags/V_1_24/FurnitureLibraryEditor FurnitureLibraryEditor
 
 
 As this project depends on Sweet Home 3D, download and install also Sweet Home 3D source code from 
-http://prdownloads.sourceforge.net/sweethome3d/SweetHome3D-6.0-src.zip 
+http://prdownloads.sourceforge.net/sweethome3d/SweetHome3D-6.1-src.zip 
 or with the following SVN command: 
 
-svn checkout https://svn.code.sf.net/p/sweethome3d/code/tags/V_6_0/SweetHome3D SweetHome3D
+svn checkout https://svn.code.sf.net/p/sweethome3d/code/tags/V_6_1/SweetHome3D SweetHome3D
 
 
 HOW TO USE THIS SOURCE CODE

build.xml

@@ -10,7 +10,7 @@
 -->
 <project basedir="." default="furnitureLibraryEditorJarExecutable" name="FurnitureLibraryEditor">
   <!-- The current version of the Furniture Library Editor -->
-  <property name="version" value="1.23"/>
+  <property name="version" value="1.24"/>
 
   <target name="furnitureLibraryEditor" 
           description="Builds build/FurnitureLibraryEditor.jar with all its classes">

debian/changelog

+sweethome3d-furniture-editor (1.24-1) unstable; urgency=medium
+
+  * New upstream version 1.24.
+  * Declare compliance with Debian Policy 4.3.0.
+  * Use canonical VCS URI.
+
+ -- Markus Koschany <apo@debian.org>  Mon, 28 Jan 2019 17:01:08 +0100
+
 sweethome3d-furniture-editor (1.23-1) unstable; urgency=medium
 
   * New upstream version 1.23.

debian/control

@@ -12,10 +12,10 @@ Build-Depends:
  imagemagick,
  sweethome3d (>= 5.7),
  unzip
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Homepage: http://www.sweethome3d.com
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/sweethome3d-furniture-editor.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/sweethome3d-furniture-editor.git
+Vcs-Git: https://salsa.debian.org/java-team/sweethome3d-furniture-editor.git
+Vcs-Browser: https://salsa.debian.org/java-team/sweethome3d-furniture-editor
 
 Package: sweethome3d-furniture-editor
 Architecture: all

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: Sweet Home 3D Furniture Library Editor
 Source: http://www.sweethome3d.com
 
 Files: *
-Copyright: 2010-2018, Emmanuel Puybaret, eTeks <info@eteks.com>
+Copyright: 2010-2019, Emmanuel Puybaret, eTeks <info@eteks.com>
 License: GPL-2+
 
 Files: src/com/eteks/sweethome3d/swing/resources/icons/tango/*
@@ -16,7 +16,7 @@ License: public-domain
 
 Files: debian/*
 Copyright: 2012,      Gabriele Giacone <1o5g4r8o@gmail.com>
-           2016-2018, Markus Koschany <apo@debian.org>
+           2016-2019, Markus Koschany <apo@debian.org>
 License: GPL-2+
 
 License: GPL-2+

src/com/eteks/furniturelibraryeditor/swing/EditorPane.java

@@ -51,6 +51,7 @@ import com.eteks.sweethome3d.model.SelectionListener;
 import com.eteks.sweethome3d.model.UserPreferences;
 import com.eteks.sweethome3d.swing.ControllerAction;
 import com.eteks.sweethome3d.swing.ResourceAction;
+import com.eteks.sweethome3d.swing.SwingTools;
 import com.eteks.sweethome3d.swing.UnfocusableToolBar;
 import com.eteks.sweethome3d.tools.OperatingSystem;
 import com.eteks.sweethome3d.viewcontroller.HomeView.SaveAnswer;
@@ -260,6 +261,9 @@ public class EditorPane extends JRootPane implements EditorView {
     JEditorPane messagePane = new JEditorPane("text/html", message);
     messagePane.setOpaque(false);
     messagePane.setEditable(false);
+    if (SwingTools.getResolutionScale() != 1) {
+      messagePane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);
+    }
     String title = this.preferences.getLocalizedString(EditorPane.class, "about.title");
     Icon   icon  = new ImageIcon(EditorPane.class.getResource(
         this.preferences.getLocalizedString(EditorPane.class, "about.icon")));

src/com/eteks/furniturelibraryeditor/swing/FurnitureLibraryTable.java

@@ -75,6 +75,7 @@ import com.eteks.sweethome3d.model.SelectionListener;
 import com.eteks.sweethome3d.model.UserPreferences;
 import com.eteks.sweethome3d.swing.CatalogItemToolTip;
 import com.eteks.sweethome3d.swing.IconManager;
+import com.eteks.sweethome3d.swing.SwingTools;
 import com.eteks.sweethome3d.viewcontroller.View;
 
 /**
@@ -92,6 +93,11 @@ public class FurnitureLibraryTable extends JTable implements View {
     super(new FurnitureLibraryTableModel(furnitureLibrary, furnitureLanguageController),
         new FurnitureLibraryTableColumnModel(furnitureLibrary, preferences, furnitureLanguageController));
     this.toolTip = new CatalogItemToolTip(CatalogItemToolTip.DisplayedInformation.ICON, preferences);
+    float resolutionScale = SwingTools.getResolutionScale();
+    if (resolutionScale != 1) {
+      // Adapt row height to specified resolution scale
+      setRowHeight(Math.round(getRowHeight() * resolutionScale));
+    }
     addTableHeaderListener();
     setAutoResizeMode(AUTO_RESIZE_OFF);
     updateTableColumnsWidth();

src/com/eteks/furniturelibraryeditor/swing/FurnitureLibraryUserPreferencesPanel.java

@@ -223,8 +223,9 @@ public class FurnitureLibraryUserPreferencesPanel extends UserPreferencesPanel {
     int labelAlignment = OperatingSystem.isMacOSX()
         ? GridBagConstraints.LINE_END
         : GridBagConstraints.LINE_START;
-    Insets labelInsets = new Insets(0, 0, 5, 5);
-    Insets componentInsets = new Insets(0, 0, 5, 0);
+    int gap = Math.round(5 * SwingTools.getResolutionScale());
+    Insets labelInsets = new Insets(0, 0, gap, gap);
+    Insets componentInsets = new Insets(0, 0, gap, 0);
     if (this.defaultCreatorLabel != null) {
       add(this.defaultCreatorLabel, new GridBagConstraints(
           0, 100, 1, 1, 0, 0, labelAlignment,
@@ -252,7 +253,7 @@ public class FurnitureLibraryUserPreferencesPanel extends UserPreferencesPanel {
     if (this.furnitureResourcesRemoteUrlBaseLabel != null) {
       add(this.furnitureResourcesRemoteUrlBaseLabel, new GridBagConstraints(
           0, 103, 1, 1, 0, 0, labelAlignment,
-          GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0));
+          GridBagConstraints.NONE, new Insets(0, 0, 0, gap), 0, 0));
       add(this.furnitureResourcesRemoteUrlBaseTextField, new GridBagConstraints(
           1, 103, 2, 1, 0, 0, GridBagConstraints.LINE_START,
           GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));

src/com/eteks/furniturelibraryeditor/swing/FurniturePanel.java

@@ -1360,8 +1360,9 @@ public class FurniturePanel extends JPanel implements DialogView {
     int labelAlignment = OperatingSystem.isMacOSX()
         ? GridBagConstraints.LINE_END
         : GridBagConstraints.LINE_START;
-    Insets labelInsets = new Insets(0, 0, 5, 5);
-    Insets componentInsets = new Insets(0, 0, 5, 0);
+    int gap = Math.round(5 * SwingTools.getResolutionScale());
+    Insets labelInsets = new Insets(0, 0, gap, gap);
+    Insets componentInsets = new Insets(0, 0, gap, 0);
     if (this.controller.isPropertyEditable(FurnitureController.Property.ICON)) {
       JPanel iconPanel = new JPanel(new GridBagLayout());
       // Add dummy labels with a vertical weight of 1 at top and bottom of iconPanel
@@ -1375,11 +1376,11 @@ public class FurniturePanel extends JPanel implements DialogView {
       if (this.controller.isPropertyEditable(FurnitureController.Property.MODEL)) {
         iconPanel.add(this.changeModelButton, new GridBagConstraints(
             0, 1, 1, 1, 0, 0, GridBagConstraints.CENTER,
-            GridBagConstraints.NONE, new Insets(0, 0, 5, 0), 0, 0));
+            GridBagConstraints.NONE, new Insets(0, 0, gap, 0), 0, 0));
       }
       iconPanel.add(this.iconComponent, new GridBagConstraints(
           0, 2, 1, 1, 0, 0, GridBagConstraints.CENTER,
-          GridBagConstraints.NONE, new Insets(0, 0, 5, 0), 0, 0));
+          GridBagConstraints.NONE, new Insets(0, 0, gap, 0), 0, 0));
       if (this.controller.isPropertyEditable(FurnitureController.Property.MODEL_ROTATION)) {
         JPanel rotationButtonsPanel = new JPanel(new GridBagLayout()) {
             @Override
@@ -1409,7 +1410,7 @@ public class FurniturePanel extends JPanel implements DialogView {
 
       add(iconPanel, new GridBagConstraints(
           0, 0, 1, 16, 0, 0, GridBagConstraints.CENTER,
-          GridBagConstraints.BOTH, new Insets(0, 0, 0, 15), 0, 0));
+          GridBagConstraints.BOTH, new Insets(0, 0, 0, 3 * gap), 0, 0));
     }
     if (this.controller.isPropertyEditable(FurnitureController.Property.ID)) {
       add(this.idLabel, new GridBagConstraints(
@@ -1457,7 +1458,7 @@ public class FurniturePanel extends JPanel implements DialogView {
           GridBagConstraints.NONE, labelInsets, 0, 0));
       add(this.creatorTextField, new GridBagConstraints(
           2, 5, 1, 1, 0, 0, GridBagConstraints.LINE_START,
-          GridBagConstraints.HORIZONTAL, new Insets(0, 0, 5, 10), 0, 0));
+          GridBagConstraints.HORIZONTAL, new Insets(0, 0, gap, 2 * gap), 0, 0));
     }
     if (this.controller.isPropertyEditable(FurnitureController.Property.CATEGORY)) {
       add(this.categoryLabel, new GridBagConstraints(
@@ -1473,7 +1474,7 @@ public class FurniturePanel extends JPanel implements DialogView {
           GridBagConstraints.NONE, labelInsets, 0, 0));
       add(this.creationDateSpinner, new GridBagConstraints(
           2, 6, 1, 1, 0, 0, GridBagConstraints.LINE_START,
-          GridBagConstraints.HORIZONTAL, new Insets(0, 0, 5, 10), 0, 0));
+          GridBagConstraints.HORIZONTAL, new Insets(0, 0, gap, 2 * gap), 0, 0));
     }
     if (this.controller.isPropertyEditable(FurnitureController.Property.GRADE)) {
       add(this.gradeLabel, new GridBagConstraints(
@@ -1489,7 +1490,7 @@ public class FurniturePanel extends JPanel implements DialogView {
           GridBagConstraints.NONE, labelInsets, 0, 0));
       add(this.priceSpinner, new GridBagConstraints(
           2, 7, 1, 1, 0, 0, GridBagConstraints.LINE_START,
-          GridBagConstraints.HORIZONTAL, new Insets(0, 0, 5, 10), -10, 0));
+          GridBagConstraints.HORIZONTAL, new Insets(0, 0, gap, 2 * gap), -10, 0));
     }
     if (this.controller.isPropertyEditable(FurnitureController.Property.VALUE_ADDED_TAX_PERCENTAGE)) {
       add(this.valueAddedTaxPercentageLabel, new GridBagConstraints(
@@ -1505,7 +1506,7 @@ public class FurniturePanel extends JPanel implements DialogView {
           GridBagConstraints.NONE, labelInsets, 0, 0));
       add(this.widthSpinner, new GridBagConstraints(
           2, 8, 1, 1, 0, 0, GridBagConstraints.LINE_START,
-          GridBagConstraints.HORIZONTAL, new Insets(0, 0, 5, 10), -10, 0));
+          GridBagConstraints.HORIZONTAL, new Insets(0, 0, gap, 2 * gap), -10, 0));
     }
     if (this.controller.isPropertyEditable(FurnitureController.Property.DEPTH)) {
       add(this.depthLabel, new GridBagConstraints(
@@ -1521,7 +1522,7 @@ public class FurniturePanel extends JPanel implements DialogView {
           GridBagConstraints.NONE, labelInsets, 0, 0));
       add(this.heightSpinner, new GridBagConstraints(
           2, 9, 1, 1, 0, 0, GridBagConstraints.LINE_START,
-          GridBagConstraints.HORIZONTAL, new Insets(0, 0, 5, 10), -10, 0));
+          GridBagConstraints.HORIZONTAL, new Insets(0, 0, gap, 2 * gap), -10, 0));
     }
     if (this.controller.isPropertyEditable(FurnitureController.Property.ELEVATION)) {
       add(this.elevationLabel, new GridBagConstraints(
@@ -1555,7 +1556,7 @@ public class FurniturePanel extends JPanel implements DialogView {
       if (this.controller.isPropertyEditable(FurnitureController.Property.DOOR_OR_WINDOW_CUT_OUT_SHAPE)) {
         add(this.doorOrWindowCustomizedCutOutShapeCheckBox, new GridBagConstraints(
             2, 12, 2, 1, 0, 0, labelAlignment,
-            GridBagConstraints.NONE, OperatingSystem.isMacOSX() ? new Insets(0, 0, 5, 0) : labelInsets, 0, 0));
+            GridBagConstraints.NONE, OperatingSystem.isMacOSX() ? new Insets(0, 0, gap, 0) : labelInsets, 0, 0));
         add(this.doorOrWindowCustomizedCutOutShapeTextField, new GridBagConstraints(
             4, 12, 1, 1, 0, 0, GridBagConstraints.LINE_START,
             GridBagConstraints.HORIZONTAL, componentInsets, 0, 0));

src/com/eteks/furniturelibraryeditor/swing/package.properties

@@ -119,10 +119,10 @@ EditorPane.about.message=<html><font face="sanssherif"><center><font size="+2"><
     <br><font size="-1">SVG path compilation provided by Batik</font>\
     <p>Please, visit http://www.sweethome3d.com/\
     <br>for software updates and bug report.\
-    </p><p><font size="-2">\u00a9 Copyrights 2010-2018 eTeks  info@eteks.com\
+    </p><p><font size="-2">\u00a9 Copyrights 2010-2019 eTeks  info@eteks.com\
     <br>Distributed under GNU General Public License</font>
 # Note to translators: dot not copy the 2 following keys in localized file
-EditorPane.about.version=1.23
+EditorPane.about.version=1.24
 EditorPane.about.icon=/com/eteks/furniturelibraryeditor/swing/resources/aboutIcon.png
 
 

src/com/eteks/furniturelibraryeditor/swing/package_fr.properties

@@ -79,7 +79,7 @@ EditorPane.about.message=<html><font face="sanssherif"><center><font size="+2"><
     <br><font size="-1">Compilation SVG path fournie par Batik</font>\
     <p>Rendez-vous sur http://www.sweethome3d.com/fr/\
     <br>pour mettre  jour ce logiciel ou faire des suggestions.\
-    </p><p><font size="-2">\u00a9 Copyrights 2010-2018 eTeks  info@eteks.com\
+    </p><p><font size="-2">\u00a9 Copyrights 2010-2019 eTeks  info@eteks.com\
     <br>Distribu sous licence GNU General Public License</font>
 
 FurnitureLanguageComboBox.defaultLanguage=Langue par dfaut