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 upstream changes.

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2008-11-29 19:47:49 -05:00
commit 98a8f6bf32
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/dialogs/scheduler.py
View File

@ -334,9 +334,9 @@ class Scheduler(QObject):
def customize_feeds(self, *args): def customize_feeds(self, *args):
main = self.main main = self.main
d = UserProfiles(main, main.library_view.model().db.get_feeds()) d = UserProfiles(main, main.library_view.model().db.get_feeds())
if d.exec_() == QDialog.Accepted: d.exec_()
feeds = tuple(d.profiles()) feeds = tuple(d.profiles())
main.library_view.model().db.set_feeds(feeds) main.library_view.model().db.set_feeds(feeds)
def debug(self, *args): def debug(self, *args):

2
src/calibre/gui2/dialogs/user_profiles.ui
View File

@ -23,7 +23,7 @@
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="standardButtons" > <property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Close</set>
</property> </property>
</widget> </widget>
</item> </item>

8
src/calibre/gui2/main.py
View File

@ -110,6 +110,9 @@ class Main(MainWindow, Ui_MainWindow):
if r == QSystemTrayIcon.Trigger: if r == QSystemTrayIcon.Trigger:
self.hide() if self.isVisible() else self.show() self.hide() if self.isVisible() else self.show()
self.connect(self.system_tray_icon, SIGNAL('activated(QSystemTrayIcon::ActivationReason)'), sta) self.connect(self.system_tray_icon, SIGNAL('activated(QSystemTrayIcon::ActivationReason)'), sta)
def tcme(self, *args):
print args
self.tool_bar.contextMenuEvent = tcme
####################### Location View ######################## ####################### Location View ########################
QObject.connect(self.location_view, SIGNAL('location_selected(PyQt_PyObject)'), QObject.connect(self.location_view, SIGNAL('location_selected(PyQt_PyObject)'),
self.location_selected) self.location_selected)
@ -1247,9 +1250,10 @@ in which you want to store your books files. Any existing books will be automati
</form> </form>
''' '''
MSG = _('is the result of the efforts of many volunteers from all over the world. If you find it useful, please consider donating to support its development.') MSG = _('is the result of the efforts of many volunteers from all over the world. If you find it useful, please consider donating to support its development.')
HTML = ''' HTML = u'''
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<title>Donate to support calibre</title> <title>Donate to support calibre</title>
</head> </head>
<body style="background:white"> <body style="background:white">
@ -1260,7 +1264,7 @@ in which you want to store your books files. Any existing books will be automati
</html> </html>
'''%(MSG, BUTTON) '''%(MSG, BUTTON)
pt = PersistentTemporaryFile('_donate.htm') pt = PersistentTemporaryFile('_donate.htm')
pt.write(HTML) pt.write(HTML.encode('utf-8'))
pt.close() pt.close()
QDesktopServices.openUrl(QUrl.fromLocalFile(pt.name)) QDesktopServices.openUrl(QUrl.fromLocalFile(pt.name))

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

@ -16,6 +16,9 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="contextMenuPolicy" >
<enum>Qt::NoContextMenu</enum>
</property>
<property name="windowTitle" > <property name="windowTitle" >
<string>__appname__</string> <string>__appname__</string>
</property> </property>
@ -412,6 +415,9 @@
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="contextMenuPolicy" >
<enum>Qt::PreventContextMenu</enum>
</property>
<property name="movable" > <property name="movable" >
<bool>false</bool> <bool>false</bool>
</property> </property>