kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-20 16:20:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modification of the qmessagebox during the open of project

Browse Source 
more recently than the qet's version used.
The qmessagebox request if we want continue or cancel
the open of project




git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1314 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
nishiki
2011-08-26 19:06:35 +00:00
parent b1c0d8eea1
commit 0d58f970a1
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/qetdiagrameditor.cpp
View File

@@ -794,7 +794,7 @@ bool QETDiagramEditor::openAndAddProject(const QString &filepath, bool interacti
// cree le projet a partir du fichier // cree le projet a partir du fichier
QETProject *project = new QETProject(filepath); QETProject *project = new QETProject(filepath);
if (project -> state() != QETProject::Ok) { if (project -> state() != QETProject::Ok) {
if (interactive) { if (interactive && project -> state() != QETProject::FileOpenDiscard) {
QET::MessageBox::warning( QET::MessageBox::warning(
this, this,
tr("\311chec de l'ouverture du projet", "message box title"), tr("\311chec de l'ouverture du projet", "message box title"),
@@ -807,6 +807,7 @@ bool QETDiagramEditor::openAndAddProject(const QString &filepath, bool interacti
).arg(filepath) ).arg(filepath)
); );
} }
delete project;
return(false); return(false);
} }

15
sources/qetproject.cpp
View File

@@ -827,17 +827,26 @@ void QETProject::readProjectXml() {
bool conv_ok; bool conv_ok;
project_qet_version_ = root_elmt.attribute("version").toDouble(&conv_ok); project_qet_version_ = root_elmt.attribute("version").toDouble(&conv_ok);
if (conv_ok && QET::version.toDouble() < project_qet_version_) { if (conv_ok && QET::version.toDouble() < project_qet_version_) {
QET::MessageBox::warning(
int ret = QET::MessageBox::warning(
0, 0,
tr("Avertissement", "message box title"), tr("Avertissement", "message box title"),
tr( tr(
"Ce document semble avoir \351t\351 enregistr\351 avec " "Ce document semble avoir \351t\351 enregistr\351 avec "
"une version ult\351rieure de QElectroTech. Il est " "une version ult\351rieure de QElectroTech. Il est "
"possible que l'ouverture de tout ou partie de ce " "possible que l'ouverture de tout ou partie de ce "
"document \351choue.", "document \351choue.\n"
"Que d\351sirez vous faire ?",
"message box content" "message box content"
) ),
QMessageBox::Open | QMessageBox::Cancel
); );
if (ret == QMessageBox::Cancel) {
state_ = FileOpenDiscard;
return;
}
} }
} }

3
sources/qetproject.h
View File

@@ -65,7 +65,8 @@ class QETProject : public QObject {
FileOpenFailed = 1, /// l'ouverture d'un fichier a echoue FileOpenFailed = 1, /// l'ouverture d'un fichier a echoue
XmlParsingFailed = 2, /// l'analyse XML a echoue XmlParsingFailed = 2, /// l'analyse XML a echoue
ProjectParsingRunning = 3, /// la lecture du projet est en cours ProjectParsingRunning = 3, /// la lecture du projet est en cours
ProjectParsingFailed = 4 /// la lecture en tant que projet a echoue ProjectParsingFailed = 4, /// la lecture en tant que projet a echoue
FileOpenDiscard = 5 /// the user cancelled the file opening
}; };
// methodes // methodes