GUI: Try to simplify the 'Import Project' setting
This commit is contained in:
Daniel Marjamäki
parent
f6ee0f6868
commit
ca2f59a6d4
|
|
@ -92,8 +92,7 @@ ProjectFileDialog::ProjectFileDialog(const QString &path, QWidget *parent)
|
|||
|
||||
connect(mUI.mButtons, SIGNAL(accepted()), this, SLOT(accept()));
|
||||
connect(mUI.mBtnBrowseBuildDir, SIGNAL(clicked()), this, SLOT(BrowseBuildDir()));
|
||||
connect(mUI.mBtnBrowseCompileDatabase, SIGNAL(clicked()), this, SLOT(BrowseCompileDatabase()));
|
||||
connect(mUI.mBtnBrowseVisualStudio, SIGNAL(clicked()), this, SLOT(BrowseVisualStudio()));
|
||||
connect(mUI.mBtnBrowseImportProject, SIGNAL(clicked()), this, SLOT(BrowseImportProject()));
|
||||
connect(mUI.mBtnAddCheckPath, SIGNAL(clicked()), this, SLOT(AddCheckPath()));
|
||||
connect(mUI.mBtnEditCheckPath, SIGNAL(clicked()), this, SLOT(EditCheckPath()));
|
||||
connect(mUI.mBtnRemoveCheckPath, SIGNAL(clicked()), this, SLOT(RemoveCheckPath()));
|
||||
|
|
@ -186,24 +185,14 @@ void ProjectFileDialog::BrowseBuildDir()
|
|||
mUI.mEditBuildDir->setText(dir);
|
||||
}
|
||||
|
||||
void ProjectFileDialog::BrowseCompileDatabase()
|
||||
void ProjectFileDialog::BrowseImportProject()
|
||||
{
|
||||
const QFileInfo inf(mFilePath);
|
||||
const QDir &dir = inf.absoluteDir();
|
||||
QString fileName = QFileDialog::getOpenFileName(this, tr("Compile Database"),
|
||||
dir.canonicalPath(),
|
||||
tr("Compile database (compile_database.json)"));
|
||||
mUI.mEditCompileDatabase->setText(dir.relativeFilePath(fileName));
|
||||
}
|
||||
|
||||
void ProjectFileDialog::BrowseVisualStudio()
|
||||
{
|
||||
const QFileInfo inf(mFilePath);
|
||||
const QDir &dir = inf.absoluteDir();
|
||||
QString fileName = QFileDialog::getOpenFileName(this, tr("Visual Studio"),
|
||||
dir.canonicalPath(),
|
||||
tr("Visual Studio Solution/Project (*.sln *.vcxproj)"));
|
||||
mUI.mEditVisualStudio->setText(dir.relativeFilePath(fileName));
|
||||
QString fileName = QFileDialog::getOpenFileName(this, tr("Import Project"),
|
||||
dir.canonicalPath(),
|
||||
tr("Visual Studio (*.sln *.vcxproj);;Compile database (compile_database.json)"));
|
||||
mUI.mEditImportProject->setText(dir.relativeFilePath(fileName));
|
||||
}
|
||||
|
||||
void ProjectFileDialog::AddIncludeDir(const QString &dir)
|
||||
|
|
@ -254,7 +243,7 @@ QString ProjectFileDialog::GetBuildDir() const
|
|||
|
||||
QString ProjectFileDialog::GetImportProject() const
|
||||
{
|
||||
return mUI.mEditCompileDatabase->text() + mUI.mEditVisualStudio->text();
|
||||
return mUI.mEditImportProject->text();
|
||||
}
|
||||
|
||||
QStringList ProjectFileDialog::GetIncludePaths() const
|
||||
|
|
@ -337,12 +326,7 @@ void ProjectFileDialog::SetBuildDir(const QString &buildDir)
|
|||
|
||||
void ProjectFileDialog::SetImportProject(const QString &importProject)
|
||||
{
|
||||
mUI.mEditCompileDatabase->setText("");
|
||||
mUI.mEditVisualStudio->setText("");
|
||||
if (importProject.endsWith("compile_database.json", Qt::CaseInsensitive))
|
||||
mUI.mEditCompileDatabase->setText(importProject);
|
||||
else if (importProject.endsWith(".sln",Qt::CaseInsensitive) || importProject.endsWith(".vcxproj",Qt::CaseInsensitive))
|
||||
mUI.mEditVisualStudio->setText(importProject);
|
||||
mUI.mEditImportProject->setText(importProject);
|
||||
}
|
||||
|
||||
void ProjectFileDialog::SetIncludepaths(const QStringList &includes)
|
||||
|
|
|
|||
|
|
@ -148,14 +148,9 @@ protected slots:
|
|||
void BrowseBuildDir();
|
||||
|
||||
/**
|
||||
* @brief Browse for Visual Studio solution/project.
|
||||
* @brief Browse for solution / project / compile database.
|
||||
*/
|
||||
void BrowseVisualStudio();
|
||||
|
||||
/**
|
||||
* @brief Browse for Compile Database.
|
||||
*/
|
||||
void BrowseCompileDatabase();
|
||||
void BrowseImportProject();
|
||||
|
||||
/**
|
||||
* @brief Add new path to check.
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>635</width>
|
||||
<height>368</height>
|
||||
<width>642</width>
|
||||
<height>434</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -23,13 +23,13 @@
|
|||
<attribute name="title">
|
||||
<string>Project</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_12">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_7">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="mLayoutProjectRoot">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelProjectRoot">
|
||||
<property name="text">
|
||||
<string>Root:</string>
|
||||
<string>&Root:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>mEditProjectRoot</cstring>
|
||||
|
|
@ -42,41 +42,60 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="mLayoutBuildDir">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelBuildDir">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>In the build dir, cppcheck stores data about each translation unit.</p><p><br/></p><p>With a build dir you get whole program analysis and faster analysis.</p></body></html></string>
|
||||
<string><html><head/><body><p>In the build dir, cppcheck stores data about each translation unit.</p><p>With a build dir you get whole program analysis.</p><p>Unchanged files will be analyzed much faster; Cppcheck skip the analysis of these files and reuse their old data.</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Cppcheck build dir (optional)</string>
|
||||
<string>Cppcheck build dir (whole program analysis, faster analysis for unchanged files)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="mEditBuildDir"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="mBtnBrowseBuildDir">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="mEditBuildDir"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="mBtnBrowseBuildDir">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_10">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>97</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelImport">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Cppcheck can import Visual studio solutions (*.sln), Visual studio projects (*.vcxproj) or compile databases.</p><p>Files to check, include paths, configurations, defines, platform settings are imported.\n\nLibrary settings are not imported.\n\n</p><p>A compile database can be generated from a cmake project using cmake, or from a Makefile project using bear (build ear).</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Import Project (Visual studio / compile database)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="mEditImportProject"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="mBtnBrowseImportProject">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="mLayoutLibraries">
|
||||
|
|
@ -114,100 +133,6 @@
|
|||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="mTabVisualStudio">
|
||||
<attribute name="title">
|
||||
<string>Visual Studio</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelVisualStudio">
|
||||
<property name="text">
|
||||
<string>Visual Studio
|
||||
|
||||
Cppcheck can import visual studio solutions and projects.
|
||||
|
||||
Files to check, include paths, configurations, defines, platform settings are imported.
|
||||
|
||||
Library settings are not imported.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="mLayoutVisualStudio">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="mEditVisualStudio"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="mBtnBrowseVisualStudio">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_5">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>149</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="mTabCMake">
|
||||
<attribute name="title">
|
||||
<string>CMake</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_7">
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelCMake">
|
||||
<property name="text">
|
||||
<string>Compile database
|
||||
|
||||
Cppcheck can import files to analyse, include paths, defines from the compile database.
|
||||
|
||||
Platform settings are not provided in compile database and must be configured.
|
||||
|
||||
Library settings are not provided in compile database, be careful about this configuration also.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="mLayoutCMake">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="mEditCompileDatabase"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="mBtnBrowseCompileDatabase">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_7">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>149</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="mTabOther">
|
||||
<attribute name="title">
|
||||
<string>Other</string>
|
||||
|
|
|
|||
Loading…
Reference in New Issue