From e265eb26f45d9ca14e13e2635976e93df2c23715 Mon Sep 17 00:00:00 2001
From: "Verbeek, J.M. (Janneke)" <j.verbeek@student.ru.nl>
Date: Tue, 10 Dec 2019 11:43:13 +0100
Subject: [PATCH] There is a typo in the branch name. This should however fix a
bug where two files can be added at the same time and should fix the button
texts
---
umbra/controller.py | 4 ++--
umbra/utils.py | 1 +
umbra/view.py | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/umbra/controller.py b/umbra/controller.py
index a817fe7a..a866f750 100644
--- a/umbra/controller.py
+++ b/umbra/controller.py
@@ -173,7 +173,7 @@ class Controller:
dict = self._model.get_multi_data(type)
key = ut.shadow_regex(file_path)
data = self._filereader.read(file_path, type)
- ut.add_to_dict(key, data, dict, alternative=True)
+ ut.add_to_dict(key, data, dict)
else:
for file_path in self._source_files:
if ".csv" not in file_path:
@@ -182,4 +182,4 @@ class Controller:
dict = self._model.get_multi_data(type)
key = ut.id_regex(file_path)
data = self._filereader.read(file_path, type)
- ut.add_to_dict(key, data, dict, alternative=True)
+ ut.add_to_dict(key, data, dict)
diff --git a/umbra/utils.py b/umbra/utils.py
index 59e6f1d6..916194c2 100644
--- a/umbra/utils.py
+++ b/umbra/utils.py
@@ -87,3 +87,4 @@ class Utils:
cnt += 1
key += "({})".format(str(cnt))
dict[key] = value
+ pass
diff --git a/umbra/view.py b/umbra/view.py
index 2f54dc86..e0ae0ef4 100644
--- a/umbra/view.py
+++ b/umbra/view.py
@@ -199,18 +199,18 @@ class View:
2, column)
self._create_button('select {}'.format(type),
frame,
- 'Select {} file'.format(type),
+ 'Add {} file'.format(type),
5, column)
self._create_button('delete {}'.format(type),
frame,
- 'Delete {}'.format(type),
+ 'Remove {}'.format(type),
7, column)
self._create_button('rm_all {}'.format(type),
frame,
- 'Delete all {} files'.format(type),
+ 'Remove all {} files'.format(type),
8, column)
self._create_button('select_folder {}'.format(type), frame,
- 'Select {} folder'.format(type),
+ 'Add {} folder'.format(type),
6, column)
def _create_button(self, key, frame, text, row, column):
--
GitLab