Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2010-04-30 15:24:58 +01:00
commit b39c5e62ce
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/installer/linux/freeze.py
View File

@ -153,7 +153,7 @@ class LinuxFreeze(Command):
sys.resources_location = os.path.join(DIR_NAME, 'resources') sys.resources_location = os.path.join(DIR_NAME, 'resources')
dfv = os.environ.get('CALIBRE_DEVELOP_FROM', None) dfv = os.environ.get('CALIBRE_DEVELOP_FROM', None)
if dfv and os.path.exists(dfv): if dfv and os.path.exists(dfv):
sys.path.insert(0, dfv) sys.path.insert(0, os.path.abspath(dfv))
executables = %(executables)s executables = %(executables)s

6
src/calibre/gui2/ui.py
View File

@ -242,8 +242,12 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
####################### Vanity ######################## ####################### Vanity ########################
self.vanity_template = _('<p>For help see the: <a href="%s">User Manual</a>' self.vanity_template = _('<p>For help see the: <a href="%s">User Manual</a>'
'<br>')%'http://calibre-ebook.com/user_manual' '<br>')%'http://calibre-ebook.com/user_manual'
dv = os.environ.get('CALIBRE_DEVELOP_FROM', None)
v = __version__
if getattr(sys, 'frozen', False) and dv and os.path.abspath(dv) in sys.path:
v += '*'
self.vanity_template += _('<b>%s</b>: %s by <b>Kovid Goyal ' self.vanity_template += _('<b>%s</b>: %s by <b>Kovid Goyal '
'%%(version)s</b><br>%%(device)s</p>')%(__appname__, __version__) '%%(version)s</b><br>%%(device)s</p>')%(__appname__, v)
self.latest_version = ' ' self.latest_version = ' '
self.vanity.setText(self.vanity_template%dict(version=' ', device=' ')) self.vanity.setText(self.vanity_template%dict(version=' ', device=' '))
self.device_info = ' ' self.device_info = ' '