Changeset 6981 for lliurex-mate-welcome

Timestamp:

Mar 8, 2018, 1:28:22 PM (2 years ago)

Author:

alviboi

Message:

 

Location:

lliurex-mate-welcome/trunk/fuentes

Files:

• lliurex-mate-welcome (modified) (5 diffs)
• lliurex-mate-welcome.desktop (modified) (1 diff)

lliurex-mate-welcome/trunk/fuentes/lliurex-mate-welcome

@@ -1401 +1401 @@
         self.welcome_version = 'Unknown'
         self.rpi_resize_pending = False
+        self.start_from_menu = False
 
         # Get current architecture of system.
@@ -2659 +2660 @@
         self.jump_to = None
         self.font_dpi_override = None
+        self.start_from_menu = False
 
         for arg in sys.argv:
@@ -2751 +2753 @@
               print('[Debug] Opening page: ' + self.jump_to + '.html')
 
+          if arg.startswith('--force'):
+              print('[Debug] Start from menu')
+              self.start_from_menu = True
+
           if arg.startswith('--font-dpi='):
               try:
@@ -2783 +2789 @@
             systemstate.codename = self.simulate_codename
 
+    def check_start_menu(self):
+        if not self.start_from_menu == False:
+            systemstate.start_from_menu = self.start_from_menu
+        
+
 
 if __name__ == "__main__":
 
-    # Process any parameters passed to the program.
+    user = os.environ.get('USER')
+    groups = os.getgroups()
+    # Process any parameters passed to the program.       
     arg = Arguments()
 
@@ -2801 +2814 @@
     arg.override_flavour()
     arg.override_codename()
-
+    arg.check_start_menu()
     print('[Welcome] Application Started.')
     print('[SystemState] Lliurex Session: ' + systemstate.session_type)
     print('[SystemState] Lliurex Flavour: ' + systemstate.session_flavour)
-    app.run()
+    if 10004 in groups or user == 'netadmin' and systemstate.start_from_menu == False:
+            print('[Init] Netadmin or member of students')
+            exit()
+    else:        
+        app.run()

lliurex-mate-welcome/trunk/fuentes/lliurex-mate-welcome.desktop

@@ -15 +15 @@
 Comment[ca_ES]=Pantalla de benvinguda a LliureX 16
 Comment[ca_ES@valencia]=Pantalla de benvinguda a LliureX 16
-Exec=lliurex-mate-welcome
+Exec=sh -c "lliurex-mate-welcome --force"
 Icon=lliurex-welcome
 OnlyShowIn=MATE;