r19786 by jghali - msvc project update

scribus-commit scribus-commit at lists.scribus.net
Mon Feb 2 23:52:32 UTC 2015 

Author: jghali
Date: Mon Feb  2 23:52:32 2015
New Revision: 19786

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19786
Log:
msvc project update

Modified:
    trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters
    trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters

Modified: trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19786&path=/trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj (original)
+++ trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj Mon Feb  2 23:52:32 2015
@@ -200,7 +200,7 @@
     <ClInclude Include="..\..\..\scribus\canvasmode_rotate.h" />
     <ClInclude Include="..\..\..\scribus\cellarea.h" />
     <moc Include="..\..\..\scribus\qtiocompressor.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_ora.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ora.h" />
     <moc Include="..\..\..\scribus\selectionrubberband.h" />
     <ClInclude Include="..\..\..\scribus\styles\cellstyle.h" />
     <moc Include="..\..\..\scribus\ui\charselect.h" />
@@ -283,6 +283,7 @@
     <moc Include="..\..\..\scribus\ui\helpbrowser.h" />
     <ClInclude Include="..\..\..\scribus\text\textlayout.h" />
     <moc Include="..\..\..\scribus\ui\filedialogeventcatcher.h" />
+    <moc Include="..\..\..\scribus\ui\downloadspalette.h" />
     <ClInclude Include="..\..\..\scribus\ui\helpnavigation.h" />
     <ClInclude Include="..\..\..\scribus\hnjalloc.h" />
     <moc Include="..\..\..\scribus\ui\hruler.h" />
@@ -454,6 +455,7 @@
     <moc Include="..\..\..\scribus\upgradechecker.h" />
     <moc Include="..\..\..\scribus\ui\proptree.h" />
     <moc Include="..\..\..\scribus\ui\viewtoolbar.h" />
+    <ClInclude Include="..\..\..\scribus\ui\ui_downloadspalettebase.h" />
     <ClInclude Include="..\..\..\scribus\undotransaction.h" />
     <ClInclude Include="..\..\..\scribus\util_debug.h" />
     <ClInclude Include="..\..\..\scribus\util_os.h" />
@@ -490,17 +492,17 @@
     <ClInclude Include="..\..\..\scribus\scimagecacheproxy.h" />
     <ClInclude Include="..\..\..\scribus\scimagecachewriteaction.h" />
     <ClInclude Include="..\..\..\scribus\scimagestructs.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_gimp.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_jpeg.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_pdf.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_pgf.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_pict.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_ps.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_psd.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_qt.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_tiff.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_wpg.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_gimp.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_jpeg.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pdf.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pgf.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pict.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ps.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_psd.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_qt.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_tiff.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_wpg.h" />
     <moc Include="..\..\..\scribus\ui\scinputdialog.h" />
     <moc Include="..\..\..\scribus\sclayer.h" />
     <ClInclude Include="..\..\..\scribus\sclimits.h" />
@@ -782,7 +784,7 @@
     <ClCompile Include="..\..\..\scribus\desaxe\saxXML.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\uniqueid.cpp" />
     <ClCompile Include="..\..\..\scribus\qtiocompressor.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_ora.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ora.cpp" />
     <ClCompile Include="..\..\..\scribus\selectionrubberband.cpp" />
     <ClCompile Include="..\..\..\scribus\text\textlayout.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\about.cpp" />
@@ -876,6 +878,7 @@
     <ClCompile Include="..\..\..\scribus\docinfo.cpp" />
     <ClCompile Include="..\..\..\scribus\documentchecker.cpp" />
     <ClCompile Include="..\..\..\scribus\documentinformation.cpp" />
+    <ClCompile Include="..\..\..\scribus\ui\downloadspalette.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\editor.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\edittoolbar.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\effectsdialog.cpp" />
@@ -1163,17 +1166,17 @@
     <ClCompile Include="..\..\..\scribus\scimagecacheproxy.cpp" />
     <ClCompile Include="..\..\..\scribus\scimagecachewriteaction.cpp" />
     <ClCompile Include="..\..\..\scribus\scimagestructs.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_gimp.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_jpeg.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_pdf.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_pgf.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_pict.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_ps.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_psd.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_qt.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_tiff.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_wpg.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_gimp.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_jpeg.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pdf.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pgf.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pict.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ps.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_psd.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_qt.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_tiff.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_wpg.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\scinputdialog.cpp" />
     <ClCompile Include="..\..\..\scribus\sclayer.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\sclistwidgetdelegate.cpp" />
@@ -1350,6 +1353,7 @@
     <uic Include="..\..\..\scribus\ui\colorpalette.ui" />
     <uic Include="..\..\..\scribus\ui\copypagetomasterpage.ui" />
     <uic Include="..\..\..\scribus\ui\createrange.ui" />
+    <uic Include="..\..\..\scribus\ui\downloadspalettebase.ui" />
     <uic Include="..\..\..\scribus\ui\gradientaddedit.ui" />
     <uic Include="..\..\..\scribus\ui\gradienteditor.ui" />
     <uic Include="..\..\..\scribus\ui\gradientvectorbase.ui" />

