navilocal 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44aea07beba53d9e85a3ca39d76ee5085fc1baec93d0f67fddd8ae4b931ab0f7
-  data.tar.gz: 6c7246d64199dff25eeabed0e6f7da3c1c1652edee78a9529f8207fa38a834a2
+  metadata.gz: 50e2ab7fb4d7cf1813173539e3d2ab77b5acdc47849a9cb7e29ed1a2bdf87917
+  data.tar.gz: 07d35928083050ff99e47f2bb88cd37abf6d8daffc3edc624d680ffa7939a636
 SHA512:
-  metadata.gz: 06fa4c7f08442c515f705aae097f9c84fcda79ae271f0b51aeb90dc83d116427c775c3e77877f16ade15dac839e927787e4240f0e3ca418051ae4da9f3e26dee
-  data.tar.gz: 6c969be5fa8a7cc045355ca626b556d8453bdc9871297a980094baa7988a693563bdcfc5aa2e8399b84e9e141978be30b37be0c75e3e4a90d7005a0d49435f0c
+  metadata.gz: 9a83cf5c0460528507e4f74b2f016de3eec43e07cfa551f808d8e14df2db79e4e1638aa9f072923fabb8e13f1508772008ae9848bd036cc30decd0ddbe0f9cb8
+  data.tar.gz: ba0911cd0c6bfd6bf0043b68c35167481f15891cbb8a57af58d63290658b33d407328acdcade619431e8a0d5f9f0514d2034f0dc74fe613114428142dc19f610

data/application/lib/common_functions.rb

@@ -3,6 +3,10 @@ module CommonFunctions
   def create_tags(buffer)
     buffer.create_tag("double_spaced_line",
                       "pixels_inside_wrap" => 2)
