r16803 by jghali - merge trunk revisions up to r16802
scribus-commit
scribus-commit at lists.scribus.net
Thu Aug 25 23:06:38 UTC 2011
Author: jghali
Date: Thu Aug 25 23:06:37 2011
New Revision: 16803
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16803
Log:
merge trunk revisions up to r16802
Modified:
branches/ScribusOIF/resources/translations/po/scribus.lt_LT.ts
branches/ScribusOIF/scribus/canvas.cpp
branches/ScribusOIF/scribus/canvasmode_editgradient.cpp
branches/ScribusOIF/scribus/canvasmode_editmeshgradient.cpp
branches/ScribusOIF/scribus/langmgr.cpp
branches/ScribusOIF/scribus/pageitem.cpp
branches/ScribusOIF/scribus/pageitem.h
branches/ScribusOIF/scribus/pdflib_core.cpp
branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
branches/ScribusOIF/scribus/plugins/scriptplugin/cmdstyle.cpp
branches/ScribusOIF/scribus/plugins/scriptplugin/prefs_scripter.cpp
branches/ScribusOIF/scribus/plugins/scriptplugin/prefs_scripter.h
branches/ScribusOIF/scribus/pslib.cpp
branches/ScribusOIF/scribus/scribus.cpp
branches/ScribusOIF/scribus/scribusdoc.cpp
branches/ScribusOIF/scribus/ui/about.cpp
branches/ScribusOIF/scribus/ui/colorlistbox.cpp
branches/ScribusOIF/scribus/ui/colorpalette.ui
branches/ScribusOIF/scribus/ui/cpalette.cpp
branches/ScribusOIF/scribus/ui/gradienteditor.cpp
branches/ScribusOIF/scribus/ui/gradientvectordialog.cpp
branches/ScribusOIF/scribus/ui/gradientvectordialog.h
branches/ScribusOIF/scribus/ui/propertiespalette.cpp
branches/ScribusOIF/scribus/ui/propertywidget_color.cpp
branches/ScribusOIF/scribus/ui/propertywidget_colorbase.ui
branches/ScribusOIF/scribus/ui/rulermover.cpp
branches/ScribusOIF/scribus/ui/rulermover.h
branches/ScribusOIF/scribus/ui/search.cpp
branches/ScribusOIF/scribus/ui/search.h
branches/ScribusOIF/scribus/ui/storyeditor.h
branches/ScribusOIF/win32/vc9/Scribus-build.vsprops
branches/ScribusOIF/win32/vc9/Scribus.vcproj
branches/ScribusOIF/win32/vc9/aiimport/aiimport.vcproj
branches/ScribusOIF/win32/vc9/barcodegenerator/barcodegenerator.vcproj
branches/ScribusOIF/win32/vc9/cgmimport/cgmimport.vcproj
branches/ScribusOIF/win32/vc9/colorwheel/colorwheel.vcproj
branches/ScribusOIF/win32/vc9/cvgimport/cvgimport.vcproj
branches/ScribusOIF/win32/vc9/drwimport/drwimport.vcproj
branches/ScribusOIF/win32/vc9/flattenpath/flattenpath.vcproj
branches/ScribusOIF/win32/vc9/fontpreview/fontpreview.vcproj
branches/ScribusOIF/win32/vc9/gettext-csvim/gettext-csvim.vcproj
branches/ScribusOIF/win32/vc9/gettext-docim/gettext-docim.vcproj
branches/ScribusOIF/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj
branches/ScribusOIF/win32/vc9/gettext-odtim/gettext-odtim.vcproj
branches/ScribusOIF/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj
branches/ScribusOIF/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj
branches/ScribusOIF/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj
branches/ScribusOIF/win32/vc9/gettext-txtim/gettext-txtim.vcproj
branches/ScribusOIF/win32/vc9/gettext-xtgim/gettext-xtgim.vcproj
branches/ScribusOIF/win32/vc9/idmlimport/idmlimport.vcproj
branches/ScribusOIF/win32/vc9/lenseffects/lenseffects.vcproj
branches/ScribusOIF/win32/vc9/meshdistortion/meshdistortion.vcproj
branches/ScribusOIF/win32/vc9/oodrawimport/oodrawimport.vcproj
branches/ScribusOIF/win32/vc9/pathalongpath/pathalongpath.vcproj
branches/ScribusOIF/win32/vc9/pathconnect/pathconnect.vcproj
branches/ScribusOIF/win32/vc9/pathcut/pathcut.vcproj
branches/ScribusOIF/win32/vc9/pathfinder/pathfinder.vcproj
branches/ScribusOIF/win32/vc9/pathstroker/pathstroker.vcproj
branches/ScribusOIF/win32/vc9/pctimport/pctimport.vcproj
branches/ScribusOIF/win32/vc9/pdfimport/pdfimport.vcproj
branches/ScribusOIF/win32/vc9/picturebrowser/picturebrowser.vcproj
branches/ScribusOIF/win32/vc9/pixmapexport/pixmapexport.vcproj
branches/ScribusOIF/win32/vc9/psimport/psimport.vcproj
branches/ScribusOIF/win32/vc9/saveastemplate/saveastemplate.vcproj
branches/ScribusOIF/win32/vc9/scribus-cairo/scribus-cairo.vcproj
branches/ScribusOIF/win32/vc9/scribus12format/scribus12format.vcproj
branches/ScribusOIF/win32/vc9/scribus134format/scribus134format.vcproj
branches/ScribusOIF/win32/vc9/scribus13format/scribus13format.vcproj
branches/ScribusOIF/win32/vc9/scribus150format/scribus150format.vcproj
branches/ScribusOIF/win32/vc9/scriptplugin/scriptplugin.vcproj
branches/ScribusOIF/win32/vc9/shapeimport/shapeimport.vcproj
branches/ScribusOIF/win32/vc9/shortwords/shortwords.vcproj
branches/ScribusOIF/win32/vc9/smlimport/smlimport.vcproj
branches/ScribusOIF/win32/vc9/smoothpath/smoothpath.vcproj
branches/ScribusOIF/win32/vc9/subdivide/subdivide.vcproj
branches/ScribusOIF/win32/vc9/svgexport/svgexport.vcproj
branches/ScribusOIF/win32/vc9/svgimport/svgimport.vcproj
branches/ScribusOIF/win32/vc9/transform/transform.vcproj
branches/ScribusOIF/win32/vc9/uniconvimport/uniconvimport.vcproj
branches/ScribusOIF/win32/vc9/wmfimport/wmfimport.vcproj
branches/ScribusOIF/win32/vc9/wpgimport/wpgimport.vcproj
branches/ScribusOIF/win32/vc9/xarimport/xarimport.vcproj
branches/ScribusOIF/win32/vc9/xfigimport/xfigimport.vcproj
Modified: branches/ScribusOIF/resources/translations/po/scribus.lt_LT.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/resources/translations/po/scribus.lt_LT.ts
==============================================================================
--- branches/ScribusOIF/resources/translations/po/scribus.lt_LT.ts (original)
+++ branches/ScribusOIF/resources/translations/po/scribus.lt_LT.ts Thu Aug 25 23:06:37 2011
@@ -135,7 +135,7 @@
<location filename="../../../scribus/ui/about.cpp" line="123"/>
<source>%1 %2 %3</source>
<translatorcomment>data lietuviškai</translatorcomment>
- <translation>%3 %2 %1 d. </translation>
+ <translation>%3 %2 %1 d.</translation>
</message>
<message>
<location filename="../../../scribus/ui/about.cpp" line="131"/>
@@ -581,7 +581,7 @@
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1364"/>
<source>&Multiple Duplicate</source>
- <translation>&Daug kopijų</translation>
+ <translation>&Daugybinis kopijavimas</translation>
</message>
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1365"/>
@@ -6078,7 +6078,7 @@
<name>Cpalette</name>
<message>
<source>Shade:</source>
- <translation type="obsolete">Šešėlis:</translation>
+ <translation type="obsolete">Atspalvis:</translation>
</message>
<message>
<source> %</source>
@@ -7487,7 +7487,7 @@
<message>
<location filename="../../../scribus/ui/effectsdialog.cpp" line="111"/>
<source>Shade:</source>
- <translation>Šešėlis:</translation>
+ <translation>Atspalvis:</translation>
</message>
<message>
<location filename="../../../scribus/ui/effectsdialog.cpp" line="127"/>
@@ -8702,7 +8702,7 @@
<message>
<location filename="../../../scribus/ui/gradienteditor.ui" line="113"/>
<source>Shade:</source>
- <translation>Šešėlis:</translation>
+ <translation>Atspalvis:</translation>
</message>
</context>
<context>
@@ -8853,7 +8853,7 @@
<location filename="../../../scribus/ui/guidemanager.ui" line="32"/>
<location filename="../../../scribus/ui/guidemanager.cpp" line="226"/>
<source>&Single</source>
- <translation>&Viengubas</translation>
+ <translation>&Atskiros</translation>
</message>
<message>
<location filename="../../../scribus/ui/guidemanager.ui" line="40"/>
@@ -8861,7 +8861,7 @@
<location filename="../../../scribus/ui/guidemanager.cpp" line="229"/>
<location filename="../../../scribus/ui/guidemanager.cpp" line="237"/>
<source>Horizontals</source>
- <translation>Horizontalūs</translation>
+ <translation>Horizontalios</translation>
</message>
<message>
<location filename="../../../scribus/ui/guidemanager.ui" line="56"/>
@@ -8896,7 +8896,7 @@
<location filename="../../../scribus/ui/guidemanager.cpp" line="230"/>
<location filename="../../../scribus/ui/guidemanager.cpp" line="238"/>
<source>Verticals</source>
- <translation>Vertikalūs</translation>
+ <translation>Vertikalios</translation>
</message>
<message>
<location filename="../../../scribus/ui/guidemanager.ui" line="95"/>
@@ -8945,7 +8945,7 @@
<location filename="../../../scribus/ui/guidemanager.ui" line="141"/>
<location filename="../../../scribus/ui/guidemanager.cpp" line="227"/>
<source>&Column/Row</source>
- <translation>&Stulpelis/EilutÄ—</translation>
+ <translation>&Skiltys</translation>
</message>
<message>
<location filename="../../../scribus/ui/guidemanager.ui" line="153"/>
@@ -8970,7 +8970,7 @@
<location filename="../../../scribus/ui/guidemanager.cpp" line="245"/>
<location filename="../../../scribus/ui/guidemanager.cpp" line="248"/>
<source>&Page</source>
- <translation>&Puslapis</translation>
+ <translation>&Puslapio kraštus</translation>
</message>
<message>
<location filename="../../../scribus/ui/guidemanager.ui" line="198"/>
@@ -8985,7 +8985,7 @@
<location filename="../../../scribus/ui/guidemanager.cpp" line="246"/>
<location filename="../../../scribus/ui/guidemanager.cpp" line="249"/>
<source>M&argins</source>
- <translation>P&araštės</translation>
+ <translation>P&araštes</translation>
</message>
<message>
<location filename="../../../scribus/ui/guidemanager.ui" line="218"/>
@@ -9016,7 +9016,7 @@
<location filename="../../../scribus/ui/guidemanager.ui" line="332"/>
<location filename="../../../scribus/ui/guidemanager.cpp" line="228"/>
<source>&Misc</source>
- <translation>&Įvairūs</translation>
+ <translation>&Įvairūs veiksmai</translation>
</message>
<message>
<location filename="../../../scribus/ui/guidemanager.ui" line="338"/>
@@ -9147,7 +9147,7 @@
<location filename="../../../scribus/ui/guidemanager.cpp" line="243"/>
<location filename="../../../scribus/ui/guidemanager.cpp" line="244"/>
<source>Refer to</source>
- <translation>Nukreipia į</translation>
+ <translation>Atsižvelgiantf į</translation>
</message>
</context>
<context>
@@ -10097,7 +10097,8 @@
<message>
<location filename="../../../scribus/ui/inspage.cpp" line="46"/>
<source>Page(s)</source>
- <translation>Puslapis(-iai)</translation>
+ <translatorcomment>galimi įvairūs linksniai...</translatorcomment>
+ <translation>psl.</translation>
</message>
<message>
<location filename="../../../scribus/ui/inspage.cpp" line="50"/>
@@ -10126,7 +10127,7 @@
<location filename="../../../scribus/ui/inspage.cpp" line="42"/>
<location filename="../../../scribus/ui/inspage.cpp" line="63"/>
<source>&Insert</source>
- <translation>Ä®&terpimas</translation>
+ <translation>Ä®&terpti</translation>
</message>
<message>
<location filename="../../../scribus/ui/inspage.cpp" line="67"/>
@@ -11610,7 +11611,7 @@
<name>Mdup</name>
<message>
<source>Multiple Duplicate</source>
- <translation type="obsolete">Daug kopijų</translation>
+ <translation type="obsolete">Daugybinis kopijavimas</translation>
</message>
</context>
<context>
@@ -12040,7 +12041,7 @@
<message>
<location filename="../../../scribus/ui/multipleduplicate.ui" line="14"/>
<source>Multiple Duplicate</source>
- <translation>Daug dublikatų</translation>
+ <translation>Daugybinis kopijavimas</translation>
</message>
<message>
<location filename="../../../scribus/ui/multipleduplicate.ui" line="33"/>
@@ -12117,7 +12118,7 @@
<name>MultipleDuplicateBase</name>
<message>
<source>Multiple Duplicate</source>
- <translation type="obsolete">Daug kopijų</translation>
+ <translation type="obsolete">Daugybinis kopijavimas</translation>
</message>
</context>
<context>
@@ -22984,11 +22985,11 @@
</message>
<message>
<source>Knockout</source>
- <translation type="obsolete">IÅ¡gaubtas</translation>
+ <translation type="obsolete">Eliminuoti</translation>
</message>
<message>
<source>Overprint</source>
- <translation type="obsolete">Užspausdinamasis</translation>
+ <translation type="obsolete">Spausdinti ant viršaus</translation>
</message>
<message>
<source>Color of text stroke and/or drop shadow, depending which is chosen.If both are chosen, then they share the same color.</source>
@@ -23036,7 +23037,7 @@
</message>
<message>
<source>Use the bounding box, which is always rectangular, instead of the frame's shape for text flow of text frames below the object. </source>
- <translation type="obsolete">Naudoti aprÄ—pos staÄiakampį tekstui apgaubti (vietoje objektų rÄ—melių formos).Tekstui apgaubti naudoti apybrėžos staÄiakampį (vietoje objektų formos apybrėžos).</translation>
+ <translation type="obsolete">Visuomet naudoti staÄiakampį (vietoje objektų rÄ—melių formos).</translation>
</message>
<message>
<source>Transparency Settings</source>
@@ -23121,7 +23122,7 @@
</message>
<message>
<source>When chosen, the contour line can be edited with the Edit Shape Tool on the palette further above. When edited via the shape palette, this becomes a second separate line originally based on the frame's shape for text flow of text frames below the object. T</source>
- <translation type="obsolete">PažymÄ—ta figÅ«ros apybrėža gali bÅ«ti keiÄiama figÅ«rų redagavimo priemone (mygtukas „Taisyti figÅ«rÄ
...“ aukÅ¡Äiau esanÄioje paletÄ—je). Taisant figÅ«rų paletÄ—s priemonÄ—mis sukuriama antra papildoma apybrėža figÅ«ros pagrindu tekstui, skirtam blokui po objektu esanÄiuose teksiniuose rÄ—meliuose, apgaubti.</translation>
+ <translation type="obsolete">PažymÄ—ta figÅ«ros apybrėža gali bÅ«ti keiÄiama figÅ«rų redagavimo priemone (spragtelÄ—k aukÅ¡Äiau esantį mygtukÄ
„Taisyti...“). Taisant figūrų priemonėmis, figūros pagrindu sukuriama papildoma apybrėža, naudojama po objektams, esantiems po teksto rėmeliu, apgaubti.</translation>
</message>
<message>
<source>Default</source>
@@ -23353,7 +23354,7 @@
<message>
<location filename="../../../scribus/ui/propertiespalette_group.cpp" line="606"/>
<source>Use Frame &Shape</source>
- <translation>Naudoti kontÅ«ro &formÄ
</translation>
+ <translation>Naudoti rÄ—melio &formÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette_group.cpp" line="607"/>
@@ -23383,7 +23384,7 @@
<message>
<location filename="../../../scribus/ui/propertiespalette_group.cpp" line="613"/>
<source>Use the bounding box, which is always rectangular, instead of the frame's shape for text flow of text frames below the object. </source>
- <translation>Naudoti aprÄ—pos staÄiakampį tekstui apgaubti (vietoje objektų rÄ—melių formos).Tekstui apgaubti naudoti apybrėžos staÄiakampį (vietoje objektų formos apybrėžos).</translation>
+ <translation>Visuomet naudoti staÄiakampį (vietoje objektų rÄ—melių formos).</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette_group.cpp" line="614"/>
@@ -24146,7 +24147,7 @@
<message>
<location filename="../../../scribus/ui/propertiespalette_shape.cpp" line="544"/>
<source>Use Frame &Shape</source>
- <translation>Naudoti kontÅ«ro &formÄ
</translation>
+ <translation>Naudoti rÄ—melio &formÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette_shape.cpp" line="545"/>
@@ -25819,7 +25820,7 @@
<message>
<location filename="../../../scribus/translationdummy.cpp" line="124"/>
<source>Sh&ade</source>
- <translation>&Šešėlis</translation>
+ <translation>&Atspalvis</translation>
</message>
<message>
<location filename="../../../scribus/translationdummy.cpp" line="125"/>
@@ -26955,7 +26956,7 @@
<location filename="../../../scribus/plugins/scriptplugin/cmdsetprop.cpp" line="286"/>
<source>Fill shade out of bounds, must be 0 <= shade <= 100.</source>
<comment>python error</comment>
- <translation>Užpildo šešėlis nepatenka į rėžius; jis gali būti nuo 0 iki 100.</translation>
+ <translation>Užpildo Atspalvis nepatenka į rėžius; jis gali būti nuo 0 iki 100.</translation>
</message>
<message>
<location filename="../../../scribus/plugins/scriptplugin/cmdsetprop.cpp" line="378"/>
@@ -28364,7 +28365,7 @@
<location filename="../../../scribus/plugins/scriptplugin/cmdsetprop.cpp" line="101"/>
<source>Stop shade out of bounds, must be 0 <= shade <= 100.</source>
<comment>python error</comment>
- <translation>Pabaigos šešėlis nepatenka į leidžiamus rėžius: turi būti nuo 0 iki 100.</translation>
+ <translation>Pabaigos Atspalvis nepatenka į leidžiamus rėžius: turi būti nuo 0 iki 100.</translation>
</message>
<message>
<location filename="../../../scribus/plugins/scriptplugin/cmdsetprop.cpp" line="106"/>
@@ -28906,7 +28907,7 @@
<name>SMCStylePage</name>
<message>
<source>Shade</source>
- <translation type="obsolete">Šešėlis</translation>
+ <translation type="obsolete">Atspalvis</translation>
</message>
</context>
<context>
@@ -28937,7 +28938,7 @@
<location filename="../../../scribus/ui/smcstylewidget.cpp" line="466"/>
<location filename="../../../scribus/ui/smcstylewidget.cpp" line="484"/>
<source>Shade</source>
- <translation>Šešėlis</translation>
+ <translation>Atspalvis</translation>
</message>
<message>
<location filename="../../../scribus/ui/smcstylewidget.ui" line="49"/>
@@ -29012,7 +29013,7 @@
<message>
<location filename="../../../scribus/ui/smcstylewidget.cpp" line="93"/>
<source>Fill Shade</source>
- <translation>Užpildo šešėlis</translation>
+ <translation>Užpildo atspalvis</translation>
</message>
<message>
<location filename="../../../scribus/ui/smcstylewidget.cpp" line="94"/>
@@ -29022,7 +29023,7 @@
<message>
<location filename="../../../scribus/ui/smcstylewidget.cpp" line="95"/>
<source>Stroke Shade</source>
- <translation>Apvado šešėlis</translation>
+ <translation>Apvado atspalvis</translation>
</message>
<message>
<location filename="../../../scribus/ui/smcstylewidget.cpp" line="229"/>
@@ -29235,7 +29236,7 @@
<message>
<location filename="../../../scribus/ui/smlinestylewidget.cpp" line="69"/>
<source>Line shade</source>
- <translation>Linijos šešėlis</translation>
+ <translation>Linijos atspalvis</translation>
</message>
<message>
<source> pt</source>
@@ -29310,12 +29311,12 @@
<message>
<location filename="../../../scribus/ui/smpstylewidget.ui" line="265"/>
<source>&Lines:</source>
- <translation>&Linijos:</translation>
+ <translation>Ei&lutÄ—s:</translation>
</message>
<message>
<location filename="../../../scribus/ui/smpstylewidget.ui" line="289"/>
<source>Distance from Text:</source>
- <translation>Atstumas nuo teksto:</translation>
+ <translation>Atstumas iki teksto:</translation>
</message>
<message>
<location filename="../../../scribus/ui/smpstylewidget.cpp" line="96"/>
@@ -30450,7 +30451,7 @@
</message>
<message>
<source>Multiple Duplicate</source>
- <translation type="obsolete">Daug kopijų</translation>
+ <translation type="obsolete">Daugybinis kopijavimas</translation>
</message>
<message>
<source>Delete</source>
@@ -30626,7 +30627,7 @@
</message>
<message>
<source>Shade</source>
- <translation type="obsolete">Šešėlis</translation>
+ <translation type="obsolete">Atspalvis</translation>
</message>
<message>
<source>Open</source>
@@ -31725,7 +31726,7 @@
<message>
<location filename="../../../scribus/scribusview.cpp" line="358"/>
<source>Zoom to 100%</source>
- <translation>Padidinti iki 100%</translation>
+ <translation>Rodyti 100% dydžio</translation>
</message>
<message>
<location filename="../../../scribus/scribusview.cpp" line="359"/>
@@ -32112,7 +32113,7 @@
<location filename="../../../scribus/ui/search.cpp" line="83"/>
<location filename="../../../scribus/ui/search.cpp" line="172"/>
<source>Fill Shade</source>
- <translation>Užpildo šešėlis</translation>
+ <translation>Užpildo atspalvis</translation>
</message>
<message>
<location filename="../../../scribus/ui/search.cpp" line="86"/>
@@ -32124,7 +32125,7 @@
<location filename="../../../scribus/ui/search.cpp" line="89"/>
<location filename="../../../scribus/ui/search.cpp" line="178"/>
<source>Stroke Shade</source>
- <translation>Apvado šešėlis</translation>
+ <translation>Apvado atspalvis</translation>
</message>
<message>
<location filename="../../../scribus/ui/search.cpp" line="96"/>
@@ -37321,7 +37322,7 @@
<message>
<location filename="../../../scribus/undomanager.cpp" line="953"/>
<source>Multiple duplicate</source>
- <translation>Daug kopijų</translation>
+ <translation>Daugybinis kopijavimas</translation>
</message>
<message>
<location filename="../../../scribus/undomanager.cpp" line="833"/>
@@ -37994,7 +37995,7 @@
<location filename="../../../scribus/ui/colorpalette.ui" line="427"/>
<location filename="../../../scribus/ui/colorpalette.ui" line="643"/>
<source>Shade:</source>
- <translation>Šešėlis:</translation>
+ <translation>Atspalvis:</translation>
</message>
<message>
<source>Saturation of color</source>
@@ -38094,7 +38095,7 @@
<message>
<location filename="../../../scribus/ui/colorpalette.ui" line="192"/>
<source>Shade</source>
- <translation>Šešėlis</translation>
+ <translation>Atspalvis</translation>
</message>
<message>
<location filename="../../../scribus/ui/colorpalette.ui" line="199"/>
@@ -38144,7 +38145,7 @@
<message>
<location filename="../../../scribus/ui/colorpalette.ui" line="809"/>
<source>Knockout</source>
- <translation>IÅ¡gaubtas</translation>
+ <translation>Eliminuoti</translation>
</message>
<message>
<location filename="../../../scribus/ui/colorpalette.ui" line="814"/>
Modified: branches/ScribusOIF/scribus/canvas.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/canvas.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvas.cpp (original)
+++ branches/ScribusOIF/scribus/canvas.cpp Thu Aug 25 23:06:37 2011
@@ -1851,7 +1851,7 @@
page->guides.drawPage(p, m_doc, lineWidth);
if (m_doc->currentPage() == page)
{
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.pageBorderColor, 2 / m_viewMode.scale, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.pageBorderColor, 1 / m_viewMode.scale, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->drawRect(0, 0, pageWidth, pageHeight);
}
p->setAntialiasing(true);
Modified: branches/ScribusOIF/scribus/canvasmode_editgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/canvasmode_editgradient.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_editgradient.cpp (original)
+++ branches/ScribusOIF/scribus/canvasmode_editgradient.cpp Thu Aug 25 23:06:37 2011
@@ -183,22 +183,25 @@
QTransform qmatrix;
qmatrix.translate(currItem->GrStartX, currItem->GrStartY);
qmatrix.rotate(rotEnd);
- double mask_gradientSkew = 0.0;
- if (currItem->GrSkew == 90)
- mask_gradientSkew = 1;
- else if (currItem->GrSkew == 180)
- mask_gradientSkew = 0;
- else if (currItem->GrSkew == 270)
- mask_gradientSkew = -1;
- else if (currItem->GrSkew == 390)
- mask_gradientSkew = 0;
- else
- mask_gradientSkew = tan(M_PI / 180.0 * currItem->GrSkew);
- qmatrix.shear(mask_gradientSkew, 0);
+ if (currItem->GrType != 13)
+ {
+ double mask_gradientSkew = 0.0;
+ if (currItem->GrSkew == 90)
+ mask_gradientSkew = 1;
+ else if (currItem->GrSkew == 180)
+ mask_gradientSkew = 0;
+ else if (currItem->GrSkew == 270)
+ mask_gradientSkew = -1;
+ else if (currItem->GrSkew == 390)
+ mask_gradientSkew = 0;
+ else
+ mask_gradientSkew = tan(M_PI / 180.0 * currItem->GrSkew);
+ qmatrix.shear(mask_gradientSkew, 0);
+ }
qmatrix.translate(0, currItem->GrStartY * (1.0 - currItem->GrScale));
qmatrix.translate(-currItem->GrStartX, -currItem->GrStartY);
qmatrix.scale(1, currItem->GrScale);
- if (currItem->GrType == 7)
+ if ((currItem->GrType == 7) || (currItem->GrType == 13))
psx->drawPoint(qmatrix.map(QPointF(currItem->GrFocalX, currItem->GrFocalY)));
QTransform m;
m.translate(currItem->GrStartX, currItem->GrStartY);
@@ -522,7 +525,7 @@
currItem->GrStartY -= np.y();
currItem->GrFocalX -= np.x();
currItem->GrFocalY -= np.y();
- if (currItem->GrType == 7)
+ if ((currItem->GrType == 7) || (currItem->GrType == 13))
{
double radEnd = distance(currItem->GrEndX - currItem->GrStartX, currItem->GrEndY - currItem->GrStartY);
double radFoc = distance(currItem->GrFocalX - currItem->GrStartX, currItem->GrFocalY - currItem->GrStartY);
@@ -541,18 +544,21 @@
QTransform qmatrix;
qmatrix.translate(currItem->GrStartX, currItem->GrStartY);
qmatrix.rotate(rotEnd);
- double mask_gradientSkew = 0.0;
- if (currItem->GrSkew == 90)
- mask_gradientSkew = 1;
- else if (currItem->GrSkew == 180)
- mask_gradientSkew = 0;
- else if (currItem->GrSkew == 270)
- mask_gradientSkew = -1;
- else if (currItem->GrSkew == 390)
- mask_gradientSkew = 0;
- else
- mask_gradientSkew = tan(M_PI / 180.0 * currItem->GrSkew);
- qmatrix.shear(mask_gradientSkew, 0);
+ if (currItem->GrType != 13)
+ {
+ double mask_gradientSkew = 0.0;
+ if (currItem->GrSkew == 90)
+ mask_gradientSkew = 1;
+ else if (currItem->GrSkew == 180)
+ mask_gradientSkew = 0;
+ else if (currItem->GrSkew == 270)
+ mask_gradientSkew = -1;
+ else if (currItem->GrSkew == 390)
+ mask_gradientSkew = 0;
+ else
+ mask_gradientSkew = tan(M_PI / 180.0 * currItem->GrSkew);
+ qmatrix.shear(mask_gradientSkew, 0);
+ }
qmatrix.translate(0, currItem->GrStartY * (1.0 - currItem->GrScale));
qmatrix.translate(-currItem->GrStartX, -currItem->GrStartY);
qmatrix.scale(1, currItem->GrScale);
@@ -561,7 +567,7 @@
QPointF shRe = m.map(shR - np);
currItem->GrFocalX = shRe.x();
currItem->GrFocalY = shRe.y();
- if (currItem->GrType == 7)
+ if ((currItem->GrType == 7) || (currItem->GrType == 13))
{
double radEnd = distance(currItem->GrEndX - currItem->GrStartX, currItem->GrEndY - currItem->GrStartY);
double radFoc = distance(currItem->GrFocalX - currItem->GrStartX, currItem->GrFocalY - currItem->GrStartY);
@@ -582,13 +588,17 @@
m.translate(currItem->GrStartX, currItem->GrStartY);
m.rotate(rotEnd);
m.rotate(-90);
- m.rotate(currItem->GrSkew);
+ if (currItem->GrType != 13)
+ m.rotate(currItem->GrSkew);
m.translate(radEnd * currItem->GrScale, 0);
QPointF shP = m.map(QPointF(0,0));
QPointF shR = QPointF(shP.x() -np.x(), shP.y() - np.y());
double radNew = distance(shR.x() - currItem->GrStartX, shR.y() - currItem->GrStartY);
double rotNew = xy2Deg(shR.x() - currItem->GrStartX, shR.y() - currItem->GrStartY) + 90;
- currItem->GrSkew = rotNew - rotEnd;
+ if (currItem->GrType != 13)
+ currItem->GrSkew = rotNew - rotEnd;
+ else
+ currItem->GrSkew = 0;
double newScale = radNew / radEnd;
if ((newScale > 0) && (newScale <= 1))
currItem->GrScale = newScale;
@@ -597,7 +607,7 @@
{
currItem->GrEndX -= np.x();
currItem->GrEndY -= np.y();
- if (currItem->GrType == 7)
+ if ((currItem->GrType == 7) || (currItem->GrType == 13))
{
double radEnd = distance(currItem->GrEndX - currItem->GrStartX, currItem->GrEndY - currItem->GrStartY);
double radFoc = distance(currItem->GrFocalX - currItem->GrStartX, currItem->GrFocalY - currItem->GrStartY);
@@ -695,6 +705,8 @@
upRect = QRectF(QPointF(-currItem->width(), -currItem->height()), QPointF(currItem->width() * 2, currItem->height() * 2)).normalized();
}
upRect.translate(currItem->xPos(), currItem->yPos());
+ if (currItem->GrType == 13)
+ currItem->createConicalMesh();
m_doc->regionsChanged()->update(upRect.adjusted(-10.0, -10.0, 10.0, 10.0));
}
}
@@ -808,18 +820,21 @@
QTransform qmatrix;
qmatrix.translate(currItem->GrStartX, currItem->GrStartY);
qmatrix.rotate(rotEnd);
- double mask_gradientSkew = 0.0;
- if (currItem->GrSkew == 90)
- mask_gradientSkew = 1;
- else if (currItem->GrSkew == 180)
- mask_gradientSkew = 0;
- else if (currItem->GrSkew == 270)
- mask_gradientSkew = -1;
- else if (currItem->GrSkew == 390)
- mask_gradientSkew = 0;
- else
- mask_gradientSkew = tan(M_PI / 180.0 * currItem->GrSkew);
- qmatrix.shear(mask_gradientSkew, 0);
+ if (currItem->GrType != 13)
+ {
+ double mask_gradientSkew = 0.0;
+ if (currItem->GrSkew == 90)
+ mask_gradientSkew = 1;
+ else if (currItem->GrSkew == 180)
+ mask_gradientSkew = 0;
+ else if (currItem->GrSkew == 270)
+ mask_gradientSkew = -1;
+ else if (currItem->GrSkew == 390)
+ mask_gradientSkew = 0;
+ else
+ mask_gradientSkew = tan(M_PI / 180.0 * currItem->GrSkew);
+ qmatrix.shear(mask_gradientSkew, 0);
+ }
qmatrix.translate(0, currItem->GrStartY * (1.0 - currItem->GrScale));
qmatrix.translate(-currItem->GrStartX, -currItem->GrStartY);
qmatrix.scale(1, currItem->GrScale);
Modified: branches/ScribusOIF/scribus/canvasmode_editmeshgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/canvasmode_editmeshgradient.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_editmeshgradient.cpp (original)
+++ branches/ScribusOIF/scribus/canvasmode_editmeshgradient.cpp Thu Aug 25 23:06:37 2011
@@ -421,12 +421,17 @@
return;
if (m_canvas->m_viewMode.m_MouseButtonPressed && m_view->moveTimerElapsed())
{
- double newX = mousePointDoc.x();
- double newY = mousePointDoc.y();
+ FPoint npfN;
+ double nx = mousePointDoc.x();
+ double ny = mousePointDoc.y();
+ if (!m_doc->ApplyGuides(&nx, &ny))
+ npfN = m_doc->ApplyGridF(FPoint(nx, ny));
+ else
+ npfN = FPoint(nx, ny);
PageItem *currItem = m_doc->m_Selection->itemAt(0);
- FPoint npf = FPoint(mousePointDoc.x(), mousePointDoc.y(), currItem->xPos(), currItem->yPos(), currItem->rotation(), 1, 1, true);
+ FPoint npf = FPoint(npfN.x(), npfN.y(), currItem->xPos(), currItem->yPos(), currItem->rotation(), 1, 1, true);
m_canvas->displayXYHUD(m->globalPos(), npf.x(), npf.y());
- FPoint npx(Mxp - newX, Myp - newY, 0, 0, currItem->rotation(), 1, 1, true);
+ FPoint npx(Mxp - npfN.x(), Myp - npfN.y(), 0, 0, currItem->rotation(), 1, 1, true);
if (selectedMeshPoints.count() > 0)
{
if (m_view->editStrokeGradient == 5)
@@ -455,8 +460,8 @@
upRect.translate(currItem->xPos(), currItem->yPos());
m_doc->regionsChanged()->update(upRect.adjusted(-10.0 - currItem->width() / 2.0, -10.0 - currItem->height() / 2.0, 10.0 + currItem->width() / 2.0, 10.0 + currItem->height() / 2.0));
}
- Mxp = newX;
- Myp = newY;
+ Mxp = npfN.x();
+ Myp = npfN.y();
}
}
Modified: branches/ScribusOIF/scribus/langmgr.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/langmgr.cpp
==============================================================================
--- branches/ScribusOIF/scribus/langmgr.cpp (original)
+++ branches/ScribusOIF/scribus/langmgr.cpp Thu Aug 25 23:06:37 2011
@@ -96,7 +96,7 @@
langList.insert("ja", langPair("Japanese", QObject::tr( "Japanese" )) );
langList.insert("km", langPair("Khmer", QObject::tr( "Khmer" )) );
langList.insert("ko", langPair("Korean", QObject::tr( "Korean" )) );
- langList.insert("ku", langPair("Kurdish", QObject::tr( "Kurdish" )) );
+ langList.insert("ku", langPair("Kurdish", QObject::tr( "Kurdish" )) );
langList.insert("lo", langPair("Lao", QObject::tr( "Lao" )) );
langList.insert("la", langPair("Latin", QObject::tr( "Latin" )) );
langList.insert("lt", langPair("Lithuanian", QObject::tr( "Lithuanian" )) );
@@ -120,6 +120,7 @@
langList.insert("es_ES", langPair("Spanish", QObject::tr( "Spanish" )) );
langList.insert("es_LA", langPair("Spanish (Latin)", QObject::tr( "Spanish (Latin)" )) );
langList.insert("sk", langPair("Slovak", QObject::tr( "Slovak" )) );
+ langList.insert("sk_SK", langPair("Slovak", QObject::tr( "Slovak" )) );
langList.insert("sl", langPair("Slovenian", QObject::tr( "Slovenian" )) );
langList.insert("sr", langPair("Serbian", QObject::tr( "Serbian" )) );
langList.insert("sv", langPair("Swedish", QObject::tr( "Swedish" )) );
Modified: branches/ScribusOIF/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/pageitem.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pageitem.cpp (original)
+++ branches/ScribusOIF/scribus/pageitem.cpp Thu Aug 25 23:06:37 2011
@@ -1500,6 +1500,7 @@
p->setDiamondGeometry(FPoint(0, 0), FPoint(width(), 0), FPoint(width(), height()), FPoint(0, height()), GrControl1, GrControl2, GrControl3, GrControl4, GrControl5);
break;
case 11:
+ case 13:
p->setFillMode(ScPainter::Gradient);
p->setMeshGradient(FPoint(0, 0), FPoint(width(), 0), FPoint(width(), height()), FPoint(0, height()), meshGradientArray);
break;
@@ -2992,6 +2993,195 @@
ContourLine = PoLine.copy();
}
+void PageItem::createConicalMesh()
+{
+ VGradient gradient;
+ gradient.clearStops();
+ QList<VColorStop*> cstops = fill_gradient.colorStops();
+ double lastStop = -1.0;
+ double actualStop = 0.0;
+ bool isFirst = true;
+ for (uint cst = 0; cst < fill_gradient.Stops(); ++cst)
+ {
+ actualStop = cstops.at(cst)->rampPoint;
+ if ((actualStop == lastStop) && (!isFirst))
+ continue;
+ if (isFirst)
+ {
+ if (actualStop != 0)
+ {
+ gradient.addStop(cstops.at(cst)->color, 0, 0, cstops.at(cst)->opacity, cstops.at(cst)->name, cstops.at(cst)->shade);
+ if (actualStop <= 0.25)
+ gradient.addStop(cstops.at(cst)->color, cstops.at(cst)->rampPoint, cstops.at(cst)->midPoint, cstops.at(cst)->opacity, cstops.at(cst)->name, cstops.at(cst)->shade);
+ else
+ {
+ double actDist = 0.25;
+ do
+ {
+ gradient.addStop(cstops.at(cst)->color, actDist, actDist, cstops.at(cst)->opacity, cstops.at(cst)->name, cstops.at(cst)->shade);
+ actDist += 0.25;
+ }
+ while (actualStop > actDist);
+ gradient.addStop(cstops.at(cst)->color, cstops.at(cst)->rampPoint, cstops.at(cst)->midPoint, cstops.at(cst)->opacity, cstops.at(cst)->name, cstops.at(cst)->shade);
+ }
+ }
+ else
+ gradient.addStop(cstops.at(cst)->color, cstops.at(cst)->rampPoint, cstops.at(cst)->midPoint, cstops.at(cst)->opacity, cstops.at(cst)->name, cstops.at(cst)->shade);
+ isFirst = false;
+ lastStop = actualStop;
+ continue;
+ }
+ isFirst = false;
+ if (actualStop - lastStop <= 0.25)
+ gradient.addStop(cstops.at(cst)->color, cstops.at(cst)->rampPoint, cstops.at(cst)->midPoint, cstops.at(cst)->opacity, cstops.at(cst)->name, cstops.at(cst)->shade);
+ else
+ {
+ double actDist = lastStop + 0.25;
+ do
+ {
+ gradient.addStop(computeInBetweenStop(cstops.at(cst-1), cstops.at(cst), actDist));
+ actDist += 0.25;
+ }
+ while (actualStop > actDist);
+ gradient.addStop(cstops.at(cst)->color, cstops.at(cst)->rampPoint, cstops.at(cst)->midPoint, cstops.at(cst)->opacity, cstops.at(cst)->name, cstops.at(cst)->shade);
+ }
+ if ((cst == fill_gradient.Stops()-1) && (actualStop < 1.0))
+ {
+ double distToGo = 1.0 - actualStop;
+ if (distToGo <= 0.25)
+ gradient.addStop(cstops.at(cst)->color, 1.0, 1.0, cstops.at(cst)->opacity, cstops.at(cst)->name, cstops.at(cst)->shade);
+ else
+ {
+ do
+ {
+ double actDist = actualStop + 0.25;
+ gradient.addStop(cstops.at(cst)->color, actDist, actDist, cstops.at(cst)->opacity, cstops.at(cst)->name, cstops.at(cst)->shade);
+ distToGo -= 0.25;
+ actDist += 0.25;
+ }
+ while (distToGo >= 0.25);
+ gradient.addStop(cstops.at(cst)->color, 1.0, 1.0, cstops.at(cst)->opacity, cstops.at(cst)->name, cstops.at(cst)->shade);
+ }
+ break;
+ }
+ lastStop = actualStop;
+ }
+ meshGradientArray.clear();
+ QList<meshPoint> mgList1;
+ QList<meshPoint> mgList2;
+ meshPoint mgP1, mgP2, mgP3, mgP4;
+ QPainterPath path;
+ FPointArray arcPath;
+ QLineF angLin = QLineF(QPointF(GrStartX, GrStartY), QPointF(GrEndX, GrEndY));
+ double startAngle = angLin.angle();
+ double radius = angLin.length();
+ double radius2 = radius * 2.0;
+ QList<VColorStop*> rstops = gradient.colorStops();
+ double stepAngle = 360 * rstops.at(1)->rampPoint;
+ path.arcMoveTo(-radius, -radius, radius2, radius2, 0);
+ path.arcTo(-radius, -radius, radius2, radius2, 0, -stepAngle);
+ QTransform mm;
+ mm.rotate(-startAngle);
+ path = mm.map(path);
+ QTransform mr;
+ mr.scale(1.0, GrScale);
+ path = mr.map(path);
+ arcPath.fromQPainterPath(path);
+ arcPath.translate(GrStartX, GrStartY);
+ QPointF foc = QPointF(GrFocalX, GrFocalY);
+ QTransform qmatrix;
+ qmatrix.translate(GrStartX, GrStartY);
+ qmatrix.rotate(-startAngle);
+ qmatrix.translate(0, GrStartY * (1.0 - GrScale));
+ qmatrix.translate(-GrStartX, -GrStartY);
+ qmatrix.scale(1, GrScale);
+ foc = qmatrix.map(foc);
+ mgP1.resetTo(arcPath.point(0));
+ mgP1.controlRight = arcPath.point(1);
+ mgP1.transparency = rstops.at(0)->opacity;
+ mgP1.shade = rstops.at(0)->shade;
+ mgP1.colorName = rstops.at(0)->name;
+ mgP1.color = rstops.at(0)->color;
+ mgP1.color.setAlphaF(mgP1.transparency);
+ mgList1.append(mgP1);
+
+ mgP2.resetTo(arcPath.point(2));
+ mgP2.controlLeft = arcPath.point(3);
+ mgP2.transparency = rstops.at(1)->opacity;
+ mgP2.shade = rstops.at(1)->shade;
+ mgP2.colorName = rstops.at(1)->name;
+ mgP2.color = rstops.at(1)->color;
+ mgP2.color.setAlphaF(mgP2.transparency);
+
+ mgP3.resetTo(FPoint(foc.x(), foc.y()));
+ mgP3.transparency = rstops.at(0)->opacity;
+ mgP3.shade = rstops.at(0)->shade;
+ mgP3.colorName = rstops.at(0)->name;
+ mgP3.color = rstops.at(0)->color;
+ mgP3.color.setAlphaF(mgP3.transparency);
+
+ mgList2.append(mgP3);
+ mgP3.transparency = rstops.at(1)->opacity;
+ mgP3.shade = rstops.at(1)->shade;
+ mgP3.colorName = rstops.at(1)->name;
+ mgP3.color = rstops.at(1)->color;
+ mgP3.color.setAlphaF(mgP3.transparency);
+ mgList2.append(mgP3);
+ startAngle -= stepAngle;
+ for (uint rst = 2; rst < gradient.Stops(); ++rst)
+ {
+ stepAngle = 360 * (rstops.at(rst)->rampPoint - rstops.at(rst-1)->rampPoint);
+ path = QPainterPath();
+ arcPath.resize(0);
+ path.arcMoveTo(-radius, -radius, radius2, radius2, 0);
+ path.arcTo(-radius, -radius, radius2, radius2, 0, -stepAngle);
+ QTransform mm;
+ mm.rotate(-startAngle);
+ QTransform mr;
+ mr.scale(1.0, GrScale);
+ path = mm.map(path);
+ path = mr.map(path);
+ arcPath.fromQPainterPath(path);
+ arcPath.translate(GrStartX, GrStartY);
+ mgP2.controlRight = arcPath.point(1);
+ mgList1.append(mgP2);
+
+ mgP2.resetTo(arcPath.point(2));
+ mgP2.controlLeft = arcPath.point(3);
+ mgP2.transparency = rstops.at(rst)->opacity;
+ mgP2.shade = rstops.at(rst)->shade;
+ mgP2.colorName = rstops.at(rst)->name;
+ mgP2.color = rstops.at(rst)->color;
+ mgP2.color.setAlphaF(mgP2.transparency);
+
+ mgP3.transparency = rstops.at(rst)->opacity;
+ mgP3.shade = rstops.at(rst)->shade;
+ mgP3.colorName = rstops.at(rst)->name;
+ mgP3.color = rstops.at(rst)->color;
+ mgP3.color.setAlphaF(mgP3.transparency);
+ mgList2.append(mgP3);
+ startAngle -= stepAngle;
+ }
+ mgList1.append(mgP2);
+ meshGradientArray.append(mgList1);
+ meshGradientArray.append(mgList2);
+}
+
+VColorStop PageItem::computeInBetweenStop(VColorStop* last, VColorStop* actual, double t)
+{
+ double dist = actual->rampPoint - last->rampPoint;
+ double perc = (t - last->rampPoint) / dist;
+ double Rn = ((actual->color.redF() - last->color.redF()) * perc) + last->color.redF();
+ double Gn = ((actual->color.greenF() - last->color.greenF()) * perc) + last->color.greenF();
+ double Bn = ((actual->color.blueF() - last->color.blueF()) * perc) + last->color.blueF();
+ QColor color;
+ color.setRgbF(Rn, Gn, Bn);
+ double opacity = ((actual->opacity - last->opacity) * perc) + last->opacity;
+ int shade = qRound(((actual->shade - last->shade) * perc) + last->shade);
+ QString name = last->name + actual->name + QString("%1").arg(perc);
+ return VColorStop(t, t, color, opacity, name, shade);
+}
+
void PageItem::gradientVector(double& startX, double& startY, double& endX, double& endY, double &focalX, double &focalY, double &scale, double &skew) const
{
startX = GrStartX;
@@ -5031,7 +5221,8 @@
{
for (int gcol = 0; gcol < meshGradientArray[grow].count(); gcol++)
{
- lists.collectColor(meshGradientArray[grow][gcol].colorName);
+ if (m_Doc->PageColors.contains(meshGradientArray[grow][gcol].colorName))
+ lists.collectColor(meshGradientArray[grow][gcol].colorName);
}
}
}
Modified: branches/ScribusOIF/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/pageitem.h
==============================================================================
--- branches/ScribusOIF/scribus/pageitem.h (original)
+++ branches/ScribusOIF/scribus/pageitem.h Thu Aug 25 23:06:37 2011
@@ -663,6 +663,8 @@
void createGradientMesh(int rows, int cols);
void resetGradientMesh();
void meshToShape();
+ void createConicalMesh();
+ VColorStop computeInBetweenStop(VColorStop* last, VColorStop* actual, double t);
void gradientVector(double& startX, double& startY, double& endX, double& endY, double &focalX, double &focalY, double &scale, double &skew) const;
void setGradientVector(double startX, double startY, double endX, double endY, double focalX, double focalY, double scale, double skew);
Modified: branches/ScribusOIF/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/pdflib_core.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pdflib_core.cpp (original)
+++ branches/ScribusOIF/scribus/pdflib_core.cpp Thu Aug 25 23:06:37 2011
@@ -6494,6 +6494,7 @@
QStringList colorNames;
QList<int> colorShades;
QStringList spotColorSet;
+ QStringList tmpAddedColors;
bool spotMode = false;
bool transparencyFound = false;
StopVec.clear();
@@ -6501,12 +6502,25 @@
Gcolors.clear();
colorNames.clear();
colorShades.clear();
+ tmpAddedColors.clear();
for (int grow = 0; grow < c->meshGradientArray.count(); grow++)
{
for (int gcol = 0; gcol < c->meshGradientArray[grow].count(); gcol++)
{
meshPoint mp1 = c->meshGradientArray[grow][gcol];
colorNames.append(mp1.colorName);
+ if (!doc.PageColors.contains(mp1.colorName))
+ {
+ if (!tmpAddedColors.contains(mp1.colorName))
+ {
+ tmpAddedColors.append(mp1.colorName);
+ ScColor tmp;
+ tmp.setSpotColor(false);
+ tmp.setRegistrationColor(false);
+ tmp.fromQColor(mp1.color);
+ doc.PageColors.insert(mp1.colorName, tmp);
+ }
+ }
colorShades.append(mp1.shade);
TransVec.append(mp1.transparency);
if (mp1.transparency != 1.0)
@@ -6551,10 +6565,7 @@
vst << encode32dVal(mp1.gridPoint.x()) << encode32dVal(-mp1.gridPoint.y()) << encode32dVal(mp1.controlRight.x()) << encode32dVal(-mp1.controlRight.y()) << encode32dVal(mp2.controlLeft.x()) << encode32dVal(-mp2.controlLeft.y());
vst << encode32dVal(mp2.gridPoint.x()) << encode32dVal(-mp2.gridPoint.y()) << encode32dVal(mp2.controlBottom.x()) << encode32dVal(-mp2.controlBottom.y()) << encode32dVal(mp3.controlTop.x()) << encode32dVal(-mp3.controlTop.y());
vst << encode32dVal(mp3.gridPoint.x()) << encode32dVal(-mp3.gridPoint.y()) << encode32dVal(mp3.controlLeft.x()) << encode32dVal(-mp3.controlLeft.y()) << encode32dVal(mp4.controlRight.x()) << encode32dVal(-mp4.controlRight.y());
- encodeColor(vst, colorNames[colInd4], colorShades[colInd4], spotColorSet, spotMode);
- encodeColor(vst, colorNames[colInd1], colorShades[colInd1], spotColorSet, spotMode);
- encodeColor(vst, colorNames[colInd2], colorShades[colInd2], spotColorSet, spotMode);
- encodeColor(vst, colorNames[colInd3], colorShades[colInd3], spotColorSet, spotMode);
+ vst << encode16dVal(TransVec[colInd4]) << encode16dVal(TransVec[colInd1]) << encode16dVal(TransVec[colInd2]) << encode16dVal(TransVec[colInd3]);
}
}
PutDoc("/Decode [-40000 40000 -40000 40000 0 1]\n");
@@ -6762,6 +6773,13 @@
tmp += "/Pattern cs\n";
tmp += "/Pattern"+QString::number(patObject)+" scn\n";
output = tmp;
+ if (tmpAddedColors.count() != 0)
+ {
+ for (int cd = 0; cd < tmpAddedColors.count(); cd++)
+ {
+ doc.PageColors.remove(tmpAddedColors[cd]);
+ }
+ }
return true;
}
@@ -6863,10 +6881,7 @@
vst << encode32dVal(mp1.gridPoint.x()) << encode32dVal(-mp1.gridPoint.y()) << encode32dVal(mp1.controlRight.x()) << encode32dVal(-mp1.controlRight.y()) << encode32dVal(mp2.controlLeft.x()) << encode32dVal(-mp2.controlLeft.y());
vst << encode32dVal(mp2.gridPoint.x()) << encode32dVal(-mp2.gridPoint.y()) << encode32dVal(mp2.controlBottom.x()) << encode32dVal(-mp2.controlBottom.y()) << encode32dVal(mp3.controlTop.x()) << encode32dVal(-mp3.controlTop.y());
vst << encode32dVal(mp3.gridPoint.x()) << encode32dVal(-mp3.gridPoint.y()) << encode32dVal(mp3.controlLeft.x()) << encode32dVal(-mp3.controlLeft.y()) << encode32dVal(mp4.controlRight.x()) << encode32dVal(-mp4.controlRight.y());
- encodeColor(vst, colorNames[colInd4], colorShades[colInd4], spotColorSet, spotMode);
- encodeColor(vst, colorNames[colInd1], colorShades[colInd1], spotColorSet, spotMode);
- encodeColor(vst, colorNames[colInd2], colorShades[colInd2], spotColorSet, spotMode);
- encodeColor(vst, colorNames[colInd3], colorShades[colInd3], spotColorSet, spotMode);
+ vst << encode16dVal(TransVec[colInd4]) << encode16dVal(TransVec[colInd1]) << encode16dVal(TransVec[colInd2]) << encode16dVal(TransVec[colInd3]);
}
PutDoc("/Decode [-40000 40000 -40000 40000 0 1]\n");
QString dat = "";
@@ -7845,7 +7860,7 @@
return PDF_TensorGradientFill(output, currItem);
else if (GType == 10)
return PDF_DiamondGradientFill(output, currItem);
- else if (GType == 11)
+ else if ((GType == 11) || (GType == 13))
return PDF_MeshGradientFill(output, currItem);
else if (GType == 12)
return PDF_PatchMeshGradientFill(output, currItem);
Modified: branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Thu Aug 25 23:06:37 2011
@@ -2916,6 +2916,12 @@
newItem->mask_gradient.addStop(ScColorEngine::getRGBColor(col1, doc), 0.0, 0.5, 1.0, doc->itemToolPrefs().shapeFillColor, 100);
newItem->mask_gradient.addStop(ScColorEngine::getRGBColor(col2, doc), 1.0, 0.5, 1.0, doc->itemToolPrefs().shapeLineColor, 100);
}
+ if (newItem->GrType == 13)
+ {
+ if (!newItem->gradient().isEmpty())
+ newItem->fill_gradient = doc->docGradients[newItem->gradient()];
+ newItem->createConicalMesh();
+ }
if (newItem->asPathText())
{
Modified: branches/ScribusOIF/scribus/plugins/scriptplugin/cmdstyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/plugins/scriptplugin/cmdstyle.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/scriptplugin/cmdstyle.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/scriptplugin/cmdstyle.cpp Thu Aug 25 23:06:37 2011
@@ -38,8 +38,10 @@
const_cast<char*>("charstyle"),
NULL};
char *Name = const_cast<char*>(""), *CharStyle = const_cast<char*>("");
- int LineSpacingMode = 0, LineSpacing = 15, Alignment = 0, LeftMargin = 0, RightMargin = 0, GapBefore = 0, GapAfter = 0, FirstIndent = 0, DropCapLines = 2, DropCapOffset = 0, HasDropCap = 0;
- if (!PyArg_ParseTupleAndKeywords(args, keywords, "es|iiiiiiiiiiies",
+ int LineSpacingMode = 0, Alignment = 0, DropCapLines = 2, HasDropCap = 0;
+ double LineSpacing = 15.0, LeftMargin = 0.0, RightMargin = 0.0;
+ double GapBefore = 0.0, GapAfter = 0.0, FirstIndent = 0.0, DropCapOffset = 0;
+ if (!PyArg_ParseTupleAndKeywords(args, keywords, "es|ididddddiides",
keywordargs, "utf-8", &Name, &LineSpacingMode, &LineSpacing, &Alignment,
&LeftMargin, &RightMargin, &GapBefore, &GapAfter, &FirstIndent,
&HasDropCap, &DropCapLines, &DropCapOffset, "utf-8", &CharStyle))
Modified: branches/ScribusOIF/scribus/plugins/scriptplugin/prefs_scripter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/plugins/scriptplugin/prefs_scripter.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/scriptplugin/prefs_scripter.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/scriptplugin/prefs_scripter.cpp Thu Aug 25 23:06:37 2011
@@ -1,92 +1,92 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-
-// include the python header first because on OSX that uses the name "slots"
-#include "cmdvar.h"
-
-#include <QColorDialog>
-#include <QFileDialog>
-#include <QPalette>
-
-#include "prefs_scripter.h"
-#include "scriptercore.h"
-#include "prefsfile.h"
-#include "prefscontext.h"
-#include "prefsmanager.h"
-#include "prefsstructs.h"
-
-Prefs_Scripter::Prefs_Scripter(QWidget* parent)
- : Prefs_Pane(parent)
-{
- setupUi(this);
- languageChange();
- setupSyntaxColors();
-
- // Set the state of the ext script enable checkbox
- extensionScriptsChk->setChecked(scripterCore->extensionsEnabled());
- // The startup script box should be disabled if ext scripts are off
- startupScriptEdit->setEnabled(extensionScriptsChk->isChecked());
- connect(extensionScriptsChk, SIGNAL(toggled(bool)),
- startupScriptEdit, SLOT(setEnabled(bool)));
-
- // signals and slots connections
- connect(extensionScriptsChk, SIGNAL(toggled(bool)), startupScriptEdit, SLOT(setEnabled(bool)));
- // colors
- connect(textButton, SIGNAL(clicked()), this, SLOT(setColor()));
- connect(commentButton, SIGNAL(clicked()), this, SLOT(setColor()));
- connect(keywordButton, SIGNAL(clicked()), this, SLOT(setColor()));
- connect(errorButton, SIGNAL(clicked()), this, SLOT(setColor()));
- connect(signButton, SIGNAL(clicked()), this, SLOT(setColor()));
- connect(stringButton, SIGNAL(clicked()), this, SLOT(setColor()));
- connect(numberButton, SIGNAL(clicked()), this, SLOT(setColor()));
- connect(startupScriptChangeButton, SIGNAL(clicked()), this, SLOT(changeStartupScript()));
-}
-
-Prefs_Scripter::~Prefs_Scripter()
-{
-}
-
-void Prefs_Scripter::languageChange()
-{
-}
-
-void Prefs_Scripter::restoreDefaults(struct ApplicationPrefs *prefsData)
-{
-}
-
-void Prefs_Scripter::saveGuiToPrefs(struct ApplicationPrefs *prefsData) const
-{
-}
-
-// Apply changes to prefs. Auto connected.
-void Prefs_Scripter::apply()
-{
- scripterCore->setExtensionsEnabled(extensionScriptsChk->isChecked());
- scripterCore->setStartupScript(startupScriptEdit->text());
- // colors
- PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("scriptplugin");
- if (prefs)
- {
- prefs->set("syntaxerror", errorColor.name());
- prefs->set("syntaxcomment", commentColor.name());
- prefs->set("syntaxkeyword", keywordColor.name());
- prefs->set("syntaxsign", signColor.name());
- prefs->set("syntaxnumber", numberColor.name());
- prefs->set("syntaxstring", stringColor.name());
- prefs->set("syntaxtext", textColor.name());
-
- emit prefsChanged();
- }
-}
-
-void Prefs_Scripter::setColor()
-{
- QPushButton* button = (QPushButton*) sender();
-
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+
+// include the python header first because on OSX that uses the name "slots"
+#include "cmdvar.h"
+
+#include <QColorDialog>
+#include <QFileDialog>
+#include <QPalette>
+
+#include "prefs_scripter.h"
+#include "scriptercore.h"
+#include "prefsfile.h"
+#include "prefscontext.h"
+#include "prefsmanager.h"
+#include "prefsstructs.h"
+
+Prefs_Scripter::Prefs_Scripter(QWidget* parent)
+ : Prefs_Pane(parent)
+{
+ setupUi(this);
+ languageChange();
+ setupSyntaxColors();
+
+ // Set the state of the ext script enable checkbox
+ extensionScriptsChk->setChecked(scripterCore->extensionsEnabled());
+ // The startup script box should be disabled if ext scripts are off
+ startupScriptEdit->setEnabled(extensionScriptsChk->isChecked());
+ connect(extensionScriptsChk, SIGNAL(toggled(bool)),
+ startupScriptEdit, SLOT(setEnabled(bool)));
+
+ // signals and slots connections
+ connect(extensionScriptsChk, SIGNAL(toggled(bool)), startupScriptEdit, SLOT(setEnabled(bool)));
+ // colors
+ connect(textButton, SIGNAL(clicked()), this, SLOT(setColor()));
+ connect(commentButton, SIGNAL(clicked()), this, SLOT(setColor()));
+ connect(keywordButton, SIGNAL(clicked()), this, SLOT(setColor()));
+ connect(errorButton, SIGNAL(clicked()), this, SLOT(setColor()));
+ connect(signButton, SIGNAL(clicked()), this, SLOT(setColor()));
+ connect(stringButton, SIGNAL(clicked()), this, SLOT(setColor()));
+ connect(numberButton, SIGNAL(clicked()), this, SLOT(setColor()));
+ connect(startupScriptChangeButton, SIGNAL(clicked()), this, SLOT(changeStartupScript()));
+}
+
+Prefs_Scripter::~Prefs_Scripter()
+{
+}
+
+void Prefs_Scripter::languageChange()
+{
+}
+
+void Prefs_Scripter::restoreDefaults(struct ApplicationPrefs *prefsData)
+{
+}
+
+void Prefs_Scripter::saveGuiToPrefs(struct ApplicationPrefs *prefsData) const
+{
+}
+
+// Apply changes to prefs. Auto connected.
+void Prefs_Scripter::apply()
+{
+ scripterCore->setExtensionsEnabled(extensionScriptsChk->isChecked());
+ scripterCore->setStartupScript(startupScriptEdit->text());
+ // colors
+ PrefsContext* prefs = PrefsManager::instance()->prefsFile->getPluginContext("scriptplugin");
+ if (prefs)
+ {
+ prefs->set("syntaxerror", errorColor.name());
+ prefs->set("syntaxcomment", commentColor.name());
+ prefs->set("syntaxkeyword", keywordColor.name());
+ prefs->set("syntaxsign", signColor.name());
+ prefs->set("syntaxnumber", numberColor.name());
+ prefs->set("syntaxstring", stringColor.name());
+ prefs->set("syntaxtext", textColor.name());
+
+ emit prefsChanged();
+ }
+}
+
+void Prefs_Scripter::setColor()
+{
+ QPushButton* button = (QPushButton*) sender();
+
QColor oldColor;
if (button == textButton) oldColor = textColor;
if (button == commentButton) oldColor = commentColor;
@@ -94,70 +94,70 @@
if (button == errorButton) oldColor = errorColor;
if (button == signButton) oldColor = signColor;
if (button == stringButton) oldColor = stringColor;
- if (button == numberButton) oldColor = numberColor;
-
- QColor color = QColorDialog::getColor(oldColor, this);
- if (color.isValid() && button)
- {
- QPixmap pm(54, 14);
- pm.fill(color);
- button->setIcon(pm);
- if (button==textButton)
- textColor=color;
- if (button==commentButton)
- commentColor=color;
- if (button==keywordButton)
- keywordColor=color;
- if (button==errorButton)
- errorColor=color;
- if (button==signButton)
- signColor=color;
- if (button==stringButton)
- stringColor=color;
- if (button==numberButton)
- numberColor=color;
- }
-}
-
-void Prefs_Scripter::setupSyntaxColors()
-{
- SyntaxColors *syntax = new SyntaxColors();
- textColor=syntax->textColor;
- commentColor=syntax->commentColor;
- keywordColor=syntax->keywordColor;
- errorColor=syntax->errorColor;
- signColor=syntax->signColor;
- stringColor=syntax->stringColor;
- numberColor=syntax->numberColor;
-
- QPixmap pm(54, 14);
- pm.fill(textColor);
- textButton->setIcon(pm);
- pm.fill(commentColor);
- commentButton->setIcon(pm);
- pm.fill(keywordColor);
- keywordButton->setIcon(pm);
- pm.fill(errorColor);
- errorButton->setIcon(pm);
- pm.fill(signColor);
- signButton->setIcon(pm);
- pm.fill(stringColor);
- stringButton->setIcon(pm);
- pm.fill(numberColor);
- numberButton->setIcon(pm);
-
- delete(syntax);
-}
-
-void Prefs_Scripter::changeStartupScript()
-{
- QString currentScript=startupScriptEdit->text();
- QFileInfo fi(startupScriptEdit->text());
- if (!fi.exists())
- currentScript = QDir::homePath();
-
- QString s = QFileDialog::getOpenFileName(this, tr("Locate Startup Script"), currentScript, "Python Scripts (*.py *.PY)");
- if (!s.isEmpty())
- startupScriptEdit->setText(s);
-}
-
+ if (button == numberButton) oldColor = numberColor;
+
+ QColor color = QColorDialog::getColor(oldColor, this);
+ if (color.isValid() && button)
+ {
+ QPixmap pm(54, 14);
+ pm.fill(color);
+ button->setIcon(pm);
+ if (button==textButton)
+ textColor=color;
+ if (button==commentButton)
+ commentColor=color;
+ if (button==keywordButton)
+ keywordColor=color;
+ if (button==errorButton)
+ errorColor=color;
+ if (button==signButton)
+ signColor=color;
+ if (button==stringButton)
+ stringColor=color;
+ if (button==numberButton)
+ numberColor=color;
+ }
+}
+
+void Prefs_Scripter::setupSyntaxColors()
+{
+ SyntaxColors *syntax = new SyntaxColors();
+ textColor=syntax->textColor;
+ commentColor=syntax->commentColor;
+ keywordColor=syntax->keywordColor;
+ errorColor=syntax->errorColor;
+ signColor=syntax->signColor;
+ stringColor=syntax->stringColor;
+ numberColor=syntax->numberColor;
+
+ QPixmap pm(54, 14);
+ pm.fill(textColor);
+ textButton->setIcon(pm);
+ pm.fill(commentColor);
+ commentButton->setIcon(pm);
+ pm.fill(keywordColor);
+ keywordButton->setIcon(pm);
+ pm.fill(errorColor);
+ errorButton->setIcon(pm);
+ pm.fill(signColor);
+ signButton->setIcon(pm);
+ pm.fill(stringColor);
+ stringButton->setIcon(pm);
+ pm.fill(numberColor);
+ numberButton->setIcon(pm);
+
+ delete(syntax);
+}
+
+void Prefs_Scripter::changeStartupScript()
+{
+ QString currentScript=startupScriptEdit->text();
+ QFileInfo fi(startupScriptEdit->text());
+ if (!fi.exists())
+ currentScript = QDir::homePath();
+
+ QString s = QFileDialog::getOpenFileName(this, tr("Locate Startup Script"), currentScript, "Python Scripts (*.py *.PY)");
+ if (!s.isEmpty())
+ startupScriptEdit->setText(s);
+}
+
Modified: branches/ScribusOIF/scribus/plugins/scriptplugin/prefs_scripter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/plugins/scriptplugin/prefs_scripter.h
==============================================================================
--- branches/ScribusOIF/scribus/plugins/scriptplugin/prefs_scripter.h (original)
+++ branches/ScribusOIF/scribus/plugins/scriptplugin/prefs_scripter.h Thu Aug 25 23:06:37 2011
@@ -1,52 +1,52 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-
-#ifndef PREFS_SCRIPTER_H
-#define PREFS_SCRIPTER_H
-
-#include "ui_prefs_scripterbase.h"
-#include "ui/prefs_pane.h"
-#include "pconsole.h"
-
-class Prefs_Scripter : public Prefs_Pane, Ui::Prefs_Scripter
-{
- Q_OBJECT
-
- public:
- Prefs_Scripter(QWidget* parent=0);
- ~Prefs_Scripter();
- virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
- virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
-
- public slots:
- void languageChange();
- //! \brief Apply changes to prefs. Auto connected.
- void apply();
-
-
- protected:
- void setupSyntaxColors();
- QColor textColor;
- QColor commentColor;
- QColor keywordColor;
- QColor errorColor;
- QColor signColor;
- QColor stringColor;
- QColor numberColor;
-
- protected slots:
- /*! \brief All requests for color change are handled here.
- \author Petr Vanek
- \warning I'm trying to handle multiple signals via single slot here. sender() Returns a pointer to the object that sent the signal, if called in a slot activated by a signal; otherwise the return value is undefined. This function will return something apparently correct in other cases as well. However, its value may change during any function call, depending on what signal-slot connections are activated during that call. In Qt 3.0 the value will change more often than in 2.x. This function violates the object-oriented principle of modularity. However, getting access to the sender might be useful when many signals are connected to a single slot. The sender is undefined if the slot is called as a normal C++ function. */
- void setColor();
- void changeStartupScript();
-
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+
+#ifndef PREFS_SCRIPTER_H
+#define PREFS_SCRIPTER_H
+
+#include "ui_prefs_scripterbase.h"
+#include "ui/prefs_pane.h"
+#include "pconsole.h"
+
+class Prefs_Scripter : public Prefs_Pane, Ui::Prefs_Scripter
+{
+ Q_OBJECT
+
+ public:
+ Prefs_Scripter(QWidget* parent=0);
+ ~Prefs_Scripter();
+ virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
+ virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
+
+ public slots:
+ void languageChange();
+ //! \brief Apply changes to prefs. Auto connected.
+ void apply();
+
+
+ protected:
+ void setupSyntaxColors();
+ QColor textColor;
+ QColor commentColor;
+ QColor keywordColor;
+ QColor errorColor;
+ QColor signColor;
+ QColor stringColor;
+ QColor numberColor;
+
+ protected slots:
+ /*! \brief All requests for color change are handled here.
+ \author Petr Vanek
+ \warning I'm trying to handle multiple signals via single slot here. sender() Returns a pointer to the object that sent the signal, if called in a slot activated by a signal; otherwise the return value is undefined. This function will return something apparently correct in other cases as well. However, its value may change during any function call, depending on what signal-slot connections are activated during that call. In Qt 3.0 the value will change more often than in 2.x. This function violates the object-oriented principle of modularity. However, getting access to the sender might be useful when many signals are connected to a single slot. The sender is undefined if the slot is called as a normal C++ function. */
+ void setColor();
+ void changeStartupScript();
+
signals:
- void prefsChanged();
-};
-
-#endif // PREFS_SCRIPTER_H
+ void prefsChanged();
+};
+
+#endif // PREFS_SCRIPTER_H
Modified: branches/ScribusOIF/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/pslib.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pslib.cpp (original)
+++ branches/ScribusOIF/scribus/pslib.cpp Thu Aug 25 23:06:37 2011
@@ -3177,6 +3177,8 @@
QStringList cols;
QStringList colorValues;
QStringList spotColorSet;
+ QStringList tmpAddedColors;
+ tmpAddedColors.clear();
QList<int> colsSh;
for (int grow = 0; grow < c->meshGradientArray.count(); grow++)
{
@@ -3184,6 +3186,18 @@
{
meshPoint mp1 = c->meshGradientArray[grow][gcol];
cols.append(mp1.colorName);
+ if (!m_Doc->PageColors.contains(mp1.colorName))
+ {
+ if (!tmpAddedColors.contains(mp1.colorName))
+ {
+ tmpAddedColors.append(mp1.colorName);
+ ScColor tmp;
+ tmp.setSpotColor(false);
+ tmp.setRegistrationColor(false);
+ tmp.fromQColor(mp1.color);
+ m_Doc->PageColors.insert(mp1.colorName, tmp);
+ }
+ }
colsSh.append(mp1.shade);
if (spotMap.contains(mp1.colorName))
{
@@ -3307,6 +3321,13 @@
PutStream("eofill\n");
else
PutStream("fill\n");
+ if (tmpAddedColors.count() != 0)
+ {
+ for (int cd = 0; cd < tmpAddedColors.count(); cd++)
+ {
+ m_Doc->PageColors.remove(tmpAddedColors[cd]);
+ }
+ }
return;
}
@@ -3861,7 +3882,7 @@
HandleDiamondGradient(c, gcr);
return;
}
- else if (GType == 11)
+ else if ((GType == 11) || (GType == 13))
{
HandleMeshGradient(c, gcr);
return;
Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Thu Aug 25 23:06:37 2011
@@ -5522,7 +5522,18 @@
undoManager->setUndoEnabled(false);
QStringList base;
- if (basedOn == NULL)
+ if (basedOn != NULL)
+ {
+ base = *basedOn;
+ // #10211 case when restoring page deletion, basedOn contains only masterpage name
+ if (base.count() == 1)
+ {
+ int setcol = doc->pageSets()[doc->pagePositioning()].Columns;
+ while (base.count() < setcol)
+ base.append (base.at(0));
+ }
+ }
+ if (base.empty())
{
int setcol = doc->pageSets()[doc->pagePositioning()].Columns;
if (setcol == 1)
@@ -5546,8 +5557,6 @@
base.append( CommonStrings::trMasterPageNormalRight);
}
}
- else
- base = *basedOn;
int cc;
int wot = wo;
if (where==0)
Modified: branches/ScribusOIF/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/scribusdoc.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribusdoc.cpp (original)
+++ branches/ScribusOIF/scribus/scribusdoc.cpp Thu Aug 25 23:06:37 2011
@@ -3984,6 +3984,8 @@
cstops = ite->mask_gradient.colorStops();
for (uint cst = 0; cst < ite->mask_gradient.Stops(); ++cst)
ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
+ if (ite->GrType == 13)
+ ite->createConicalMesh();
}
uint masterItemsCount=MasterItems.count();
for (uint c=0; c<masterItemsCount; ++c)
@@ -3998,6 +4000,8 @@
cstops = ite->mask_gradient.colorStops();
for (uint cst = 0; cst < ite->mask_gradient.Stops(); ++cst)
ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
+ if (ite->GrType == 13)
+ ite->createConicalMesh();
}
uint frameItemsCount=FrameItems.count();
for (uint c=0; c<frameItemsCount; ++c)
@@ -4012,6 +4016,8 @@
cstops = ite->mask_gradient.colorStops();
for (uint cst = 0; cst < ite->mask_gradient.Stops(); ++cst)
ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
+ if (ite->GrType == 13)
+ ite->createConicalMesh();
}
QStringList patterns = docPatterns.keys();
for (int c = 0; c < patterns.count(); ++c)
@@ -4031,6 +4037,8 @@
ite->SetQColor(&cstops.at(cst)->color, cstops.at(cst)->name, cstops.at(cst)->shade);
if (ite->asImageFrame())
loadPict(ite->Pfile, ite, true, false);
+ if (ite->GrType == 13)
+ ite->createConicalMesh();
}
PageItem *ite = pa.items.at(0);
docPatterns[patterns[c]].pattern = ite->DrawObj_toImage(pa.items, 1.0);
@@ -6721,6 +6729,8 @@
}
if ((typ > 0) && (typ < 8))
currItem->updateGradientVectors();
+ if (currItem->GrType == 13)
+ currItem->createConicalMesh();
currItem->update();
}
m_updateManager.setUpdatesEnabled();
@@ -9270,6 +9280,8 @@
PageItem *currItem;
currItem = itemSelection->itemAt(i);
currItem->fill_gradient = newGradient;
+ if (currItem->GrType == 13)
+ currItem->createConicalMesh();
currItem->update();
}
m_updateManager.setUpdatesEnabled();
Modified: branches/ScribusOIF/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/about.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/about.cpp (original)
+++ branches/ScribusOIF/scribus/ui/about.cpp Thu Aug 25 23:06:37 2011
@@ -112,7 +112,7 @@
buildID = new QLabel( tab );
buildID->setAlignment(Qt::AlignCenter);
buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
- QString BUILD_DAY = "4";
+ QString BUILD_DAY = "15";
QString BUILD_MONTH = CommonStrings::august;
QString BUILD_YEAR = "2011";
QString BUILD_TIME = "";
Modified: branches/ScribusOIF/scribus/ui/colorlistbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/colorlistbox.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/colorlistbox.cpp (original)
+++ branches/ScribusOIF/scribus/ui/colorlistbox.cpp Thu Aug 25 23:06:37 2011
@@ -448,7 +448,7 @@
{
if (event != NULL)
{
- /* commented out because of random crashes in the colorcombobox of the gradient editor */
+ /* commented out because of random crashes in the colorcombobox of the gradient editor
if (event->type() == QEvent::ToolTip)
{
if (cList != NULL)
@@ -480,7 +480,7 @@
}
}
}
- else
+ else */
if (event->type() == QEvent::MouseButtonPress)
{
QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
Modified: branches/ScribusOIF/scribus/ui/colorpalette.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/colorpalette.ui
==============================================================================
--- branches/ScribusOIF/scribus/ui/colorpalette.ui (original)
+++ branches/ScribusOIF/scribus/ui/colorpalette.ui Thu Aug 25 23:06:37 2011
@@ -116,6 +116,11 @@
<item>
<property name="text">
<string>Radial</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Conical</string>
</property>
</item>
<item>
Modified: branches/ScribusOIF/scribus/ui/cpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/cpalette.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/cpalette.cpp (original)
+++ branches/ScribusOIF/scribus/ui/cpalette.cpp Thu Aug 25 23:06:37 2011
@@ -126,8 +126,7 @@
connect(gradEditButtonStroke, SIGNAL(clicked()), this, SLOT(editGradientVectorStroke()));
connect(followsPath, SIGNAL(clicked()), this, SLOT(toggleStrokePattern()));
connect(colorPoint1, SIGNAL(activated(int)), this, SLOT(setGradientColors()));
- connect(colorPoint2, SIGNAL(activated(int)), this, SLOT(setGradientColors()));
- connect(colorPoint3, SIGNAL(activated(int)), this, SLOT(setGradientColors()));
+ connect(colorPoint2, SIGNAL(activated(int)), this, SLOT(setGradientColors()))connect(colorPoint3, SIGNAL(activated(int)), this, SLOT(setGradientColors()));
connect(colorPoint4, SIGNAL(activated(int)), this, SLOT(setGradientColors()));
connect(color1Alpha, SIGNAL(valueChanged(int)), this, SLOT(setGradientColors()));
connect(color2Alpha, SIGNAL(valueChanged(int)), this, SLOT(setGradientColors()));
@@ -681,13 +680,15 @@
else if (gradientType->currentIndex() == 1)
emit NewGradient(7);
else if (gradientType->currentIndex() == 2)
+ emit NewGradient(13);
+ else if (gradientType->currentIndex() == 3)
{
setGradientColors();
emit NewGradient(9);
}
- else if (gradientType->currentIndex() == 3)
+ else if (gradientType->currentIndex() == 4)
emit NewGradient(10);
- else if (gradientType->currentIndex() == 4)
+ else if (gradientType->currentIndex() == 5)
emit NewGradient(11);
}
@@ -869,17 +870,20 @@
}
if (number == 0)
fillModeCombo->setCurrentIndex(0);
- else if (((number > 0) && (number < 8)) || (number == 9) || (number == 10) || (number == 11) || (number == 12))
- {
- if ((number == 5) || (number == 7))
+ else if (((number > 0) && (number < 8)) || ((number >= 9) && (number <= 13)))
+ {
+ if ((number == 5) || (number == 7) || (number == 13))
{
stackedWidget_2->setCurrentIndex(0);
- gradientType->setCurrentIndex(1);
+ if ((number == 5) || (number == 7))
+ gradientType->setCurrentIndex(1);
+ if (number == 13)
+ gradientType->setCurrentIndex(2);
}
else if (number == 9)
{
stackedWidget_2->setCurrentIndex(1);
- gradientType->setCurrentIndex(2);
+ gradientType->setCurrentIndex(3);
if ((currentItem->GrColorP1 != CommonStrings::None) && (!currentItem->GrColorP1.isEmpty()))
setCurrentComboItem(colorPoint1, currentItem->GrColorP1);
else
@@ -908,7 +912,7 @@
else if (number == 10)
{
stackedWidget_2->setCurrentIndex(0);
- gradientType->setCurrentIndex(3);
+ gradientType->setCurrentIndex(4);
}
else if (number == 11)
{
@@ -920,12 +924,12 @@
shadeMeshPoint->setValue(mp.shade);
transparencyMeshPoint->setValue(mp.transparency * 100);
}
- gradientType->setCurrentIndex(4);
+ gradientType->setCurrentIndex(5);
}
else if (number == 12)
{
stackedWidget_2->setCurrentIndex(2);
- gradientType->setCurrentIndex(5);
+ gradientType->setCurrentIndex(6);
}
else
{
@@ -978,6 +982,11 @@
emit NewGradient(7);
}
else if (gradientType->currentIndex() == 2)
+ {
+ stackedWidget_2->setCurrentIndex(0);
+ emit NewGradient(13);
+ }
+ else if (gradientType->currentIndex() == 3)
{
stackedWidget_2->setCurrentIndex(1);
if ((currentItem->GrColorP1 != CommonStrings::None) && (!currentItem->GrColorP1.isEmpty()))
@@ -1006,12 +1015,12 @@
color4Shade->setValue(currentItem->GrCol4Shade);
emit NewGradient(9);
}
- else if (gradientType->currentIndex() == 3)
+ else if (gradientType->currentIndex() == 4)
{
stackedWidget_2->setCurrentIndex(0);
emit NewGradient(10);
}
- else if (gradientType->currentIndex() == 4)
+ else if (gradientType->currentIndex() == 5)
{
stackedWidget_2->setCurrentIndex(2);
if ((currentItem->selectedMeshPointX > -1) && (currentItem->selectedMeshPointY > -1l))
@@ -1023,7 +1032,7 @@
}
emit NewGradient(11);
}
- else if (gradientType->currentIndex() == 5)
+ else if (gradientType->currentIndex() == 6)
{
stackedWidget_2->setCurrentIndex(2);
emit NewGradient(12);
@@ -1052,6 +1061,11 @@
emit NewGradient(7);
}
else if (type == 2)
+ {
+ stackedWidget_2->setCurrentIndex(0);
+ emit NewGradient(13);
+ }
+ else if (type == 3)
{
stackedWidget_2->setCurrentIndex(1);
if ((currentItem->GrColorP1 != CommonStrings::None) && (!currentItem->GrColorP1.isEmpty()))
@@ -1080,12 +1094,12 @@
color4Shade->setValue(currentItem->GrCol4Shade);
emit NewGradient(9);
}
- else if (type == 3)
+ else if (type == 4)
{
stackedWidget_2->setCurrentIndex(0);
emit NewGradient(10);
}
- else if (type == 4)
+ else if (type == 5)
{
stackedWidget_2->setCurrentIndex(2);
if ((currentItem->selectedMeshPointX > -1) && (currentItem->selectedMeshPointY > -1l))
@@ -1097,7 +1111,7 @@
}
emit NewGradient(11);
}
- else if (type == 5)
+ else if (type == 6)
{
stackedWidget_2->setCurrentIndex(2);
emit NewGradient(12);
@@ -1215,6 +1229,8 @@
CGradDia->selectMesh();
editMeshColors->setEnabled(false);
}
+ else if (currentItem->GrType == 13)
+ CGradDia->selectConical();
CGradDia->show();
}
else
Modified: branches/ScribusOIF/scribus/ui/gradienteditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/gradienteditor.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/gradienteditor.cpp (original)
+++ branches/ScribusOIF/scribus/ui/gradienteditor.cpp Thu Aug 25 23:06:37 2011
@@ -41,6 +41,7 @@
connect(Preview, SIGNAL(selectedStop(VColorStop*)), this, SLOT(slotDisplayStop(VColorStop*)));
connect(Preview, SIGNAL(currStep(double)), this, SLOT(setPos(double)));
connect(Preview, SIGNAL(currStep(double)), this, SIGNAL(gradientChanged()));
+ connect(Preview, SIGNAL(gradientChanged()), this, SIGNAL(gradientChanged()));
}
void GradientEditor::setGradient(VGradient grad)
Modified: branches/ScribusOIF/scribus/ui/gradientvectordialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/gradientvectordialog.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/gradientvectordialog.cpp (original)
+++ branches/ScribusOIF/scribus/ui/gradientvectordialog.cpp Thu Aug 25 23:06:37 2011
@@ -103,6 +103,16 @@
void GradientVectorDialog::selectRadial()
{
stackedWidget->setCurrentIndex(1);
+ label_7->show();
+ gSk_2->show();
+ resize(minimumSizeHint());
+}
+
+void GradientVectorDialog::selectConical()
+{
+ stackedWidget->setCurrentIndex(1);
+ label_7->hide();
+ gSk_2->hide();
resize(minimumSizeHint());
}
Modified: branches/ScribusOIF/scribus/ui/gradientvectordialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/gradientvectordialog.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/gradientvectordialog.h (original)
+++ branches/ScribusOIF/scribus/ui/gradientvectordialog.h Thu Aug 25 23:06:37 2011
@@ -47,6 +47,7 @@
virtual void changeEvent(QEvent *e);
void selectLinear();
void selectRadial();
+ void selectConical();
void selectFourColor();
void selectDiamond();
void selectMesh();
Modified: branches/ScribusOIF/scribus/ui/propertiespalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/propertiespalette.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette.cpp Thu Aug 25 23:06:37 2011
@@ -748,6 +748,8 @@
m_item->GrFocalX = m_item->GrStartX;
m_item->GrFocalY = m_item->GrStartY;
}
+ if (m_item->GrType == 13)
+ m_item->createConicalMesh();
m_item->update();
upRect = QRectF(QPointF(m_item->GrStartX, m_item->GrStartY), QPointF(m_item->GrEndX, m_item->GrEndY));
double radEnd = distance(m_item->GrEndX - m_item->GrStartX, m_item->GrEndY - m_item->GrStartY);
Modified: branches/ScribusOIF/scribus/ui/propertywidget_color.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/propertywidget_color.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_color.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_color.cpp Thu Aug 25 23:06:37 2011
@@ -642,13 +642,15 @@
else if (gradientType->currentIndex() == 1)
emit NewGradient(7);
else if (gradientType->currentIndex() == 2)
+ emit NewGradient(13);
+ else if (gradientType->currentIndex() == 3)
{
setGradientColors();
emit NewGradient(9);
}
- else if (gradientType->currentIndex() == 3)
+ else if (gradientType->currentIndex() == 4)
emit NewGradient(10);
- else if (gradientType->currentIndex() == 4)
+ else if (gradientType->currentIndex() == 5)
emit NewGradient(11);
}
@@ -839,12 +841,15 @@
}
if (number == 0)
fillModeCombo->setCurrentIndex(0);
- else if (((number > 0) && (number < 8)) || (number == 9) || (number == 10) || (number == 11))
- {
- if ((number == 5) || (number == 7))
+ else if (((number > 0) && (number < 8)) || ((number >= 9) && (number <= 13)))
+ {
+ if ((number == 5) || (number == 7) || (number == 13))
{
stackedWidget_2->setCurrentIndex(0);
- gradientType->setCurrentIndex(1);
+ if ((number == 5) || (number == 7))
+ gradientType->setCurrentIndex(1);
+ if (number == 13)
+ gradientType->setCurrentIndex(2);
}
else if (number == 9)
{
@@ -878,7 +883,7 @@
else if (number == 10)
{
stackedWidget_2->setCurrentIndex(0);
- gradientType->setCurrentIndex(3);
+ gradientType->setCurrentIndex(4);
}
else if (number == 11)
{
@@ -890,7 +895,12 @@
shadeMeshPoint->setValue(mp.shade);
transparencyMeshPoint->setValue(mp.transparency * 100);
}
- gradientType->setCurrentIndex(4);
+ gradientType->setCurrentIndex(5);
+ }
+ else if (number == 12)
+ {
+ stackedWidget_2->setCurrentIndex(2);
+ gradientType->setCurrentIndex(6);
}
else
{
@@ -945,6 +955,11 @@
emit NewGradient(7);
}
else if (gradientType->currentIndex() == 2)
+ {
+ stackedWidget_2->setCurrentIndex(0);
+ emit NewGradient(13);
+ }
+ else if (gradientType->currentIndex() == 3)
{
stackedWidget_2->setCurrentIndex(1);
if ((m_item->GrColorP1 != CommonStrings::None) && (!m_item->GrColorP1.isEmpty()))
@@ -973,12 +988,12 @@
color4Shade->setValue(m_item->GrCol4Shade);
emit NewGradient(9);
}
- else if (gradientType->currentIndex() == 3)
+ else if (gradientType->currentIndex() == 4)
{
stackedWidget_2->setCurrentIndex(0);
emit NewGradient(10);
}
- else if (gradientType->currentIndex() == 4)
+ else if (gradientType->currentIndex() == 5)
{
stackedWidget_2->setCurrentIndex(2);
if ((m_item->selectedMeshPointX > -1) && (m_item->selectedMeshPointY > -1l))
@@ -990,6 +1005,11 @@
}
emit NewGradient(11);
}
+ else if (gradientType->currentIndex() == 6)
+ {
+ stackedWidget_2->setCurrentIndex(2);
+ emit NewGradient(12);
+ }
namedGradBlocked = namedGradient->blockSignals(namedGradBlocked);
gradTypeBlocked = gradientType->blockSignals(gradTypeBlocked);
@@ -1015,6 +1035,11 @@
emit NewGradient(7);
}
else if (type == 2)
+ {
+ stackedWidget_2->setCurrentIndex(0);
+ emit NewGradient(13);
+ }
+ else if (type == 3)
{
stackedWidget_2->setCurrentIndex(1);
if ((m_item->GrColorP1 != CommonStrings::None) && (!m_item->GrColorP1.isEmpty()))
@@ -1043,12 +1068,12 @@
color4Shade->setValue(m_item->GrCol4Shade);
emit NewGradient(9);
}
- else if (type == 3)
+ else if (type == 4)
{
stackedWidget_2->setCurrentIndex(0);
emit NewGradient(10);
}
- else if (type == 4)
+ else if (type == 5)
{
stackedWidget_2->setCurrentIndex(2);
if ((m_item->selectedMeshPointX > -1) && (m_item->selectedMeshPointY > -1l))
@@ -1059,6 +1084,11 @@
transparencyMeshPoint->setValue(mp.transparency * 100);
}
emit NewGradient(11);
+ }
+ else if (type == 6)
+ {
+ stackedWidget_2->setCurrentIndex(2);
+ emit NewGradient(12);
}
}
@@ -1173,6 +1203,8 @@
CGradDia->selectMesh();
editMeshColors->setEnabled(false);
}
+ else if (m_item->GrType == 13)
+ CGradDia->selectConical();
CGradDia->show();
}
else
Modified: branches/ScribusOIF/scribus/ui/propertywidget_colorbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/propertywidget_colorbase.ui
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_colorbase.ui (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_colorbase.ui Thu Aug 25 23:06:37 2011
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>220</width>
+ <width>242</width>
<height>329</height>
</rect>
</property>
@@ -66,9 +66,9 @@
<item>
<widget class="QStackedWidget" name="fillStrokeStack">
<property name="currentIndex">
- <number>1</number>
+ <number>0</number>
</property>
- <widget class="QWidget" name="tabFillStrokePage1" native="true">
+ <widget class="QWidget" name="tabFillStrokePage1">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>2</number>
@@ -156,6 +156,11 @@
</item>
<item>
<property name="text">
+ <string>Conical</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
<string>4 Colors</string>
</property>
</item>
@@ -169,12 +174,20 @@
<string>Mesh</string>
</property>
</item>
+ <item>
+ <property name="text">
+ <string>Patch Mesh</string>
+ </property>
+ </item>
</widget>
</item>
<item>
<widget class="QToolButton" name="gradEditButton">
<property name="text">
<string>Move Vector</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
</property>
</widget>
</item>
@@ -620,7 +633,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabFillStrokePage2" native="true">
+ <widget class="QWidget" name="tabFillStrokePage2">
<layout class="QVBoxLayout" name="verticalLayout_11">
<property name="spacing">
<number>2</number>
@@ -852,11 +865,6 @@
</widget>
<customwidgets>
<customwidget>
- <class>ColorCombo</class>
- <extends>QComboBox</extends>
- <header>ui/colorcombo.h</header>
- </customwidget>
- <customwidget>
<class>ScComboBox</class>
<extends>QComboBox</extends>
<header>ui/sccombobox.h</header>
@@ -872,6 +880,11 @@
<extends>QListWidget</extends>
<header>ui/colorlistbox.h</header>
</customwidget>
+ <customwidget>
+ <class>ColorCombo</class>
+ <extends>QComboBox</extends>
+ <header>ui/colorcombo.h</header>
+ </customwidget>
</customwidgets>
<resources/>
<connections/>
Modified: branches/ScribusOIF/scribus/ui/rulermover.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/rulermover.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/rulermover.cpp (original)
+++ branches/ScribusOIF/scribus/ui/rulermover.cpp Thu Aug 25 23:06:37 2011
@@ -91,6 +91,8 @@
pmen2->addAction( tr("Origin at Bottom Left"), this, SLOT(moveRulerBottomLeft()));
pmen2->addAction( tr("Origin at Bottom Right"), this, SLOT(moveRulerBottomRight()));
pmen2->addAction( tr("Origin at Center"), this, SLOT(moveRulerCenter()));
+ pmen2->addAction( tr("Origin at Top Center"), this, SLOT(moveRulerTopCenter()));
+ pmen2->addAction( tr("Origin at Bottom Center"), this, SLOT(moveRulerBottomCenter()));
pmen->addMenu(pmen2);
}
}
@@ -143,3 +145,18 @@
currView->Doc->rulerYoffset = currView->Doc->currentPage()->height() / 2.0;
currView->DrawNew();
}
+
+void RulerMover::moveRulerTopCenter()
+{
+ currView->Doc->rulerXoffset = currView->Doc->currentPage()->width() / 2.0;
+ currView->Doc->rulerYoffset = 0;
+ currView->DrawNew();
+}
+
+void RulerMover::moveRulerBottomCenter()
+{
+ currView->Doc->rulerXoffset = currView->Doc->currentPage()->width() / 2.0;
+ currView->Doc->rulerYoffset = currView->Doc->currentPage()->height();
+ currView->DrawNew();
+}
+
Modified: branches/ScribusOIF/scribus/ui/rulermover.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/rulermover.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/rulermover.h (original)
+++ branches/ScribusOIF/scribus/ui/rulermover.h Thu Aug 25 23:06:37 2011
@@ -50,6 +50,9 @@
void moveRulerBottomLeft();
void moveRulerBottomRight();
void moveRulerCenter();
+ void moveRulerTopCenter();
+ void moveRulerBottomCenter();
+
private: // Private attributes
ScribusView *currView;
RulerGesture* rulerGesture;
Modified: branches/ScribusOIF/scribus/ui/search.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/search.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/search.cpp (original)
+++ branches/ScribusOIF/scribus/ui/search.cpp Thu Aug 25 23:06:37 2011
@@ -65,43 +65,39 @@
SText->setText( tr( "Text" ) );
SearchLayout->addWidget( SText, 0, 0 );
SStyle = new QCheckBox( Search );
- SStyle->setText( tr( "Alignment" ) );
+ SStyle->setText( tr( "Style" ) );
SearchLayout->addWidget( SStyle, 1, 0 );
+ SAlign = new QCheckBox( Search );
+ SAlign->setText( tr( "Alignment" ) );
+ SearchLayout->addWidget( SAlign, 2, 0 );
SFont = new QCheckBox( Search );
SFont->setText( tr( "Font" ) );
- SearchLayout->addWidget( SFont, 2, 0 );
+ SearchLayout->addWidget( SFont, 3, 0 );
SSize = new QCheckBox( Search );
SSize->setText( tr( "Font Size" ) );
- SearchLayout->addWidget( SSize, 3, 0 );
+ SearchLayout->addWidget( SSize, 4, 0 );
SEffect = new QCheckBox( Search );
SEffect->setText( tr( "Font Effects" ) );
- SearchLayout->addWidget( SEffect );
+ SearchLayout->addWidget( SEffect, 5, 0 );
SFill = new QCheckBox( Search);
SFill->setText( tr( "Fill Color" ) );
- SearchLayout->addWidget( SFill );
+ SearchLayout->addWidget( SFill, 6, 0 );
SFillS = new QCheckBox( Search );
SFillS->setText( tr( "Fill Shade" ) );
- SearchLayout->addWidget( SFillS );
+ SearchLayout->addWidget( SFillS, 7, 0 );
SStroke = new QCheckBox( Search );
SStroke->setText( tr( "Stroke Color" ) );
- SearchLayout->addWidget( SStroke );
+ SearchLayout->addWidget( SStroke, 8, 0 );
SStrokeS = new QCheckBox( Search );
SStrokeS->setText( tr( "Stroke Shade" ) );
- SearchLayout->addWidget( SStrokeS, 8, 0 );
+ SearchLayout->addWidget( SStrokeS, 9, 0 );
STextVal = new QLineEdit( Search );
STextVal->setEnabled(false);
SearchLayout->addWidget( STextVal, 0, 1 );
SStyleVal = new QComboBox( Search );
SStyleVal->setEditable(false);
- QString tmp_sty[] = { tr("Left"), tr("Center"), tr("Right"), tr("Block"), tr("Forced")};
- size_t ar_sty = sizeof(tmp_sty) / sizeof(*tmp_sty);
- for (uint a = 0; a < ar_sty; ++a)
- SStyleVal->addItem(tmp_sty[a]);
-// if (doc->docParagraphStyles.count() >5)
- {
- for (int x = 0; x < doc->paragraphStyles().count(); ++x)
- SStyleVal->addItem(doc->paragraphStyles()[x].name());
- }
+ for (int x = 0; x < doc->paragraphStyles().count(); ++x)
+ SStyleVal->addItem(doc->paragraphStyles()[x].name());
QListView *tmpView = dynamic_cast<QListView*>(SStyleVal->view()); Q_ASSERT(tmpView);
int tmpWidth = tmpView->sizeHintForColumn(0);
if (tmpWidth > 0)
@@ -109,39 +105,51 @@
SStyleVal->setCurrentIndex(findParagraphStyle(doc, doc->currentStyle));
SStyleVal->setEnabled(false);
SearchLayout->addWidget( SStyleVal, 1, 1 );
+ SAlignVal = new QComboBox( Search );
+ SAlignVal->setEditable(false);
+ QString tmp_sty[] = { tr("Left"), tr("Center"), tr("Right"), tr("Block"), tr("Forced")};
+ size_t ar_sty = sizeof(tmp_sty) / sizeof(*tmp_sty);
+ for (uint a = 0; a < ar_sty; ++a)
+ SAlignVal->addItem( tmp_sty[a] );
+ tmpView = dynamic_cast<QListView*>(SAlignVal->view()); Q_ASSERT(tmpView);
+ tmpWidth = tmpView->sizeHintForColumn(0);
+ if (tmpWidth > 0)
+ tmpView->setMinimumWidth(tmpWidth + 24);
+ SAlignVal->setEnabled(false);
+ SearchLayout->addWidget( SAlignVal, 2, 1 );
SFontVal = new FontCombo(Search);
SFontVal->setMaximumSize(190, 30);
setCurrentComboItem(SFontVal, doc->currentStyle.charStyle().font().scName());
SFontVal->setEnabled(false);
- SearchLayout->addWidget( SFontVal, 2, 1 );
+ SearchLayout->addWidget( SFontVal, 3, 1 );
SSizeVal = new ScrSpinBox( 0.5, 2048, Search, 0 );
SSizeVal->setValue( doc->currentStyle.charStyle().fontSize() / 10.0 );
SSizeVal->setEnabled(false);
- SearchLayout->addWidget( SSizeVal, 3, 1 );
+ SearchLayout->addWidget( SSizeVal, 4, 1 );
SEffVal = new StyleSelect( Search );
SEffVal->setStyle(0);
SEffVal->setEnabled(false);
- SearchLayout->addWidget( SEffVal, 4, 1, Qt::AlignLeft );
+ SearchLayout->addWidget( SEffVal, 5, 1, Qt::AlignLeft );
SFillVal = new ColorCombo( Search );
SFillVal->setEditable(false);
SFillVal->updateBox(doc->PageColors, ColorCombo::fancyPixmaps, true);
SFillVal->setMinimumWidth(SFillVal->view()->maximumViewportSize().width() + 24);
setCurrentComboItem(SFillVal, doc->currentStyle.charStyle().fillColor());
SFillVal->setEnabled(false);
- SearchLayout->addWidget( SFillVal, 5, 1 );
+ SearchLayout->addWidget( SFillVal, 6, 1 );
SFillSVal = new ShadeButton(Search);
SFillSVal->setEnabled(false);
- SearchLayout->addWidget( SFillSVal, 6, 1, Qt::AlignLeft );
+ SearchLayout->addWidget( SFillSVal, 7, 1, Qt::AlignLeft );
SStrokeVal = new ColorCombo( Search );
SStrokeVal->setEditable(false);
SStrokeVal->updateBox(doc->PageColors, ColorCombo::fancyPixmaps, true);
SStrokeVal->view()->setMinimumWidth(SStrokeVal->view()->maximumViewportSize().width() + 24);
setCurrentComboItem(SStrokeVal, doc->currentStyle.charStyle().strokeColor());
SStrokeVal->setEnabled(false);
- SearchLayout->addWidget( SStrokeVal, 7, 1 );
+ SearchLayout->addWidget( SStrokeVal, 8, 1 );
SStrokeSVal = new ShadeButton(Search);
SStrokeSVal->setEnabled(false);
- SearchLayout->addWidget( SStrokeSVal, 8, 1, Qt::AlignLeft );
+ SearchLayout->addWidget( SStrokeSVal, 9, 1, Qt::AlignLeft );
SelLayout->addWidget( Search );
Replace = new QGroupBox( this );
@@ -154,41 +162,39 @@
RText->setText( tr( "Text" ) );
ReplaceLayout->addWidget( RText, 0, 0 );
RStyle = new QCheckBox( Replace );
- RStyle->setText( tr( "Alignment" ) );
+ RStyle->setText( tr( "Style" ) );
ReplaceLayout->addWidget( RStyle, 1, 0 );
+ RAlign = new QCheckBox( Replace );
+ RAlign->setText( tr( "Alignment" ) );
+ ReplaceLayout->addWidget( RAlign, 2, 0 );
RFont = new QCheckBox( Replace );
RFont->setText( tr( "Font" ) );
- ReplaceLayout->addWidget( RFont, 2, 0 );
+ ReplaceLayout->addWidget( RFont, 3, 0 );
RSize = new QCheckBox( Replace );
RSize->setText( tr( "Font Size" ) );
- ReplaceLayout->addWidget( RSize, 3, 0 );
+ ReplaceLayout->addWidget( RSize, 4, 0 );
REffect = new QCheckBox( Replace );
REffect->setText( tr( "Font Effects" ) );
- ReplaceLayout->addWidget( REffect, 4, 0 );
+ ReplaceLayout->addWidget( REffect, 5, 0 );
RFill = new QCheckBox( Replace );
RFill->setText( tr( "Fill Color" ) );
- ReplaceLayout->addWidget( RFill, 5, 0 );
+ ReplaceLayout->addWidget( RFill, 6, 0 );
RFillS = new QCheckBox( Replace );
RFillS->setText( tr( "Fill Shade" ) );
- ReplaceLayout->addWidget( RFillS, 6, 0 );
+ ReplaceLayout->addWidget( RFillS, 7, 0 );
RStroke = new QCheckBox( Replace );
RStroke->setText( tr( "Stroke Color" ) );
- ReplaceLayout->addWidget( RStroke, 7, 0 );
+ ReplaceLayout->addWidget( RStroke, 8, 0 );
RStrokeS = new QCheckBox( Replace );
RStrokeS->setText( tr( "Stroke Shade" ) );
- ReplaceLayout->addWidget( RStrokeS, 8, 0 );
+ ReplaceLayout->addWidget( RStrokeS, 9, 0 );
RTextVal = new QLineEdit( Replace );
RTextVal->setEnabled(false);
ReplaceLayout->addWidget( RTextVal, 0, 1 );
RStyleVal = new QComboBox( Replace );
RStyleVal->setEditable(false);
- for (uint a = 0; a < ar_sty; ++a)
- RStyleVal->addItem(tmp_sty[a]);
-// if (doc->docParagraphStyles.count() > 5)
- {
- for (int x = 0; x < doc->paragraphStyles().count(); ++x)
- RStyleVal->addItem(doc->paragraphStyles()[x].name());
- }
+ for (int x = 0; x < doc->paragraphStyles().count(); ++x)
+ RStyleVal->addItem(doc->paragraphStyles()[x].name());
tmpView = dynamic_cast<QListView*>(RStyleVal->view()); Q_ASSERT(tmpView);
tmpWidth = tmpView->sizeHintForColumn(0);
if (tmpWidth > 0)
@@ -196,39 +202,49 @@
RStyleVal->setCurrentIndex(findParagraphStyle(doc, doc->currentStyle));
RStyleVal->setEnabled(false);
ReplaceLayout->addWidget( RStyleVal, 1, 1 );
+ RAlignVal = new QComboBox( Replace );
+ RAlignVal->setEditable(false);
+ for (uint a = 0; a < ar_sty; ++a)
+ RAlignVal->addItem(tmp_sty[a]);
+ tmpView = dynamic_cast<QListView*>(RAlignVal->view()); Q_ASSERT(tmpView);
+ tmpWidth = tmpView->sizeHintForColumn(0);
+ if (tmpWidth > 0)
+ tmpView->setMinimumWidth(tmpWidth + 24);
+ RAlignVal->setEnabled(false);
+ ReplaceLayout->addWidget( RAlignVal, 2, 1 );
RFontVal = new FontCombo(Replace);
RFontVal->setMaximumSize(190, 30);
setCurrentComboItem(RFontVal, doc->currentStyle.charStyle().font().scName());
RFontVal->setEnabled(false);
- ReplaceLayout->addWidget( RFontVal, 2, 1 );
+ ReplaceLayout->addWidget( RFontVal, 3, 1 );
RSizeVal = new ScrSpinBox( 0.5, 2048, Replace, 0 );
RSizeVal->setValue( doc->currentStyle.charStyle().fontSize() / 10.0 );
RSizeVal->setEnabled(false);
- ReplaceLayout->addWidget( RSizeVal, 3, 1 );
+ ReplaceLayout->addWidget( RSizeVal, 4, 1 );
REffVal = new StyleSelect( Replace );
REffVal->setStyle(0);
REffVal->setEnabled(false);
- ReplaceLayout->addWidget( REffVal, 4, 1, Qt::AlignLeft );
+ ReplaceLayout->addWidget( REffVal, 5, 1, Qt::AlignLeft );
RFillVal = new ColorCombo( true, Replace );
RFillVal->setEditable(false);
RFillVal->updateBox(doc->PageColors, ColorCombo::fancyPixmaps, true);
RFillVal->view()->setMinimumWidth(RFillVal->view()->maximumViewportSize().width() + 24);
setCurrentComboItem(RFillVal, doc->currentStyle.charStyle().fillColor());
RFillVal->setEnabled(false);
- ReplaceLayout->addWidget( RFillVal, 5, 1 );
+ ReplaceLayout->addWidget( RFillVal, 6, 1 );
RFillSVal = new ShadeButton(Replace);
RFillSVal->setEnabled(false);
- ReplaceLayout->addWidget( RFillSVal, 6, 1, Qt::AlignLeft );
+ ReplaceLayout->addWidget( RFillSVal, 7, 1, Qt::AlignLeft );
RStrokeVal = new ColorCombo( true, Replace );
RStrokeVal->setEditable(false);
RStrokeVal->updateBox(doc->PageColors, ColorCombo::fancyPixmaps, true);
RStrokeVal->view()->setMinimumWidth(RStrokeVal->view()->maximumViewportSize().width() + 24);
setCurrentComboItem(RStrokeVal, doc->currentStyle.charStyle().strokeColor());
RStrokeVal->setEnabled(false);
- ReplaceLayout->addWidget( RStrokeVal, 7, 1 );
+ ReplaceLayout->addWidget( RStrokeVal, 8, 1 );
RStrokeSVal = new ShadeButton(Replace);;
RStrokeSVal->setEnabled(false);
- ReplaceLayout->addWidget( RStrokeSVal, 8, 1, Qt::AlignLeft );
+ ReplaceLayout->addWidget( RStrokeSVal, 9, 1, Qt::AlignLeft );
SelLayout->addWidget( Replace );
SearchReplaceLayout->addLayout( SelLayout );
@@ -272,6 +288,7 @@
connect( AllReplace, SIGNAL( clicked() ), this, SLOT( slotReplaceAll() ) );
connect( SText, SIGNAL( clicked() ), this, SLOT( enableTxSearch() ) );
connect( SStyle, SIGNAL( clicked() ), this, SLOT( enableStyleSearch() ) );
+ connect( SAlign, SIGNAL( clicked() ), this, SLOT( enableAlignSearch() ) );
connect( SFont, SIGNAL( clicked() ), this, SLOT( enableFontSearch() ) );
connect( SSize, SIGNAL( clicked() ), this, SLOT( enableSizeSearch() ) );
connect( SEffect, SIGNAL( clicked() ), this, SLOT( enableEffSearch() ) );
@@ -281,6 +298,7 @@
connect( SStroke, SIGNAL( clicked() ), this, SLOT( enableStrokeSearch() ) );
connect( RText, SIGNAL( clicked() ), this, SLOT( enableTxReplace() ) );
connect( RStyle, SIGNAL( clicked() ), this, SLOT( enableStyleReplace() ) );
+ connect( RAlign, SIGNAL( clicked() ), this, SLOT( enableAlignReplace() ) );
connect( RFont, SIGNAL( clicked() ), this, SLOT( enableFontReplace() ) );
connect( RSize, SIGNAL( clicked() ), this, SLOT( enableSizeReplace() ) );
connect( REffect, SIGNAL( clicked() ), this, SLOT( enableEffReplace() ) );
@@ -306,7 +324,8 @@
setTabOrder( SFill, SStroke );
setTabOrder( SStroke, STextVal );
setTabOrder( STextVal, SStyleVal );
- setTabOrder( SStyleVal, SFontVal );
+ setTabOrder( SStyleVal, SAlignVal );
+ setTabOrder( SAlignVal, SFontVal );
setTabOrder( SFontVal, SSizeVal );
setTabOrder( SSizeVal, SEffVal );
setTabOrder( SEffVal, SFillVal );
@@ -320,7 +339,8 @@
setTabOrder( RFill, RStroke );
setTabOrder( RStroke, RTextVal );
setTabOrder( RTextVal, RStyleVal );
- setTabOrder( RStyleVal, RFontVal );
+ setTabOrder( RStyleVal, RAlignVal );
+ setTabOrder( RAlignVal, RFontVal );
setTabOrder( RFontVal, RSizeVal );
setTabOrder( RSizeVal, REffVal );
setTabOrder( REffVal, RFillVal );
@@ -364,6 +384,7 @@
QString sText = "";
NotFound = true;
int sStyle = 0;
+ int sAlign = 0;
int sSize = 0;
int sEff = 0;
int sFillSh = 100;
@@ -392,6 +413,8 @@
sFont = SFontVal->currentText();
if (SStyle->isChecked())
sStyle = SStyleVal->currentIndex();
+ if (SAlign->isChecked())
+ sAlign = SAlignVal->currentIndex();
if (SSize->isChecked())
sSize = qRound(SSizeVal->value() * 10);
if (sText.length() > 0)
@@ -428,10 +451,15 @@
#ifndef NLS_PROTO
if (SStyle->isChecked())
{
-// if (Item->itemText.item(a)->cab != sStyle)
-// found = false;
+ if (Item->itemText.paragraphStyle(a).parent() != Doc->paragraphStyles()[sStyle].name())
+ found = false;
}
#endif
+ if (SAlign->isChecked())
+ {
+ if (Item->itemText.paragraphStyle(a).alignment() != sAlign)
+ found = false;
+ }
if (SStroke->isChecked())
{
if (Item->itemText.charStyle(a).strokeColor() != sCol)
@@ -448,10 +476,10 @@
found = false;
}
if (SEffect->isChecked())
- {
+ {
if ((Item->itemText.charStyle(a).effects() & 1919) != sEff)
found = false;
- }
+ }
if (SFill->isChecked())
{
if (Item->itemText.charStyle(a).fillColor() != fCol)
@@ -466,7 +494,7 @@
DoReplace->setEnabled(true);
AllReplace->setEnabled(true);
}
- Item->itemText.setCursorPosition(a + 1);
+ Item->itemText.setCursorPosition(a+1);
if (SText->isChecked())
{
if (inde == 0)
@@ -540,13 +568,16 @@
int selStart = cursor.selectionStart();
for (int ap = 0; ap < sText.length(); ++ap)
{
+ const ParagraphStyle& parStyle = storyTextEdit->StyledText.paragraphStyle(selStart + ap);
const CharStyle& charStyle = storyTextEdit->StyledText.charStyle(selStart + ap);
if (SSize->isChecked() && (charStyle.fontSize() != sSize))
found = false;
if (SFont->isChecked() && (charStyle.font().scName() != sFont))
found = false;
-// if (SStyle->isChecked() && (hg->cab != sStyle))
-// found = false;
+ if (SStyle->isChecked() && (parStyle.parent() != Doc->paragraphStyles()[sStyle].name()))
+ found = false;
+ if (SAlign->isChecked() && (parStyle.alignment() != sAlign))
+ found = false;
if (SFill->isChecked() && (charStyle.fillColor() != fCol))
found = false;
if (SStroke->isChecked() && (charStyle.strokeColor() != sCol))
@@ -568,13 +599,16 @@
for (int i = position; i < styledText.length(); ++i)
{
found = true;
+ const ParagraphStyle& parStyle = storyTextEdit->StyledText.paragraphStyle(i);
const CharStyle& charStyle = styledText.charStyle(i);
if (SSize->isChecked() && (charStyle.fontSize() != sSize))
found = false;
if (SFont->isChecked() && (charStyle.font().scName() != sFont))
found = false;
-// if (SStyle->isChecked() && (hg->cab != sStyle))
-// found = false;
+ if (SStyle->isChecked() && (parStyle.parent() != Doc->paragraphStyles()[sStyle].name()))
+ found = false;
+ if (SAlign->isChecked() && (parStyle.alignment() != sAlign))
+ found = false;
if (SFill->isChecked() && (charStyle.fillColor() != fCol))
found = false;
if (SFillS->isChecked() && (charStyle.fillShade() != sFillSh))
@@ -657,19 +691,29 @@
for (cx = cs; cx < repl.length(); ++cx)
Item->itemText.insertChars(ReplStart+cx, repl.mid(cx,1), true);
// FIXME:NLS also replace styles!!
- Item->itemText.setCursorPosition(ReplStart + cx);
}
else
{
for (cs = 0; cs < repl.length(); ++cs)
Item->itemText.replaceChar(ReplStart+cs, repl[cs]);
Item->itemText.removeChars(ReplStart+cs, sear.length() - cs);
- Item->itemText.setCursorPosition(ReplStart + cs);
}
}
}
if (RStyle->isChecked())
+ {
+ int oldMode = Doc->appMode;
+ Doc->appMode = modeEdit;
Doc->itemSelection_SetNamedParagraphStyle(Doc->paragraphStyles()[RStyleVal->currentIndex()].name());
+ Doc->appMode = oldMode;
+ }
+ if (RAlign->isChecked())
+ {
+ int oldMode = Doc->appMode;
+ Doc->appMode = modeEdit;
+ Doc->itemSelection_SetAlignment(RAlignVal->currentIndex());
+ Doc->appMode = oldMode;
+ }
if (RFill->isChecked())
Doc->itemSelection_SetFillColor(RFillVal->currentText());
if (RFillS->isChecked())
@@ -735,7 +779,9 @@
// se->newAlign(se->Editor->currentParaStyle);
}
if (RStyle->isChecked())
- se->newAlign(RStyleVal->currentIndex());
+ se->newStyle(Doc->paragraphStyles()[RStyleVal->currentIndex()].name());
+ if (RAlign->isChecked())
+ se->newAlign(RAlignVal->currentIndex());
if (RFill->isChecked())
se->newTxFill(RFillVal->currentIndex(), -1);
if (RFillS->isChecked())
@@ -790,7 +836,12 @@
void SearchReplace::enableStyleSearch()
{
- SStyleVal->setEnabled(SStyle->isChecked());
+ SStyleVal->setEnabled(SStyleVal->count() ? SStyle->isChecked() : false);
+}
+
+void SearchReplace::enableAlignSearch()
+{
+ SAlignVal->setEnabled(SAlign->isChecked());
}
void SearchReplace::enableFontSearch()
@@ -840,6 +891,11 @@
RStyleVal->setEnabled(RStyle->isChecked());
}
+void SearchReplace::enableAlignReplace()
+{
+ RAlignVal->setEnabled(RAlign->isChecked());
+}
+
void SearchReplace::enableFontReplace()
{
RFontVal->setEnabled(RFont->isChecked());
@@ -877,7 +933,7 @@
void SearchReplace::clear()
{
-
+ SAlign->setChecked(false);
SStroke->setChecked(false);
SFill->setChecked(false);
SStrokeS->setChecked(false);
@@ -891,6 +947,7 @@
STextVal->setText("");
int currentParaStyle = findParagraphStyle(Doc, Doc->currentStyle);
SStyleVal->setCurrentIndex(currentParaStyle);
+ RAlignVal->setCurrentIndex(Doc->currentStyle.alignment());
setCurrentComboItem(SFontVal, Doc->currentStyle.charStyle().font().scName());
setCurrentComboItem(SFillVal, Doc->currentStyle.charStyle().fillColor());
setCurrentComboItem(SStrokeVal, Doc->currentStyle.charStyle().strokeColor());
@@ -905,6 +962,7 @@
RText->setChecked(false);
RTextVal->setText("");
RStyleVal->setCurrentIndex(currentParaStyle);
+ RAlignVal->setCurrentIndex(Doc->currentStyle.alignment());
setCurrentComboItem(RFontVal, Doc->currentStyle.charStyle().font().scName());
setCurrentComboItem(RFillVal, Doc->currentStyle.charStyle().fillColor());
setCurrentComboItem(RStrokeVal, Doc->currentStyle.charStyle().strokeColor());
@@ -940,16 +998,19 @@
SSize->setChecked(prefs->getBool("SSize", false));
SFont->setChecked(prefs->getBool("SFont", false));
SStyle->setChecked(prefs->getBool("SStyle", false));
+ SAlign->setChecked(prefs->getBool("SAlign", false));
SText->setChecked(prefs->getBool("SText", false));
SEffect->setChecked(prefs->getBool("SEffect", false));
REffect->setChecked(prefs->getBool("REffect", false));
STextVal->setText(prefs->get("STextVal", ""));
int tmp = prefs->getInt("SStyleVal", findParagraphStyle(Doc, Doc->currentStyle));
if (tmp < 0 || tmp >= SStyleVal->count())
- SStyleVal->setCurrentIndex(0);
- else
- SStyleVal->setCurrentIndex(tmp);
-
+ tmp = 0;
+ SStyleVal->setCurrentIndex(tmp);
+ tmp = prefs->getInt("SAlignVal", Doc->currentStyle.alignment());
+ if (tmp < 0 || tmp >= SAlignVal->count())
+ tmp = 0;
+ SAlignVal->setCurrentIndex(tmp);
setCurrentComboItem(SFontVal, prefs->get("SFontVal", Doc->currentStyle.charStyle().font().scName()));
setCurrentComboItem(SFillVal, prefs->get("SFillVal", Doc->currentStyle.charStyle().fillColor()));
setCurrentComboItem(SStrokeVal, prefs->get("SStrokeVal", Doc->currentStyle.charStyle().strokeColor()));
@@ -961,13 +1022,17 @@
RSize->setChecked(prefs->getBool("RSize", false));
RFont->setChecked(prefs->getBool("RFont", false));
RStyle->setChecked(prefs->getBool("RStyle", false));
+ RAlign->setChecked(prefs->getBool("RAlign", false));
RText->setChecked(prefs->getBool("RText", false));
RTextVal->setText(prefs->get("RTextVal", ""));
tmp = prefs->getInt("RStyleVal", findParagraphStyle(Doc, Doc->currentStyle));
if (tmp < 0 || tmp >= RStyleVal->count())
- RStyleVal->setCurrentIndex(0);
- else
- RStyleVal->setCurrentIndex(tmp);
+ tmp = 0;
+ RStyleVal->setCurrentIndex(tmp);
+ tmp = prefs->getInt("RAlignVal", Doc->currentStyle.alignment());
+ if (tmp < 0 || tmp >= RAlignVal->count())
+ tmp = 0;
+ RAlignVal->setCurrentIndex(tmp);
setCurrentComboItem(RFontVal, prefs->get("RFontVal", Doc->currentStyle.charStyle().font().scName()));
setCurrentComboItem(RFillVal, prefs->get("RFillVal", Doc->currentStyle.charStyle().fillColor()));
setCurrentComboItem(RStrokeVal, prefs->get("RStrokeVal", Doc->currentStyle.charStyle().strokeColor()));
@@ -976,6 +1041,7 @@
CaseIgnore->setChecked(prefs->getBool("CaseIgnore", false));
enableTxSearch();
enableStyleSearch();
+ enableAlignSearch();
enableFontSearch();
enableSizeSearch();
enableEffSearch();
@@ -985,6 +1051,7 @@
enableStrokeSSearch();
enableTxReplace();
enableStyleReplace();
+ enableAlignReplace();
enableFontReplace();
enableSizeReplace();
enableEffReplace();
@@ -1003,11 +1070,13 @@
prefs->set("SSize", SSize->isChecked());
prefs->set("SFont", SFont->isChecked());
prefs->set("SStyle", SStyle->isChecked());
+ prefs->set("SAlign", SAlign->isChecked());
prefs->set("SText", SText->isChecked());
prefs->set("SEffect", SEffect->isChecked());
prefs->set("REffect", REffect->isChecked());
prefs->set("STextVal", STextVal->text());
prefs->set("SStyleVal", SStyleVal->currentIndex());
+ prefs->set("SAlignVal", SAlignVal->currentIndex());
prefs->set("SFontVal", SFontVal->currentText());
prefs->set("SSizeVal", SSizeVal->value());
prefs->set("SFillVal", SFillVal->currentText());
@@ -1019,9 +1088,11 @@
prefs->set("RSize", RSize->isChecked());
prefs->set("RFont", RFont->isChecked());
prefs->set("RStyle", RStyle->isChecked());
+ prefs->set("RAlign", RAlign->isChecked());
prefs->set("RText", RText->isChecked());
prefs->set("RTextVal", RTextVal->text());
prefs->set("RStyleVal", RStyleVal->currentText());
+ prefs->set("RAlignVal", RAlignVal->currentIndex());
prefs->set("RFontVal", RFontVal->currentText());
prefs->set("RSizeVal", RSizeVal->value());
prefs->set("RFillVal", RFillVal->currentText());
Modified: branches/ScribusOIF/scribus/ui/search.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/search.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/search.h (original)
+++ branches/ScribusOIF/scribus/ui/search.h Thu Aug 25 23:06:37 2011
@@ -48,11 +48,13 @@
QCheckBox* SSize;
QCheckBox* SFont;
QCheckBox* SStyle;
+ QCheckBox* SAlign;
QCheckBox* SText;
QCheckBox* SEffect;
QCheckBox* REffect;
QLineEdit* STextVal;
QComboBox* SStyleVal;
+ QComboBox* SAlignVal;
FontCombo* SFontVal;
ScrSpinBox* SSizeVal;
ColorCombo* SFillVal;
@@ -67,9 +69,11 @@
QCheckBox* RSize;
QCheckBox* RFont;
QCheckBox* RStyle;
+ QCheckBox* RAlign;
QCheckBox* RText;
QLineEdit* RTextVal;
QComboBox* RStyleVal;
+ QComboBox* RAlignVal;
FontCombo* RFontVal;
ScrSpinBox* RSizeVal;
ColorCombo* RFillVal;
@@ -98,6 +102,7 @@
virtual void slotReplaceAll();
virtual void enableTxSearch();
virtual void enableStyleSearch();
+ virtual void enableAlignSearch();
virtual void enableFontSearch();
virtual void enableSizeSearch();
virtual void enableEffSearch();
@@ -107,6 +112,7 @@
virtual void enableStrokeSSearch();
virtual void enableTxReplace();
virtual void enableStyleReplace();
+ virtual void enableAlignReplace();
virtual void enableFontReplace();
virtual void enableSizeReplace();
virtual void enableEffReplace();
Modified: branches/ScribusOIF/scribus/ui/storyeditor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/scribus/ui/storyeditor.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/storyeditor.h (original)
+++ branches/ScribusOIF/scribus/ui/storyeditor.h Thu Aug 25 23:06:37 2011
@@ -391,6 +391,7 @@
bool activFromApp;
public slots:
+ void newStyle(const QString&);
void newAlign(int st);
void newTxFill(int c, int s);
void newTxStroke(int c, int s);
@@ -436,7 +437,6 @@
void updateProps(QTextCursor &cur);
void updateProps(int p, int ch);
- void newStyle(const QString&);
void changeStyleSB(int pa, const QString&);
void changeStyle();
void updateStatus();
Modified: branches/ScribusOIF/win32/vc9/Scribus-build.vsprops
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/Scribus-build.vsprops
==============================================================================
--- branches/ScribusOIF/win32/vc9/Scribus-build.vsprops (original)
+++ branches/ScribusOIF/win32/vc9/Scribus-build.vsprops Thu Aug 25 23:06:37 2011
@@ -17,8 +17,24 @@
Value="F:\Libraries-vc9\cairo-1.8.8"
/>
<UserMacro
+ Name="CAIRO_DEBUG_LIB"
+ Value="cairo2d.lib"
+ />
+ <UserMacro
+ Name="CAIRO_RELEASE_LIB"
+ Value="cairo2.lib"
+ />
+ <UserMacro
Name="FREETYPE_DIR"
Value="F:\Libraries-vc9\freetype-2.4.6"
+ />
+ <UserMacro
+ Name="FREETYPE_DEBUG_LIB"
+ Value="freetypeD.lib"
+ />
+ <UserMacro
+ Name="FREETYPE_RELEASE_LIB"
+ Value="freetype.lib"
/>
<UserMacro
Name="ICONV_DIR"
@@ -29,35 +45,107 @@
Value="F:\Libraries-vc9\icu-4.4.2"
/>
<UserMacro
+ Name="ICU_DEBUG_LIB"
+ Value="iculed.lib icuucd.lib"
+ />
+ <UserMacro
+ Name="ICU_RELEASE_LIB"
+ Value="icule.lib icuuc.lib"
+ />
+ <UserMacro
Name="LCMS_DIR"
Value="F:\Libraries-vc9\lcms2-2.2"
+ />
+ <UserMacro
+ Name="LCMS_DEBUG_LIB"
+ Value="lcms2_staticd.lib"
+ />
+ <UserMacro
+ Name="LCMS_RELEASE_LIB"
+ Value="lcms2_static.lib"
/>
<UserMacro
Name="LIBJPEG_DIR"
Value="F:\Libraries-vc9\libjpeg-6b-3"
/>
<UserMacro
+ Name="LIBJPEG_DEBUG_LIB"
+ Value="libjpeg.a"
+ />
+ <UserMacro
+ Name="LIBJPEG_RELEASE_LIB"
+ Value="libjpeg.a"
+ />
+ <UserMacro
Name="LIBTIFF_DIR"
Value="F:\Libraries-vc9\libtiff-3.8.2"
+ />
+ <UserMacro
+ Name="LIBTIFF_DEBUG_LIB"
+ Value="libtiff.lib"
+ />
+ <UserMacro
+ Name="LIBTIFF_RELEASE_LIB"
+ Value="libtiff.lib"
/>
<UserMacro
Name="PIXMAN_DIR"
Value="F:\Libraries-vc9\pixman-0.18.0"
/>
<UserMacro
+ Name="PIXMAN_DEBUG_LIB"
+ Value="pixman_d.lib"
+ />
+ <UserMacro
+ Name="PIXMAN_RELEASE_LIB"
+ Value="pixman.lib"
+ />
+ <UserMacro
Name="PODOFO_DIR"
Value="F:\Libraries-vc9\podofo-0.9.1"
+ />
+ <UserMacro
+ Name="PODOFO_DEBUG_LIB"
+ Value="PoDoFoLibD.lib"
+ />
+ <UserMacro
+ Name="PODOFO_RELEASE_LIB"
+ Value="PoDoFoLib.lib"
/>
<UserMacro
Name="LIBXML2_DIR"
Value="F:\Libraries-vc9\libxml2-2.6.32+"
/>
<UserMacro
+ Name="LIBXML2_DEBUG_LIB"
+ Value="libxml2.lib"
+ />
+ <UserMacro
+ Name="LIBXML2_RELEASE_LIB"
+ Value="libxml2.lib"
+ />
+ <UserMacro
Name="PYTHON_DIR"
Value="F:\Libraries-vc9\Python-2.7.1"
+ />
+ <UserMacro
+ Name="PYTHON_DEBUG_LIB"
+ Value="python27_d.lib"
+ />
+ <UserMacro
+ Name="PYTHON_RELEASE_LIB"
+ Value="python27.lib"
/>
<UserMacro
Name="POPPLER_DIR"
Value="F:\Libraries-vc9\poppler-0.17.1"
/>
+ <UserMacro
+ Name="POPPLER_DEBUG_LIB"
+ Value="poppler_staticD.lib"
+ />
+ <UserMacro
+ Name="POPPLER_RELEASE_LIB"
+ Value="poppler_static.lib"
+ />
</VisualStudioPropertySheet>
Modified: branches/ScribusOIF/win32/vc9/Scribus.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/Scribus.vcproj Thu Aug 25 23:06:37 2011
@@ -85,7 +85,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib iculed.lib icuucd.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-cairo.lib scribus-fribidi.lib scribus-harfbuzz.lib scribus-pgf.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib $(FREETYPE_DEBUG_LIB) $(ICU_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) $(PODOFO_DEBUG_LIB) mscms.lib WSock32.Lib scribus-cairo.lib scribus-pgf.lib scribus-wpg.lib"
OutputFile="$(OutDir)\Scribus.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(ICU_DIR)\lib";"$(OutDir)\.""
@@ -187,7 +187,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib freetype.lib icule.lib icuuc.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-cairo.lib scribus-fribidi.lib scribus-harfbuzz.lib scribus-pgf.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib $(FREETYPE_RELEASE_LIB) $(ICU_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(PODOFO_RELEASE_LIB) mscms.lib WSock32.Lib scribus-cairo.lib scribus-pgf.lib scribus-wpg.lib"
OutputFile="$(OutDir)\Scribus.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(ICU_DIR)\lib";"$(OutDir)\.""
Modified: branches/ScribusOIF/win32/vc9/aiimport/aiimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/aiimport/aiimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/aiimport/aiimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/aiimport/aiimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib PoDoFoLibD.lib scribus-api.lib WSock32.Lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) $(PODOFO_DEBUG_LIB) scribus-api.lib WSock32.Lib"
OutputFile="$(OutDir)\importai.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib PoDoFoLib.lib scribus-api.lib WSock32.Lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(PODOFO_RELEASE_LIB) scribus-api.lib WSock32.Lib"
OutputFile="$(OutDir)\importai.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/barcodegenerator/barcodegenerator.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/barcodegenerator/barcodegenerator.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/barcodegenerator/barcodegenerator.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/barcodegenerator/barcodegenerator.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\barcodegenerator.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\barcodegenerator.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/cgmimport/cgmimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/cgmimport/cgmimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/cgmimport/cgmimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/cgmimport/cgmimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importcgm.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importcgm.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/colorwheel/colorwheel.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/colorwheel/colorwheel.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/colorwheel/colorwheel.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/colorwheel/colorwheel.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\colorwheel.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\colorwheel.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/cvgimport/cvgimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/cvgimport/cvgimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/cvgimport/cvgimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/cvgimport/cvgimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importcvg.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importcvg.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/drwimport/drwimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/drwimport/drwimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/drwimport/drwimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/drwimport/drwimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importdrw.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importdrw.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/flattenpath/flattenpath.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/flattenpath/flattenpath.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/flattenpath/flattenpath.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/flattenpath/flattenpath.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\flattenpath.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\flattenpath.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/fontpreview/fontpreview.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/fontpreview/fontpreview.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/fontpreview/fontpreview.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/fontpreview/fontpreview.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\fontpreview.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\fontpreview.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/gettext-csvim/gettext-csvim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/gettext-csvim/gettext-csvim.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/gettext-csvim/gettext-csvim.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/gettext-csvim/gettext-csvim.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib libxml2.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LIBXML2_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-csvim.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib libxml2.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(LIBXML2_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-csvim.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
Modified: branches/ScribusOIF/win32/vc9/gettext-docim/gettext-docim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/gettext-docim/gettext-docim.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/gettext-docim/gettext-docim.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/gettext-docim/gettext-docim.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib libxml2.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LIBXML2_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-docim.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib libxml2.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(LIBXML2_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-docim.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
Modified: branches/ScribusOIF/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib libxml2.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LIBXML2_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-htmlim.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib libxml2.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(LIBXML2_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-htmlim.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
Modified: branches/ScribusOIF/win32/vc9/gettext-odtim/gettext-odtim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/gettext-odtim/gettext-odtim.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/gettext-odtim/gettext-odtim.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/gettext-odtim/gettext-odtim.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib libxml2.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LIBXML2_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-odtim.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib libxml2.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(LIBXML2_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-odtim.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
Modified: branches/ScribusOIF/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib libxml2.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LIBXML2_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-pdbim.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib libxml2.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(LIBXML2_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-pdbim.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
Modified: branches/ScribusOIF/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib libxml2.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LIBXML2_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-sxwim.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib libxml2.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(LIBXML2_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-sxwim.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
Modified: branches/ScribusOIF/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib libxml2.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LIBXML2_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-textfilter.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib libxml2.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(LIBXML2_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-textfilter.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
Modified: branches/ScribusOIF/win32/vc9/gettext-txtim/gettext-txtim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/gettext-txtim/gettext-txtim.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/gettext-txtim/gettext-txtim.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/gettext-txtim/gettext-txtim.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib libxml2.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LIBXML2_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-txtim.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib libxml2.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(LIBXML2_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-txtim.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
Modified: branches/ScribusOIF/win32/vc9/gettext-xtgim/gettext-xtgim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/gettext-xtgim/gettext-xtgim.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/gettext-xtgim/gettext-xtgim.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/gettext-xtgim/gettext-xtgim.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib libxml2.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LIBXML2_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-xtgim.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib libxml2.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(LIBXML2_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\gettext-xtgim.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(LIBXML2_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..\..""
Modified: branches/ScribusOIF/win32/vc9/idmlimport/idmlimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/idmlimport/idmlimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/idmlimport/idmlimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/idmlimport/idmlimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importidml.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importidml.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/lenseffects/lenseffects.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/lenseffects/lenseffects.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/lenseffects/lenseffects.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/lenseffects/lenseffects.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\lenseffects.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\lenseffects.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/meshdistortion/meshdistortion.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/meshdistortion/meshdistortion.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/meshdistortion/meshdistortion.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/meshdistortion/meshdistortion.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib scribus-lib2geom.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib scribus-lib2geom.lib"
OutputFile="$(OutDir)\meshdistortion.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib scribus-lib2geom.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib scribus-lib2geom.lib"
OutputFile="$(OutDir)\meshdistortion.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/oodrawimport/oodrawimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/oodrawimport/oodrawimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/oodrawimport/oodrawimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/oodrawimport/oodrawimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\oodrawimp.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\oodrawimp.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/pathalongpath/pathalongpath.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/pathalongpath/pathalongpath.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/pathalongpath/pathalongpath.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/pathalongpath/pathalongpath.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib scribus-lib2geom.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib scribus-lib2geom.lib"
OutputFile="$(OutDir)\pathalongpath.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib scribus-lib2geom.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib scribus-lib2geom.lib"
OutputFile="$(OutDir)\pathalongpath.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/pathconnect/pathconnect.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/pathconnect/pathconnect.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/pathconnect/pathconnect.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/pathconnect/pathconnect.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\pathconnect.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\pathconnect.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/pathcut/pathcut.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/pathcut/pathcut.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/pathcut/pathcut.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/pathcut/pathcut.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\pathcut.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\pathcut.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/pathfinder/pathfinder.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/pathfinder/pathfinder.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/pathfinder/pathfinder.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/pathfinder/pathfinder.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\pathfinder.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\pathfinder.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/pathstroker/pathstroker.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/pathstroker/pathstroker.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/pathstroker/pathstroker.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/pathstroker/pathstroker.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\pathstroker.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\pathstroker.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/pctimport/pctimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/pctimport/pctimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/pctimport/pctimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/pctimport/pctimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importpct.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importpct.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/pdfimport/pdfimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/pdfimport/pdfimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/pdfimport/pdfimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/pdfimport/pdfimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib poppler_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) $(POPPLER_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importpdf.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(POPPLER_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib poppler_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(POPPLER_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importpdf.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(POPPLER_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/picturebrowser/picturebrowser.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/picturebrowser/picturebrowser.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/picturebrowser/picturebrowser.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/picturebrowser/picturebrowser.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\picturebrowser.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\picturebrowser.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/pixmapexport/pixmapexport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/pixmapexport/pixmapexport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/pixmapexport/pixmapexport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/pixmapexport/pixmapexport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scribusexportpixmap.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scribusexportpixmap.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/psimport/psimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/psimport/psimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/psimport/psimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/psimport/psimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib PoDoFoLibD.lib scribus-api.lib WSock32.Lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) $(PODOFO_DEBUG_LIB) scribus-api.lib WSock32.Lib"
OutputFile="$(OutDir)\importps.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib PoDoFoLib.lib scribus-api.lib WSock32.Lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(PODOFO_RELEASE_LIB) scribus-api.lib WSock32.Lib"
OutputFile="$(OutDir)\importps.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/saveastemplate/saveastemplate.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/saveastemplate/saveastemplate.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/saveastemplate/saveastemplate.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/saveastemplate/saveastemplate.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\saveastemplateplugin.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\saveastemplateplugin.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/scribus-cairo/scribus-cairo.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/scribus-cairo/scribus-cairo.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/scribus-cairo/scribus-cairo.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/scribus-cairo/scribus-cairo.vcproj Thu Aug 25 23:06:37 2011
@@ -67,7 +67,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="pixman_d.lib msimg32.lib"
+ AdditionalDependencies="$(PIXMAN_DEBUG_LIB) msimg32.lib"
OutputFile="$(OutDir)/$(ProjectName).dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(PIXMAN_DIR)\lib""
@@ -153,7 +153,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="pixman.lib msimg32.lib"
+ AdditionalDependencies="$(PIXMAN_RELEASE_LIB) msimg32.lib"
OutputFile="$(OutDir)/$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(PIXMAN_DIR)\lib""
Modified: branches/ScribusOIF/win32/vc9/scribus12format/scribus12format.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/scribus12format/scribus12format.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/scribus12format/scribus12format.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/scribus12format/scribus12format.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scribus12format.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scribus12format.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/scribus134format/scribus134format.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/scribus134format/scribus134format.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/scribus134format/scribus134format.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/scribus134format/scribus134format.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scribus134format.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scribus134format.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/scribus13format/scribus13format.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/scribus13format/scribus13format.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/scribus13format/scribus13format.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/scribus13format/scribus13format.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scribus13format.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scribus13format.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/scribus150format/scribus150format.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/scribus150format/scribus150format.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/scribus150format/scribus150format.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/scribus150format/scribus150format.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scribus150format.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scribus150format.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/scriptplugin/scriptplugin.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/scriptplugin/scriptplugin.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/scriptplugin/scriptplugin.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/scriptplugin/scriptplugin.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib python27_d.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib QtWebKitd4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) $(PYTHON_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scriptplugin.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PYTHON_DIR)\libs";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib QtWebKit4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib python27.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib QtWebKit4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) $(PYTHON_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scriptplugin.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PYTHON_DIR)\libs";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/shapeimport/shapeimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/shapeimport/shapeimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/shapeimport/shapeimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/shapeimport/shapeimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importshape.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importshape.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/shortwords/shortwords.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/shortwords/shortwords.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/shortwords/shortwords.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/shortwords/shortwords.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib QtWebKitd4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scribusshortwords.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib QtWebKit4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib QtWebKit4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\scribusshortwords.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/smlimport/smlimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/smlimport/smlimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/smlimport/smlimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/smlimport/smlimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importsml.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importsml.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/smoothpath/smoothpath.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/smoothpath/smoothpath.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/smoothpath/smoothpath.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/smoothpath/smoothpath.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\smoothpath.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\smoothpath.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/subdivide/subdivide.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/subdivide/subdivide.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/subdivide/subdivide.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/subdivide/subdivide.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\subdivide.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\subdivide.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/svgexport/svgexport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/svgexport/svgexport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/svgexport/svgexport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/svgexport/svgexport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\svgexplugin.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\svgexplugin.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/svgimport/svgimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/svgimport/svgimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/svgimport/svgimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/svgimport/svgimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\svgimplugin.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\svgimplugin.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/transform/transform.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/transform/transform.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/transform/transform.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/transform/transform.vcproj Thu Aug 25 23:06:37 2011
@@ -76,7 +76,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\transformeffect.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -171,7 +171,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\transformeffect.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -266,7 +266,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\transformeffect.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -361,7 +361,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\transformeffect.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/uniconvimport/uniconvimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/uniconvimport/uniconvimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/uniconvimport/uniconvimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/uniconvimport/uniconvimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\uniconvertorplugin.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\uniconvertorplugin.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/wmfimport/wmfimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/wmfimport/wmfimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/wmfimport/wmfimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/wmfimport/wmfimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\wmfimplugin.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\wmfimplugin.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/wpgimport/wpgimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/wpgimport/wpgimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/wpgimport/wpgimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/wpgimport/wpgimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib scribus-wpg.lib"
OutputFile="$(OutDir)\importwpg.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib scribus-wpg.lib"
OutputFile="$(OutDir)\importwpg.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/xarimport/xarimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/xarimport/xarimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/xarimport/xarimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/xarimport/xarimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importxar.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importxar.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
Modified: branches/ScribusOIF/win32/vc9/xfigimport/xfigimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16803&path=/branches/ScribusOIF/win32/vc9/xfigimport/xfigimport.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc9/xfigimport/xfigimport.vcproj (original)
+++ branches/ScribusOIF/win32/vc9/xfigimport/xfigimport.vcproj Thu Aug 25 23:06:37 2011
@@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib $(FREETYPE_DEBUG_LIB) $(LIBJPEG_DEBUG_LIB) $(LIBTIFF_DEBUG_LIB) $(LCMS_DEBUG_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importxfig.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib $(FREETYPE_RELEASE_LIB) $(LIBJPEG_RELEASE_LIB) $(LIBTIFF_RELEASE_LIB) $(LCMS_RELEASE_LIB) scribus-api.lib"
OutputFile="$(OutDir)\importxfig.dll"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(QT4_DIR)\lib";"$(OutDir)\..""
More information about the scribus-commit
mailing list