Changeset 3946

Timestamp:

Mar 15, 2017, 11:55:09 AM (2 years ago)

Author:

jrpelegrina

Message:

Fix autostart, reorder bin and connect gui with indicator

Location:

lliurex-gdrive/trunk/fuentes

Files:

• lliurex-gdrive-core.install/etc/xdg/autostart/lliurex-gdrive.desktop (deleted)
• lliurex-gdrive-core.install/etc/xdg/autostart/lliurexGdrive.desktop (added)
• lliurex-gdrive-core.install/usr/bin (added)
• lliurex-gdrive-core.install/usr/bin/lliurex-gdrive-autostart (added)
• lliurex-gdrive-gui.install/usr/bin (added)
• lliurex-gdrive-gui.install/usr/bin/lliurex-gdrive (added)
• lliurex-gdrive-gui.install/usr/sbin (deleted)
• lliurex-gdrive-gui.install/usr/share/lliurex-gdrive/Core.py (modified) (1 diff)
• lliurex-gdrive-gui.install/usr/share/lliurex-gdrive/LliurexGdrive.py (modified) (5 diffs)
• lliurex-gdrive-gui.install/usr/share/lliurex-gdrive/ProfileBox.py (modified) (3 diffs)
• lliurex-gdrive-gui.install/usr/share/lliurex-gdrive/lliurex-gdrive.py (modified) (1 diff)
• lliurex-gdrive-indicator.install/usr/bin (added)
• lliurex-gdrive-indicator.install/usr/bin/lliurexGdriveIndicator (added)
• lliurex-gdrive-indicator.install/usr/sbin (deleted)

lliurex-gdrive/trunk/fuentes/lliurex-gdrive-gui.install/usr/share/lliurex-gdrive/Core.py

@@ +1 @@
+
+#!/usr/bin/env python
+
 #import LliurexGoogleDriveManager
 import lliurex.lliurexgdrive

lliurex-gdrive/trunk/fuentes/lliurex-gdrive-gui.install/usr/share/lliurex-gdrive/LliurexGdrive.py

@@ +1 @@
+#!/usr/bin/env python
+
 import gi
 gi.require_version('Gtk', '3.0')
@@ -15 +17 @@
 
 
-RSRC="./"
+RSRC="/usr/share/lliurex-gdrive/"
 #CONFIG_DIR=os.path.expanduser("~/.config/lliurex-google-drive-profiles/config")
+CSS_FILE="/usr/share/lliurex-gdrive/lliurex-gdrive.css"
+LOCK_PATH="~/.config/lliurex-google-drive-profiles/lgdIndicator.lock"
+
 
 class LliurexGdrive:
@@ -29 +34 @@
                 
                 builder=Gtk.Builder()
-                ui_path=RSRC + "/rsrc/lliurex-gdrive.ui"
+                ui_path=RSRC + "rsrc/lliurex-gdrive.ui"
                 builder.add_from_file(ui_path)
                 
@@ -68 +73 @@
                 
                 self.style_provider=Gtk.CssProvider()
-                f=Gio.File.new_for_path("lliurex-gdrive.css")
+                f=Gio.File.new_for_path(CSS_FILE)
                 self.style_provider.load_from_file(f)
                 Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(),self.style_provider,Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
@@ -83 +88 @@
         #def connect_signals
 
+        def launch_indicator(self):
+
+                self.lockpath=R=os.path.expanduser(LOCK_PATH)
+                if not os.path.exists(self.lockpath):
+                        cmd="lliurexGdriveIndicator.py" + "&"
+                        os.system(cmd)
+
+
         def quit(self,widget):
-                
-                
+
+                self.launch_indicator()
+
                 Gtk.main_quit() 
         

lliurex-gdrive/trunk/fuentes/lliurex-gdrive-gui.install/usr/share/lliurex-gdrive/ProfileBox.py

@@ +1 @@
+#!/usr/bin/env python
+
+
 import gi
 gi.require_version('Gtk', '3.0')
@@ -21 +24 @@
 
 
-RSRC="./"
+RSRC="/usr/share/lliurex-gdrive/"
+CSS_FILE="/usr/share/lliurex-gdrive/lliurex-gdrive.css"
 PROFILE_IMAGE=RSRC+"rsrc/profile.svg"
 FOLDER_IMAGE=RSRC+"rsrc/folder.svg"
@@ -112 +116 @@
                 self.style_provider=Gtk.CssProvider()
 
-                f=Gio.File.new_for_path("lliurex-gdrive.css")
+                f=Gio.File.new_for_path(CSS_FILE)
                 self.style_provider.load_from_file(f)
 

lliurex-gdrive/trunk/fuentes/lliurex-gdrive-gui.install/usr/share/lliurex-gdrive/lliurex-gdrive.py

@@ -1 +1 @@
 #!/usr/bin/env python
+
 import Core