[ jEdit-commits ] SF.net SVN: jedit:[24696] jEdit/trunk/org/gjt/sp/jedit/print/ PrinterDialog.java

[<dal...@us...>]

Revision: 24696
          http://sourceforge.net/p/jedit/svn/24696
Author:   daleanson
Date:     2017-06-05 17:36:46 +0000 (Mon, 05 Jun 2017)
Log Message:
-----------
Fixed default metric margin values.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java

Modified: jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-04 20:51:19 UTC (rev 24695)
+++ jEdit/trunk/org/gjt/sp/jedit/print/PrinterDialog.java	2017-06-05 17:36:46 UTC (rev 24696)
@@ -47,9 +47,8 @@
 import org.gjt.sp.jedit.gui.VariableGridLayout;
 import org.gjt.sp.jedit.jEdit;
 import org.gjt.sp.util.GenericGUIUtilities;
+import org.gjt.sp.util.Log;
 
-
-// import org.gjt.sp.util.Log;
 // Technical guide on the Java printing system:
 // https://docs.oracle.com/javase/7/docs/technotes/guides/jps/spec/JPSTOC.fm.html
 public class PrinterDialog extends JDialog implements ListSelectionListener
@@ -1064,10 +1063,10 @@
             JPanel marginPanel = new JPanel( new VariableGridLayout( VariableGridLayout.FIXED_NUM_COLUMNS, 2, 6, 6 ) );
             marginPanel.setBorder( BorderFactory.createCompoundBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), jEdit.getProperty( "print.dialog.Margins", "Margins" ) ), BorderFactory.createEmptyBorder( 11, 11, 11, 11 ) ) );
             boolean unitIsMM = getUnits() == MediaPrintableArea.MM;
-            String topMargin = jEdit.getProperty("print.topMargin", unitIsMM ? "2.5" : "1.0");
-            String leftMargin = jEdit.getProperty("print.leftMargin", unitIsMM ? "2.5" : "1.0");
-            String rightMargin = jEdit.getProperty("print.rightMargin", unitIsMM ? "2.5" : "1.0");
-            String bottomMargin = jEdit.getProperty("print.bottomMargin", unitIsMM ? "2.5" : "1.0");
+            String topMargin = jEdit.getProperty("print.topMargin", unitIsMM ? "25" : "1.0");
+            String leftMargin = jEdit.getProperty("print.leftMargin", unitIsMM ? "25" : "1.0");
+            String rightMargin = jEdit.getProperty("print.rightMargin", unitIsMM ? "25" : "1.0");
+            String bottomMargin = jEdit.getProperty("print.bottomMargin", unitIsMM ? "25" : "1.0");
             topMarginField = new NumericTextField( topMargin, true, unitIsMM );
             leftMarginField = new NumericTextField( leftMargin, true, unitIsMM );
             rightMarginField = new NumericTextField( rightMargin, true, unitIsMM );
@@ -1465,7 +1464,7 @@
             OrientationRequested orientationRequested = ( OrientationRequested )orientation.getSelectedItem();
             rotateMargins( topMargin, leftMargin, rightMargin, bottomMargin, orientationRequested );
 
-            // Log.log( Log.DEBUG, this, "getMinimumMargins returning " + topMargin + ", " + leftMargin + ", " + rightMargin + ", " + bottomMargin);
+            Log.log( Log.DEBUG, this, "getMinimumMargins returning " + topMargin + ", " + leftMargin + ", " + rightMargin + ", " + bottomMargin);
             return new float[] {topMargin, leftMargin, rightMargin, bottomMargin};
         }
 
@@ -1508,7 +1507,7 @@
             OrientationRequested orientationRequested = ( OrientationRequested )orientation.getSelectedItem();
             rotateMargins( topMargin, leftMargin, rightMargin, bottomMargin, orientationRequested );
 
-            // Log.log( Log.DEBUG, this, "getMinimumMargins returning " + topMargin + ", " + leftMargin + ", " + rightMargin + ", " + bottomMargin);
+            Log.log( Log.DEBUG, this, "getMinimumMargins returning " + topMargin + ", " + leftMargin + ", " + rightMargin + ", " + bottomMargin);
             return new float[] {topMargin, leftMargin, rightMargin, bottomMargin};
         }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.