r15754 by jghali - merge trunk revisions up to r15740

scribus-commit scribus-commit at lists.scribus.net
Wed Nov 3 22:23:22 CET 2010


Author: jghali
Date: Wed Nov  3 21:23:22 2010
New Revision: 15754

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

Added:
    branches/ScribusOIF/doc/en/images/insert-frame-1.png
      - copied unchanged from r15740, trunk/Scribus/doc/en/images/insert-frame-1.png
    branches/ScribusOIF/doc/en/images/insert-frame-2.png
      - copied unchanged from r15740, trunk/Scribus/doc/en/images/insert-frame-2.png
    branches/ScribusOIF/doc/en/images/mpage1.png
      - copied unchanged from r15740, trunk/Scribus/doc/en/images/mpage1.png
    branches/ScribusOIF/doc/en/images/mpage2.png
      - copied unchanged from r15740, trunk/Scribus/doc/en/images/mpage2.png
    branches/ScribusOIF/doc/en/images/mpage3.png
      - copied unchanged from r15740, trunk/Scribus/doc/en/images/mpage3.png
    branches/ScribusOIF/doc/en/images/mpage4.png
      - copied unchanged from r15740, trunk/Scribus/doc/en/images/mpage4.png
    branches/ScribusOIF/doc/en/images/mpage5.png
      - copied unchanged from r15740, trunk/Scribus/doc/en/images/mpage5.png
    branches/ScribusOIF/doc/en/images/numb-sections.png
      - copied unchanged from r15740, trunk/Scribus/doc/en/images/numb-sections.png
    branches/ScribusOIF/doc/en/images/scribus-os2.png
      - copied unchanged from r15740, trunk/Scribus/doc/en/images/scribus-os2.png
    branches/ScribusOIF/doc/en/images/table-import-1.png
      - copied unchanged from r15740, trunk/Scribus/doc/en/images/table-import-1.png
    branches/ScribusOIF/doc/en/images/table-import-2.png
      - copied unchanged from r15740, trunk/Scribus/doc/en/images/table-import-2.png
    branches/ScribusOIF/doc/en/images/table-import-3.png
      - copied unchanged from r15740, trunk/Scribus/doc/en/images/table-import-3.png
Removed:
    branches/ScribusOIF/doc/en/images/pagenumbering.png
    branches/ScribusOIF/scribus/ui/colorm.cpp
    branches/ScribusOIF/scribus/ui/colorm.h
    branches/ScribusOIF/scribus/ui/gradientmanager.cpp
    branches/ScribusOIF/scribus/ui/gradientmanager.h
    branches/ScribusOIF/scribus/ui/gradientmanager.ui
Modified:
    branches/ScribusOIF/doc/en/images/htmlstyle.png
    branches/ScribusOIF/doc/en/images/oogettext1.png
    branches/ScribusOIF/doc/en/importhints3.html
    branches/ScribusOIF/doc/en/pagenumber.html
    branches/ScribusOIF/doc/en/pagetemplate1.html
    branches/ScribusOIF/doc/en/readme-os2.html
    branches/ScribusOIF/doc/en/specs.html
    branches/ScribusOIF/scribus/canvasgesture_rulermove.cpp
    branches/ScribusOIF/scribus/scribus.cpp
    branches/ScribusOIF/scribus/scribusview.cpp
    branches/ScribusOIF/scribus/serializer.cpp
    branches/ScribusOIF/scribus/ui/guidemanager.cpp
    branches/ScribusOIF/scribus/ui/hruler.cpp

Modified: branches/ScribusOIF/doc/en/images/htmlstyle.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/doc/en/images/htmlstyle.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/doc/en/images/oogettext1.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/doc/en/images/oogettext1.png
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/doc/en/importhints3.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/doc/en/importhints3.html
==============================================================================
--- branches/ScribusOIF/doc/en/importhints3.html (original)
+++ branches/ScribusOIF/doc/en/importhints3.html Wed Nov  3 21:23:22 2010
@@ -1,60 +1,87 @@
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-	<title>Scribus and OpenOffice.org</title>
+	<title>Scribus and OpenOffice.org/OpenDocument</title>
 </head>
 <body>
-<h2>Scribus and OpenOffice.org</h2>
+<h2>Scribus and OpenOffice.org/OpenDocument</h2>
+
 <h4>Overview</h4>
