Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge trunk from 19853 to 19947

Browse Source 
svn: r19949
This commit is contained in:
Benny Malengier
2012-07-05 00:38:18 +00:00
parent aba47d38cb e73eec36aa
commit 226a3eee2b
360 changed files with 9231 additions and 4315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/plug/_windows.py
View File

@@ -56,8 +56,8 @@ import tool
from _guioptions import add_gui_options
from gui.dialog import InfoDialog
from gui.editors import EditPerson
import Utils
import const
from gen.utils.file import get_unicode_path_from_file_chooser
from gen.const import URL_WIKISTRING, USER_HOME, WIKI_EXTRAPLUGINS_RAWDATA
from gen.config import config
def display_message(message):
@@ -291,7 +291,7 @@ class PluginStatus(ManagedWindow):
"""
import urllib
from gui.utils import ProgressMeter
URL = "%s%s" % (const.URL_WIKISTRING, const.WIKI_EXTRAPLUGINS_RAWDATA)
URL = "%s%s" % (URL_WIKISTRING, WIKI_EXTRAPLUGINS_RAWDATA)
try:
fp = urllib.urlopen(URL)
except:
@@ -347,7 +347,7 @@ class PluginStatus(ManagedWindow):
if "|" in url:
url, text = url.split("|", 1)
# need to get a page that says where it is:
fp = urllib.urlopen("%s%s%s" % (const.URL_WIKISTRING, url,
fp = urllib.urlopen("%s%s%s" % (URL_WIKISTRING, url,
"&action=edit&externaledit=true&mode=file"))
for line in fp:
if line.startswith("URL="):
@@ -422,7 +422,7 @@ class PluginStatus(ManagedWindow):
name = self.install_addon_path.get_text()
dir = os.path.dirname(name)
if not os.path.isdir(dir):
dir = const.USER_HOME
dir = USER_HOME
name = ''
elif not os.path.isfile(name):
name = ''
@@ -432,7 +432,7 @@ class PluginStatus(ManagedWindow):
status = fcd.run()
if status == Gtk.ResponseType.OK:
path = Utils.get_unicode_path_from_file_chooser(fcd.get_filename())
path = get_unicode_path_from_file_chooser(fcd.get_filename())
if path:
self.install_addon_path.set_text(path)
fcd.destroy()