diff options
Diffstat (limited to 'src/dialog.cpp')
-rw-r--r-- | src/dialog.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/dialog.cpp b/src/dialog.cpp index b156231..3adfef6 100644 --- a/src/dialog.cpp +++ b/src/dialog.cpp @@ -262,19 +262,16 @@ void Dialog::onCenterTimer() { } void Dialog::addSessionsAfterDownload(QNetworkReply* reply) { - QString filename = "/tmp/vmchooser2.xml"; - QString backup_filename = "/tmp/vmchooser2_backup.xml"; - if (reply->error() != QNetworkReply::NoError) { if (debugMode) { qDebug() << "Error reading from URL: " << reply->error(); } - QFile backup_file(backup_filename); + QFile backup_file(xml_backup_filename); if (!backup_file.open(QIODevice::ReadOnly)) { if (debugMode) { - qDebug() << "Cannot read backup file " << backup_filename << " either"; + qDebug() << "Cannot read backup file " << xml_backup_filename << " either"; } this->removeItem(QCoreApplication::instance()->translate("Dialog", "Loading..."),QCoreApplication::instance()->translate("Dialog", "Virtual Sessions")); this->addLabelItem(QCoreApplication::instance()->translate("Dialog", "URL Error"), QCoreApplication::instance()->translate("Dialog", "Virtual Sessions")); @@ -282,19 +279,24 @@ void Dialog::addSessionsAfterDownload(QNetworkReply* reply) { } if (debugMode) { - qDebug() << "Used backup file " << backup_filename; + qDebug() << "Used backup file " << xml_backup_filename; } backup_file.close(); - this->addItems(VSession::readXmlFile(backup_filename), QCoreApplication::instance()->translate("Dialog", "Virtual Sessions")); + + QList<Session*> sessions = VSession::readXmlFile(xml_backup_filename); + + qSort(sessions.begin(), sessions.end(), myLessThan); + + this->addItems(sessions, QCoreApplication::instance()->translate("Dialog", "Virtual Sessions")); } else { - QFile file(filename); + QFile file(xml_filename); if (!file.open(QIODevice::WriteOnly)) { if (debugMode) { - qDebug() << "Could not write XML to " << filename; + qDebug() << "Could not write XML to " << xml_filename; } return; } @@ -308,7 +310,7 @@ void Dialog::addSessionsAfterDownload(QNetworkReply* reply) { file.close(); } - const QList<Session*> sessions = VSession::readXmlFile(filename); + const QList<Session*> sessions = VSession::readXmlFile(xml_filename); this->removeItem(QCoreApplication::instance()->translate("Dialog", "Loading..."),QCoreApplication::instance()->translate("Dialog", "Virtual Sessions")); |