aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug with change name of drawing.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2013-10-10 13:00:04 +03:00
parent ca61b27599
commit 80b5fe6d5e
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mainwindow.cpp
View File

@ -198,8 +198,12 @@ void MainWindow::OptionDraw(){
} }
delete dlg; delete dlg;
index = comboBoxDraws->findText(doc->GetNameActivDraw()); index = comboBoxDraws->findText(doc->GetNameActivDraw());
doc->SetNameDraw(nameDraw); if(doc->SetNameDraw(nameDraw)){
comboBoxDraws->setItemText(index, nameDraw); comboBoxDraws->setItemText(index, nameDraw);
} else {
QMessageBox::warning(this, tr("Error saving change!!!"), tr("Can't save new name of drawing"));
}
} }
template <typename Dialog, typename Func> template <typename Dialog, typename Func>

15
xml/vdomdocument.cpp
View File

@ -169,11 +169,20 @@ void VDomDocument::ChangeActivDraw(const QString& name, Document::Documents pars
} }
} }
void VDomDocument::SetNameDraw(const QString& name){ bool VDomDocument::SetNameDraw(const QString& name){
Q_ASSERT_X(!name.isEmpty(), "SetNameDraw", "name draw is empty"); Q_ASSERT_X(!name.isEmpty(), "SetNameDraw", "name draw is empty");
QString oldName = nameActivDraw; QString oldName = nameActivDraw;
nameActivDraw = name; QDomElement element;
emit ChangedNameDraw(oldName, nameActivDraw); if(GetActivDrawElement(element)){
nameActivDraw = name;
element.setAttribute("name", nameActivDraw);
emit haveChange();
emit ChangedNameDraw(oldName, nameActivDraw);
return true;
} else {
qWarning()<<"Can't find activ draw"<<Q_FUNC_INFO;
return false;
}
} }
void VDomDocument::SetActivDraw(const QString& name){ void VDomDocument::SetActivDraw(const QString& name){

2
xml/vdomdocument.h
View File

@ -55,7 +55,7 @@ public:
bool GetActivModelingElement(QDomElement &element); bool GetActivModelingElement(QDomElement &element);
bool GetActivDetailsElement(QDomElement &element); bool GetActivDetailsElement(QDomElement &element);
bool appendDraw(const QString& name); bool appendDraw(const QString& name);
void SetNameDraw(const QString& name); bool SetNameDraw(const QString& name);
void Parse(Document::Documents parse, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail); void Parse(Document::Documents parse, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail);
QHash<qint64, VDataTool*>* getTools(); QHash<qint64, VDataTool*>* getTools();
QVector<VToolRecord> *getHistory(); QVector<VToolRecord> *getHistory();