Commit 93b750a8 authored by Claudio Valerio's avatar Claudio Valerio

The empty name should be avoided and the same directory name too. File name...

The empty name should be avoided and the same directory name too. File name could have the same name this is as before
parent af6dc9c6
...@@ -84,8 +84,8 @@ void UBDocumentTreeWidget::onItemPressed(QTreeWidgetItem* item, int column) ...@@ -84,8 +84,8 @@ void UBDocumentTreeWidget::onItemPressed(QTreeWidgetItem* item, int column)
void UBDocumentTreeWidget::itemChangedValidation(QTreeWidgetItem * item, int column) void UBDocumentTreeWidget::itemChangedValidation(QTreeWidgetItem * item, int column)
{ {
// QString emptyNameWarningTitle = tr("Empty name"); QString emptyNameWarningTitle = tr("Empty name");
// QString emptyNameWarningText = tr("The name should not be empty. Please enter a valid name."); QString emptyNameWarningText = tr("The name should not be empty. Please enter a valid name.");
QString alreadyExistsNameWarningTitle = tr("Name already used"); QString alreadyExistsNameWarningTitle = tr("Name already used");
QString alreadyExistsNameWarningText = tr("The actual name is in conflict with and existing. Please choose another one."); QString alreadyExistsNameWarningText = tr("The actual name is in conflict with and existing. Please choose another one.");
...@@ -94,23 +94,12 @@ void UBDocumentTreeWidget::itemChangedValidation(QTreeWidgetItem * item, int col ...@@ -94,23 +94,12 @@ void UBDocumentTreeWidget::itemChangedValidation(QTreeWidgetItem * item, int col
if (treeItem) if (treeItem)
{ {
QString name = treeItem->text(column); QString name = treeItem->text(column);
// if(name.isEmpty()) if(name.isEmpty()){
// UBApplication::mainWindow->warning(emptyNameWarningTitle,emptyNameWarningText); mFailedValidationForTreeItem = item;
mFailedValidationItemColumn = column;
UBApplication::mainWindow->warning(emptyNameWarningTitle,emptyNameWarningText);
for(int i = 0; i < treeItem->parent()->childCount(); i++) QTimer::singleShot(100,this,SLOT(validationFailed()));
{ return;
QTreeWidgetItem* childAtPosition = treeItem->parent()->child(i);
if (childAtPosition != item && childAtPosition->text(column) == name){
UBApplication::mainWindow->warning(alreadyExistsNameWarningTitle,alreadyExistsNameWarningText);
// This is not really a good way but at this time we are not yet out of the editing time
// this is not what is told by the name of the function itemChanged...
mFailedValidationForTreeItem = item;
mFailedValidationItemColumn = column;
QTimer::singleShot(100,this,SLOT(validationFailed()));
return;
}
} }
} }
...@@ -119,8 +108,13 @@ void UBDocumentTreeWidget::itemChangedValidation(QTreeWidgetItem * item, int col ...@@ -119,8 +108,13 @@ void UBDocumentTreeWidget::itemChangedValidation(QTreeWidgetItem * item, int col
if(group) if(group)
{ {
QString name = group->text(column); QString name = group->text(column);
// if(name.isEmpty()) if(name.isEmpty()){
// UBApplication::mainWindow->warning(emptyNameWarningTitle,emptyNameWarningText); mFailedValidationForTreeItem = item;
mFailedValidationItemColumn = column;
UBApplication::mainWindow->warning(emptyNameWarningTitle,emptyNameWarningText);
QTimer::singleShot(100,this,SLOT(validationFailed()));
return;
}
if(group->parent()){ if(group->parent()){
for(int i = 0; i < group->parent()->childCount(); i++) for(int i = 0; i < group->parent()->childCount(); i++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment