diff --git a/src/calibre/gui2/dialogs/job_view.ui b/src/calibre/gui2/dialogs/job_view.ui index ffd4419da9..f4b0086497 100644 --- a/src/calibre/gui2/dialogs/job_view.ui +++ b/src/calibre/gui2/dialogs/job_view.ui @@ -16,7 +16,7 @@ :/images/view.svg:/images/view.svg - + @@ -30,10 +30,34 @@ + + + + QDialogButtonBox::Ok + + + - + + + buttonBox + accepted() + Dialog + accept() + + + 617 + 442 + + + 206 + -5 + + + + diff --git a/src/calibre/linux.py b/src/calibre/linux.py index ffd4c46d7f..edcfa99342 100644 --- a/src/calibre/linux.py +++ b/src/calibre/linux.py @@ -485,14 +485,14 @@ def post_install(): os.unlink(f) def binary_install(): - manifest = os.path.join(sys.frozen_path, 'manifest') + manifest = os.path.join(getattr(sys, 'frozen_path'), 'manifest') exes = [x.strip() for x in open(manifest).readlines()] print 'Creating symlinks...' for exe in exes: dest = os.path.join('/usr', 'bin', exe) if os.path.exists(dest): os.remove(dest) - os.symlink(os.path.join(sys.frozen_path, exe), dest) + os.symlink(os.path.join(getattr(sys, 'frozen_path'), exe), dest) post_install() return 0