+
+    buffer.create_tag("small_gap_below",
+                      "pixels_below_lines" => 2)
+
     buffer.create_tag("large_spaced_line",
                       "pixels_inside_wrap" => 8)
     buffer.create_tag("wide_margins",

data/application/ui/navi/account_configuration.rb

@@ -4,8 +4,9 @@ module NaviClientInstaller
     attr_accessor :window_ui
     include CommonFunctions
     attr_accessor :next_btn
+    attr_accessor :cancel_btn
 
-    def initialize(settings, next_btn=nil)
+    def initialize(settings, next_btn=nil, show_cancel_btn = nil)
       builder = Gtk::Builder.new(:resource => '/com/navi/navi-client/ui/account_configuration.ui')
       css_provider = Gtk::CssProvider.new
       css_provider.load(:resource_path => '/com/navi/navi-client/css/main.css')
@@ -15,7 +16,13 @@ module NaviClientInstaller
       @combo_text_provider = builder.get_object("combo_text_ac_provider")
       @entry_email = builder.get_object("entry_email")
       @entry_password = builder.get_object("entry_password")
-      @next_btn = next_btn.nil? ?  builder.get_object("btn_change") : next_btn
+
+
+      if(next_btn.nil?)
+        @next_btn = builder.get_object("btn_change")
+        @cancel_btn = builder.get_object("btn_cancel")
+        @cancel_btn.visible = true unless show_cancel_btn.nil?
+      end
       @next_btn.visible = true
 
       # @settings = settings

data/application/ui/navi/installer_assistant.rb

@@ -97,12 +97,14 @@ module NaviClientInstaller
       end
 
 
-      @logout_control = Proc.new do |arg|
+      @logout_control = Proc.new do |show_cancel_btn|
         # @current_window.prepare_ui btn_next, btn_back
         #
         main_stack.remove (@step_account_configuration.window_ui) if @step_account_configuration
 
-        @step_account_configuration = NaviClientInstaller::AccountConfiguration.new @settings
+        @step_account_configuration = NaviClientInstaller::AccountConfiguration.new @settings, nil, show_cancel_btn
+        temp_password = @settings.password
+        temp_username = @settings.username
 
         @step_account_configuration.next_btn.signal_connect 'clicked' do |button|
 
@@ -112,6 +114,14 @@ module NaviClientInstaller
           @splash.initiate_signup @signup_gauss, @logout_control
         end
 
+        @step_account_configuration.cancel_btn&.signal_connect 'clicked' do |button|
+          @settings.password = temp_password
+          @settings.username = temp_username
+          @settings.save_settings
+          main_stack.set_visible_child(@splash.window_ui)
+          @splash.initiate_signup @signup_gauss, @logout_control
+        end
+
         main_stack.add_named(@step_account_configuration.window_ui, "account_configuration")
 
 

data/application/ui/navi/main_runner.rb

@@ -38,6 +38,8 @@ module NaviClientInstaller
       @settings = settings
       apply_css @window_ui, css_provider
 
+
+      create_tags(@log_display.buffer)
       @iter_log = @log_display.buffer.get_iter_at(:offset => 0)
 
       @log_display.signal_connect 'size-allocate' do |button|
@@ -47,7 +49,7 @@ module NaviClientInstaller
 
       @stop_btn.signal_connect 'clicked' do |button|
         terminate_worker_thread
-        @logger.debug "Process terminated"
+        @logger.debug "process terminated"
         button.set_sensitive false
         @spinner_indicator.active = false
         @notifier.label = "Terminated.."
@@ -152,7 +154,6 @@ module NaviClientInstaller
           filenames = []
           dateStarted = DateTime.now
           @logger.debug "Syncing started at #{dateStarted}"
-          @client.logToLoggly({event:"EMAIL_SYNC_STARTED", env: env, storage: "local", email: @settings.username})
 
           sendEmailCompletedEvent = true
           folder = "Inbox"
@@ -165,7 +166,7 @@ module NaviClientInstaller
           downloaded = [downloaded, total].min
 
           @email_indicator.label = "#{downloaded}/#{total}"
-
+          @client.logToLoggly({event:"EMAIL_SYNC_STARTED", env: env, storage: "local", email: @settings.username, total_email: total, already_downloaded: downloaded})
 
             # start_naviai
           @notifier.label = "Checking for previous failures.."
@@ -183,7 +184,7 @@ module NaviClientInstaller
             downloaded = [downloaded, total].min
             @email_indicator.label = "#{downloaded}/#{total}"
 
-            @logger.debug "Processing Complete. OK..."
+            @logger.debug "processing Complete. OK..."
 
             if filenames.size == 50 || isLast
               sendEmailCompletedEvent = !sendEmailCompletedEvent
@@ -208,7 +209,7 @@ module NaviClientInstaller
                 totalTimeInSecs = (dateEnded - dateStarted) * 24 * 60 * 60
                 new_emails = true
 
-                @client.logToLoggly({event:"EMAIL_SYNC_FINISHED", env: env, storage: "local", email: @settings.username, emailCount: index + 1, time_elapsed: totalTimeInSecs.to_f.round(2)})
+                @client.logToLoggly({event:"EMAIL_SYNC_FINISHED", env: env, storage: "local", email: @settings.username, emailCount: index + 1, time_elapsed: totalTimeInSecs.to_f.round(2), total_email: total, already_downloaded: downloaded})
                 @logger.debug "#{index + 1} emails from the #{folder} has been downloaded. OK"
                 @logger.debug "started: #{dateStarted.to_s} , ended: #{dateEnded.to_s}, Total time: #{totalTimeInSecs.to_f.round(2)} secs"
               end
@@ -227,7 +228,7 @@ module NaviClientInstaller
 
             if complete
               downloaded+=1
-              @logger.debug "Processing Complete. OK..."
+              @logger.debug "processing Complete. OK..."
             else
               @notifier.label = "Fetching emails..."
               @logger.debug "processing email##{index + 1} with id #{mail.__id__.to_s} and uuid #{id}"
@@ -300,13 +301,15 @@ class CustomLogger
 
   def info msg
     # p msg
-    @buffer.insert_markup(@iter, "#{msg}\n")
+    @buffer.insert(@iter, "#{msg}", :tags => %w(small_gap_below normal-size))
+    @buffer.insert_markup(@iter, "\n")
     @logger_custom.info msg
   end
 
   def debug msg
     # p msg
-    @buffer.insert_markup(@iter, "#{msg}\n")
+    @buffer.insert(@iter, "#{msg}", :tags => %w(small_gap_below normal-size))
+    @buffer.insert_markup(@iter, "\n")
     @logger_custom.debug msg
   end
 end

data/application/ui/navi/splash.rb

@@ -58,14 +58,13 @@ module NaviClientInstaller
       password_entry = @builder.get_object("entry_splash_pass")
       back_btn = @builder.get_object("back")
       connect_btn = @builder.get_object("connect_btn")
-      account_label = @builder.get_object("account_label")
 
       email_entry.set_text @settings.username
       password_entry.set_text ""
 
       if login_info.label.to_s.empty?
         back_btn.signal_connect("clicked") {|widget|
-          back_callback&.call
+          back_callback&.call true
         }
 
         connect_btn.signal_connect("clicked") {|widget|
@@ -115,13 +114,10 @@ module NaviClientInstaller
         }
 
         # create_tags(login_info.buffer)
-        create_tags(account_label.buffer)
 
         login_info.label =  "Please connect to our app using your preferred email address."
         # login_info.buffer.insert(login_info.buffer.get_iter_at(:offset => 0), "Please connect to our app using your preferred email address.")
 
-        account_label.buffer.insert(account_label.buffer.get_iter_at(:offset => 0), "Don't have an Account? Create Account.")
-
       end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navilocal
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Msanjib