r22186 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Sat Oct 7 11:42:58 UTC 2017


Author: jghali
Date: Sat Oct  7 11:42:58 2017
New Revision: 22186

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22186
Log:
msvc projects now output moc_* and ui_* files outside source tree

Modified:
    trunk/Scribus/scribus/plugins/tools/pathcut/install.targets
    trunk/Scribus/win32/msvc2012/Scribus-build-rules.props
    trunk/Scribus/win32/msvc2012/Scribus-build-rules.rules
    trunk/Scribus/win32/msvc2012/Scribus-build-rules.targets
    trunk/Scribus/win32/msvc2012/barcodegenerator/barcodegenerator.vcxproj
    trunk/Scribus/win32/msvc2012/barcodegenerator/barcodegenerator.vcxproj.filters
    trunk/Scribus/win32/msvc2012/colorwheel/colorwheel.vcxproj
    trunk/Scribus/win32/msvc2012/colorwheel/colorwheel.vcxproj.filters
    trunk/Scribus/win32/msvc2012/flattenpath/flattenpath.vcxproj.filters
    trunk/Scribus/win32/msvc2012/fontpreview/fontpreview.vcxproj
    trunk/Scribus/win32/msvc2012/fontpreview/fontpreview.vcxproj.filters
    trunk/Scribus/win32/msvc2012/hunspellcheck/hunspellcheck.vcxproj
    trunk/Scribus/win32/msvc2012/hunspellcheck/hunspellcheck.vcxproj.filters
    trunk/Scribus/win32/msvc2012/lenseffects/lenseffects.vcxproj
    trunk/Scribus/win32/msvc2012/lenseffects/lenseffects.vcxproj.filters
    trunk/Scribus/win32/msvc2012/meshdistortion/meshdistortion.vcxproj
    trunk/Scribus/win32/msvc2012/meshdistortion/meshdistortion.vcxproj.filters
    trunk/Scribus/win32/msvc2012/pathalongpath/pathalongpath.vcxproj
    trunk/Scribus/win32/msvc2012/pathalongpath/pathalongpath.vcxproj.filters
    trunk/Scribus/win32/msvc2012/pathconnect/pathconnect.vcxproj
    trunk/Scribus/win32/msvc2012/pathconnect/pathconnect.vcxproj.filters
    trunk/Scribus/win32/msvc2012/pathcut/pathcut.vcxproj.filters
    trunk/Scribus/win32/msvc2012/pathfinder/pathfinder.vcxproj
    trunk/Scribus/win32/msvc2012/pathfinder/pathfinder.vcxproj.filters
    trunk/Scribus/win32/msvc2012/pathstroker/pathstroker.vcxproj.filters
    trunk/Scribus/win32/msvc2012/pdfimport/pdfimport.vcxproj
    trunk/Scribus/win32/msvc2012/pdfimport/pdfimport.vcxproj.filters
    trunk/Scribus/win32/msvc2012/picturebrowser/picturebrowser.vcxproj
    trunk/Scribus/win32/msvc2012/picturebrowser/picturebrowser.vcxproj.filters
    trunk/Scribus/win32/msvc2012/pixmapexport/pixmapexport.vcxproj
    trunk/Scribus/win32/msvc2012/pixmapexport/pixmapexport.vcxproj.filters
    trunk/Scribus/win32/msvc2012/saveastemplate/saveastemplate.vcxproj
    trunk/Scribus/win32/msvc2012/saveastemplate/saveastemplate.vcxproj.filters
    trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
    trunk/Scribus/win32/msvc2012/scriptplugin/scriptplugin.vcxproj
    trunk/Scribus/win32/msvc2012/scriptplugin/scriptplugin.vcxproj.filters
    trunk/Scribus/win32/msvc2012/shortwords/shortwords.vcxproj
    trunk/Scribus/win32/msvc2012/shortwords/shortwords.vcxproj.filters
    trunk/Scribus/win32/msvc2012/smoothpath/smoothpath.vcxproj.filters
    trunk/Scribus/win32/msvc2012/subdivide/subdivide.vcxproj.filters
    trunk/Scribus/win32/msvc2012/xpsimport/xpsimport.vcxproj
    trunk/Scribus/win32/msvc2012/xpsimport/xpsimport.vcxproj.filters
    trunk/Scribus/win32/msvc2015/Scribus-build-rules.props
    trunk/Scribus/win32/msvc2015/Scribus-build-rules.rules
    trunk/Scribus/win32/msvc2015/Scribus-build-rules.targets
    trunk/Scribus/win32/msvc2015/barcodegenerator/barcodegenerator.vcxproj
    trunk/Scribus/win32/msvc2015/barcodegenerator/barcodegenerator.vcxproj.filters
    trunk/Scribus/win32/msvc2015/colorwheel/colorwheel.vcxproj
    trunk/Scribus/win32/msvc2015/colorwheel/colorwheel.vcxproj.filters
    trunk/Scribus/win32/msvc2015/flattenpath/flattenpath.vcxproj.filters
    trunk/Scribus/win32/msvc2015/fontpreview/fontpreview.vcxproj
    trunk/Scribus/win32/msvc2015/fontpreview/fontpreview.vcxproj.filters
    trunk/Scribus/win32/msvc2015/hunspellcheck/hunspellcheck.vcxproj
    trunk/Scribus/win32/msvc2015/hunspellcheck/hunspellcheck.vcxproj.filters
    trunk/Scribus/win32/msvc2015/lenseffects/lenseffects.vcxproj
    trunk/Scribus/win32/msvc2015/lenseffects/lenseffects.vcxproj.filters
    trunk/Scribus/win32/msvc2015/meshdistortion/meshdistortion.vcxproj
    trunk/Scribus/win32/msvc2015/meshdistortion/meshdistortion.vcxproj.filters
    trunk/Scribus/win32/msvc2015/pathalongpath/pathalongpath.vcxproj
    trunk/Scribus/win32/msvc2015/pathalongpath/pathalongpath.vcxproj.filters
    trunk/Scribus/win32/msvc2015/pathconnect/pathconnect.vcxproj
    trunk/Scribus/win32/msvc2015/pathconnect/pathconnect.vcxproj.filters
    trunk/Scribus/win32/msvc2015/pathcut/pathcut.vcxproj.filters
    trunk/Scribus/win32/msvc2015/pathfinder/pathfinder.vcxproj
    trunk/Scribus/win32/msvc2015/pathfinder/pathfinder.vcxproj.filters
    trunk/Scribus/win32/msvc2015/pathstroker/pathstroker.vcxproj.filters
    trunk/Scribus/win32/msvc2015/pdfimport/pdfimport.vcxproj
    trunk/Scribus/win32/msvc2015/pdfimport/pdfimport.vcxproj.filters
    trunk/Scribus/win32/msvc2015/picturebrowser/picturebrowser.vcxproj
    trunk/Scribus/win32/msvc2015/picturebrowser/picturebrowser.vcxproj.filters
    trunk/Scribus/win32/msvc2015/pixmapexport/pixmapexport.vcxproj
    trunk/Scribus/win32/msvc2015/pixmapexport/pixmapexport.vcxproj.filters
    trunk/Scribus/win32/msvc2015/saveastemplate/saveastemplate.vcxproj
    trunk/Scribus/win32/msvc2015/saveastemplate/saveastemplate.vcxproj.filters
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
    trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj
    trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj.filters
    trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj
    trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj.filters
    trunk/Scribus/win32/msvc2015/smoothpath/smoothpath.vcxproj.filters
    trunk/Scribus/win32/msvc2015/subdivide/subdivide.vcxproj.filters
    trunk/Scribus/win32/msvc2015/xpsimport/xpsimport.vcxproj
    trunk/Scribus/win32/msvc2015/xpsimport/xpsimport.vcxproj.filters

Modified: trunk/Scribus/scribus/plugins/tools/pathcut/install.targets
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/scribus/plugins/tools/pathcut/install.targets
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathcut/install.targets	(original)
+++ trunk/Scribus/scribus/plugins/tools/pathcut/install.targets	Sat Oct  7 11:42:58 2017
@@ -17,10 +17,10 @@
 			DestinationFiles="@(FilesToInstall_plugins_pathcut->'$(OutDir)\share\icons\1_5_0\%(Filename)%(Extension)')"
 			SkipUnchangedFiles="true"
 		/>
-		<Copy  
+		<!--Copy  
 			SourceFiles="@(FilesToInstall_plugins_pathcut)"  
 			DestinationFiles="@(FilesToInstall_plugins_pathcut->'$(OutDir)\share\icons\1_5_1\%(Filename)%(Extension)')"
 			SkipUnchangedFiles="true"
-		/>
+		/-->
 	</Target>
 </Project>

