[brailleblaster] [brailleblaster.newdesign] push by brandon....@xxxxxxxxx - Changed how font width is calculated on 2013-07-23 15:41 GMT
- From: brailleblaster@xxxxxxxxxxxxxx
- To: brailleblaster@xxxxxxxxxxxxx
- Date: Tue, 23 Jul 2013 15:41:29 +0000
Revision: e4a2de727b74
Branch: default
Author: Brandon Roller <brandon.r.roller@xxxxxxxxx>
Date: Tue Jul 23 08:38:11 2013
Log: Changed how font width is calculated
http://code.google.com/p/brailleblaster/source/detail?r=e4a2de727b74&repo=newdesign
Modified:
/src/main/org/brailleblaster/views/TextView.java
/src/main/org/brailleblaster/wordprocessor/BBToolBar.java
/src/main/org/brailleblaster/wordprocessor/DocumentManager.java
/src/main/org/brailleblaster/wordprocessor/FontManager.java
=======================================
--- /src/main/org/brailleblaster/views/TextView.java Wed Jul 17 12:21:04
2013
+++ /src/main/org/brailleblaster/views/TextView.java Tue Jul 23 08:38:11
2013
@@ -191,7 +191,7 @@
if(oldCursorPosition == -1 && positionFromStart
== 0){
view.setCaretOffset((Integer)message.getValue("start"));
}
-
+
sendStatusBarUpdate(dm);
}
@@ -424,7 +424,6 @@
String reformattedText;
int pos = view.getCaretOffset();
setListenerLock(true);
-
int indent =
view.getLineIndent(view.getLineAtOffset(currentStart));
StyleRange range = getStyleRange();
if(!n.getValue().equals(""))
=======================================
--- /src/main/org/brailleblaster/wordprocessor/BBToolBar.java Mon Jul 15
07:48:47 2013
+++ /src/main/org/brailleblaster/wordprocessor/BBToolBar.java Tue Jul 23
08:38:11 2013
@@ -181,7 +181,6 @@
checkBrailleItem = new Button(shell, SWT.CHECK);
checkBrailleItem.setLayoutData(bloc);
checkBrailleItem.setText(lh.localValue("viewBraille"));
- checkBrailleItem.setEnabled(false);
checkBrailleItem.pack();
checkBrailleItem.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
=======================================
--- /src/main/org/brailleblaster/wordprocessor/DocumentManager.java Mon Jul
22 09:17:20 2013
+++ /src/main/org/brailleblaster/wordprocessor/DocumentManager.java Tue Jul
23 08:38:11 2013
@@ -118,6 +118,7 @@
this.item.setControl(this.group);
initializeDocumentTab();
this.document = new BBDocument(this);
+ FontManager.setFontWidth(this);
logger = BBIni.getLogger();
@@ -635,7 +636,6 @@
if(this.text.view.isFocusControl()){
currentOffset = this.text.view.getCaretOffset();
resetViews();
- initializeDocumentTab();
if(currentOffset <
this.text.view.getCharCount()){
this.text.view.setCaretOffset(currentOffset);
@@ -650,7 +650,6 @@
else if(this.braille.view.isFocusControl()){
currentOffset =
this.braille.view.getCaretOffset();
resetViews();
- initializeDocumentTab();
this.braille.view.setCaretOffset(currentOffset);
setCurrentOnRefresh("braille",currentOffset);
@@ -664,17 +663,14 @@
currentOffset = list.getCurrent().start;
resetViews();
- initializeDocumentTab();
setCurrentOnRefresh(null, currentOffset);
this.text.view.setCaretOffset(currentOffset);
this.text.setPositionFromStart();
}
else {
- currentOffset = this.text.view.getCaretOffset();
-
+ currentOffset = this.text.view.getCaretOffset();
resetViews();
- initializeDocumentTab();
setCurrentOnRefresh(null,currentOffset);
this.text.view.setCaretOffset(currentOffset);
@@ -696,6 +692,7 @@
this.braille.resetView(this.group);
this.treeView.removeListeners();
this.treeView.resetView(this.group);
+ initializeDocumentTab();
this.text.words = 0;
updateTempFile();
this.document.deleteDOM();
@@ -777,4 +774,8 @@
public Display getDisplay(){
return this.wp.getShell().getDisplay();
}
+
+ public WPManager getWPManager(){
+ return this.wp;
+ }
}
=======================================
--- /src/main/org/brailleblaster/wordprocessor/FontManager.java Mon Jul 15
07:48:47 2013
+++ /src/main/org/brailleblaster/wordprocessor/FontManager.java Tue Jul 23
08:38:11 2013
@@ -56,6 +56,20 @@
static Logger logger = BBIni.getLogger();
static boolean displayBrailleFont = false;
+ public static void setFontWidth(DocumentManager dm){
+ dm.text.setcharWidth();
+ if(SimBraille){
+ simBrailleFont = new Font(WPManager.getDisplay(), "SimBraille",
brailleFontHeight, SWT.NORMAL);
+ dm.braille.view.setFont(simBrailleFont);
+ dm.braille.setcharWidth();
+
+ dm.braille.view.setFont(daisyFont);
+ }
+ else {
+ dm.braille.setcharWidth();
+ }
+ }
+
public static void setShellFonts(Shell shell, DocumentManager dm){
FontData[] fd = shell.getDisplay().getFontList(null, true);
String fileSep = BBIni.getFileSep();
@@ -94,17 +108,18 @@
daisyFont = new Font(shell.getDisplay(), altFont, daisyFontHeight,
SWT.NORMAL);
}
-
dm.text.view.setFont(daisyFont);
- dm.text.setcharWidth();
- dm.braille.setcharWidth();
- dm.braille.view.setFont(daisyFont);
+ if(SimBraille && displayBrailleFont) {
+ setBrailleFont(dm.getWPManager(), dm, true);
+ }
+ else {
+ dm.braille.view.setFont(daisyFont);
+ }
dm.braille.view.setEditable(false);
String loc = lh.getLocale().toString();
if (!loc.contentEquals(lh.localValue("localeResource"))) {
logger.log(Level.WARNING, "Locale resource for " + loc + " not found.
Using default.");
- // System.err.println("Locale resource for '" +
lh.getLocale().getDisplayName() + "' not found. Using default.");
// new Notify("Locale resource for '" + lh.getLocale().getDisplayName()
+ "' not found.");
}
}
@@ -163,20 +178,18 @@
private static void setBrailleFont(WPManager wp, DocumentManager dm,
boolean toggle) {
if (toggle && SimBraille) {
- simBrailleFont = new Font(WPManager.getDisplay(),
- "SimBraille", brailleFontHeight,
SWT.NORMAL);
+ // simBrailleFont = new Font(WPManager.getDisplay(), "SimBraille",
brailleFontHeight, SWT.NORMAL);
dm.braille.view.setFont(simBrailleFont);
dm.simBrailleDisplayed = true;
}
else {
- if (Courier) {
- simBrailleFont = new
Font(WPManager.getDisplay(),
- courierFont, daisyFontHeight,
SWT.NORMAL);
- } else {
- simBrailleFont = new
Font(WPManager.getDisplay(), altFont,
- daisyFontHeight, SWT.NORMAL);
- }
- dm.braille.view.setFont(simBrailleFont);
+ // if (Courier) {
+ // simBrailleFont = new Font(WPManager.getDisplay(),courierFont,
daisyFontHeight, SWT.NORMAL);
+ // }
+ // else {
+ // simBrailleFont = new Font(WPManager.getDisplay(), altFont,
daisyFontHeight, SWT.NORMAL);
+ // }
+ dm.braille.view.setFont(daisyFont);
dm.simBrailleDisplayed = false;
}
}
Other related posts:
- » [brailleblaster] [brailleblaster.newdesign] push by brandon....@xxxxxxxxx - Changed how font width is calculated on 2013-07-23 15:41 GMT - brailleblaster
