From 3c5190b313bae4b50c60c728fd5682a46b4c5ae5 Mon Sep 17 00:00:00 2001 From: Mika Koivistoinen Date: Wed, 25 Apr 2018 10:20:01 +0300 Subject: [PATCH 1/4] Delete config.yml from the project root --- config.yml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 config.yml diff --git a/config.yml b/config.yml deleted file mode 100644 index 4ea34f4a6..000000000 --- a/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -node: wss://bitshares.openledger.info/ws - -workers: {} \ No newline at end of file From 2103605144a314eb788190fb39d169175a1b5bb9 Mon Sep 17 00:00:00 2001 From: Mika Koivistoinen Date: Thu, 26 Apr 2018 10:18:49 +0300 Subject: [PATCH 2/4] Fix worker name editing in the gui --- dexbot/views/worker_item.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dexbot/views/worker_item.py b/dexbot/views/worker_item.py index e1dc922c3..64d522dab 100644 --- a/dexbot/views/worker_item.py +++ b/dexbot/views/worker_item.py @@ -98,11 +98,11 @@ def remove_widget(self): self.view.remove_worker_widget(self.worker_name) self.view.ui.add_worker_button.setEnabled(True) - def reload_widget(self, worker_name, new_worker_name): + def reload_widget(self, worker_name): """ Cancels orders of the widget's worker and then reloads the data of the widget """ self.main_ctrl.remove_worker(worker_name) - self.worker_config = self.main_ctrl.get_worker_config(new_worker_name) + self.worker_config = self.main_ctrl.get_worker_config(worker_name) self.setup_ui_data(self.worker_config) self._pause_worker() @@ -115,5 +115,5 @@ def handle_edit_worker(self): if return_value: new_worker_name = edit_worker_dialog.worker_name self.main_ctrl.replace_worker_config(self.worker_name, new_worker_name, edit_worker_dialog.worker_data) - self.reload_widget(self.worker_name, new_worker_name) + self.reload_widget(new_worker_name) self.worker_name = new_worker_name From 4a758f4822fa59ee7c75cfc37ecdf2e4d4eefba8 Mon Sep 17 00:00:00 2001 From: Mika Koivistoinen Date: Thu, 26 Apr 2018 10:42:04 +0300 Subject: [PATCH 3/4] Fix order canceling when reloading a worker widget --- dexbot/views/worker_item.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dexbot/views/worker_item.py b/dexbot/views/worker_item.py index 64d522dab..ede4637af 100644 --- a/dexbot/views/worker_item.py +++ b/dexbot/views/worker_item.py @@ -99,9 +99,8 @@ def remove_widget(self): self.view.ui.add_worker_button.setEnabled(True) def reload_widget(self, worker_name): - """ Cancels orders of the widget's worker and then reloads the data of the widget + """ Reload the data of the widget """ - self.main_ctrl.remove_worker(worker_name) self.worker_config = self.main_ctrl.get_worker_config(worker_name) self.setup_ui_data(self.worker_config) self._pause_worker() @@ -114,6 +113,7 @@ def handle_edit_worker(self): # User clicked save if return_value: new_worker_name = edit_worker_dialog.worker_name + self.main_ctrl.remove_worker(self.worker_name) self.main_ctrl.replace_worker_config(self.worker_name, new_worker_name, edit_worker_dialog.worker_data) self.reload_widget(new_worker_name) self.worker_name = new_worker_name From 7e700dacb2f67f1c594d7a1ee9ac68f4f771e322 Mon Sep 17 00:00:00 2001 From: Mika Koivistoinen Date: Fri, 27 Apr 2018 13:14:43 +0300 Subject: [PATCH 4/4] Change dexbot version number to 0.1.16 --- dexbot/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dexbot/__init__.py b/dexbot/__init__.py index cce7a58bb..59e42f3e1 100644 --- a/dexbot/__init__.py +++ b/dexbot/__init__.py @@ -3,7 +3,7 @@ from appdirs import user_config_dir APP_NAME = "dexbot" -VERSION = '0.1.15' +VERSION = '0.1.16' AUTHOR = "codaone" __version__ = VERSION