r15576 by jghali - merge trunk revisions up to r15574
scribus-commit
scribus-commit at lists.scribus.net
Mon Oct 18 23:11:59 CEST 2010
Author: jghali
Date: Mon Oct 18 21:11:59 2010
New Revision: 15576
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15576
Log:
merge trunk revisions up to r15574
Added:
branches/ScribusOIF/resources/icons/16/configure.png
- copied unchanged from r15575, trunk/Scribus/resources/icons/16/configure.png
branches/ScribusOIF/resources/templates/cc/
- copied from r15575, trunk/Scribus/resources/templates/cc/
branches/ScribusOIF/resources/templates/cover1/
- copied from r15575, trunk/Scribus/resources/templates/cover1/
branches/ScribusOIF/resources/templates/cover2/
- copied from r15575, trunk/Scribus/resources/templates/cover2/
branches/ScribusOIF/resources/templates/cover3/
- copied from r15575, trunk/Scribus/resources/templates/cover3/
branches/ScribusOIF/resources/templates/cover4/
- copied from r15575, trunk/Scribus/resources/templates/cover4/
branches/ScribusOIF/resources/templates/cover5/
- copied from r15575, trunk/Scribus/resources/templates/cover5/
branches/ScribusOIF/resources/templates/mc/
- copied from r15575, trunk/Scribus/resources/templates/mc/
Modified:
branches/ScribusOIF/doc/en/WwFrames.html
branches/ScribusOIF/doc/en/about1.html
branches/ScribusOIF/doc/en/gsview.html
branches/ScribusOIF/doc/en/toolbox.html
branches/ScribusOIF/doc/en/toolbox6.html
branches/ScribusOIF/resources/loremipsum/de.xml
branches/ScribusOIF/resources/templates/CMakeLists.txt
branches/ScribusOIF/resources/templates/template.xml
branches/ScribusOIF/scribus/scribusXml.cpp
branches/ScribusOIF/scribus/scribusview.cpp
branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp
branches/ScribusOIF/scribus/ui/scrapbookpalette.h
Modified: branches/ScribusOIF/doc/en/WwFrames.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15576&path=/branches/ScribusOIF/doc/en/WwFrames.html
==============================================================================
--- branches/ScribusOIF/doc/en/WwFrames.html (original)
+++ branches/ScribusOIF/doc/en/WwFrames.html Mon Oct 18 21:11:59 2010
@@ -1,113 +1,275 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>Working with Frames</title>
-</head>
-<body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head>
+
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Working with Frames</title>
+
+
+</head><body>
<h2>Working with Frames</h2>
-<p>Working with Scribus is for the most part working with a frames environment. Some more generic terms you may see in menus and commands are objects or items, of which frames are one kind of object or item. There are 5 kinds of frames you will work with in Scribus:
+
+<p>Working with Scribus is for the most part working with a frames
+environment. Some more generic terms you may see in menus and commands
+are objects or items, of which frames are one kind of object or item.
+There are five kinds of frames you will work with in Scribus:
+</p>
+
<ul>
-<li><a href="WwText.html">Text frames</a></li>
-<li><a href="WwImages.html">Image frames</a></li>
-<li>Render frames</li>
-<li><a href="WwShapes.html">Shapes</a></li>
-<li><a href="WwShapes.html">Polygons</a></li>
+
+ <li><a href="WwText.html">Text frames</a></li>
+ <li><a href="WwImages.html">Image frames</a></li>
+ <li><a href="WwRenderframes.html">Render frames</a></li>
+ <li><a href="WwShapes.html">Shapes</a></li>
+ <li><a href="WwShapes.html">Polygons</a></li>
</ul>
-Each of these have their own section in this online manual, but here we will explain features they share.
+
+Each of these have their own section in this online manual, but here we
+will explain features they share.
<h3>Creating Frames</h3>
-There are at least 6 ways to create frames:
+
+There are at least six ways to create frames:
<ol>
-<li>Clicking the toolbar icon for the type of frame</li>
-<li>Choosing from the menu, Item > <i>Type of frame</i></li>
-<li>Using the keyboard shortcut (when not in Edit Contents mode)</li>
-<ul>
-<li>T for Text frame</li>
-<li>I for Image frame</li>
-<li>D for Render frame</li>
-<li>S for Shape</li>
-<li>P for Polygon</li>
-</ul>
-<li>Using Duplicate or Multiple Duplicate to make one or more copies of the selected frame</li>
-<li>Duplicating a Layer with its contents</li>
-<li>Copying a page, with all of its contents</li>
+
+ <li>Clicking the toolbar icon for the type of frame</li>
+ <li>Choosing from the menu, <span style="font-style: italic;">Insert</span>
+> <i>Type of frame</i></li>
+ <li>Using the keyboard shortcut (when not in Edit Contents mode in an
+already existing frame)</li>
+ <ul>
+ <li>T for Text frame</li>
+ <li>I for Image frame</li>
+ <li>D for Render frame</li>
+ <li>S for Shape</li>
+ <li>P for Polygon</li>
+ </ul>
+ <li>Using Duplicate or Multiple Duplicate to make one or more copies
+of the selected frame</li>
+ <li>Duplicating a Layer with its contents</li>
+ <li>Copying a page, with all of its contents</li>
</ol>
-<table width="70%" cellpadding="5">
-<tr><td valign="top">If you change your mind or press the wrong key, you can press Esc or the Spacebar to cancel, or click the toolbar icon for your next choice.
-<p>When you make one of the choices 1-3, your mouse cursor becomes activated to draw the frame, and a tooltip pops up to tell you the cursor's X-Pos and Y-Pos. As you click-drag to make the frame from one corner to its opposite, the tooltip now displays the Width and Height frame you are creating. For Shapes and Polygons, this describes the dimensions of the Bounding Box.
-<p>Usually the next step is adding or doing something with the content, but we will leave that to the individual sections regarding each type of frame.</td>
-<td width="310"><img src="images/shapes7.png">
-<p>Here we see the <b>Enter Object Size</b> dialog that comes up if you left-click somewhere on the page, rather than doing a click-drag operation. Obviously this can be very handy for creating a frame of a precise size and repeatedly doing so.
-</td></tr>
-</table>
+
+<table cellpadding="5" width="70%">
+
+ <tbody>
+ <tr>
+ <td valign="top">If you change your mind or pressed the wrong key
+(at least in the cases 1, 2 and 3),
+you can press Esc or the Spacebar to cancel, or click the toolbar icon
+for your next choice.
+ <p>When you make one of the choices 1–3, your mouse cursor
+becomes activated to draw the frame, and a tooltip pops up to tell you
+the cursor's X-Pos and Y-Pos. As you click-drag to make the frame from
+one corner to its opposite, the tooltip now displays the Width and
+Height frame you are creating. For Shapes and Polygons, this describes
+the dimensions of the Bounding Box. </p>
+ <p>Usually the next step is adding or doing something with the
+content, but we will leave that to the individual sections regarding
+each type of frame.</p>
+ </td>
+ <td width="310"><img src="images/shapes7.png">
+ <p>Here we see the <b>Enter Object Size</b> dialog that comes up
+if you left-click somewhere on the page, rather than doing a click-drag
+operation. Obviously this can be very handy for creating a frame of a
+precise size.</p>
+ <p>The fields <span style="font-style: italic;">Width</span> and
+ <span style="font-style: italic;">Height</span> are spinboxes
+whose use will be explained below.<br>
+ </p>
+ </td>
+ </tr>
+ </tbody>
+</table>
+
<h3>Context Menus</h3>
-Each frame type has its own particular Context Menu, found by right-clicking on it. Since these are variable depending on the type of frame, they will not be elaborated upon here. Keep in mind that you can find interesting things in Scribus by right-clicking on various items.
+
+Each frame type has its own particular Context Menu, found by
+right-clicking on it. Since these are variable depending on the type of
+frame, they will not be elaborated upon here. Keep in mind that you can
+find interesting things in Scribus by right-clicking on various items.
<h3>Manipulating Frames</h3>
+
<h4>How to Use Spinboxes</h4>
+
<table>
-<tr><td>
-<ul>
-<li>Hover the cursor over the spinbox value and use your mousewheel to change it</li>
-<li>Click the up or down arrow to the right side of the spinbox</li>
-<li>Use the arrow keys – cursor must be over the appropriate spinbox</li>
-<li>Change the value with the keyboard. <br><i>Hint: Scribus will do math for you. Enter (615/2+20), for example. There are some keywords you can use also, and combine with math operations: <b>pagewidth</b>/2, for example. Other keywords are <b>pageheight</b>, <b>width</b> (of selected item), and <b>height</b> (of selected item).</i>
-</ul>
+
+ <tbody>
+ <tr>
+ <td>
+ <ul>
+ <li>Hover the cursor over the spinbox value and use your
+mousewheel to change it</li>
+ <li>Click the up or down arrow to the right side of the spinbox</li>
+ <li>Use the arrow keys – cursor must be over the appropriate
+spinbox</li>
+ <li>Change the value with the keyboard. <br>
+ <i>Hint: Scribus will do math for you. Enter (615/2+20), for
+example. There are some keywords you can use also, and combine with
+math operations: <b>pagewidth</b>/2, for example. Other keywords are <b>pageheight</b>,
+ <b>width</b> (of selected item), and <b>height</b> (of
+selected item).</i> </li>
+ </ul>
The mousewheel digit changed can be modified:
-<ul>
-<li>No key pressed: units</li>
-<li>Shift key held: tenths</li>
-<li>Shift + Alt: hundredths</li>
-<li>Ctrl or Alt: tens</li>
-<li>Ctrl + Alt: hundreds – <i>Careful with this one with a page measurement unit like inches</i></li>
-<li>Except for those that use Alt, you can use most of these keymods when moving the frame with the arrow keys (cursor not over spinbox), but not for resizing with arrow keys.</li>
-</ul>
-<h4>Moving Frames</h4>
-<p>The simplest method is to click-hold inside the frame and move with the mouse. While this is taking place a tooltip tells you the position of the <b>Basepoint</b> (default basepoint is left upper corner). You can also use the arrow keys to move the frame as long as the cursor is not over any spinboxes. For more precise movement, use Properties > X,Y,Z tab (<b>X-Pos</b> and <b>Y-Pos</b>) and its spinboxes.
-<h4>Resizing Frames</h4>
-A selected frame shows a dotted red border and in addition small square handles at the corners and at the midpoints of each side. Click and drag a handle to make manual adjustments. If you hold down the Alt key <i>and the cursor is not over a spinbox</i>, you can resize the frame using the arrow keys. Use the <b>Width</b> and <b>Height</b> spinboxes for precision.
-</td>
-<td valign="middle"><img src="images/XYZ_Prop.png"></td></tr>
-</table>
+ <ul>
+ <li>No key pressed: units</li>
+ <li>Shift key held: tenths</li>
+ <li>Shift + Alt: hundredths</li>
+ <li>Ctrl or Alt: tens</li>
+ <li>Ctrl + Alt: hundreds – <i>Careful with this one with a
+page measurement unit like inches</i></li>
+ <li>Except for those that use Alt, you can use most of these
+keymods when moving the frame with the arrow keys (cursor not over
+spinbox), but not for resizing with arrow keys.</li>
+ </ul>
+ <h4>Moving Frames</h4>
+ <p>The simplest method is to click-hold inside the frame and move
+with the mouse. While this is taking place a tooltip tells you the
+position of the <b>Basepoint</b> (default basepoint is left upper
+corner). You can also use the arrow keys to move the frame as long as
+the cursor is not over any spinboxes. For more precise movement, use <span style="font-style: italic;">Properties > X,Y,Z</span>
+tab (<b>X-Pos</b> and <b>Y-Pos</b>) and its
+spinboxes. </p>
+ <h4>Resizing Frames</h4>
+A selected frame shows a dotted red border and in addition small square
+handles at the corners and at the midpoints of each side. Click and
+drag a handle to make manual adjustments. If you hold down the Alt key <i>and
+the cursor is not over a spinbox</i>, you can resize the frame using
+the arrow keys. To resize a frame proportionally, press Ctrl+Alt while
+moving a handle. Use the <b>Width</b> and <b>Height</b> spinboxes in
+the Properties Palette for
+precision. </td>
+ <td valign="middle"><img src="images/XYZ_Prop.png"></td>
+ </tr>
+ </tbody>
+</table>
+
<h4>Rotating Frames</h4>
+
There are 2 ways to rotate a frame:
<ul>
-<li>Click the Rotate icon on the toolbar. You then click-drag inside the frame to rotate. The basepoint is always the center of the frame.</li>
-<li>Use the <b>Rotation</b> spinbox in Properties. In this case, you can choose the <b>Basepoint</b> around which rotation takes place, as well as have more precision.</li>
+
+ <li>Click the Rotate icon on the toolbar. You then click-drag inside
+the frame to rotate. As long as you click inside a frame, the basepoint
+is always the center of the frame. However, if click on any of the
+corner handles, the basepoint is the opposite corner.<br>
+ </li>
+ <li>Use the <b>Rotation</b> spinbox in Properties. In this case, you
+can choose the <b>basepoint</b> around which rotation takes place, as
+well as have more precision.</li>
</ul>
+
<table>
-<tr><td><h4>Moving Frames – Level to Level or Layer to Layer</h4>
-You can move up or down levels using Properties > X,Y,Z tab, in the area labelled <b>Level</b>, either one level at a time or to the top or bottom. The number beside these arrows tells you which level your object is on (1 is the bottom).
-<p>There are also keyboard shortcuts:
-<ul>
-<li>Home: to the top</li>
-<li>End: to the bottom</li>
-<li>Ctrl+Home: up one level</li>
-<li>Ctrl+End: down one level</li>
-</ul>
-If you have more than one layer, you can use the Context menu (right-click on the frame) to send the frame to a different layer.
-<h4>Final Section of Properties: X,Y,Z</h4>
-Looking at the last group of 7 buttons in the lower right corner of <b>X,Y,Z</b>, the two leftmost buttons, grayed out in this picture, will group and ungroup a collection of selected objects. The next two buttons, with the blue arrows, flip the object horizontally or vertically. The picture of the lock is where you can lock or unlock the selected object, and just to its right you can lock or unlock only the size of the object. The last button in the lower right corner enables is disables printing (and export to PDF) of the object.
-</td>
-<td valign="middle"><img src="images/XYZ_Prop1.png"></td></tr>
-</table>
+
+ <tbody>
+ <tr>
+ <td>
+ <h4>Moving Frames – Level to Level or Layer to Layer</h4>
+You can move up or down levels using Properties > X,Y,Z tab, in the
+area labelled <b>Level</b>, either one level at a time or to the top
+or bottom. The number beside these arrows tells you which level your
+object is on (1 is the bottom).
+ <p>There are also keyboard shortcuts: </p>
+ <ul>
+ <li>Home: to the top</li>
+ <li>End: to the bottom</li>
+ <li>Ctrl+Home: up one level</li>
+ <li>Ctrl+End: down one level</li>
+ </ul>
+If you have more than one <a href="layers.html">layer</a>, you can use the Context Menu
+(right-click on the frame) to send the frame to a different layer.
+ <h4>Final Section of Properties: X,Y,Z</h4>
+Looking at the last group of seven buttons in the lower right corner of <b>X,Y,Z</b>,
+the two leftmost buttons, grayed out in this picture, will group and
+ungroup a collection of selected objects (note that vector drawings are <span style="font-style: italic;">always</span> imported as groups of objects). The next two buttons, with
+the blue arrows, flip the object horizontally or vertically. The
+picture of the lock is where you can lock or unlock the selected
+object, and just to its right you can lock or unlock only the size of
+the object. The last button in the lower right corner enables is
+disables printing (and export to PDF) of the object. </td>
+ <td valign="middle"><img src="images/XYZ_Prop1.png"></td>
+ </tr>
+ </tbody>
+</table>
+
<h4>Copy, Cut, Paste, Delete</h4>
-Most users should be familiar with these kinds of operations common to many types of editing software. They can be found in the Context Menu, and have the standard keyboard shortcuts of Ctrl+C, Ctrl+X, Ctrl+V, and Del. In Scribus, Delete operates like Cut, since it can be undone, but in contrast is not copied to the clipboard and therefore cannot be pasted. If you move from one page or one layer to another, Paste will place the new copy at the same coordinates it had on the original page or layer.
+
+Most users should be familiar with these kinds of operations common to
+many types of editing software. They can be found in the Context Menu or the <span style="font-style: italic;">Edit</span> menu,
+and have the standard keyboard shortcuts of Ctrl+C, Ctrl+X, Ctrl+V, and
+Del. In Scribus, Delete operates similar to Cut, since it can be undone, but
+in contrast is not copied to the clipboard and therefore cannot be
+pasted. If you move from one page or one layer to another, Paste will
+place the new copy at the same coordinates it had on the original page
+or layer.
<h4>Selecting Multiple Frames</h4>
-You might do this as a prelude to grouping the frames, so you can move or scale them as a unit.
-<p>The simplest way of selecting a group of frames is to click-drag <i>around</i> them. You have to be sure that any frame you wish to be selected is fully within the temporary rectangle you see during this operation. This may not work when you only want some of the frames in a particular rectangular space. In that situation you can manually select additional frames in a cumulative way by holding down Shift as you click. If you make a mistake, click again while holding Shift to deselect individual frames (this is a new feature as of the 1.3.5+ versions). If you have not yet grouped the frames, click outside these collectively selected frames to "break" the multiple selection. You can also combine these approaches by click-dragging around a number of frames, then Shift-clicking any you wish to select in addition or deselect.
+
+You might do this as a prelude to grouping the frames, so you can move
+or scale them as a unit.
+<p>The simplest way of selecting a group of frames is to click-drag <i>around</i>
+them. You have to be sure that any frame you wish to be selected is
+<span style="font-style: italic;">fully</span> within the temporary rectangle you see during this operation.
+This may not work when you only want some of the frames in a particular
+rectangular space. In that situation you can manually select additional
+frames in a cumulative way by holding down Shift as you click. If you
+make a mistake, click again while holding Shift to deselect individual
+frames. If you have
+not yet grouped the frames, click outside these collectively selected
+frames to "break" the multiple selection. You can also combine these
+approaches by click-dragging around a number of frames, then
+Shift-clicking any you wish to select in addition or deselect.
+</p>
+
<h4>Selecting Frames Under Other Frames</h4>
-If all you want to do is select an individual frame that happens to be completely underneath some other frame, hold Shift+Ctrl, and click serially on a particular spot to toggle through the frames covering that spot. You will cycle through the frames, but also at some point select none of them.
-<p><i>Note: if you find an inability to select a frame underneath another using this method, consider that this frame may be on another layer. You may only work on one layer at a time.</i>
+
+If all you want to do is select an individual frame that happens to be
+completely underneath some other frame, hold Shift+Ctrl, and click
+serially on a particular spot to toggle through the frames covering
+that spot. You will cycle through the frames, but also at some point
+select none of them.
+<p><i>Note: if you find an inability to select a frame underneath
+another using this method, consider that this frame may be on another
+layer. You may only work on one layer at a time.</i>
+</p>
+
<h3>Line and Colors of Frames</h3>
-The line of a frame is the border. For text and image frames, the default color of the line is None, so none of the line settings have any meaning until the line is given a color in the Colors tab. The default background or fill color of text and image frames is also None. For Shapes and Polygons, the default of both of these is Black. For all kinds of frames these default colors can be set in File > Preferences > Tools.
+
+The line of a frame is the border. For text, image and render frames, the
+default color of the line is None, so none of the line settings have
+any meaning until the line is given a color in the <span style="font-style: italic;">Colors</span> tab of the Properties Palette. The
+default background or fill color of text and image frames is also None.
+<br>
+<br>
+For Shapes and Polygons, the default fill color is set to None, wheras the default line color is Black. For all
+kinds of frames these default colors can be set in <span style="font-style: italic;">File > Document Setup > Tools</span> for the current document and in <span style="font-style: italic;">File >
+Preferences > Tools</span> for new documents.
<h3>Text Flow Around Frame</h3>
+
<table cellpadding="5">
-<tr><td>
-The first important thing to remember is that this can be a property of any kind of frame, and that it applies to any text frames <i>underneath</i> it, underneath being not only on a lower level, but also a lower layer.
-<p>Secondly, you need to choose whether you want flow around the frame, the contour line, or the boundary box – making your choice in the Shape tab of Properties. For text and image frames, all 3 coincide with each other when they are created. As for shapes and polygons, only a rectangle would show this property, otherwise only the frame and contour lines coincide. Details will be found elsewhere, but in the Properties > Shape tab you can edit the frame/shape or contour line independently.
-<p>In this screenshot below, the left column flows around the frame, the right around an edited contour line:
-</td></tr>
-<tr><td align="center"><img src="images/text_flow.png"></td></tr>
-</table>
-
-</body>
-</html>
+
+ <tbody>
+ <tr>
+ <td>The first important thing to remember is that this can be a
+property of any kind of frame, and that it applies to any text frames <i>underneath</i>
+it, underneath being not only on a lower level, but also a lower layer.
+ <p>Secondly, you need to choose whether you want flow around the
+frame, the contour line, or the bounding box – making your choice in
+the <span style="font-style: italic;">Shape</span> tab of Properties. For text and image frames, all 3 coincide
+with each other when they are created. <br>
+</p>
+ <p>As for shapes and polygons, only only the frame and
+contour lines coincide (i.e., they are identical with the shape/polygon
+itself), whereas the boundling box is always the surrounding rectangle.
+Details will be found elsewhere, but in the
+<span style="font-style: italic;">Shape</span> tab of the Properties Palette you can edit the frame/shape or the contour line
+independently. </p>
+
+ <p>In this screenshot below, the left column flows around the
+frame, the right around an edited (enlarged) contour line: </p>
+ </td>
+ </tr>
+ <tr>
+ <td align="center"><img src="images/text_flow.png"></td>
+ </tr>
+ </tbody>
+</table>
+
+</body></html>
Modified: branches/ScribusOIF/doc/en/about1.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15576&path=/branches/ScribusOIF/doc/en/about1.html
==============================================================================
--- branches/ScribusOIF/doc/en/about1.html (original)
+++ branches/ScribusOIF/doc/en/about1.html Mon Oct 18 21:11:59 2010
@@ -1,68 +1,99 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>About the Scribus Team</title>
-</head>
-<body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head>
+
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>About the Scribus Team</title></head><body>
<h2>About the Scribus Team (in order of joining)</h2>
<p>Franz Schmid - "Our Linus..." original author, main coder, software developer for a publishing company</p>
-<p>Peter Linnell - aka mrdocs - started with testing the 0.3.6 version, took over the documentation writing for 0.5.0; tester, rpm builder, original web master for <a href="http://www.scribus.net/">www.scribus.net,</a> Pre-Press/IT consultant for publishing and e-commerce companies.</p>
+<p>Peter Linnell - aka mrdocs - started with testing the 0.3.6 version,
+took over the documentation writing for 0.5.0; tester, rpm builder,
+original web master for <a href="http://www.scribus.net/">www.scribus.net,</a> Pre-Press/IT consultant for publishing and e-commerce companies.</p>
-<p>Craig Bradney - aka MrB - started with 1.1.1, testing, setup of docs.scribus.net and bugs.scribus.net, manages the IRC channel #scribus on freenode.net; IT Manager for global e-commerce company.
+<p>Craig Bradney - aka MrB - started with 1.1.1, testing, setup of
+docs.scribus.net and bugs.scribus.net, manages the IRC channel #scribus
+on freenode.net; IT Manager for global e-commerce company.
+</p><p>Petr Vaněk - started with 1.1.4, plug-in specialist, has
+written several Scribus plug-ins and the how-to for Scribus plug-in
+writing; software engineer.</p>
-<p>Petr Vaněk - started with 1.1.4, plug-in specialist, has written several Scribus plug-ins and the how-to for Scribus plug-in writing; software engineer.</p>
+<p>Riku Leino - aka Tsoots - started with 1.1.5, wrote the Document
+Template plug-in and the OO/HTML importers for 1.2.2; IT Manager for
+large non-profit in Finland.</p>
-<p>Riku Leino - aka Tsoots - started with 1.1.5, wrote the Document Template plug-in and the OO/HTML importers for 1.2.2; IT Manager for large non-profit in Finland.</p>
+<p>Craig Ringer - Worked on the scripter, build system and tested
+Windows and Mac OSX port beginnings. Contributed fixes for Python and
+other enhancements; IT/DTP administrator for daily newspaper. </p>
-<p>Craig Ringer - Worked on the scripter, build system and tested Windows and Mac OSX port beginnings. Contributed fixes for Python and other enhancements; IT/DTP administrator for daily newspaper. </p>
+<p>Andreas Vox - pronounced [fox] -- started with 1.3.0. Developed
+original Mac OS X native port, font API specialist, hates C++, likes
+good layout and has a stupid comment for anything: software developer.</p>
-<p>Andreas Vox - pronounced [fox] -- started with 1.3.0. Developed original Mac OS X native port, font API specialist, hates C++, likes good layout and has a stupid comment for anything: software developer.</p>
+<p>Jean Ghali - handles the Windows native port and much of the color
+management coding. Pre-press and software engineer for printing company.</p>
-<p>Jean Ghali - handles the Windows native port and much of the color management coding. Pre-press and software engineer for printing company.</p>
-
-<p>Oleksandr Moskalenko, Phd.- aka malex - maintainer of Scribus Debian packages, helps with internationalization, translation, and user support in #scribus on IRC, tool scripts and the new Drupal-based www.scribus.net site, GSoC representative; molecular biologist.</p>
+<p>Oleksandr Moskalenko, Phd.- aka malex - maintainer of Scribus Debian
+packages, helps with internationalization, translation, and user
+support in #scribus on IRC, tool scripts and the new Drupal-based
+www.scribus.net site, GSoC representative; molecular biologist.</p>
<p>Pierre Marchand - fonts, canvas, text layout and shaping. Developer of FontMatrix, has own IT company. </p>
-<p>Christoph Schäfer - Leading bug reporter and tester for bleeding edge Scribus. Wiki editor and doc translator/proofreader. </p>
+<p>Christoph Schäfer - Leading bug reporter and tester for bleeding
+edge Scribus. Wiki editor and doc translator/proofreader, one of the
+main authors of the Offcial Manual.</p>
<p>Hermann Kraus - Wrote the Render frame system and GraphicsMagick and UniConvertor integration.</p>
+<p>Jain Basil Aliyas - Wrote the XTG and IDML import filters.<br>
+</p>
+
<h2>The Supporting Cast and Former Developers</h2>
<h4>Active users/contributors who have added to the Scribus community (in no particular order):</h4>
<p>Paul F. Johnson - aka Nodoid - started with sending patches for 0.8, did code review and code optimizing. </p>
-<p>Steve Callcott - aka sjc - wrote the Python plugin font sampler, which showed the real power of the Python Scripter in Scribus; works on systems control and consumer electronics, custom software and support.</p>
+<p>Steve Callcott - aka sjc - wrote the Python plugin font sampler,
+which showed the real power of the Python Scripter in Scribus; works on
+systems control and consumer electronics, custom software and support.</p>
<p>Alessandro Rimoldi - added fixes for localization and code clean-ups.</p>
<p>J.J. Sarton - added some key patches for improving image handling and other improvements. Added the GIMP support to Scribus.</p>
-<p>Alistair Robinson - added some important fixes for font handling in early Scribus versions. Also wrote the clever hack for GIMP to create CMYK TIFFs.</p>
+<p>Alistair Robinson - added some important fixes for font handling in
+early Scribus versions. Also wrote the clever hack for GIMP to create
+CMYK TIFFs.</p>
-<p>Maciej Hanski - Polish translator and writer of the PDF Forms how-to. One of the primary contributors to the scribus wiki.</p>
+<p>Maciej Hanski - Polish translator and writer of the PDF Forms how-to. One of the primary contributors to the Scribus wiki.</p>
-<p>Yves Ceccone - Original French translator, wrote many of the Python scripts included with Scribus, maintained a large number of Docs for Scribus in French.</p>
+<p>Yves Ceccone - Original French translator, wrote many of the Python
+scripts included with Scribus, maintained a large number of Docs for
+Scribus in French.</p>
<p>Martin Costabel - maintains the Scribus port and support libraries for Fink, allowing Scribus to run under X11 on MacOSX.</p>
<p>Niyam Bhushan - contributed a terrific tutorial on Scribus.</p>
-<p>Marti Maria - for answering tons of our questions on color managemetn and providing littlecms.</p>
+<p>Marti Maria - for answering tons of our questions on color management and providing littlecms.</p>
-<p>Johannes Rüschel - Excellent bug finder, German translator; German Civil Service</p>
+<p>Johannes Rüschel - Excellent bug finder, former German translator.</p>
-<p>Alexandre Prokoudine - Russian Translator, has helped a bunch with internationalization issues, as well as designing UI improvements; professional technical writer.</p>
+<p>Alexandre Prokoudine - Russian Translator, has helped a bunch with
+internationalization issues, as well as designing UI improvements;
+professional technical writer.</p>
-<p>"Lukasz [DeeJay1] Jernas" - PLD Linux package maintainer and user support in #scribus </p>
+<p>"Lukasz [DeeJay1] Jernas" - PLD Linux package maintainer. </p>
<p>Howard White - Retired Pre-Press Engineer - Testing and testing and more testing. Always daring to test bleeding edge code. </p>
<p>Cedric Gemy - Graphics Professor and author - UI testing and feedback, GSoC mentor.</p>
-<p>Dr. Greg Pittman - One of the primary contributors to the scribus wiki and future documentation.</p>
-</body>
-</html>
+<p>Dr. Greg Pittman - One of the primary contributors to the scribus wiki and the documentation, one of the main authors of the Offcial Manual; author of several useful Scribus scripts.<br>
+</p>
+<p>Paul Smedley - Maintainer of the OS/2 port.<br>
+</p>
+
+
+Volker Ribbert - started with the German translation of the German docs.<br>
+</body></html>
Modified: branches/ScribusOIF/doc/en/gsview.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15576&path=/branches/ScribusOIF/doc/en/gsview.html
==============================================================================
--- branches/ScribusOIF/doc/en/gsview.html (original)
+++ branches/ScribusOIF/doc/en/gsview.html Mon Oct 18 21:11:59 2010
@@ -1,34 +1,95 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>GSview and Scribus</title>
-</head>
-<body>
-<h2>GSview and Scribus</h2>
-<p><strong>Parts of this section are thanks to Russell Lang, author and maintainer of GSview, epstool and Ghostscript for his hints and patiently answering my questions about GSview and Ghostscript. It has allowed the Scribus Team to use some of the more advanced features of Ghostscript in Scribus. </strong></p>
-<p>First off, It is in my very strong opinion, <strong>a superior replacement for ghostview, gv and derivatives.</strong> Although Acrobat Reader® is in my experience sometimes a better pure viewer for PDF, I also consider GSview one of the most essential tools to have when using Scribus. GSview has a handful of extremely useful functions. For those unfamiliar, it provides an easy to use "front end" to
-Ghostscript, as well as <code>pstoedit</code> for converting bitmaps into vector files. For those coming from the Windows/Mac world, it also has the functionality of Distiller with a graphical front end for those applications which do not export PDF natively.</p>
-<p>Second ensure you have the latest version 4.7+. (GSview migrated from the Windows world, where it has been excellent since the 4.x versions.)</p>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head>
+
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>GSview and Scribus</title>
+
+
+</head><body>
+<h2>GSview*</h2>
+
+<p>One important thing to note is that <a href="http://pages.cs.wisc.edu/%7Eghost/gsview/index.htm">GSview</a> <span style="font-style: italic;">must not be confused</span> with <strong style="font-weight: normal;">ghostview, gv and their derivatives!</strong>
+Although Adobe Reader® is often a better pure viewer for PDFs, GSview
+should be regarded as one of the most essential tools to have when
+using
+Scribus. GSview has some extremely useful functions. For those
+unfamiliar with the program, it provides an easy to use “front end†to
+Ghostscript, as well as <code>pstoedit</code> for converting bitmaps
+into vector files or vice versa. For those coming from a traditional
+DTP background in the Mac/Windows world, it also
+provides some of the functionality of Acrobat Distiller.<br>
+</p>
+
+<p>You should always use the latest version, at least 4.7. (GSview
+migrated from the
+Windows world, where it has been excellent since the 4.x versions.)</p>
+
<p>For use with Scribus, GSview has the following features:</p>
+
<ul>
- <li>With the help of <a href="http://pstoedit.net">pstoedit</a>, you can convert bitmap images or PDF content back into SVG and other scalable vector file formats.</li>
- <li>The ability to preview, convert and add previews (Tiff recommended) for raw EPS (Encapsulated PostScript Files).</li>
- <li>The ability to extract text from a PDF.</li>
- <li>The ability to preview, convert and add previews for raw PostScript files. An easy to use interface for creating PDF's in applications without the high level of export capabilities of Scribus. (You are still recommended to use the Export to PDF Scribus, as it is optimized for Scribus files.)</li>
- <li>As an easy to use front end to Ghostscript's less well known features such as image conversion and re-sampling. The example below uses the <strong>epswrite</strong> "device". There are others in Ghostscript including: converting between TIFF formats, changing the color depth of at TIFF, JPEG or the color space of an image.</li>
+
+ <li>With the help of <a href="http://pstoedit.net">pstoedit</a>, you
+can convert bitmap images or PDF content back into SVG and other
+scalable vector file formats.</li>
+ <li>The ability to preview, convert and add previews (TIFF
+recommended) for raw EPS (Encapsulated PostScript files).</li>
+ <li>The ability to extract text from a PDF.</li>
+ <li>The ability to preview, convert and add previews for raw
+PostScript files.</li>
+ <li>An easy-to-use front end to Ghostscript’s less well known
+features such as image conversion and re-sampling. There are other
+features in
+Ghostscript, including: converting between TIFF formats, changing the
+color depth of a TIFF, JPEG or the color space of an image.</li>
</ul>
-<p>One example where I use GSview with Scribus is for troubleshooting/fixing EPS files which do not display correctly within Scribus. Although many applications can generate EPS files, some add their own quirks into the EPS, which can cause problems when used in other applications (like Scribus).</p>
-<p>So, if you find difficulty with an EPS or PDF you wish to use in Scribus, open the EPS in GSview. Then, use the key command <strong>M</strong> to display messages from Ghostscript. The messages can indicate problems which cause display or printing errors. You can also use the <strong>epswrite</strong> "device" to re-save the EPS, which can help to strip out or fix issues with an EPS.</p>
-<p>You can also <em>rasterize</em> an EPS image like this, by converting to PNG or TIFF and then resize, adjust colors etc with an image program like GIMP or Corel Photoshop. I did this with a troublesome EPS and converted it to a 600DPI PNG, which would then display and print perfectly from Scribus. Sometimes when working with images and DTP there are several different ways to accomplish the same task - in my example, it was getting a complex EPS file from Illustrator to display and print properly from Scribus. The fact that there problem displaying the EPS, was not a bug in Scribus, but some non-standard PostScript info in the file, which by using Ghostscript as a back end to GSview I could strip out and then display properly in Scribus.</p>
-<p> Note: GSview uses the <code>libgs.so</code> shared library to access Ghostscript. Not all Linux distributions ship this, so the hints for compiling Ghostscript with a paralell install really apply here. </p>
+
+<p>One example where GSview is extremely useful with Scribus is
+troubleshooting or fixing EPS files that do not display correctly
+within
+Scribus. Although many applications can generate EPS files, some add
+their own quirks into the EPS, which can cause problems when used in
+other programs (like Scribus).</p>
+
+<p>So, if you find difficulty with an EPS you wish to use in
+Scribus, open the EPS in GSview. Then, use the key command <strong>M</strong>
+to display messages from Ghostscript. The messages can indicate
+problems which cause display or printing errors. You can also use the <strong>epswrite</strong>
+“device†to re-save the EPS, which can help to strip out or fix issues
+with an EPS.</p>
+
+<p>You can also <em>rasterize</em> an EPS image, by converting it to
+PNG
+or TIFF and then resize, adjust colors etc with an image program like
+GIMP or Krita.<br>
+</p>
+
+<p> Note that GSview uses the <code>libgs.so</code> shared library to
+access Ghostscript. Not all Linux distributions ship this, so the hints
+for compiling Ghostscript with a paralell install really apply here. </p>
+
<h4>Getting Gsview:</h4>
-<p>Not all Linux distributions offer GSview. However, for those with rpm based systems, a simple rpm command will have you with an easy to install rpm. The GSview tarball already has a built-in spec file. A simple: </p>
-<blockquote><table width="100%" border="1" bgcolor="#eeeeee"><tr><td border="0">
-<pre>
-rpmbuild -tb ./gsview-4.7.tar.gz
-</pre></td></tr></table></blockquote>
-<p>Will get you started. Windows has a convetional setup.exe installer. Unfortunately, it is not yet available for MacOSX. </p>
-<p>GSview since about 4.3, has been, in my experience, the most reliable and versatile PDF viewer along with Acrobat Reader on Linux. For DTP with Scribus, I consider it essential.</p>
+
+<p>GSview is available for most Linux distributions, at least the major
+ones. Otherwise you can build GSview by following
+the instructions provided in the <a href="http://pages.cs.wisc.edu/%7Eghost/">source package</a>. For
+Windows and OS/2 and eComStation you can download <a href="http://pages.cs.wisc.edu/%7Eghost/gsview/get49.htm">conventional
+installers</a> .
+Unfortunately, there is no current version for Mac OS X available. </p>
+
+<p>A special note to users of OpenSUSE 11.3: The required GTK 1
+libraries are no longer available for this Linux distribution, but you
+can use the <a href="http://download.opensuse.org/repositories/GNOME:/GNOME1/openSUSE_11.2/i586/">versions
+compiled for 11.2</a>. You need to install the gtk-1.20 and glib
+packages (if you want to build GSview yourself, you also need the
+respective devel RPMs), as well as the <a href="http://download.opensuse.org/repositories/GNOME:/GNOME1/openSUSE_11.2/noarch/gtk-lang-1.2.10-1093.1.noarch.rpm">lang
+package</a>.<br>
+</p>
+
<p>Now, for advanced hints with GSview and Ghostscript, see: <a href="toolbox7.html">Advanced Ghostscript and GSview Hints</a></p>
-</body>
-</html>
+
+<p>*) <span style="font-style: italic;">Parts of this section are
+thanks to Russell Lang, author and maintainer of GSview, epstool and
+Ghostscript for his hints and patiently answering questions about
+GSview and Ghostscript.</span></p>
+
+</body></html>
Modified: branches/ScribusOIF/doc/en/toolbox.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15576&path=/branches/ScribusOIF/doc/en/toolbox.html
==============================================================================
--- branches/ScribusOIF/doc/en/toolbox.html (original)
+++ branches/ScribusOIF/doc/en/toolbox.html Mon Oct 18 21:11:59 2010
@@ -1,38 +1,70 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>My Linux DTP Tool Box</title>
-</head>
-<body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head>
+
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>My Linux DTP Tool Box</title>
+
+
+</head><body>
<h2>My Linux DTP Tool Box</h2>
-<p>This is wholly my own personal selection, based fairly narrowly on how capable I find these applications to work with Scribus for print. If you disagree, I most certainly will listen to a well reasoned argument. Be prepared though! Part of my day job is to evaluate similar commercial applications for clients. Some of these apps have been tested within the limitations of modern PC hardware. Example: Telling Xnview to create 10,000 thumbnails at once. So in alphabetical order:</p>
+
+<p>This is a selection of important tools to be used with Scribus,
+based fairly narrowly on
+how reliably these applications work with Scribus for print.
+Some of these apps have been
+tested within the limitations of modern PC hardware, for example:
+telling
+XNview to create 10,000 thumbnails at once. <br>
+</p>
+
<ul>
- <li><a href="toolbox1.html">Acrobat Reader</a></li>
- <li><a href="toolbox2.html">Other PDF Viewers</a></li>
- <li><a href="toolbox3.html">Batik</a></li>
- <li><a href="toolbox4.html">Gimp</a></li>
- <li><a href="toolbox5.html">Ghostscript</a></li>
- <li><a href="toolbox6.html">GSview</a></li>
- <li><a href="toolbox7.html">Advanced Ghostscript & GSview</a></li>
- <li><a href="toolbox8.html">Imagemagick</a></li>
- <li><a href="toolbox9.html">Inkscape</a></li>
- <li><a href="toolbox10.html">KSnapshot</a></li>
- <li><a href="toolbox11.html">Tracing Tools</a></li>
- <li><a href="toolbox12.html">WINE</a></li>
- <li><a href="toolbox13.html">Xnview</a></li>
- <li><a href="toolbox14.html">Lprof</a></li>
- <li><a href="toolbox15.html">Krita</a></li>
+
+ <li><a href="toolbox1.html">Adobe Reader</a></li>
+ <li><a href="toolbox2.html">Other PDF Viewers</a></li>
+ <li><a href="toolbox3.html">Batik</a></li>
+ <li><a href="toolbox4.html">GIMP</a></li>
+ <li><a href="toolbox5.html">Ghostscript</a></li>
+ <li><a href="toolbox6.html">GSview</a></li>
+ <li><a href="toolbox7.html">Advanced Ghostscript & GSview</a></li>
+ <li><a href="toolbox8.html">ImageMagick</a></li>
+ <li><a href="toolbox9.html">Inkscape</a></li>
+ <li><a href="toolbox10.html">KSnapshot</a></li>
+ <li><a href="toolbox11.html">Tracing Tools</a></li>
+ <li><a href="toolbox12.html">WINE</a></li>
+ <li><a href="toolbox13.html">XNview</a></li>
+ <li><a href="toolbox14.html">Lprof</a></li>
+ <li><a href="toolbox15.html">Krita</a></li>
</ul>
<h4>A note on PDF Viewers:</h4>
-<p>One of the challenges with PDF and EPS viewers on Linux, is that Scribus creates high end PS level 3, PDF 1.4 and PDF 1.6 in the future. Sometimes these features are beyond the capabilities of some open source viewers. Some of these features are necessary for reliable commercial printing and only supported in commercial pre-press or DTP tools. Four years of working with Scribus has led me to the strongly held conclusion that the following three viewers are the most reliable at displaying PS/EPS/PDF created by Scribus:</p>
+
+<p>One of the challenges with PDF in general is that
+Scribus creates high-end PDF files. Sometimes their features are beyond
+the capabilities of some open
+source viewers, while necessary for reliable
+commercial printing and only supported in commercial pre-press or DTP
+tools. Years of working with Scribus have led to the strongly
+held conclusion that the following viewers are the most reliable
+at displaying PS/EPS/PDF created by Scribus:</p>
+
<ul>
- <li><strong>Acrobat Reader 7.0.x for Linux</strong> - The best and sometimes the only choice for PDF viewing. Detailed notes and hints: <a href="toolbox1.html">Adobe Acrobat Reader.</a> </li>
-
- <li><strong>GSview 4.8+</strong> - with the latest version of Ghostscript available. This combination is your best choice for viewing EPS files, PS files and most PDFs. In addition, GSview has many other very useful capabilities with add-ons like <code>pstoedit</code> and <code>epstool</code>. For more detailed notes and hints: <a href="/index.php?lang=en&sm=dtptoolbox&page=toolbox6">GSview</a>. I consider it an essential tool for DTP on Linux.</li>
- <li><strong>Kpdf from KDE 3.5+</strong> - This updated PDF viewer based on Xpdf has a new rendering engine and is capable of viewing PDF 1.5 files. There is a vast improvement from Kpdf 3.3 > Kpdf 3.4. This no knock on Gnome, just based on my experience with the latest from both DE's. </li>
+
+ <li><strong>Adobe Reader 7.x or later</strong> – The best and
+sometimes the only choice for PDF viewing. Detailed notes and hints: <a href="toolbox1.html">Adobe Reader.</a> </li>
+ <li><strong>GSview 4.8+</strong> with the latest version of
+Ghostscript available. This combination is your best choice for viewing
+EPS files, PS files and most PDFs. In addition, GSview has many other
+very useful capabilities with add-ons like <code>pstoedit</code> and <code>epstool</code>.
+For more detailed notes and hints: <a href="toolbox6.html">GSview</a>.</li>
</ul>
-<p><strong>If any other PDF or EPS viewer you choose cannot display PDFs from Scribus, but they do view properly in Acrobat Reader 5+, file a bug with the upstream author. I cannot stress this enough. In virtually all cases I have tested, it is a limitation of the viewing application. Scribus PDFs are tested daily with specialist pre-press software to validate their adherence to the published PDF specifications.</strong></p></div>
-</body>
-</html>
+<p><strong>If any other PDF or EPS viewer you choose cannot display
+PDFs from Scribus, but they do view properly in Adobe Reader, file
+a bug with the upstream author. It cannot be stressed this enough. In
+virtually all cases that have been tested, it is a limitation of the
+viewing
+application. Scribus PDFs are tested daily with specialist pre-press
+software to validate their adherence to the published PDF
+specifications.</strong></p>
+
+</body></html>
Modified: branches/ScribusOIF/doc/en/toolbox6.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15576&path=/branches/ScribusOIF/doc/en/toolbox6.html
==============================================================================
--- branches/ScribusOIF/doc/en/toolbox6.html (original)
+++ branches/ScribusOIF/doc/en/toolbox6.html Mon Oct 18 21:11:59 2010
@@ -1,35 +1,95 @@
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>GSview and Scribus</title>
-</head>
-<body>
-<h2>GSview and Scribus</h2>
-<p><strong>Parts of this section are thanks to Russell Lang, author and maintainer of GSview, epstool and Ghostscript for his hints and patiently answering my questions about GSview and Ghostscript. It has allowed the Scribus Team to use some of the more advanced features of Ghostscript in Scribus. </strong></p>
-<p>First off, It is in my very strong opinion, <strong>a superior replacement for gv and derivatives. Moreover, for viewing PDF for print purposes, it is more reliable than any other open source PDF viewer.</strong> Although Acrobat Reader® is in my experience sometimes a better pure viewer for PDF, I also consider GSview one of the most essential tools to have when using Scribus. GSview has a handful of extremely useful functions. For those unfamiliar, it provides an easy to use "front end" to
-Ghostscript, as well as <code>pstoedit</code> for converting bitmaps into vector files. For those coming from the Windows/Mac world, it also has the functionality of Distiller with a graphical front end for those applications which do not export PDF natively.</p>
-<p>Second ensure you have the latest version 4.7+. (GSview migrated from the Windows world, where it has been excellent since the 4.x versions.)</p>
-<p>Third, for GSview to work properly, the font paths must be setup in the GSview Preferences correctly. Notes further on.</p>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head>
+
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>GSview and Scribus</title>
+
+
+</head><body>
+<h2>GSview*</h2>
+
+<p>One important thing to note is that <a href="http://pages.cs.wisc.edu/%7Eghost/gsview/index.htm">GSview</a> <span style="font-style: italic;">must not be confused</span> with <strong style="font-weight: normal;">ghostview, gv and their derivatives!</strong>
+Although Adobe Reader® is often a better pure viewer for PDFs, GSview
+should be regarded as one of the most essential tools to have when
+using
+Scribus. GSview has some extremely useful functions. For those
+unfamiliar with the program, it provides an easy to use “front end†to
+Ghostscript, as well as <code>pstoedit</code> for converting bitmaps
+into vector files or vice versa. For those coming from a traditional
+DTP background in the Mac/Windows world, it also
+provides some of the functionality of Acrobat Distiller.<br>
+</p>
+
+<p>You should always use the latest version, at least 4.7. (GSview
+migrated from the
+Windows world, where it has been excellent since the 4.x versions.)</p>
+
<p>For use with Scribus, GSview has the following features:</p>
+
<ul>
- <li>With the help of <a href="http://pstoedit.net">pstoedit</a>, you can convert bitmap images or PDF content back into SVG and other scalable vector file formats.</li>
- <li>The ability to preview, convert and add previews (Tiff recommended) for raw EPS (Encapsulated PostScript Files). This is done using <a href="http://www.cs.wisc.edu/~ghost/gsview/epstool.htm">Epstool</a> from the same author. Epstool can also fix EPS files with incorrect or missing bounding boxes. This is a separate tool to be installed and works as a plugin like pstoedit.</li>
- <li>The ability to extract text from a PDF.</li>
- <li>The ability to preview, convert and add previews for raw PostScript files. An easy to use interface for creating PDF's in applications without the high level of export capabilities of Scribus. (You are still recommended to use the Export to PDF Scribus, as it is optimized for Scribus files.)</li>
- <li>As an easy to use front end to Ghostscript's less well known features such as image conversion and re-sampling. The example below uses the <strong>epswrite</strong> "device". There are others in Ghostscript including: converting between TIFF formats, changing the color depth of at TIFF, JPEG or the color space of an image.</li>
+
+ <li>With the help of <a href="http://pstoedit.net">pstoedit</a>, you
+can convert bitmap images or PDF content back into SVG and other
+scalable vector file formats.</li>
+ <li>The ability to preview, convert and add previews (TIFF
+recommended) for raw EPS (Encapsulated PostScript files).</li>
+ <li>The ability to extract text from a PDF.</li>
+ <li>The ability to preview, convert and add previews for raw
+PostScript files.</li>
+ <li>An easy-to-use front end to Ghostscript’s less well known
+features such as image conversion and re-sampling. There are other
+features in
+Ghostscript, including: converting between TIFF formats, changing the
+color depth of a TIFF, JPEG or the color space of an image.</li>
</ul>
-<p>One example where I use GSview with Scribus is for troubleshooting/fixing EPS files which do not display correctly within Scribus. Although many applications can generate EPS files, some add their own quirks into the EPS, which can cause problems when used in other applications (like Scribus).</p>
-<p>So, if you find difficulty with an EPS or PDF you wish to use in Scribus, open the EPS in GSview. Then, use the key command <strong>M</strong> to display messages from Ghostscript. The messages can indicate problems which cause display or printing errors. You can also use the <strong>epswrite</strong> "device" to re-save the EPS, which can help to strip out or fix issues with an EPS.</p>
-<p>You can also <em>rasterize</em> an EPS image like this, by converting to PNG or TIFF and then resize, adjust colors etc with an image program like GIMP or Corel Photoshop. I did this with a troublesome EPS and converted it to a 600DPI PNG, which would then display and print perfectly from Scribus. Sometimes when working with images and DTP there are several different ways to accomplish the same task - in my example, it was getting a complex EPS file from Illustrator to display and print properly from Scribus. The fact that there problem displaying the EPS, was not a bug in Scribus, but some non-standard PostScript info in the file, which by using Ghostscript as a back end to GSview I could strip out and then display properly in Scribus.</p>
-<p> Note: GSview uses the <code>libgs.so</code> shared library to access Ghostscript. Not all Linux distributions ship this, so the hints for compiling Ghostscript with a paralell install really apply here. </p>
+
+<p>One example where GSview is extremely useful with Scribus is
+troubleshooting or fixing EPS files that do not display correctly
+within
+Scribus. Although many applications can generate EPS files, some add
+their own quirks into the EPS, which can cause problems when used in
+other programs (like Scribus).</p>
+
+<p>So, if you find difficulty with an EPS you wish to use in
+Scribus, open the EPS in GSview. Then, use the key command <strong>M</strong>
+to display messages from Ghostscript. The messages can indicate
+problems which cause display or printing errors. You can also use the <strong>epswrite</strong>
+“device†to re-save the EPS, which can help to strip out or fix issues
+with an EPS.</p>
+
+<p>You can also <em>rasterize</em> an EPS image, by converting it to
+PNG
+or TIFF and then resize, adjust colors etc with an image program like
+GIMP or Krita.<br>
+</p>
+
+<p> Note that GSview uses the <code>libgs.so</code> shared library to
+access Ghostscript. Not all Linux distributions ship this, so the hints
+for compiling Ghostscript with a paralell install really apply here. </p>
+
<h4>Getting Gsview:</h4>
-<p>Not all Linux distributions offer GSview. However, for those with rpm based systems, a simple rpm command will have you with an easy to install rpm. The GSview tarball already has a built-in spec file. A simple: </p>
-<blockquote><table width="100%" border="1" bgcolor="#eeeeee"><tr><td border="0">
-<pre>
-rpmbuild -tb ./gsview-4.7.tar.gz
-</pre></td></tr></table></blockquote>
-<p>Will get you started. Windows has a convetional setup.exe installer. Unfortunately, it is not yet available for MacOSX. </p>
-<p>GSview since about 4.3, has been, in my experience, the most reliable and versatile PDF viewer along with Acrobat Reader on Linux. For DTP with Scribus, I consider it essential.</p>
-<p>Now, for advanced hints with GSview and Ghostscript, see: <a href="toolbox7.html">Advanced Ghostscript and GSview Hints</a>. For detailed hints on setting up Ghostscript to help you find all your fonts, see: <a href="gsfont.html">Ghostscript Fonts</a>.</p>
-</body>
-</html>
+
+<p>GSview is available for most Linux distributions, at least the major
+ones. Otherwise you can build GSview by following
+the instructions provided in the <a href="http://pages.cs.wisc.edu/%7Eghost/">source package</a>. For
+Windows and OS/2 and eComStation you can download <a href="http://pages.cs.wisc.edu/%7Eghost/gsview/get49.htm">conventional
+installers</a> .
+Unfortunately, there is no current version for Mac OS X available. </p>
+
+<p>A special note to users of OpenSUSE 11.3: The required GTK 1
+libraries are no longer available for this Linux distribution, but you
+can use the <a href="http://download.opensuse.org/repositories/GNOME:/GNOME1/openSUSE_11.2/i586/">versions
+compiled for 11.2</a>. You need to install the gtk-1.20 and glib
+packages (if you want to build GSview yourself, you also need the
+respective devel RPMs), as well as the <a href="http://download.opensuse.org/repositories/GNOME:/GNOME1/openSUSE_11.2/noarch/gtk-lang-1.2.10-1093.1.noarch.rpm">lang
+package</a>.<br>
+</p>
+
+<p>Now, for advanced hints with GSview and Ghostscript, see: <a href="toolbox7.html">Advanced Ghostscript and GSview Hints</a></p>
+
+<p>*) <span style="font-style: italic;">Parts of this section are
+thanks to Russell Lang, author and maintainer of GSview, epstool and
+Ghostscript for his hints and patiently answering questions about
+GSview and Ghostscript.</span></p>
+
+</body></html>
Modified: branches/ScribusOIF/resources/loremipsum/de.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15576&path=/branches/ScribusOIF/resources/loremipsum/de.xml
==============================================================================
--- branches/ScribusOIF/resources/loremipsum/de.xml (original)
+++ branches/ScribusOIF/resources/loremipsum/de.xml Mon Oct 18 21:11:59 2010
@@ -7,11 +7,11 @@
<p>Weit hinten, hinter den Wortbergen, fern der Länder Vokalien und Konsonantien leben die Blindtexte. Abgeschieden wohnen Sie in Buchstabhausen an der Küste des Semantik, eines großen Sprachozeans. Ein kleines Bächlein namens Duden fließt durch ihren Ort und versorgt sie mit den nötigen Regelialien. Es ist ein paradiesmatisches Land, in dem einem gebratene Satzteile in den Mund fliegen. Nicht einmal von der allmächtigen Interpunktion werden die Blindtexte beherrscht - ein geradezu unorthographisches Leben.</p>
-<p>Eines Tages aber beschloß eine kleine Zeile Blindtext, ihr Name war Lorem Ipsum, hinaus zu gehen in die weite Grammatik. Der große Oxmox riet ihr davon ab, da es dort wimmele von bösen Kommata, wilden Fragezeichen und hinterhältigen Semikoli, doch das Blindtextchen ließ sich nicht beirren. Es packte seine sieben Versalien, schob sich sein Initial in den Gürtel und machte sich auf den Weg.</p>
+<p>Eines Tages aber beschloß eine kleine Zeile Blindtext, ihr Name war Lorem Ipsum, hinauszugehen in die weite Grammatik. Der große Oxmox riet ihr davon ab, da es dort wimmele von bösen Kommata, wilden Fragezeichen und hinterhältigen Semikoli, doch das Blindtextchen ließ sich nicht beirren. Es packte seine sieben Versalien, schob sich sein Initial in den Gürtel und machte sich auf den Weg.</p>
<p>Als es die ersten Hügel des Kursivgebirges erklommen hatte, warf es einen letzten Blick zurück auf die Skyline seiner Heimatstadt Buchstabhausen, die Headline von Alphabetdorf und die Subline seiner eigenen Straße, der Zeilengasse. Wehmütig lief ihm eine rethorische Frage über die Wange, dann setzte es seinen Weg fort.</p>
-<p>Unterwegs traf es eine Copy. Die Copy warnte das Blindtextchen, da, wo sie herkäme wäre sie zigmal umgeschrieben worden und alles, was von ihrem Ursprung noch übrig wäre, sei das Wort „und“ und das Blindtextchen solle umkehren und wieder in sein eigenes, sicheres Land zurückkehren.</p>
+<p>Unterwegs traf es eine Copy. Die Copy warnte das Blindtextchen, da, wo sie herkäme, wäre sie zigmal umgeschrieben worden und alles, was von ihrem Ursprung noch übrig wäre, sei das Wort „und“ und das Blindtextchen solle umkehren und wieder in sein eigenes, sicheres Land zurückkehren.</p>
-<p>Doch alles Gutzureden konnte es nicht überzeugen und so dauerte es nicht lange, bis ihm ein paar heimtückische Werbetexter auflauerten, es mit Longe und Parole betrunken machten und es dann in ihre Agentur schleppten, wo sie es für ihre Projekte wieder und wieder mißbrauchten. Und wenn es nicht umgeschrieben wurde, dann benutzen Sie es immernoch.</p>
+<p>Doch alles Gutzureden konnte es nicht überzeugen, und so dauerte es nicht lange, bis ihm ein paar heimtückische Werbetexter auflauerten, es mit Langue und Parole betrunken machten und es dann in ihre Agentur schleppten, wo sie es für ihre Projekte wieder und wieder mißbrauchten. Und wenn es nicht umgeschrieben wurde, dann benutzen Sie es immer noch.</p>
</lorem>
Modified: branches/ScribusOIF/resources/templates/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15576&path=/branches/ScribusOIF/resources/templates/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/resources/templates/CMakeLists.txt (original)
+++ branches/ScribusOIF/resources/templates/CMakeLists.txt Mon Oct 18 21:11:59 2010
@@ -45,4 +45,53 @@
sc_presentation/presentation.sla.gz
sc_presentation/presentationtn.png
DESTINATION ${TEMPLATEDIR}sc_presentation
+)
+
+INSTALL(FILES
+cc/Cheat_Cube.png
+cc/Cheat_Cubetn.png
+cc/Cheat_Cube.sla.gz
+ DESTINATION ${TEMPLATEDIR}cc
+)
+
+INSTALL(FILES
+mc/menu_template1.png
+mc/menu_template1tn.png
+mc/menu_template1.sla.gz
+ DESTINATION ${TEMPLATEDIR}mc
+)
+
+INSTALL(FILES
+cover1/cover1.png
+cover1/cover1tn.png
+cover1/cover1.sla.gz
+ DESTINATION ${TEMPLATEDIR}cover1
+)
+
+INSTALL(FILES
+cover2/cover2.png
+cover2/cover2tn.png
+cover2/cover2.sla.gz
+ DESTINATION ${TEMPLATEDIR}cover2
+)
+
+INSTALL(FILES
+cover3/cover3.png
+cover3/cover3tn.png
+cover3/cover3.sla.gz
+ DESTINATION ${TEMPLATEDIR}cover3
+)
+
+INSTALL(FILES
+cover4/cover4.png
+cover4/cover4tn.png
+cover4/cover4.sla.gz
+ DESTINATION ${TEMPLATEDIR}cover4
+)
+
+INSTALL(FILES
+cover5/cover5.png
+cover5/cover5tn.png
+cover5/cover5.sla.gz
+ DESTINATION ${TEMPLATEDIR}cover5
)
Modified: branches/ScribusOIF/resources/templates/template.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15576&path=/branches/ScribusOIF/resources/templates/template.xml
==============================================================================
--- branches/ScribusOIF/resources/templates/template.xml (original)
+++ branches/ScribusOIF/resources/templates/template.xml Mon Oct 18 21:11:59 2010
@@ -70,4 +70,102 @@
<author>Petr Vaněk</author>
<email>petr at yarpen.cz</email>
</template>
+ <template category="Packaging">
+ <name>Cheat_Cube</name>
+ <file>cc/Cheat_Cube.sla.gz</file>
+ <tnail>cc/Cheat_Cubetn.png</tnail>
+ <img>cc/Cheat_Cube.png</img>
+ <psize>custom, 1052x744</psize>
+ <color>color</color>
+ <descr></descr>
+ <usage></usage>
+ <scribus_version>1.3.9.svn</scribus_version>
+ <date>2010-10-18</date>
+ <author>Fedora Project</author>
+ <email></email>
+ </template>
+ <template category="Cards">
+ <name>menu_template1</name>
+ <file>mc/menu_template1.sla.gz</file>
+ <tnail>mc/menu_template1tn.png</tnail>
+ <img>mc/menu_template1.png</img>
+ <psize>custom, 1224x792</psize>
+ <color>color</color>
+ <descr>Simple menu card template</descr>
+ <usage></usage>
+ <scribus_version>1.3.9.svn</scribus_version>
+ <date>2010-10-18</date>
+ <author>vectorportal.com</author>
+ <email></email>
+ </template>
+ <template category="Brochures">
+ <name>cover1</name>
+ <file>cover1/cover1.sla.gz</file>
+ <tnail>cover1/cover1tn.png</tnail>
+ <img>cover1/cover1.png</img>
+ <psize>A4, Hochformat</psize>
+ <color>Color</color>
+ <descr></descr>
+ <usage></usage>
+ <scribus_version>1.3.9.svn</scribus_version>
+ <date>2010-10-18</date>
+ <author>vectorportal.com</author>
+ <email></email>
+ </template>
+ <template category="Brochures">
+ <name>cover2</name>
+ <file>cover2/cover2.sla.gz</file>
+ <tnail>cover2/cover2tn.png</tnail>
+ <img>cover2/cover2.png</img>
+ <psize>A4, Hochformat</psize>
+ <color>Color</color>
+ <descr></descr>
+ <usage></usage>
+ <scribus_version>1.3.9.svn</scribus_version>
+ <date>2010-10-18</date>
+ <author>vectorportal.com</author>
+ <email></email>
+ </template>
+ <template category="Brochures">
+ <name>cover3</name>
+ <file>cover3/cover3.sla.gz</file>
+ <tnail>cover3/cover3tn.png</tnail>
+ <img>cover3/cover3.png</img>
+ <psize>A4, Hochformat</psize>
+ <color>Color</color>
+ <descr></descr>
+ <usage></usage>
+ <scribus_version>1.3.9.svn</scribus_version>
+ <date>2010-10-18</date>
+ <author>vectorportal.com</author>
+ <email></email>
+ </template>
+ <template category="Brochures">
+ <name>cover4</name>
+ <file>cover4/cover4.sla.gz</file>
+ <tnail>cover4/cover4tn.png</tnail>
+ <img>cover4/cover4.png</img>
+ <psize>A4, Hochformat</psize>
+ <color>Color</color>
+ <descr></descr>
+ <usage></usage>
+ <scribus_version>1.3.9.svn</scribus_version>
+ <date>2010-10-18</date>
+ <author>vectorportal.com</author>
+ <email></email>
+ </template>
+ <template category="Brochures">
+ <name>cover5</name>
+ <file>cover5/cover5.sla.gz</file>
+ <tnail>cover5/cover5tn.png</tnail>
+ <img>cover5/cover5.png</img>
+ <psize>A4, Hochformat</psize>
+ <color>Color</color>
+ <descr></descr>
+ <usage></usage>
+ <scribus_version>1.3.9.svn</scribus_version>
+ <date>2010-10-18</date>
+ <author>vectorportal.com</author>
+ <email></email>
+ </template>
</templates>
Modified: branches/ScribusOIF/scribus/scribusXml.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15576&path=/branches/ScribusOIF/scribus/scribusXml.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribusXml.cpp (original)
+++ branches/ScribusOIF/scribus/scribusXml.cpp Mon Oct 18 21:11:59 2010
@@ -171,6 +171,8 @@
OB->fill_gradient.clearStops();
if (OB->PType == PageItem::Symbol)
OB->pattern = attrAsString(attrs, "pattern", "");
+ OB->mGArrayRows = 1;
+ OB->mGArrayCols = 1;
if (OB->GrType != 0)
{
if (OB->GrType == 8)
@@ -1103,7 +1105,6 @@
{
ff = fileName;
}
-
// In case ff contains some old broken scribus xml
ff.replace(QChar(5), SpecialChars::PARSEP);
ff.replace(QChar(4), SpecialChars::TAB);
Modified: branches/ScribusOIF/scribus/scribusview.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15576&path=/branches/ScribusOIF/scribus/scribusview.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribusview.cpp (original)
+++ branches/ScribusOIF/scribus/scribusview.cpp Mon Oct 18 21:11:59 2010
@@ -866,8 +866,15 @@
m_ScMW->newActWin(((ScribusWin*)(Doc->WinHan))->getSubWin());
updateContents();
//>>
- QFileInfo fi(url.toLocalFile());
- QString ext = fi.suffix().toUpper();
+ QFileInfo fi;
+ QString ext = "";
+ if (!e->mimeData()->formats().contains("application/x-scribus-elem"))
+ {
+ fi.setFile(url.toLocalFile());
+ ext = fi.suffix().toUpper();
+ }
+// QFileInfo fi(url.toLocalFile());
+// QString ext = fi.suffix().toUpper();
QStringList imfo;
QList<QByteArray> imgs = QImageReader::supportedImageFormats();
for (int i = 0; i < imgs.count(); ++i )
Modified: branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15576&path=/branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp (original)
+++ branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp Mon Oct 18 21:11:59 2010
@@ -69,6 +69,9 @@
setSelectionMode(QAbstractItemView::SingleSelection);
setContextMenuPolicy(Qt::CustomContextMenu);
setIconSize(QSize(60, 60));
+ setGridSize(QSize(70, 80));
+ setSpacing(10);
+ setTextElideMode(Qt::ElideMiddle);
objectMap.clear();
ScFilename = "";
visibleName = "";
@@ -185,11 +188,12 @@
e->ignore();
}
-void BibView::AddObj(QString name, QString daten, QPixmap Bild, bool isDir, bool isRaster)
+void BibView::AddObj(QString name, QString daten, QPixmap Bild, bool isDir, bool isRaster, bool isVector)
{
struct Elem DrElem;
DrElem.isDir = isDir;
DrElem.isRaster = isRaster;
+ DrElem.isVector = isVector;
DrElem.Data = daten;
DrElem.Preview = Bild;
objectMap.insert(name, DrElem);
@@ -766,7 +770,7 @@
}
}
}
- AddObj(fi.fileName(), QDir::cleanPath(QDir::convertSeparators(name + "/" + d4[dc])), pm);
+ AddObj(fi.fileName(), QDir::cleanPath(QDir::convertSeparators(name + "/" + d4[dc])), pm, false, false, true);
}
}
}
@@ -818,7 +822,6 @@
{
if (itf.value().isDir)
{
-// itf.value().Preview = itf.value().Preview.scaled(60, 60, Qt::KeepAspectRatio, Qt::SmoothTransformation);
QPixmap pm(60, 60);
pm.fill(palette().color(QPalette::Base));
QPainter p;
@@ -827,6 +830,7 @@
p.end();
QListWidgetItem *item = new QListWidgetItem(QIcon(pm), itf.key(), this);
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+ itf.value().widgetItem = item;
}
}
for (itf = objectMap.begin(); itf != objectMap.end(); ++itf)
@@ -840,7 +844,8 @@
p.begin(&pm);
p.drawPixmap(30 - itf.value().Preview.width() / 2, 30 - itf.value().Preview.height() / 2, itf.value().Preview);
p.end();
- new QListWidgetItem(QIcon(pm), itf.key(), this);
+ QListWidgetItem *item = new QListWidgetItem(QIcon(pm), itf.key(), this);
+ itf.value().widgetItem = item;
}
}
}
@@ -872,12 +877,33 @@
closeButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
closeButton->setIcon(loadIcon("16/close.png"));
closeButton->setIconSize(QSize(16, 16));
+ configButton = new QToolButton(this);
+ configButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+ configButton->setIcon(loadIcon("16/configure.png"));
+ configButton->setIconSize(QSize(16, 16));
+ configMenue = new QMenu();
+ conf_HideDirs = configMenue->addAction( tr("Hide Directorys"));
+ conf_HideDirs->setCheckable(true);
+ conf_HideDirs->setChecked(false);
+ conf_HideImages = configMenue->addAction( tr("Hide Images"));
+ conf_HideImages->setCheckable(true);
+ conf_HideImages->setChecked(false);
+ conf_HideVectors = configMenue->addAction( tr("Hide Vector files"));
+ conf_HideVectors->setCheckable(true);
+ conf_HideVectors->setChecked(false);
+ configMenue->addSeparator();
+ conf_OpenMode = configMenue->addAction( tr("Open Directorys in a new tab"));
+ conf_OpenMode->setCheckable(true);
+ conf_OpenMode->setChecked(false);
+ configButton->setMenu(configMenue);
+ configButton->setPopupMode(QToolButton::InstantPopup);
buttonLayout->addWidget( newButton );
buttonLayout->addWidget( upButton );
buttonLayout->addWidget( importButton );
buttonLayout->addWidget( closeButton );
QSpacerItem* spacer = new QSpacerItem( 1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum );
buttonLayout->addItem( spacer );
+ buttonLayout->addWidget( configButton );
BiblioLayout->addLayout( buttonLayout );
Frame3 = new QToolBox( this );
@@ -892,12 +918,18 @@
BiblioLayout->addWidget( Frame3 );
languageChange();
+ prefs = PrefsManager::instance()->prefsFile->getContext("Scrapbook");
+ conf_HideDirs->setChecked(prefs->getBool("hideDirs", false));
+ conf_HideImages->setChecked(prefs->getBool("hideImages", false));
+ conf_HideVectors->setChecked(prefs->getBool("hideVectors", false));
+ conf_OpenMode->setChecked(prefs->getBool("openMode", false));
connect(newButton, SIGNAL(clicked()), this, SLOT(NewLib()));
connect(upButton, SIGNAL(clicked()), this, SLOT(goOneDirUp()));
connect(importButton, SIGNAL(clicked()), this, SLOT(Import()));
connect(closeButton, SIGNAL(clicked()), this, SLOT(closeLib()));
connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
+ connect(configMenue, SIGNAL(triggered(QAction *)), this, SLOT(updateView()));
}
void Biblio::setOpenScrapbooks(QStringList &fileNames)
@@ -931,6 +963,7 @@
activeBView = (BibView*)Frame3->widget(0);
Frame3->setCurrentIndex(0);
upButton->setEnabled(false);
+ updateView();
connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
connect(activeBView, SIGNAL(objDropped(QString)), this, SLOT(ObjFromMenu(QString)));
connect(activeBView, SIGNAL(fileDropped(QString, int)), this, SLOT(ObjFromFile(QString, int)));
@@ -1003,6 +1036,28 @@
ScrPaletteBase::installEventFilter(filterObj);
activeBView->installEventFilter(filterObj);
tempBView->installEventFilter(filterObj);
+}
+
+void Biblio::updateView()
+{
+ for (int a = 0; a < Frame3->count(); a++)
+ {
+ BibView* bv = (BibView*)Frame3->widget(a);
+ QMap<QString, BibView::Elem>::Iterator itf;
+ for (itf = bv->objectMap.begin(); itf != bv->objectMap.end(); ++itf)
+ {
+ if (itf.value().isDir)
+ itf.value().widgetItem->setHidden(conf_HideDirs->isChecked());
+ if (itf.value().isRaster)
+ itf.value().widgetItem->setHidden(conf_HideImages->isChecked());
+ if (itf.value().isVector)
+ itf.value().widgetItem->setHidden(conf_HideVectors->isChecked());
+ }
+ }
+ prefs->set("hideDirs", conf_HideDirs->isChecked());
+ prefs->set("hideImages", conf_HideImages->isChecked());
+ prefs->set("hideVectors", conf_HideVectors->isChecked());
+ prefs->set("openMode", conf_OpenMode->isChecked());
}
void Biblio::NewLib()
@@ -1040,6 +1095,7 @@
dirs->set("scrap_load", d.absolutePath());
activeBView->scrollToTop();
upButton->setEnabled(!((Frame3->currentIndex() == 0) || (Frame3->currentIndex() == 1)));
+ updateView();
connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
connect(activeBView, SIGNAL(objDropped(QString)), this, SLOT(ObjFromMenu(QString)));
connect(activeBView, SIGNAL(fileDropped(QString, int)), this, SLOT(ObjFromFile(QString, int)));
@@ -1068,6 +1124,7 @@
readContents(activeBView->ScFilename);
}
activeBView->scrollToTop();
+ updateView();
}
}
@@ -1155,6 +1212,7 @@
bv->scrollToTop();
}
}
+ updateView();
}
void Biblio::handleDoubleClick(QListWidgetItem *ite)
@@ -1166,6 +1224,14 @@
QString fileName = activeBView->ScFilename + "/" + ite->text();
QDir d(fileName);
QFileInfo fd(fileName);
+ if (conf_OpenMode->isChecked())
+ {
+ activeBView = new BibView(this);
+ if (fd.isWritable())
+ Frame3->addItem(activeBView, d.dirName());
+ else
+ Frame3->addItem(activeBView, QIcon(loadIcon("16/lock.png")), d.dirName());
+ }
activeBView->canWrite = fd.isWritable();
activeBView->setAcceptDrops(activeBView->canWrite);
activeBView->ReadContents(fileName);
@@ -1179,6 +1245,7 @@
PrefsContext* dirs = PrefsManager::instance()->prefsFile->getContext("dirs");
dirs->set("scrap_load", d.absolutePath());
activeBView->scrollToTop();
+ updateView();
}
else
{
@@ -1209,6 +1276,7 @@
PrefsContext* dirs = PrefsManager::instance()->prefsFile->getContext("dirs");
dirs->set("scrap_load", d.absolutePath());
activeBView->scrollToTop();
+ updateView();
}
void Biblio::handlePasteToPage()
@@ -1368,7 +1436,8 @@
p.begin(&pm2);
p.drawPixmap(30 - pm.width() / 2, 30 - pm.height() / 2, pm);
p.end();
- new QListWidgetItem(QIcon(pm), nam, bv);
+ QListWidgetItem *item = new QListWidgetItem(QIcon(pm), nam, bv);
+ bv->objectMap[nam].widgetItem = item;
if (bv == tempBView)
{
tempCount++;
@@ -1615,6 +1684,8 @@
{
if (!activeBView->canWrite)
return;
+ bool isImage = false;
+ bool isVector = false;
QString tmp;
QFileInfo fi(path);
if ( fi.exists() )
@@ -1652,6 +1723,7 @@
cms.allowColorManagement(false);
if (im.loadPicture(path, 1, cms, ScImage::Thumbnail, 72, &mode))
img = im.scaled(60, 60, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+ isImage = true;
}
else
{
@@ -1661,6 +1733,7 @@
img = fmt->readThumbnail(path);
img = img.scaled(60, 60, Qt::KeepAspectRatio, Qt::SmoothTransformation);
}
+ isVector = true;
}
QByteArray cf;
if (!loadRawText(path, cf))
@@ -1683,14 +1756,19 @@
}
img.save(QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename + "/.ScribusThumbs/" + nam +".png")), "PNG");
}
- activeBView->AddObj(nam, QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename + "/" + nam + "." + fi.completeSuffix())), pm);
+ activeBView->AddObj(nam, QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename + "/" + nam + "." + fi.completeSuffix())), pm, false, isImage, isVector);
QPixmap pm2(60, 60);
pm2.fill(palette().color(QPalette::Base));
QPainter p;
p.begin(&pm2);
p.drawPixmap(30 - pm.width() / 2, 30 - pm.height() / 2, pm);
p.end();
- new QListWidgetItem(QIcon(pm2), nam, activeBView);
+ QListWidgetItem *item = new QListWidgetItem(QIcon(pm2), nam, activeBView);
+ activeBView->objectMap[nam].widgetItem = item;
+ if (isImage)
+ item->setHidden(conf_HideImages->isChecked());
+ if (isVector)
+ item->setHidden(conf_HideVectors->isChecked());
if (Frame3->currentIndex() == 1)
{
if (tempBView->objectMap.count() > PrefsManager::instance()->appPrefs.scrapbookPrefs.numScrapbookCopies)
@@ -1791,7 +1869,8 @@
p.begin(&pm2);
p.drawPixmap(30 - pm.width() / 2, 30 - pm.height() / 2, pm);
p.end();
- new QListWidgetItem(QIcon(pm2), nam, activeBView);
+ QListWidgetItem *item = new QListWidgetItem(QIcon(pm2), nam, activeBView);
+ activeBView->objectMap[nam].widgetItem = item;
delete pre;
if (Frame3->currentIndex() == 1)
{
@@ -1866,7 +1945,8 @@
p.begin(&pm2);
p.drawPixmap(30 - pm.width() / 2, 30 - pm.height() / 2, pm);
p.end();
- new QListWidgetItem(QIcon(pm2), nam, tempBView);
+ QListWidgetItem *item = new QListWidgetItem(QIcon(pm2), nam, tempBView);
+ tempBView->objectMap[nam].widgetItem = item;
delete pre;
if (tempBView->objectMap.count() > PrefsManager::instance()->appPrefs.scrapbookPrefs.numScrapbookCopies)
{
@@ -1956,7 +2036,8 @@
p.begin(&pm2);
p.drawPixmap(30 - pm.width() / 2, 30 - pm.height() / 2, pm);
p.end();
- new QListWidgetItem(QIcon(pm2), nam, actBView);
+ QListWidgetItem *item = new QListWidgetItem(QIcon(pm2), nam, actBView);
+ actBView->objectMap[nam].widgetItem = item;
delete pre;
}
@@ -2005,4 +2086,9 @@
upButton->setToolTip( tr( "Go up one Directory" ) );
importButton->setToolTip( tr( "Import a scrapbook file from Scribus <=1.3.2" ) );
closeButton->setToolTip( tr( "Close the selected scrapbook" ) );
-}
+ configButton->setToolTip( tr( "Configure the scrapbook" ) );
+ conf_HideDirs->setText( tr("Hide Directorys"));
+ conf_HideImages->setText( tr("Hide Images"));
+ conf_HideVectors->setText( tr("Hide Vector files"));
+ conf_OpenMode->setText( tr("Open Directorys in a new tab"));
+}
Modified: branches/ScribusOIF/scribus/ui/scrapbookpalette.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15576&path=/branches/ScribusOIF/scribus/ui/scrapbookpalette.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/scrapbookpalette.h (original)
+++ branches/ScribusOIF/scribus/ui/scrapbookpalette.h Mon Oct 18 21:11:59 2010
@@ -32,7 +32,7 @@
public:
BibView( QWidget* parent);
~BibView() {};
- void AddObj(QString name, QString daten, QPixmap Bild, bool isDir = false, bool isRaster = false);
+ void AddObj(QString name, QString daten, QPixmap Bild, bool isDir = false, bool isRaster = false, bool isVector = false);
void checkAndChange(QString &text, QString nam, QString dir);
void ReadOldContents(QString, QString newName);
void ReadContents(QString name);
@@ -40,8 +40,10 @@
{
bool isDir;
bool isRaster;
+ bool isVector;
QString Data;
QPixmap Preview;
+ QListWidgetItem* widgetItem;
};
QMap<QString,Elem> objectMap;
QString ScFilename;
@@ -109,6 +111,7 @@
void deleteAllObj();
void renameObj();
void NewLib();
+ void updateView();
void goOneDirUp();
void closeLib();
void libChanged(int index);
@@ -128,6 +131,13 @@
QToolButton* upButton;
QToolButton* importButton;
QToolButton* closeButton;
+ QToolButton* configButton;
+ QMenu* configMenue;
+ QAction* conf_HideDirs;
+ QAction* conf_HideImages;
+ QAction* conf_HideVectors;
+ QAction* conf_OpenMode;
+ PrefsContext* prefs;
};
#endif // BIBLIO_H
More information about the scribus-commit
mailing list