Revision: b2ff785e8dc2 Branch: rt1986 Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Wed Feb 11 19:48:22 2015 UTC Log: options addes to page numbers tab https://code.google.com/p/brailleblaster/source/detail?r=b2ff785e8dc2 Modified: /src/main/org/brailleblaster/settings/ui/PageNumbersTab.java =======================================--- /src/main/org/brailleblaster/settings/ui/PageNumbersTab.java Mon Jan 12 13:08:30 2015 UTC +++ /src/main/org/brailleblaster/settings/ui/PageNumbersTab.java Wed Feb 11 19:48:22 2015 UTC
@@ -79,15 +79,23 @@ bpnLocLabel.setText("Braille Page Number Location"); setGridData(bpnLocLabel); bpnLocCombo = new Combo(bpnGroup, SWT.READ_ONLY); - bpnLocCombo.add("Top"); - bpnLocCombo.add("Bottom"); + bpnLocCombo.add("Top Left"); + bpnLocCombo.add("Bottom Left"); + bpnLocCombo.add("Top Right"); + bpnLocCombo.add("Bottom Right"); bpnLocCombo.add("None"); - if (settingsMap.get("braillePageNumberAt").equals("top")) { - bpnLocCombo.setText("Top"); + if (settingsMap.get("braillePageNumberAt").equals("Top Left")) { + bpnLocCombo.setText("Top Left"); + } + else if (settingsMap.get("braillePageNumberAt").equals("Bottom Left")){ + bpnLocCombo.setText("Bottom Left"); + } + else if (settingsMap.get("braillePageNumberAt").equals("Top Right")) { + bpnLocCombo.setText("Top Right"); } else { - bpnLocCombo.setText("Bottom"); + bpnLocCombo.setText("BottomRight"); } if (settingsMap.get("numberBraillePages").equals("no")) { @@ -106,15 +114,23 @@ ppnLocLabel.setText("Print Page Number Location"); setGridData(ppnLocLabel); ppnLocCombo = new Combo(ppnGroup, SWT.READ_ONLY); - ppnLocCombo.add("Top"); - ppnLocCombo.add("Bottom"); + ppnLocCombo.add("Top Left"); + ppnLocCombo.add("Bottom Left"); + ppnLocCombo.add("Top Right"); + ppnLocCombo.add("Bottom Right"); ppnLocCombo.add("None"); - if (settingsMap.get("printPageNumberAt").equals("top") ) { - ppnLocCombo.setText("Top"); + if (settingsMap.get("printPageNumberAt").equals("Top Left") ) { + ppnLocCombo.setText("Top Left"); + } + else if (settingsMap.get("printPageNumberAt").equals("Bottom Left")) { + ppnLocCombo.setText("Bottom Left"); + } + else if (settingsMap.get("printPageNumberAt").equals("Top Right")) { + ppnLocCombo.setText("Top Right"); } else { - ppnLocCombo.setText("Bottom"); + ppnLocCombo.setText("Bottom Right"); } if (settingsMap.get("printPages").equals("no")) { @@ -126,7 +142,7 @@ ///////////// ppnRngLabel = new Label(ppnGroup, 0); - ppnRngLabel.setText("Page Number Range"); + ppnRngLabel.setText("Continuation Symbols for Print Pages"); setGridData(ppnRngLabel); ppnRngCombo = new Combo(ppnGroup, SWT.READ_ONLY); ppnRngCombo.add("No"); @@ -164,12 +180,11 @@ ppnLocCombo.addSelectionListener(new SelectionAdapter(){ @Override public void widgetSelected(SelectionEvent e) { - int index = ppnLocCombo.getSelectionIndex(); if (ppnLocCombo.getText().equals("None")) { settingsMap.put("printPages", "no"); } else {- settingsMap.put("printPageNumberAt", ppnLocCombo.getText().toLowerCase());
+ settingsMap.put("printPageNumberAt", ppnLocCombo.getText()); settingsMap.put("printPages", "yes"); } } @@ -177,13 +192,12 @@ bpnLocCombo.addSelectionListener(new SelectionAdapter(){ @Override - public void widgetSelected(SelectionEvent e) { - int index = bpnLocCombo.getSelectionIndex(); + public void widgetSelected(SelectionEvent e) {; if (bpnLocCombo.getText().equals("None")) { settingsMap.put("numberBraillePages", "no"); } else {- settingsMap.put("braillePageNumberAt", bpnLocCombo.getText().toLowerCase());
+ settingsMap.put("braillePageNumberAt", bpnLocCombo.getText()); settingsMap.put("numberBraillePages", "yes"); } }