r15636 by jghali - merge trunk revisions up to r15633

scribus-commit scribus-commit at lists.scribus.net
Sun Oct 24 16:52:36 CEST 2010


Author: jghali
Date: Sun Oct 24 14:52:36 2010
New Revision: 15636

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15636
Log:
merge trunk revisions up to r15633

Added:
    branches/ScribusOIF/resources/templates/buscard1/
      - copied from r15634, trunk/Scribus/resources/templates/buscard1/
    branches/ScribusOIF/resources/templates/buscard10/
      - copied from r15634, trunk/Scribus/resources/templates/buscard10/
    branches/ScribusOIF/resources/templates/buscard11/
      - copied from r15634, trunk/Scribus/resources/templates/buscard11/
    branches/ScribusOIF/resources/templates/buscard2/
      - copied from r15634, trunk/Scribus/resources/templates/buscard2/
    branches/ScribusOIF/resources/templates/buscard3/
      - copied from r15634, trunk/Scribus/resources/templates/buscard3/
    branches/ScribusOIF/resources/templates/buscard4/
      - copied from r15634, trunk/Scribus/resources/templates/buscard4/
    branches/ScribusOIF/resources/templates/buscard5/
      - copied from r15634, trunk/Scribus/resources/templates/buscard5/
    branches/ScribusOIF/resources/templates/buscard6/
      - copied from r15634, trunk/Scribus/resources/templates/buscard6/
    branches/ScribusOIF/resources/templates/buscard7/
      - copied from r15634, trunk/Scribus/resources/templates/buscard7/
    branches/ScribusOIF/resources/templates/buscard8/
      - copied from r15634, trunk/Scribus/resources/templates/buscard8/
    branches/ScribusOIF/resources/templates/buscard9/
      - copied from r15634, trunk/Scribus/resources/templates/buscard9/
    branches/ScribusOIF/resources/templates/grid_br_100x210_l/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_100x210_l/
    branches/ScribusOIF/resources/templates/grid_br_100x210_p/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_100x210_p/
    branches/ScribusOIF/resources/templates/grid_br_375x85_l/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_375x85_l/
    branches/ScribusOIF/resources/templates/grid_br_375x85_p/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_375x85_p/
    branches/ScribusOIF/resources/templates/grid_br_55x85in_l/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_55x85in_l/
    branches/ScribusOIF/resources/templates/grid_br_55x86in_p/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_55x86in_p/
    branches/ScribusOIF/resources/templates/grid_br_975x85_p/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_975x85_p/
    branches/ScribusOIF/resources/templates/grid_br_975x85in_l/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_975x85in_l/
    branches/ScribusOIF/resources/templates/grid_br_a4_l/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_a4_l/
    branches/ScribusOIF/resources/templates/grid_br_a4_p/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_a4_p/
    branches/ScribusOIF/resources/templates/grid_br_a5_l/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_a5_l/
    branches/ScribusOIF/resources/templates/grid_br_a5_p/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_a5_p/
    branches/ScribusOIF/resources/templates/grid_br_dinl_l/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_dinl_l/
    branches/ScribusOIF/resources/templates/grid_br_dinl_p/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_dinl_p/
    branches/ScribusOIF/resources/templates/grid_br_usl_l/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_usl_l/
    branches/ScribusOIF/resources/templates/grid_br_usl_p/
      - copied from r15634, trunk/Scribus/resources/templates/grid_br_usl_p/
    branches/ScribusOIF/resources/templates/grid_poster_a0/
      - copied from r15634, trunk/Scribus/resources/templates/grid_poster_a0/
    branches/ScribusOIF/resources/templates/grid_poster_a1/
      - copied from r15634, trunk/Scribus/resources/templates/grid_poster_a1/
    branches/ScribusOIF/resources/templates/grid_poster_a2/
      - copied from r15634, trunk/Scribus/resources/templates/grid_poster_a2/
    branches/ScribusOIF/resources/templates/grid_poster_a3/
      - copied from r15634, trunk/Scribus/resources/templates/grid_poster_a3/
    branches/ScribusOIF/resources/templates/template.de.xml
      - copied unchanged from r15634, trunk/Scribus/resources/templates/template.de.xml
    branches/ScribusOIF/scribus/ui/paintmanagerbase.ui
      - copied unchanged from r15634, trunk/Scribus/scribus/ui/paintmanagerbase.ui
Removed:
    branches/ScribusOIF/doc/en/faq2.html
    branches/ScribusOIF/scribus/ui/paintmanager.ui
Modified:
    branches/ScribusOIF/doc/en/faq1.html
    branches/ScribusOIF/doc/en/menu.xml
    branches/ScribusOIF/doc/en/qsg.html
    branches/ScribusOIF/resources/templates/CMakeLists.txt
    branches/ScribusOIF/resources/templates/template.xml
    branches/ScribusOIF/scribus/CMakeLists.txt
    branches/ScribusOIF/scribus/plugins/barcodegenerator/CMakeLists.txt
    branches/ScribusOIF/scribus/plugins/barcodegenerator/barcodegenerator.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    branches/ScribusOIF/scribus/scribus.cpp
    branches/ScribusOIF/scribus/ui/paintmanager.cpp
    branches/ScribusOIF/scribus/ui/paintmanager.h
    branches/ScribusOIF/win32/vc8/Scribus.vcproj

Modified: branches/ScribusOIF/doc/en/faq1.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/doc/en/faq1.html
==============================================================================
--- branches/ScribusOIF/doc/en/faq1.html (original)
+++ branches/ScribusOIF/doc/en/faq1.html Sun Oct 24 14:52:36 2010
@@ -7,18 +7,23 @@
 <a name="top"></a>
 <h2>General Questions</h2>
 <ul>
-	<li><a href="#1">How do I contact the Scribus Team or find interactive help?</a></li>
-	<li><a href="#2">How do get I formatted tables in Scribus?</a></li>
+	<li><a href="#1">How do I contact the Scribus Team, find interactive help or hire an experienced Scribus trainer?</a></li>
+	<li><a href="#2">How do I get formatted tables in Scribus?</a></li>
 	<li><a href="#3">Help! My palettes have disappeared!</a></li>
 	<li><a href="#4">Why do Scribus DMGs from SourceForge not work on Mac OS X 10.4.x?</a></li>
 	<li><a href="#5">What is the difference between PDF 1.3, PDF 1.4 and PDF 1.5?</a></li>
-	<li><a href="#6">How do you change paper size once the a has been created?</a></li>
-	<li><a href="#7">How do you get a printer to print on a non standard size page?</a></li>
+	<li><a href="#6">How do you change paper size once the document has been created?</a></li>
+	<li><a href="#7">How do you get your printer to print on a non-standard size sheet?</a></li>
 	<li><a href="#8">The CUPS options do not show up in print options dialog, what is wrong?</a></li>
 	<li><a href="#9">Scribus crashes when launching and searching for fonts. I have updated my freetype2. I upgraded my freetype2 to enable the bytecode interpreter.</a></li>
 	<li><a href="#10">Scribus seems to hang in an infinite loop when importing EPS or PS files. Why?</a></li>
-	<li><a href="#11">How do I get Arabic text to display correctly with proper glyph shaping and RTL text direction, the most I can get out of Scribus right now is RTL text with no glyph shaping?</a></li>
+	<li><a href="#11">How do I get Arabic text to display correctly with proper glyph shaping and RTL text direction?</a></li>
 	<li><a href="#12">There are many Scribus versions. Which one should I use?</a></li>
+	<li><a href="#13">Why is Scribus built with Qt and not some other toolkit?</a></li>
+	<li><a href="#14">Where does the name &ldquo;Scribus&rdquo; derive from?</a></li>
+	<li><a href="#15">Why are there no import filters for XPress, InDesign or other commercial DTP applications?</a></li>
+	<li><a href="#16">Is there or will there be a Microsoft Publisher importer?</a></li>
+	<li><a href="#17">So, how can I work with those who use other page layout applications?</a></li>
 </ul>
 
 <h3>Answers</h3>
@@ -31,7 +36,7 @@
 		<a href="#top">Back to top</a><hr/>
 	</li>
 	<li><a name="2"></a>
-		<p class="faqquestion">How do get I formatted tables in Scribus?</p>
+		<p class="faqquestion">How do I get formatted tables in Scribus?</p>
 		<p>Scribus added basic table support in 1.1.6, but unfortunately, tables are nothing more than combined text frames, and it is a bit hard to work with them. If you need to have more complex tables, here is a reliable workaround:</p>
 	<ol>
 	<li> Create your table in either OpenOffice.org Writer or Calc.</li>
@@ -45,7 +50,7 @@
 	<li><a name="3"></a>
 		<p class="faqquestion">Help! My palettes have disappeared!</p>
 		<p>Close Scribus. Then open <code>~/.scribus/scribus.rc</code>, a hidden file in your home directory in a text editor. Then look down in the file for the section beginning about 10 lines from the top. <code>ex: MEASUREMENTS YPOS=&quot;-264&quot; XPOS=&quot;-692&quot; VISIBLE=&quot;1&quot;</code>.</p>
