diff --git a/ctSESAM/deploy/ctSESAM.nsi b/ctSESAM/deploy/ctSESAM.nsi index a1ca1c20..7d84031c 100644 --- a/ctSESAM/deploy/ctSESAM.nsi +++ b/ctSESAM/deploy/ctSESAM.nsi @@ -1,6 +1,6 @@ !define VERSIONMAJOR "2" !define VERSIONMINOR "0" -!define VERSIONPATCH "-BETA" +!define VERSIONPATCH "0" !define VERSION "${VERSIONMAJOR}.${VERSIONMINOR}${VERSIONPATCH}" !define GUID "{f25f512a-7d58-4e2f-a52b-3663fd8ca813}" !define APP "ctSESAM" diff --git a/ctSESAM/global.cpp b/ctSESAM/global.cpp index ea2f91cc..7ab2fc2c 100644 --- a/ctSESAM/global.cpp +++ b/ctSESAM/global.cpp @@ -21,9 +21,9 @@ #include "global.h" #include -const QString AppCompanyName = "c't"; -const QString AppName = "Qt SESAM"; -const QString AppVersion = "2.0 BETA"; +const QString AppCompanyName = "ct"; +const QString AppName = "QtSESAM"; +const QString AppVersion = "2.0.0"; const QString AppURL = "https://github.com/ola-ct/Qt-SESAM"; const QString AppAuthor = "Oliver Lau"; const QString AppAuthorMail = "ola@ct.de"; diff --git a/ctSESAM/mainwindow.cpp b/ctSESAM/mainwindow.cpp index a1d99209..e4d51af8 100644 --- a/ctSESAM/mainwindow.cpp +++ b/ctSESAM/mainwindow.cpp @@ -1242,7 +1242,6 @@ void MainWindow::mergeLocalAndRemoteData(void) { Q_D(MainWindow); QStringList allDomainNames = d->remoteDomains.keys() + d->domains.keys(); - qDebug() << "mergeLocalAndRemoteData() combined domain names =" << allDomainNames; allDomainNames.removeDuplicates(); foreach(QString domainName, allDomainNames) { const DomainSettings &remoteDomainSetting = d->remoteDomains.at(domainName); @@ -1334,10 +1333,6 @@ void MainWindow::sendToSyncServer(const QByteArray &cipher) void MainWindow::onDomainSelected(const QString &domain) { Q_D(MainWindow); - qDebug() << "MainWindow::onDomainSelected(" << domain << ")"; - qDebug() << "ui->domainsComboBox->currentText() =" << ui->domainsComboBox->currentText(); - qDebug() << "ui->domainsComboBox->currentIndex() =" << ui->domainsComboBox->currentIndex(); - if (ui->domainsComboBox->currentIndex() == 0 && !d->parameterSetDirty) { newDomain(); } diff --git a/ctSESAM/translations/i18n_de.ts b/ctSESAM/translations/i18n_de.ts index 1d3d5e1c..9376fa9e 100644 --- a/ctSESAM/translations/i18n_de.ts +++ b/ctSESAM/translations/i18n_de.ts @@ -858,6 +858,10 @@ Choose certificate file Zertifikatskettendatei wählen + + Write backup files + Backups schreiben + ProgressDialog