r15981 by jghali - merge trunk revisions up to r15980
scribus-commit
scribus-commit at lists.scribus.net
Thu Nov 25 00:22:04 CET 2010
Author: jghali
Date: Wed Nov 24 23:22:04 2010
New Revision: 15981
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15981
Log:
merge trunk revisions up to r15980
Added:
branches/ScribusOIF/doc/en/images/cmcanvas.png
- copied unchanged from r15980, trunk/Scribus/doc/en/images/cmcanvas.png
Modified:
branches/ScribusOIF/AUTHORS
branches/ScribusOIF/doc/en/about2.html
branches/ScribusOIF/doc/en/mouse.html
branches/ScribusOIF/doc/en/readme.html
branches/ScribusOIF/doc/en/toolbox5.html
branches/ScribusOIF/scribus/canvasmode_edit.cpp
branches/ScribusOIF/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
branches/ScribusOIF/scribus/ui/preferencesdialog.cpp
branches/ScribusOIF/scribus/ui/prefs_colormanagement.cpp
branches/ScribusOIF/scribus/ui/prefs_colormanagementbase.ui
branches/ScribusOIF/scribus/ui/search.cpp
branches/ScribusOIF/scribus/ui/stylemanager.cpp
Modified: branches/ScribusOIF/AUTHORS
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15981&path=/branches/ScribusOIF/AUTHORS
==============================================================================
--- branches/ScribusOIF/AUTHORS (original)
+++ branches/ScribusOIF/AUTHORS Wed Nov 24 23:22:04 2010
@@ -35,10 +35,11 @@
Elvis Stansvik elvstone at gmail.com
Michael Doubez michael.doubez at free.fr
Tomas Mecir mecirt at gmail.com
+Cezary Grabski
Mac OS® X Aqua Port:
-Andreas Vox avox at arcor.de
+Craig Bradney cbradney at zip.com.au
OS/2®/eComStation™ Port:
@@ -56,9 +57,10 @@
Peter Linnell mrdocs at scribus.info
Craig Bradney cbradney at zip.com.au
Frédéric Dubuy effediwhy at gmail.com
-Johannes Rüschel jo.rueschel at gmx.de
Volker Ribbert volkerius at h3c.de
Louis Desjardins louisdesjardins at videotron.ca
+Christoph Schäfer christoph at scribus.info
+Gregory Pittman gregp_ky at yahoo.com
Other Documentation:
Modified: branches/ScribusOIF/doc/en/about2.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15981&path=/branches/ScribusOIF/doc/en/about2.html
==============================================================================
--- branches/ScribusOIF/doc/en/about2.html (original)
+++ branches/ScribusOIF/doc/en/about2.html Wed Nov 24 23:22:04 2010
@@ -6,47 +6,30 @@
<body>
<h2>Scribus Basics</h2>
-<h3>Why Page Layout is different from Word Processing</h3>
+<h3>Why Page Layout is Different from Word Processing</h3>
-<p>What can you do with Scribus ? What is a "page layout" program ? </p>
-<p>Fundamentally, Scribus is <strong>not a word processor</strong>. This is a very important concept to understand. Scribus belongs to the family of applications known as page layout programs or more commonly known as Desktop Publishing programs. Scribus gives users great flexibility in placing objects like photos, logos, text frames and shapes in the exact place where you want them. This short guide is meant to give a first time user a sense of what Scribus can do. It is not meant to cover every feature, just a simple over view to get you started and being productive.</p>
+<p>What can you do with Scribus – and what is a “page layout” program? </p>
+<p>One thing you should be aware of is that Scribus, like almost all DTP programs, is very different from a word processor. It is very important to understand the fundamental difference! Scribus belongs to the family of applications known as page layout programs or more commonly known as Desktop Publishing (DTP) programs. These programs give users great flexibility in placing objects like photos, logos, text frames and shapes in the exact place where they want them. This short introduction, together with the <a href="qsg.html">Quick Start Guide</a>, is meant to give a first time user a sense of what Scribus can do and how to avoid mistakes.</p>
-<p>With Scribus you can:</p>
-<ul>
-<li>Create great looking documents including things like CD covers, greeting cards, company brochures, newsletters and posters. </li>
-<li>Create files which will print easily at your commercial printer.</li>
-<li>Create interactive PDF forms and presentation documents. What is interactive PDF? <!--Your looking at one.--> Interactive PDFs have special features like hyperlinks, annotations (non-printing notes), bookmarks – a kind of an automatically created index for your PDF, as well as special navigation features – just like a web browser.</li>
-<li>Create logos and drawings with Scribus' easy to use tools including the ability to create neat font effects.</li>
-<li>Import photos and other artwork with precise color control for high fidelity printing. </li>
-</ul>
-<h4>First the Theory – The Right Approach</h4>
-<p>First time users of page layout applications like Scribus can find starting out quite frustrating. The interface seems approachable and familiar enough, but when you make your beginning steps things often do not quite work as expected. Do not make the mistake of launching Scribus, opening a new document and expect to start typing. Making the most of an application like Scribus, requires a bit of understanding of the concepts of "workflow" in the page layout world. It might seem a bit arcane at first, but will pay off in the end.</p>
-<p>Part of the challenge of learning Scribus is you are often not just trying to learn a program, but learning page layout, which has its own sometimes subtle rules. There are stark differences from word processors or other text editors. Fortunately, Scribus comes with its own built-in Story Editor (SE). Using this instead of editing on the canvas, understanding the setup and application of styles will greatly enhance your productivity, as well as providing you with more consistent, easier to edit documents.</p>
-<p><i>Workflow</i>, means in the page layout world a way of assembling both the files to be used, but also some forethought on where and how your document will be printed or used. If for example, you were planning on creating a brochure for your business, you certainly would want to have it commercially printed. Thus, you would be sadly mistaken if you thought you could take the low resolution JPEG from your website and use them in Scribus directly. Web and print have two different objectives. <b><i>Graphics used on a website are almost always unusable for commercial printing.</i></b> You need <b>much</b> higher resolution graphics. File size should almost always be secondary to image quality when considering commercial print needs. A typical website image is 72–96 DPI , where for good print results, you need 200–300 DPI. Scribus can export PDF at <em>4000</em> DPI</p>
-<p>A Simple Page Layout Workflow:</p>
-<ol>
-<li>Make a simple sketch on paper of the basic layout. This helps to visualize how to mix text, artwork and images.</li>
-<li>Get images collected as needed, preferably high 200 DPI or higher saved as TIFFs or PNG. Get your artwork (illustrations or line art in a suitable import format. SVG or EPS are usually the best option.</li>
-<li>Write out the text in a word processor or text editor. Spell check, double check grammar, etc.</li>
-<li>Collect all these files in a project directory and start building your document in Scribus.</li>
-</ol>
-<p>In a commercial setting, this might be far more complex. In my experience, using similar methods will allow the planning and structure to make sense and greatly enhances productivity.</p>
-<p>Lastly, Workflow similarly takes into consideration the many options when exporting PDF or printing. There are extensive notes about this in the chapter <a href="pdflavor.html">PDF Export</a>. Scribus has many advanced printing features, which are atypical of desktop applications. Make sure <b>tooltips</b> are enabled, to get general guidance and/or read the <a href="print1.html">Printing Section</a> carefully to understand the options.
-</p>
-<p><!--For first time users, I would encourage you to launch Scribus while looking -->When reading through the parts of the documentation, especially some of the sections on more advanced topics,<!-- . Read everything once thoroughly. M-->make notes on what you do not understand, then post your questions to the mailing list or IRC.</p>
-<p>Before diving into a project, sometimes the best thing is to put the computer aside, get out a sketch pad and make a simple drawing how you want the doc to appear. I too have rediscovered pen and paper. On a recent vacation, lacking a computer at times, I discovered my lack of writing by hand has lead to very poor penmanship. Results, I wrote 8 complete pages in an afternoon, more than I might have written in three nights. Why? Because, I could only concentrate on content. I suggest you do the same. Scribus's real magic is the ability to assemble all the bits <i>at the end</i> to create your masterpiece.
-</p>
-<p>So, if text is going to be a big part of your document, start your favorite text editor or word processor and compose the text first. This way you can concentrate on content. This is where word processors sometimes work against you Note how often you can be distracted by editing done to affect the look, instead of the content. (I'm guilty too) I need not preach to the choir and explain the benefits of saving plain unformatted text. This, in the UNIX world is a given, but for migrating Windows/Mac users may not be the usual habit. Save plain text, you will be happy about this some day. Alternatively, you can import OpenOffice.org.org 1.x and 2.x (OASIS) text and or MS Word documents.</p>
-<p>Next, you will need to consider drawings, photos, tables etc., which might be a part of your doc.</p>
+<h3>The Final Assembly Line</h3>
+<p>First time users of page layout applications like Scribus can find starting out quite frustrating. The interface seems approachable and familiar enough, but when you make your beginning steps things often do not quite work as expected. Do not make the mistake of launching Scribus, opening a new document and expect to start typing, because it won’t work!</p>
+<p>You can compare a document that will be sent to a commercial printer or uploaded to the web to a car or a computer. Such a machine consists of thousands of parts, most of which haven’t even been produced by the car or computer manufacturer itself, but by suppliers. What the manufacturer does is assembling the parts into the final product, and that’s exactly the main purpose of a layout program: It’s the final assembly line of a document that is going to be published – most likely in print – hence the name “Desktop <i>Publishing</i>”.</p>
-<h4>Bitmap Images</h4>
-<p>Like photos that come from the GIMP, Krita, Adobe Photoshop or similar. They could also be images from a digital camera program like <a href="http://www.digikam.org/">digiKam</a> or a scanner application like <a href="http://www.xsane.org/">Xsane</a> or <a href="http://kooka.kde.org/">Kooka</a>. Bitmap images are composed of pixels or dots, typically compressed in a file format like JPEG, TIFF, PNG or bmp. For images in Scribus, I prefer and recommend either PNG for things like screen captures or TIFFs. TIFFs are generally very reliable in DTP and should be chosen for any kind of high resolution photos.</p>
-<h4>Vector Drawings or illustrations</h4><p>come from applications like Inkscape, OpenOffice.org Draw, Adobe Illustrator, CorelDraw, Sketch, or Xfig. These generate line drawings and other artwork which is kept in a vector format inways which preserve their appearance at any scale. It should be mentioned that vector files don't save dots, but coordinates which <em>describe</em> mathematically where to draw the lines or fill shapes. That's the reason why they can be scaled endlessly without loss of quality. The preferred way to import them into Scribus is via EPS (Encapsulated Post Script) or via SVG (Scalable Vector Graphics). The advantage of SVG is Scribus imports this into native editable objects and can re-edit almost every features in SVG. <!--The importer can import almost every type of SVG from the W3C test suite, excepting multimedia features and scripted actions for Win32 plug-ins in a browser.--></p>
-<h4>EPS/PS Importing</h4>
-<p>One of the reasons we recommend the latest Ghostscript is to enable the best possibility of importing EPS and PS vector files, which can then be edited natively as Scribus objects. This can be very useful for imports which need further changes and you do not have the original source files. </p>
-<h4>Importing PDF</h4>
-<p>One other way you can import files into Scribus is via PDF. Scribus will use Ghostscript to create a high resolution image with a lower resolution file for preview on screen. This is more appropriate for drawings and images versus text. If you need just the text from a PDF, you can open the file in Adobe Acrobat Reader or KPDF and copy and paste from the clipboard. Note: you can only import one page of a PDF at a time, and you cannot yet edit imported PDFs. </p>
-<p>Once you have assembled all these bits, it is time to begin working in Scribus. For previous users of desktop publishing, launching Scribus for the first time will seem comfortable and familiar.
-</p>
+<h3>Workflow</h3>
+<p>Manufacturing complex machines requires an enormous amount of planning: Resources like available plants and employees must be taken into consideration, as well as the materials required to build the machines. It also requires coordination with suppliers, since modern machines are made of complex parts, which are often tailored to the final product, and this, in turn, means that the suppliers, too, have to allocate resources, buy materials etc. The whole process of planning, coordination and production is called <b>workflow</b>, and if you remember that Desktop Publishing is the final assembly of visually complex documents, the process needs to be applied here as well.</p>
+
+<h4>Planning</h4>
+<p>It doesn’t matter whether you want to build a complex machine or create a complex layout – in both cases it often starts, quite literally, at the drawing board. Many products, including cars, have been first “created” on a sheet of paper. Thus, in design, it’s often a good idea to switch off the computer and to use a sketch block to outline your future layout.</p>
+<p>Since there are many inspiring designs for almost every purpose available, it’s often unnecessary to re-invent the wheel. Learning from the masters in the art will probably help you further with becoming creative yourself than anything else. It also helps to read a few books on page layout, typography or color theory – there are many available, and most of them are full of inspiring examples.</p>
+<p>Learning from existing examples is something different than copying a layout – it’s actually hard work, because you need to analyze a layout, for example by using a ruler to determine page margins, dimensions etc. If you’re serious about learning, you’ll learn quickly that a good ruler can be one of your most valuable tools.</p>
+<p>Once you think you have created a great layout on your drawing block, the analyzing doesn’t stop, quite the contrary! Part of the planning stage is to determine which parts of your layout are static and should become part of a <a href="pagetemplate1.html">Master Page</a>. You also need to find out which elements will be repeatedly used in different places of your layout, as you can store all those elements in a single directory that can be used as a Scrapbook folder etc.</p>
+<p>Layout considerations aside, there is another important aspect to your project planning, namely the other side of the assembly process, which, in our case, is commercial printing. It is <b>very</b> important to know what kind of files (e.g. PDF versions) a printer can handle, and if you plan to use <a href="color1.html">spot colors</a>, you should know in advance which colors the printer can reliably reproduce. All this information will influence the next stages of production on your side.</p>
+<h4>Preparing Your Suppliers</h4>
+<p>Just like a manufacturer of machines is coordinating with its suppliers to avoid frictions and hickups during the final assembly, you can avoid problems by providing guidelines to those who will produce the “components” of your layout (and if you do everything yourself, you can make some mental notes to avoid hassles down the road).</p>
+<p>For writers it should be clear which file formats are acceptable. Ideally, only a single file format should be used, and if that’s impossible, perhaps due to different software tools available, plain text files can be used as the lowest common denominator. Writers should also be advised to use consistent spelling, quotes, dashes etc.</p>
+<p>As for graphics files, you should figure out which <a href="importhints.html">file formats</a> work best for you and then ask contributors of graphics not to use anything else. You should also provide clear guidelines for the use of <a href="color1.html">spot colors</a>, image resolutions and <a href="cms.html">color profiles</a>.</p>
+<h4>Getting Ready to Work</h4>
+<p>From experience it can be told that the final layout should only be started when you have collected all the components you need, and that’s especially true for text. If an image needs color corrections it can be done with the layout in place, but changes to a text, like adding a line or even a paragraph can result in a <b>lot</b> of extra work, as the placement of graphics or captions needs to be adjusted. Thus, make sure that no surprises will happen down the line.</p>
+<p>Before you start your work, it’s alyways recommended to collect all project files in a single project directory, with subdirectories for text, vector graphics, image files and other file types you need for your project. Files that you want to re-use often should be moved into a single Scrapbook directory for use in Scribus. Once you’ve done all this, you are ready to go ...</p>
</body>
</html>
Modified: branches/ScribusOIF/doc/en/mouse.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15981&path=/branches/ScribusOIF/doc/en/mouse.html
==============================================================================
--- branches/ScribusOIF/doc/en/mouse.html (original)
+++ branches/ScribusOIF/doc/en/mouse.html Wed Nov 24 23:22:04 2010
@@ -6,37 +6,52 @@
<body>
<h2>Mouse Usage Hints</h2>
+<h3>View</h3>
<p>Mouse usage in Scribus has some subtle, but once learned, very useful shortcuts with the mouse.</p>
<ul>
-<li>Space Bar + Left Click - toggles panning mode for the mouse</li>
-<li>Click third button, or on two button mice ("chord" them by click left and right together), refreshes the view</li>
-<li>Ctrl - select an object beneath the currently selected one</li>
-<li>Shift - dont clear the selection but add to it</li>
-<li>Alt - allow selection of objects within groups</li>
-<li>Hence, Ctrl-Shift-Click is extends the selection with the item below the currently selected one beneath the cursor</li>
-<li>Ctrl-Click cycles through all objects at the position from top to bottom, finally deselecting all and then starting with the top again</li>
-<li>Ctrl-Alt-Click will include group members in the cycle</li>
-<li>Control left click resize/move for lower objects. Release + drag resizes. Hold down Control+Drag moves.</li>
-<li>Left Click >Drag Resizes Frames</li>
-<li>Right Click >Drag Copies or Moves Frames- a context menu will pop up asking your choice</li>
-<li>Ctrl >Wheel - Zooms the view in and out.</li>
-<li>Ctrl >Right Button Drag - Allows you to pan the document up or down and/or left to right depending on the zoom factor.</li>
+<li>Space Bar + Left Click – toggles panning mode for the mouse</li>
+<li>Click third button, or on two button mice (“chord” them by click left and right together), refreshes the view</li>
+<li>Ctrl > Wheel – zooms the view in and out.</li>
+<li>Ctrl > Right Button Drag – allows you to pan the document up or down and/or left to right depending on the zoom factor.</li>
+<li>Right Click – brings up the Context Menu for the document canvas as shown below.</li>
</ul>
-<h4>Working with the Color Eye Dropper</h4>
-<ul><li>Fill color with click</li>
-<li>Text color with Control click</li>
-<li>Line color with Alt click.</li></ul>
-<h4>In the Properties Palette</h4>
+<table width="100%"><tr><td align="center"><img src="images/cmcanvas.png" title="Context Menu for the document canvas" alt="Context Menu for the document canvas" /></td></tr></table><br />
+
+<h3>Items</h3>
<ul>
-<li>Ctrl +Wheel - Increases/Decreases units 10 at a time.</li>
-<li>Shift +Wheel - Increases/Decreases units 1/10 at a time.</li>
-<li>Ctrl +Shift +Wheel - Increases/Decreases units 1/100 at a time.</li>
+<li>Shift + Left Click – dont clear the selection but add to it</li>
+<li>Alt + Left Click – allow selection of objects within groups</li>
+<li>Hence, Ctrl + Shift + Left Click extends the selection with the item below the currently selected one beneath the cursor</li>
+<li>Ctrl + Left Click cycles through all objects at the position from top to bottom, finally deselecting all and then starting with the top again</li>
+<li>Ctrl+ Alt + Left Click will include group members in the cycle</li>
+<li>Control + Left Click resize/move for lower objects. Release + drag resizes. Hold down Control + Drag moves.</li>
+<li>Left Click > Drag resizes Frames</li>
+<li>Right Click > Drag copies or moves Frames – a context menu will pop up asking your choice</li>
</ul>
-<p>Alternatively:</p>
+
+<h3>Text Frames</h3>
<ul>
-<li>Shift + Arrow Key Increases/Decreases units 10 at a time.</li>
-<li>Crtl + Arrow Key Increases/Decreases units 1/10 at a time.</li>
+<li>Shift + Left Click – selects the text between cursor position and the click.</li>
+<li>Ctrl + Double Left Click – selects the current paragraph.</li>
+<li>Ctrl + Shift + Double Left Click – selects the current paragraph first, and subsequent clicks will add text between the selected paragraph and the click position to the selection.</li>
+</ul>
+
+<h3>The Color Eye Dropper</h3>
+Select a:
+<ul><li>fill color with Left Click</li>
+<li>text color with Ctrl + Left Click</li>
+<li>line color with Alt + Left Click.</li></ul>
+<h3>In the Properties Palette</h3>
+<ul>
+<li>Ctrl + Wheel – increases/decreases units 10 at a time.</li>
+<li>Shift + Wheel – increases/decreases units 1/10 at a time.</li>
+<li>Ctrl + Shift + Wheel – increases/decreases units 1/100 at a time.</li>
+</ul>
+<b>Alternatively:</b>
+<ul>
+<li>Shift + Arrow Key increases/decreases units 10 at a time.</li>
+<li>Crtl + Arrow Key increases/decreases units 1/10 at a time.</li>
</ul>
</body>
</html>
Modified: branches/ScribusOIF/doc/en/readme.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15981&path=/branches/ScribusOIF/doc/en/readme.html
==============================================================================
--- branches/ScribusOIF/doc/en/readme.html (original)
+++ branches/ScribusOIF/doc/en/readme.html Wed Nov 24 23:22:04 2010
@@ -36,6 +36,7 @@
<li>New Style Manager that allows for style hierarchies, cloned styles and style inheritance.</li>
<li>A new glyph selector that allows for the creation of glyph sets that can be shared between users.</li>
<li>Major improvements to the hyphenator.</li>
+<li>Optical margins to give the impression of a straighter edge with justified text by moving hyphens, commas and parts of certain glyphs slightly into the margin:</li>
</ul>
<br>
<table width="100%">
Modified: branches/ScribusOIF/doc/en/toolbox5.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15981&path=/branches/ScribusOIF/doc/en/toolbox5.html
==============================================================================
--- branches/ScribusOIF/doc/en/toolbox5.html (original)
+++ branches/ScribusOIF/doc/en/toolbox5.html Wed Nov 24 23:22:04 2010
@@ -1,20 +1,31 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>Ghostscript - Black Box Magic</title>
+ <title>Ghostscript – Black Box Magic</title>
</head>
<body>
-<h2>Ghostscript - Black Box Magic</h2>
+<h2>Ghostscript – Black Box Magic</h2>
+<h3>What is Ghostscript?</h3>
-<p>For those not familiar, Ghostscript strictly defined is a PostScript interpreter and many programs use GS for PostScript conversions and import/export. Likewise, Scribus uses Ghostscript, sometimes using some of the most advanced features available only in newer versions. </p>
+<p>For those not familiar, <a href="http://www.ghostscript.com/">Ghostscript (gs)</a>, strictly defined, is a so-called “PostScript interpreter”, and many programs use <code>gs</code> for PostScript conversions and import/export. Ghostscript has become one of the core building blocks of OSS software. It would be hard to imagine modern OSS distributions and software without it.</p>
+<p>Likewise, Scribus uses Ghostscript, sometimes taking advantage of the most sophisticated features that are available only in the latest versions. Scribus uses <code>gs</code> for two purposes, the first one being the import of rasterized <a href="importhints1.html">EPS files</a> into <a href="WwImages.html">image frames</a>. The second feature that requires <code>gs</code> is the <a href="print2.html">Print Preview</a>.</p>
-<p>With regard to Scribus, there are two major issues: Ghostscript is a kind of black box command line tool with sometimes obscure or difficult to understand switches. Accessing many of these is made much easier with GSview, noted later. The other is there have been some major improvements in the 8.x versions, especially with advanced PS3, PDF 1.4 features and high end printing features. The next section outlines a possible way to upgrade to the latest version, without breaking your existing CUPS/Foomatic/GIMP print setup.</p>
-
-<p>While Ghostscript originates from a commercial company and is dual licensed, the Ghostscript developers are very OSS friendly and have been very helpful to the Scribus team, especially with documentation and learning some of the more esoteric features. Ghostscript is one of core building blocks of OSS software. It would be hard to imagine OSS software without it.</p>
-
-<p>When speaking of "devices" in Ghostscript, this refers to a certain type of driver or software module which performs conversions or special types of PostScript processing.</p>
-
-<p>The latest generation of GS will have a new ink jet driver <strong>rinkj</strong>, which has some new techniques for optimal printing with some ink jet printers. Plus, support for jpeg2000 aka jasper, for lossless jpeg compression and PDF 1.5. Also, there are new devices which will support many advanced pre-press and printing features. Scribus will be one of the first applications to take advantage of these improvements. Thus, we always encourage you to have the latest Ghostscript available for your system and encourage distributions to migrate to GPL Ghostscript 8.x. </p>
+<p>We always encourage you to have the latest Ghostscript available for your system.</p>
+<h3>Installing Ghostscript</h3>
+<h4>Linux/UNIX</h4>
+<p>As mentioned above, Ghostscript is required by many applications. Thus, it’s unlikely that it isn’t installed on your system. If, for any reason, <code>gs</code> isn’t available on your system or your system is being shipped with a version that’s too old (you should at least use Ghostscript 8.6 with Scribus), you can <a href="http://ghostscript.com/releases/">download</a> a tarball from the <code>gs</code> website. Be careful to download Ghostscript itself, not ghostpdl, whose source code is in the same directory. Then follow the build instructions in the tarball and install it.</p>
+<h4>Windows</h4>
+<p> See the <a href="readme-win32.html">general information</a> about Scribus on Windows for further details.</p>
+<h4>Mac OS X</h4>
+<p>There are different ways to install Ghostscript for Mac OS X, but unfortunately, none of them seems to be as easy as most Mac users are used to:</p>
+<ul>
+<li>You can download a <a href="http://pages.uoregon.edu/koch/Ghostscript-8.71.pkg.zip">ZIP archive</a> with four DMGs of <code>gs</code> for various OS X versions. Please read the related <a href="http://pages.uoregon.edu/koch/Ghostscript-8.71.pdf">info file</a> to decide which version you need.</li>
+<li>You can isntall <code>gs</code> via <a href="http://pdb.finkproject.org/pdb/package.php/ghostscript">Fink</a>.</li>
+<li>The most current releases of Ghostscript are always available via <a href="http://www.macports.org/ports.php?by=library&substr=ghostscript">MacPorts</a>.</li>
+<li>Finally, you can, of course, download the latest <a href="http://ghostscript.com/releases/">source code</a> and compile Ghostscript yourself.</li>
+</ul>
+<h4>OS/2 and eComStation</h4>
+<p> See the <a href="readme-os2.html">general information</a> about Scribus on OS/2 for further details.</p>
</body>
Modified: branches/ScribusOIF/scribus/canvasmode_edit.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15981&path=/branches/ScribusOIF/scribus/canvasmode_edit.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_edit.cpp (original)
+++ branches/ScribusOIF/scribus/canvasmode_edit.cpp Wed Nov 24 23:22:04 2010
@@ -416,10 +416,44 @@
}
//otherwise, select between the whitespace
else
- { //Double click in a frame to select a word
- oldCp = currItem->CPos;
- currItem->CPos = currItem->itemText.selectWord(currItem->CPos);
- currItem->HasSel = (currItem->itemText.lengthOfSelection() > 0);
+ {
+ if (m->modifiers() & Qt::ControlModifier)
+ {
+ int start=0, stop=0;
+
+ if (m->modifiers() & Qt::ShiftModifier)
+ {//Double click with Ctrl+Shift in a frame to select few paragraphs
+ uint oldPar = currItem->itemText.nrOfParagraph(oldCp);
+ uint newPar = currItem->itemText.nrOfParagraph(currItem->CPos);
+ if (oldPar < newPar)
+ {
+ start = currItem->itemText.startOfParagraph(oldPar);
+ stop = currItem->itemText.endOfParagraph(newPar);
+ }
+ else
+ {
+ start = currItem->itemText.startOfParagraph(newPar);
+ stop = currItem->itemText.endOfParagraph(oldPar);
+ }
+ }
+ else
+ {//Double click with Ctrl in a frame to select a paragraph
+ oldCp = currItem->CPos;
+ uint nrPar = currItem->itemText.nrOfParagraph(oldCp);
+ start = currItem->itemText.startOfParagraph(nrPar);
+ stop = currItem->itemText.endOfParagraph(nrPar);
+ }
+ //qDebug() << "start: " << start << " stop: " << stop;
+ currItem->itemText.extendSelection(start, stop);
+ currItem->CPos = stop;
+ currItem->HasSel = (currItem->itemText.lengthOfSelection() > 0);
+ }
+ else
+ { //Double click in a frame to select a word
+ oldCp = currItem->CPos;
+ currItem->CPos = currItem->itemText.selectWord(currItem->CPos);
+ currItem->HasSel = (currItem->itemText.lengthOfSelection() > 0);
+ }
}
}
else
@@ -677,16 +711,28 @@
if (m->button() != Qt::RightButton)
{
- currItem->asTextFrame()->deselectAll();
+ //currItem->asTextFrame()->deselectAll();
//<<CB Add in shift select to text frames
- if (m->modifiers() & Qt::ShiftModifier && currItem->itemText.lengthOfSelection() > 0)
- {
- if (currItem->CPos < (currItem->itemText.startOfSelection() + currItem->itemText.endOfSelection()) / 2)
- oldP = currItem->itemText.startOfSelection();
- else
- oldP = currItem->itemText.endOfSelection();
- currItem->asTextFrame()->itemText.extendSelection(oldP, currItem->CPos);
- oldCp = currItem->CPos;
+ if (m->modifiers() & Qt::ShiftModifier)
+ {
+ if (currItem->itemText.lengthOfSelection() > 0)
+ {
+ if (currItem->CPos < (currItem->itemText.startOfSelection() + currItem->itemText.endOfSelection()) / 2)
+ oldP = currItem->itemText.startOfSelection();
+ else
+ oldP = currItem->itemText.endOfSelection();
+ currItem->asTextFrame()->itemText.extendSelection(oldP, currItem->CPos);
+ oldCp = currItem->CPos;
+ }
+ else
+ {
+ int dir=1;
+ if (oldCp>currItem->CPos)
+ dir=-1;
+ if (currItem->asTextFrame())
+ currItem->asTextFrame()->ExpandSel(dir, oldP);
+ oldCp = oldP;
+ }
}
else //>>CB
{
Modified: branches/ScribusOIF/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15981&path=/branches/ScribusOIF/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Wed Nov 24 23:22:04 2010
@@ -3083,7 +3083,7 @@
break;
if (reader.isCharacters())
formula += reader.text().toString();
- if (reader.isStartDocument() && reader.name() == "PROPERTY")
+ if (reader.isStartElement() && reader.name() == "PROPERTY")
{
ScXmlStreamAttributes tAtt = reader.scAttributes();
QString name = tAtt.valueAsString("name");
Modified: branches/ScribusOIF/scribus/ui/preferencesdialog.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15981&path=/branches/ScribusOIF/scribus/ui/preferencesdialog.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/preferencesdialog.cpp (original)
+++ branches/ScribusOIF/scribus/ui/preferencesdialog.cpp Wed Nov 24 23:22:04 2010
@@ -200,8 +200,8 @@
if (prefs_KeyboardShortcuts) prefs_KeyboardShortcuts->restoreDefaults(&localPrefs);
if (prefs_ColorManagement)
{
+ prefs_ColorManagement->setProfiles(&localPrefs, &ScCore->InputProfiles, &ScCore->InputProfilesCMYK, &ScCore->PrinterProfiles, &ScCore->MonitorProfiles);
prefs_ColorManagement->restoreDefaults(&localPrefs);
- prefs_ColorManagement->setProfiles(&localPrefs, &ScCore->InputProfiles, &ScCore->InputProfilesCMYK, &ScCore->PrinterProfiles, &ScCore->MonitorProfiles);
}
if (prefs_Scrapbook) prefs_Scrapbook->restoreDefaults(&localPrefs);
if (prefs_Display) prefs_Display->restoreDefaults(&localPrefs);
Modified: branches/ScribusOIF/scribus/ui/prefs_colormanagement.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15981&path=/branches/ScribusOIF/scribus/ui/prefs_colormanagement.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/prefs_colormanagement.cpp (original)
+++ branches/ScribusOIF/scribus/ui/prefs_colormanagement.cpp Wed Nov 24 23:22:04 2010
@@ -25,7 +25,7 @@
if (!m_Doc)
{
monitorProfileComboBox->setVisible(false);
- monitorLabel->setText( tr("Monitor profiles can only be changed when no documents are open") );
+ monitorLabel->setText( tr("Monitor profiles can only be changed when no documents are open.") );
}
else
{
@@ -47,6 +47,16 @@
void Prefs_ColorManagement::restoreDefaults(struct ApplicationPrefs *prefsData)
{
+ if (!ScCore->haveCMS())
+ {
+ activateCMCheckBox->setEnabled(false);
+ warningLabel->setText("<qt><font color=\"red\">"+tr("<qt>Color Management cannot be activated due to missing color profiles.</br>You need to install at least one RGB and one CMYK profile.")+"</font></qt>");
+ }
+ else
+ {
+ warningLabel->resize(0,0);
+ warningLabel->hide();
+ }
activateCMCheckBox->setChecked(prefsData->colorPrefs.DCMSset.CMSinUse);
QString tmp_mp[] = { tr("Perceptual"), tr("Relative Colorimetric"),
Modified: branches/ScribusOIF/scribus/ui/prefs_colormanagementbase.ui
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15981&path=/branches/ScribusOIF/scribus/ui/prefs_colormanagementbase.ui
==============================================================================
--- branches/ScribusOIF/scribus/ui/prefs_colormanagementbase.ui (original)
+++ branches/ScribusOIF/scribus/ui/prefs_colormanagementbase.ui Wed Nov 24 23:22:04 2010
@@ -31,6 +31,25 @@
</widget>
</item>
<item>
+ <widget class="QLabel" name="warningLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -47,7 +66,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>587</width>
+ <width>589</width>
<height>631</height>
</rect>
</property>
Modified: branches/ScribusOIF/scribus/ui/search.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15981&path=/branches/ScribusOIF/scribus/ui/search.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/search.cpp (original)
+++ branches/ScribusOIF/scribus/ui/search.cpp Wed Nov 24 23:22:04 2010
@@ -114,7 +114,7 @@
setCurrentComboItem(SFontVal, doc->currentStyle.charStyle().font().scName());
SFontVal->setEnabled(false);
SearchLayout->addWidget( SFontVal, 2, 1 );
- SSizeVal = new ScrSpinBox( 0.5, 2048, Search, 1 );
+ SSizeVal = new ScrSpinBox( 0.5, 2048, Search, 0 );
SSizeVal->setValue( doc->currentStyle.charStyle().fontSize() / 10.0 );
SSizeVal->setEnabled(false);
SearchLayout->addWidget( SSizeVal, 3, 1 );
@@ -201,7 +201,7 @@
setCurrentComboItem(RFontVal, doc->currentStyle.charStyle().font().scName());
RFontVal->setEnabled(false);
ReplaceLayout->addWidget( RFontVal, 2, 1 );
- RSizeVal = new ScrSpinBox( 0.5, 2048, Replace, 1 );
+ RSizeVal = new ScrSpinBox( 0.5, 2048, Replace, 0 );
RSizeVal->setValue( doc->currentStyle.charStyle().fontSize() / 10.0 );
RSizeVal->setEnabled(false);
ReplaceLayout->addWidget( RSizeVal, 3, 1 );
Modified: branches/ScribusOIF/scribus/ui/stylemanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15981&path=/branches/ScribusOIF/scribus/ui/stylemanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/stylemanager.cpp (original)
+++ branches/ScribusOIF/scribus/ui/stylemanager.cpp Wed Nov 24 23:22:04 2010
@@ -205,6 +205,7 @@
// clear the style list and reload from new doc
styleView->clear();
+ m_selectedStyleAction = 0;
m_styleActions.clear();
for (int i = 0; i < m_items.count(); ++i)
{
@@ -523,7 +524,7 @@
while (*it)
{ // can't create styles here cause createNewStyle() alters the selection
StyleViewItem *item = dynamic_cast<StyleViewItem*>(*it);
- if (item)
+ if (item && !item->isRoot())
names << QPair<QString, QString>(item->rootName(), item->text(NAME_COL));
++it;
}
More information about the scribus-commit
mailing list