-<p>The open and XML based file formats (.sxw and .odt etc.) used by OpenOffice.org in all versions, share some common traits with Scribus. The clear documentation and specs have helped the Scribus Team to create very useful import features. Expect more enhancements in the future. One of the pleasant surprises to see in the OpenOffice.org version 2 releases is the improved EPS exporter. The 1.1.x version sometimes had difficulties exporting correctly.  The exporter in V 2.x in testing here seems to create better, more conformant files, which Scribus imports with little difficulties. Except for OpenOffice.org Writer files, the magic trick to get high quality imports into Scribus depends on using OO.org Draw. Almost any type of OpenOffice.org file can be imported into Scribus with high fidelity, provided you export from Draw as EPS. Native Draw files can usually be imported directly into Scribus. </p>
-<h4>Importing from OpenOffice.org Writer</h4>
-<p>The importer for Writer imports <strong>only</strong> the text contained in your document. Images and drawings need to be saved separately outside of the Writer document and then each drawing or image is then imported individually. Thus, a compound Writer document with tables of charts will not import the tables or charts. Tables, charts or other embedded objects, need to be placed into their own Draw file and exported by the methods described below.</p>
-<p>The singular most important issue to take into consideration for hassle free OO.org Writer import is well chosen usage and correctly applying styles in OO.org. Doing so will greatly reduce the amount of time needed within Scribus to format and style text. Any special paragraph styles in your Writer file will automatically be imported into your existing Scribus document.</p>
-<h4>Step by Step:</h4>
+<p>When SUN Microsystems started the OpenOffice.org project, it also introduced a new type of file format. While OpenOffice.org&rsquo;s predecessor StarOffice used a binary format to store its data, OpenOffice.org&rsquo;s file format consisted of several XML files that were combined into a ZIP archive. Later, OpenOffice.org&rsquo;s file formats provided the basis for a new international standard for office documents, such as text documents, spreadsheet or presentations. The standard has been developed by the <a href="http://www.oasis-open.org/home/index.php">Organization for the Advancement of Structured Information Standards (OASIS)</a>, and it&rsquo;s called <a href="http://www.oasis-open.org/specs/index.php#opendocument">OpenDocument</a> (ODT). OpenDocument has become an ISO standard in 2006 (ISO/IEC 26300:2006).
+<br>
+The clear documentation and specs have helped the Scribus Team to create some useful import features, which will be enhanced in the future.</p>
+<h4>Importing OpenOffice.org Writer and OpenDocument files</h4>
+<p>The importer for Writer (SXW) and ODT documents works per text frame and imports <i>only</i> the text contained in your document. Images and drawings need to be saved separately outside of the Writer document and then each drawing or image can be imported individually. Thus, a compound Writer document with tables or charts will not import the latter. Tables, charts or other embedded objects, need to be placed into their own Draw file and exported as described below.</p>
+<p>The single most important issue to take into consideration for hassle-free SXW/ODT import is well chosen usage of styles in Writer or any other ODT-compliant word processor. Doing so will greatly reduce the amount of time needed within Scribus to format and style text. Any special paragraph styles in your Writer or ODT file will automatically be imported into your existing Scribus document.</p>
+
+<h4>SXW/ODT import step by step</h4>
+<ol>
+<li>Select the text frame.</li>
+<li>Right-click > Get Text ...  </li>
+<li>Select your SXW/ODT document.</li>
+</ol>
+
+<p>This will import <i>all</i> the text from the source document, so ensure there is enough space in your frame or link extra text frames to the one you are importing into. You can comfortably import 10, 20 or even 50 pages of text in one go. However, the practical limit is probably not more than a chapter&rsquo;s (15&ndash;30 pages) worth of text for performance reasons.</p>
+<h4>Let Scribus create text frames for you</h4>
+<p>If you have an idea how many text frames you will need for the imported text, you can use an advanced import option. You can find it in the &ldquo;Insert&rdquo; menu, and it&rsquo;s called <i>Frame&nbsp;...</i>.</p>
+<p>The &ldquo;Insert Frame&rdquo; dialog consists of four tabs. In the first one you have to select &ldquo;Text Frame&rdquo; in this context. In the second tab, &ldquo;Location&rdquo;, you can determine the pages, on which the new frames will be placed, as well as their position on a page.</p>
+
+<table width="100%"><tr><td align="center"><img src="images/insert-frame-1.png" alt="The &ldquo;Insert Frame&rdquo; dialog, tab 1" align="middle" title="The &ldquo;Insert Frame&rdquo; dialog, tab 1" /></td></tr></table>
+
+<p>In the third tab, &ldquo;Size&rdquo;, you can set the size of the frames that are being inserted, and in the &ldquo;Options&rdquo; tab you determine what&rsquo;s inside the frame and how it will look:</p>
+
+<table width="100%"><tr><td align="center"><img src="images/insert-frame-2.png" alt="The &ldquo;Insert Frame&rdquo; dialog, tab 4" align="middle" title="The &ldquo;Insert Frame&rdquo; dialog, tab 4" /></td></tr></table>
+<p>
 <ul>
-<li>Select the text frame.</li>
-<li>Right Click > Get Text..  </li>
-<li>Select your OO.org document. The importer is smart enough to know recognize the type of OO.org file.</li>
- </ul>
+<li><b>Columns</b>: The number of text columns in the frame.</li>
+<li><b>Gap</b>: The gap between the text columns.</li>
+<li><b>Link inserted frames</b> does exactly what it says.</li>
+<li><b>Links to existing frame</b> lets you link the first of the newly created frames to an already existing frame. You can choose the latter from a drop down list that contains all existing frames, sorted by their name.</li>
+<li><b>Source Document:</b> Here can you choose the text document whose content will fill the new frames.</li>
+</ul>
+</p>
 
-<p>This will import <strong>all</strong> the text in your document, so ensure there is enough space in your frames or link extra text frames on subsequent pages. You can comfortably import 10, 20 or even 50 pages of text in one go. In testing the importer we have imported 600 pages. However, the practical limit is probably not more than a chapter's (15&#8211;30 pages) worth of text for performance reasons.</p>
+<h4>SXW/ODT import options</h4>
 
 <p> When importing text from OO.org there are three important options which need to be carefully considered:</p>
 
-<table width="100%"><tr><td align="center"><img src="images/oogettext1.png" alt="Import Options for OO.org Writer and OASIS (Open Document) files." align="middle" title="Import Options for OO.org Writer and OASIS (Open Document) files." /></td></tr></table>
+<table width="100%"><tr><td align="center"><img src="images/oogettext1.png" alt="Import Options for OO.org Writer and OASIS (Open Document) files." align="middle" title="Import Options for SXW and ODT files." /></td></tr></table>
 
 <ul>
-   <li><strong>Update Paragraph Styles</strong> This option will tell Scribus to change the formatting of any created styles in your Scribus document to follow those in the OO.org document. </li>
-   <li><strong>Merge Paragraph Styles</strong> This option looks at the actual attributes (fonts, size) of the OO.org and merges style which have common attributes. This can help to eliminate differently named, but similar styles.</li>
-   <li><strong>Use Document Name as a prefix for paragraph styles </strong> - is self-explanatory, but can be useful for sorting styles when importing from several documents. </li>
-<li><strong>Do Not Ask Again</strong>  - <strong>Caution</strong> This last option will make this permanent until you completely remove your preferences files. This will be fixed in a future release. <!--reset it in File &#062; Preferences &#062; permanent these options.--></li>
+   <li><b>Overwrite Paragraph Styles</b> This option will tell Scribus to change the formatting of any created styles in your Scribus document to follow those in the imported document. </li>
+   <li><b>Merge Paragraph Styles</b> This option looks at the actual attributes (fonts, size) of the imported document and merges styles which have identical attributes. This can help to eliminate differently named, but otherwise identical styles.</li>
+   <li><b>Use Document Name as a prefix for paragraph styles</b> is self-explanatory. This can be useful for sorting styles when importing from several documents. </li>
+<li><b>Do Not Ask Again</b>  Caution! This last option will make your choices above permanent. The only way to undo this is to open the file <code>prefs135.xml</code> in the hidden folder <code>./scribus</code> in your home directory with a text editor, then search for the text string <code>attribute key"=ask-Again" value=0</code> and replace the 0 with 1.</li>
  </ul>
 
 
 
-<h4>Importing Charts and Tables from Calc </h4>
-<p>This is a special case which needs to be done carefully. After you have created your Chart or Table in Calc, then <strong>Copy > Paste Special </strong> and embed the chart <strong>not</strong> as a GDI image, but as a linked object into a Draw Document, like below:</p>
+<h4>Importing Tables from Calc </h4>
+<p>Since Scribus&rsquo;s table implementation is rather simple, it may be more convenient to create a table in a dedicated spreadsheet application like OpenOffice.org Calc. Here&rsquo;s a step-by-step instruction for successful table import from Calc:</p>
 
