From 38f55169ccfe2cd996f306690f652dadec11b82f Mon Sep 17 00:00:00 2001
From: ilektrojohn
Date: Sun, 2 Feb 2014 20:09:01 +0100
Subject: [PATCH] Fixed bugs, added update check function
---
creepy/CreepyMain.py | 43 +-
creepy/components/PersonProjectWizard.py | 2 +-
.../PluginConfigurationCheckDialog.py | 2 +-
.../components/PluginsConfigurationDialog.py | 2 +-
creepy/components/UpdateCheckDialog.py | 9 +
.../include/Eye_of_Sauron_by_Blood_Solice.png | Bin 0 -> 365794 bytes
creepy/include/creepy_resources.qrc | 64 +-
creepy/models/InputPlugin.py | 1 -
creepy/models/PluginConfigurationListModel.py | 2 +-
creepy/models/ProjectTree.py | 12 +-
.../ProjectWizardPossibleTargetsTable.py | 2 +-
creepy/plugins/instagram/instagram.conf | 2 +-
creepy/plugins/twitter/twitter.conf | 2 +-
creepy/plugins/twitter/twitter.py | 2 +-
creepy/ui/AboutDialog.py | 7 +-
creepy/ui/CheckUpdateDialog.py | 77 +
creepy/ui/CreepyUI.py | 77 +-
creepy/ui/FilterLocationsDateDialog.py | 4 +-
creepy/ui/FilterLocationsPointDialog.py | 4 +-
...rojectWizard.py => PersonProjectWizard.py} | 13 +-
...ckdialog.py => PluginConfigCheckdialog.py} | 6 +-
creepy/ui/PluginImportWizardUI.py | 87 -
...onfigurationDialog.py => PluginsConfig.py} | 4 +-
creepy/ui/UpdateCheckDialog.py | 92 +
creepy/ui/VerifyDeleteDialog.py | 10 +-
creepy/ui/creepy_resources_rc.py | 34450 +++++++++++-----
gui/aboutDialog.ui | 7 +-
gui/creepy.ui | 80 +-
gui/filterLocationsDateDialog.ui | 2 +-
gui/filterLocationsPointDialog.ui | 2 +-
gui/personProjectWizard.ui | 8 +-
gui/pluginConfigCheckDialog.ui | 8 +-
gui/pluginsConfig.ui | 2 +-
gui/updateCheckDialog.ui | 175 +
gui/verifyDeleteDialog.ui | 8 +-
35 files changed, 25766 insertions(+), 9502 deletions(-)
create mode 100644 creepy/components/UpdateCheckDialog.py
create mode 100644 creepy/include/Eye_of_Sauron_by_Blood_Solice.png
create mode 100644 creepy/ui/CheckUpdateDialog.py
rename creepy/ui/{CreepyPersonProjectWizard.py => PersonProjectWizard.py} (96%)
rename creepy/ui/{CreepyPluginConfigurationCheckdialog.py => PluginConfigCheckdialog.py} (93%)
delete mode 100644 creepy/ui/PluginImportWizardUI.py
rename creepy/ui/{CreepyPluginsConfigurationDialog.py => PluginsConfig.py} (94%)
create mode 100644 creepy/ui/UpdateCheckDialog.py
create mode 100644 gui/updateCheckDialog.ui
diff --git a/creepy/CreepyMain.py b/creepy/CreepyMain.py
index 33e0976..63121e7 100644
--- a/creepy/CreepyMain.py
+++ b/creepy/CreepyMain.py
@@ -7,9 +7,12 @@
import shelve
import functools
import csv
+import urllib2
+from distutils.version import StrictVersion
+from configobj import ConfigObj
from PyQt4.QtCore import QString, QThread, SIGNAL, QUrl, QDateTime, QDate, QRect, Qt
-from PyQt4.QtGui import QMainWindow, QApplication, QMessageBox, QFileDialog, QWidget, QScrollArea, QVBoxLayout
-from PyQt4.QtGui import QHBoxLayout, QLabel, QLineEdit, QCheckBox, QPushButton, QStackedWidget,QGridLayout, QMenu
+from PyQt4.QtGui import QMainWindow, QApplication, QMessageBox, QFileDialog, QWidget, QScrollArea, QVBoxLayout, QIcon, QPixmap
+from PyQt4.QtGui import QHBoxLayout, QLabel, QLineEdit, QCheckBox, QPushButton, QStackedWidget,QGridLayout, QMenu, QTableWidgetItem
from PyQt4.QtWebKit import QWebPage
from ui.CreepyUI import Ui_CreepyMainWindow
from yapsy.PluginManager import PluginManagerSingleton
@@ -27,6 +30,7 @@
from components.FilterLocationsPointDialog import FilterLocationsPointDialog
from components.AboutDialog import AboutDialog
from components.VerifyDeleteDialog import VerifyDeleteDialog
+from components.UpdateCheckDialog import UpdateCheckDialog
from utilities import GeneralUtilities
# set up logging
logger = logging.getLogger(__name__)
@@ -86,6 +90,7 @@ def run(self):
self.emit(SIGNAL('locations(PyQt_PyObject)'), self.project)
def __init__(self, parent=None):
+ self.version = "1.1"
QWidget.__init__(self, parent)
self.ui = Ui_CreepyMainWindow()
self.ui.setupUi(self)
@@ -118,8 +123,42 @@ def __init__(self, parent=None):
self.ui.actionShowHeatMap.toggled.connect(self.toggleHeatMap)
self.ui.actionReportProblem.triggered.connect(GeneralUtilities.reportProblem)
self.ui.actionAbout.triggered.connect(self.showAboutDialog)
+ self.ui.actionCheckUpdates.triggered.connect(self.checkForUpdatedVersion)
self.ui.actionExit.triggered.connect(self.close)
self.loadProjectsFromStorage()
+ #If option enabled check for updated version
+
+ def checkForUpdatedVersion(self):
+ '''
+ Checks www.geocreepy.com for an updated version and returns a tuple with the
+ result and the latest version number
+
+ '''
+
+ try:
+ latestVersion = urllib2.urlopen("http://www.geocreepy.com/version.html").read().rstrip()
+
+ updateCheckDialog = UpdateCheckDialog()
+ updateCheckDialog.ui.versionsTableWidget.setHorizontalHeaderLabels(('','Component','Status','Installed','Available'))
+ updateCheckDialog.ui.versionsTableWidget.setItem(0,1,QTableWidgetItem('Creepy'))
+ if StrictVersion(latestVersion) > StrictVersion(self.version):
+ updateCheckDialog.ui.versionsTableWidget.setItem(0,0,QTableWidgetItem(QIcon(QPixmap(':/creepy/exclamation')), ''))
+ updateCheckDialog.ui.versionsTableWidget.setItem(0,2,QTableWidgetItem('Outdated'))
+ updateCheckDialog.ui.dlNewVersionLabel.setText('Download the latest version from geocreepy.com
')
+ else:
+ updateCheckDialog.ui.versionsTableWidget.setItem(0,0,QTableWidgetItem(QIcon(QPixmap(':/creepy/tick')), ''))
+ updateCheckDialog.ui.versionsTableWidget.setItem(0,2,QTableWidgetItem('Up To Date'))
+ updateCheckDialog.ui.dlNewVersionLabel.setText('