Modified: trunk/Scribus/win32/msvc2012/Scribus-build-rules.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/Scribus-build-rules.props
==============================================================================
--- trunk/Scribus/win32/msvc2012/Scribus-build-rules.props	(original)
+++ trunk/Scribus/win32/msvc2012/Scribus-build-rules.props	Sat Oct  7 11:42:58 2017
@@ -11,8 +11,8 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <uic>
-      <CommandLineTemplate>$(QT5_DIR)\bin\uic.exe [inputs] -o "%(RootDir)%(Directory)\ui_%(Filename).h"</CommandLineTemplate>
-      <Outputs>%(RootDir)%(Directory)\ui_%(Filename).h</Outputs>
+      <CommandLineTemplate>$(QT5_DIR)\bin\uic.exe [inputs] -o "$(IntDir)uic\ui_%(Filename).h"</CommandLineTemplate>
+      <Outputs>$(IntDir)uic\ui_%(Filename).h</Outputs>
       <ExecutionDescription>Uic'ing %(Filename)%(Extension)</ExecutionDescription>
       <AdditionalDependencies>$(QT5_DIR)\bin\uic.exe</AdditionalDependencies>
     </uic>
@@ -28,8 +28,8 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <moc>
-      <CommandLineTemplate>$(QT5_DIR)\bin\moc.exe [inputs] -o "%(RootDir)%(Directory)\moc_%(Filename).cpp"</CommandLineTemplate>
-      <Outputs>%(RootDir)%(Directory)\moc_%(Filename).cpp</Outputs>
+      <CommandLineTemplate>$(QT5_DIR)\bin\moc.exe [inputs] -o "$(IntDir)moc\moc_%(Filename).cpp"</CommandLineTemplate>
+      <Outputs>$(IntDir)moc\moc_%(Filename).cpp</Outputs>
       <ExecutionDescription>Moc'ing %(Filename)%(Extension)</ExecutionDescription>
       <AdditionalDependencies>$(QT5_DIR)\bin\moc.exe</AdditionalDependencies>
     </moc>
@@ -45,8 +45,8 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <rcc>
-      <CommandLineTemplate>$(QT5_DIR)\bin\rcc.exe [inputs] -o "%(RootDir)%(Directory)\rcc_%(Filename).cpp"</CommandLineTemplate>
-      <Outputs>%(RootDir)%(Directory)\rcc_%(Filename).cpp</Outputs>
+      <CommandLineTemplate>$(QT5_DIR)\bin\rcc.exe [inputs] -o "$(IntDir)rcc\rcc_%(Filename).cpp"</CommandLineTemplate>
+      <Outputs>$(IntDir)rcc\rcc_%(Filename).cpp</Outputs>
       <ExecutionDescription>%(Filename).qrc</ExecutionDescription>
       <AdditionalDependencies>$(QT5_DIR)\bin\rcc.exe</AdditionalDependencies>
     </rcc>

Modified: trunk/Scribus/win32/msvc2012/Scribus-build-rules.targets
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/Scribus-build-rules.targets
==============================================================================
--- trunk/Scribus/win32/msvc2012/Scribus-build-rules.targets	(original)
+++ trunk/Scribus/win32/msvc2012/Scribus-build-rules.targets	Sat Oct  7 11:42:58 2017
@@ -78,6 +78,9 @@
       CommandLineTemplate="%(uic.CommandLineTemplate)"
       AdditionalOptions="%(uic.AdditionalOptions)"
       Inputs="%(uic.Identity)" />
+    <!-- ItemGroup>
+      <ClInclude Include="%(uic.Outputs)"/>
+    </ItemGroup -->
   </Target>
   <PropertyGroup>
     <ComputeLinkInputsTargets>
@@ -119,10 +122,21 @@
     Name="UicClean"
     Condition="'@(uic)' != ''">
     <ItemGroup>
-      <mocFileToDelete Include="%(uic.Outputs)" />
+      <uicFileToDelete Include="%(uic.Outputs)" />
     </ItemGroup>
     <Delete Files="@(uicFileToDelete)" />
   </Target>
+  <!-- Additionnal include directories for ui_* files -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(IntDir)uic;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(ProjectName)'!='scribus-main'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(IntDir)..\scribus-main\uic;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <!-- Targets for moc tool -->
   <Target
     Name="_moc"

Modified: trunk/Scribus/win32/msvc2012/barcodegenerator/barcodegenerator.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/barcodegenerator/barcodegenerator.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/barcodegenerator/barcodegenerator.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/barcodegenerator/barcodegenerator.vcxproj	Sat Oct  7 11:42:58 2017
@@ -219,7 +219,6 @@
     <moc Include="..\..\..\scribus\plugins\barcodegenerator\barcode.h" />
     <moc Include="..\..\..\scribus\plugins\barcodegenerator\barcodegenerator.h" />
     <moc Include="..\..\..\scribus\plugins\barcodegenerator\barcodegeneratorrenderthread.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\barcodegenerator\ui_barcodegenerator.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\barcodegenerator\barcodegenerator.ui" />

Modified: trunk/Scribus/win32/msvc2012/barcodegenerator/barcodegenerator.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/barcodegenerator/barcodegenerator.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/barcodegenerator/barcodegenerator.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/barcodegenerator/barcodegenerator.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -16,9 +16,6 @@
     <Filter Include="Form Files">
       <UniqueIdentifier>{e56d0fb6-48e8-4a3a-ba56-2d765cb34b28}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{f1291aab-46c7-40aa-b69b-32f5c71db67c}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\plugins\barcodegenerator\barcode.cpp">
@@ -35,9 +32,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\barcodegenerator\ui_barcodegenerator.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/colorwheel/colorwheel.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/colorwheel/colorwheel.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/colorwheel/colorwheel.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/colorwheel/colorwheel.vcxproj	Sat Oct  7 11:42:58 2017
@@ -219,7 +219,6 @@
     <moc Include="..\..\..\scribus\plugins\colorwheel\colorwheel.h" />
     <moc Include="..\..\..\scribus\plugins\colorwheel\colorwheelwidget.h" />
     <moc Include="..\..\..\scribus\plugins\colorwheel\cwdialog.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\colorwheel\ui_cwdialog.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\colorwheel\cwdialog.ui" />

