first check data/ else use system appdata/share directory.

This commit is contained in:
Amir Taaki 2012-07-05 21:43:32 +02:00
parent dcff721aa9
commit d7ad1f41e5
2 changed files with 8 additions and 4 deletions

View File

@ -1,10 +1,11 @@
from PyQt4.QtCore import * from PyQt4.QtCore import *
from PyQt4.QtGui import * from PyQt4.QtGui import *
from decimal import Decimal as D from decimal import Decimal as D
from util import get_resource_path as rsrc from util import appdata_dir, get_resource_path as rsrc
from i18n import _ from i18n import _
import decimal import decimal
import exchange_rate import exchange_rate
import os.path
import random import random
import re import re
import sys import sys
@ -40,7 +41,10 @@ class ElectrumGui:
def __init__(self, wallet): def __init__(self, wallet):
self.wallet = wallet self.wallet = wallet
self.app = QApplication(sys.argv) self.app = QApplication(sys.argv)
QDir.setCurrent(rsrc()) if os.path.exists("data"):
QDir.setCurrent("data")
else:
QDir.setCurrent(appdata_dir())
with open(rsrc("style.css")) as style_file: with open(rsrc("style.css")) as style_file:
self.app.setStyleSheet(style_file.read()) self.app.setStyleSheet(style_file.read())
@ -136,7 +140,7 @@ class MiniWindow(QDialog):
self.connect(self.address_input, SIGNAL("textEdited(QString)"), self.connect(self.address_input, SIGNAL("textEdited(QString)"),
self.address_field_changed) self.address_field_changed)
resize_line_edit_width(self.address_input, resize_line_edit_width(self.address_input,
"1E4vM9q25xsyDwWwdqHUWnwshdWC9PykmL") "1BtaFUr3qVvAmwrsuDuu5zk6e4s2rxd2Gy")
self.address_completions = QStringListModel() self.address_completions = QStringListModel()
address_completer = QCompleter(self.address_input) address_completer = QCompleter(self.address_input)

View File

@ -13,5 +13,5 @@ def appdata_dir():
raise Exception("Unknown system") raise Exception("Unknown system")
def get_resource_path(*args): def get_resource_path(*args):
return os.path.join(appdata_dir(), *args) return os.path.join(".", *args)