Changeset 3857

Timestamp:

Mar 9, 2017, 2:02:49 PM (4 years ago)

Author:

jrpelegrina

Message:

WIP

Location:

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

Files:

• LliurexGoogleDriveManager.py (modified) (11 diffs)
• ProfileBox.py (modified) (15 diffs)
• rsrc/lliurex-gdrive.ui (modified) (1 diff)

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

@@ -96 +96 @@
 
                 
-        #def check_configuration
+        #def check_config
 
         def check_google_connections(self):
@@ -110 +110 @@
                         return False
 
+        #def check_google_connections           
         
         def mount_drive(self,profile,mountpoint):
@@ -197 +198 @@
                 f.close()
 
+        #def save_profiles      
 
         def check_mountpoint_status(self,mountpoint):
@@ -222 +224 @@
                 return {"status":status,"size":mountpoint_size,"used":mountpoint_used,"available":mountpoint_available,"Used%":mountpoint_per}          
                 
-
+        #def check_mountpoint_status    
+                
         def check_profile_info(self,profile,mountpoint,edition):
         
@@ -247 +250 @@
                 return {"result":True,"code":0}                                                         
         
+        #def check_profile_info
+
         def create_profile(self,profile):
 
@@ -263 +268 @@
                                 
                         
-                
         #def create_profile
 
@@ -279 +283 @@
                         
                 return result
+
+        #def create_mountpoint  
 
         def dismount_mountpoint(self,mountpoint):
@@ -297 +303 @@
                 return result
 
+        #def dismount_mountpoint        
 
         def delete_profile(self,info,profile):
@@ -354 +361 @@
                         self.save_profiles(info)
                 
-                return result                           
+                return result           
+
+        #def edit_profile                       
 
         def sync_profile(self,profile,mountpoint):
@@ -370 +379 @@
                 return {"action":action,"result":result}        
 
+        #def_sync_profile       
 
         def log(self,msg):
@@ -377 +387 @@
                 f=open(log_file,"a+")
                 f.write(msg + '\n')
-                f.close()                
+                f.close()       
+
+        #def log                 
 
 if __name__=="__main__":

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

@@ -29 +29 @@
 DELETE_IMAGE=RSRC+"rsrc/trash.svg"
 MAX_RETRY_INTENTS=900
+MSG_CHANGE_SUCCESS=_("Changes applied successfully")
+MSG_CHANGE_ERROR=_("An error ocurred applying changes. See log file for more information")
 
 class ProfileBox(Gtk.VBox):
@@ -123 +125 @@
 
                 
-                
-                
                         
         #def set-css_info
@@ -158 +158 @@
 
         #def hide_window        
+
+        def init_profile_dialog_button(self):
+
+                self.accept_add_profile_button.show()
+                image = Gtk.Image()
+                image.set_from_stock(Gtk.STOCK_CANCEL,Gtk.IconSize.MENU)
+                self.cancel_add_profile_button.set_image(image)
+                self.cancel_add_profile_button.set_label(_("Cancel"))
+                self.cancel_add_profile_button.show()
+
+        #def init_profile_dialog_button 
+
+        def change_cancel_button(self):
+                
+                image = Gtk.Image()
+                image.set_from_stock(Gtk.STOCK_CLOSE,Gtk.IconSize.MENU)
+                self.cancel_add_profile_button.set_image(image)
+                self.cancel_add_profile_button.set_label(_("Close"))    
+                self.cancel_add_profile_button.show()   
+
+        #def change_cancel_button       
 
         def add_new_profile_button_clicked(self,widget):
@@ -172 +193 @@
                 self.init_threads()
                 
-                self.msg_label.hide()
+                self.msg_label.set_text("")
                 self.profile_msg.hide()
                 self.profile_pbar.hide()
+                self.init_profile_dialog_button()
                 self.new_profile_window.show()
+                
 
         #def add_new_profile_button_clicked     
@@ -181 +204 @@
         def delete_profile_clicked(self,button,hbox):
 
-                self.msg_label.hide()
+                self.msg_label.set_text("")
                 profile=hbox.get_children()[1].get_text().split("\n")[0]
                 self.profiles_info.pop(profile)
@@ -190 +213 @@
 
                 if delete:
-                        self.msg_label.set_text(_("Changes applied successfully"))
+                        self.msg_label.set_text(MSG_CHANGE_SUCCESS)
                         self.profile_list_box.remove(hbox)
                 else:
                         self.msg_label.set_name("MSG_ERROR_LABEl")
-                        self.msg_label.set_text(_("An error ocurred applying changes. See log file for more information"))
+                        self.msg_label.set_text(MSG_CHANGE_ERROR)
 
                 self.profiles_info=self.core.LliurexGoogleDriveManager.profiles_config.copy()
@@ -204 +227 @@
         def sync_profile_clicked(self,button,hbox):
 
