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

fixed apostroph problems on os x

Browse source
This commit is contained in:
Jeena 2014-01-07 21:23:29 +01:00
parent b22ab00922
commit 81675dec77
4 changed files with 105 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,4 +1,4 @@
<img align=right src="http://jabs.nu/feedthemonkey/feedthemonkey-icon.png" width=256 alt='Icon'> <img align=right src="http://jabs.nu/feedthemonkey/feedthemonkey-icon.png" width='256' alt='Icon'>
# Feed the Monkey # Feed the Monkey

17
build-osx.sh Executable file
View file

@ -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

19
feedthemonkey
View file

@ -3,6 +3,7 @@
import sys, os, json, tempfile, urllib2, urllib, json import sys, os, json, tempfile, urllib2, urllib, json
from PyQt4 import QtGui, QtCore, QtWebKit, QtNetwork from PyQt4 import QtGui, QtCore, QtWebKit, QtNetwork
from threading import Thread from threading import Thread
from sys import platform as _platform
settings = QtCore.QSettings("jabs.nu", "feedthemonkey") settings = QtCore.QSettings("jabs.nu", "feedthemonkey")
@ -136,6 +137,7 @@ class List(QtGui.QTableWidget):
self.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows) self.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
self.app = container self.app = container
self.itemSelectionChanged.connect(self.rowSelected) self.itemSelectionChanged.connect(self.rowSelected)
self.setShowGrid(False)
def initHeader(self): def initHeader(self):
self.clear() self.clear()
@ -172,7 +174,6 @@ class List(QtGui.QTableWidget):
row += 1 row += 1
self.selectRow(0) self.selectRow(0)
def rowSelected(self): def rowSelected(self):
indexes = self.selectedIndexes() indexes = self.selectedIndexes()
if len(indexes) > 0: if len(indexes) > 0:
@ -187,6 +188,7 @@ class List(QtGui.QTableWidget):
font.setBold(article["unread"]) font.setBold(article["unread"])
item.setFont(font) item.setFont(font)
class Content(QtGui.QWidget): class Content(QtGui.QWidget):
def __init__(self, container): def __init__(self, container):
QtGui.QWidget.__init__(self) QtGui.QWidget.__init__(self)
@ -302,7 +304,7 @@ class Content(QtGui.QWidget):
self.evaluateJavaScript("setArticle('empty')") self.evaluateJavaScript("setArticle('empty')")
def templateString(self): def templateString(self):
return """ html="""
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
@ -336,7 +338,7 @@ class Content(QtGui.QWidget):
} else if(article) { } else if(article) {
$("date").innerHTML = (new Date(parseInt(article.updated, 10) * 1000)).toLocaleString(); $("date").innerHTML = (new Date(parseInt(article.updated, 10) * 1000));
$("title").innerHTML = article.title; $("title").innerHTML = article.title;
$("title").href = article.link; $("title").href = article.link;
$("title").title = article.link; $("title").title = article.link;
@ -350,9 +352,12 @@ class Content(QtGui.QWidget):
</script> </script>
<style type="text/css"> <style type="text/css">
body { body {
font-family: "Ubuntu", "Lucida Grande","Tahoma"; font-family: "Ubuntu", "Lucida Grande", "Tahoma", sans-serif;
padding: 1em 2em 1em 2em; padding: 1em 2em 1em 2em;
} }
body.darwin {
font-family: "LucidaGrande", sans-serif;
}
h1 { h1 {
font-weight: normal; font-weight: normal;
margin: 0; margin: 0;
@ -381,7 +386,7 @@ class Content(QtGui.QWidget):
} }
</style> </style>
</head> </head>
<body> <body class='""" + _platform + """''>
<header> <header>
<p><span id="feed_title"></span> <span id="author"></span></p> <p><span id="feed_title"></span> <span id="author"></span></p>
<h1><a id="title" href=""></a></h1> <h1><a id="title" href=""></a></h1>
@ -389,8 +394,8 @@ class Content(QtGui.QWidget):
</header> </header>
<article id="article"></article> <article id="article"></article>
</body> </body>
</html> </html>"""
""" return html # string.replace(html, "<body", "<body class='" + _platform + "'")

2
setup.py
View file

@ -4,7 +4,7 @@ import os, PyQt4
from setuptools import setup from setuptools import setup
from sys import platform as _platform from sys import platform as _platform
VERSION = "0.1.0" VERSION = "0.1.1"
APP = ["feedthemonkey"] APP = ["feedthemonkey"]
files = [] files = []