From 5218f41e7b084b0282cf8618e1275357eb027bc4 Mon Sep 17 00:00:00 2001 From: Salvo 'LtWorf' Tomaselli Date: Wed, 17 Jun 2015 16:35:14 +0200 Subject: [PATCH] Use handler to suggest name --- relational_gui/guihandler.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/relational_gui/guihandler.py b/relational_gui/guihandler.py index 21ee5d8..48b36c5 100644 --- a/relational_gui/guihandler.py +++ b/relational_gui/guihandler.py @@ -16,10 +16,6 @@ # along with this program. If not, see . # # author Salvo "LtWorf" Tomaselli -import sys -import os -import os.path - from PyQt5 import QtCore, QtWidgets, QtWidgets from relational import relation, parser, optimizer, rtypes @@ -297,17 +293,9 @@ class relForm(QtWidgets.QMainWindow): for f in filenames: # Default relation's name - name = os.path.basename(f).lower() - - if len(name) == 0: - return - - if (name.endswith(".csv")): # removes the extension - name = name[:-4] - - if not rtypes.is_valid_relation_name(name): + name = self.user_interface.suggest_name(f) + if name is None: name = self.promptRelationName() - if name is None: continue