r15759 by jghali - merge trunk revisions up to r15755
scribus-commit
scribus-commit at lists.scribus.net
Wed Nov 3 23:50:39 CET 2010
Author: jghali
Date: Wed Nov 3 22:50:39 2010
New Revision: 15759
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15759
Log:
merge trunk revisions up to r15755
Added:
branches/ScribusOIF/doc/en/cli.html
- copied unchanged from r15752, trunk/Scribus/doc/en/cli.html
branches/ScribusOIF/doc/en/releases.html
- copied unchanged from r15752, trunk/Scribus/doc/en/releases.html
Modified:
branches/ScribusOIF/doc/en/images/scribus-os2.png
branches/ScribusOIF/doc/en/index.html
branches/ScribusOIF/doc/en/install2.html
branches/ScribusOIF/doc/en/menu.xml
branches/ScribusOIF/doc/en/readme-win32.html
branches/ScribusOIF/scribus/colorsetmanager.cpp
branches/ScribusOIF/scribus/ui/paintmanager.cpp
branches/ScribusOIF/scribus/util_color.cpp
Modified: branches/ScribusOIF/doc/en/images/scribus-os2.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15759&path=/branches/ScribusOIF/doc/en/images/scribus-os2.png
==============================================================================
Binary files - no diff available.
Modified: branches/ScribusOIF/doc/en/index.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15759&path=/branches/ScribusOIF/doc/en/index.html
==============================================================================
--- branches/ScribusOIF/doc/en/index.html (original)
+++ branches/ScribusOIF/doc/en/index.html Wed Nov 3 22:50:39 2010
@@ -1,5 +1,7 @@
-<qt>
-<title>Open Source Desktop Publishing for Linux, Mac OS® X and Windows®</title>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<title>Scribus – Open Source Desktop Publishing</title>
<table border="0" cellspacing="0" cellpadding="0" width="100%" bgcolor="#2780b9" >
<tr>
<td align="left"><img src="images/docheader1.png" width="222" height="87"></td>
@@ -10,70 +12,12 @@
<!--marker for image gallery-->
-<p>Scribus brings award-winning professional page layout to Linux/Unix, Mac OS X, OS/2 and Windows desktops with a combination of "press-ready" output and new approaches to page layout.</p>
+<p>Welcome to Scribus, an award-winning page layout program for Linux/UNIX, Mac OS X, OS/2 Warp 4, eComStation and Windows desktops.</p>
-<p>Since its humble beginning in the spring of 2001, Scribus has rapidly developed into one of the premier desktop applications for Linux. Encouraged by professionals and beginners alike, the Scribus Team, supported by a large and constantly growing number of enthusiastic contributors from all over the world, is dedicated to develop and improve "one of the most powerful and useful open-source projects out there" (TechRepublic). Scribus brings powerful and versatile tools for desktop publishing and PDF creation, including separation previews, cross-platform Python scripting or advanced PDF 1.4 and 1.5 support. Scribus is now completely cross-platform and runs natively on Linux/Unix, Mac OS X, OS/2 and Windows.</p>
+<p>Since its humble beginning in the spring of 2001, Scribus has rapidly evolved into one of the premier Open Source desktop applications. Encouraged by professionals and beginners alike, the Scribus Team, supported by a large and constantly growing number of enthusiastic contributors from all over the world, is dedicated to develop and improve “one of the most powerful and useful open-source projects out there” (TechRepublic). Scribus is now completely cross-platform and runs natively on Linux/Unix, Mac OS X, OS/2 Warp 4, eComStation and Windows.</p>
-<p>Underneath a user-friendly interface, Scribus supports professional publishing features, such as CMYK colors, spot color support, ICC color management and versatile PDF creation. Scribus was also the first DTP application on the planet to directly support PDF/X-3 output, a rigorous ISO standard for pre-press documents.</p>
+<p>Underneath a user-friendly interface, Scribus supports professional publishing features, such as CMYK colors, spot color support, ICC color management and versatile PDF creation.</p>
-<p>Scribus also has unexpected touches, such as useful vector drawing tools, support for many file types via import/export filters, emulation of color blindness or the rendering of markup languages like LaTeX or Lilypond inside Scribus. The Scribus file format is XML based and open. Unlike proprietary binary file formats, even damaged documents can be recovered with a simple text editor – sometimes a challenging problem with other page layout programs. Scribus has been translated into more than 25 languages, and more are coming in the future.</p>
-<p>The Scribus team prides itself on excellent end user support with a lively IRC channel and friendly mailing list.</p>
+<p>Scribus has many unexpected touches, such as powerful vector drawing tools, support for a huge number of file types via import/export filters, emulation of color blindness or the rendering of markup languages like LaTeX or Lilypond inside Scribus. The Scribus file format is XML-based and open. Unlike proprietary binary file formats, even damaged documents can be recovered with a simple text editor – sometimes a challenging problem with other page layout programs. Scribus has been translated into more than 25 languages, and more are coming in the future.</p>
-<div class="news">
-<div class="item">
-<h3>Release History</h3>
-<ul>
-<li><b>15/04/2008</b> - Scribus 1.3.3.13 released </li>
-<li><b>12/06/2008</b> - Scribus 1.3.3.12 released </li>
-<li><b>12/01/2008</b> - Scribus 1.3.3.11 released </li>
-<li><b>08/01/2008</b> - Scribus 1.3.3.10 released </li>
-<li><b>28/05/2007</b> - Scribus 1.3.4 (devel) released </li>
-<li><b>05/05/2007</b> - Scribus 1.3.3.9 released </li>
-<li><b>23/02/2007</b> - Scribus 1.3.3.8 released </li>
-<li><b>09/01/2007</b> - Scribus 1.3.3.7 released (added OS/2 Port)</li>
-<li><b>04/12/2006</b> - Scribus 1.3.3.6 released</li>
-<li><b>09/11/2006</b> - Scribus 1.3.3.5 released</li>
-<li><b>03/10/2006</b> - Scribus 1.3.3.4 released</li>
-<li><b>07/08/2006</b> - Scribus 1.3.3.3 released</li>
-<li><b>14/07/2006</b> - Scribus 1.2.5 released</li>
-<li><b>29/05/2006</b> - Scribus 1.3.3.2 (devel) released</li>
-<li><b>10/04/2006</b> - Scribus 1.3.3.1 (devel) released</li>
-<li><b>27/01/2006</b> - Scribus 1.3.3 (devel) released</li>
-<li><b>22/01/2006</b> - Scribus 1.3.2 (devel) released (added Win32 port)</li>
-<li><b>05/01/2006</b> - Scribus 1.2.4.1 released</li>
-<li><b>03/10/2005</b> - Scribus 1.3.1 (devel) released</li>
-<li><b>12/09/2005</b> - Scribus 1.2.3 released</li>
-<li><b>14/07/2005</b> - Scribus 1.3.0 released (added Mac OSX port)</li>
-<li><b>05/07/2005</b> - Scribus 1.2.2.1 released</li>
-<li><b>8/01/2005</b> - Scribus 1.2.1 released</li>
-<li><b>28/08/2004</b> - Scribus 1.2 released</li>
-<li><b>06/06/2004</b> - Scribus 1.1.7 released</li>
-<li><b>28/03/2004</b> - Scribus 1.1.6 released</li>
-<li><b>14/02/2004</b> - Scribus 1.1.5 released</li>
-<li><b>18/12/2003</b> - Scribus 1.1.4 released</li>
-<li><b>28/11/2003</b> - Scribus 1.1.3 released</li>
-<li><b>28/10/2003</b> - Scribus 1.1.2 released</li>
-<li><b>03/10/2003</b> - Scribus 1.1.1 released</li>
-<li><b>06/09/2003</b> - Scribus 1.1.0 released</li>
-<li><b>07/08/2003</b> - Scribus 1.0.1 released</li>
-<li><b>21/06/2003</b> - Scribus 1.0 released</li>
-<!--
-<li><b>13/06/2003</b> - Scribus 0.9.11.1 released</li>
-<li><b>16/05/2003</b> - Scribus 0.9.10 released</li>
-<li><b>18/04/2003</b> - Scribus 0.9.9 released</li>
-<li><b>25/03/2003</b> - Scribus 0.9.8 released</li>
-<li><b>21/02/2003</b> - Scribus 0.9.7 released</li>
-<li><b>11/01/2003</b> - Scribus 0.9.6 released</li>
-<li><b>14/12/2002</b> - Scribus 0.9.4 released</li>
-<li><b>23/11/2002</b> - Scribus 0.9.3 released</li>
-<li><b>14/11/2002</b> - Scribus 0.9.2 released</li>
-<li><b>30/12/2002</b> - Scribus 0.9.1 released</li>
-<li><b>09/11/2002</b> - Scribus 0.9.0 released</li>
-<li><b>24/09/2002</b> - Scribus 0.8.0 released</li>
-<li><b>30/12/2002</b> - Scribus 0.7.8 released</li>-->
-</ul>
-</div>
-</div>
-</qt>
-
Modified: branches/ScribusOIF/doc/en/install2.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15759&path=/branches/ScribusOIF/doc/en/install2.html
==============================================================================
--- branches/ScribusOIF/doc/en/install2.html (original)
+++ branches/ScribusOIF/doc/en/install2.html Wed Nov 3 22:50:39 2010
@@ -15,66 +15,33 @@
<li>Qt 4.6.0+, both the runtime libraries and development libraries. Qt 4.2.x is not supported as 1.3.5+ relies on functions only in 4.3.x, 1.3.8 relies on functions introduced in 4.6. Qt3 is no longer required or supported with Scribus 1.3.5 or higher.</li>
<li>Python and python-devel libraries 2.3+. Python 2.2 is not supported.</li>
<li>Freetype2 2.1.7+. Due to various freetype2 bugs, we recommend, if your distribution/OS allows, to use 2.3.x</li>
-<li>cairo 1.4.x <strong>We recommend 1.4.10+</strong>for performance reasons.</li>
+<li>cairo 1.4.x <b>We recommend 1.4.10 or later</b> for performance reasons.</li>
<li>libxml2 2.6+.</li>
-<li>Ghostscript 8.15+ or GPL Ghostscript 8.60+ is highly recommended. Ubuntu users in particular are urged to update to a newer version if possible.</li>
-<li>PostScript-Fonts. TrueType Fonts. Scribus also can support OpenType fonts, both TrueType and Type 1 Outline OpenType Fonts.</li>
-<li>Littlecms - also known as lcms in some distributions. Minimum 1.12, 1.17+ recommended. lcms 1.12+ has support for black point compensation. 1.3.4+ requires littlecms.</li>
+<li>Ghostscript 8.60+ is highly recommended.</li>
+<li>Littlecms – also known as lcms in some distributions. Minimum is 1.12, 1.17+ recommended. lcms 1.12+ has support for black point compensation.</li>
<li>libtiff 3.6.0+</li>
<li>libjpeg</li>
</ol>
<h3>Optionally:</h3>
<ul>
-<li>CUPS development libraries - Scribus directly supports printing with CUPS.(Linux/Unix only).</li>
-<li>tkinter - for the font sampler script</li>
+<li>CUPS development libraries – Scribus directly supports printing with CUPS.(Linux/UNIX only).</li>
+<li>tkinter – for the font sampler script</li>
<li>python-imaging libaries for font sampler script preview</li>
<li>openssl-devel (Some linux distributions enable ssl support for CUPS, notably SUSE Linux)</li>
-<li>fontconfig-devel - for auto discovery of fonts on Linux, MacOSX and Unix. Not needed on Windows.</li>
-<li>antiword - this is not needed at compile time for MS Word import. Scribus will detect this at run time however.</li>
-<li>Podofo 0.5 (svn does not currently work) - used to enhance the Adobe Illustrator importer.</li>
+<li>fontconfig-devel – for auto discovery of fonts on Linux, MacOSX and Unix. Not needed on Windows.</li>
+<li>antiword – this is not needed at compile time for MS Word import. Scribus will detect this at run time however.</li>
+<li>Podofo 0.6 or later – used to enhance the Adobe Illustrator importer.</li>
</ul>
-<p>Scribus will run under most any window manager and does not require KDE itself. However, drag and drop functionality will be lost without KDE. One of the Scribus developers runs Gnome. The author of this documentation has made a point of testing each release of Scribus under Blackbox as well. This has shown no incompatibilities or problems for Scribus, except for the loss of drag and drop functionality.</p>
-<p>If color management does not work, you also need at least one RGB profile and one CMYK profile installed or the color preferences and options will not appear in the menus. Scribus installs one RGB and one CMYK profile simply to enable color management, but some distributions, notably Debian, because of licensing issues provides icc profiles in separate packages.</p>
+<p>Scribus will run under most any window manager and does not require KDE. However, drag and drop functionality will be lost without KDE.</p>
+<p>If color management does not work, you also need at least one RGB profile and one CMYK profile installed or the color preferences and options will not appear in the menus. Scribus installs one RGB and one CMYK profile simply to enable color management, but some distributions, notably Debian, provide ICC profiles in separate packages, due to their licensing policy. </p>
<p>Testing suggests setting the correct "-march=" CXXFLAGS has a very beneficial effect on Scribus performance. For example, if you have a Duron or Athlon processor, using <code>export CXXFLAGS="-march=athlon"</code> would be of benefit. Check if your distribution sets these for you and how they are set, and for further information see:
<blockquote><table width="100%" border="1" bgcolor="#eeeeee"><tr><td border="0">
<pre>man gcc</pre>
-</td></tr></table></blockquote>
-for detailed options</p>
-<p>There are detailed notes in the BUILDING file and packagers should look at the PACKAGING file in the sources for more details.</p>
+</td></tr></table></blockquote></p>
+<p>There are detailed notes in the BUILDING file, and packagers should look at the PACKAGING file in the sources for more details.</p>
<h4>Using CMake</h4>
-<p>In 1.3.3.6+, weadded support for using CMake as an alternative for traditional autotools. For 1.3.5+ it is mandatory. Currently, Linux and MacOSX are working reliably. Please see <a href="install4.html">CMake instructions</a> for instructions.</p>
-
-<p>You can launch Scribus from the command line with the following options:</p>
-
-<pre>
-scribus --help
-</pre>
-
-<p>Output:</p>
-<blockquote><table width="100%" border="1" bgcolor="#eeeeee"><tr><td border="0">
-<pre>scribus -h
-
-Scribus, Open Source Desktop Publishing
----------------------------------------
-Homepage: http://www.scribus.net
-Documentation: http://docs.scribus.net
-Wiki: http://wiki.scribus.net
-Issues: http://bugs.scribus.net
-
-Usage: scribus [option ... ] [file]
-Options:
- -h, --help Print help (this message) and exit
- -l, --lang Uses xx as shortcut for a language, eg `en' or `de'
- -la, --langs-available List the currently installed interface languages
- -fi, --font-info Show information on the console when fonts are being loaded
- -ns, --no-splash Do not show the splashscreen on startup
- -v, --version Output version information and exit
- -sb, --swap-buttons Use right to left dialog button ordering (eg. Cancel/No/Yes instead of Yes/No/Cancel)
- -pr, --prefs filename Use filename as path for user given preferences
- -pi --profile-info Lists the installed profiles Scribus can access and diagnostics on loading them.
-</pre>
-</td></tr></table></blockquote>
+<p>In 1.3.3.6+, we added support for CMake as an alternative to the traditional autotools. Since 1.3.5 it is mandatory, and autotools are no longer supported. Currently, building on Linux, UNIX and MacOSX is working reliably. Please see the <a href="install4.html">CMake instructions</a> for more details.</p>
<p>The default location for the Scribus executable is located in <code>/usr/local/bin</code>. Documentation is located in <code>/usr/local/lib/scribus/doc</code></p>
-<p>In addition for Linux/Unix desktops, there is a <code>desktop.config</code> file named <code>scribus.desktop</code> which can be used for a menu shortcut or desktop shortcut. Simply copy this from the base directory of the installation source directory to your KDE desktop and this will launch Scribus. After dragging this to the desktop, right click and make sure the execute check box is checked. This file conforms to the latest <a href="http://www.freedesktop.org">www.freedesktop.org</a> specifications.</p>
+<p>In addition for Linux/UNIX desktops, there is a <code>desktop.config</code> file named <code>scribus.desktop</code> which can be used for a menu shortcut or desktop shortcut. Simply copy this from the base directory of the installation source directory to your KDE desktop and this will launch Scribus. After dragging the file to the desktop, right click and make sure the “execute” check box is checked. This file conforms to the latest <a href="http://www.freedesktop.org">www.freedesktop.org</a> specifications.</p>
</body>
</html>
Modified: branches/ScribusOIF/doc/en/menu.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15759&path=/branches/ScribusOIF/doc/en/menu.xml
==============================================================================
--- branches/ScribusOIF/doc/en/menu.xml (original)
+++ branches/ScribusOIF/doc/en/menu.xml Wed Nov 3 22:50:39 2010
@@ -11,7 +11,6 @@
<submenuitem text="Installation" file="install.html">
<submenuitem text="Scribus Source & SVN" file="install1.html"/>
<submenuitem text="Requirements" file="install2.html"/>
- <submenuitem text="Compiling & Installing" file="install3.html"/>
<submenuitem text="Compiling using CMake" file="install4.html"/>
<submenuitem text="Compiling using CMake on OS X" file="install5.html"/>
<submenuitem text="Parallel Install" file="parallel-install.html"/>
@@ -38,6 +37,7 @@
</submenuitem>
<submenuitem text="Scribus Basics" file="about2.html" >
<submenuitem file="qsg.html" text="Quick Start Guide" />
+ <submenuitem file="cli.html" text="Command Line Reference" />
<submenuitem file="docinfo.html" text="Document Information" />
<submenuitem file="WwFrames.html" text="Working with Frames" />
<submenuitem file="WwText.html" text="Working with Text" />
@@ -146,6 +146,7 @@
<submenuitem text="Printers" file="scprinters.html"/>
<submenuitem text="Download" file="download.html"/>
<submenuitem text="Contributions" file="contributions.html"/>
+ <submenuitem text="Release History" file="releases.html"/>
<submenuitem text="Scribus Copyright" file="scribuscopyright.html"/>
<submenuitem text="Documentation Copyright" file="doccopyright.html"/>
</area>
Modified: branches/ScribusOIF/doc/en/readme-win32.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15759&path=/branches/ScribusOIF/doc/en/readme-win32.html
==============================================================================
--- branches/ScribusOIF/doc/en/readme-win32.html (original)
+++ branches/ScribusOIF/doc/en/readme-win32.html Wed Nov 3 22:50:39 2010
@@ -4,45 +4,36 @@
<title>Scribus on Windows</title>
</head>
<body>
-<h2>Scribus on Windows - Read Me</h2>
-<h4>What is different about Scribus ?</h4>
+<h3>Scribus on Windows</h3>
+<h4>Historical Background</h4>
-<p>First, Scribus was developed first and foremost on Linux and Unix machines, so sometimes the way things work are not always the 'windows way', but a more OS neutral way. Scribus also is natively ported to MacOSX and the behavior changes are mostly in the way the menus work. Second, a great deal of time and effort has been put into Scribus to generate very high quality commercial grade PDF. Provided you follow the recommended workflow in the documentation, you should have few issues with commercial printing.</p>
+<p>Scribus was originally developed on and for Linux, but over time it has been ported to other platforms like Mac OS X or Windows, so sometimes things work in a rather OS-neutral way.</p>
+
+<h4>Downloading Scribus for Windows</h4>
+<p>The latest Windows installers can be downloaded from <a href="http://sourceforge.net/projects/scribus/files/">Sourceforge</a>.</p>
<h3>Hardware/Software Minimum Requirements:</h3>
-<p>Windows 2000 SP4 or Windows XP are supported. Windows 98 and ME have not been tested and are <strong>not supported</strong>. Any and all bug reports relating to Windows 9X will be closed quickly. </p>
-<p>256 Mb or more system memory - the more the better. 512Mb or more is strongly recommended for larger more complex documents. </p>
-<p>Pentium III or better - 750MHz or better</p>
-<h3>Recommended:</h3>
-<p>XP Themes Disabled - Use the "Windows Classic" theme <strong>is very strongly recommended</strong>. There is a known issue with Custom Themes causing document loading problems. This is especially true with third party themes. </p>
-
+<p>
+<ul>
+<li>Windows 2000 SP4, Windows XP, Vista or 7 are supported. Windows 98 and ME have not been tested and are <b>not supported</b>. Any and all bug reports relating to Windows 9X will be closed quickly. </li>
+<li>512MB RAM or more is strongly recommended – the more, the better. </li>
+<li>Pentium III or better – 750MHz or better</li>
+<li><i>It is strongly recommended to disable any custom desktop themes. If you encounter any strange behaviour, like no document appearing on screen, use the “Windows Classic“ theme. There is a known Qt issue with custom themes causing document loading problems. This is especially true with third party themes.</i></li>
+</ul>
+</p>
<h3>Before Installing Scribus</h3>
<ul>
- <li>Install Ghostscript for Windows - <a href="http://ghostscript.com">Ghostscript 8.60+</a> or newer is recommended. This is important for EPS,PS import and printing. Note: After installing there are two .exe files installed by the installer. The correct .exe name to use in Scribus' preferences for Ghostscript is gswin32c.exe, <strong>not</strong> gswin32.exe. In the large majority of cases <strong>if</strong> Ghostscript is properly installed before installing Scribus, Scribus will automatically detect the location for Ghostscript for you.</li>
- <li>Scribus is <strong>very</strong> intolerant of poorly constructed or marginal grade fonts. Once installed, please read carefully the font setup section in the help documentation. Scribus may and often will refuse to load fonts which do not follow the True Type and Type 1 specifications properly. What this means in plain English is freeware fonts may work in other programs, but will be rejected by Scribus when starting. Once installed, please read carefully the font setup section in the help documentation. Some of the information is Linux specific, but has detailed explanations why poor quality fonts will cause problems. </li>
- <li>This is beta software which is undergoing many code changes daily. While it is fairly stable and usable, caution is advised. It is not recommended yet for production use. The underlying file format is undergoing rapid changes and will not be finished until the 1.3.6 or later version is released. </li>
+ <li>Install Ghostscript for Windows - <a href="http://ghostscript.com/releases/">Ghostscript 8.7+</a> or later is recommended. This is important for EPS import. Note: After installing there are two .exe files installed by the installer. The correct .exe name to use in the Scribus Preferences (under <i>External Tools</i>) for Ghostscript is <code>gswin32c.exe</code>, <b>not</b> <code>gswin32.exe</code>. In the large majority of cases <b>if</b> Ghostscript is properly installed before installing Scribus, Scribus will automatically detect the location for Ghostscript for you.</li>
+ <li>Scribus is <b>very</b> intolerant of poorly constructed or marginal grade fonts. Once installed, please read the font setup section in the documentation carefully. Scribus may and often will refuse to load fonts which do not follow the True Type, Type 1 and OpenType specifications properly. What this means in plain English is that freeware fonts may work in other programs, but will be rejected by Scribus when starting. Some of the information is Linux-specific, but has detailed explanations as to why poor quality fonts will cause problems. </li>
</ul>
<h3>After Installing</h3>
<ul>
<li>The first launch of Scribus or when a new user launches Scribus will be much longer than usual. This is because Scribus is creating a cache file of your fonts. Later re-starts will be much quicker.</li>
-<li>When you select the "Extra Fonts" Option in the installer, this installs two sets of high quality, freely distributable font. One set is the the URW fonts from Ghostscript. This includes 45 type faces which are commonly included with most PostScript printers. The second is the Bitstream Vera font family, widely used on Linux and by many of the included templates.</li>
- </ul>
+<li>When you select the “Extra Fonts” Option in the installer, this will install two sets of high-quality, freely distributable fonts. One set is the the URW fonts from Ghostscript. This includes 45 typefaces which are compatible with those included with most PostScript printers. The second is the Bitstream Vera font family, widely used on Linux and by many of the included templates.</li>
+</ul>
-<p>Again, Scribus is very particular about font quality. <strong>Use of freeware or shareware fonts is not recommended</strong>. There is an extensive and informative set of notes in the online help about fonts and commercial grade printing. Scribus scans fonts on launch and will disable obviously broken or problematic fonts. Those notes are based on experience both with Scribus and commercial printing.</p>
<h3>Console Mode for Diagnostics</h3>
-<p>There is a second way to launch Scribus: <strong>Console Mode</strong>. In the <strong>Start > Program Files</strong> menu there is a second short cut <strong>Scribus -console</strong>. This mode merely opens a windows command prompt, but will show line by line, each font and its full path being loaded by Scribus. This will also show any rejected fonts and duplicate fonts Scribus finds, along with other diagnostic info in some cases. Duplicates are not loaded, even if they have different names. One of the font tests Scribus performs on launching is to ensure each font file has a correct PostScript name. </p>
-<p>The Scribus Team is pleased to make available the only open source page layout application which runs natively on all 3 major desktop operating systems; Linux, MacOSX and Windows. Both online and direct commercial support is available for Scribus. There is a very friendly community which has developed around Scribus with the active participation of the developers. Enjoy! </p>
-
-<p><a href="http://docs.scribus.net">Scribus Documentation Site</a> (EN,FR,DE, PL) - http://docs.scribus.net</p>
-<p><a href="http://www.scribus.net/">Scribus Home Page</a> - http://www.scribus.net</p>
- <p><a href="http://bugs.scribus.net">Scribus Bug Tracker</a> - http://bugs.scribus.net</p>
- <p><a href="http://wiki.scribus.net">Scribus Wiki</a> (users for users) - http://wiki.scribus.net</p>
- <p><a href="http://lists.scribus.net/mailman/listinfo/scribus">Mailing list</a> (subscription, archives etc.) -http://lists.scribus.net/mailman/listinfo/scribus </p>
-
-<!-- <p><a href="http://sourceforge.net/project/showfiles.php?group_id=125235">Scribus
-SourceForge Downloads</a></p>
- <p><a href="devel-docs">Developers Documentation (API)</a></p>
--->
+<p>There is a second way to launch Scribus on Windows: “Console Mode”. In the <i>Start > Program Files</i> menu there is a second shortcut <strong>Scribus -console</strong>. This mode merely opens a Windows command prompt, but will show line by line, each font and its full path being loaded by Scribus. This will also show any rejected fonts and duplicate fonts Scribus finds, along with other diagnostic info in some cases. Duplicates are not loaded, even if they have different names. One of the font tests Scribus performs on launching is to ensure that each font file has a correct PostScript name. </p>
</body>
</html>
Modified: branches/ScribusOIF/scribus/colorsetmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15759&path=/branches/ScribusOIF/scribus/colorsetmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/colorsetmanager.cpp (original)
+++ branches/ScribusOIF/scribus/colorsetmanager.cpp Wed Nov 3 22:50:39 2010
@@ -139,7 +139,7 @@
void ColorSetManager::searchDir(QString path, QMap<QString, QString> &pList, QTreeWidgetItem* parent)
{
QStringList exts;
- exts << "ai" << "eps" << "gpl" << "skp" << "sla" << "soc" << "xar" << "xml";
+ exts << "aco" << "ai" << "eps" << "gpl" << "skp" << "sla" << "soc" << "xar" << "xml";
QDir dirs(path, "*", QDir::Name, QDir::Dirs | QDir::NoDotAndDotDot | QDir::Files | QDir::NoSymLinks);
dirs.setSorting(QDir::Name | QDir::DirsFirst);
if ((dirs.exists()) && (dirs.count() != 0))
Modified: branches/ScribusOIF/scribus/ui/paintmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15759&path=/branches/ScribusOIF/scribus/ui/paintmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/paintmanager.cpp (original)
+++ branches/ScribusOIF/scribus/ui/paintmanager.cpp Wed Nov 3 22:50:39 2010
@@ -811,7 +811,7 @@
QString wdir = dirs->get("colors", ".");
QString docexts("*.sla *.sla.gz *.scd *.scd.gz");
QString aiepsext(FormatsManager::instance()->extensionListForFormat(FormatsManager::EPS|FormatsManager::PS|FormatsManager::AI, 0));
- QString ooexts(" *.skp *.soc *.gpl *.xar *.xml");
+ QString ooexts(" *.aco *.skp *.soc *.gpl *.xar *.xml");
QString filter = tr("All Supported Formats (%1);;Documents (%2);;Other Files (%3);;All Files (*)").arg(docexts+" "+aiepsext+ooexts).arg(docexts).arg(aiepsext+ooexts);
CustomFDialog dia(this, wdir, tr("Import Colors"), filter, fdHidePreviewCheckBox);
if (dia.exec() == QDialog::Accepted)
Modified: branches/ScribusOIF/scribus/util_color.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15759&path=/branches/ScribusOIF/scribus/util_color.cpp
==============================================================================
--- branches/ScribusOIF/scribus/util_color.cpp (original)
+++ branches/ScribusOIF/scribus/util_color.cpp Wed Nov 3 22:50:39 2010
@@ -731,6 +731,82 @@
EditColors.insert(it.key(), it.value());
}
}
+ }
+ }
+ else if (ext == "aco") // Adobe color swatch format
+ {
+ QFile fiC(fileName);
+ if (fiC.open(QIODevice::ReadOnly))
+ {
+ ScColor lf = ScColor();
+ QDataStream ts(&fiC);
+ ts.setByteOrder(QDataStream::BigEndian);
+ quint16 vers = 0;
+ ts >> vers;
+ if (vers == 1)
+ {
+ quint16 count1 = 0;
+ quint16 count2 = 0;
+ ts >> count1;
+ ts.skipRawData(count1 * 10);
+ ts >> vers >> count2;
+ if ((vers == 2) && (count1 == count2))
+ {
+ for (quint16 cc = 0; cc < count2; cc++)
+ {
+ quint16 colType;
+ quint16 componentR, componentG, componentB, componentK;
+ quint32 nameLength;
+ QString name = "";
+ ts >> colType >> componentR >> componentG >> componentB >> componentK;
+ ts >> nameLength;
+ for (quint32 a = 0; a < nameLength; a++)
+ {
+ quint16 ch;
+ ts >> ch;
+ if (ch != 0)
+ name.append(QChar(ch));
+ }
+ if (!name.isEmpty())
+ {
+ bool validColor = false;
+ if (colType == 0) // RBG
+ {
+ lf.setColorRGB(componentR >> 8, componentG >> 8, componentB >> 8);
+ validColor = true;
+ }
+ else if (colType == 1) // HSB
+ {
+ uchar hc, sc, bc;
+ hc = componentR >> 8;
+ sc = componentG >> 8;
+ bc = componentB >> 8;
+ HSVTORGB(hc, sc, bc);
+ lf.setColorRGB(hc, sc, bc);
+ validColor = true;
+ }
+ else if (colType == 2) // CMYK
+ {
+ lf.setColor(255 - (componentR >> 8), 255 - (componentG >> 8), 255 - (componentB >> 8), 255 - (componentK >> 8));
+ validColor = true;
+ }
+ else if (colType == 8) // Grayscale
+ {
+ lf.setColor(0, 0, 0, qRound((componentK / 10000.0) * 255));
+ validColor = true;
+ }
+ if (validColor)
+ {
+ lf.setSpotColor(false);
+ lf.setRegistrationColor(false);
+ if (!EditColors.contains(name))
+ EditColors.insert(name, lf);
+ }
+ }
+ }
+ }
+ }
+ fiC.close();
}
}
else if (ext == "skp") // Sk1 palette
More information about the scribus-commit
mailing list