-		<p>Notice the negative numbers in front of the <code>YPOS</code> and <code>XPOS</code> statements. Remove the minus, set the visible setting to 0 and save. You might find the coordinates too large: (<code>YPOS=&quot;3046&quot; XPOS=&quot;7690&quot;</code>) Either way, these coordinates are screen positions in pixels. They should be within 1024x768 or whatever screen resolution you are running. Restart Scribus, go to the <i>Windows</i> menu and select show for the missing palette. It will reappear like normal.</p>
+		<p>Notice the negative numbers in front of the <code>YPOS</code> and <code>XPOS</code> statements. Remove the minus, set the visible setting to 0 and save. You might find the coordinates too large: (<code>YPOS=&quot;3046&quot; XPOS=&quot;7690&quot;</code>). Either way, these coordinates are screen positions in pixels. They should be within 1024x768 or whatever screen resolution you are running. Restart Scribus, go to the <i>Windows</i> menu and select show for the missing palette. It will reappear like normal.</p>
 		<p><i>This has been corrected in the most recent versions of Scribus and should not be a problem in the future.</i></p>
 		<a href="#top">Back to top</a><hr/>
 	</li>
@@ -56,26 +61,26 @@
 	<li><a name="5"></a>
 		<p class="faqquestion">Scribus is slow to launch. Why?</p>
 		<p>For those who are new at desktop publishing, unlike most programs, DTP applications care greatly about which fonts are installed and if the font paths are valid. So, when Scribus launches, one of the things it does is to completely and thoroughly scan your font paths and ensure they are valid. This takes time. If you have a large number of fonts installed and slow launch times are a problem, reduce the number of fonts or font paths. </p>
-		<p>The other reason is that your Scrapbook might be filled with complex or large image files. Deleting uneeded items or saving the Scrapbook under a different name and then creating a new blank Scrapbook will also help reduce the startup time.</p>
+		<p>The other reason is that your Scrapbook might be filled with complex or large objects. Deleting unneeded items or saving the Scrapbook under a different name and then creating a new blank Scrapbook will also help reduce the startup time.</p>
 		<a href="#top">Back to top</a><hr/>
 	</li>
 	<li><a name="5"></a>
 		<p class="faqquestion">What is the difference between PDF 1.3, PDF 1.4 and PDF 1.5?</p>
 		<p>PDF 1.2 = Acrobat 3.0 &ndash; Relatively obsolete now.</p>
 		<p>PDF 1.3 = Acrobat 4.0 &ndash; The first version of PDF which truly had all the needed features to support &ldquo;press-ready&rdquo; PDFs including color managment, ICC profiles etc. It also added JavaScript, interactive and multimedia capabilities. This standard is probably the safest to send if you are unsure of the capabilities of the receiver of your file. PDF/X-3 and a number of commercial print work flows are based on PDF 1.3.</p>
-		<p>PDF 1.4 = Acrobat 5.0 &ndash; actually introduced with Illustrator 9, The main difference to concern Scribus users is that PDF 1.4, has both transparency and alpha transparency capabilites, which make a major difference in where a PDF with these features can be printed. It takes either the latest commerical RIP's or a Level 3 PostScript printer to use these features properly. The latest versions of Ghostscript support the advanced PDF 1.4 features Scribus can create when exporting PDF.</p>
+		<p>PDF 1.4 = Acrobat 5.0 &ndash; actually introduced with Illustrator 9, The main difference to concern Scribus users is that PDF 1.4, has both transparency and alpha transparency capabilites, which make a major difference in where a PDF with these features can be printed. It takes either the latest commerical RIPs or a Level 3 PostScript printer to use these features properly. The latest versions of Ghostscript support the advanced PDF 1.4 features Scribus can create when exporting PDF.</p>
 		<p>PDF 1.5 = Acrobat 6.0 &ndash; Among the most interesting for Scribus users: Many improvements for &ldquo;press-ready&rdquo; PDF, the capability to have true layering within the PDF, PDF-X &ldquo;pre-flight&rdquo; capability, more security and interactive features, like the ability to add comments which are separate from the original document.</p>
 		<a href="#top">Back to top</a><hr/>
 	</li>
 	<li><a name="6"></a>
-		<p class="faqquestion">How do you change paper size once page has been created?</p>
+		<p class="faqquestion">How do you change paper size once a document has been created?</p>
 		<p>In 1.3.x, you can change the size of the current page or a range of pages in the <i>Page</i> menu, under <i>Manage Page Properties</i>.</p>
 		<p>You can change this for the whole document under <i>File > Document Setup</i>.</p>
 		<p>Scribus 1.3.x allows multiple page sizes per document.</p>
 		<a href="#top">Back to top</a><hr/>
 	</li>
 	<li><a name="7"></a>
-		<p class="faqquestion">How do you get printer to print on a non standard size page?</p>
+		<p class="faqquestion">How do you get your printer to print on a non-standard size sheet?</p>
 		<p>It depends:</p>
 		<ol>
 			<li>If you are printing to a local printer which is <b>not</b> a PostScript printer, but using CUPS, you can't. It is a limitation, as far as we can tell of CUPS.</li>
@@ -85,15 +90,15 @@
 	</li>
 	<li><a name="8"></a>
 		<p class="faqquestion">The CUPS options do not show up in print options dialog, What is wrong?</p>
-		<p>See this bug: http://bugs.scribus.net/bug_view_advanced_page.php?bug_id=0000271 for and explanation of how CUPS can be mis-configured.</p>
+		<p>See <a href="http://bugs.scribus.net/bug_view_advanced_page.php?bug_id=0000271">this bug</a> for an explanation of how CUPS can be misconfigured.</p>
 		<a href="#top">Back to top</a><hr/>
 	</li>
 	<li><a name="9"></a>
 		<p class="faqquestion">Scribus crashes when launching and searching for fonts and I have updated my freetype2. I upgraded my freetype2 to enable the bytecode interpreter.</p>
-		<p>We do not recommend trying to update freetype2, except rebuilding your existing distros Source RPMS or source packages.</p>
+		<p>We do not recommend trying to update freetype2, except rebuilding your existing distro's source RPMs or source packages.</p>
 		<ol>
-			<li>Recent versions of freetype have an autohinter which works very well.</li>
-			<li><b>Many</b> packages are compiled against freetype2 (Xfree86,Qt, Gtk etc..), upgrading freetype2 might require recompiling <b>all</b> of these packages or system instability might result.</li>
+			<li>Recent versions of freetype have an autohinter, which works very well.</li>
+			<li><b>Many</b> packages are compiled against freetype2 (Xfree86, Qt, Gtk+ etc..), thus, upgrading freetype2 will require recompiling <b>all</b> of these packages or system instability might be the result.</li>
 		</ol>
 		<a href="#top">Back to top</a><hr/>
 	</li>
@@ -103,12 +108,12 @@
 		<ol>
 			<li>Upgrade to the latest Ghostscript. There are <a href="toolbox7.html">notes</a> in the &ldquo;Toolbox&rdquo; section on parallel installs of GS.</li>
 			<li>Reduce the complexity of your EPS/PS file.</li>
-			<li>You do not have enought memory/swap space when importing complex EPS files.</li>
+			<li>You do not have enough memory/swap space when importing complex EPS files.</li>
 		</ol>
 		<a href="#top">Back to top</a><hr/>
 	</li>
 		<li><a name="11"></a>
-		<p class="faqquestion">How do i get Arabic or Hebrew text to display correctly with proper glyph shaping and RTL text direction, the most I can get out of Scribus right now is RTL text with no glyph shaping?</p>
+		<p class="faqquestion">How do i get Arabic or Hebrew text to display correctly with proper glyph shaping and RTL text direction?</p>
 		<p>The glyph shaping is a very difficult thing to achieve. We plan to add this in one of the 1.5.x development versions.</p>
 		<a href="#top">Back to top</a><hr/>
 	</li>
@@ -117,9 +122,42 @@
 		<p>There are currently three branches of Scribus available: 
 		<ol>	
 		<li>The officially stable branch is 1.3.3.x, and installers for Windows and OS/2 are available from <a href="http://sourceforge.net/projects/scribus/files/scribus/">Sourceforge</a>. This branch is unlikely to see any updates or bugfixes.</li>
-		<li>The next version of Scribus is being developed in the branch called &ldquo;Next Generation&rdquo; (NG), and it will result in Scribus 1.4. This branch is already quite stable and useable. Installers for this branch are regularly updated and <a href="http://sourceforge.net/projects/scribus/files/scribus-svn/">available</a> for Mac OS X 10.5+, OS/2 and Windows. Users of Linux/UNIX can use their distribution's package management or check out <a href="install1.html">svn</a> and <a href="install4.html">build from source</a>.</li> 
-		<li>1.5.x is an experimental branch, in which new features are implemented and tested. If possible, those new features will be backported to the 1.3.x/1.4 branch. There are no installers or packages available, as it's only recommended for users who want to test the latest features. <b>Do not use 1.5+ for serious work, because we cannot even guarantee that the file format won't change!</b> 1.5+ must be compiled from source.</li>
+		<li>The next version of Scribus is being developed in the branch called &ldquo;Next Generation&rdquo; (NG), and it will result in Scribus 1.4. This branch is already quite stable and useable. Installers for this branch are regularly updated and <a href="http://sourceforge.net/projects/scribus/files/scribus-svn/">available</a> for Mac OS X 10.5+, OS/2 and Windows. Users of Linux/UNIX can use their distribution&rsquo;s package management or check out <a href="install1.html">svn</a> and <a href="install4.html">build from source</a>.</li> 
+		<li>1.5.x is an experimental branch, in which new features are implemented and tested. If possible, those new features will be backported to the 1.3.x/1.4 branch. There are no installers or packages available, as it's only recommended for users who want to test the latest features. <b>Do not use 1.5+ for serious work, because we cannot even guarantee that the file format won&rsquo;t change!</b> 1.5+ must be compiled from source.</li>
 		</ol>
+		<a href="#top">Back to top</a><hr/>
+	</li>
+	<li><a name="13"></a>
+	<p class="faqquestion">Why is Scribus built with Qt and not some other toolkit?</p>
+	<p>When Franz Schmid launched the project, it was originally written in Python, but for performance reasons he decided to port it to C++. The toolkit with the most complete documentation at the time was Qt 2.2. The first Qt 2 release was 0.3 in 2001. Scribus was ported to Qt 3 after the release of version 0.6. Currently, Scribus uses Qt 4.</p>
+		<a href="#top">Back to top</a><hr/>
+	</li>
+	<li><a name="14"></a>
+		<p class="faqquestion">Where does the name &ldquo;Scribus&rdquo; derive from?</p>
+	<p>When Franz Schmid launched the project, the first working name was &ldquo;Open Page&rdquo;, but he thought it would be too generic. &ldquo;Scribus&rdquo; is derived from the Latin name of the official writers in Ancient Rome, &ldquo;scriba&rdquo;, from which we get &ldquo;scribe&rdquo; or writer. This translates well in to many languages besides English. The German word is &ldquo;Schreiber&rdquo;, for example.</p>
+		<a href="#top">Back to top</a><hr/>
+	</li>
+	<li><a name="15"></a>
+		<p class="faqquestion">Why are there no import filters for Quark, InDesign or other commercial DTP applications?</p>
+		<p>There are several reasons why there are no import filters for commercial DTP applications.</p>
+		<ol>
+	<li>DTP file formats are very complex internally &ndash; they are probably the most complex file formats. Creating import/export filters is a task far more difficult than importing a spreadsheet or simpler word processing document. An engineer familiar with the internal file format of PageMaker compared it to a 2m&nbsp;x&nbsp;3&nbsp;m flow chart diagram in 6 point type. It was not until the arrival of InDesign 2.0 that reliable PageMaker file import was possible in another DTP application, even though Adobe had the file format specs.</li>
+	<li>The file formats are not documented publically.</li>
+	<li>So, is it unethical/illegal to apply hexedit to an InDesign or XPress file to reverse engineer the file format with hexedit or others for the purpose of creating the export/import plugins for Scribus?<br/>Probably not, but given their closed nature, we cannot rule out the possibility of legal bullying by a commercial vendor, as we did from Quark when there was a Quark importer in testing. We do not have the legal resources to challenge large proprietary software companies. A German vendor of DTP software successfully reverse-engineered Quark&rsquo;s file format and created an import filter. It took a long legal battle for them to succeed.</li>
+	<li>Developer constraints. It is the considered judgement of the development team that efforts to improve Scribus is a more valuable use of time.</li>
+	<li>As an exception to the rule, we are open to implement publically available format specifications. For example, the XML version of InDesign's file format (IDML) is very well documented, and the spec is freely (i.e. without any legal restrictions that prevent the implementation of an import filter) available. Thus, a team member took the time and wrote an import filter, which is currently being tested. The same goes for formatted text snippets from QuarkXPress, called XPress Tags.</li>
+		</ol>
+		<a href="#top">Back to top</a><hr/>
+	</li>
+	<li><a name="16"></a>
+		<p class="faqquestion">Is there or will there be a Microsoft Publisher importer? </p>
+		<p>There is none and very unlikely to be provided by the Scribus Team. As with InDesign and QuarkXpress, the file format is undocumented. PUB files are difficult and sometimes impossible to reverse engineer.</p>
+		<p>As with InDesign or XPress, we are considering to implement a workaround: Newer versions of Publisher are capable of exporting to Microsoft's XML Paper Specification (XPS), which is freely available and can be implemented without any legal encumbrances. Thus, if time constraints permit, we may create XPS import/export filters. If you urgently need to exchange files with users of Publisher, you should consider to either get your hands dirty by writing the filters yourself or by paying someone to do so for you.</p>
+		<a href="#top">Back to top</a><hr/>
+	</li>
+	<li><a name="17"></a>
+		<p class="faqquestion">So, how can I work with those who use other page layout applications?</p>
+		<p>Use EPS, PS, SVG or PDF as an exchange format. Scribus created PDFs can be easily imported into a number of commercial applications. SVG import is excellent for vector artwork. Scribus can import EPS files as long as they are conformant to the specs &ndash; this includes spot colors in DCS 2.0 files. The documentation has detailed notes covering these subjects. </p>
 		<a href="#top">Back to top</a><hr/>
 	</li>
 </ul>

Modified: branches/ScribusOIF/doc/en/menu.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/doc/en/menu.xml
==============================================================================
--- branches/ScribusOIF/doc/en/menu.xml (original)
+++ branches/ScribusOIF/doc/en/menu.xml Sun Oct 24 14:52:36 2010
@@ -103,7 +103,6 @@
 		</submenuitem>
 		<submenuitem text="Hints &amp; FAQs" file="topten.html">
 			<submenuitem text="Help" file="faq1.html"/>
-			<submenuitem text="Miscellaneous" file="faq2.html"/>
 			<submenuitem text="Development" file="faq3.html"/>
 		</submenuitem>
 	</area>

Modified: branches/ScribusOIF/doc/en/qsg.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/doc/en/qsg.html
==============================================================================
--- branches/ScribusOIF/doc/en/qsg.html (original)
+++ branches/ScribusOIF/doc/en/qsg.html Sun Oct 24 14:52:36 2010
@@ -1,7 +1,7 @@
 <h1> Scribus Quick Start Guide</h1>
 <p>Before we start explaining Scribus in depth, it might be useful to get a &ldquo;feeling&rdquo; for the way Scribus works. For that purpose, you can see how a simple front page of a magazine for an imaginary Rembrandt exhibition is being created. If you want to follow the description provided here, you need:
 </p>
-<ul><li>The <a href="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;item_id=Gentium&amp;_sc=1" class="external text" title="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;item_id=Gentium&amp;_sc=1" rel="nofollow">Gentium</a> and <a href="http://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-std-8.11.tar.gz" class="external text" title="http://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-std-8.11.tar.gz" rel="nofollow">Bitstream Vera Sans</a> fonts installed on your computer.</li>
+<ul><li>The <a href="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;item_id=Gentium&amp;_sc=1" class="external text" title="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;item_id=Gentium&amp;_sc=1" rel="nofollow">Gentium</a> and <a href="http://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/current/ghostscript-fonts-std-8.11.tar.gz" class="external text" title="http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/" rel="nofollow">Bitstream Vera Sans</a> fonts installed on your computer.</li>
 <li>Rembrandt's self-portrait from <a href="http://commons.wikimedia.org/wiki/Image:Rembrandt_Harmensz._van_Rijn_137.jpg" class="external text" title="http://commons.wikimedia.org/wiki/Image:Rembrandt_Harmensz._van_Rijn_137.jpg" rel="nofollow">Wikimedia</a>.
 </li><li>The Scribus logo from your Scribus install directory.
 </li></ul>
@@ -25,12 +25,12 @@
 
 <table width="100%"><tr><td align="center"><img src="images/Rembrandt1.png"/></td></tr></table> 
 
-</p><p>For our cover page we will choose a Single Page layout. Set the Page Size to &ldquo;Custom&rdquo; and change the default value for height to 285 mm. This is going to be about the same as US Letter size. The cover page won't need any margins, so that we use 0 mm as the value for all page margins. Leave the rest of the default settings as they are.
+</p><p>For our cover page we will choose a Single Page layout. Set the Page Size to &ldquo;Custom&rdquo; (found at the bottom of the list in the <i>Size</i> dropdown box) and change the default value for <i>Height</i> to 285 mm. This is going to be about the same as US Letter size. The cover page won't need any margins, so that we use 0 mm as the value for all page margins. Leave the rest of the default settings as they are.
 </p><p>After clicking the &ldquo;OK&rdquo; button, Scribus creates a new page:
 
 <table width="100%"><tr><td align="center"><img src="images/Rembrandt2.png"/></td></tr></table>
 