-<table width="100%"><tr><td align="center"><img src="images/oochart.png" alt="Embedding a Chart in to OO.org Draw" align="middle" title="Embedding a Chart in to OO.org Draw" /></td></tr></table>
+<p>1. Create your table in either OpenOffice.org Calc:</p>
 
-<p>After placing the linked object, import using one of the two methods below.</p>
+<table width="100%"><tr><td align="center"><img src="images/table-import-1.png" align="middle"/></td></tr></table>
 
-<h4>Importing Native OO.org Draw Files</h4>
-<p>There are two methods: First is to use the native importer. For most drawings this works very well and I have tested very complex Draw files which imported flawlessly. In some cases, especially with gradients, it may be preferable to test exporting EPS, with the settings further down. The second method is to export EPS from OO.org. You should test both methods of export for best quality not only on screen, but by exporting a PDF and then zooming with Adobe Acrobat Reader is a recommended quality check.</p>
+<p>2. Copy the table items you need in Scribus (i.e., not the whole spreadheet) to the clipboard, create a new OpenOffice.org Draw document, and use <i>Edit > Paste Special > GDI Metafile</i> to insert the table as a vector file into Draw: </p>
+<table width="100%"><tr><td align="center"><img src="images/table-import-2.png" align="middle"/></td></tr></table>
 
-<ul>
-   <li>  It is important to note Draw 3D objects do not export well, as they are limited to screen resolution. They do not print well in most cases and will appear pixellated at print resolutions.  </li>
-   <li>Not all shapes in OO.org Draw 2.x are supported. Contours and callouts do not currently work natively. The workaround is to go <strong>Edit > Select All</strong> in Draw and then right click the selection, then choose <strong>Convert to Curves or Convert to Polygons</strong> depending on the kind of content.</li>
-   <li>Most curves, polygons and bezier shapes are imported without issues. The same applies for star shapes, ellipses and markers - a type of line with arrows. </li>
-   <li>Text effects should be avoided in preference to doing them natively in Scribus which has very versatile text effects.  </li>
- </ul>
+<p>3. Use <i>File > Export</i> to export the table as an EPS file. Make sure that &ldquo;Selection&rdquo; is checked in the export dialog, because otherwise the whole page will be exported. </p>
+<p>4. Now import the EPS file as a vector drawing into Scribus via <i>File > Import > Get Vector File</i>. The result will be a nicely formatted table in Scribus that can be edited using Scribus&rsquo;s vector tools:</p>
 
-<h4>Importing Formulas</h4>
-<p>The most reliable way I have found is to save your formula as desired and Close Math. Then open OO.org Draw and create a new file. Then, <strong>Insert Object > Formula</strong>. You will have a tiny embedded square on Draw's canvas. Then, right click the embedded object > <strong>Edit Object</strong>. Then, Draw will launch Math. In Math, select <strong>Tools > Import Formula</strong> and browse to your saved formula. Then save to close the file and the embedded formula is now scalable in Draw with the context menus. Save this Draw file, then export as EPS and import into Scribus. The formulas and text will import as a grouped objects as scalable vector items. Any text is imported as outlines as well. This will result in formulas which will print with <strong>very</strong> high quality and little worries when exported as PDF. Saving the Draw file and attempting to import the Draw file with embedded objects will fail, as Scribus cannot access those object directly.</p>
-<h4>Export Settings from OO.org Draw</h4>
-<p>Below are the recommended EPS export settings for all versions of OO.org Draw.</p>
-<table width="100%"><tr><td align="center"><img src="images/ooeps1.png" alt="Recommended EPS Export Settings" align="middle" title="Recommended EPS Export Settings" /></td></tr></table>
+<table width="100%"><tr><td align="center"><img src="images/table-import-3.png" align="middle"/></td></tr></table>
 
-<p>Using the settings above and a recent Ghostscript (8.50+), I have encountered only minor difficulties importing files from OpenOffice.org. Even then, ungrouping the import and minor touching up is easily done. The most noticeable issue I have found is some lines on charts or freehand lines are too thin when viewed as imported EPS in Scribus and a quick adjustment of the size of the line with the Properties Palette sets things right.</p>
+<h4>Importing SXD and ODG graphics files</h4>
+<p>There are two methods: The first is to use the native importer. For many drawings this works very well. In some cases, especially with gradients, it may be preferable to test exporting as EPS or SVG.</p>
+
+<p>It is important to note that Draw 3D objects do not export well, as they are limited to screen resolution. They also do not print well in most cases and will appear pixellated at print resolutions. Moreover, not all shapes and certain kinds of lines, like, for instance, connectors, are supported by the Scribus import filter.</p>
+<p>In case you need any of the above, there&rsquo;s a reliable workaround: Like almost any program that allows for printing, OpenOffice.org provides an option to print to a file instead of sending the data to a printer. Simply go to <i>File > Print</i> in OpenOffice.org and check the &ldquo;Print to File&rdquo; option. On Linux/UNIX and Mac OS X this will create a PostScript file.</p>
+
+<p>On Windows and OS/2 you have to install a PostScript printer driver (e.g. Apple Color Laser Writer) first. When you are asked to insert a name for the file you will print to, make sure you select or add "ps" as the file extension.</p>
+
+<p>Next you can open the file or import it as a vector file into Scribus. This time, the content looks almost if not 100&nbsp;% like the original. Even low-resolution 3D graphics have smooth edges now.</p>
+
+<h4>Importing SXM and ODF formulas</h4>
+<p>The most reliable way is to create a formula In OpenOffice.org Math and save it as SXM or ODF. Then open OpenOffice.org Draw and create a new file. Use <i>Insert Object > Formula</i>. You will have a tiny embedded square on Draw&rsquo;s canvas. Next, open <i>Edit Object</i> from the context menu. Draw will now launch Math. In Math, select <i>Tools > Import Formula</i>, browse to your saved formula and save to close the file. The embedded formula is now editable as a vector object. Save this Draw file, then export as EPS and import into Scribus. The formulas and text will import as scalable vector items. This will result in formulas which will print with <b>very</b> high quality and no worries when exported as PDF. Saving the Draw file and attempting to import the Draw file with embedded objects will fail, as Scribus cannot access those objects directly.</p>
 </body>
 </html>

Modified: branches/ScribusOIF/doc/en/pagenumber.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/doc/en/pagenumber.html
==============================================================================
--- branches/ScribusOIF/doc/en/pagenumber.html (original)
+++ branches/ScribusOIF/doc/en/pagenumber.html Wed Nov  3 21:23:22 2010
@@ -4,22 +4,29 @@
 	<title>Automatic Page Numbers</title>
 </head>
 <body>
-<h2>Automatic Page Numbering</h2>
+<h2>Automatic page numbering</h2>
 
