diff --git a/README.md b/README.md index 3208938..0a6372e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Icon +Icon # Feed the Monkey diff --git a/build-osx.sh b/build-osx.sh new file mode 100755 index 0000000..1704cfa --- /dev/null +++ b/build-osx.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +HERE=`pwd` +TMP="/tmp" + +rm -rf FeedTheMonkey.app +rm -rf $TMP/feedthemonkey +mkdir $TMP/feedthemonkey +cp Icon.icns $TMP/feedthemonkey/ +cp setup.py $TMP/feedthemonkey +cp feedthemonkey $TMP/feedthemonkey/ +cd $TMP/feedthemonkey +python setup.py py2app +mv $TMP/feedthemonkey/dist/FeedTheMonkey.app $HERE +cd $HERE +rm -rf $TMP/feedthemonkey +FeedTheMonkey.app/Contents/MacOS/FeedTheMonkey \ No newline at end of file diff --git a/feedthemonkey b/feedthemonkey index 18d8af5..36005ab 100755 --- a/feedthemonkey +++ b/feedthemonkey @@ -3,6 +3,7 @@ import sys, os, json, tempfile, urllib2, urllib, json from PyQt4 import QtGui, QtCore, QtWebKit, QtNetwork from threading import Thread +from sys import platform as _platform settings = QtCore.QSettings("jabs.nu", "feedthemonkey") @@ -136,6 +137,7 @@ class List(QtGui.QTableWidget): self.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows) self.app = container self.itemSelectionChanged.connect(self.rowSelected) + self.setShowGrid(False) def initHeader(self): self.clear() @@ -172,7 +174,6 @@ class List(QtGui.QTableWidget): row += 1 self.selectRow(0) - def rowSelected(self): indexes = self.selectedIndexes() if len(indexes) > 0: @@ -187,6 +188,7 @@ class List(QtGui.QTableWidget): font.setBold(article["unread"]) item.setFont(font) + class Content(QtGui.QWidget): def __init__(self, container): QtGui.QWidget.__init__(self) @@ -302,95 +304,98 @@ class Content(QtGui.QWidget): self.evaluateJavaScript("setArticle('empty')") def templateString(self): - return """ - - - - - ttrssl - - - - -
-

-

-

-
-
- - - """ + $("date").innerHTML = (new Date(parseInt(article.updated, 10) * 1000)); + $("title").innerHTML = article.title; + $("title").href = article.link; + $("title").title = article.link; + $("feed_title").innerHTML = article.feed_title; + $("author").innerHTML = ""; + if(article.author && article.author.length > 0) + $("author").innerHTML = "– " + article.author + $("article").innerHTML = article.content; + } + } + + + + +
+

+

+

+
+
+ + """ + return html # string.replace(html, "