Modified: trunk/Scribus/win32/msvc2012/colorwheel/colorwheel.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/colorwheel/colorwheel.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/colorwheel/colorwheel.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/colorwheel/colorwheel.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{51b0a2f6-2166-4b0a-91f7-f4a6d0e3ac85}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{5270151a-f364-4c18-afb5-f2d3ae00d96d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{4620ea87-ca71-42d6-8fdc-b3f99182dc81}</UniqueIdentifier>
@@ -31,9 +28,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\colorwheel\ui_cwdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/flattenpath/flattenpath.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/flattenpath/flattenpath.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/flattenpath/flattenpath.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/flattenpath/flattenpath.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{54481527-1a72-4ea0-ba0f-95a0a7ae0f4b}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{cdef1702-942c-498f-aeb8-b5025730c010}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{31b4b558-660c-4eb6-aa40-229e6db56366}</UniqueIdentifier>

Modified: trunk/Scribus/win32/msvc2012/fontpreview/fontpreview.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/fontpreview/fontpreview.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/fontpreview/fontpreview.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/fontpreview/fontpreview.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
     <moc Include="..\..\..\scribus\plugins\fontpreview\fontpreview.h" />
     <moc Include="..\..\..\scribus\plugins\fontpreview\fontpreviewplugin.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\fontpreview\ui_fontpreview.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\fontpreview\fontpreview.ui" />

Modified: trunk/Scribus/win32/msvc2012/fontpreview/fontpreview.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/fontpreview/fontpreview.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/fontpreview/fontpreview.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/fontpreview/fontpreview.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{467096fa-eab5-417a-9f13-65188bdfbc50}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{d8e30f82-ab05-45e1-8833-7d119f3bf2fa}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{11bdc54d-9a6a-4185-80ef-706038e5230e}</UniqueIdentifier>
@@ -28,9 +25,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\fontpreview\ui_fontpreview.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/hunspellcheck/hunspellcheck.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/hunspellcheck/hunspellcheck.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/hunspellcheck/hunspellcheck.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/hunspellcheck/hunspellcheck.vcxproj	Sat Oct  7 11:42:58 2017
@@ -222,7 +222,6 @@
     <moc Include="..\..\..\scribus\plugins\tools\hunspellcheck\hunspellplugin.h" />
     <moc Include="..\..\..\scribus\plugins\tools\hunspellcheck\hunspellpluginimpl.h" />
     <ClInclude Include="..\..\..\scribus\plugins\tools\hunspellcheck\hunspellpluginstructs.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\tools\hunspellcheck\ui_hunspelldialogbase.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\tools\hunspellcheck\hunspelldialogbase.ui" />

Modified: trunk/Scribus/win32/msvc2012/hunspellcheck/hunspellcheck.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/hunspellcheck/hunspellcheck.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/hunspellcheck/hunspellcheck.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/hunspellcheck/hunspellcheck.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{e431be5a-3295-43d7-aa9e-e9f73832a915}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{7de4c226-c92a-4950-9008-e8b945cb7fd3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{85366c1e-4809-4e78-8978-aaa31061c048}</UniqueIdentifier>
@@ -41,9 +38,6 @@
     <ClInclude Include="..\..\..\scribus\plugins\tools\hunspellcheck\hunspellpluginstructs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\tools\hunspellcheck\ui_hunspelldialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/lenseffects/lenseffects.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/lenseffects/lenseffects.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/lenseffects/lenseffects.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/lenseffects/lenseffects.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <moc Include="..\..\..\scribus\plugins\tools\lenseffects\lensdialog.h" />
     <moc Include="..\..\..\scribus\plugins\tools\lenseffects\lenseffects.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\tools\lenseffects\ui_lensdialogbase.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\tools\lenseffects\lensdialogbase.ui" />

Modified: trunk/Scribus/win32/msvc2012/lenseffects/lenseffects.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/lenseffects/lenseffects.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/lenseffects/lenseffects.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/lenseffects/lenseffects.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{f2df67ca-56c9-4510-8cde-c266955b1f02}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{c6e17d68-63bd-46da-979d-01235f7b116f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{7dbc8e97-e5cb-4f41-ac96-4c14d93bb633}</UniqueIdentifier>
@@ -29,9 +26,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\tools\lenseffects\ui_lensdialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/meshdistortion/meshdistortion.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/meshdistortion/meshdistortion.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/meshdistortion/meshdistortion.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/meshdistortion/meshdistortion.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <moc Include="..\..\..\scribus\plugins\tools\2geomtools\meshdistortion\meshdistortion.h" />
     <moc Include="..\..\..\scribus\plugins\tools\2geomtools\meshdistortion\meshdistortiondialog.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\tools\2geomtools\meshdistortion\ui_meshdistortiondialog.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\tools\2geomtools\meshdistortion\meshdistortiondialog.ui" />

Modified: trunk/Scribus/win32/msvc2012/meshdistortion/meshdistortion.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/meshdistortion/meshdistortion.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/meshdistortion/meshdistortion.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/meshdistortion/meshdistortion.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{95ac6036-f82c-43c2-9714-3ead6f9e598a}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{aca5a719-0e98-4903-8174-3613bc726064}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{2eff7aaf-93a7-46b1-9370-2f2a2d1fa3d5}</UniqueIdentifier>
@@ -29,9 +26,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\tools\2geomtools\meshdistortion\ui_meshdistortiondialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/pathalongpath/pathalongpath.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/pathalongpath/pathalongpath.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/pathalongpath/pathalongpath.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/pathalongpath/pathalongpath.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <moc Include="..\..\..\scribus\plugins\tools\2geomtools\pathalongpath\pathalongpath.h" />
     <moc Include="..\..\..\scribus\plugins\tools\2geomtools\pathalongpath\pathdialog.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\tools\2geomtools\pathalongpath\ui_pathdialogbase.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\tools\2geomtools\pathalongpath\pathdialogbase.ui" />

Modified: trunk/Scribus/win32/msvc2012/pathalongpath/pathalongpath.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/pathalongpath/pathalongpath.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/pathalongpath/pathalongpath.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/pathalongpath/pathalongpath.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{5c6a6b51-4633-446c-991e-283623a44c89}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{1080b30f-da4b-4d38-9e1b-dc7c25e3d36a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{22dbbf93-31ee-4cbb-a699-4107a3af880a}</UniqueIdentifier>
@@ -29,9 +26,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\tools\2geomtools\pathalongpath\ui_pathdialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/pathconnect/pathconnect.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/pathconnect/pathconnect.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/pathconnect/pathconnect.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/pathconnect/pathconnect.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <moc Include="..\..\..\scribus\plugins\tools\pathconnect\pathconnect.h" />
     <moc Include="..\..\..\scribus\plugins\tools\pathconnect\pathconnectdialog.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\tools\pathconnect\ui_pathconnectdialogbase.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\tools\pathconnect\pathconnectdialogbase.ui" />

Modified: trunk/Scribus/win32/msvc2012/pathconnect/pathconnect.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/pathconnect/pathconnect.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/pathconnect/pathconnect.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/pathconnect/pathconnect.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{2aa3be9c-d0bb-4673-822f-279920a32ead}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{2bfb6535-8099-415f-a6a0-97936b074dda}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{b41e1b81-9afd-4ac3-ad84-437bd83eb5f6}</UniqueIdentifier>
@@ -29,9 +26,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\tools\pathconnect\ui_pathconnectdialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/pathcut/pathcut.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/pathcut/pathcut.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/pathcut/pathcut.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/pathcut/pathcut.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{39cd4539-b992-4290-b3df-f7ec507189ec}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{15ec6be1-3d0d-4291-a474-c04ec79a0a7d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{665981ec-5f3f-42a5-88b6-ab4eaa67ca4b}</UniqueIdentifier>

Modified: trunk/Scribus/win32/msvc2012/pathfinder/pathfinder.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/pathfinder/pathfinder.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/pathfinder/pathfinder.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/pathfinder/pathfinder.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <moc Include="..\..\..\scribus\plugins\tools\pathfinder\pathfinder.h" />
     <moc Include="..\..\..\scribus\plugins\tools\pathfinder\pathfinderdialog.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\tools\pathfinder\ui_pathfinderbase.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\tools\pathfinder\pathfinderbase.ui" />

Modified: trunk/Scribus/win32/msvc2012/pathfinder/pathfinder.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/pathfinder/pathfinder.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/pathfinder/pathfinder.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/pathfinder/pathfinder.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{6b593108-b1a3-451f-8d85-e33c89de4997}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{3bbbde15-fda4-4e57-ac30-7ef124d51dcb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{020539f9-1a91-4d16-8ae7-19a4d099e659}</UniqueIdentifier>
@@ -29,9 +26,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\tools\pathfinder\ui_pathfinderbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/pathstroker/pathstroker.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/pathstroker/pathstroker.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/pathstroker/pathstroker.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/pathstroker/pathstroker.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{1c744da8-6a98-4190-a400-5963c67afbb4}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{f91b8228-b5b4-4273-a958-e0304df4d274}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{2ee5e3dc-f982-4e44-834b-58e7e92f3dde}</UniqueIdentifier>

Modified: trunk/Scribus/win32/msvc2012/pdfimport/pdfimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/pdfimport/pdfimport.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/pdfimport/pdfimport.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/pdfimport/pdfimport.vcxproj	Sat Oct  7 11:42:58 2017
@@ -221,7 +221,6 @@
     <moc Include="..\..\..\scribus\plugins\import\pdf\importpdfplugin.h" />
     <moc Include="..\..\..\scribus\plugins\import\pdf\pdfimportoptions.h" />
     <ClInclude Include="..\..\..\scribus\plugins\import\pdf\slaoutput.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\import\pdf\ui_pdfimportoptions.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\import\pdf\pdfimportoptions.ui" />

Modified: trunk/Scribus/win32/msvc2012/pdfimport/pdfimport.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/pdfimport/pdfimport.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/pdfimport/pdfimport.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/pdfimport/pdfimport.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{e90d32cf-149c-4dc1-ab3a-b6d86893914a}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{b4cb61b3-e1bc-44e8-8fba-19fab0cbec1f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{20b73e59-c812-4c19-8f7f-06049e6ff8ba}</UniqueIdentifier>
@@ -38,9 +35,6 @@
     <ClInclude Include="..\..\..\scribus\plugins\import\pdf\slaoutput.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\import\pdf\ui_pdfimportoptions.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/picturebrowser/picturebrowser.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/picturebrowser/picturebrowser.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/picturebrowser/picturebrowser.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/picturebrowser/picturebrowser.vcxproj	Sat Oct  7 11:42:58 2017
@@ -233,8 +233,6 @@
     <moc Include="..\..\..\scribus\plugins\picbrowser\pictview.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
     <moc Include="..\..\..\scribus\plugins\picbrowser\previewimage.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\picbrowser\ui_imagedialog.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\picbrowser\ui_picturebrowser.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\picbrowser\imagedialog.ui" />

Modified: trunk/Scribus/win32/msvc2012/picturebrowser/picturebrowser.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/picturebrowser/picturebrowser.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/picturebrowser/picturebrowser.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/picturebrowser/picturebrowser.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -16,9 +16,6 @@
     <Filter Include="Form Files">
       <UniqueIdentifier>{b444e537-1a8e-4132-8b80-7c50827631c6}</UniqueIdentifier>
       <Extensions>ui</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{1c3b9947-57ed-4fab-918e-29ee1e5dd3b7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -57,20 +54,8 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\picbrowser\iview.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\picbrowser\pictview.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\picbrowser\ui_imagedialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\picbrowser\ui_picturebrowser.h">
-      <Filter>Generated Form Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -106,5 +91,11 @@
     <moc Include="..\..\..\scribus\plugins\picbrowser\previewimage.h">
       <Filter>Header Files</Filter>
     </moc>
+    <moc Include="..\..\..\scribus\plugins\picbrowser\iview.h">
+      <Filter>Header Files</Filter>
+    </moc>
+    <moc Include="..\..\..\scribus\plugins\picbrowser\pictview.h">
+      <Filter>Header Files</Filter>
+    </moc>
   </ItemGroup>
 </Project>

Modified: trunk/Scribus/win32/msvc2012/pixmapexport/pixmapexport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/pixmapexport/pixmapexport.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/pixmapexport/pixmapexport.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/pixmapexport/pixmapexport.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
     <moc Include="..\..\..\scribus\plugins\export\pixmapexport\dialog.h" />
     <moc Include="..\..\..\scribus\plugins\export\pixmapexport\export.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\export\pixmapexport\ui_exportform.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\export\pixmapexport\exportform.ui" />

Modified: trunk/Scribus/win32/msvc2012/pixmapexport/pixmapexport.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/pixmapexport/pixmapexport.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/pixmapexport/pixmapexport.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/pixmapexport/pixmapexport.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -12,9 +12,6 @@
     <Filter Include="Form Files">
       <UniqueIdentifier>{09f7faf0-2871-4174-8346-cf42a1da43c6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{f55087c4-a921-49d3-8fff-06a1bdcc027b}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\plugins\export\pixmapexport\dialog.cpp">
@@ -28,9 +25,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\export\pixmapexport\ui_exportform.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/saveastemplate/saveastemplate.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/saveastemplate/saveastemplate.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/saveastemplate/saveastemplate.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/saveastemplate/saveastemplate.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <moc Include="..\..\..\scribus\plugins\saveastemplateplugin\satdialog.h" />
     <moc Include="..\..\..\scribus\plugins\saveastemplateplugin\satemplate.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\saveastemplateplugin\ui_satdialog.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\saveastemplateplugin\satdialog.ui" />

Modified: trunk/Scribus/win32/msvc2012/saveastemplate/saveastemplate.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/saveastemplate/saveastemplate.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/saveastemplate/saveastemplate.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/saveastemplate/saveastemplate.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -13,9 +13,6 @@
       <UniqueIdentifier>{ce9de50a-635a-41a7-ae33-c8b5ecb7db18}</UniqueIdentifier>
       <Extensions>ui</Extensions>
     </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{cdebf2d4-8f04-4519-bd1d-dcede62421c1}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\plugins\saveastemplateplugin\satdialog.cpp">
@@ -29,9 +26,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\saveastemplateplugin\ui_satdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj	Sat Oct  7 11:42:58 2017
@@ -596,10 +596,6 @@
     <moc Include="..\..\..\scribus\ui\smlineedit.h" />
     <moc Include="..\..\..\scribus\ui\smdirectionselect.h" />
     <moc Include="..\..\..\scribus\ui\textpalette.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_colorsandfillsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_downloadspalettebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_resourcemanagerbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_resourcemanagerlicensebase.h" />
     <ClInclude Include="..\..\..\scribus\undotransaction.h" />
     <ClInclude Include="..\..\..\scribus\util_debug.h" />
     <ClInclude Include="..\..\..\scribus\util_os.h" />
@@ -791,107 +787,6 @@
     <ClInclude Include="..\..\..\scribus\vgradientex.h" />
     <moc Include="..\..\..\scribus\ui\vruler.h" />
     <moc Include="..\..\..\scribus\ui\weldedit.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_aboutplugins.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_aligndistribute.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_arcvectorbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_arcwidgetbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_charselect.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_charselectenhanced.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_cmsprefsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_colorpalette.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_copypagetomasterpage.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_createrange.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_gradientaddedit.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_gradienteditor.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_gradientvectorbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_gtfiledialog.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_guidemanager.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_helpbrowser.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_helpbrowsernavigation.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_insertaframe.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_inserttablecolumnsdialog.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_inserttablerowsdialog.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_mark2item.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_mark2mark.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_markanchor.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_marknote.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_marksmanager.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_markvariabletext.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_measurementsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_multipleduplicate.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_multiprogressdialog.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_newmarginwidgetbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_notesstyleseditor.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_pageitemattributes.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_pagepalette_masterpagesbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_picsearch.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_picsearchoptions.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_picstatus.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_pluginmanagerprefsgui.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_polygonwidgetbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_preferencesdialogbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_colormanagementbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_displaybase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentinformationbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentitemattributesbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentsectionsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentsetupbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_externaltoolsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_fontsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_guidesbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_hyphenatorbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_imagecachebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_itemtoolsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_keyboardshortcutsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_miscellaneousbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_operatortoolsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pagesizesbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pathsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pdfexportbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pluginsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_preflightverifierbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_printerbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_scrapbookbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_spellingbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_tableofcontentsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_typographybase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_userinterfacebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_printdialogbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_groupbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_imagebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_linebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_shadowbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_shapebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_tablebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_textbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_xyzbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_advancedbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_distancebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_flopbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_optmarginsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_orphansbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_pareffectbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_pathtextbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_textcolorbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_replacecolors.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_replaceonecolor.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_selectobjects.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_shortcutwidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_smcellstylewidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_smcstylewidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_smlinestylewidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_smpstylewidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_smreplacedia.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_smtablestylewidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_spiralvectorbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_spiralwidgetbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_stylemanager.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_tablecolumnwidthsdialog.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_tablerowheightsdialog.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_transformdialogbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_transparencypalette.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_unicodesearch.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_useprintermarginsdialog.h" />
     <ClInclude Include="..\win-config.h" />
     <ClInclude Include="..\..\..\scribus\colormgmt\sccolormgmtelem.h" />
     <ClInclude Include="..\..\..\scribus\colormgmt\sccolormgmtengine.h" />
@@ -1755,10 +1650,10 @@
     <Import Project="..\Scribus-build-rules.targets" />
   </ImportGroup>
   <Import Project="..\..\..\scribus.install.targets" />
-  <Target Name="AfterBuildMessage" AfterTargets="Build" BeforeTargets="AfterBuild" >
-     <Message Importance="High" Text="Now copying assets to output directory..." />
+  <Target Name="AfterBuildMessage" AfterTargets="Build" BeforeTargets="AfterBuild">
+    <Message Importance="High" Text="Now copying assets to output directory..." />
   </Target>
-  <Target Name="AfterBuild" AfterTargets="Build" DependsOnTargets="$(AfterBuildDependsOn)" >
-     <Message Importance="High" Text="Assets have been copied to output directory..." />
+  <Target Name="AfterBuild" AfterTargets="Build" DependsOnTargets="$(AfterBuildDependsOn)">
+    <Message Importance="High" Text="Assets have been copied to output directory..." />
   </Target>
 </Project>

Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -15,9 +15,6 @@
     <Filter Include="Resource Files">
       <UniqueIdentifier>{21958c29-b128-465f-b025-cd419f23d4c9}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{99d03b00-3d8b-4648-8c57-76a4eb400f6d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{89b48344-5dfc-4692-8e28-d0d3d74907a9}</UniqueIdentifier>
@@ -560,309 +557,6 @@
     <ClInclude Include="..\..\..\scribus\vgradientex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_aboutplugins.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_aligndistribute.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_arcvectorbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_arcwidgetbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_charselect.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_charselectenhanced.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_cmsprefsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_colorpalette.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_copypagetomasterpage.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_createrange.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_gradientaddedit.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_gradienteditor.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_gradientvectorbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_gtfiledialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_guidemanager.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_helpbrowser.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_helpbrowsernavigation.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_insertaframe.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_inserttablecolumnsdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_inserttablerowsdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_mark2item.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_mark2mark.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_markanchor.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_marknote.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_marksmanager.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_markvariabletext.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_measurementsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_multipleduplicate.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_multiprogressdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_newmarginwidgetbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_notesstyleseditor.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_pageitemattributes.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_pagepalette_masterpagesbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_picsearch.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_picsearchoptions.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_picstatus.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_pluginmanagerprefsgui.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_polygonwidgetbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_preferencesdialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_colormanagementbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_displaybase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentinformationbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentitemattributesbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentsectionsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentsetupbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_externaltoolsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_fontsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_guidesbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_hyphenatorbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_imagecachebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_itemtoolsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_keyboardshortcutsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_miscellaneousbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_operatortoolsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pagesizesbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pathsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pdfexportbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pluginsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_preflightverifierbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_printerbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_scrapbookbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_spellingbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_tableofcontentsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_typographybase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_userinterfacebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_printdialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_groupbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_imagebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_linebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_shadowbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_shapebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_tablebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_textbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_xyzbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_advancedbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_distancebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_flopbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_optmarginsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_orphansbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_pareffectbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_pathtextbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_textcolorbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_replacecolors.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_replaceonecolor.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_selectobjects.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_shortcutwidget.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_smcellstylewidget.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_smcstylewidget.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_smlinestylewidget.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_smpstylewidget.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_smreplacedia.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_smtablestylewidget.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_spiralvectorbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_spiralwidgetbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_stylemanager.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_tablecolumnwidthsdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_tablerowheightsdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_transformdialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_transparencypalette.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_unicodesearch.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_useprintermarginsdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\win-config.h">
       <Filter>Win-config</Filter>
     </ClInclude>
@@ -953,12 +647,6 @@
     <ClInclude Include="..\..\..\scribus\undotransaction.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_downloadspalettebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_resourcemanagerbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\third_party\fparser\fparser.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -989,9 +677,6 @@
     <ClInclude Include="..\..\..\scribus\colormgmt\sccolorspacedata_labdbl.h">
       <Filter>colorMgmt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_resourcemanagerlicensebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\collapsedtablepainterex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1036,9 +721,6 @@
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\text\textsource.h">
       <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_colorsandfillsbase.h">
-      <Filter>Generated Form Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>

Modified: trunk/Scribus/win32/msvc2012/scriptplugin/scriptplugin.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/scriptplugin/scriptplugin.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/scriptplugin/scriptplugin.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/scriptplugin/scriptplugin.vcxproj	Sat Oct  7 11:42:58 2017
@@ -272,10 +272,6 @@
     <moc Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.h" />
     <moc Include="..\..\..\scribus\plugins\scriptplugin\scriptplugin.h" />
     <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\svgimport.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_pconsole.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_prefs_scripterbase.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_runscriptdialog.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_scripterprefsgui.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\scriptplugin\pconsole.ui" />

Modified: trunk/Scribus/win32/msvc2012/scriptplugin/scriptplugin.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/scriptplugin/scriptplugin.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/scriptplugin/scriptplugin.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/scriptplugin/scriptplugin.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -13,9 +13,6 @@
       <UniqueIdentifier>{e7c51734-0aa1-45e7-b09b-99999118ece9}</UniqueIdentifier>
       <Extensions>ui</Extensions>
     </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{91615bb8-8d82-48b0-8bcd-0c62dc28b37f}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\plugins\scriptplugin\cmdcell.cpp">
@@ -170,18 +167,6 @@
     <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\svgimport.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_pconsole.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_prefs_scripterbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_runscriptdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_scripterprefsgui.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\cmdannotations.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2012/shortwords/shortwords.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/shortwords/shortwords.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/shortwords/shortwords.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/shortwords/shortwords.vcxproj	Sat Oct  7 11:42:58 2017
@@ -228,7 +228,6 @@
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
     <moc Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.h" />
     <ClInclude Include="..\..\..\scribus\plugins\short-words\version.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\short-words\ui_swdialog.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\short-words\prefs_shortwordsbase.ui" />

Modified: trunk/Scribus/win32/msvc2012/shortwords/shortwords.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/shortwords/shortwords.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/shortwords/shortwords.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/shortwords/shortwords.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -12,9 +12,6 @@
     <Filter Include="Form Files">
       <UniqueIdentifier>{403be6a8-b5d3-4e2a-b06b-b076c3418a83}</UniqueIdentifier>
       <Extensions>ui</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{5899fdf5-cc8b-4ef6-adae-d6ad9c0ce595}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -44,14 +41,8 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\short-words\version.h">
       <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\short-words\ui_swdialog.h">
-      <Filter>Generated Form Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
@@ -84,5 +75,8 @@
     <moc Include="..\..\..\scribus\plugins\short-words\swprefsgui.h">
       <Filter>Header Files</Filter>
     </moc>
+    <moc Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.h">
+      <Filter>Header Files</Filter>
+    </moc>
   </ItemGroup>
 </Project>

Modified: trunk/Scribus/win32/msvc2012/smoothpath/smoothpath.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/smoothpath/smoothpath.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/smoothpath/smoothpath.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/smoothpath/smoothpath.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{e51d29c8-e562-4967-9786-9e77a26d3219}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{2fab3bd6-f6c4-4e5a-a2c5-ff1180857b10}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{02617aeb-a1cc-43be-b7b6-3262625df62b}</UniqueIdentifier>

Modified: trunk/Scribus/win32/msvc2012/subdivide/subdivide.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/subdivide/subdivide.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/subdivide/subdivide.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/subdivide/subdivide.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{14090ca2-ae12-4338-a735-24f85cc508a5}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{7c4eb06c-8c2b-442a-843b-53522b7dccc6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{6105d9c0-3e04-4f0e-8118-92088565c8f3}</UniqueIdentifier>

Modified: trunk/Scribus/win32/msvc2012/xpsimport/xpsimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/xpsimport/xpsimport.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/xpsimport/xpsimport.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2012/xpsimport/xpsimport.vcxproj	Sat Oct  7 11:42:58 2017
@@ -226,7 +226,6 @@
     <uic Include="..\..\..\scribus\plugins\import\xps\xpsimportoptions.ui" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\import\xps\ui_xpsimportoptions.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Modified: trunk/Scribus/win32/msvc2012/xpsimport/xpsimport.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2012/xpsimport/xpsimport.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/xpsimport/xpsimport.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2012/xpsimport/xpsimport.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{ae7efe02-a2a4-4bb8-9332-5ed946549b77}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{1d2ad7ef-563a-4431-b6ce-7591574764b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{5dbaee6c-6214-47eb-9141-17787bc75aaa}</UniqueIdentifier>
@@ -48,9 +45,6 @@
     </uic>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\import\xps\ui_xpsimportoptions.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/Scribus-build-rules.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/Scribus-build-rules.props
==============================================================================
--- trunk/Scribus/win32/msvc2015/Scribus-build-rules.props	(original)
+++ trunk/Scribus/win32/msvc2015/Scribus-build-rules.props	Sat Oct  7 11:42:58 2017
@@ -11,8 +11,8 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <uic>
-      <CommandLineTemplate>$(QT5_DIR)\bin\uic.exe [inputs] -o "%(RootDir)%(Directory)\ui_%(Filename).h"</CommandLineTemplate>
-      <Outputs>%(RootDir)%(Directory)\ui_%(Filename).h</Outputs>
+      <CommandLineTemplate>$(QT5_DIR)\bin\uic.exe [inputs] -o "$(IntDir)uic\ui_%(Filename).h"</CommandLineTemplate>
+      <Outputs>$(IntDir)uic\ui_%(Filename).h</Outputs>
       <ExecutionDescription>Uic'ing %(Filename)%(Extension)</ExecutionDescription>
       <AdditionalDependencies>$(QT5_DIR)\bin\uic.exe</AdditionalDependencies>
     </uic>
@@ -28,8 +28,8 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <moc>
-      <CommandLineTemplate>$(QT5_DIR)\bin\moc.exe [inputs] -o "%(RootDir)%(Directory)\moc_%(Filename).cpp"</CommandLineTemplate>
-      <Outputs>%(RootDir)%(Directory)\moc_%(Filename).cpp</Outputs>
+      <CommandLineTemplate>$(QT5_DIR)\bin\moc.exe [inputs] -o "$(IntDir)moc\moc_%(Filename).cpp"</CommandLineTemplate>
+      <Outputs>$(IntDir)moc\moc_%(Filename).cpp</Outputs>
       <ExecutionDescription>Moc'ing %(Filename)%(Extension)</ExecutionDescription>
       <AdditionalDependencies>$(QT5_DIR)\bin\moc.exe</AdditionalDependencies>
     </moc>
@@ -45,8 +45,8 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <rcc>
-      <CommandLineTemplate>$(QT5_DIR)\bin\rcc.exe [inputs] -o "%(RootDir)%(Directory)\rcc_%(Filename).cpp"</CommandLineTemplate>
-      <Outputs>%(RootDir)%(Directory)\rcc_%(Filename).cpp</Outputs>
+      <CommandLineTemplate>$(QT5_DIR)\bin\rcc.exe [inputs] -o "$(IntDir)rcc\rcc_%(Filename).cpp"</CommandLineTemplate>
+      <Outputs>$(IntDir)rcc\rcc_%(Filename).cpp</Outputs>
       <ExecutionDescription>%(Filename).qrc</ExecutionDescription>
       <AdditionalDependencies>$(QT5_DIR)\bin\rcc.exe</AdditionalDependencies>
     </rcc>

Modified: trunk/Scribus/win32/msvc2015/Scribus-build-rules.targets
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/Scribus-build-rules.targets
==============================================================================
--- trunk/Scribus/win32/msvc2015/Scribus-build-rules.targets	(original)
+++ trunk/Scribus/win32/msvc2015/Scribus-build-rules.targets	Sat Oct  7 11:42:58 2017
@@ -78,6 +78,9 @@
       CommandLineTemplate="%(uic.CommandLineTemplate)"
       AdditionalOptions="%(uic.AdditionalOptions)"
       Inputs="%(uic.Identity)" />
+    <!-- ItemGroup>
+      <ClInclude Include="%(uic.Outputs)"/>
+    </ItemGroup -->
   </Target>
   <PropertyGroup>
     <ComputeLinkInputsTargets>
@@ -119,10 +122,21 @@
     Name="UicClean"
     Condition="'@(uic)' != ''">
     <ItemGroup>
-      <mocFileToDelete Include="%(uic.Outputs)" />
+      <uicFileToDelete Include="%(uic.Outputs)" />
     </ItemGroup>
     <Delete Files="@(uicFileToDelete)" />
   </Target>
+  <!-- Additionnal include directories for ui_* files -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(IntDir)uic;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(ProjectName)'!='scribus-main'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(IntDir)..\scribus-main\uic;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <!-- Targets for moc tool -->
   <Target
     Name="_moc"

Modified: trunk/Scribus/win32/msvc2015/barcodegenerator/barcodegenerator.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/barcodegenerator/barcodegenerator.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/barcodegenerator/barcodegenerator.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/barcodegenerator/barcodegenerator.vcxproj	Sat Oct  7 11:42:58 2017
@@ -219,7 +219,6 @@
     <moc Include="..\..\..\scribus\plugins\barcodegenerator\barcode.h" />
     <moc Include="..\..\..\scribus\plugins\barcodegenerator\barcodegenerator.h" />
     <moc Include="..\..\..\scribus\plugins\barcodegenerator\barcodegeneratorrenderthread.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\barcodegenerator\ui_barcodegenerator.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\barcodegenerator\barcodegenerator.ui" />

Modified: trunk/Scribus/win32/msvc2015/barcodegenerator/barcodegenerator.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/barcodegenerator/barcodegenerator.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/barcodegenerator/barcodegenerator.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/barcodegenerator/barcodegenerator.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -16,9 +16,6 @@
     <Filter Include="Form Files">
       <UniqueIdentifier>{e56d0fb6-48e8-4a3a-ba56-2d765cb34b28}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{f1291aab-46c7-40aa-b69b-32f5c71db67c}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\plugins\barcodegenerator\barcode.cpp">
@@ -35,9 +32,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\barcodegenerator\ui_barcodegenerator.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/colorwheel/colorwheel.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/colorwheel/colorwheel.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/colorwheel/colorwheel.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/colorwheel/colorwheel.vcxproj	Sat Oct  7 11:42:58 2017
@@ -219,7 +219,6 @@
     <moc Include="..\..\..\scribus\plugins\colorwheel\colorwheel.h" />
     <moc Include="..\..\..\scribus\plugins\colorwheel\colorwheelwidget.h" />
     <moc Include="..\..\..\scribus\plugins\colorwheel\cwdialog.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\colorwheel\ui_cwdialog.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\colorwheel\cwdialog.ui" />

Modified: trunk/Scribus/win32/msvc2015/colorwheel/colorwheel.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/colorwheel/colorwheel.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/colorwheel/colorwheel.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/colorwheel/colorwheel.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{51b0a2f6-2166-4b0a-91f7-f4a6d0e3ac85}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{5270151a-f364-4c18-afb5-f2d3ae00d96d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{4620ea87-ca71-42d6-8fdc-b3f99182dc81}</UniqueIdentifier>
@@ -31,9 +28,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\colorwheel\ui_cwdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/flattenpath/flattenpath.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/flattenpath/flattenpath.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/flattenpath/flattenpath.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/flattenpath/flattenpath.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{54481527-1a72-4ea0-ba0f-95a0a7ae0f4b}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{cdef1702-942c-498f-aeb8-b5025730c010}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{31b4b558-660c-4eb6-aa40-229e6db56366}</UniqueIdentifier>

Modified: trunk/Scribus/win32/msvc2015/fontpreview/fontpreview.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/fontpreview/fontpreview.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/fontpreview/fontpreview.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/fontpreview/fontpreview.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
     <moc Include="..\..\..\scribus\plugins\fontpreview\fontpreview.h" />
     <moc Include="..\..\..\scribus\plugins\fontpreview\fontpreviewplugin.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\fontpreview\ui_fontpreview.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\fontpreview\fontpreview.ui" />

Modified: trunk/Scribus/win32/msvc2015/fontpreview/fontpreview.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/fontpreview/fontpreview.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/fontpreview/fontpreview.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/fontpreview/fontpreview.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{467096fa-eab5-417a-9f13-65188bdfbc50}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{d8e30f82-ab05-45e1-8833-7d119f3bf2fa}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{11bdc54d-9a6a-4185-80ef-706038e5230e}</UniqueIdentifier>
@@ -28,9 +25,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\fontpreview\ui_fontpreview.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/hunspellcheck/hunspellcheck.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/hunspellcheck/hunspellcheck.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/hunspellcheck/hunspellcheck.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/hunspellcheck/hunspellcheck.vcxproj	Sat Oct  7 11:42:58 2017
@@ -222,7 +222,6 @@
     <moc Include="..\..\..\scribus\plugins\tools\hunspellcheck\hunspellplugin.h" />
     <moc Include="..\..\..\scribus\plugins\tools\hunspellcheck\hunspellpluginimpl.h" />
     <ClInclude Include="..\..\..\scribus\plugins\tools\hunspellcheck\hunspellpluginstructs.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\tools\hunspellcheck\ui_hunspelldialogbase.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\tools\hunspellcheck\hunspelldialogbase.ui" />

Modified: trunk/Scribus/win32/msvc2015/hunspellcheck/hunspellcheck.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/hunspellcheck/hunspellcheck.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/hunspellcheck/hunspellcheck.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/hunspellcheck/hunspellcheck.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{e431be5a-3295-43d7-aa9e-e9f73832a915}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{7de4c226-c92a-4950-9008-e8b945cb7fd3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{85366c1e-4809-4e78-8978-aaa31061c048}</UniqueIdentifier>
@@ -41,9 +38,6 @@
     <ClInclude Include="..\..\..\scribus\plugins\tools\hunspellcheck\hunspellpluginstructs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\tools\hunspellcheck\ui_hunspelldialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/lenseffects/lenseffects.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/lenseffects/lenseffects.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/lenseffects/lenseffects.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/lenseffects/lenseffects.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <moc Include="..\..\..\scribus\plugins\tools\lenseffects\lensdialog.h" />
     <moc Include="..\..\..\scribus\plugins\tools\lenseffects\lenseffects.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\tools\lenseffects\ui_lensdialogbase.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\tools\lenseffects\lensdialogbase.ui" />

Modified: trunk/Scribus/win32/msvc2015/lenseffects/lenseffects.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/lenseffects/lenseffects.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/lenseffects/lenseffects.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/lenseffects/lenseffects.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{f2df67ca-56c9-4510-8cde-c266955b1f02}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{c6e17d68-63bd-46da-979d-01235f7b116f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{7dbc8e97-e5cb-4f41-ac96-4c14d93bb633}</UniqueIdentifier>
@@ -29,9 +26,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\tools\lenseffects\ui_lensdialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/meshdistortion/meshdistortion.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/meshdistortion/meshdistortion.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/meshdistortion/meshdistortion.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/meshdistortion/meshdistortion.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <moc Include="..\..\..\scribus\plugins\tools\2geomtools\meshdistortion\meshdistortion.h" />
     <moc Include="..\..\..\scribus\plugins\tools\2geomtools\meshdistortion\meshdistortiondialog.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\tools\2geomtools\meshdistortion\ui_meshdistortiondialog.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\tools\2geomtools\meshdistortion\meshdistortiondialog.ui" />

Modified: trunk/Scribus/win32/msvc2015/meshdistortion/meshdistortion.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/meshdistortion/meshdistortion.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/meshdistortion/meshdistortion.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/meshdistortion/meshdistortion.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{95ac6036-f82c-43c2-9714-3ead6f9e598a}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{aca5a719-0e98-4903-8174-3613bc726064}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{2eff7aaf-93a7-46b1-9370-2f2a2d1fa3d5}</UniqueIdentifier>
@@ -29,9 +26,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\tools\2geomtools\meshdistortion\ui_meshdistortiondialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/pathalongpath/pathalongpath.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/pathalongpath/pathalongpath.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/pathalongpath/pathalongpath.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/pathalongpath/pathalongpath.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <moc Include="..\..\..\scribus\plugins\tools\2geomtools\pathalongpath\pathalongpath.h" />
     <moc Include="..\..\..\scribus\plugins\tools\2geomtools\pathalongpath\pathdialog.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\tools\2geomtools\pathalongpath\ui_pathdialogbase.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\tools\2geomtools\pathalongpath\pathdialogbase.ui" />

Modified: trunk/Scribus/win32/msvc2015/pathalongpath/pathalongpath.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/pathalongpath/pathalongpath.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/pathalongpath/pathalongpath.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/pathalongpath/pathalongpath.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{5c6a6b51-4633-446c-991e-283623a44c89}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{1080b30f-da4b-4d38-9e1b-dc7c25e3d36a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{22dbbf93-31ee-4cbb-a699-4107a3af880a}</UniqueIdentifier>
@@ -29,9 +26,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\tools\2geomtools\pathalongpath\ui_pathdialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/pathconnect/pathconnect.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/pathconnect/pathconnect.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/pathconnect/pathconnect.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/pathconnect/pathconnect.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <moc Include="..\..\..\scribus\plugins\tools\pathconnect\pathconnect.h" />
     <moc Include="..\..\..\scribus\plugins\tools\pathconnect\pathconnectdialog.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\tools\pathconnect\ui_pathconnectdialogbase.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\tools\pathconnect\pathconnectdialogbase.ui" />

Modified: trunk/Scribus/win32/msvc2015/pathconnect/pathconnect.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/pathconnect/pathconnect.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/pathconnect/pathconnect.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/pathconnect/pathconnect.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{2aa3be9c-d0bb-4673-822f-279920a32ead}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{2bfb6535-8099-415f-a6a0-97936b074dda}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{b41e1b81-9afd-4ac3-ad84-437bd83eb5f6}</UniqueIdentifier>
@@ -29,9 +26,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\tools\pathconnect\ui_pathconnectdialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/pathcut/pathcut.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/pathcut/pathcut.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/pathcut/pathcut.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/pathcut/pathcut.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{39cd4539-b992-4290-b3df-f7ec507189ec}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{15ec6be1-3d0d-4291-a474-c04ec79a0a7d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{665981ec-5f3f-42a5-88b6-ab4eaa67ca4b}</UniqueIdentifier>

Modified: trunk/Scribus/win32/msvc2015/pathfinder/pathfinder.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/pathfinder/pathfinder.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/pathfinder/pathfinder.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/pathfinder/pathfinder.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <moc Include="..\..\..\scribus\plugins\tools\pathfinder\pathfinder.h" />
     <moc Include="..\..\..\scribus\plugins\tools\pathfinder\pathfinderdialog.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\tools\pathfinder\ui_pathfinderbase.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\tools\pathfinder\pathfinderbase.ui" />

Modified: trunk/Scribus/win32/msvc2015/pathfinder/pathfinder.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/pathfinder/pathfinder.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/pathfinder/pathfinder.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/pathfinder/pathfinder.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{6b593108-b1a3-451f-8d85-e33c89de4997}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{3bbbde15-fda4-4e57-ac30-7ef124d51dcb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{020539f9-1a91-4d16-8ae7-19a4d099e659}</UniqueIdentifier>
@@ -29,9 +26,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\tools\pathfinder\ui_pathfinderbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/pathstroker/pathstroker.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/pathstroker/pathstroker.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/pathstroker/pathstroker.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/pathstroker/pathstroker.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{1c744da8-6a98-4190-a400-5963c67afbb4}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{f91b8228-b5b4-4273-a958-e0304df4d274}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{2ee5e3dc-f982-4e44-834b-58e7e92f3dde}</UniqueIdentifier>

Modified: trunk/Scribus/win32/msvc2015/pdfimport/pdfimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/pdfimport/pdfimport.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/pdfimport/pdfimport.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/pdfimport/pdfimport.vcxproj	Sat Oct  7 11:42:58 2017
@@ -221,7 +221,6 @@
     <moc Include="..\..\..\scribus\plugins\import\pdf\importpdfplugin.h" />
     <moc Include="..\..\..\scribus\plugins\import\pdf\pdfimportoptions.h" />
     <ClInclude Include="..\..\..\scribus\plugins\import\pdf\slaoutput.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\import\pdf\ui_pdfimportoptions.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\import\pdf\pdfimportoptions.ui" />

Modified: trunk/Scribus/win32/msvc2015/pdfimport/pdfimport.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/pdfimport/pdfimport.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/pdfimport/pdfimport.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/pdfimport/pdfimport.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{e90d32cf-149c-4dc1-ab3a-b6d86893914a}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{b4cb61b3-e1bc-44e8-8fba-19fab0cbec1f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{20b73e59-c812-4c19-8f7f-06049e6ff8ba}</UniqueIdentifier>
@@ -38,9 +35,6 @@
     <ClInclude Include="..\..\..\scribus\plugins\import\pdf\slaoutput.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\import\pdf\ui_pdfimportoptions.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/picturebrowser/picturebrowser.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/picturebrowser/picturebrowser.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/picturebrowser/picturebrowser.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/picturebrowser/picturebrowser.vcxproj	Sat Oct  7 11:42:58 2017
@@ -233,8 +233,6 @@
     <moc Include="..\..\..\scribus\plugins\picbrowser\pictview.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
     <moc Include="..\..\..\scribus\plugins\picbrowser\previewimage.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\picbrowser\ui_imagedialog.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\picbrowser\ui_picturebrowser.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\picbrowser\imagedialog.ui" />

Modified: trunk/Scribus/win32/msvc2015/picturebrowser/picturebrowser.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/picturebrowser/picturebrowser.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/picturebrowser/picturebrowser.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/picturebrowser/picturebrowser.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -16,9 +16,6 @@
     <Filter Include="Form Files">
       <UniqueIdentifier>{b444e537-1a8e-4132-8b80-7c50827631c6}</UniqueIdentifier>
       <Extensions>ui</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{1c3b9947-57ed-4fab-918e-29ee1e5dd3b7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -59,12 +56,6 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\picbrowser\ui_imagedialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\picbrowser\ui_picturebrowser.h">
-      <Filter>Generated Form Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>

Modified: trunk/Scribus/win32/msvc2015/pixmapexport/pixmapexport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/pixmapexport/pixmapexport.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/pixmapexport/pixmapexport.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/pixmapexport/pixmapexport.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
     <moc Include="..\..\..\scribus\plugins\export\pixmapexport\dialog.h" />
     <moc Include="..\..\..\scribus\plugins\export\pixmapexport\export.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\export\pixmapexport\ui_exportform.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\export\pixmapexport\exportform.ui" />

Modified: trunk/Scribus/win32/msvc2015/pixmapexport/pixmapexport.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/pixmapexport/pixmapexport.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/pixmapexport/pixmapexport.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/pixmapexport/pixmapexport.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -12,9 +12,6 @@
     <Filter Include="Form Files">
       <UniqueIdentifier>{09f7faf0-2871-4174-8346-cf42a1da43c6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{f55087c4-a921-49d3-8fff-06a1bdcc027b}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\plugins\export\pixmapexport\dialog.cpp">
@@ -28,9 +25,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\export\pixmapexport\ui_exportform.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/saveastemplate/saveastemplate.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/saveastemplate/saveastemplate.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/saveastemplate/saveastemplate.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/saveastemplate/saveastemplate.vcxproj	Sat Oct  7 11:42:58 2017
@@ -217,7 +217,6 @@
     <moc Include="..\..\..\scribus\plugins\saveastemplateplugin\satdialog.h" />
     <moc Include="..\..\..\scribus\plugins\saveastemplateplugin\satemplate.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\saveastemplateplugin\ui_satdialog.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\saveastemplateplugin\satdialog.ui" />

Modified: trunk/Scribus/win32/msvc2015/saveastemplate/saveastemplate.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/saveastemplate/saveastemplate.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/saveastemplate/saveastemplate.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/saveastemplate/saveastemplate.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -13,9 +13,6 @@
       <UniqueIdentifier>{ce9de50a-635a-41a7-ae33-c8b5ecb7db18}</UniqueIdentifier>
       <Extensions>ui</Extensions>
     </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{cdebf2d4-8f04-4519-bd1d-dcede62421c1}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\plugins\saveastemplateplugin\satdialog.cpp">
@@ -29,9 +26,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\saveastemplateplugin\ui_satdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj	Sat Oct  7 11:42:58 2017
@@ -596,10 +596,6 @@
     <moc Include="..\..\..\scribus\ui\smlineedit.h" />
     <moc Include="..\..\..\scribus\ui\smdirectionselect.h" />
     <moc Include="..\..\..\scribus\ui\textpalette.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_colorsandfillsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_downloadspalettebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_resourcemanagerbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_resourcemanagerlicensebase.h" />
     <ClInclude Include="..\..\..\scribus\undotransaction.h" />
     <ClInclude Include="..\..\..\scribus\util_debug.h" />
     <ClInclude Include="..\..\..\scribus\util_os.h" />
@@ -791,107 +787,6 @@
     <ClInclude Include="..\..\..\scribus\vgradientex.h" />
     <moc Include="..\..\..\scribus\ui\vruler.h" />
     <moc Include="..\..\..\scribus\ui\weldedit.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_aboutplugins.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_aligndistribute.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_arcvectorbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_arcwidgetbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_charselect.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_charselectenhanced.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_cmsprefsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_colorpalette.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_copypagetomasterpage.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_createrange.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_gradientaddedit.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_gradienteditor.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_gradientvectorbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_gtfiledialog.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_guidemanager.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_helpbrowser.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_helpbrowsernavigation.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_insertaframe.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_inserttablecolumnsdialog.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_inserttablerowsdialog.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_mark2item.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_mark2mark.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_markanchor.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_marknote.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_marksmanager.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_markvariabletext.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_measurementsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_multipleduplicate.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_multiprogressdialog.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_newmarginwidgetbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_notesstyleseditor.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_pageitemattributes.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_pagepalette_masterpagesbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_picsearch.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_picsearchoptions.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_picstatus.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_pluginmanagerprefsgui.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_polygonwidgetbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_preferencesdialogbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_colormanagementbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_displaybase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentinformationbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentitemattributesbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentsectionsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentsetupbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_externaltoolsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_fontsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_guidesbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_hyphenatorbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_imagecachebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_itemtoolsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_keyboardshortcutsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_miscellaneousbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_operatortoolsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pagesizesbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pathsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pdfexportbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pluginsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_preflightverifierbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_printerbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_scrapbookbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_spellingbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_tableofcontentsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_typographybase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_userinterfacebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_printdialogbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_groupbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_imagebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_linebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_shadowbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_shapebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_tablebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_textbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_xyzbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_advancedbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_distancebase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_flopbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_optmarginsbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_orphansbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_pareffectbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_pathtextbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_textcolorbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_replacecolors.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_replaceonecolor.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_selectobjects.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_shortcutwidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_smcellstylewidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_smcstylewidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_smlinestylewidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_smpstylewidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_smreplacedia.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_smtablestylewidget.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_spiralvectorbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_spiralwidgetbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_stylemanager.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_tablecolumnwidthsdialog.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_tablerowheightsdialog.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_transformdialogbase.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_transparencypalette.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_unicodesearch.h" />
-    <ClInclude Include="..\..\..\scribus\ui\ui_useprintermarginsdialog.h" />
     <ClInclude Include="..\win-config.h" />
     <ClInclude Include="..\..\..\scribus\colormgmt\sccolormgmtelem.h" />
     <ClInclude Include="..\..\..\scribus\colormgmt\sccolormgmtengine.h" />
@@ -1755,10 +1650,10 @@
     <Import Project="..\Scribus-build-rules.targets" />
   </ImportGroup>
   <Import Project="..\..\..\scribus.install.targets" />
-  <Target Name="AfterBuildMessage" AfterTargets="Build" BeforeTargets="AfterBuild" >
-     <Message Importance="High" Text="Now copying assets to output directory..." />
+  <Target Name="AfterBuildMessage" AfterTargets="Build" BeforeTargets="AfterBuild">
+    <Message Importance="High" Text="Now copying assets to output directory..." />
   </Target>
-  <Target Name="AfterBuild" AfterTargets="Build" DependsOnTargets="$(AfterBuildDependsOn)" >
-     <Message Importance="High" Text="Assets have been copied to output directory..." />
+  <Target Name="AfterBuild" AfterTargets="Build" DependsOnTargets="$(AfterBuildDependsOn)">
+    <Message Importance="High" Text="Assets have been copied to output directory..." />
   </Target>
 </Project>

Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -15,9 +15,6 @@
     <Filter Include="Resource Files">
       <UniqueIdentifier>{21958c29-b128-465f-b025-cd419f23d4c9}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{99d03b00-3d8b-4648-8c57-76a4eb400f6d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{89b48344-5dfc-4692-8e28-d0d3d74907a9}</UniqueIdentifier>
@@ -560,309 +557,6 @@
     <ClInclude Include="..\..\..\scribus\vgradientex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_aboutplugins.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_aligndistribute.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_arcvectorbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_arcwidgetbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_charselect.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_charselectenhanced.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_cmsprefsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_colorpalette.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_copypagetomasterpage.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_createrange.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_gradientaddedit.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_gradienteditor.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_gradientvectorbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_gtfiledialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_guidemanager.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_helpbrowser.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_helpbrowsernavigation.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_insertaframe.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_inserttablecolumnsdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_inserttablerowsdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_mark2item.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_mark2mark.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_markanchor.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_marknote.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_marksmanager.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_markvariabletext.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_measurementsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_multipleduplicate.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_multiprogressdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_newmarginwidgetbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_notesstyleseditor.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_pageitemattributes.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_pagepalette_masterpagesbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_picsearch.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_picsearchoptions.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_picstatus.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_pluginmanagerprefsgui.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_polygonwidgetbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_preferencesdialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_colormanagementbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_displaybase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentinformationbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentitemattributesbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentsectionsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_documentsetupbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_externaltoolsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_fontsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_guidesbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_hyphenatorbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_imagecachebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_itemtoolsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_keyboardshortcutsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_miscellaneousbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_operatortoolsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pagesizesbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pathsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pdfexportbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_pluginsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_preflightverifierbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_printerbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_scrapbookbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_spellingbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_tableofcontentsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_typographybase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_prefs_userinterfacebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_printdialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_groupbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_imagebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_linebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_shadowbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_shapebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_tablebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_textbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertiespalette_xyzbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_advancedbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_distancebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_flopbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_optmarginsbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_orphansbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_pareffectbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_pathtextbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_propertywidget_textcolorbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_replacecolors.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_replaceonecolor.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_selectobjects.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_shortcutwidget.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_smcellstylewidget.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_smcstylewidget.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_smlinestylewidget.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_smpstylewidget.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_smreplacedia.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_smtablestylewidget.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_spiralvectorbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_spiralwidgetbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_stylemanager.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_tablecolumnwidthsdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_tablerowheightsdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_transformdialogbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_transparencypalette.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_unicodesearch.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_useprintermarginsdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\win-config.h">
       <Filter>Win-config</Filter>
     </ClInclude>
@@ -953,12 +647,6 @@
     <ClInclude Include="..\..\..\scribus\undotransaction.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_downloadspalettebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_resourcemanagerbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\third_party\fparser\fparser.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -989,9 +677,6 @@
     <ClInclude Include="..\..\..\scribus\colormgmt\sccolorspacedata_labdbl.h">
       <Filter>colorMgmt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_resourcemanagerlicensebase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\collapsedtablepainterex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1036,9 +721,6 @@
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\text\textsource.h">
       <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\ui\ui_colorsandfillsbase.h">
-      <Filter>Generated Form Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>

Modified: trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj	Sat Oct  7 11:42:58 2017
@@ -272,10 +272,6 @@
     <moc Include="..\..\..\scribus\plugins\scriptplugin\scripterprefsgui.h" />
     <moc Include="..\..\..\scribus\plugins\scriptplugin\scriptplugin.h" />
     <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\svgimport.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_pconsole.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_prefs_scripterbase.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_runscriptdialog.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_scripterprefsgui.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\scriptplugin\pconsole.ui" />

Modified: trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/scriptplugin/scriptplugin.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -13,9 +13,6 @@
       <UniqueIdentifier>{e7c51734-0aa1-45e7-b09b-99999118ece9}</UniqueIdentifier>
       <Extensions>ui</Extensions>
     </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{91615bb8-8d82-48b0-8bcd-0c62dc28b37f}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\plugins\scriptplugin\cmdcell.cpp">
@@ -170,18 +167,6 @@
     <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\svgimport.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_pconsole.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_prefs_scripterbase.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_runscriptdialog.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\ui_scripterprefsgui.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\scriptplugin\cmdannotations.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Modified: trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj	Sat Oct  7 11:42:58 2017
@@ -228,7 +228,6 @@
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
     <moc Include="..\..\..\scribus\plugins\short-words\swsyntaxhighlighter.h" />
     <ClInclude Include="..\..\..\scribus\plugins\short-words\version.h" />
-    <ClInclude Include="..\..\..\scribus\plugins\short-words\ui_swdialog.h" />
   </ItemGroup>
   <ItemGroup>
     <uic Include="..\..\..\scribus\plugins\short-words\prefs_shortwordsbase.ui" />

Modified: trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/shortwords/shortwords.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -12,9 +12,6 @@
     <Filter Include="Form Files">
       <UniqueIdentifier>{403be6a8-b5d3-4e2a-b06b-b076c3418a83}</UniqueIdentifier>
       <Extensions>ui</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{5899fdf5-cc8b-4ef6-adae-d6ad9c0ce595}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -46,9 +43,6 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\scribus\plugins\short-words\version.h">
       <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\plugins\short-words\ui_swdialog.h">
-      <Filter>Generated Form Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>

Modified: trunk/Scribus/win32/msvc2015/smoothpath/smoothpath.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/smoothpath/smoothpath.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/smoothpath/smoothpath.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/smoothpath/smoothpath.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{e51d29c8-e562-4967-9786-9e77a26d3219}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{2fab3bd6-f6c4-4e5a-a2c5-ff1180857b10}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{02617aeb-a1cc-43be-b7b6-3262625df62b}</UniqueIdentifier>

Modified: trunk/Scribus/win32/msvc2015/subdivide/subdivide.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/subdivide/subdivide.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/subdivide/subdivide.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/subdivide/subdivide.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{14090ca2-ae12-4338-a735-24f85cc508a5}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{7c4eb06c-8c2b-442a-843b-53522b7dccc6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{6105d9c0-3e04-4f0e-8118-92088565c8f3}</UniqueIdentifier>

Modified: trunk/Scribus/win32/msvc2015/xpsimport/xpsimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/xpsimport/xpsimport.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/xpsimport/xpsimport.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2015/xpsimport/xpsimport.vcxproj	Sat Oct  7 11:42:58 2017
@@ -226,7 +226,6 @@
     <uic Include="..\..\..\scribus\plugins\import\xps\xpsimportoptions.ui" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\import\xps\ui_xpsimportoptions.h" />
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Modified: trunk/Scribus/win32/msvc2015/xpsimport/xpsimport.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22186&path=/trunk/Scribus/win32/msvc2015/xpsimport/xpsimport.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/xpsimport/xpsimport.vcxproj.filters	(original)
+++ trunk/Scribus/win32/msvc2015/xpsimport/xpsimport.vcxproj.filters	Sat Oct  7 11:42:58 2017
@@ -8,9 +8,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{ae7efe02-a2a4-4bb8-9332-5ed946549b77}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Generated Form Files">
-      <UniqueIdentifier>{1d2ad7ef-563a-4431-b6ce-7591574764b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Form Files">
       <UniqueIdentifier>{5dbaee6c-6214-47eb-9141-17787bc75aaa}</UniqueIdentifier>
@@ -48,9 +45,6 @@
     </uic>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\scribus\plugins\import\xps\ui_xpsimportoptions.h">
-      <Filter>Generated Form Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\scribus\plugins\plugins_pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>




More information about the scribus-commit mailing list