From 9acce79ce28a022c7dad4fe59f731fac16e90cd0 Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Fri, 2 Sep 2016 11:50:13 +0200 Subject: Implement basic Qt Help System support Change-Id: Ibf3b3fc46f66f4cf017c573fa3728c5bc8417687 Reviewed-by: Oliver Wolff --- src/qtprojectlib/VersionInformation.cs | 10 + src/qtvstools/QtHelpLinkChooser.xaml | 107 ++++++++++ src/qtvstools/QtHelpLinkChooser.xaml.cs | 98 ++++++++++ src/qtvstools/QtHelpMenu.cs | 289 ++++++++++++++++++++++++++++ src/qtvstools/QtMenus.vsct | 66 +++++++ src/qtvstools/QtVsTools.csproj | 49 ++++- src/qtvstools/Vsix.cs | 1 + src/qtvstools/packages.config | 4 + src/qtvstools/source.extension.vsixmanifest | 10 +- 9 files changed, 626 insertions(+), 8 deletions(-) create mode 100644 src/qtvstools/QtHelpLinkChooser.xaml create mode 100644 src/qtvstools/QtHelpLinkChooser.xaml.cs create mode 100644 src/qtvstools/QtHelpMenu.cs create mode 100644 src/qtvstools/packages.config diff --git a/src/qtprojectlib/VersionInformation.cs b/src/qtprojectlib/VersionInformation.cs index ac3e3af9..bbc4689a 100644 --- a/src/qtprojectlib/VersionInformation.cs +++ b/src/qtprojectlib/VersionInformation.cs @@ -100,6 +100,16 @@ namespace QtProjectLib } catch (Exception /*e*/) { qtDir = null; } + + try { + var qmakeQuery = new QMakeQuery(this); + QtInstallDocs = qmakeQuery.query("QT_INSTALL_DOCS"); + } catch { } + } + + public string QtInstallDocs + { + get; private set; } public bool IsStaticBuild() diff --git a/src/qtvstools/QtHelpLinkChooser.xaml b/src/qtvstools/QtHelpLinkChooser.xaml new file mode 100644 index 00000000..18d9471f --- /dev/null +++ b/src/qtvstools/QtHelpLinkChooser.xaml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -534,6 +584,18 @@ + + + + + + + + + + + + @@ -560,4 +622,8 @@ + + + + diff --git a/src/qtvstools/QtVsTools.csproj b/src/qtvstools/QtVsTools.csproj index 1df4b66f..7f2ccd69 100644 --- a/src/qtvstools/QtVsTools.csproj +++ b/src/qtvstools/QtVsTools.csproj @@ -45,14 +45,15 @@ true - - Form Form + + + Form @@ -75,6 +76,10 @@ + + QtHelpLinkChooser.xaml + + @@ -84,26 +89,36 @@ Form - - - LICENSE.GPL3-EXCEPT + + Changelog Always true - - Changelog + + LICENSE.GPL3-EXCEPT Always true + + + x64\SQLite.Interop.dll + true + Always + + + x86\SQLite.Interop.dll + true + Always + Visualizer\qt5.natvis Always @@ -248,6 +263,19 @@ DebugSymbolsProjectOutputGroup%3b + + + + ..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net45\System.Data.SQLite.dll + True + + + + + Designer + MSBuild:Compile + + @@ -274,4 +302,11 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/src/qtvstools/Vsix.cs b/src/qtvstools/Vsix.cs index 35bae720..f4aa8601 100644 --- a/src/qtvstools/Vsix.cs +++ b/src/qtvstools/Vsix.cs @@ -137,6 +137,7 @@ namespace QtVsTools QtProjectContextMenu.Initialize(this); QtItemContextMenu.Initialize(this); DefaultEditorsHandler.Initialize(Dte); + QtHelpMenu.Initialize(this); try { UpdateDefaultEditors(Mode.Startup); diff --git a/src/qtvstools/packages.config b/src/qtvstools/packages.config new file mode 100644 index 00000000..33ddd19a --- /dev/null +++ b/src/qtvstools/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/qtvstools/source.extension.vsixmanifest b/src/qtvstools/source.extension.vsixmanifest index 5c8b95ba..636c7f61 100644 --- a/src/qtvstools/source.extension.vsixmanifest +++ b/src/qtvstools/source.extension.vsixmanifest @@ -61,5 +61,13 @@ - + + + -- cgit v1.2.3