From dedff60119ad2e08bf226e7b9794707d8e1c3901 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 4 May 2012 19:40:25 -0400 Subject: [PATCH] transfer log works, yay --- bin/unison-watch | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/bin/unison-watch b/bin/unison-watch index 0670f53..6a1ec65 100755 --- a/bin/unison-watch +++ b/bin/unison-watch @@ -140,8 +140,16 @@ class UnisonWatcher < Qt::Application @active_status = Qt::Action.new("Pause syncing", @menu) @active_status.connect(SIGNAL :triggered) { toggle_status } + @current_log_size = File.size(File.expand_path(TRANSFER_LOG)) + + @fileview = Qt::TextEdit.new + @fileview.plainText = "Watching for changes..." + @fileview.readOnly = true + @fileview.resize 800, 600 + @fileview.connect(SIGNAL :textChanged) { @fileview.moveCursor Qt::TextCursor::End } + @log = Qt::Action.new("View transfer log", @menu) - @log.connect(SIGNAL :triggered) { system %{open #{TRANSFER_LOG}} } + @log.connect(SIGNAL :triggered) { @fileview.show } quit = Qt::Action.new("Quit", @menu) quit.connect(SIGNAL :triggered) { @exiting = true } @@ -185,7 +193,6 @@ class UnisonWatcher < Qt::Application end def ui - @icon = Qt::SystemTrayIcon.new @icon.contextMenu = menu @@ -232,7 +239,13 @@ class UnisonWatcher < Qt::Application index = 0 while !@done @current_icon = "working-#{index + 1}" + File.open(File.expand_path(TRANSFER_LOG), 'r') { |fh| + fh.seek(@current_log_size) + @fileview.plainText = fh.read + } + update_ui + break if @done sleep 0.25 @@ -244,6 +257,11 @@ class UnisonWatcher < Qt::Application @remote_sync_check = SYNC_CHECK_COUNT @sync_now = false @queue.update { [] } + + File.open(File.expand_path(TRANSFER_LOG), 'r') { |fh| + fh.seek(@current_log_size) + @fileview.plainText = fh.read + } end rescue => e puts e.message