Code cleanup

diff --git a/src/FeedingIt.py b/src/FeedingIt.py
index 4101334..446d73f 100644 (file)
--- a/src/FeedingIt.py
+++ b/src/FeedingIt.py
@@ -222,7 +222,6 @@ class FeedingIt:
         
         button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
         button.set_label("Delete Feed")
-        #button.set_selector(self.create_selector())
         button.connect("clicked", self.button_delete_clicked)
         menu.append(button)
         
@@ -232,12 +231,8 @@ class FeedingIt:
         self.feedWindow = hildon.StackableWindow()
         self.articleWindow = hildon.StackableWindow()
 
-        #self.listing.downloadFeeds()
         self.displayListing() 
         
-        #self.window.show_all()
-        #self.displayFeed(self.listing.getFeed(0))
-        
     def button_add_clicked(self, button):
         wizard = AddWidgetWizard(self.window)
         ret = wizard.run()
@@ -330,9 +325,6 @@ class FeedingIt:
 
 
 if __name__ == "__main__":
-    #gobject.signal_new("ReloadArticle", gtkhtml2.Document,
-    #                   gobject.SIGNAL_RUN_LAST,
-    #                   gobject.TYPE_NONE, ())
     if not isdir(CONFIGDIR):
         try:
             mkdir(CONFIGDIR)

diff --git a/src/feedparser.pyo b/src/feedparser.pyo
deleted file mode 100644 (file)
index 6c76c63..0000000
Binary files a/src/feedparser.pyo and /dev/null differ

