[brailleblaster] push by rebecca....@xxxxxxxxx - cellsLines initial margins settings changed on 2014-12-30 16:08 GMT

  • From: brailleblaster@xxxxxxxxxxxxxx
  • To: brailleblaster@xxxxxxxxxxxxx
  • Date: Tue, 30 Dec 2014 16:08:33 +0000

Revision: 916800a412d9
Branch:   rt1738
Author:   Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date:     Tue Dec 30 16:07:33 2014 UTC
Log:      cellsLines initial margins settings changed
https://code.google.com/p/brailleblaster/source/detail?r=916800a412d9

Modified:
 /src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java

=======================================
--- /src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java Tue Dec 30 15:35:55 2014 UTC +++ /src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java Tue Dec 30 16:07:33 2014 UTC
@@ -157,7 +157,7 @@
                marginTopBox = new Text(marginGroup, SWT.BORDER);
                addDoubleListener(marginTopBox);
                setGridData(marginTopBox);
-               setValue(marginTopBox, "topMargin");
+               setValueForMargins(marginTopBox, "topMargin");
                addMarginListener(marginTopBox, "topMargin");

                marginBottomLabel = new Label(marginGroup, 0);
@@ -165,7 +165,7 @@
                marginBottomBox = new Text(marginGroup, SWT.BORDER);
                addDoubleListener(marginBottomBox);
                setGridData(marginBottomBox);
-               setValue(marginBottomBox, "bottomMargin");
+               setValueForMargins(marginBottomBox, "bottomMargin");
                addMarginListener(marginBottomBox, "bottomMargin");

                marginLeftLabel= new Label(marginGroup, 0);
@@ -173,7 +173,7 @@
                marginLeftBox = new Text(marginGroup, SWT.BORDER);
                addDoubleListener(marginLeftBox);
                setGridData(marginLeftBox);
-               setValue(marginLeftBox, "leftMargin");
+               setValueForMargins(marginLeftBox, "leftMargin");
                addMarginListener(marginLeftBox, "leftMargin");

                marginRightLabel = new Label(marginGroup, 0);
@@ -181,7 +181,7 @@
                marginRightBox = new Text(marginGroup, SWT.BORDER);
                addDoubleListener(marginRightBox);
                setGridData(marginRightBox);
-               setValue(marginRightBox, "rightMargin");
+               setValueForMargins(marginRightBox, "rightMargin");
                addMarginListener(marginRightBox, "rightMargin");

                Control [] tabList = {sizeGroup, marginGroup, unitsGroup};
@@ -515,6 +515,23 @@
                if(settingsMap.containsKey(key))
                        text.setText(settingsMap.get(key));
        }
+
+       private void setValueForMargins (Text text, String key) {
+               if (regionalButton.getSelection()) {
+                       if(settingsMap.containsKey(key))
+                               text.setText(settingsMap.get(key));
+               }
+               else {
+                       if(key.equals("leftMargin")||key.equals("rightMargin")) 
{
+                               if(settingsMap.containsKey(key))
+ text.setText(String.valueOf(calculateCellsPerInch(Double.valueOf(settingsMap.get(key)))));
+                       }
+                       else {
+                               if(settingsMap.containsKey(key))
+ text.setText(String.valueOf(calculateLinesPerInch(Double.valueOf(settingsMap.get(key)))));
+                       }
+               }
+       }

        private void setDefault(){
if(settingsMap.containsKey("paperWidth") && settingsMap.containsKey("paperHeight")){

Other related posts:

  • » [brailleblaster] push by rebecca....@xxxxxxxxx - cellsLines initial margins settings changed on 2014-12-30 16:08 GMT - brailleblaster