-<p>Adding automatically incrementing page numbers is a two step process, but, once mastered, quite simple and reliable. There are two different methods which can be used independently or together. The first is to draw a text frame, click to get into edit mode and then go: <strong>Insert > Character > Insert Page Number</strong>. This will only add the page number to the currently selected page. The second uses Master Pages to enable automatic page numbering.</p>
+<p>Adding automatically incrementing page numbers is not as easy as, for example, in a word processor, but, once mastered, it&rsquo;s quite simple and reliable. Moreover, when it comes to mixed numbering schemes, like I, II, III for the preface, 1, 2, 3 for the main text and A, B, C for appendices, it&rsquo;s actually much easier to use than a word processor.</p>
+<p>As you already know, almost everything in Scribus has to happen in a frame, and page numbers are no different. Thus, to insert a page number, we need to create a text frame first. Once we have entered the editing mode of the frame, we can insert a <i>variable</i> for the page number, which will tell Scribus to insert the actual page number. There are two different ways to insert this variable, the first one being the keyboard shortcut Ctrl+Alt+Shift+P. If you&rsquo;re afraid to break your fingers, you can assign a new shortcut in the Preferences dialog or use the menu command <i>Insert > Character > Page Number</i>. You can now see that Scribus shows the number of the current page, but this approach may not be what you want to achieve, as it will only add the page number to the currently selected page. If you want to automate the page numbering (also called &ldquo;pagination&rdquo;), you should insert the variable into a text frame on a <a href="pagetemplate1.html">Maste!
 r Page</a>. As you will note, Scribus doesn&rsquo;t display a real number on a Master Page, because a Master Page isn&rsquo;t a real document page and thus doesn&rsquo;t have a position in the sequence of pages. Instead, Scribus displays <b>#</b> as a placeholder symbol.</p>
 
-<p>Scribus uses a special place holder within <a href="pagetemplate1.html">Master Pages</a> to indicate page numbers and allows them to be automatically included in your document without concern for moving, importing or deleting pages. </p>
+<h4>Changing the numbering scheme</h4>
 
-<h4>Step One</h4>
+<p>To change the numbering scheme, you have to use <i>File > Document Setup</i>. Under <i>Sections</i> you can now create numbering sections for your document:</p>
 
-<p>With your chosen document open, go <strong>Edit > Master Pages</strong>. If you have not created any other Master Pages, then there will be just one named "Normal." </p>
-<h4>Step Two</h4>
-<p>Next, create a text frame where you want the page numbers to go. Then, enter the edit mode by double clicking on the text frame and insert a page number as described above. In Scribus versions before 1.3.4, you need to create different master pages for one, two or three digit page numbers, whereas from 1.3.4 on, a single placeholder will suffice. Then save the Master Page by closing the Master Pages dialog and return to the main document.</p>
+<table width="100%"><tr><td align="center"><img src="images/numb-sections.png" title="Numbering sections" alt="Numbering sections"  /></td></tr></table>
 
-<table width="100%"><tr><td align="center"><img src="images/pagenumbering.png" title="Inserting Page Number placeholders." alt="Inserting Page Number placeholders"  /></td></tr></table>
+<p>Let&rsquo;s assume you have an introduction that covers the first three pages, and you want it to be numbered with Roman numbers. The main text will start at the physical page 5 with page number 1. For aesthetical reasons, page 4 shouldn&rsquo;t have a number at all. The first section is already there. You can enter a name for it in the &ldquo;Name&rdquo; column. In the &ldquo;From&rdquo; column enter &ldquo;1&rdquo; and in &ldquo;To&rdquo; enter &ldquo;3&rdquo;. Choose &ldquo;I, II, III&rdquo; as a numbering style and set the &ldquo;Start&rdquo; value to &ldquo;1&rdquo;.</p>
+<p>To add a new section, click on the &ldquo;Add&rdquo; button at the bottom of the dialog. For page 4 in our example the values would be: &ldquo;From&rdquo; = 4, &ldquo;To&rdquo; = 4, &ldquo;Style&rdquo; and &ldquo;Start&rdquo; don&rsquo;t matter here, but it&rsquo;s important that you uncheck &ldquo;Shown&rdquo; in the second column, because this means there will be no visible page number on page 4. For the main text, the values are: &ldquo;From&rdquo; = 5, &ldquo;To&rdquo; = [the number of pages you need for the main text], &ldquo;Style&rdquo; = 1, 2, 3, and &ldquo;Start&rdquo; = 1. That&rsquo;s all, your document will be paginated as desired.</p>
 
-<p>If you have more than one Master Page, you will need to add these placeholders to each Master Page that is expected to show a page number.</p>
+<h4>Page numbering tips</h4>
+<p><ul>
+<li>If you have more than one Master Page, you will need to add these placeholders to each Master Page that is expected to show a page number.</li>
+<li>To make sure that every page number is exactly at the same position on each Master Page, you should first create a Master Page that satifies your layout requirements and then duplicate it.</li>
+<li>If you are working with larger documents, make sure that the text frames are wide enough to display all digits. Otherwise, there will be a text overflow, and the page number remains invisible.</li>
+<li>You can apply styles and direct text formatting as you wish, just like with a normal text frame.</li>
+<li>In European language publications page counting always starts on a right page, i.e., page 1 must be a right page.</li>
+<li>It is considered good style and a sign of quality that in books, which are written in a European language, new chapters always start on a right page, i.e., a page with an odd page number.</li>
+</ul></p>
 
-<p>You can also apply styles and direct text formatting as you wish, just like a normal text frame. </p>
 </body>
 </html>

Modified: branches/ScribusOIF/doc/en/pagetemplate1.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/doc/en/pagetemplate1.html
==============================================================================
--- branches/ScribusOIF/doc/en/pagetemplate1.html (original)
+++ branches/ScribusOIF/doc/en/pagetemplate1.html Wed Nov  3 21:23:22 2010
@@ -1,46 +1,59 @@
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-	<title>Master Pages - Using the Page Palette</title>
+	<title>Working with Master Pages</title>
 </head>
 <body>
 	
-<h3>Master Pages - Using the Page Palette</h3>
+<h2>Working with Master Pages</h2>
 
-<p>Master Pages are the means to add content to pages which have repeating content like page numbers, chapter names, section heads and the like. Users of other page layout applications might be familiar with the concept of <em>master pages</em> or static page backgrounds. Fundamental to understanding how they work is they are not editable from the normal page canvas. All items except page numbers are static background items.</p>
+<p>Master Pages are the means to add content to pages which have repeating content like page numbers, chapter names, section heads and the like. Users of other page layout applications might be familiar with this concept of a6 static page backgrounds. Fundamental to understanding how they work is that these pages are not editable from the normal page canvas. All items except page numbers are static background items.</p>
 
