diff --git a/gui/cppcheck_de.ts b/gui/cppcheck_de.ts index 408ef3e610f..e86d62e3ed8 100644 --- a/gui/cppcheck_de.ts +++ b/gui/cppcheck_de.ts @@ -1992,85 +1992,75 @@ Options: Projektdatei: %1 - + Select Cppcheck build dir Wähle Cppcheck-Erstellungsverzeichnis - + Select include directory Wähle Include-Verzeichnisse - + Select a directory to check Wähle zu prüfendes Verzeichnis - + Clang-tidy (not found) Clang-tidy (nicht gefunden) - + Visual Studio Visual Studio - + Compile database Compilerdatenbank - + Borland C++ Builder 6 Borland C++-Builder 6 - + Import Project Projekt importieren - + Select directory to ignore Wähle zu ignorierendes Verzeichnis - + Source files - + All files - + Exclude file - + Select MISRA rule texts file Wähle MISRA-Regeltext-Datei - + MISRA rule texts file (%1) MISRA-Regeltext-Datei - - - Select license file - - - - - License file (%1) - - QObject @@ -2100,7 +2090,7 @@ Options: - + (Not found) (nicht gefunden) diff --git a/gui/cppcheck_es.ts b/gui/cppcheck_es.ts index 9ee45de4f07..2c176dc90a7 100644 --- a/gui/cppcheck_es.ts +++ b/gui/cppcheck_es.ts @@ -1956,85 +1956,75 @@ Options: Archivo de proyecto: %1 - + Select Cppcheck build dir - + Select include directory Selecciona una carpeta para incluir - + Select a directory to check Selecciona la carpeta a comprobar - + Clang-tidy (not found) - + Visual Studio - + Compile database - + Borland C++ Builder 6 - + Import Project - + Select directory to ignore Selecciona la carpeta a ignorar - + Source files - + All files - + Exclude file - + Select MISRA rule texts file - + MISRA rule texts file (%1) - - - Select license file - - - - - License file (%1) - - QObject @@ -2064,7 +2054,7 @@ Options: - + (Not found) diff --git a/gui/cppcheck_fi.ts b/gui/cppcheck_fi.ts index 0b94ee3c660..4e30023880c 100644 --- a/gui/cppcheck_fi.ts +++ b/gui/cppcheck_fi.ts @@ -1950,85 +1950,75 @@ Options: - + Select Cppcheck build dir - + Select include directory - + Select a directory to check - + Clang-tidy (not found) - + Visual Studio - + Compile database - + Borland C++ Builder 6 - + Import Project - + Select directory to ignore - + Source files - + All files - + Exclude file - + Select MISRA rule texts file - + MISRA rule texts file (%1) - - - Select license file - - - - - License file (%1) - - QObject @@ -2060,7 +2050,7 @@ Options: - + (Not found) diff --git a/gui/cppcheck_fr.ts b/gui/cppcheck_fr.ts index 43d6c36b312..4f8fac97b28 100644 --- a/gui/cppcheck_fr.ts +++ b/gui/cppcheck_fr.ts @@ -1939,82 +1939,72 @@ Do you want to proceed? Fichier projet : %1 - + Select include directory Selectionner un répertoire à inclure - + Select directory to ignore Selectionner un répertoire à ignorer - + Select a directory to check Selectionner un répertoire à vérifier - + Select Cppcheck build dir - + Import Project - + Clang-tidy (not found) - + Source files - + All files - + Exclude file - + Select MISRA rule texts file - + MISRA rule texts file (%1) - - Select license file - - - - - License file (%1) - - - - + Visual Studio - + Compile database - + Borland C++ Builder 6 @@ -2047,7 +2037,7 @@ Do you want to proceed? - + (Not found) diff --git a/gui/cppcheck_it.ts b/gui/cppcheck_it.ts index 0f32e24a077..e8c9a3f0451 100644 --- a/gui/cppcheck_it.ts +++ b/gui/cppcheck_it.ts @@ -1969,85 +1969,75 @@ Options: File di progetto: %1 - + Select Cppcheck build dir - + Select include directory Seleziona la cartella da includere - + Select a directory to check Seleziona una cartella da scansionare - + Clang-tidy (not found) - + Visual Studio - + Compile database - + Borland C++ Builder 6 - + Import Project - + Select directory to ignore Seleziona la cartella da ignorare - + Source files - + All files - + Exclude file - + Select MISRA rule texts file - + MISRA rule texts file (%1) - - - Select license file - - - - - License file (%1) - - QObject @@ -2077,7 +2067,7 @@ Options: - + (Not found) diff --git a/gui/cppcheck_ja.ts b/gui/cppcheck_ja.ts index 39d43faf148..69daceaba5c 100644 --- a/gui/cppcheck_ja.ts +++ b/gui/cppcheck_ja.ts @@ -2025,84 +2025,82 @@ Options: プロジェクトファイル:%1 - + Select Cppcheck build dir Cppcheckビルドディレクトリ - + Select include directory includeディレクトリを選択 - + Select a directory to check チェックするディレクトリを選択してください - + Clang-tidy (not found) Clang-tidy (みつかりません) - + Visual Studio Visual Studio - + Compile database コンパイルデータベース - + Borland C++ Builder 6 Borland C++ Builder 6 - + Import Project プロジェクトのインポート - + Select directory to ignore 除外するディレクトリを選択してください - + Source files ソースファイル - + All files 全ファイル - + Exclude file 除外ファイル - + Select MISRA rule texts file MISRAルールテキストファイルを選択 - + MISRA rule texts file (%1) MISRAルールテキストファイル (%1) - Select license file - ライセンスファイルの選択 + ライセンスファイルの選択 - License file (%1) - ライセンスファイル (%1) + ライセンスファイル (%1) @@ -2133,7 +2131,7 @@ Options: 行 %1: 必須の属性 '%2' が '%3'にない - + (Not found) (見つかりません) diff --git a/gui/cppcheck_ka.ts b/gui/cppcheck_ka.ts index b26df21c3bb..7da730ce39d 100644 --- a/gui/cppcheck_ka.ts +++ b/gui/cppcheck_ka.ts @@ -1985,85 +1985,75 @@ Options: პროექტის ფაილი: %1 - + Select Cppcheck build dir აირჩიეთ Cppcheck-ის აგების საქაღალდე - + Select include directory აირჩიეთ ჩასასმელი საქაღალდე - + Select a directory to check აირჩიეთ შესამოწმებელი საქაღალდე - + Clang-tidy (not found) Clang-tidy (ვერ ვიპოვე) - + Visual Studio Visual Studio - + Compile database მონაცემთა ბაზის კომპილაცია - + Borland C++ Builder 6 Borland C++ Builder 6 - + Import Project პროექტის შემოტანა - + Select directory to ignore აირჩიეთ გამოსატოვებელი საქაღალდე - + Source files კოდის ფაილები - + All files ყველა ფაილი - + Exclude file ფაილის ამოღება - + Select MISRA rule texts file აირჩიეთ MISRA-ის წესების ტექსტის ფაილი - + MISRA rule texts file (%1) MISRA-ის წესის ტექსტების ფაილი (%1) - - - Select license file - - - - - License file (%1) - - QObject @@ -2095,7 +2085,7 @@ Options: ხაზი %1: აუცილებელი ატრიბუტი '%2' '%3'-ში აღმოჩენილი არაა - + (Not found) (ვერ ვიპოვე) diff --git a/gui/cppcheck_ko.ts b/gui/cppcheck_ko.ts index 8a3efb2e1d6..f266f88e759 100644 --- a/gui/cppcheck_ko.ts +++ b/gui/cppcheck_ko.ts @@ -1947,82 +1947,72 @@ Do you want to proceed? 프로젝트 파일: %1 - + Select include directory Include 디렉토리 선택 - + Select a directory to check 검사할 디렉토리 선택 - + Select directory to ignore 무시할 디렉토리 선택 - + Select Cppcheck build dir - + Import Project - + Clang-tidy (not found) - + Source files - + All files - + Exclude file - + Select MISRA rule texts file - + MISRA rule texts file (%1) - - Select license file - - - - - License file (%1) - - - - + Visual Studio - + Compile database - + Borland C++ Builder 6 @@ -2055,7 +2045,7 @@ Do you want to proceed? - + (Not found) diff --git a/gui/cppcheck_nl.ts b/gui/cppcheck_nl.ts index d379928315d..a3c90055939 100644 --- a/gui/cppcheck_nl.ts +++ b/gui/cppcheck_nl.ts @@ -1968,85 +1968,75 @@ Options: Project Bestand %1 - + Select Cppcheck build dir - + Select include directory Selecteer include map - + Select a directory to check Selecteer een map om te controleren - + Clang-tidy (not found) - + Visual Studio - + Compile database - + Borland C++ Builder 6 - + Import Project - + Select directory to ignore Selecteer een map om te negeren - + Source files - + All files - + Exclude file - + Select MISRA rule texts file - + MISRA rule texts file (%1) - - - Select license file - - - - - License file (%1) - - QObject @@ -2078,7 +2068,7 @@ Options: - + (Not found) diff --git a/gui/cppcheck_ru.ts b/gui/cppcheck_ru.ts index 95d35a7d9c1..cf62632618b 100644 --- a/gui/cppcheck_ru.ts +++ b/gui/cppcheck_ru.ts @@ -2003,85 +2003,75 @@ Options: Файл проекта: %1 - + Select Cppcheck build dir Выбрать директорию сборки Cppcheck - + Select include directory Выберите директорию для поиска заголовочных файлов - + Select a directory to check Выберите директорию для проверки - + Clang-tidy (not found) Clang-tidy (не найден) - + Visual Studio Visual Studio - + Compile database - + Borland C++ Builder 6 Borland C++ Builder 6 - + Import Project Импорт проекта - + Select directory to ignore Выберите директорию, которую надо проигнорировать - + Source files - + All files - + Exclude file - + Select MISRA rule texts file Выбрать файл текстов правил MISRA - + MISRA rule texts file (%1) Файл текстов правил MISRA (%1) - - - Select license file - - - - - License file (%1) - - QObject @@ -2113,7 +2103,7 @@ Options: - + (Not found) (Недоступно) diff --git a/gui/cppcheck_sr.ts b/gui/cppcheck_sr.ts index 45e28c4b2e0..f7c94ac7282 100644 --- a/gui/cppcheck_sr.ts +++ b/gui/cppcheck_sr.ts @@ -1948,85 +1948,75 @@ Options: - + Select Cppcheck build dir - + Select include directory - + Select a directory to check - + Clang-tidy (not found) - + Visual Studio - + Compile database - + Borland C++ Builder 6 - + Import Project - + Select directory to ignore - + Source files - + All files - + Exclude file - + Select MISRA rule texts file - + MISRA rule texts file (%1) - - - Select license file - - - - - License file (%1) - - QObject @@ -2056,7 +2046,7 @@ Options: - + (Not found) diff --git a/gui/cppcheck_sv.ts b/gui/cppcheck_sv.ts index 65c78282034..8c36911d244 100644 --- a/gui/cppcheck_sv.ts +++ b/gui/cppcheck_sv.ts @@ -2004,82 +2004,72 @@ Options: Projektfil: %1 - + Clang-tidy (not found) - + Select Cppcheck build dir Välj Cppcheck build dir - + Select include directory Välj include sökväg - + Source files - + All files - + Exclude file - + Select MISRA rule texts file - + MISRA rule texts file (%1) - - Select license file - - - - - License file (%1) - - - - + Select a directory to check Välj mapp att analysera - + Visual Studio Visual Studio - + Compile database - + Borland C++ Builder 6 - + Import Project Importera Projekt - + Select directory to ignore Välj sökväg att ignorera @@ -2114,7 +2104,7 @@ Options: - + (Not found) diff --git a/gui/cppcheck_zh_CN.ts b/gui/cppcheck_zh_CN.ts index 8aadb4977e4..9ba81e62c27 100644 --- a/gui/cppcheck_zh_CN.ts +++ b/gui/cppcheck_zh_CN.ts @@ -2010,85 +2010,75 @@ Options: 项目文件: %1 - + Select Cppcheck build dir 选择 Cppcheck 构建目录 - + Select include directory 选择 Include 目录 - + Select a directory to check 选择一个检查目录 - + Clang-tidy (not found) Clang-tidy (未找到) - + Visual Studio Visual Studio - + Compile database Compile database - + Borland C++ Builder 6 Borland C++ Builder 6 - + Import Project 导入项目 - + Select directory to ignore 选择忽略的目录 - + Source files 源文件 - + All files 全部文件 - + Exclude file 排除文件 - + Select MISRA rule texts file 选择 MISRA 规则文本文件 - + MISRA rule texts file (%1) MISRA 规则文本文件 (%1) - - - Select license file - - - - - License file (%1) - - QObject @@ -2118,7 +2108,7 @@ Options: 第%1行：在 "%3" 中缺失的必选属性 "%2" - + (Not found) (未找到) diff --git a/gui/cppcheck_zh_TW.ts b/gui/cppcheck_zh_TW.ts index 3d64576fe53..f9ef6cc822a 100644 --- a/gui/cppcheck_zh_TW.ts +++ b/gui/cppcheck_zh_TW.ts @@ -1949,85 +1949,75 @@ Do you want to remove the file from the recently used projects -list? 專案檔: %1 - + Clang-tidy (not found) Clang-tidy (找不到) - + Select Cppcheck build dir 選取 Cppcheck 建置目錄 - + Visual Studio Visual Studio - + Compile database 編譯資料庫 - + Borland C++ Builder 6 Borland C++ Builder 6 - + Import Project 匯入專案 - + Select a directory to check 選取要檢查的目錄 - + Select include directory 選取包含目錄 - + Select directory to ignore 選取要忽略的目錄 - + Source files 來源檔 - + All files 所有檔案 - + Exclude file 排除檔案 - + Select MISRA rule texts file 選取 MISRA 規則文字檔 - + MISRA rule texts file (%1) MISRA 規則文字檔 (%1) - - - Select license file - - - - - License file (%1) - - QObject @@ -2177,7 +2167,7 @@ Do you want to remove the file from the recently used projects -list? - + (Not found) (找不到) diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp index 372fc7f36b9..d6ffbc5f0ff 100644 --- a/gui/projectfiledialog.cpp +++ b/gui/projectfiledialog.cpp @@ -119,7 +119,7 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi setWindowTitle(title); loadSettings(); - mUI->premiumLicense->setVisible(premium); + mUI->premiumLicense->setVisible(false); // Checkboxes for the libraries.. const QString applicationFilePath = QCoreApplication::applicationFilePath(); @@ -247,7 +247,6 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi connect(mUI->mListSuppressions, &QListWidget::doubleClicked, this, &ProjectFileDialog::editSuppression); connect(mUI->mBtnBrowseMisraFile, &QPushButton::clicked, this, &ProjectFileDialog::browseMisraFile); connect(mUI->mChkAllVsConfigs, &QCheckBox::clicked, this, &ProjectFileDialog::checkAllVSConfigs); - connect(mUI->mBtnBrowseLicense, &QPushButton::clicked, this, &ProjectFileDialog::browseLicenseFile); loadFromProjectFile(projectFile); } @@ -528,8 +527,7 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const projectFile->setBughunting(mUI->mBughunting->isChecked()); projectFile->setClangAnalyzer(mUI->mToolClangAnalyzer->isChecked()); projectFile->setClangTidy(mUI->mToolClangTidy->isChecked()); - if (mPremium) - projectFile->setLicenseFile(mUI->mEditLicenseFile->text()); + projectFile->setLicenseFile(mUI->mEditLicenseFile->text()); #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) projectFile->setTags(mUI->mEditTags->text().split(";", Qt::SkipEmptyParts)); #else @@ -967,16 +965,3 @@ void ProjectFileDialog::browseMisraFile() updateAddonCheckBox(mUI->mMisraC, nullptr, getDataDir(), ADDON_MISRA); } } - -void ProjectFileDialog::browseLicenseFile() -{ - const QFileInfo inf(mProjectFile->getFilename()); - const QString projectPath = inf.absolutePath(); - - const QString fileName = QFileDialog::getOpenFileName(this, tr("Select license file"), projectPath, tr("License file (%1)").arg("*.lic")); - if (fileName.isEmpty()) - return; - - const QDir dir(projectPath); - mUI->mEditLicenseFile->setText(dir.relativeFilePath(fileName)); -} diff --git a/gui/projectfiledialog.h b/gui/projectfiledialog.h index b90cbf04862..3dfb6b89f93 100644 --- a/gui/projectfiledialog.h +++ b/gui/projectfiledialog.h @@ -278,9 +278,6 @@ private slots: */ void checkAllVSConfigs(); - /** @brief Browse for Cppcheck Premium license file */ - void browseLicenseFile(); - protected: /**