reorder apps

openplotter · Apr 13, 2024 · 8d79ecf · 8d79ecf
1 parent 0e08edb
commit 8d79ecf
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 54 deletions.
diff --git a/openplotterSettings/appsList.py b/openplotterSettings/appsList.py
@@ -56,23 +56,23 @@ def __init__(self):
 		'conf': 'avnav'
 		}
 		self.appsDict.append(app)
-		
+
 		app = {
-		'name': _('Notifications'),
+		'name': 'XyGrib',
 		'platform': 'both',
-		'package': 'openplotter-notifications',
-		'preUninstall': 'notificationsPreUninstall',
-		'uninstall': 'openplotter-notifications',
-		'sources': ['https://dl.cloudsmith.io/public/openplotter/openplotter/deb/debian'],
+		'package': 'xygrib',
+		'preUninstall': '',
+		'uninstall': 'xygrib',
+		'sources': ['https://www.free-x.de/deb4op'],
 		'dev': 'no',
-		'entryPoint': 'openplotter-notifications',
-		'postInstall': platform2.admin+' notificationsPostInstall',
+		'entryPoint': 'XyGrib',
+		'postInstall': platform2.admin+' python3 '+currentdir+'/xygribPostInstall.py',
 		'reboot': 'no',
-		'module': 'openplotterNotifications',
-		'conf': 'notifications'
+		'module': '',
+		'conf': ''
 		}
 		self.appsDict.append(app)
-
+		
 		app = {
 		'name': _('MAIANA AIS transponder'),
 		'platform': 'both',
@@ -89,22 +89,6 @@ def __init__(self):
 		}
 		self.appsDict.append(app)
 
-		app = {
-		'name': 'IoB',
-		'platform': 'both',
-		'package': 'openplotter-iob',
-		'preUninstall': platform2.admin+' iobPreUninstall',
-		'uninstall': 'openplotter-iob',
-		'sources': ['https://dl.cloudsmith.io/public/openplotter/openplotter/deb/debian'],
-		'dev': 'no',
-		'entryPoint': 'openplotter-iob',
-		'postInstall': platform2.admin+' iobPostInstall',
-		'reboot': 'no',
-		'module': 'openplotterIob',
-		'conf': 'iob'
-		}
-		self.appsDict.append(app)
-
 		app = {
 		'name': 'GPIO',
 		'platform': 'rpi',
@@ -154,34 +138,34 @@ def __init__(self):
 		self.appsDict.append(app)
 
 		app = {
-		'name': _('CAN Bus'),
+		'name': 'IoB',
 		'platform': 'both',
-		'package': 'openplotter-can',
-		'preUninstall': platform2.admin+' canPreUninstall',
-		'uninstall': 'openplotter-can',
+		'package': 'openplotter-iob',
+		'preUninstall': platform2.admin+' iobPreUninstall',
+		'uninstall': 'openplotter-iob',
 		'sources': ['https://dl.cloudsmith.io/public/openplotter/openplotter/deb/debian'],
 		'dev': 'no',
-		'entryPoint': 'openplotter-can',
-		'postInstall': platform2.admin+' canPostInstall',
+		'entryPoint': 'openplotter-iob',
+		'postInstall': platform2.admin+' iobPostInstall',
 		'reboot': 'no',
-		'module': 'openplotterCan',
-		'conf': 'can'
+		'module': 'openplotterIob',
+		'conf': 'iob'
 		}
 		self.appsDict.append(app)
 
 		app = {
-		'name': _('Serial'),
+		'name': _('Notifications'),
 		'platform': 'both',
-		'package': 'openplotter-serial',
-		'preUninstall': platform2.admin+' serialPreUninstall',
-		'uninstall': 'openplotter-serial',
+		'package': 'openplotter-notifications',
+		'preUninstall': 'notificationsPreUninstall',
+		'uninstall': 'openplotter-notifications',
 		'sources': ['https://dl.cloudsmith.io/public/openplotter/openplotter/deb/debian'],
 		'dev': 'no',
-		'entryPoint': 'openplotter-serial',
-		'postInstall': platform2.admin+' serialPostInstall',
+		'entryPoint': 'openplotter-notifications',
+		'postInstall': 'notificationsPostInstall',
 		'reboot': 'no',
-		'module': 'openplotterSerial',
-		'conf': 'serial'
+		'module': 'openplotterNotifications',
+		'conf': 'notifications'
 		}
 		self.appsDict.append(app)
 
@@ -202,21 +186,37 @@ def __init__(self):
 		self.appsDict.append(app)
 
 		app = {
-		'name': 'XyGrib',
+		'name': _('CAN Bus'),
 		'platform': 'both',
-		'package': 'xygrib',
-		'preUninstall': '',
-		'uninstall': 'xygrib',
-		'sources': ['https://www.free-x.de/deb4op'],
+		'package': 'openplotter-can',
+		'preUninstall': platform2.admin+' canPreUninstall',
+		'uninstall': 'openplotter-can',
+		'sources': ['https://dl.cloudsmith.io/public/openplotter/openplotter/deb/debian'],
 		'dev': 'no',
-		'entryPoint': 'XyGrib',
-		'postInstall': platform2.admin+' python3 '+currentdir+'/xygribPostInstall.py',
+		'entryPoint': 'openplotter-can',
+		'postInstall': platform2.admin+' canPostInstall',
 		'reboot': 'no',
-		'module': '',
-		'conf': ''
+		'module': 'openplotterCan',
+		'conf': 'can'
 		}
 		self.appsDict.append(app)
-
+
+		app = {
+		'name': _('Serial'),
+		'platform': 'both',
+		'package': 'openplotter-serial',
+		'preUninstall': platform2.admin+' serialPreUninstall',
+		'uninstall': 'openplotter-serial',
+		'sources': ['https://dl.cloudsmith.io/public/openplotter/openplotter/deb/debian'],
+		'dev': 'no',
+		'entryPoint': 'openplotter-serial',
+		'postInstall': platform2.admin+' serialPostInstall',
+		'reboot': 'no',
+		'module': 'openplotterSerial',
+		'conf': 'serial'
+		}
+		self.appsDict.append(app)
+
 		app = {
 		'name': _('OpenCPN Installer'),
 		'platform': 'both',

diff --git a/openplotterSettings/startup.py b/openplotterSettings/startup.py
@@ -153,9 +153,11 @@ def starting(self):
 			if self.mode == 'start':
 				if self.isRPI:
 					forceVNC = self.conf.get('GENERAL', 'forceVNC')
-					if forceVNC == '1': 
+					if forceVNC == '1':
+						self.add_logger_data(_('Setting remote desktop...'))
 						subprocess.call(['sudo', 'raspi-config', 'nonint', 'do_vnc', '0'])
 						self.conf.set('GENERAL', 'forceVNC', '0')
+						self.add_logger_data({'green':'','black':_('done'),'red':''})
 		except Exception as e: 
 			self.add_logger_data({'green':'','black':'','red':str(e)})