diff --git a/src/test.py b/src/test.py
deleted file mode 100644 (file)
index f2e0d78..0000000
--- a/src/test.py
+++ /dev/null
@@ -1,167 +0,0 @@
-import sys
-from PyQt4 import QtGui
-from PyQt4 import QtCore
-from PyQt4.QtWebKit import QWebView
-import rss
-from rss import *
-
-from os.path import isfile, isdir
-from os import mkdir
-
-class ArticleDisplay(QtGui.QMainWindow):
-    def __init__(self, parent, feed, index):
-        QtGui.QMainWindow.__init__(self, parent)
-        #self.setWindowTitle('Feeding It')
-        
-        text = feed.getArticle(index)
-        self.web = QWebView()
-        self.connect(self.web,QtCore.SIGNAL("linkClicked(QUrl)"), self.linkClicked)
-        self.web.setHtml(text)
-        self.setCentralWidget(self.web)
-        self.show()
-        
-    def linkClicked(self, link):
-       self.web.load(link)
-       self.show()
-        
-class ListingDisplay(QtGui.QMainWindow):  
-    def __init__(self, parent, feed):
-        QtGui.QMainWindow.__init__(self, parent)
-        
-        listWidget = QtGui.QListWidget(self)
-        index = 0
-        for item in feed.getTitles():
-            QtGui.QListWidgetItem(item["title"], listWidget)
-
-            #button.connect("clicked", self.button_clicked, self, self.window, currentfeed, index)
-            index=index+1
-        
-        #self.add(listWidget)
-        self.show()
-
-class FeedDisplay(QtGui.QMainWindow):
-    def __init__(self, feed, title, parent=None):
-        self.feed = feed
-        self.title = title
-        QtGui.QMainWindow.__init__(self, parent)
-        self.setWindowTitle(self.title)
-        
-        #self.mainWidget=QtGui.QScrollArea(self) # dummy widget to contain the
-                                      # layout manager
-        #self.setCentralWidget(self.mainWidget)
-        #self.mainLayout=QtGui.QVBoxLayout()
-        self.displayFeed()
-        #self.mainWidget.setWidget(self.mainLayout)
-        self.show()
-        
-    def displayFeed(self):
-       #1 = Working version with QListWidget
-       self.articles = []
-       self.mainwidget = QtGui.QWidget()
-       self.scroll = QtGui.QScrollArea(self)
-       self.layout = QtGui.QVBoxLayout(self.mainwidget)
-       
-        #1 self.widgetList = QtGui.QListWidget(self)
-        #1 self.connect(self.widgetList, QtCore.SIGNAL("itemDoubleClicked(QListWidgetItem *)"), self.buttonArticleClicked)
-        #self.connect(self.widgetList, QtCore.SIGNAL("currentItemChanged(QListWidgetItem *)"), self.buttonArticleClicked)
-        #1 self.widgetList.setProperty("FingerScrollable", True)
-        index = 0
-        for item in self.feed.getEntries():
-           #1 widgetItem = QtGui.QListWidgetItem(item["title"])
-           #1 self.articles.append(widgetItem)
-           #1 self.widgetList.addItem(widgetItem)
-            button = QtGui.QPushButton(item["title"])
-            button.setObjectName(str(index))
-            self.layout.addWidget(button)
-            #button.setFixedHeight(button.sizeHint().height())
-            self.connect(button, QtCore.SIGNAL("clicked()"), self.buttonArticleClicked)           
-            index = index + 1
-        #1 self.setCentralWidget(self.widgetList)
-        self.scroll.setWidget(self.mainwidget)
-        self.setCentralWidget(self.scroll)
-            
-    def buttonArticleClicked(self):
-        #index = self.articles.index(self.sender())
-        index = int(self.sender().objectName())
-        #print self.articles.index(item1)
-        #print "clicked"
-        #index = self.articles.index(item1)
-        self.articleDisplay = ArticleDisplay(self, self.feed, index)
-
-class FeedingIt(QtGui.QMainWindow):    
- 
-    def __init__(self, parent=None):
-        QtGui.QMainWindow.__init__(self, parent)
-        self.setWindowTitle('Feeding It')
-
-        update = QtGui.QAction('Update All Feeds', self)
-        update.setStatusTip('Update all feeds')
-        self.connect(update, QtCore.SIGNAL('triggered()'), self.updateAllFeeds)
-        menubar = self.menuBar()
-        file = menubar.addAction(update)
-        
-        add = QtGui.QAction('Add Feed', self)
-        self.connect(add, QtCore.SIGNAL('triggered()'), self.addFeedButtonClicked)
-        file = menubar.addAction(add)
-
-        # Create MenuBar
-        exitAction = QtGui.QAction('Exit', self)
-        self.connect(exitAction, QtCore.SIGNAL('triggered()'), self.close)
-        file = menubar.addAction(exitAction)
-        
-        self.listing=Listing()
-        self.displayListing() 
-        self.show()
-        
-    def updateAllFeeds(self):
-        self.listing.updateFeeds()
-        self.displayListing()
-        
-    def displayListing(self):
-        self.mainWidget=QtGui.QWidget(self) # dummy widget to contain the
-                                      # layout manager
-        self.setCentralWidget(self.mainWidget)
-        self.mainLayout=QtGui.QVBoxLayout(self.mainWidget)
-        
-        for key in self.listing.getListOfFeeds():
-            # Create the button for the feed
-            button = QtGui.QPushButton(self.listing.getFeedTitle(key), self)
-            button.setObjectName(key)
-            self.mainLayout.addWidget(button)
-            self.connect(button, QtCore.SIGNAL("clicked()"), self.buttonFeedClicked)
-        self.show()
-            
-    def displayFeed(self, qtKey):
-        key = str(qtKey)
-        self.feedDisplay = FeedDisplay(self.listing.getFeed(key), self.listing.getFeedTitle(key), self)
-        
-    def buttonFeedClicked(self):
-        key = self.sender().objectName()
-        self.displayFeed(key)
-        
-    def addFeedButtonClicked(self):
-        # Ask for Feed Name
-        (title,ok) = QtGui.QInputDialog.getText(self, "Add Feed", "Enter the name of the new feed")
-        if ok and title != "":
-           (url, ok) = QtGui.QInputDialog.getText(self, "Add Feed", "Enter the URL of the new feed")
-           if ok and url != "":
-              self.listing.addFeed(title, url)
-        self.displayListing()
-        
-if __name__ == '__main__': 
-
-    # Checking the configuration directory does exist
-    if not isdir(CONFIGDIR):
-        try:
-            mkdir(CONFIGDIR)
-        except:
-            print "Error: Can't create configuration directory"
-            sys.exit(1)
- 
-    #Creating Qt application
-    app = QtGui.QApplication(sys.argv)
- 
-    feedingIt = FeedingIt()
- 
-    #Starting the application's main loop
-    sys.exit(app.exec_())
\ No newline at end of file