-</p><p>Next, we need a grey background for our page. Click on the white rectangle in the menu bar or simply press S on the keyboard. Yes, you're reading correctly, pressing S doesn't mean anything will be &ldquo;typed&rdquo; on the page. To type, you need a special environment called text frame, as you will see below. In this case, we need a shape, thus the keyboard S command.
+</p><p>Next, we need a gray background for our page. Click on the white (or light gray) rectangle in the menu bar or simply press S on the keyboard. Yes, you're reading correctly, pressing S doesn't mean anything will be &ldquo;typed&rdquo; on the page. To type, you need a special environment called text frame, as you will see below. In this case, we need a shape, thus the keyboard S command.
 </p><p>Your mouse pointer now turns into a rectangle with a + on its upper left corner. Click and hold the mouse button, then drag the + across the page and let up &ndash; you have just created a shape. Size, position and color don't matter here, as we will change them immediately.
 
 <table width="100%"><tr><td align="center"><img src="images/Rembrandt3.png"/></td></tr></table>

Modified: branches/ScribusOIF/resources/templates/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/resources/templates/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/resources/templates/CMakeLists.txt (original)
+++ branches/ScribusOIF/resources/templates/CMakeLists.txt Sun Oct 24 14:52:36 2010
@@ -5,6 +5,11 @@
 
 INSTALL(FILES
 template.xml
+  DESTINATION ${TEMPLATEDIR}
+)
+
+INSTALL(FILES
+template.de.xml
   DESTINATION ${TEMPLATEDIR}
 )
 
@@ -40,6 +45,7 @@
 textbased/textbasedtn.png
   DESTINATION ${TEMPLATEDIR}textbased
 )
+
 INSTALL(FILES
 sc_presentation/presentation.png
 sc_presentation/presentation.sla.gz
@@ -94,4 +100,228 @@
 cover5/cover5tn.png
 cover5/cover5.sla.gz
   DESTINATION ${TEMPLATEDIR}cover5
-)
+)
+
+INSTALL(FILES
+buscard1/Business_Card_1.png
+buscard1/Business_Card_1tn.png
+buscard1/buscard1.sla.gz
+  DESTINATION ${TEMPLATEDIR}buscard1
+)
+
+INSTALL(FILES
+buscard2/Business_Card_2.png
+buscard2/Business_Card_2tn.png
+buscard2/buscard2.sla.gz
+  DESTINATION ${TEMPLATEDIR}buscard2
+)
+
+INSTALL(FILES
+buscard3/Business_Card_3.png
+buscard3/Business_Card_3tn.png
+buscard3/buscard3.sla.gz
+  DESTINATION ${TEMPLATEDIR}buscard3
+)
+
+INSTALL(FILES
+buscard4/Business_Card_4.png
+buscard4/Business_Card_4tn.png
+buscard4/buscard4.sla.gz
+  DESTINATION ${TEMPLATEDIR}buscard4
+)
+
+INSTALL(FILES
+buscard5/Business_Card_5.png
+buscard5/Business_Card_5tn.png
+buscard5/buscard5.sla.gz
+  DESTINATION ${TEMPLATEDIR}buscard5
+)
+
+INSTALL(FILES
+buscard6/Business_Card_6.png
+buscard6/Business_Card_6tn.png
+buscard6/buscard6.sla.gz
+  DESTINATION ${TEMPLATEDIR}buscard6
+)
+
+INSTALL(FILES
+buscard7/Business_Card_7.png
+buscard7/Business_Card_7tn.png
+buscard7/buscard7.sla.gz
+  DESTINATION ${TEMPLATEDIR}buscard7
+)
+
+INSTALL(FILES
+buscard8/Business_Card_8.png
+buscard8/Business_Card_8tn.png
+buscard8/buscard8.sla.gz
+  DESTINATION ${TEMPLATEDIR}buscard8
+)
+
+INSTALL(FILES
+buscard9/Business_Card_9.png
+buscard9/Business_Card_9tn.png
+buscard9/buscard9.sla.gz
+  DESTINATION ${TEMPLATEDIR}buscard9
+)
+
+INSTALL(FILES
+buscard10/Business_Card_10.png
+buscard10/Business_Card_10tn.png
+buscard10/buscard10.sla.gz
+  DESTINATION ${TEMPLATEDIR}buscard10
+)
+
+INSTALL(FILES
+buscard11/Business_Card_11.png
+buscard11/Business_Card_11tn.png
+buscard11/buscard11.sla.gz
+  DESTINATION ${TEMPLATEDIR}buscard11
+)
+
+INSTALL(FILES
+grid_br_a4_l/Brochure_Grid_A4_L.sla.gz
+grid_br_a4_l/Brochure_Grid_A4_Ltn.png
+grid_br_a4_l/Brochure_Grid_A4_L.png
+  DESTINATION ${TEMPLATEDIR}grid_br_a4_l
+)
+
+INSTALL(FILES
+grid_br_a4_p/Brochure_Grid_A4_P.sla.gz
+grid_br_a4_p/Brochure_Grid_A4_Ptn.png
+grid_br_a4_p/Brochure_Grid_A4_P.png
+  DESTINATION ${TEMPLATEDIR}grid_br_a4_p
+)
+
+INSTALL(FILES
+grid_br_975x85in_l/Brochure_Grid_975x85in_L.sla.gz
+grid_br_975x85in_l/Brochure_Grid_975x85_in_Ltn.png
+grid_br_975x85in_l/Brochure_Grid_975x85_in_L.png
+  DESTINATION ${TEMPLATEDIR}grid_br_975x85in_l
+)
+
+INSTALL(FILES
+grid_br_975x85_p/Brochure_Grid_975x85in_P.sla.gz
+grid_br_975x85_p/Brochure_Grid_975x85_in_Ptn.png
+grid_br_975x85_p/Brochure_Grid_975x85_in_P.png
+  DESTINATION ${TEMPLATEDIR}grid_br_975x85_p
+)
+
+INSTALL(FILES
+grid_br_375x85_p/Brochure_Grid_375x85in_P.sla.gz
+grid_br_375x85_p/Brochure_Grid_375x85_in_Ptn.png
+grid_br_375x85_p/Brochure_Grid_375x85_in_P.png
+  DESTINATION ${TEMPLATEDIR}grid_br_375x85_p
+)
+
+INSTALL(FILES
+grid_br_375x85_l/Brochure_Grid_375x85in_L.sla.gz
+grid_br_375x85_l/Brochure_Grid_375x85_in_Landscapetn.png
+grid_br_375x85_l/Brochure_Grid_375x85_in_Landscape.png
+  DESTINATION ${TEMPLATEDIR}grid_br_375x85_l
+)
+
+INSTALL(FILES
+grid_br_100x210_p/Brochure_Grid_100x210_P.sla.gz
+grid_br_100x210_p/Brochure_Grid_100x210_Ptn.png
+grid_br_100x210_p/Brochure_Grid_100x210_P.png
+  DESTINATION ${TEMPLATEDIR}grid_br_100x210_p
+)
+
+INSTALL(FILES
+grid_br_100x210_l/Brochure_Grid_100x210_L.sla.gz
+grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscapetn.png
+grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscape.png
+  DESTINATION ${TEMPLATEDIR}grid_br_100x210_l
+)
+
+INSTALL(FILES
+grid_br_55x86in_p/Brochure_Grid_55x85in_P.sla.gz
+grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoittn.png
+grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoit.png
+  DESTINATION ${TEMPLATEDIR}grid_br_55x86in_p
+)
+
+INSTALL(FILES
+grid_br_55x85in_l/Brochure_Grid_55x85in_L.sla.gz
+grid_br_55x85in_l/Brochure_Grid_55x85_in_Ltn.png
+grid_br_55x85in_l/Brochure_Grid_55x85_in_L.png
+  DESTINATION ${TEMPLATEDIR}grid_br_55x85in_l
+)
+
+INSTALL(FILES
+grid_poster_a3/Poster_Grid_A3.sla.gz
+grid_poster_a3/Poster_Grid_A3tn.png
+grid_poster_a3/Poster_Grid_A3.png
+  DESTINATION ${TEMPLATEDIR}grid_poster_a3
+)
+
+INSTALL(FILES
+grid_poster_a2/Poster_Grid_A2.sla.gz
+grid_poster_a2/Poster_Grid_A2tn.png
+grid_poster_a2/Poster_Grid_A2.png
+  DESTINATION ${TEMPLATEDIR}grid_poster_a2
+)
+
+INSTALL(FILES
+grid_poster_a1/Poster_Grid_A1.sla.gz
+grid_poster_a1/Poster_Grid_A1tn.png
+grid_poster_a1/Poster_Grid_A1.png
+  DESTINATION ${TEMPLATEDIR}grid_poster_a1
+)
+
+INSTALL(FILES
+grid_poster_a0/Poster_Grid_A0.sla.gz
+grid_poster_a0/Poster_Grid_A0tn.png
+grid_poster_a0/Poster_Grid_A0.png
+  DESTINATION ${TEMPLATEDIR}grid_poster_a0
+)
+
+INSTALL(FILES
+grid_br_usl_p/Brochure_Grid_USL_P.sla.gz
+grid_br_usl_p/Brochure_Grid_USL_Ptn.png
+grid_br_usl_p/Brochure_Grid_USL_P.png
+  DESTINATION ${TEMPLATEDIR}grid_poster_a0
+)
+
+INSTALL(FILES
+grid_br_usl_l/Brochure_Grid_USL_L.sla.gz
+grid_br_usl_l/Brochure_Grid_USL_Ltn.png
+grid_br_usl_l/Brochure_Grid_USL_L.png
+  DESTINATION ${TEMPLATEDIR}grid_br_usl_l
+)
+
+INSTALL(FILES
+grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.sla.gz
+grid_br_dinl_p/Brochure_Grid_DIN_LANG_Ptn.png
+grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.png
+  DESTINATION ${TEMPLATEDIR}grid_br_dinl_p
+)
+
+INSTALL(FILES
+grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.sla.gz
+grid_br_dinl_l/Brochure_Grid_DIN_LANG_Ltn.png
+grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.png
+  DESTINATION ${TEMPLATEDIR}grid_br_dinl_l
+)
+
+INSTALL(FILES
+grid_br_a5_p/Brochure_Grid_A5_P.sla.gz
+grid_br_a5_p/Brochure_Grid_A5_Portraittn.png
+grid_br_a5_p/Brochure_Grid_A5_Portrait.png
+  DESTINATION ${TEMPLATEDIR}grid_br_a5_p
+)
+
+INSTALL(FILES
+grid_br_a5_l/Brochure_Grid_A5_L.sla.gz
+grid_br_a5_l/Brochure_Grid_A5_Ltn.png
+grid_br_a5_l/Brochure_Grid_A5_L.png
+  DESTINATION ${TEMPLATEDIR}grid_br_a5_l
+)
+
+INSTALL(FILES
+buscard_coll/business_card_collection.sla.gz
+buscard_coll/Business_Card_Collectiontn.png
+buscard_coll/Business_Card_Collection.png
+  DESTINATION ${TEMPLATEDIR}buscard_coll
+)

