Skip to content

Commit

Permalink
add automatic update
Browse files Browse the repository at this point in the history
  • Loading branch information
p-eli committed Oct 9, 2015
1 parent 0e46b21 commit 2d43eb0
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 10 deletions.
31 changes: 25 additions & 6 deletions createApGui/createEditAp.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ def initSettingPage(self):
self.languageComboBox = Gtk.ComboBox.new_with_model(self.languageListStore)
defaultPosition = self.setting['language'].getLanguageList().index(self.setting['userSetting'].language['name'])
self.createComboBox(self.languageComboBox, [1,3,0,1],table , defaultPosition)
#Automatic check update
self.createLabel(self._('Automatic update'),[0,1,1,2],table, aligment='right')
self.createSwitchButton([2,3,1,2], table, self.automaticCheckUpdate, self.setting['userSetting'].version['autoCheck'])
#save
self.createButton(self._('Save'),[2,3,9,10], table, self.saveSetting)
self.notebook.append_page(table, Gtk.Label(self._('Setting')))

Expand All @@ -195,15 +199,18 @@ def initAboutPage(self):
table.attach(aboutTitleLabel, 0,3,0,2)
#Description
self.createLabel(self._('\t Gui application for easy creating access points.\n Application allows save configuration for quickly create AP.'),[0,3,2,3],table, aligment='center')
#version
self.createLabel(self._('Version:'),[0,1,3,4],table, aligment='right')
self.createLabel(self.setting['userSetting'].version['version'],[1,3,3,4],table, aligment='left')
#author
self.createLabel(self._('Author:'),[0,1,3,4],table, aligment='right')
self.createLabel(self._('Jakub Pelikan'),[1,3,3,4],table, aligment='left')
self.createLabel(self._('Author:'),[0,1,4,5],table, aligment='right')
self.createLabel(self._('Jakub Pelikan'),[1,3,4,5],table, aligment='left')
#nick
self.createLabel(self._('Nick:'),[0,1,4,5],table, aligment='right')
self.createLabel(self._('P-eli'),[1,3,4,5],table, aligment='left')
self.createLabel(self._('Nick:'),[0,1,5,6],table, aligment='right')
self.createLabel(self._('P-eli'),[1,3,5,6],table, aligment='left')
#email
self.createLabel(self._('Email:'),[0,1,5,6],table, aligment='right')
self.createLabel(self._('[email protected]'),[1,3,5,6],table, aligment='left')
self.createLabel(self._('Email:'),[0,1,6,7],table, aligment='right')
self.createLabel(self._('[email protected]'),[1,3,6,7],table, aligment='left')
#Website
self.createLabel(self._('Website:'),[0,1,7,8],table, aligment='right')
website = Gtk.Label()
Expand Down Expand Up @@ -267,6 +274,18 @@ def createTextViewColumn(self, names):
self.treeview.append_column(column_name)
id=id+1

def automaticCheckUpdate(self, switch, gparam):
if switch.get_active():
self.setting['userSetting'].version['autoCheck'] = True
else:
self.setting['userSetting'].version['autoCheck'] = False

def createSwitchButton(self,pos, table, function,active=True):
switch = Gtk.Switch()
switch.connect("notify::active", function)
switch.set_active(active)
table.attach(switch ,pos[0],pos[1],pos[2],pos[3])

def initInterfaceList(self):
self.interfaceListStore = Gtk.ListStore(str)
self.interface = TerminalInterface(self.interfaceListSignal, "interfaceListMsg")
Expand Down
5 changes: 5 additions & 0 deletions createApGui/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ def firstStart(self):
self.start()

def start(self):
self.checkUpdate()
self.tray = TrayIcon(self.setting)
Gtk.main()

Expand All @@ -50,3 +51,7 @@ def getPath(self):
root = os.path.realpath(root)
return(os.path.dirname (os.path.abspath (root)))

def checkUpdate(self):
if self.setting['userSetting'].version['autoCheck']:
import subprocess
subprocess.call('pip install --upgrade create-ap-gui', shell=True,stdout=subprocess.PIPE)
3 changes: 2 additions & 1 deletion createApGui/terminalInterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,5 @@ def run(self):
time.sleep(2)

def stop(self):
self.__running = False
self.__running = False

10 changes: 7 additions & 3 deletions createApGui/userSetting.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import os
class UserSetting():
def __init__(self):
self.version = {'version':'1.2.2', 'autoCheck':True}
self.language = {'name':'English_en', 'fileName':'lang', 'path':'lang'}
self.saveAp = []
try:
Expand Down Expand Up @@ -42,10 +43,13 @@ def load(self):
try:
with open(os.path.join(self.saveFile['path'],self.saveFile['fileName']), 'rb') as file:
loadSetting = pickle.load(file)
if loadSetting.language['name'] == 'English':
try:
loadSetting.version
return loadSetting
except:
self.saveAp = loadSetting.saveAp
self.save()
return self
else:
return loadSetting

except FileNotFoundError:
return self

0 comments on commit 2d43eb0

Please sign in to comment.