diff --git a/umbra/controller.py b/umbra/controller.py index a817fe7a91ddae309824b1fd612d15990e78dfde..a866f750b1dca73351bc8c6e484079407877ccaa 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 59e6f1d619f7d525817d8a7f002bde9e2da9b2d0..916194c2c1c8fd8060047c4abd3a7b99ecb7e625 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 2f54dc86800fca6b37873cee8b32d4dd1edd631a..e0ae0ef46cdfc09c780ff3141cb8c5fc8b8868ec 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):