-<p>Thoughtful creation of master pages and styles combine can vastly simplify and speed up laying out documents - the more complex, the more they are essential. The first and probably most common use is adding the ability to automatically add page numbers. Let's start there:</p>
+<p>Thoughtful creation of master pages can vastly simplify and speed up the creation of complex documents &ndash; the more complex, the more essential they are. There are several reasons to use Master Pages, among them the ability to automatically add <a href="pagenumber.html">page numbers</a> or avoiding the hassle of inserting objects that are repeatedly used in the same place over and over again.</p>
 
-<h4>Adding Automatic Page Numbers</h4>
-<p>It is actually is quite simple. Go to <strong>Edit > Master Pages</strong>, then create a text frame where you want the page number to appear. Then, in edit mode, enter Alt+#. (US Keyboard users, are recommended to re-map this key to F7 for example.) Save the template and return to the main document.</p>
+<h4>Creating Master Pages</h4>
+<p>There are basically two ways to create a Master Page. The most obvious is to create a new one from scratch, which is actually is quite simple: Go to <i>Edit > Master Pages</i>. This will bring up the Master Page dialog:</p>
 
-<h4>Page Palette</h4>
+<table width="100%"><tr><td align="center"><img src="images/mpage1.png" title="Page Palette" alt="Page Palette" align="center" /></td></tr></table>
 
+<p>As you can see, Master Pages have already been automatically created when you created the new document. How many and what kind of Master Page depends on the document layout you chose: Single-page layouts have one Master Page, double-sided layouts two etc. It is generally a good idea not to touch the &ldquo;Normal&rdquo; Master Pages and create new ones instead.</p>
+<p> The Master Page dialog shown above offers four options, from left to right:
+<ul>
+<li><b>Add new Master Page</b>: If you click on this icon, a new dialog pops up. Here you have to enter a name for the new Master Page. Depending on your document layout, you also have to determine the Master Page category (e.g. left page, right page). Clicking OK will create your new Master Page, and you can edit this page immediately.</li>
+<b>Duplicate Master Page</b>: This will create a copy of the Master Page you have selected in the dialog. Since a new Master Page is created that way, you will also see the prompt to insert a name. Copying a Master Page is helpful if you are working with documents that use a mostly identical design and only vary in details. Thus, you can create a basic design and create duplicates, in which only the changing details are modified.</li>
+<li><b>Import Master Pages</b>: Clicking this button brings up a file dialog, in which you need to select a Scribus file. After selecting a file and clicking &ldquo;OK&rdquo;, Scribus will open a new dialog that allows you to select a Master Page from the document for import into Scribus. This feature is most useful when you have split a large project into several smaller files (which is always recommended), as you don't have to create a new Master Page for each project file.<br>
+<table width="100%"><tr><td align="center"><img src="images/mpage2.png" title="Page Palette" alt="Page Palette" align="center" /></td></tr></table></li>
+<li><b>Delete Master Page</b>: This will delete the Master Page you have selected in the file dialog. If the Master Page is already in use, you will be asked for a replacement.</li>
+</ul>
+</p>Another way to create a new Master Page is to convert an existing page into a Master Page via <i>Page > Convert to Master Page</i>. As with any new Master Page you will be asked to insert a name for the new page, as well as determining the category. If you check the option &ldquo;Copy Applied Master Page Items&rdquo;, the Master Page that is applied to the current page will be merged with the latter into one new Master Page. Otherwise, only the items on the &ldquo;real&rdquo; page become part of the new Master Page.</p>
+<table width="100%"><tr><td align="center"><img src="images/mpage3.png" title="Page Palette" alt="Page Palette" align="center" /></td></tr></table>
 
-<p>The page palette give you a fast, drag and drop way of applying page templates, navigating pages, moving and inserting pages. The top half of the palette has the available templates for your document. The lower half has the actual pages within your document.</p>
+<h4>Applying Master Pages</h4>
+<p>As with creating Master Pages, there are also several ways to apply them.</p>
 
-<table width="100%"><tr><td align="center"><img src="images/pagetemplate1.png" title="Page Palette" alt="Page Palette" align="center" /></td></tr></table>
+<h5>The Page Menu</h5>
+<p>The most obvious way to apply a Master Page is via <i>Page > Apply Master Page</i>, which will bring up the following dialog:</p>
+<table width="100%"><tr><td align="center"><img src="images/mpage4.png" title="Page Palette" alt="Page Palette" align="center" /></td></tr></table>
+<p>In the dropdown list at the top of the dialog you can choose the Master Page you want to apply.</p>
+<p>The options below let you choose the range of pages to which the selected Master Page will be applied:
+<ul>
+<li>Current page</li>
+<li>Even pages (i.e. in most cases left pages)</li>
+<li>Odd pages (i.e. in most cases right pages)</li>
+<li>All pages</li>
+<li>A range of pages.</li>
+</ul>
+</p>
+<h5>The Page Palette</h5>
+<p>The Page Palette (<i>Windows > Arrange Pages</i>) gives you a fast, drag-and-drop way of applying Master Pages, navigating pages, moving and inserting pages. The top half of the palette shows the available Master Pages in your document. By right-clicking on a listed Master Page item you can activate a thumbnail preview of the available Master Pages. The lower half has the actual pages within your document. Applying a Master Page is done by dragging a Master Page list item onto a page in the lower half.</p>
 
+<table width="100%"><tr><td align="center"><img src="images/mpage5.png" title="Page Palette" alt="Page Palette" align="center" /></td></tr></table>
 
-<p>You can do the following within the Page Palette:</p><ul>
-<li>Insert a page by dragging a master page from the master page area to the page layout area. When the area shows a horizontal bar, release the left mouse button.</li>
-<li>Apply a master page by dragging a template and dropping on the selected page.</li>
-<li>Delete a page or template by dragging them to the trash bin.</li>
-<li>Move pages by dragging and dropping them in between pages. When the horizontal bar appears release the left mouse button.</li>
-<li>Navigate by left clicking on the page will move the canvas to that page.</li>
-<li>You can switch thumbnails in the template area by right clicking in the template area and un-checking Show Thumbnails.</li>
-<li>Double clicking a master page switches you into edit master page mode for the selected master page.</ul></li>
+<br>
+<p><b><i>Important: Please note that Master Page items are always below any item on a regular page. It's impossible to move a Master Page item above a real page item in the stacking order.</i></b></p>
 
 
 
