kostnik/FeedTheMonkey
1
0
Fork 0
forked from jeena/FeedTheMonkey
Code Pull requests Activity

added more readme

Browse source
This commit is contained in:
jeena 2013-04-24 16:37:02 +02:00
parent cef0b4c64e
commit bdab79bb02
2 changed files with 39 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
feedthemonkey
View file

@ -49,7 +49,7 @@ class MainWindow(QtGui.QMainWindow):
actionMenu.addAction(mkAction("&Reload", self.content.reload, "R"))
actionMenu.addAction(mkAction("&Next", self.content.showNext, "J"))
actionMenu.addAction(mkAction("&Previous", self.content.showPrevious, "K"))
actionMenu.addAction(mkAction("&Open in Browser", self.content.openCurrent, "Return"))
actionMenu.addAction(mkAction("&Open in Browser", self.content.openCurrent, "N"))
viewMenu = mb.addMenu("&View")
viewMenu.addAction(mkAction("Zoom &In", lambda: self.content.wb.setZoomFactor(self.content.wb.zoomFactor() + 0.2), "Ctrl++"))
@ -108,7 +108,7 @@ class MainWindow(QtGui.QMainWindow):
dialog.exec_()
def logOut(self):
self.content.evaluateJavaScript("setArticle()")
self.content.evaluateJavaScript("setArticle('logout')")
self.tinyTinyRSS.logOut()
self.tinyTinyRSS = None
self.put("session_id", None)
@ -134,6 +134,7 @@ class Content(QtGui.QWidget):
self.do_show_next = QtGui.QShortcut(QtCore.Qt.Key_Right, self, activated=self.showNext)
self.do_show_previous = QtGui.QShortcut(QtCore.Qt.Key_Left, self, activated=self.showPrevious)
self.do_open = QtGui.QShortcut("Return", self, activated=self.openCurrent)
self.wb.settings().setAttribute(QtWebKit.QWebSettings.PluginsEnabled, True)
self.wb.settings().setIconDatabasePath(tempfile.mkdtemp())
@ -233,6 +234,8 @@ class Content(QtGui.QWidget):
$("article").innerHTML = "Loading <blink>&hellip;</blink>";
} else if (article == "logout") {
} else if(article) {
$("date").innerHTML = (new Date(parseInt(article.updated, 10) * 1000)).toLocaleString();
@ -273,6 +276,7 @@ class Content(QtGui.QWidget):
}
img {
max-width: 100%;
height: auto;
}
article {
line-height: 1.6;
@ -400,17 +404,16 @@ class Login(QtGui.QDialog):
layout.addWidget(self.textPass)
layout.addWidget(self.buttons)
class WorkerThread(QtCore.QThread):
def __init__(self, parent, do_reload):
super(WorkerThread, self).__init__(parent)
self.do_reload = do_reload
self.isRunning = True
def run(self):
self.do_reload()
self.emit(QtCore.SIGNAL("reload_done()"))
self.isRunning = False
if __name__ == "__main__":