From e490852476d72892c653f03346613c8a02735f11 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 2 Aug 2012 15:09:08 +0300 Subject: [PATCH 1/2] GUI: Clear current results before opening XML. Currently if there were results in the GUI the results from XML file were imported to list of results. This is confusing and not what users usually want to do. This patch makes GUI to clear the results before opening new results from XML file. Ticket #3829 (Rename open xml to import xml) --- gui/mainwindow.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 1c9a061b7..1530bbad9 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -608,6 +608,23 @@ void MainWindow::ClearResults() void MainWindow::OpenXML() { + if (mUI.mResults->HasResults()) { + QMessageBox msgBox(this); + msgBox.setWindowTitle(tr("Cppcheck")); + const QString msg(tr("Current results will be cleared.\n\n" + "Opening a new XML file will clear current results." + "Do you want to proceed?")); + msgBox.setText(msg); + msgBox.setIcon(QMessageBox::Warning); + msgBox.addButton(QMessageBox::Yes); + msgBox.addButton(QMessageBox::No); + msgBox.setDefaultButton(QMessageBox::Yes); + int dlgResult = msgBox.exec(); + if (dlgResult == QMessageBox::No) { + return; + } + } + QString selectedFilter; const QString filter(tr("XML files (*.xml)")); QString selectedFile = QFileDialog::getOpenFileName(this, @@ -617,6 +634,7 @@ void MainWindow::OpenXML() &selectedFilter); if (!selectedFile.isEmpty()) { + mUI.mResults->Clear(); mUI.mResults->ReadErrorsXml(selectedFile); } } From a597bb1ec8a653c6b2bbfff446c04069cd501431 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 2 Aug 2012 15:31:26 +0300 Subject: [PATCH 2/2] GUI: Update translation files. --- gui/cppcheck_de.ts | 58 +++++++++++++++++++++++++------------------- gui/cppcheck_es.ts | 60 ++++++++++++++++++++++++++-------------------- gui/cppcheck_fi.ts | 58 +++++++++++++++++++++++++------------------- gui/cppcheck_fr.ts | 6 +++++ gui/cppcheck_ja.ts | 60 ++++++++++++++++++++++++++-------------------- gui/cppcheck_ko.ts | 6 +++++ gui/cppcheck_nl.ts | 58 +++++++++++++++++++++++++------------------- gui/cppcheck_ru.ts | 58 +++++++++++++++++++++++++------------------- gui/cppcheck_sr.ts | 58 +++++++++++++++++++++++++------------------- gui/cppcheck_sv.ts | 58 +++++++++++++++++++++++++------------------- 10 files changed, 278 insertions(+), 202 deletions(-) diff --git a/gui/cppcheck_de.ts b/gui/cppcheck_de.ts index 1e8c4fcbd..d5e4650c8 100644 --- a/gui/cppcheck_de.ts +++ b/gui/cppcheck_de.ts @@ -182,11 +182,12 @@ Parameter: -l(line) (file) - - - - - + + + + + + Cppcheck Cppcheck @@ -596,27 +597,27 @@ Do you want to proceed checking without using any of these project files? - + License Lizenz - + Authors Autoren - + XML files version 2 (*.xml);;XML files version 1 (*.xml);;Text files (*.txt);;CSV files (*.csv) XML-Dateien Version 2 (*.xml);;XML-Dateien Version 1 (*.xml);;Textdateien (*.txt);;CSV-Dateien (*.csv) - + Save the report file Speichert die Berichtdatei - + XML files (*.xml) XML-Dateien (*.xml) @@ -636,11 +637,18 @@ Dies wurde vermutlich durch einen Wechsel der Cppcheck-Version hervorgerufen. Bi + Current results will be cleared. + +Opening a new XML file will clear current results.Do you want to proceed? + + + + Open the report file Berichtdatei öffnen - + Checking is running. Do you want to stop the checking and exit Cppcheck?. @@ -649,32 +657,32 @@ Do you want to stop the checking and exit Cppcheck?. Möchten Sie die Prüfung abbrechen und Cppcheck beenden? - + XML files version 1 (*.xml) XML-Dateien Version 1 (*.xml) - + XML files version 2 (*.xml) XML-Dateien Version 2 (*.xml) - + Text files (*.txt) Textdateien (*.txt) - + CSV files (*.csv) CSV-Dateien (*.csv) - + Cppcheck - %1 Cppcheck - %1 - + Failed to change the user interface language: %1 @@ -687,34 +695,34 @@ The user interface language has been reset to English. Open the Preferences-dial Die Sprache wurde auf Englisch zurückgesetzt. Öffnen Sie den Einstellungen-Dialog um eine verfügbare Sprache auszuwählen. - - + + Project files (*.cppcheck);;All files(*.*) Projektdateien (*.cppcheck);;Alle Dateien(*.*) - + Select Project File Projektdatei auswählen - - + + Project: Projekt: - + Select Project Filename Projektnamen auswählen - + No project file loaded Keine Projektdatei geladen - + The project file %1 diff --git a/gui/cppcheck_es.ts b/gui/cppcheck_es.ts index f4a31609d..43ca73bf5 100644 --- a/gui/cppcheck_es.ts +++ b/gui/cppcheck_es.ts @@ -170,11 +170,12 @@ Parameters: -l(line) (file) - - - - - + + + + + + Cppcheck Cppcheck @@ -573,17 +574,17 @@ This is probably because the settings were changed between the Cppcheck versions Selecciona una carpeta para comprobar - + XML files (*.xml) Ficheros XML(*.xml) - + Open the report file Abrir informe - + Checking is running. Do you want to stop the checking and exit Cppcheck?. @@ -592,22 +593,22 @@ Do you want to stop the checking and exit Cppcheck?. ¿Quieres parar la comprobación y salir del Cppcheck?. - + License Licencia - + Authors Autores - + XML files version 2 (*.xml);;XML files version 1 (*.xml);;Text files (*.txt);;CSV files (*.csv) - + Failed to change the user interface language: %1 @@ -616,7 +617,7 @@ The user interface language has been reset to English. Open the Preferences-dial - + Save the report file Guardar informe @@ -640,59 +641,66 @@ Do you want to proceed checking without using any of these project files? - + + Current results will be cleared. + +Opening a new XML file will clear current results.Do you want to proceed? + + + + XML files version 1 (*.xml) - + XML files version 2 (*.xml) - + Text files (*.txt) Ficheros de texto (*.txt) - + CSV files (*.csv) Ficheros CVS (*.cvs) - + Cppcheck - %1 Cppcheck - %1 - - + + Project files (*.cppcheck);;All files(*.*) Ficheros de proyecto (*.cppcheck;;Todos los ficheros (*.*) - + Select Project File Selecciona proyecto - - + + Project: Proyecto: - + Select Project Filename Selecciona el nombre del proyecto - + No project file loaded No hay ningún proyecto cargado - + The project file %1 diff --git a/gui/cppcheck_fi.ts b/gui/cppcheck_fi.ts index 1342208d0..7cf929441 100644 --- a/gui/cppcheck_fi.ts +++ b/gui/cppcheck_fi.ts @@ -173,11 +173,12 @@ Parameters: -l(line) (file) - - - - - + + + + + + Cppcheck Cppcheck @@ -583,28 +584,28 @@ Do you want to proceed checking without using any of these project files? - + License Lisenssi - + Authors Tekijät - + XML files version 2 (*.xml);;XML files version 1 (*.xml);;Text files (*.txt);;CSV files (*.csv) XML files (*.xml);;Text files (*.txt);;CSV files (*.csv) XML-tiedostot (*.xml);;Tekstitiedostot (*.txt);;CSV-tiedostot (*.csv) - + Save the report file Tallenna raportti - + XML files (*.xml) XML-tiedostot (*xml) @@ -622,43 +623,50 @@ This is probably because the settings were changed between the Cppcheck versions + Current results will be cleared. + +Opening a new XML file will clear current results.Do you want to proceed? + + + + Open the report file - + Checking is running. Do you want to stop the checking and exit Cppcheck?. - + XML files version 1 (*.xml) - + XML files version 2 (*.xml) - + Text files (*.txt) Tekstitiedostot (*.txt) - + CSV files (*.csv) - + Cppcheck - %1 Cppcheck - %1 - + Failed to change the user interface language: %1 @@ -667,34 +675,34 @@ The user interface language has been reset to English. Open the Preferences-dial - - + + Project files (*.cppcheck);;All files(*.*) - + Select Project File - - + + Project: - + Select Project Filename - + No project file loaded - + The project file %1 diff --git a/gui/cppcheck_fr.ts b/gui/cppcheck_fr.ts index 1d944c574..601094e89 100644 --- a/gui/cppcheck_fr.ts +++ b/gui/cppcheck_fr.ts @@ -597,6 +597,12 @@ Do you want to remove the file from the recently used projects -list? Korean + + Current results will be cleared. + +Opening a new XML file will clear current results.Do you want to proceed? + + Platforms diff --git a/gui/cppcheck_ja.ts b/gui/cppcheck_ja.ts index 447efbc81..ce7cd5750 100644 --- a/gui/cppcheck_ja.ts +++ b/gui/cppcheck_ja.ts @@ -170,11 +170,12 @@ Parameters: -l(line) (file) - - - - - + + + + + + Cppcheck Cppcheck @@ -592,17 +593,24 @@ Do you want to proceed checking without using any of these project files? - + + Current results will be cleared. + +Opening a new XML file will clear current results.Do you want to proceed? + + + + XML files (*.xml) XML ファイル (*.xml) - + Open the report file レポートを開く - + Checking is running. Do you want to stop the checking and exit Cppcheck?. @@ -611,53 +619,53 @@ Do you want to stop the checking and exit Cppcheck?. 解析を停止してCppcheckを終了しますか?. - + License ライセンス - + Authors 作者 - + XML files version 2 (*.xml);;XML files version 1 (*.xml);;Text files (*.txt);;CSV files (*.csv) XML files (*.xml);;Text files (*.txt);;CSV files (*.csv) XML ファイル (*.xml);;テキストファイル (*.txt);;CSV形式ファイル (*.csv) - + Save the report file レポートを保存 - + XML files version 1 (*.xml) XMLファイルのバージョン1 - + XML files version 2 (*.xml) XMLファイルのバージョン2 - + Text files (*.txt) テキストファイル (*.txt) - + CSV files (*.csv) CSV形式ファイル (*.csv) - + Cppcheck - %1 Cppcheck - %1 - + Failed to change the user interface language: %1 @@ -666,34 +674,34 @@ The user interface language has been reset to English. Open the Preferences-dial - - + + Project files (*.cppcheck);;All files(*.*) プロジェクトファイル (*.cppcheck);;すべてのファイル(*.*) - + Select Project File プロジェクトファイルを選択 - - + + Project: プロジェクト: - + Select Project Filename プロジェクトファイル名を選択 - + No project file loaded プロジェクトファイルが読み込まれていません - + The project file %1 diff --git a/gui/cppcheck_ko.ts b/gui/cppcheck_ko.ts index bb66e51e2..0d1aa11a1 100644 --- a/gui/cppcheck_ko.ts +++ b/gui/cppcheck_ko.ts @@ -625,6 +625,12 @@ Do you want to remove the file from the recently used projects -list? Swedish 스웨덴어 + + Current results will be cleared. + +Opening a new XML file will clear current results.Do you want to proceed? + + Platforms diff --git a/gui/cppcheck_nl.ts b/gui/cppcheck_nl.ts index e4ff086f8..212187cf4 100644 --- a/gui/cppcheck_nl.ts +++ b/gui/cppcheck_nl.ts @@ -173,11 +173,12 @@ Parameters: -l(line) (file) - - - - - + + + + + + Cppcheck Cppcheck @@ -583,28 +584,28 @@ Do you want to proceed checking without using any of these project files? - + License Licentie - + Authors Auteurs - + XML files version 2 (*.xml);;XML files version 1 (*.xml);;Text files (*.txt);;CSV files (*.csv) XML files (*.xml);;Text files (*.txt);;CSV files (*.csv) XML bestanden (*.xml);;Tekst bestanden (*.txt);;CSV bestanden (*.csv) - + Save the report file Rapport opslaan - + XML files (*.xml) XML bestanden (*.xml) @@ -622,43 +623,50 @@ This is probably because the settings were changed between the Cppcheck versions + Current results will be cleared. + +Opening a new XML file will clear current results.Do you want to proceed? + + + + Open the report file - + Checking is running. Do you want to stop the checking and exit Cppcheck?. - + XML files version 1 (*.xml) - + XML files version 2 (*.xml) - + Text files (*.txt) Tekst bestanden (*.txt) - + CSV files (*.csv) - + Cppcheck - %1 Cppcheck - %1 - + Failed to change the user interface language: %1 @@ -667,34 +675,34 @@ The user interface language has been reset to English. Open the Preferences-dial - - + + Project files (*.cppcheck);;All files(*.*) - + Select Project File - - + + Project: - + Select Project Filename - + No project file loaded - + The project file %1 diff --git a/gui/cppcheck_ru.ts b/gui/cppcheck_ru.ts index 2dd2c6353..caec493b7 100644 --- a/gui/cppcheck_ru.ts +++ b/gui/cppcheck_ru.ts @@ -173,11 +173,12 @@ Parameters: -l(line) (file) - - - - - + + + + + + Cppcheck Cppcheck @@ -583,28 +584,28 @@ Do you want to proceed checking without using any of these project files? - + License Лицензия - + Authors Авторы - + XML files version 2 (*.xml);;XML files version 1 (*.xml);;Text files (*.txt);;CSV files (*.csv) XML files (*.xml);;Text files (*.txt);;CSV files (*.csv) - + Save the report file - + XML files (*.xml) @@ -622,43 +623,50 @@ This is probably because the settings were changed between the Cppcheck versions + Current results will be cleared. + +Opening a new XML file will clear current results.Do you want to proceed? + + + + Open the report file - + Checking is running. Do you want to stop the checking and exit Cppcheck?. - + XML files version 1 (*.xml) - + XML files version 2 (*.xml) - + Text files (*.txt) Текстовые файлы (*.txt) - + CSV files (*.csv) - + Cppcheck - %1 Cppcheck - %1 - + Failed to change the user interface language: %1 @@ -667,34 +675,34 @@ The user interface language has been reset to English. Open the Preferences-dial - - + + Project files (*.cppcheck);;All files(*.*) - + Select Project File - - + + Project: - + Select Project Filename - + No project file loaded - + The project file %1 diff --git a/gui/cppcheck_sr.ts b/gui/cppcheck_sr.ts index 8dc1e0675..1ae019d6a 100644 --- a/gui/cppcheck_sr.ts +++ b/gui/cppcheck_sr.ts @@ -171,11 +171,12 @@ Parameters: -l(line) (file) - - - - - + + + + + + Cppcheck Cppcheck @@ -581,27 +582,27 @@ Do you want to proceed checking without using any of these project files? - + License License - + Authors Authors - + XML files version 2 (*.xml);;XML files version 1 (*.xml);;Text files (*.txt);;CSV files (*.csv) XML files (*.xml);;Text files (*.txt);;CSV files (*.csv) - + Save the report file Save the report file - + XML files (*.xml) XML files (*.xml) @@ -619,43 +620,50 @@ This is probably because the settings were changed between the Cppcheck versions + Current results will be cleared. + +Opening a new XML file will clear current results.Do you want to proceed? + + + + Open the report file - + Checking is running. Do you want to stop the checking and exit Cppcheck?. - + XML files version 1 (*.xml) - + XML files version 2 (*.xml) - + Text files (*.txt) Text files (*.txt) - + CSV files (*.csv) - + Cppcheck - %1 Cppcheck - %1 - + Failed to change the user interface language: %1 @@ -664,34 +672,34 @@ The user interface language has been reset to English. Open the Preferences-dial - - + + Project files (*.cppcheck);;All files(*.*) - + Select Project File - - + + Project: - + Select Project Filename - + No project file loaded - + The project file %1 diff --git a/gui/cppcheck_sv.ts b/gui/cppcheck_sv.ts index 1ffacbdc7..ac534d9f4 100644 --- a/gui/cppcheck_sv.ts +++ b/gui/cppcheck_sv.ts @@ -183,11 +183,12 @@ Parametrar: -l(line) (file) - - - - - + + + + + + Cppcheck Cppcheck @@ -594,28 +595,28 @@ Do you want to proceed checking without using any of these project files? - + License Licens - + Authors Utvecklare - + XML files version 2 (*.xml);;XML files version 1 (*.xml);;Text files (*.txt);;CSV files (*.csv) XML files (*.xml);;Text files (*.txt);;CSV files (*.csv) XML filer version 2 (*.xml);;XML filer version 1 (*.xml);;Text filer (*.txt);;CSV filer (*.csv) - + Save the report file Spara rapport - + XML files (*.xml) XML filer (*.xml) @@ -635,11 +636,18 @@ En trolig orsak är att inställningarna ändrats för olika Cppcheck versioner. + Current results will be cleared. + +Opening a new XML file will clear current results.Do you want to proceed? + + + + Open the report file Öppna rapportfilen - + Checking is running. Do you want to stop the checking and exit Cppcheck?. @@ -648,32 +656,32 @@ Do you want to stop the checking and exit Cppcheck?. Vill du stoppa analysen och avsluta Cppcheck? - + XML files version 1 (*.xml) XML filer version 1 (*.xml) - + XML files version 2 (*.xml) XML filer version 2 (*.xml) - + Text files (*.txt) Text filer (*.txt) - + CSV files (*.csv) CSV filer (*.csv) - + Cppcheck - %1 Cppcheck - %1 - + Failed to change the user interface language: %1 @@ -686,34 +694,34 @@ The user interface language has been reset to English. Open the Preferences-dial Språket har nollställts till Engelska. Öppna Preferences och välj något av de tillgängliga språken. - - + + Project files (*.cppcheck);;All files(*.*) Projektfiler (*.cppcheck);;Alla filer(*.*) - + Select Project File Välj projektfil - - + + Project: Projekt: - + Select Project Filename Välj Projektfil - + No project file loaded Inget projekt laddat - + The project file %1