Skip to content

check if the fontWindow is not none #24

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

Open
typemytype wants to merge 1 commit into
base: master
Choose a base branch
from
Open

check if the fontWindow is not none #24

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
46 changes: 24 additions & 22 deletions lib/browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def extractUnicodesFromEncodingFile(path):
else:
print("GlyphBrowser: ENC importer: can't find a value for %s" % line)
return values

def extractUnicodesFromUFO(path):
f = RFont(path, showInterface=False)
values = []
Expand All @@ -193,7 +193,7 @@ def extractUnicodesFromUFO(path):
values.append(u)
f.close()
return values

def extractUnicodesFromOpenType(pathOrFile):
source = TTFont(pathOrFile)
cmap = source["cmap"]
Expand Down Expand Up @@ -223,7 +223,7 @@ def extractUnicodesFromOpenType(pathOrFile):
for uniValue, glyphName in table.cmap.items():
reversedMapping[glyphName] = uniValue
return reversedMapping

def unicodeToChar(uni):
import struct
if uni < 0xFFFF:
Expand Down Expand Up @@ -287,7 +287,7 @@ def callbackApplyAddGlyphsToTargetFont(self, sender=None):
self.w.markGlyphsCheck, self.w.selectGlyphsCheck
selection = []
newGlyphs = {}

targetFonts = []
if self.targetFonts is not None:
targetFonts = self.targetFonts
Expand Down Expand Up @@ -818,13 +818,13 @@ def __init__(self, data, unicodeVersionString, versionString, joiningTypes=None)
self.currentSelection = []
self._typing = False
self.unicodeVersion = unicodeVersionString


topRow = 80
catWidth = 320

self.w = vanilla.Window((1200, 500),
("GlyphBrowser with %s and %s"%(self.unicodeVersion, versionString)),
self.w = vanilla.Window((1200, 500),
("GlyphBrowser with %s and %s"%(self.unicodeVersion, versionString)),
minSize=(800, 500),
autosaveName = "com.letterror.glyphBrowser.mainWindow",
)
Expand Down Expand Up @@ -919,17 +919,17 @@ def __init__(self, data, unicodeVersionString, versionString, joiningTypes=None)
self.w.bind("close", self.windowClosing)
self.w.open()
self.w.catNames.setSelection([0])

def namesMenu_buildMenu(self, sender):
try:
items = []
sel = sender.getSelection()
allNames = []
for nameObj in self.currentSelection:
allNames += nameObj.getAllNames()
allNames += nameObj.getAllNames()
if len(sel) == 1 and len(self.currentSelection)>=1:
nameObj = self.currentSelection[0]
allNames += nameObj.getAllNames()
allNames += nameObj.getAllNames()
thisName = nameObj.getAllNames()[0]
items.append(dict(title=f"Edit {thisName}"))
items.append(dict(title=f"Lookup {nameObj.asU()}", callback = self.callbackLookup))
Expand Down Expand Up @@ -968,7 +968,7 @@ def namesMenu_buildMenu(self, sender):
except:
print("Error making Menu", traceback.format_exc())
return items

def callbackDropOnLocationList(self, sender, dropInfo):
# handle files droppings on the list
# this is how the drop info comes in
Expand All @@ -981,7 +981,7 @@ def callbackDropOnLocationList(self, sender, dropInfo):
# 'dropOnRow': False,
# 'isProposal': False
# }

# are we offered ,ufo files?
acceptedPaths = {}
values = []
Expand Down Expand Up @@ -1053,10 +1053,12 @@ def update(self):
#items = [dict(name=name) for name in self.catNames]
self.w.catNames.set(items)
self.checkSampleSize()

def windowClosing(self, sender):
# Reset the font window glyph collection query
CurrentFontWindow().getGlyphCollection().setQuery(None)
fontWindow = CurrentFontWindow()
if fontWindow is not None:
fontWindow.getGlyphCollection().setQuery(None)

def callbackLookup(self, sender=None):
lookupThese = []
Expand Down Expand Up @@ -1214,7 +1216,7 @@ def callbackCatNameSelect(self, sender):
query = "Unicode in {%s}"%",".join(selectedUniNumbers)
queryObj = NSPredicate.predicateWithFormat_(query)
CurrentFontWindow().getGlyphCollection().setQuery(queryObj)

# stuff to clipboard
def _toPasteBoard(self, text):
pb = NSPasteboard.generalPasteboard()
Expand All @@ -1235,10 +1237,10 @@ def menuCallbackCopyToUFO(self, item):
if os.path.basename(f.path) == ufoName:
self.callbackOpenGlyphSheet(targetFonts=[f])
break

def menuCallbackCopyHexUnicode(self, item):
self.copyNamesCallback(what="hexnumbers")

def menuCallbackCopyEscapedUnicode(self, item):
self.copyNamesCallback(what="escaped")

Expand All @@ -1247,16 +1249,16 @@ def menuCallbackCopyFeature(self, item):

def menuCallbackCopyNames(self, item):
self.copyNamesCallback(what="names")

def menuCallbackCopyStrings(self, item):
self.copyNamesCallback(what="comma")

def menuCallbackCopySlash(self, item):
self.copyNamesCallback(what="slash")

def menuCallbackCopyUnicodeText(self, item):
self.copyNamesCallback(what="unicode")

def copyNamesCallback(self, sender=None, what=None):
t = None
if what is not None:
Expand Down Expand Up @@ -1286,7 +1288,7 @@ def copyNamesCallback(self, sender=None, what=None):
elif t == "escaped":
copyable = unitext.encode('ascii', 'backslashreplace')
self._toPasteBoard(copyable)

def toSpaceCenter(self, sender):
# copy the current selection to spacecenter
names = []
Expand Down