-                self.msg_label.hide()
+                self.msg_label.set_text("")
                 profile=hbox.get_children()[1].get_text().split("\n")[0]
                 mountpoint=hbox.get_children()[3].get_text()
@@ -221 +244 @@
                                 button.set_tooltip_text(_("Mount profile"))
 
-                        self.msg_label.set_text(_("Changes applied successfully"))
+                        self.msg_label.set_text(MSG_CHANGE_SUCCESS)
         
                                                 
                 else:
                         self.msg_label.set_name("MSG_ERROR_LABEl")
-                        self.msg_label.set_text(_("An error ocurred applying changes. See log file for more information"))
+                        self.msg_label.set_text(MSG_CHANGE_ERROR)
         
                 hbox.get_children()[4].set_image(mount_image)
@@ -249 +272 @@
                 self.init_threads()
 
-                self.profile_msg.set_text("")
+                self.profile_msg.hide()
                 self.profile_pbar.hide()
-                self.msg_label.hide()
+                self.msg_label.set_text("")
+                self.init_profile_dialog_button()
                 self.new_profile_window.show()  
 
@@ -267 +291 @@
                 profile=Gtk.Label()
                 profile.set_markup(profile_info)
-                profile.set_margin_left(10)
-                profile.set_margin_right(20)
+                profile.set_margin_left(5)
+                profile.set_margin_right(15)
                 profile.set_margin_top(21)
                 profile.set_margin_bottom(21)
@@ -411 +435 @@
                                                 self.profiles_info=self.core.LliurexGoogleDriveManager.profiles_config.copy()   
                                                 self.profile_msg.set_text(_("Profile created successfully"))
-
-                                                image = Gtk.Image()
-                                                image.set_from_stock(Gtk.STOCK_CLOSE,Gtk.IconSize.MENU)
-                                                self.cancel_add_profile_button.set_image(image)
-                                                self.cancel_add_profile_button.set_label(_("Close"))    
-                                                self.cancel_add_profile_button.show()
+                                                self.change_cancel_button()
+                                                
                                 else:
                                         
@@ -434 +454 @@
                 if self.create_mountpoint_t.launched:
                         if not self.create_mountpoint_t.done:
-                                return True                                     
+                                return True             
+
+        #def_pulsate_add_profile                                                
 
         def kill_create_profile(self):
@@ -445 +467 @@
                                 self.profile_msg.set_text(_("Error getting authorization"))
 
-                        return True     
-
+                return True     
+
+        #def kill_create_profile        
 
         def create_profile(self):
+
                 result=self.core.LliurexGoogleDriveManager.create_profile(self.new_profile)
 
+        #def create_profile     
 
         def create_mountpoint(self):
-
 
                 self.create_result=self.core.LliurexGoogleDriveManager.create_mountpoint(self.profiles_info,self.new_profile)
                 self.create_mountpoint_t.done=True
                 
-
+        #def create_mountpoint  
 
         def pulsate_edit_profile(self):
@@ -473 +497 @@
                                 self.profile_to_edit.get_children()[3].set_text(self.new_mountpoint)
                                 self.profiles_info=self.core.LliurexGoogleDriveManager.profiles_config.copy()   
-                                self.profile_msg.set_text(_("Changes applied successfully"))
-                                image = Gtk.Image()
-                                image.set_from_stock(Gtk.STOCK_CLOSE,Gtk.IconSize.MENU)
-                                self.cancel_add_profile_button.set_image(image)
-                                self.cancel_add_profile_button.set_label(_("Close"))    
-                                self.cancel_add_profile_button.show()   
+                                self.profile_msg.set_text(MSG_CHANGE_SUCCESS)
+                                self.change_cancel_button()
                         
                         else:
                                 self.profile_msg.set_name("MSG_ERROR_LABEL")
-                                self.profile_msg.set_text(_("An error ocurred applying changes. See log file for more information"))
+                                self.profile_msg.set_text(MSG_CHANGE_ERROR)
                                 self.cancel_add_profile_button.show()
                         return False
@@ -491 +511 @@
                                 return True
 
+        #def pulsate_edit_profile                       
+
         def edit_profile(self):
+
                 self.edit_result=self.core.LliurexGoogleDriveManager.edit_profile(self.profiles_info,self.new_profile)
                 self.edit_profile_t.done=True
 
+        #def edit_profile       
+
         def cancel_add_profile_clicked(self,widget):
                 

lliurex-gdrive/trunk/fuentes/lliurex-gdrive-gui.install/usr/share/lliurex-gdrive/rsrc/lliurex-gdrive.ui

@@ -53 +53 @@
             <property name="margin_right">10</property>
             <property name="margin_top">10</property>
-            <property name="margin_bottom">5</property>
+            <property name="margin_bottom">10</property>
             <property name="use_stock">True</property>
           </object>