Modified: branches/ScribusOIF/resources/templates/template.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/resources/templates/template.xml
==============================================================================
--- branches/ScribusOIF/resources/templates/template.xml (original)
+++ branches/ScribusOIF/resources/templates/template.xml Sun Oct 24 14:52:36 2010
@@ -168,4 +168,452 @@
 		<author>vectorportal.com</author>
 		<email></email>
 	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_A4_L</name>
+		<file>grid_br_a4_l/Brochure_Grid_A4_L.sla.gz</file>
+		<tnail>grid_br_a4_l/Brochure_Grid_A4_Ltn.png</tnail>
+		<img>grid_br_a4_l/Brochure_Grid_A4_L.png</img>
+		<psize>custom, 1684x596</psize>
+		<color>RGB</color>
+		<descr>A design grid for an A4 brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_A4_P</name>
+		<file>grid_br_a4_p/Brochure_Grid_A4_P.sla.gz</file>
+		<tnail>grid_br_a4_p/Brochure_Grid_A4_Ptn.png</tnail>
+		<img>grid_br_a4_p/Brochure_Grid_A4_P.png</img>
+		<psize>custom, 1191x842</psize>
+		<color>RGB</color>
+		<descr>A design grid for an A4 brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_975x85_in_L</name>
+		<file>grid_br_975x85in_l/Brochure_Grid_975x85in_L.sla.gz</file>
+		<tnail>grid_br_975x85in_l/Brochure_Grid_975x85_in_Ltn.png</tnail>
+		<img>grid_br_975x85in_l/Brochure_Grid_975x85_in_L.png</img>
+		<psize>custom, 1404x612</psize>
+		<color>RGB</color>
+		<descr>A design grid for a 9.75x8.5 in brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_975x85_in_P</name>
+		<file>grid_br_975x85_p/Brochure_Grid_975x85in_P.sla.gz</file>
+		<tnail>grid_br_975x85_p/Brochure_Grid_975x85_in_Ptn.png</tnail>
+		<img>grid_br_975x85_p/Brochure_Grid_975x85_in_P.png</img>
+		<psize>custom, 1224x702</psize>
+		<color>RGB</color>
+		<descr>A design grid for a 9.75x8.5 in brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_375x85_in_P</name>
+		<file>grid_br_375x85_p/Brochure_Grid_375x85in_P.sla.gz</file>
+		<tnail>grid_br_375x85_p/Brochure_Grid_375x85_in_Ptn.png</tnail>
+		<img>grid_br_375x85_p/Brochure_Grid_375x85_in_P.png</img>
+		<psize>custom, 540x613</psize>
+		<color>RGB</color>
+		<descr>A design grid for a 3.75x8.5 in brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_375x85_in_L</name>
+		<file>grid_br_375x85_l/Brochure_Grid_375x85in_L.sla.gz</file>
+		<tnail>grid_br_375x85_l/Brochure_Grid_375x85_in_Landscapetn.png</tnail>
+		<img>grid_br_375x85_l/Brochure_Grid_375x85_in_Landscape.png</img>
+		<psize>custom, 1224x270</psize>
+		<color>RGB</color>
+		<descr>A design grid for a 3.75x8.5 in brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_100x210_P</name>
+		<file>grid_br_100x210_p/Brochure_Grid_100x210_P.sla.gz</file>
+		<tnail>grid_br_100x210_p/Brochure_Grid_100x210_Ptn.png</tnail>
+		<img>grid_br_100x210_p/Brochure_Grid_100x210_P.png</img>
+		<psize>custom, 567x596</psize>
+		<color>RGB</color>
+		<descr>A design grid for a 100x210 mm portrait brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_100x210_L</name>
+		<file>grid_br_100x210_l/Brochure_Grid_100x210_L.sla.gz</file>
+		<tnail>grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscapetn.png</tnail>
+		<img>grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscape.png</img>
+		<psize>custom, 1191x284</psize>
+		<color>RGB</color>
+		<descr>A design grid for a 100x210 mm landcsape brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_55x85in_P</name>
+		<file>grid_br_55x86in_p/Brochure_Grid_55x85in_P.sla.gz</file>
+		<tnail>grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoittn.png</tnail>
+		<img>grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoit.png</img>
+		<psize>custom, 792x613</psize>
+		<color>RGB</color>
+		<descr>A design grid for a 5.5x8.5 in brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_5.5x8.5in_L</name>
+		<file>grid_br_55x85in_l/Brochure_Grid_55x85in_L.sla.gz</file>
+		<tnail>grid_br_55x85in_l/Brochure Grid_55x85_in_Ltn.png</tnail>
+		<img>grid_br_55x85in_l/Brochure Grid_55x85_in_L.png</img>
+		<psize>custom, 1224x396</psize>
+		<color>RGB</color>
+		<descr>A design grid for a 5.5x8.5 in brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Posters">
+		<name>Poster_Grid_A3</name>
+		<file>grid_poster_a3/Poster_Grid_A3.sla.gz</file>
+		<tnail>grid_poster_a3/Poster_Grid_A3tn.png</tnail>
+		<img>grid_poster_a3/Poster_Grid_A3.png</img>
+		<psize>custom, 842x1191</psize>
+		<color>RGB</color>
+		<descr>A design grid for an A3 poster</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Posters">
+		<name>Poster_Grid_A2</name>
+		<file>grid_poster_a2/Poster_Grid_A2.sla.gz</file>
+		<tnail>grid_poster_a2/Poster_Grid_A2tn.png</tnail>
+		<img>grid_poster_a2/Poster_Grid_A2.png</img>
+		<psize>custom, 1191x1684</psize>
+		<color>RGB</color>
+		<descr>A design grid for an A2 poster</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Posters">
+		<name>Poster_Grid_A1</name>
+		<file>grid_poster_a1/Poster_Grid_A1.sla.gz</file>
+		<tnail>grid_poster_a1/Poster_Grid_A1tn.png</tnail>
+		<img>grid_poster_a1/Poster_Grid_A1.png</img>
+		<psize>custom, 1684x2384</psize>
+		<color>RGB</color>
+		<descr>A design grid for an A1 poster</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Posters">
+		<name>Poster_Grid_A0</name>
+		<file>grid_poster_a0/Poster_Grid_A0.sla.gz</file>
+		<tnail>grid_poster_a0/Poster_Grid_A0tn.png</tnail>
+		<img>grid_poster_a0/Poster_Grid_A0.png</img>
+		<psize>custom, 2384x3371</psize>
+		<color>RGB</color>
+		<descr>A design grid for an A0 poster</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_USL_P</name>
+		<file>grid_br_usl_p/Brochure_Grid_USL_P.sla.gz</file>
+		<tnail>grid_br_usl_p/Brochure_Grid_USL_Ptn.png</tnail>
+		<img>grid_br_usl_p/Brochure_Grid_USL_P.png</img>
+		<psize>custom, 1224x792</psize>
+		<color>RGB</color>
+		<descr>A design grid for a US Letter brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_USL_L</name>
+		<file>grid_br_usl_l/Brochure_Grid_USL_L.sla.gz</file>
+		<tnail>grid_br_usl_l/Brochure_Grid_USL_Ltn.png</tnail>
+		<img>grid_br_usl_l/Brochure Grid_USL_L.png</img>
+		<psize>custom, 1584x612</psize>
+		<color>RGB</color>
+		<descr>A design grid for a US Letter brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_DIN_LANG P</name>
+		<file>grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.sla.gz</file>
+		<tnail>grid_br_dinl_p/Brochure_Grid_DIN_LANG_Ptn.png</tnail>
+		<img>grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.png</img>
+		<psize>custom, 596x596</psize>
+		<color>RGB</color>
+		<descr>A design grid for a DIN LANG brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_DIN_LANG_L</name>
+		<file>grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.sla.gz</file>
+		<tnail>grid_br_dinl_l/Brochure_Grid_DIN_LANG_Ltn.png</tnail>
+		<img>grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.png</img>
+		<psize>custom, 1191x298</psize>
+		<color>RGB</color>
+		<descr>A design grid for a DIN LANG brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_A5_P</name>
+		<file>grid_br_a5_p/Brochure_Grid_A5_P.sla.gz</file>
+		<tnail>grid_br_a5_p/Brochure_Grid_A5_Portraittn.png</tnail>
+		<img>grid_br_a5_p/Brochure_Grid_A5_Portrait.png</img>
+		<psize>custom, 840x596</psize>
+		<color>RGB</color>
+		<descr>A design grid for an A5 brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Brochures">
+		<name>Brochure_Grid_A5_L</name>
+		<file>grid_br_a5_l/Brochure_Grid_A5_L.sla.gz</file>
+		<tnail>grid_br_a5_l/Brochure_Grid_A5_Ltn.png</tnail>
+		<img>grid_br_a5_l/Brochure_Grid_A5_L.png</img>
+		<psize>custom, 1191x420</psize>
+		<color>RGB</color>
+		<descr>A design grid for an A5 brochure</descr>
+		<usage>Create your content on the &quot;Content&quot; layer and disable printing of the &quot;Background&quot; layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business_Card_Collection</name>
+		<file>buscard_coll/business_card_collection.sla.gz</file>
+		<tnail>buscard_coll/Business_Card_Collectiontn.png</tnail>
+		<img>buscard_coll/Business_Card_Collection.png</img>
+		<psize>custom, 1436x1709</psize>
+		<color>RGB</color>
+		<descr>A collection of business cards.</descr>
+		<usage>Copy a business card into a document or the Scrapbook to reuse and edit it.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>vectorportal.com</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business_Card_1</name>
+		<file>buscard1/buscard1.sla.gz</file>
+		<tnail>buscard1/Business_Card_1tn.png</tnail>
+		<img>buscard1/Business_Card_1.png</img>
+		<psize>custom, 252x144</psize>
+		<color>RGB</color>
+		<descr></descr>
+		<usage></usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-22</date>
+		<author>vectorportal.com</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business_Card_2</name>
+		<file>buscard2/buscard2.sla.gz</file>
+		<tnail>buscard2/Business_Card_2tn.png</tnail>
+		<img>buscard2/Business_Card_2.png</img>
+		<psize>custom, 252x144</psize>
+		<color>RGB</color>
+		<descr></descr>
+		<usage></usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-22</date>
+		<author>vectorportal.com</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business_Card_3</name>
+		<file>buscard3/buscard3.sla.gz</file>
+		<tnail>buscard3/Business_Card_3tn.png</tnail>
+		<img>buscard3/Business_Card_3.png</img>
+		<psize>custom, 252x144</psize>
+		<color>RGB</color>
+		<descr></descr>
+		<usage></usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-22</date>
+		<author>vectorportal.com</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business_Card_4</name>
+		<file>buscard4/buscard4.sla.gz</file>
+		<tnail>buscard4/Business_Card_4tn.png</tnail>
+		<img>buscard4/Business_Card_4.png</img>
+		<psize>custom, 252x144</psize>
+		<color>RGB</color>
+		<descr></descr>
+		<usage></usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-22</date>
+		<author>vectorportal.com</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business_Card_5</name>
+		<file>buscard5/buscard5.sla.gz</file>
+		<tnail>buscard5/Business_Card_5tn.png</tnail>
+		<img>buscard5/Business_Card_5.png</img>
+		<psize>custom, 252x144</psize>
+		<color>RGB</color>
+		<descr></descr>
+		<usage></usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-22</date>
+		<author>vectorportal.com</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business_Card_6</name>
+		<file>buscard6/buscard6.sla.gz</file>
+		<tnail>buscard6/Business_Card_6tn.png</tnail>
+		<img>buscard6/Business_Card_6.png</img>
+		<psize>custom, 252x144</psize>
+		<color>RGB</color>
+		<descr></descr>
+		<usage></usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-22</date>
+		<author>vectorportal.com</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business_Card_7</name>
+		<file>buscard7/buscard7.sla.gz</file>
+		<tnail>buscard7/Business_Card_7tn.png</tnail>
+		<img>buscard7/Business_Card_7.png</img>
+		<psize>custom, 252x144</psize>
+		<color>RGB</color>
+		<descr></descr>
+		<usage></usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-22</date>
+		<author>vectorportal.com</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business_Card_8</name>
+		<file>buscard8/buscard8.sla.gz</file>
+		<tnail>buscard8/Business_Card_8tn.png</tnail>
+		<img>buscard8/Business_Card_8.png</img>
+		<psize>custom, 252x144</psize>
+		<color>RGB</color>
+		<descr></descr>
+		<usage></usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-22</date>
+		<author>vectorportal.com</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business_Card_9</name>
+		<file>buscard9/buscard9.sla.gz</file>
+		<tnail>buscard9/Business_Card_9tn.png</tnail>
+		<img>buscard9/Business_Card_9.png</img>
+		<psize>custom, 252x144</psize>
+		<color>RGB</color>
+		<descr></descr>
+		<usage></usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-22</date>
+		<author>vectorportal.com</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business_Card_10</name>
+		<file>buscard10/buscard10.sla.gz</file>
+		<tnail>buscard10/Business_Card_10tn.png</tnail>
+		<img>buscard10/Business_Card_10.png</img>
+		<psize>custom, 252x144</psize>
+		<color>RGB</color>
+		<descr></descr>
+		<usage></usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-22</date>
+		<author>vectorportal.com</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business_Card_11</name>
+		<file>buscard11/buscard11.sla.gz</file>
+		<tnail>buscard11/Business_Card_11tn.png</tnail>
+		<img>buscard11/Business_Card_11.png</img>
+		<psize>custom, 252x144</psize>
+		<color>RGB</color>
+		<descr></descr>
+		<usage></usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-22</date>
+		<author>vectorportal.com</author>
+		<email></email>
+	</template>
 </templates>

