From 11ad1ee62e70eeac5e2a221f071f7ae6c8666f63 Mon Sep 17 00:00:00 2001 From: furmada Date: Sun, 4 Dec 2016 12:03:53 -0800 Subject: [PATCH] Freetype support in Keyboard Also updated gitignore for .ds files. --- .gitignore | 1 + pyos.py | 11 +++++++---- res/dev-appdb-tool.ds | 1 - res/dev-hub.ds | 1 - res/gallery.ds | 1 - res/pman.ds | 1 - res/todo.ds | 1 - 7 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 res/dev-appdb-tool.ds delete mode 100644 res/dev-hub.ds delete mode 100644 res/gallery.ds delete mode 100644 res/pman.ds delete mode 100644 res/todo.ds diff --git a/.gitignore b/.gitignore index f212ef8..f0deacf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ docs/donau.ogg .settings/ .project .pydevproject +*.ds diff --git a/pyos.py b/pyos.py index 7e65965..b1d9585 100644 --- a/pyos.py +++ b/pyos.py @@ -1803,7 +1803,8 @@ def __init__(self, textEntryField=None): self.baseContainer.setPosition((0, 2*(state.getGUI().height/3))) self.keyWidth = self.baseContainer.computedWidth / 10 self.keyHeight = self.baseContainer.computedHeight / 4 - if state.getTypingFont().freetype: + use_ft = state.getTypingFont().freetype != False + if use_ft: self.shift_sym = u"\u21E7" self.enter_sym = u"\u23CE" self.bkspc_sym = u"\u232B" @@ -1833,18 +1834,20 @@ def __init__(self, textEntryField=None): button = GUI.KeyboardButton((sym * self.keyWidth, row * self.keyHeight), "", self.keys2[row][sym], onClick=self.insertChar, onClickData=(self.keys1[row][sym],), onLongClick=self.insertChar, onLongClickData=(self.keys2[row][sym],), - width=self.keyWidth*5, height=self.keyHeight) + width=self.keyWidth*5, height=self.keyHeight, freetype=use_ft) else: if symbol == self.shift_sym or symbol == self.enter_sym or symbol == self.bkspc_sym or symbol == self.delet_sym: button = GUI.KeyboardButton((sym * self.keyWidth, row * self.keyHeight), self.keys1[row][sym], self.keys2[row][sym], onClick=self.insertChar, onClickData=(self.keys1[row][sym],), onLongClick=self.insertChar, onLongClickData=(self.keys2[row][sym],), - width=self.keyWidth, height=self.keyHeight, border=1, borderColor=state.getColorPalette().getColor("accent")) + width=self.keyWidth, height=self.keyHeight, border=1, borderColor=state.getColorPalette().getColor("accent"), + freetype=use_ft) else: button = GUI.KeyboardButton((sym * self.keyWidth, row * self.keyHeight), self.keys1[row][sym], self.keys2[row][sym], onClick=self.insertChar, onClickData=(self.keys1[row][sym],), onLongClick=self.insertChar, onLongClickData=(self.keys2[row][sym],), - width=self.keyWidth, height=self.keyHeight) + width=self.keyWidth, height=self.keyHeight, + freetype=use_ft) self.baseContainer.addChild(button) sym += 1 row += 1 diff --git a/res/dev-appdb-tool.ds b/res/dev-appdb-tool.ds deleted file mode 100644 index 729e4c3..0000000 --- a/res/dev-appdb-tool.ds +++ /dev/null @@ -1 +0,0 @@ -{"repo": "C:/Users/Adam/Documents/GitHub/PythonOSApps", "dsApp": "dev-appdb-tool"} \ No newline at end of file diff --git a/res/dev-hub.ds b/res/dev-hub.ds deleted file mode 100644 index 35273e2..0000000 --- a/res/dev-hub.ds +++ /dev/null @@ -1 +0,0 @@ -{"dsApp": "dev-hub"} \ No newline at end of file diff --git a/res/gallery.ds b/res/gallery.ds deleted file mode 100644 index 3767c14..0000000 --- a/res/gallery.ds +++ /dev/null @@ -1 +0,0 @@ -{"dsApp": "gallery", "path": "C:/Users/Adam/Documents/eclipsepy/pyos6/res/icons"} \ No newline at end of file diff --git a/res/pman.ds b/res/pman.ds deleted file mode 100644 index f97142d..0000000 --- a/res/pman.ds +++ /dev/null @@ -1 +0,0 @@ -{"dsApp": "pman", "featured": ["pman", "starforce", "wolfram-alpha"], "sel_size": "Normal", "lastUpdate": "Fri Dec 02 19:00:21 2016"} \ No newline at end of file diff --git a/res/todo.ds b/res/todo.ds deleted file mode 100644 index a322852..0000000 --- a/res/todo.ds +++ /dev/null @@ -1 +0,0 @@ -{"dsApp": "todo", "todos": []} \ No newline at end of file