Sergey77
/
OSG_Mugshot_fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle errors in loading .face (LP: #1400055, #1502043)

This commit is contained in:
Sean Davis 2016-03-27 22:14:00 -04:00
parent 8aaa1821ec
commit babc8775ce
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mugshot/MugshotWindow.py
View File

@ -288,17 +288,21 @@ class MugshotWindow(Window):
"""Scale and set the user profile image.""" """Scale and set the user profile image."""
logger.debug("Setting user profile image to %s" % str(filename)) logger.debug("Setting user profile image to %s" % str(filename))
if filename and os.path.exists(filename): if filename and os.path.exists(filename):
pixbuf = GdkPixbuf.Pixbuf.new_from_file(filename) try:
scaled = pixbuf.scale_simple(128, 128, GdkPixbuf.InterpType.HYPER) pixbuf = GdkPixbuf.Pixbuf.new_from_file(filename)
self.user_image.set_from_pixbuf(scaled) scaled = pixbuf.scale_simple(128, 128, GdkPixbuf.InterpType.HYPER)
# Show "Remove" menu item. self.user_image.set_from_pixbuf(scaled)
self.menuitem1.set_visible(True) # Show "Remove" menu item.
self.image_remove.set_visible(True) self.menuitem1.set_visible(True)
else: self.image_remove.set_visible(True)
self.user_image.set_from_icon_name('avatar-default', 128) return
# Hide "Remove" menu item. except GLib.Error:
self.menuitem1.set_visible(False) pass
self.image_remove.set_visible(False)
self.user_image.set_from_icon_name('avatar-default', 128)
# Hide "Remove" menu item.
self.menuitem1.set_visible(False)
self.image_remove.set_visible(False)
def suggest_initials(self, first_name, last_name): def suggest_initials(self, first_name, last_name):
"""Generate initials from first and last name.""" """Generate initials from first and last name."""

24
po/mugshot.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-27 21:51-0400\n" "POT-Creation-Date: 2016-03-27 22:09-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -61,7 +61,7 @@ msgstr ""
msgid "Browse…" msgid "Browse…"
msgstr "" msgstr ""
#: ../data/ui/MugshotWindow.ui.h:9 ../mugshot/MugshotWindow.py:553 #: ../data/ui/MugshotWindow.ui.h:9 ../mugshot/MugshotWindow.py:557
msgid "Mugshot" msgid "Mugshot"
msgstr "" msgstr ""
@ -107,45 +107,45 @@ msgstr ""
msgid "Retry" msgid "Retry"
msgstr "" msgstr ""
#: ../mugshot/MugshotWindow.py:331 #: ../mugshot/MugshotWindow.py:335
msgid "Authentication cancelled." msgid "Authentication cancelled."
msgstr "" msgstr ""
#: ../mugshot/MugshotWindow.py:334 #: ../mugshot/MugshotWindow.py:338
msgid "Authentication failed." msgid "Authentication failed."
msgstr "" msgstr ""
#: ../mugshot/MugshotWindow.py:337 #: ../mugshot/MugshotWindow.py:341
msgid "An error occurred when saving changes." msgid "An error occurred when saving changes."
msgstr "" msgstr ""
#: ../mugshot/MugshotWindow.py:339 #: ../mugshot/MugshotWindow.py:343
msgid "User details were not updated." msgid "User details were not updated."
msgstr "" msgstr ""
#: ../mugshot/MugshotWindow.py:440 #: ../mugshot/MugshotWindow.py:444
msgid "Update Pidgin buddy icon?" msgid "Update Pidgin buddy icon?"
msgstr "" msgstr ""
#: ../mugshot/MugshotWindow.py:441 #: ../mugshot/MugshotWindow.py:445
msgid "Would you also like to update your Pidgin buddy icon?" msgid "Would you also like to update your Pidgin buddy icon?"
msgstr "" msgstr ""
#: ../mugshot/MugshotWindow.py:554 #: ../mugshot/MugshotWindow.py:558
msgid "Enter your password to change user details." msgid "Enter your password to change user details."
msgstr "" msgstr ""
#: ../mugshot/MugshotWindow.py:556 #: ../mugshot/MugshotWindow.py:560
msgid "" msgid ""
"This is a security measure to prevent unwanted updates\n" "This is a security measure to prevent unwanted updates\n"
"to your personal information." "to your personal information."
msgstr "" msgstr ""
#: ../mugshot/MugshotWindow.py:798 #: ../mugshot/MugshotWindow.py:802
msgid "Update LibreOffice user details?" msgid "Update LibreOffice user details?"
msgstr "" msgstr ""
#: ../mugshot/MugshotWindow.py:799 #: ../mugshot/MugshotWindow.py:803
msgid "Would you also like to update your user details in LibreOffice?" msgid "Would you also like to update your user details in LibreOffice?"
msgstr "" msgstr ""