-<!--<p>Above is an example of how to use a template which allows you to have recurring objects on several pages. The template page is has a background of black tinted at 5% to simulate glossy grey paper with a faded logo in the background. The eliminates the time to recreate this on each page.
-</p>-->
-
-
-<h4>Apply Templates</h4>
-<p>Here you can apply a previously created page template size, gutter and other settings. Templates are specific to a document. This useful if you need a series of pages for example with a background on all pages or default text boxes for page numbering, headers or footers.</p>
-<p>When you think you might need to have several templates that might share the same features, a time saving method is to create a single template with all the features and then using the duplicate function to create variations of the original in place of creating each template from scratch..</p>
-<p>Another area where templates are helpful is the ability to import them from other documents. So, for example a book which has separate chapter files can import the same page templates from a common file.</p>
 
 </body>
 </html>

Modified: branches/ScribusOIF/doc/en/readme-os2.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/doc/en/readme-os2.html
==============================================================================
--- branches/ScribusOIF/doc/en/readme-os2.html (original)
+++ branches/ScribusOIF/doc/en/readme-os2.html Wed Nov  3 21:23:22 2010
@@ -1,48 +1,40 @@
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-	<title>Scribus on OS/2 and eComStation</title>
+	<title>Scribus on OS/2 &#174; and eComStation&#8482; </title>
 </head>
 <body>
-<h2>Scribus on OS/2 and eComStation</h2>
-Thanks to Paul Smedley, the Scribus Team is happy to provide a port of Scribus to OS/2 and its successor eComStation.
-
-<h2>Downloads</h2>
-<h3>Scribus 1.3.3.x Stable</h3>
-<p>The latest port of Scribus 1.3.3x is available from <a href="http://sourceforge.net/projects/scribus/files/scribus/">Sourceforge</a>. Please select the ZIP archive with "os2" in the file name for download. The archive contains a folder called "scribus," in which you find an installer called "scribus.exe".</p>
-<h3>Scribus 1.3.6+ Development</h3>
-<p>You can download a ZIP archive containing an installer for the development version either from</p>
-
-<p><a href="http://sourceforge.net/projects/scribus/files/scribus-devel/1.3.6/scribus-1.3.6-os2-20100329.zip/download">Sourceforge</a> or <a href="http://download.smedley.info/scribus-1.3.6-os2-20100329.zip">Paul Smedley's Unix Ports for OS/2 site</a>.</p>
-
-<h2>Other requirements</h2>
-<p>To run Scribus you need at least OS/2 Warp 4 or eComStation. Scribus will not run on older versions of OS/2.</p>
-<p>In addition, please note that you need to install the following software:</p>
-
-<ul>
-<li>A copy of libc063.dll, which can currently be downloaded from <a href="ftp://ftp.netlabs.org/pub/gcc/libc-0.6.3-csd3.zip">ftp://ftp.netlabs.org/pub/gcc/libc-0.6.3-csd3.zip</a> and gcc434.dll, which can be downloaded from <a href="http://download.smedley.info/gcc434.zip">http://download.smedley.info/gcc434.zip</a>. Both files need to copied to C:\OS2\DLL (OS/2) or C:\ECS\DLL (eComStation).</li>
-
-<li>Ghostscript and Python 2.6 (available from <a href="http://os2ports.smedley.info">http://os2ports.smedley.info</a>) are required to support some functionality. For instance, Python scripts won't work if Python is missing. The print preview and EPS import will not work if Ghostscript isn't available.
-
-If Scribus doesn't detect Ghostscript automatically, you can set the path to the GS exectutable (called "gsos2.exe") in the Scribus Preferences under "External Tools."
-</li>
-
-<li>Scribus 1.3.6 or later also requires the Qt4 GA dll's that can be downloaded as a WarpIn package from <a href="http://svn.netlabs.org/qt4">http://svn.netlabs.org/qt4</a></li>.
-</ul>
-
-<h2>Known issues</h2>
-<ul>
-<li>Printing support to "normal" OS/2 printers is not complete, but PDF export is. You can easily print via Acrobat Reader or another PDF viewer as a temporary workaround.</li>
-<li>Printing to CUPS printers is supported. <i>File > Print</i> will detect all available CUPS printers.</li>
-</ul>
-
-<h2>Credits</h2>
+<h2>Scribus on OS/2 Warp4&#0174; and eComStation&#0153;</h2>
 
 <p>The Scribus Team is much obliged to Paul Smedley for taking pains over porting Scribus to the OS/2 and eComStation platforms.</p>
+
 <p>The Scribus Team also wants to thank <a href="http://www.serenity-systems.com/">Serenity Systems</a> for supporting development and testing of the OS/2 and eComStation port.</p>
-<br>
-<p>If you like this software and want to support continued ports, please consider donating via PayPal via the link at <a href="http://smedley.info/os2ports">http://smedley.info/os2ports</a>, or via the Mensys online store at <a href="http://www.mensys.net/os2ports">http://www.mensys.net/os2ports</a>.</p>
 
+<table width="100%"><tr><td align="center"><img src="images/scribus-os2.png" alt="Scribus on eComStation"  title="Scribus on eComStation" /></td></tr></table>
+
+<h4>Requirements</h4>
+
+<p>In addition to the installer, the following requirements have to be met:
+<ul>
+<li>A copy of libc063.dll, which can currently be downloaded from ftp://ftp.netlabs.org/pub/gcc/libc-0.6.3-csd3.zip, and gcc434.dll, which can be downloaded from http://download.smedley.info/gcc434.zip. Both files need to copied to C:\OS2\DLL (OS/2) or C:\ECS\DLL (eComStation).</li>
+<li>Ghostscript and Python 2.6 (available from http://os2ports.smedley.info) are required to support some functionality. For instance, Python scripts won&rsquo;t work if Python is missing. The print preview and EPS import will not work if Ghostscript isn&rsquo;t available.</li>
+<li>It also requires the Qt4 GA dll&rsquo;s that can be downloaded as a WarpIn package from http://svn.netlabs.org/qt4</li>
+</ul>
+</p>
+
+<h4>Known issues</h4>
+<p>
+<ul>
+<li>Printing support is not complete, but PDF export is. You can easily print via Acrobat Reader or another PDF viewer as a temporary workaround.</li>
+<li>As for Acrobat/Adobe Reader on OS/2, please read the detailed hints in the <a href="toolbox1.html">toolbox section</a>.</li>
+</ul>
+</p>
+
+<h4>A Special Note to OS/2 and eComStation Users</h4>
+
+<p>General feedback can be provided to paul at smedley.info and via the normal Scribus communications methods (IRC, mailing list etc). Bug reports should go to http://bugs.scribus.net.</p>
+<p>If you like this software and want to support continued OS/2 ports, please consider donating via PayPal via the link at http://smedley.info/os2ports, or via the Mensys online store at http://www.mensys.net/os2ports.</p>
 <p>You can also sponsor/support the <a href="http://www.mensys.com/NetlabsQT4">Qt4 for OS/2 project</a> &ndash; without the Netlabs Qt4 project, this port could not exist!</p>
+
 </body>
 </html>

Modified: branches/ScribusOIF/doc/en/specs.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/doc/en/specs.html
==============================================================================
--- branches/ScribusOIF/doc/en/specs.html (original)
+++ branches/ScribusOIF/doc/en/specs.html Wed Nov  3 21:23:22 2010
@@ -38,7 +38,7 @@
 <li>Configurable hyphenator.</li>
 <li> Short Words plug-in to avoid undesirable line breaks.</li>
 </ul>
-<h3>Text editing</h3>
+<h3>Text Editing</h3>
 <ul>
 <li>Integrated Text Editor for quick text editing.</li>
 <li>Search and Replace for text and text formatting.</li>

Modified: branches/ScribusOIF/scribus/canvasgesture_rulermove.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/scribus/canvasgesture_rulermove.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvasgesture_rulermove.cpp (original)
+++ branches/ScribusOIF/scribus/canvasgesture_rulermove.cpp Wed Nov  3 21:23:22 2010
@@ -181,6 +181,7 @@
 						m_guide = mousePointDoc.y() - m_doc->Pages->at(page)->yOffset();
 						m_page  = page;
 						m_haveGuide = true;
+						m_doc->changed();
 					}
 				}
 				else if (mouseRelease)
