Skip to content

Workaround for #1093 #1135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doutriaux1 merged 1 commit into from
Mar 24, 2015
Merged

Workaround for #1093 #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Packages/vcs/Lib/editors/font.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import vcs

class FontEditor(object):
def __init__(self, toolbar, font_setter, current_font="default"):

self.toolbar = toolbar
self.set_font = font_setter

self.fonts = sorted(vcs.elements["font"].keys())

self.font_button = self.toolbar.add_button(self.fonts, action=self.font_state)
self.font_button.set_state(self.fonts.index(current_font))

def font_state(self, state):
font = self.fonts[state]
self.set_font(font)
27 changes: 2 additions & 25 deletions Packages/vcs/Lib/editors/label.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import text
#import vtk
import vcs.vcs2vtk
from functools import partial
from font import FontEditor

__valign_map__ = {
0: 0,
Expand Down Expand Up @@ -63,27 +63,8 @@ def __init__(self, interactor, label, dp, configurator):
valign.set_state(__valign_map__[self.to.valign])

self.angle_button = self.toolbar.add_slider_button(self.to.angle, 0, 360, "Angle", update=self.update_angle)
self.fonts = sorted(vcs.elements["font"].keys())

font_toolbar = self.toolbar.add_toolbar("Fonts")

self.font_buttons = {}

def font_setter(font):
return partial(self.set_font, font)

deactivate = font_setter("default")

for ind, font in enumerate(self.fonts):

if font[:4] != "Math":
button = font_toolbar.add_toggle_button(font, on=font_setter(font), off=deactivate, font=vcs.elements["font"][font])
else:
button = font_toolbar.add_toggle_button(font, on=font_setter(font), off=deactivate)

if vcs.elements["fontNumber"][self.tt.font] == font:
button.set_state(1)
self.font_buttons[font] = button
font_editor = FontEditor(self.toolbar, self.set_font, vcs.elements["fontNumber"][self.tt.font])

self.picker = None
self.toolbar.add_button(["Change Color"], action=self.change_color)
Expand All @@ -105,11 +86,7 @@ def sync_actor(self):
vcs.vcs2vtk.prepTextProperty(p,winSize,to=self.to,tt=self.tt,cmap=None)

def set_font(self, font):
current_font = vcs.getfontname(self.tt.font)
if font != current_font:
self.font_buttons[current_font].set_state(0)
self.tt.font = font
self.font_buttons[font].set_state(1)
self.save()

def halign(self, state):
Expand Down
27 changes: 2 additions & 25 deletions Packages/vcs/Lib/editors/text.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import priority
import vcs
from vcs.vcs2vtk import genTextActor
from functools import partial
from font import FontEditor

__valign_map__ = {
0: 0,
Expand Down Expand Up @@ -47,27 +47,8 @@ def __init__(self, interactor, text, index, dp, configurator):
valign.set_state(__valign_map__[self.text.valign])

self.toolbar.add_slider_button(text.angle, 0, 360, "Angle", update=self.update_angle)
self.fonts = sorted(vcs.elements["font"].keys())

font_toolbar = self.toolbar.add_toolbar("Fonts")

self.font_buttons = {}

def font_setter(font):
return partial(self.set_font, font)

deactivate = font_setter("default")

for ind, font in enumerate(self.fonts):

if font[:4] != "Math":
button = font_toolbar.add_toggle_button(font, on=font_setter(font), off=deactivate, font=vcs.elements["font"][font])
else:
button = font_toolbar.add_toggle_button(font, on=font_setter(font), off=deactivate)

if vcs.elements["fontNumber"][self.text.font] == font:
button.set_state(1)
self.font_buttons[font] = button
font_editor = FontEditor(self.toolbar, self.set_font, vcs.elements["fontNumber"][self.text.font])

self.picker = None
self.toolbar.add_button(["Change Color"], action=self.change_color)
Expand All @@ -86,11 +67,7 @@ def font_setter(font):
self.update()

def set_font(self, font):
current_font = vcs.getfontname(self.text.font)
if font != current_font:
self.font_buttons[current_font].set_state(0)
self.text.font = font
self.font_buttons[font].set_state(1)
self.update()

def get_object(self):
Expand Down
⚡