diff --git a/agkyra/gui/about.html b/agkyra/gui/about.html
index a4002d629b0a0a53387e52efab61c99346bdb541..ef72ee8e27e04be26ed65fab43b41e59ed065898 100644
--- a/agkyra/gui/about.html
+++ b/agkyra/gui/about.html
@@ -2,7 +2,7 @@
<head><title>Agkyra Syncing Client for Pithos+</title></head>
<body style="-webkit-app-region: drag; text-align: center">
<div>
- <img src="icons/logo.png" style="width: 64px; height: 64px;" />
+ <img src="images/logo.png" style="width: 64px; height: 64px;" />
<h1>Agkyra</h1>
<h2>... it syncs</h2>
<p> </p>
diff --git a/agkyra/gui/icons/exit.png b/agkyra/gui/icons/exit.png
deleted file mode 100644
index 12f93a705640cbe10ed5c8beab64e1c60a7b9581..0000000000000000000000000000000000000000
Binary files a/agkyra/gui/icons/exit.png and /dev/null differ
diff --git a/agkyra/gui/icons/about.png b/agkyra/gui/images/about.png
similarity index 100%
rename from agkyra/gui/icons/about.png
rename to agkyra/gui/images/about.png
diff --git a/agkyra/gui/images/exit.png b/agkyra/gui/images/exit.png
new file mode 100644
index 0000000000000000000000000000000000000000..154ee0bc76566272173949dad982949172fe66f2
Binary files /dev/null and b/agkyra/gui/images/exit.png differ
diff --git a/agkyra/gui/icons/folder.png b/agkyra/gui/images/folder.png
similarity index 100%
rename from agkyra/gui/icons/folder.png
rename to agkyra/gui/images/folder.png
diff --git a/agkyra/gui/icons/logo.png b/agkyra/gui/images/logo.png
similarity index 100%
rename from agkyra/gui/icons/logo.png
rename to agkyra/gui/images/logo.png
diff --git a/agkyra/gui/icons/logs.png b/agkyra/gui/images/logs.png
similarity index 100%
rename from agkyra/gui/icons/logs.png
rename to agkyra/gui/images/logs.png
diff --git a/agkyra/gui/images/off.png b/agkyra/gui/images/off.png
new file mode 100644
index 0000000000000000000000000000000000000000..33fd9d89427127dd60a404c6ab336cb12d56e67f
Binary files /dev/null and b/agkyra/gui/images/off.png differ
diff --git a/agkyra/gui/images/on.png b/agkyra/gui/images/on.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b5ac58897b0280bd14155196ab7547ab2d35b3b
Binary files /dev/null and b/agkyra/gui/images/on.png differ
diff --git a/agkyra/gui/icons/pithos.png b/agkyra/gui/images/pithos.png
similarity index 100%
rename from agkyra/gui/icons/pithos.png
rename to agkyra/gui/images/pithos.png
diff --git a/agkyra/gui/images/play_pause.png b/agkyra/gui/images/play_pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1412bb71192f4698cfc7fc6f9964ee2658a5623
Binary files /dev/null and b/agkyra/gui/images/play_pause.png differ
diff --git a/agkyra/gui/icons/settings.png b/agkyra/gui/images/settings.png
similarity index 100%
rename from agkyra/gui/icons/settings.png
rename to agkyra/gui/images/settings.png
diff --git a/agkyra/gui/icons/tray.png b/agkyra/gui/images/tray.png
similarity index 100%
rename from agkyra/gui/icons/tray.png
rename to agkyra/gui/images/tray.png
diff --git a/agkyra/gui/logs.txt b/agkyra/gui/logs.txt
deleted file mode 100644
index e826567aa016f2c2acd766e3db353ff1cac1887b..0000000000000000000000000000000000000000
--- a/agkyra/gui/logs.txt
+++ /dev/null
@@ -1 +0,0 @@
-There must be some logs
diff --git a/agkyra/gui/protocol.js b/agkyra/gui/protocol.js
index 0751f19e495bc0886f75fa0e3ba67d921198b58a..8be2c88068ddf0d8f09e73b7fa14bb7fe8bd71ac 100644
--- a/agkyra/gui/protocol.js
+++ b/agkyra/gui/protocol.js
@@ -131,37 +131,39 @@ function closeWindows() {
var tray = new gui.Tray({
// tooltip: 'Paused (0% synced)',
title: 'Agkyra syncs with Pithos+',
- icon: 'icons/tray.png'
+ icon: 'images/tray.png'
});
var menu = new gui.Menu();
// Progress and Pause
-var start_syncing = 'Start syncing';
-var pause_syncing = 'Pause syncing';
+var start_syncing = 'Start Syncing';
+var start_icon = 'images/play.png';
+var pause_syncing = 'Pause Syncing';
var paused = true;
progress_item = new gui.MenuItem({
// progress menu item
label: 'Initializing',
- type: 'normal'
+ type: 'normal',
+ enabled: false
});
menu.append(progress_item);
+menu.append(new gui.MenuItem({type: 'separator'}));
pause_item = new gui.MenuItem({
// pause menu item
+ icon: 'images/play_pause.png',
label: '',
type: 'normal',
click: function() {
- if(paused) {post_start(socket);}
- else {post_pause(socket);}
+ if (paused) {post_start(socket);} else {post_pause(socket);}
}
});
pause_item.enabled = false;
menu.append(pause_item);
// Update progress
-
-function reset_status() {
+window.setInterval(function() {
var status = globals['status'];
var new_progress = progress_item.label;
var new_pause = pause_item.label;
@@ -172,25 +174,22 @@ function reset_status() {
// Update to "Paused - start syncing"
paused = true;
new_pause = start_syncing;
- progress_item.enabled = false;
menu_modified = true;
} // else continue syncing
- new_progress = 'Progress: ' + status['progress'] + '%';
+ new_progress = status['progress'] + '%' + ' synced';
break;
case start_syncing: if (status['paused']) return;
// else update to "Syncing - pause syncing"
paused = false;
new_pause = pause_syncing;
- progress_item.enabled = true;
- new_progress = 'Progress: ' + status['progress'] + '%';
+ new_progress = status['progress'] + '%' + ' synced';
menu_modified = true;
break;
default:
if (status['paused']) {new_pause = start_syncing; paused=true;}
else {new_pause = pause_syncing; paused=false;}
- new_progress = 'Progress: ' + status['progress'] + '%';
+ new_progress = status['progress'] + '%' + ' synced';
pause_item.enabled = true;
- progress_item.enabled = true;
menu_modified = true;
}
}
@@ -202,16 +201,17 @@ function reset_status() {
progress_item.label = new_progress;
menu_modified = true;
}
- if (menu_modified) tray.menu = menu;
+ if (menu_modified) {
+ if (paused) progress_item.label += ' - paused';
+ tray.menu = menu;
+ }
get_status(socket);
-}
-window.setInterval(reset_status, 1000);
+}, 1500);
// Menu actions contents
-menu.append(new gui.MenuItem({type: 'separator'}));
menu.append(new gui.MenuItem({
label: 'Open local folder',
- icon: 'icons/folder.png',
+ icon: 'images/folder.png',
click: function () {
var dir = globals['settings']['directory'];
console.log('Open ' + dir);
@@ -221,7 +221,7 @@ menu.append(new gui.MenuItem({
menu.append(new gui.MenuItem({
label: 'Launch Pithos+ page',
- icon: 'icons/pithos.png',
+ icon: 'images/pithos.png',
click: function () {
var pithos_url = globals['settings']['pithos_url'];
console.log('Visit ' + pithos_url);
@@ -229,17 +229,11 @@ menu.append(new gui.MenuItem({
}
}));
-menu.append(new gui.MenuItem({
- label: 'Recently changed files',
- icon: 'icons/logs.png',
- click: function () {gui.Shell.openItem('logs.txt');}
-}));
-
// Settings and About
menu.append(new gui.MenuItem({type: 'separator'}));
menu.append(new gui.MenuItem({
label: 'Settings',
- icon: 'icons/settings.png',
+ icon: 'images/settings.png',
click: function () {
if (windows['settings']) windows['settings'].close();
windows['settings'] = gui.Window.open("settings.html", {
@@ -249,7 +243,7 @@ menu.append(new gui.MenuItem({
menu.append(new gui.MenuItem({
label: 'About',
- icon: 'icons/about.png',
+ icon: 'images/about.png',
click: function () {
if (windows['about']) windows['about'].close();
windows['about'] = gui.Window.open("about.html", {
@@ -261,7 +255,7 @@ menu.append(new gui.MenuItem({
menu.append(new gui.MenuItem({type: 'separator'}));
menu.append(new gui.MenuItem({
label: 'Quit Agkyra',
- icon: 'icons/exit.png',
+ icon: 'images/exit.png',
click: function() {post_shutdown(socket);}
}));
diff --git a/agkyra/gui/ws.html b/agkyra/gui/ws.html
deleted file mode 100644
index 7693d80cc0013492e412576ccdf970ea937b2c94..0000000000000000000000000000000000000000
--- a/agkyra/gui/ws.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html><head>
-<script>
-
- // Read config file
- var socket = new WebSocket("ws://83.212.96.33:8888");
- socket.onopen = function() {
- console.log('open dude!');
- this.send('Hello World!');
- };
- socket.onmessage = function(e) {
- console.log('message', e.data);
- };
- socket.onerror = function() {
- console.log('error');
- };
- socket.onclose = function(e) {
- console.log('close', e.code, e.reason);
- };
-</script>
-</head><body></body></html>
\ No newline at end of file
diff --git a/agkyra/protocol.py b/agkyra/protocol.py
index df115fd5beb15ce86a879a98dc23b0ab32f44e11..8f33210a4e0b3f56f2bace13e7725c9125fe9483 100644
--- a/agkyra/protocol.py
+++ b/agkyra/protocol.py
@@ -61,11 +61,13 @@ class WebSocketProtocol(WebSocket):
directory='/tmp/.',
exclude='agkyra.log',
pithos_url='https://pithos.okeanos.grnet.gr/ui/')
- status = dict(progress=-1, paused=False)
+ status = dict(progress=0, paused=False)
# Syncer-related methods
def get_status(self):
- self.status['progress'] += 1
+ from random import randint
+ if self.status['progress'] < 100:
+ self.status['progress'] += 0 if randint(0, 2) else 1
return self.status
def get_settings(self):