Modified: branches/ScribusOIF/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/scribus/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/scribus/CMakeLists.txt (original)
+++ branches/ScribusOIF/scribus/CMakeLists.txt Sun Oct 24 14:52:36 2010
@@ -88,7 +88,7 @@
   ui/nftdialog.ui
   ui/nftwidget.ui
   ui/pageitemattributes.ui
-  ui/paintmanager.ui
+  ui/paintmanagerbase.ui
   ui/patterndialog.ui
   ui/picsearch.ui
   ui/picsearchoptions.ui

Modified: branches/ScribusOIF/scribus/plugins/barcodegenerator/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/scribus/plugins/barcodegenerator/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/scribus/plugins/barcodegenerator/CMakeLists.txt (original)
+++ branches/ScribusOIF/scribus/plugins/barcodegenerator/CMakeLists.txt Sun Oct 24 14:52:36 2010
@@ -36,4 +36,6 @@
   DESTINATION ${SHAREDIR}/plugins
 )
 
+ADD_DEPENDENCIES(${SCRIBUS_BARCODEGENERATOR_PLUGIN} ${EXE_NAME})
+
 # SET_TARGET_PROPERTIES(${SCRIBUS_BARCODEGENERATOR_PLUGIN} PROPERTIES VERSION "0.0.0")