@@ -193,11 +194,12 @@
 						m_doc->Pages->at(page)->guides.addHorizontal(mousePointDoc.y() - m_doc->Pages->at(page)->yOffset(), GuideManagerCore::Standard);
 						m_page = page;
 					}
+					m_doc->changed();
 				}
 				else
 				{
-					QCursor* cursor = qApp->overrideCursor();
-					if (cursor && (cursor->shape() != Qt::SplitVCursor))
+					QCursor* cursor = qApp->overrideCursor();
+					if (cursor && (cursor->shape() != Qt::SplitVCursor))
 						qApp->changeOverrideCursor(QCursor(Qt::SplitVCursor));
 				}
 				m_currentGuide = mousePointDoc.y() - m_doc->Pages->at(page)->yOffset();
@@ -211,6 +213,7 @@
 					{
 						m_doc->Pages->at(m_page)->guides.deleteHorizontal( m_guide, GuideManagerCore::Standard);
 						m_haveGuide = false;
+						m_doc->changed();
 					}
 				}
 			}
@@ -232,6 +235,7 @@
 						m_guide = mousePointDoc.x() - m_doc->Pages->at(page)->xOffset();
 						m_page  = page;
 						m_haveGuide = true;
+						m_doc->changed();
 					}
 				}
 				else if (mouseRelease)
@@ -244,11 +248,12 @@
 						m_doc->Pages->at(page)->guides.addVertical(mousePointDoc.x() - m_doc->Pages->at(page)->xOffset(), GuideManagerCore::Standard);
 						m_page = page;
 					}
+					m_doc->changed();
 				}
 				else
 				{
-					QCursor* cursor = qApp->overrideCursor();
-					if (cursor && (cursor->shape() != Qt::SplitHCursor))
+					QCursor* cursor = qApp->overrideCursor();
+					if (cursor && (cursor->shape() != Qt::SplitHCursor))
 						qApp->changeOverrideCursor(QCursor(Qt::SplitHCursor));
 				}
 				m_currentGuide = mousePointDoc.x() - m_doc->Pages->at(page)->xOffset();
@@ -262,6 +267,7 @@
 					{
 						m_doc->Pages->at(m_page)->guides.deleteVertical( m_guide, GuideManagerCore::Standard);
 						m_haveGuide = false;
+						m_doc->changed();
 					}
 				}
 			}

Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Wed Nov  3 21:23:22 2010
@@ -1187,7 +1187,7 @@
 // 			scrActions["toolsAlignDistribute"]->toggle();
 // 		else
 		//Edit actions
-		if (currKeySeq == scrActions["editStyles"]->shortcut())
+/*		if (currKeySeq == scrActions["editStyles"]->shortcut())
 			scrActions["editStyles"]->toggle();
 		else
 		if (currKeySeq == scrActions["editUndoAction"]->shortcut() && scrActions["editUndoAction"]->isEnabled())
@@ -1206,8 +1206,8 @@
 		else
 		if (currKeySeq == scrActions["toolsZoomOut"]->shortcut())
 			scrActions["toolsZoomOut"]->activate(QAction::Trigger);
-		else
-			retVal=false;
+		else */
+		retVal=false;
 	}
 	else
 		retVal=false;

Modified: branches/ScribusOIF/scribus/scribusview.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/scribus/scribusview.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribusview.cpp (original)
+++ branches/ScribusOIF/scribus/scribusview.cpp Wed Nov  3 21:23:22 2010
@@ -264,7 +264,9 @@
 	//zoomDefaultToolbarButton->setText("1:1");
 	zoomDefaultToolbarButton->setIcon(QIcon(loadIcon("16/zoom-original.png")));
 	zoomOutToolbarButton->setIcon(QIcon(loadIcon("16/zoom-out.png")));
+	zoomOutToolbarButton->addAction(m_ScMW->scrActions["toolsZoomOut"]);
 	zoomInToolbarButton->setIcon(QIcon(loadIcon("16/zoom-in.png")));
+	zoomInToolbarButton->addAction(m_ScMW->scrActions["toolsZoomIn"]);
 	pageSelector = new PageSelector(this, Doc->Pages->count());
 	pageSelector->setFont(fo);
 	pageSelector->setFocusPolicy(Qt::ClickFocus);
@@ -311,8 +313,8 @@
 //	m_SnapCounter = 0;
 
 	Doc->regionsChanged()->connectObserver(this);
-	connect(zoomOutToolbarButton, SIGNAL(clicked()), this, SLOT(slotZoomOut()));
-	connect(zoomInToolbarButton, SIGNAL(clicked()), this, SLOT(slotZoomIn()));
+//	connect(zoomOutToolbarButton, SIGNAL(clicked()), this, SLOT(slotZoomOut()));
+//	connect(zoomInToolbarButton, SIGNAL(clicked()), this, SLOT(slotZoomIn()));
 	connect(zoomDefaultToolbarButton, SIGNAL(clicked()), this, SLOT(slotZoom100()));
 	connect(zoomSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setZoom()));
 	connect(pageSelector, SIGNAL(GotoPage(int)), this, SLOT(GotoPa(int)));