Modified: trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19786&path=/trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters (original)
+++ trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters Mon Feb  2 23:52:32 2015
@@ -365,37 +365,37 @@
     <ClInclude Include="..\..\..\scribus\scimagestructs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_gimp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_jpeg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_pdf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_pgf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_pict.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_ps.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_psd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_qt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_tiff.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_wpg.h">
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_gimp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_jpeg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pdf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pgf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pict.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ps.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_psd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_qt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_tiff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_wpg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\sclimits.h">
@@ -989,7 +989,7 @@
     <ClInclude Include="..\..\..\scribus\ui\smradiobutton.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_ora.h">
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ora.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\text\textlayout.h">
@@ -1006,6 +1006,9 @@
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\undotransaction.h">
       <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\ui\ui_downloadspalettebase.h">
+      <Filter>Generated Form Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -1999,37 +2002,37 @@
     <ClCompile Include="..\..\..\scribus\scimagestructs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_gimp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_jpeg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_pdf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_pgf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_pict.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_ps.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_psd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_qt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_tiff.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_wpg.cpp">
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_gimp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_jpeg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pdf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pgf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pict.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ps.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_psd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_qt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_tiff.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_wpg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\scinputdialog.cpp">
@@ -2494,7 +2497,7 @@
     <ClCompile Include="..\..\..\scribus\qtiocompressor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_ora.cpp">
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ora.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\text\textlayout.cpp">
@@ -2513,6 +2516,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\undotransaction.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\ui\downloadspalette.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -2863,6 +2869,9 @@
     <uic Include="..\..\..\scribus\ui\weldeditbase.ui">
       <Filter>Form Files</Filter>
     </uic>
+    <uic Include="..\..\..\scribus\ui\downloadspalettebase.ui">
+      <Filter>Form Files</Filter>
+    </uic>
   </ItemGroup>
   <ItemGroup>
     <lrelease Include="..\..\..\resources\translations\scribus.af.ts">
@@ -3965,5 +3974,8 @@
     <moc Include="..\..\..\scribus\selectionrubberband.h">
       <Filter>Header Files</Filter>
     </moc>
+    <moc Include="..\..\..\scribus\ui\downloadspalette.h">
+      <Filter>Header Files</Filter>
+    </moc>
   </ItemGroup>
 </Project>

Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19786&path=/trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj (original)
+++ trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj Mon Feb  2 23:52:32 2015
@@ -313,7 +313,7 @@
     <ClInclude Include="..\..\..\scribus\canvasmode_rotate.h" />
     <ClInclude Include="..\..\..\scribus\cellarea.h" />
     <moc Include="..\..\..\scribus\qtiocompressor.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_ora.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ora.h" />
     <moc Include="..\..\..\scribus\selectionrubberband.h" />
     <ClInclude Include="..\..\..\scribus\styles\cellstyle.h" />
     <moc Include="..\..\..\scribus\ui\charselect.h" />
@@ -396,6 +396,7 @@
     <moc Include="..\..\..\scribus\ui\helpbrowser.h" />
     <ClInclude Include="..\..\..\scribus\text\textlayout.h" />
     <moc Include="..\..\..\scribus\ui\filedialogeventcatcher.h" />
+    <moc Include="..\..\..\scribus\ui\downloadspalette.h" />
     <ClInclude Include="..\..\..\scribus\ui\helpnavigation.h" />
     <ClInclude Include="..\..\..\scribus\hnjalloc.h" />
     <moc Include="..\..\..\scribus\ui\hruler.h" />
@@ -567,6 +568,7 @@
     <moc Include="..\..\..\scribus\upgradechecker.h" />
     <moc Include="..\..\..\scribus\ui\proptree.h" />
     <moc Include="..\..\..\scribus\ui\viewtoolbar.h" />
+    <ClInclude Include="..\..\..\scribus\ui\ui_downloadspalettebase.h" />
     <ClInclude Include="..\..\..\scribus\undotransaction.h" />
     <ClInclude Include="..\..\..\scribus\util_debug.h" />
     <ClInclude Include="..\..\..\scribus\util_os.h" />
@@ -603,17 +605,17 @@
     <ClInclude Include="..\..\..\scribus\scimagecacheproxy.h" />
     <ClInclude Include="..\..\..\scribus\scimagecachewriteaction.h" />
     <ClInclude Include="..\..\..\scribus\scimagestructs.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_gimp.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_jpeg.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_pdf.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_pgf.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_pict.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_ps.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_psd.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_qt.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_tiff.h" />
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_wpg.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_gimp.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_jpeg.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pdf.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pgf.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pict.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ps.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_psd.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_qt.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_tiff.h" />
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_wpg.h" />
     <moc Include="..\..\..\scribus\ui\scinputdialog.h" />
     <moc Include="..\..\..\scribus\sclayer.h" />
     <ClInclude Include="..\..\..\scribus\sclimits.h" />
