[brailleblaster] push by rebecca....@xxxxxxxxx - cellsLines margins updated on 2014-12-30 15:36 GMT

  • From: brailleblaster@xxxxxxxxxxxxxx
  • To: brailleblaster@xxxxxxxxxxxxx
  • Date: Tue, 30 Dec 2014 15:36:36 +0000

Revision: 5d43a027072e
Branch:   rt1738
Author:   Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date:     Tue Dec 30 15:35:55 2014 UTC
Log:      cellsLines margins updated
https://code.google.com/p/brailleblaster/source/detail?r=5d43a027072e

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

=======================================
--- /src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java Mon Dec 29 20:47:59 2014 UTC +++ /src/main/org/brailleblaster/settings/ui/PagePropertiesTab.java Tue Dec 30 15:35:55 2014 UTC 
@@ -9,8 +9,6 @@
 import java.util.Map.Entry;
 import java.util.Properties;

-import javax.swing.ButtonModel;
-
 import org.brailleblaster.BBIni;
 import org.brailleblaster.localization.LocaleHandler;
 import org.brailleblaster.settings.SettingsManager;
@@ -242,9 +240,17 @@
                                                                }
                                                        }
                                                                else {
+                                                                       if 
(regionalButton.getSelection()) {
                                                                        
settingsMap.put(type,getStringValue(t));
cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(widthBox.getText())))); linesBox.setText(String.valueOf(calculateLinesPerPage(Double.valueOf(heightBox.getText())))); 
+                                                                       }
+                                                                       else {
+                                                                               
settingsMap.put(type,
+ String.valueOf(df.format(calcWidthFromCells(Integer.valueOf((getStringValue(t))))))); + cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(widthBox.getText())))); + linesBox.setText(String.valueOf(calculateLinesPerPage(Double.valueOf(heightBox.getText())))); 
+                                                                       }
                                                                }
                                                }

@@ -277,9 +283,17 @@
                                                                }
                                                        }
                                                        else {
+                                                               
if(regionalButton.getSelection()) {
                                                                
settingsMap.put(type,getStringValue(t));
cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(widthBox.getText())))); linesBox.setText(String.valueOf(calculateLinesPerPage(Double.valueOf(heightBox.getText())))); 
+                                                               }
+                                                               else {
+                                                                       
settingsMap.put(type,
+ String.valueOf(df.format(sm.calcHeightFromLines(Integer.valueOf((getStringValue(t))))))); + cellsBox.setText(String.valueOf(calculateCellsPerLine(Double.valueOf(widthBox.getText())))); + linesBox.setText(String.valueOf(calculateLinesPerPage(Double.valueOf(heightBox.getText())))); 
+                                                               }
                                                        }
                                                }
                                                }

Other related posts:

  • » [brailleblaster] push by rebecca....@xxxxxxxxx - cellsLines margins updated on 2014-12-30 15:36 GMT - brailleblaster
  1. Home
  2. brailleblaster
  3. Archive
  4. 12-2014