Modified: branches/ScribusOIF/scribus/serializer.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/scribus/serializer.cpp
==============================================================================
--- branches/ScribusOIF/scribus/serializer.cpp (original)
+++ branches/ScribusOIF/scribus/serializer.cpp Wed Nov  3 21:23:22 2010
@@ -144,14 +144,12 @@
 	addRule("/SCRIBUSFRAGMENT", Factory<Collection>());
 	addRule("/SCRIBUSFRAGMENT", Store<Collection>("<collection>"));
 
-	addRule("/SCRIBUSFRAGMENT/colors", MergeColors());
-	
-	addRule("/SCRIBUSFRAGMENT/colors/color", Factory<ScColor>());
-	addRule("/SCRIBUSFRAGMENT/colors/color", SetAttribute<ScColor, QString>( &ScColor::setNamedColor, "RGB" ));
-	addRule("/SCRIBUSFRAGMENT/colors/color", SetAttribute<ScColor, QString>( &ScColor::setNamedColor, "CMYK" ));
-	addRule("/SCRIBUSFRAGMENT/colors/color", SetAttributeWithConversion<ScColor, bool>( &ScColor::setSpotColor, "Spot", &parseBool ));
-	addRule("/SCRIBUSFRAGMENT/colors/color", SetAttributeWithConversion<ScColor, bool>( &ScColor::setRegistrationColor, "Register", &parseBool ));
-	addRule("/SCRIBUSFRAGMENT/colors/color", CollectColor());
+	addRule("/SCRIBUSFRAGMENT/color", Factory<ScColor>());
+	addRule("/SCRIBUSFRAGMENT/color", SetAttribute<ScColor, QString>( &ScColor::setNamedColor, "RGB" ));
+	addRule("/SCRIBUSFRAGMENT/color", SetAttribute<ScColor, QString>( &ScColor::setNamedColor, "CMYK" ));
+	addRule("/SCRIBUSFRAGMENT/color", SetAttributeWithConversion<ScColor, bool>( &ScColor::setSpotColor, "Spot", &parseBool ));
+	addRule("/SCRIBUSFRAGMENT/color", SetAttributeWithConversion<ScColor, bool>( &ScColor::setRegistrationColor, "Register", &parseBool ));
+	addRule("/SCRIBUSFRAGMENT/color", CollectColor());
 
 	CharStyle::desaxeRules("/SCRIBUSFRAGMENT/", *this);
 	addRule("/SCRIBUSFRAGMENT/charstyle", SetterP<Collection, CharStyle>( & Collection::collectCharStyle ));

Modified: branches/ScribusOIF/scribus/ui/guidemanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/scribus/ui/guidemanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/guidemanager.cpp (original)
+++ branches/ScribusOIF/scribus/ui/guidemanager.cpp Wed Nov  3 21:23:22 2010
@@ -312,6 +312,7 @@
 	currentPage->guides.clearHorizontals(GuideManagerCore::Standard);
 	currentPage->guides.addHorizontals(horizontalModel->values(), GuideManagerCore::Standard);
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::delVerButton_clicked()
@@ -330,6 +331,7 @@
 	currentPage->guides.clearVerticals(GuideManagerCore::Standard);
 	currentPage->guides.addVerticals(verticalModel->values(), GuideManagerCore::Standard);
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::addHorButton_clicked()
@@ -373,6 +375,7 @@
 		}
 	}
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::applyToAllStdButton_clicked()
@@ -395,12 +398,14 @@
 		horizontalAutoGapSpin->setEnabled(false);
 	currentPage->guides.setHorizontalAutoCount(val);
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::horizontalAutoGapSpin_valueChanged(double)
 {
 	currentPage->guides.setHorizontalAutoGap(value2pts(horizontalAutoGapSpin->value(), docUnitIndex));
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::horizontalAutoGapCheck_stateChanged( int )
@@ -411,6 +416,7 @@
 	else
 		currentPage->guides.setHorizontalAutoGap(0.0);
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::verticalAutoCountSpin_valueChanged(int val)
@@ -423,12 +429,14 @@
 		verticalAutoGapSpin->setEnabled(false);
 	currentPage->guides.setVerticalAutoCount(val);
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::verticalAutoGapSpin_valueChanged(double)
 {
 	currentPage->guides.setVerticalAutoGap(value2pts(verticalAutoGapSpin->value(), docUnitIndex));
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::verticalAutoGapCheck_stateChanged( int )
@@ -439,6 +447,7 @@
 	else
 		currentPage->guides.setVerticalAutoGap(0.0);
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::tabWidget_currentChanged(QWidget *)
@@ -528,6 +537,7 @@
 	trans.commit();
 
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::deleteAllGuides_clicked()
@@ -543,6 +553,7 @@
 	m_drawGuides = true;
 	trans.commit();
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::windowActivationChange(bool oldActive)
@@ -628,6 +639,7 @@
 	currentPage->guides.clearVerticals(GuideManagerCore::Standard);
 	currentPage->guides.addVerticals(verticalModel->values(), GuideManagerCore::Standard);
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::horizontalModel_valueChanged()
@@ -635,6 +647,7 @@
 	currentPage->guides.clearHorizontals(GuideManagerCore::Standard);
 	currentPage->guides.addHorizontals(horizontalModel->values(), GuideManagerCore::Standard);
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::setHorizontalRefer(int button)
@@ -721,6 +734,7 @@
 		return;
 	currentPage->guides.setVerticalAutoRefer(0);
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::verticalMarginsAutoButton_toggled(bool state)
@@ -729,6 +743,7 @@
 		return;
 	currentPage->guides.setVerticalAutoRefer(1);
 	drawGuides();
+	m_Doc->changed();
 }
 
 void GuideManager::verticalSelectionAutoButton_toggled(bool state)
@@ -739,4 +754,5 @@
 	if (verticalSelectionAutoButton->isEnabled())
 		resetSelectionForPage();
 	drawGuides();
-}
+	m_Doc->changed();
+}

Modified: branches/ScribusOIF/scribus/ui/hruler.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15754&path=/branches/ScribusOIF/scribus/ui/hruler.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/hruler.cpp (original)
+++ branches/ScribusOIF/scribus/ui/hruler.cpp Wed Nov  3 21:23:22 2010
@@ -336,7 +336,8 @@
 
 void Hruler::enterEvent(QEvent *e)
 {
-	qApp->changeOverrideCursor(QCursor(loadIcon("tab.png"), 3));
+	if (textEditMode)
+		qApp->changeOverrideCursor(QCursor(loadIcon("tab.png"), 3));
 }
 
 void Hruler::leaveEvent(QEvent *m)




More information about the scribus-commit mailing list