@@ -895,7 +897,7 @@
     <ClCompile Include="..\..\..\scribus\desaxe\saxXML.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\uniqueid.cpp" />
     <ClCompile Include="..\..\..\scribus\qtiocompressor.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_ora.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ora.cpp" />
     <ClCompile Include="..\..\..\scribus\selectionrubberband.cpp" />
     <ClCompile Include="..\..\..\scribus\text\textlayout.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\about.cpp" />
@@ -989,6 +991,7 @@
     <ClCompile Include="..\..\..\scribus\docinfo.cpp" />
     <ClCompile Include="..\..\..\scribus\documentchecker.cpp" />
     <ClCompile Include="..\..\..\scribus\documentinformation.cpp" />
+    <ClCompile Include="..\..\..\scribus\ui\downloadspalette.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\editor.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\edittoolbar.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\effectsdialog.cpp" />
@@ -1324,17 +1327,17 @@
     <ClCompile Include="..\..\..\scribus\scimagecacheproxy.cpp" />
     <ClCompile Include="..\..\..\scribus\scimagecachewriteaction.cpp" />
     <ClCompile Include="..\..\..\scribus\scimagestructs.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_gimp.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_jpeg.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_pdf.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_pgf.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_pict.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_ps.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_psd.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_qt.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_tiff.cpp" />
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_wpg.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_gimp.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_jpeg.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pdf.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pgf.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pict.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ps.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_psd.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_qt.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_tiff.cpp" />
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_wpg.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\scinputdialog.cpp" />
     <ClCompile Include="..\..\..\scribus\sclayer.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\sclistwidgetdelegate.cpp" />
@@ -1513,6 +1516,7 @@
     <uic Include="..\..\..\scribus\ui\colorpalette.ui" />
     <uic Include="..\..\..\scribus\ui\copypagetomasterpage.ui" />
     <uic Include="..\..\..\scribus\ui\createrange.ui" />
+    <uic Include="..\..\..\scribus\ui\downloadspalettebase.ui" />
     <uic Include="..\..\..\scribus\ui\gradientaddedit.ui" />
     <uic Include="..\..\..\scribus\ui\gradienteditor.ui" />
     <uic Include="..\..\..\scribus\ui\gradientvectorbase.ui" />
@@ -1661,16 +1665,6 @@
     <lrelease Include="..\..\..\resources\translations\scribus.zh_CN.ts" />
     <lrelease Include="..\..\..\resources\translations\scribus.zh_TW.ts" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\scribus-pgf\scribus-pgf.vcxproj">
-      <Project>{aaa3586d-6218-4cdb-bdd2-bc0198946661}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\scribus-wpg\scribus-wpg.vcxproj">
-      <Project>{50c264a1-2ce7-46a3-8c79-cbc714c49510}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\Scribus-build-rules.targets" />

Modified: trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19786&path=/trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters (original)
+++ trunk/Scribus/win32/vc11/scribus-main/Scribus.vcxproj.filters Mon Feb  2 23:52:32 2015
@@ -365,37 +365,37 @@
     <ClInclude Include="..\..\..\scribus\scimagestructs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_gimp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_jpeg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_pdf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_pgf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_pict.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_ps.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_psd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_qt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_tiff.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_wpg.h">
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_gimp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_jpeg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pdf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pgf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pict.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ps.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_psd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_qt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_tiff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_wpg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\sclimits.h">
@@ -977,7 +977,7 @@
     <ClInclude Include="..\..\..\scribus\colormgmt\sclcms2colortransformimpl.h">
       <Filter>colorMgmt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\scribus\scimgdataloader_ora.h">
+    <ClInclude Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ora.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\text\textlayout.h">
@@ -994,6 +994,12 @@
     </ClInclude>
     <ClInclude Include="..\..\..\scribus\undotransaction.h">
       <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\ui\downloadspalette.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\scribus\ui\ui_downloadspalettebase.h">
+      <Filter>Generated Form Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -1987,37 +1993,37 @@
     <ClCompile Include="..\..\..\scribus\scimagestructs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_gimp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_jpeg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_pdf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_pgf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_pict.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_ps.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_psd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_qt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_tiff.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_wpg.cpp">
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_gimp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_jpeg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pdf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pgf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_pict.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ps.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_psd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_qt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_tiff.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_wpg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\ui\scinputdialog.cpp">
@@ -2482,7 +2488,7 @@
     <ClCompile Include="..\..\..\scribus\qtiocompressor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\scribus\scimgdataloader_ora.cpp">
+    <ClCompile Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ora.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\text\textlayout.cpp">
@@ -2501,6 +2507,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\undotransaction.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\ui\downloadspalette.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -2851,6 +2860,9 @@
     <uic Include="..\..\..\scribus\ui\weldeditbase.ui">
       <Filter>Form Files</Filter>
     </uic>
+    <uic Include="..\..\..\scribus\ui\downloadspalettebase.ui">
+      <Filter>Form Files</Filter>
+    </uic>
   </ItemGroup>
   <ItemGroup>
     <lrelease Include="..\..\..\resources\translations\scribus.af.ts">

More information about the scribus-commit mailing list