Modified: branches/ScribusOIF/scribus/plugins/barcodegenerator/barcodegenerator.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/scribus/plugins/barcodegenerator/barcodegenerator.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/barcodegenerator/barcodegenerator.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/barcodegenerator/barcodegenerator.cpp Sun Oct 24 14:52:36 2010
@@ -218,7 +218,7 @@
 
 void BarcodeGenerator::bgColorButton_pressed()
 {
-	paintManagerDialog d(this, &ScCore->primaryMainWindow()->doc->docGradients, ScCore->primaryMainWindow()->doc->PageColors, "", QStringList(), ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow());
+	PaintManagerDialog d(this, &ScCore->primaryMainWindow()->doc->docGradients, ScCore->primaryMainWindow()->doc->PageColors, "", QStringList(), ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow());
 	if (!d.exec())
 		return;
 	bgColor = d.selectedColor();
@@ -229,7 +229,7 @@
 
 void BarcodeGenerator::lnColorButton_pressed()
 {
-	paintManagerDialog d(this, &ScCore->primaryMainWindow()->doc->docGradients, ScCore->primaryMainWindow()->doc->PageColors, "", QStringList(), ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow());
+	PaintManagerDialog d(this, &ScCore->primaryMainWindow()->doc->docGradients, ScCore->primaryMainWindow()->doc->PageColors, "", QStringList(), ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow());
 	if (!d.exec())
 		return;
 	lnColor = d.selectedColor();
@@ -240,7 +240,7 @@
 
 void BarcodeGenerator::txtColorButton_pressed()
 {
-	paintManagerDialog d(this, &ScCore->primaryMainWindow()->doc->docGradients, ScCore->primaryMainWindow()->doc->PageColors, "", QStringList(), ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow());
+	PaintManagerDialog d(this, &ScCore->primaryMainWindow()->doc->docGradients, ScCore->primaryMainWindow()->doc->PageColors, "", QStringList(), ScCore->primaryMainWindow()->doc, ScCore->primaryMainWindow());
 
 	if (!d.exec())
 		return;

Modified: branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&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 Sun Oct 24 14:52:36 2010
@@ -1609,7 +1609,7 @@
 			newSection.reversed = attrs.valueAsBool("Reversed");
 			newSection.active = attrs.valueAsBool("Active");
 			if (attrs.hasAttribute("FillChar"))
-				newSection.pageNumberFillChar = attrs.valueAsString("FillChar").at(0);
+				newSection.pageNumberFillChar = QChar(attrs.valueAsInt("FillChar"));
 			else
 				newSection.pageNumberFillChar = QChar();
 			if (attrs.hasAttribute("FieldWidth"))

Modified: branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp Sun Oct 24 14:52:36 2010
@@ -845,7 +845,7 @@
 		docu.writeAttribute("Start", (*it).sectionstartindex);
 		docu.writeAttribute("Reversed", (*it).reversed);
 		docu.writeAttribute("Active", (*it).active);
-		docu.writeAttribute("FillChar", (*it).pageNumberFillChar);
+		docu.writeAttribute("FillChar", (*it).pageNumberFillChar.unicode());
 		docu.writeAttribute("FieldWidth", (*it).pageNumberWidth);
 	}
 	docu.writeEndElement();

Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Sun Oct 24 14:52:36 2010
@@ -9886,7 +9886,7 @@
 		edc = prefsManager->colorSet();
 	}
 	undoManager->setUndoEnabled(false);
-	paintManagerDialog *dia = new paintManagerDialog(this, Gradients, edc, prefsManager->colorSetName(), prefsManager->appPrefs.colorPrefs.CustomColorSets, doc, this);
+	PaintManagerDialog *dia = new PaintManagerDialog(this, Gradients, edc, prefsManager->colorSetName(), prefsManager->appPrefs.colorPrefs.CustomColorSets, doc, this);
 	if (dia->exec())
 	{
 		if (HaveDoc)

Modified: branches/ScribusOIF/scribus/ui/paintmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/scribus/ui/paintmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/paintmanager.cpp (original)
+++ branches/ScribusOIF/scribus/ui/paintmanager.cpp Sun Oct 24 14:52:36 2010
@@ -35,6 +35,7 @@
 #include "dcolor.h"
 #include "fileloader.h"
 #include "gradientaddedit.h"
+#include "loadsaveplugin.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "query.h"
@@ -53,7 +54,7 @@
 
 #include <QDebug>
 
-paintManagerDialog::paintManagerDialog(QWidget* parent, QMap<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QStringList custColSet, ScribusDoc *doc, ScribusMainWindow *scMW) : QDialog(parent)
+PaintManagerDialog::PaintManagerDialog(QWidget* parent, QMap<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QStringList custColSet, ScribusDoc *doc, ScribusMainWindow *scMW) : QDialog(parent)
 {
 	setupUi(this);
 	setModal(true);
@@ -106,11 +107,13 @@
 	editButton->setEnabled(false);
 	duplicateButton->setEnabled(false);
 	deleteButton->setEnabled(false);
-	buttonRemoveAll->setEnabled(false);
 	deleteUnusedButton->setEnabled(false);
 	updateGradientList();
 	updateColorList();
+	dataTree->expandItem(colorItems);
+	dataTree->expandItem(gradientItems);
 	connect(dataTree, SIGNAL(itemClicked(QTreeWidgetItem*, int)), this, SLOT(itemSelected(QTreeWidgetItem*)));
+	connect(dataTree, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), this, SLOT(selEditColor(QTreeWidgetItem*)));
 	connect(newButton, SIGNAL(clicked()), this, SLOT(createNew()));
 	connect(editButton, SIGNAL(clicked()), this, SLOT(editColorItem()));
 	connect(duplicateButton, SIGNAL(clicked()), this, SLOT(duplicateColorItem()));
@@ -123,7 +126,7 @@
 	connect(LoadColSet, SIGNAL(activated(const QString &)), this, SLOT(loadDefaults(const QString&)));
 }
 
-QTreeWidgetItem* paintManagerDialog::updateGradientList(QString addedName)
+QTreeWidgetItem* PaintManagerDialog::updateGradientList(QString addedName)
 {
 	QList<QTreeWidgetItem*> lg = gradientItems->takeChildren();
 	for (int a = 0; a < lg.count(); a++)
@@ -160,7 +163,7 @@
 	return ret;
 }
 
-QTreeWidgetItem* paintManagerDialog::updateColorList(QString addedName)
+QTreeWidgetItem* PaintManagerDialog::updateColorList(QString addedName)
 {
 	QList<QTreeWidgetItem*> lg = colorItems->takeChildren();
 	for (int a = 0; a < lg.count(); a++)
@@ -182,7 +185,26 @@
 	return ret;
 }
 
-void paintManagerDialog::itemSelected(QTreeWidgetItem* it)
+void PaintManagerDialog::selEditColor(QTreeWidgetItem *it)
+{
+	if ((it) && (!paletteLocked))
+	{
+		if ((it->parent() == colorItems) || (it->parent() == gradientItems))
+		{
+			QString curCol = it->text(0);
+			ScColor tmpColor = m_colorList[curCol];
+			bool enableDel  = (curCol != "Black" && curCol != "White" && !tmpColor.isRegistrationColor()) && (m_colorList.count() > 1);
+			bool enableEdit = (curCol != "Black" && curCol != "White" && !tmpColor.isRegistrationColor());
+			duplicateButton->setEnabled(curCol != "Registration");
+			deleteButton->setEnabled(enableDel);
+			editButton->setEnabled(enableEdit);
+			if(enableEdit)
+				editColorItem();
+		}
+	}
+}
+
+void PaintManagerDialog::itemSelected(QTreeWidgetItem* it)
 {
 	if ((it) && (!paletteLocked))
 	{
@@ -190,11 +212,23 @@
 		{
 			importButton->setEnabled(false);
 			newButton->setEnabled(true);
-			editButton->setEnabled(true);
-			duplicateButton->setEnabled(true);
-			deleteButton->setEnabled(true);
-			buttonRemoveAll->setEnabled(true);
 			deleteUnusedButton->setEnabled(it->parent() == colorItems);
+			if (it->parent() == colorItems)
+			{
+				QString curCol = it->text(0);
+				ScColor tmpColor = m_colorList[curCol];
+				bool enableDel  = (curCol != "Black" && curCol != "White" && !tmpColor.isRegistrationColor()) && (m_colorList.count() > 1);
+				bool enableEdit = (curCol != "Black" && curCol != "White" && !tmpColor.isRegistrationColor());
+				duplicateButton->setEnabled(curCol != "Registration");
+				deleteButton->setEnabled(enableDel);
+				editButton->setEnabled(enableEdit);
+			}
+			else
+			{
+				editButton->setEnabled(true);
+				duplicateButton->setEnabled(true);
+				deleteButton->setEnabled(true);
+			}
 		}
 		else
 		{
@@ -202,8 +236,7 @@
 			newButton->setEnabled(true);
 			editButton->setEnabled(false);
 			duplicateButton->setEnabled(false);
-			deleteButton->setEnabled(false);
-			buttonRemoveAll->setEnabled(it->childCount() > 0);
+			deleteButton->setEnabled(it->childCount() > 0);
 			deleteUnusedButton->setEnabled((it == colorItems) && (it->childCount() > 0));
 		}
 	}
@@ -214,13 +247,12 @@
 		editButton->setEnabled(false);
 		duplicateButton->setEnabled(false);
 		deleteButton->setEnabled(false);
-		buttonRemoveAll->setEnabled(false);
 		deleteUnusedButton->setEnabled(false);
 		dataTree->clearSelection();
 	}
 }
 
-void paintManagerDialog::createNew()
+void PaintManagerDialog::createNew()
 {
 	if (paletteLocked)
 		return;
@@ -268,7 +300,7 @@
 	}
 }
 
-void paintManagerDialog::editColorItem()
+void PaintManagerDialog::editColorItem()
 {
 	if (paletteLocked)
 		return;
@@ -333,7 +365,7 @@
 	}
 }
 
-void paintManagerDialog::duplicateColorItem()
+void PaintManagerDialog::duplicateColorItem()
 {
 	if (paletteLocked)
 		return;
@@ -402,7 +434,7 @@
 	}
 }
 
-void paintManagerDialog::removeColorItem()
+void PaintManagerDialog::removeColorItem()
 {
 	if (paletteLocked)
 		return;
@@ -411,42 +443,79 @@
 	{
 		if ((it->parent() == gradientItems) || (it == gradientItems))
 		{
-			dialogGradients.remove(it->text(0));
-			replaceMap.insert(it->text(0), "");
+			if (it == gradientItems)
+			{
+				int t = QMessageBox::warning(this, CommonStrings::trWarning, tr("Do you really want to clear all your gradients?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+				if (t == QMessageBox::No)
+					return;
+				replaceMap.clear();
+				for (QMap<QString, VGradient>::Iterator it = dialogGradients.begin(); it != dialogGradients.end(); ++it)
+				{
+					replaceMap.insert(it.key(), "");
+				}
+				dialogGradients.clear();
+			}
+			else
+			{
+				dialogGradients.remove(it->text(0));
+				replaceMap.insert(it->text(0), "");
+			}
 			updateGradientList();
 			itemSelected(0);
 		}
 		else if ((it->parent() == colorItems) || (it == colorItems))
 		{
-			QString dColor = it->text(0);
-			DelColor *dia = new DelColor(this, m_colorList, dColor, (m_doc!=0));
-			if (dia->exec())
-			{
-				QString replacementColor(dia->getReplacementColor());
-				if (replacementColor == CommonStrings::tr_NoneColor)
-					replacementColor = CommonStrings::None;
-				if (replaceColorMap.values().contains(dColor))
-				{
-					QMap<QString,QString>::Iterator itt;
-					for (itt = replaceColorMap.begin(); itt != replaceColorMap.end(); ++itt)
+			if (it == colorItems)
+			{
+				int t = QMessageBox::warning(this, CommonStrings::trWarning, tr("Do you really want to clear all your colors and gradients?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+				if (t == QMessageBox::No)
+					return;
+				replaceMap.clear();
+				for (QMap<QString, VGradient>::Iterator it = dialogGradients.begin(); it != dialogGradients.end(); ++it)
+				{
+					replaceMap.insert(it.key(), "");
+				}
+				replaceColorMap.clear();
+				for (ColorList::Iterator it = m_colorList.begin(); it != m_colorList.end(); ++it)
+				{
+					replaceColorMap.insert(it.key(), "Black");
+				}
+				dialogGradients.clear();
+				m_colorList.clear();
+				m_colorList.ensureBlackAndWhite();
+			}
+			else
+			{
+				QString dColor = it->text(0);
+				DelColor *dia = new DelColor(this, m_colorList, dColor, (m_doc!=0));
+				if (dia->exec())
+				{
+					QString replacementColor(dia->getReplacementColor());
+					if (replacementColor == CommonStrings::tr_NoneColor)
+						replacementColor = CommonStrings::None;
+					if (replaceColorMap.values().contains(dColor))
 					{
-						if (itt.value() == dColor)
-							itt.value() = replacementColor;
+						QMap<QString,QString>::Iterator itt;
+						for (itt = replaceColorMap.begin(); itt != replaceColorMap.end(); ++itt)
+						{
+							if (itt.value() == dColor)
+								itt.value() = replacementColor;
+						}
 					}
-				}
-				replaceColorMap.insert(dColor, replacementColor);
-				m_colorList.remove(dColor);
-				updateGradientColors(replacementColor, dColor);
-				updateGradientList();
-				updateColorList();
-				itemSelected(0);
-			}
-			delete dia;
-		}
-	}
-}
-
-void paintManagerDialog::removeUnusedColorItem()
+					replaceColorMap.insert(dColor, replacementColor);
+					m_colorList.remove(dColor);
+					updateGradientColors(replacementColor, dColor);
+				}
+				delete dia;
+			}
+			updateGradientList();
+			updateColorList();
+			itemSelected(0);
+		}
+	}
+}
+
+void PaintManagerDialog::removeUnusedColorItem()
 {
 	if (paletteLocked)
 		return;
@@ -493,7 +562,7 @@
 	}
 }
 
-void paintManagerDialog::importColorItems()
+void PaintManagerDialog::importColorItems()
 {
 	QTreeWidgetItem* it = dataTree->currentItem();
 	if (it)
@@ -558,7 +627,7 @@
 	}
 }
 
-ColorList paintManagerDialog::getGradientColors()
+ColorList PaintManagerDialog::getGradientColors()
 {
 	ColorList colorList;
 	QMap<QString,VGradient>::Iterator itg;
@@ -574,7 +643,7 @@
 	return colorList;
 }
 
-void paintManagerDialog::updateGradientColors(QString newName, QString oldName)
+void PaintManagerDialog::updateGradientColors(QString newName, QString oldName)
 {
 	QMap<QString,VGradient>::Iterator itg;
 	for (itg = dialogGradients.begin(); itg != dialogGradients.end(); ++itg)
@@ -592,7 +661,7 @@
 	}
 }
 
-void paintManagerDialog::loadGimpFormat(QString fileName)
+void PaintManagerDialog::loadGimpFormat(QString fileName)
 {
 	QFile f(fileName);
 	if (f.open(QIODevice::ReadOnly))
@@ -712,7 +781,7 @@
    */
 }
 
-void paintManagerDialog::addGimpColor(QString &colorName, double r, double g, double b)
+void PaintManagerDialog::addGimpColor(QString &colorName, double r, double g, double b)
 {
 	ScColor lf = ScColor();
 	bool found = false;
@@ -741,7 +810,7 @@
 	}
 }
 
-void paintManagerDialog::loadScribusFormat(QString fileName)
+void PaintManagerDialog::loadScribusFormat(QString fileName)
 {
 	QFile f(fileName);
 	if(!f.open(QIODevice::ReadOnly))
@@ -822,7 +891,7 @@
 	}
 }
 
-void paintManagerDialog::loadDefaults(const QString &txt)
+void PaintManagerDialog::loadDefaults(const QString &txt)
 {
 	int c = LoadColSet->currentIndex();
 	setCurrentComboItem(LoadColSet, txt);
@@ -891,7 +960,7 @@
 	itemSelected(0);
 }
 
-void paintManagerDialog::saveDefaults()
+void PaintManagerDialog::saveDefaults()
 {
 	QString Cpfad = QDir::convertSeparators(ScPaths::getApplicationDataDir());
 	QString Name = LoadColSet->currentText();
@@ -965,12 +1034,12 @@
 	}
 }
 
-QString paintManagerDialog::getColorSetName()
+QString PaintManagerDialog::getColorSetName()
 {
 	return LoadColSet->currentText();
 }
 
-ScColor paintManagerDialog::selectedColor()
+ScColor PaintManagerDialog::selectedColor()
 {
 	QTreeWidgetItem* it = dataTree->currentItem();
 	if (it)
@@ -981,7 +1050,7 @@
 	return ScColor();
 }
 
-QString paintManagerDialog::selectedColorName()
+QString PaintManagerDialog::selectedColorName()
 {
 	QTreeWidgetItem* it = dataTree->currentItem();
 	if (it)

Modified: branches/ScribusOIF/scribus/ui/paintmanager.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/scribus/ui/paintmanager.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/paintmanager.h (original)
+++ branches/ScribusOIF/scribus/ui/paintmanager.h Sun Oct 24 14:52:36 2010
@@ -25,7 +25,7 @@
 ***************************************************************************/
 #ifndef PAINTMANAGER_H
 #define PAINTMANAGER_H
-#include "ui_paintmanager.h"
+#include "ui_paintmanagerbase.h"
 #include "colorsetmanager.h"
 #include "sccolor.h"
 #include "scribusapi.h"
@@ -33,13 +33,13 @@
 #include "scribus.h"
 #include "vgradient.h"
 
-class SCRIBUS_API paintManagerDialog : public QDialog, Ui::paintManager
+class SCRIBUS_API PaintManagerDialog : public QDialog, Ui::PaintManagerBase
 {
 	Q_OBJECT
 
 	public:
-		paintManagerDialog(QWidget* parent, QMap<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QStringList custColSet, ScribusDoc *doc, ScribusMainWindow* scMW);
-		~paintManagerDialog() {};
+		PaintManagerDialog(QWidget* parent, QMap<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QStringList custColSet, ScribusDoc *doc, ScribusMainWindow* scMW);
+		~PaintManagerDialog() {};
 		/*! \brief Returns the name of the current/selected color set.
 		\retval QString selected name. */
 		QString getColorSetName();
@@ -63,6 +63,7 @@
 		QStringList customColSet;
 		bool hasImportedColors;
 	private slots:
+		void selEditColor(QTreeWidgetItem *it);
 		void itemSelected(QTreeWidgetItem* it);
 		void createNew();
 		void editColorItem();

Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15636&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.vcproj Sun Oct 24 14:52:36 2010
@@ -12253,7 +12253,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\scribus\ui\ui_paintmanager.h"
+				RelativePath="..\..\scribus\ui\ui_paintmanagerbase.h"
 				>
 			</File>
 			<File
@@ -13691,7 +13691,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\scribus\ui\paintmanager.ui"
+				RelativePath="..\..\scribus\ui\paintmanagerbase.ui"
 				>
 			</File>
 			<File




More information about the scribus-commit mailing list