r15947 by jghali - merge trunk revisions up to r15946
scribus-commit
scribus-commit at lists.scribus.net
Mon Nov 22 01:02:58 CET 2010
Author: jghali
Date: Mon Nov 22 00:02:57 2010
New Revision: 15947
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15947
Log:
merge trunk revisions up to r15946
Modified:
branches/ScribusOIF/doc/en/color1.html
branches/ScribusOIF/doc/en/color2.html
branches/ScribusOIF/doc/en/color4.html
branches/ScribusOIF/doc/en/color8.html
branches/ScribusOIF/doc/en/images/docinfo.png
branches/ScribusOIF/doc/en/images/docinfo2.png
branches/ScribusOIF/doc/en/lipsum.html
branches/ScribusOIF/doc/en/menu.xml
branches/ScribusOIF/scribus/langmgr.cpp
branches/ScribusOIF/scribus/scribus.cpp
branches/ScribusOIF/scribus/scribus.h
branches/ScribusOIF/scribus/scribusapp.cpp
branches/ScribusOIF/scribus/scribuscore.cpp
Modified: branches/ScribusOIF/doc/en/color1.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/doc/en/color1.html
==============================================================================
--- branches/ScribusOIF/doc/en/color1.html (original)
+++ branches/ScribusOIF/doc/en/color1.html Mon Nov 22 00:02:57 2010
@@ -57,7 +57,7 @@
<tr valign=top>
<td><img src="images/register.png"></td>
<td></td>
- <td><b>Registration Color</b>: This is a special case of a CMYK color, which is used for registration marks. The latter are used by printers to determine whether a four-color print run has been successful. Each palette can only have one registration color, which is indicated by a “bull’s eye” icon.</td>
+ <td><b>Registration Color</b>: This is a special case of a “color”, which is used for registration marks. The latter are used by printers to determine whether a print run has been successful. While displayed as a CMYK color, it will actually consist of as many colors as there are color separations, one for each printing plate. Each palette can only have one registration color, which is indicated by a “bull’s eye” icon.</td>
<td></td>
</tr>
<tr valign=top>
Modified: branches/ScribusOIF/doc/en/color2.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/doc/en/color2.html
==============================================================================
--- branches/ScribusOIF/doc/en/color2.html (original)
+++ branches/ScribusOIF/doc/en/color2.html Mon Nov 22 00:02:57 2010
@@ -6,13 +6,13 @@
<body>
<h2>Editing and Managing Solid Colors (2)</h2>
<h3>Changing the Default Color Palette</h3>
-<p>To change the default colour palette, make sure that no Scribus document is open. Then open the Color Manager (<i>Edit > Colors</i>):</p>
+<p>To change the default color palette, make sure that no Scribus document is open. Then open the Color Manager (<i>Edit > Colors</i>):</p>
<table width="100%"><tr><td align="center"><img src="images/colrs-mgt1.png" title="Scribus Color Manager" alt="Scribus Color Manager" /></td></tr></table><br/>
<p>In the dialog you can select a new default palette for <i>new</i> documents. Any change you make here will not affect existing documents, as the color palette in such a document has been <a href="color1.html">stored</a> in the document itself. Some of the color palettes shipped with Scribus have been created for special purposes, so before you select another default palette, you should learn something about the color sets from the descriptions provided in subsequent sections. In some cases, your printer or a client may insist on the use of certain colors.</p>
<p>What you will notice immediately when you open the dialog is that you can’t edit any color in one of the palettes that are shipped with Scribus. This is a feature, not a bug, as the very purpose of standardized colors is to work across documents, computers or platforms with identical colors, which in turn have unique color values and color names. Thus, all color palettes that have been installed to directories to which you have read-only access are “locked”, i.e. prevented from editing.</p>
-<p>Sometimes, however, there are good reasons to edit a locked palette anyway, for example, if you need to reduce the number of colors in a palette for a certain project, i.e. if you need to create a “project palette”. In such a case you can click on the “Save Color Set” icon in the Color Manager. This will save the palette to your home directory and will add the copy to the list of available color sets. If you select the copy of the palette, you will notice that the editing options are now available. Be aware, though, that clicking “OK” will make all changes to the copy permanent!</p><br>
+<p>Sometimes, however, there are good reasons to edit a locked palette anyway, for example, if you need to reduce the number of colors in a palette for a certain project, i.e. if you need to create a “project palette”. In such a case you can click on the “Save Color Set” button in the Color Manager. This will save the palette to the folder <code>~/swatches</code> in your Scribus settings directory (e.g. <code>~.scribus/swatches</code> on Linux/UNIX) and will add the copy to the list of available color sets. If you select the copy of the palette, you will notice that the editing options are now available. Be aware, though, that clicking “OK” will make all changes to the copy permanent!</p><br>
<table width="100%"><tr><td align="center"><img src="images/colrs-mgt2.png" title="Saving an editable copy of a locked palette" alt="Saving an editable copy of a locked palette" /></td></tr></table><br/>
<h3>Installing or Importing New Color Palettes</h3>
Modified: branches/ScribusOIF/doc/en/color4.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/doc/en/color4.html
==============================================================================
--- branches/ScribusOIF/doc/en/color4.html (original)
+++ branches/ScribusOIF/doc/en/color4.html Mon Nov 22 00:02:57 2010
@@ -6,7 +6,7 @@
<body>
<h2>Color Palettes in Scribus (2): National/Government Standards</h2>
<p>In some countries the national standard bodies or governments themselves created standardized color sets, i.e., color standards that bidders/tenderers in calls for tenders must comply with. While some of these standards have niche applications, like military vessels or cables, others are considered to be “general purpose” color standards. The Scribus Team has collected and will continue to collect as many of those standards as possible, at least if they aren’t defined as a subset of other color “standards” like Pantone. We hope that this feature will facilitate the use of Scribus in government agencies.</p>
-<p>To use one of the standards reliably, you are advised to contact the respective government agency or standards organization, as they are selling reference materials like color fans or color chips. In many cases, the reference materials can also be bought from vendors of printing accessories. <b>The colors in the Scribus palettes are only approximations!</b></p>
+<p>To use one of the standards reliably, you are advised to contact the respective government agency or standards organization, as they are selling reference materials like color fans or color chips. In many cases, the reference materials can also be bought from vendors of printing accessories. <b>The colors in the Scribus palettes are only approximations!</b></p><br>
<table border="1">
<tbody>
<tr>
Modified: branches/ScribusOIF/doc/en/color8.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/doc/en/color8.html
==============================================================================
--- branches/ScribusOIF/doc/en/color8.html (original)
+++ branches/ScribusOIF/doc/en/color8.html Mon Nov 22 00:02:57 2010
@@ -5,7 +5,7 @@
</head>
<body>
<h2>Color Palettes in Scribus (6): Special Purpose Colors</h2>
-
+<br>
<table border="1">
<tbody>
<tr>
Modified: branches/ScribusOIF/doc/en/images/docinfo.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/doc/en/images/docinfo.png
==============================================================================
Binary files - no diff available.
Modified: branches/ScribusOIF/doc/en/images/docinfo2.png
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/doc/en/images/docinfo2.png
==============================================================================
Binary files - no diff available.
Modified: branches/ScribusOIF/doc/en/lipsum.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/doc/en/lipsum.html
==============================================================================
--- branches/ScribusOIF/doc/en/lipsum.html (original)
+++ branches/ScribusOIF/doc/en/lipsum.html Mon Nov 22 00:02:57 2010
@@ -1,15 +1,18 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>Adding Lipsum in your Language</title>
+ <title>Adding Sample Text in your Language</title>
</head>
<body>
-<h2>Adding Lipsum in your Language</h2>
-<p>When creating page layouts Lorem ipsum, also known simply as lipsum, is used as a placeholder for actual text before the real text is inserted. Scribus makes this very convenient to use by simply selecting, then right clicking a text frame and selecting <strong>Sample Text.</strong>. This allows you to visualize the layout or experiment with different fonts and effects before finalizing your design. Lipsum, based on a speech by Cicero is chosen as it uses a broad selection of letters from the Roman alphabet. However, if you use a non-Latin language, this can be a great distraction to your layout. </p>
-<P>Thus, this simple howto shows you how easy it is to add your own language if it not yet included with Scribus. </P>
-<p>The structure of the file is very simple XML, which anyone can use. Below is a shortened version of lipsum in Finnish.</p>
+<h2>Adding Sample Text in your Language</h2>
+<h3>Why Sample Text?</h3>
+<p>When creating page layouts a sample text, also known as “Lorem ipsum” or “lipsum” to typesetting professionals, is often used as a placeholder for actual text before the real text is inserted. The original Lorem ipsum consists of nonsensical Latin, the reason being the desire of typesetters to not distract from the impression of the text layout (font choice, font size, linespacing etc.). This can most easily be achieved with a nonsensical text, as the viewer will not be tempted to read. However, since one of the purposes of a Lorem ipsum is to show all letters in an alphabet, the original may not be well-suited for languages other than English or Latin, as most languages use either an extended Latin alphabet or no Latin alphabet at all.</p>
+<p>Scribus makes it very convenient to insert a smaple text by simply selecting, then right-clicking a text frame and selecting “Sample Text” from the Conext Menu. This allows you to visualize the layout or experiment with different fonts and effects before finalizing your design.</p>
+<h3>Creating a Sample Text for your Language</h3>
+<P>This simple HOWTO shows you how easy it is to add your own language or alphabet if it’s not yet included with Scribus. </P>
+<p>The structure of a lipsum file is very simple XML, which anyone can use. Below is a shortened version of a Finnish sample text.</p>
<pre>
- <?xml version="1.0" encoding="utf8"?>
+<?xml version="1.0" encoding="utf8"?>
<lorem>
<name>Finnish</name>
<author>http://www.dlc.fi/~frank/ite.htm</author>
@@ -19,12 +22,12 @@
Vaimo jännitti kovasti ja halusi kaiken sujuvan täydellisesti. Viime minuuteilla hän tajusi, ettei
hänellä ollut illallisille yhtään etanoita, jolloin hän käski miestään juoksemaan
alas rannalle ja keräämään koriin joitain etanoita.</p>
-<lorem>
+</lorem>
</pre>
-<p>Now, you can search on the internet for lipsum in your language - it has been translated into many many languages. </p>
-<p>Insert the text, replace the name, author and url data with the correct ones. Then simply put html-like tags around each of the paragraphs.</p><p>Insert the text, then save is as <code>language.xml</code>,where language = two letter abbreviation e.g. ru.xml</p>
-<p> Important, make sure you save the text in UTF-8 encoding. Then, you can copy it in the subdirectory /scribus/loremipsum/ where Scribus is installed. Linux users may have to use sudo or login as root. MacOSX users can find the Scribus folder under Applications usually. Windows users will find it in Program Files\Scribus. </p>
-<p>Now that you have done this major bit of engineering, head over to <a href="http://bugs.scribus.net" name="http://bugs.scribus.net.">http://bugs.scribus.net.</a> File a bug with severity 'feature' and upload your newly created XML file. One of the scribus developers will add it to the next release of Scribus for all to enjoy.</p>
+<p>You can search on the internet for a lipsum in your language – there are many available – or simply create your own. Make sure that you can use and distribute an existing sample text without restrictions. If you create your own Lorem ipsum, you are advised to make sure that the sample text is as nonsensical as possible and that it contains all letters of your alphabet.</p>
+<p>Insert the text, replace the name, author and URL data with the correct ones. Then simply put HTML-like tags around each of the paragraphs.</p><p>Insert the text, then save is as <code>language.xml</code>, where “language” must be replaced with an <a href="http://en.wikipedia.org/wiki/ISO_639-1">ISO 639-1 language code</a>, a two letter abbreviation for the respective language, e.g. <code>ru.xml</code> for Russian. It’s important to make sure that you save the text in <a href="http://en.wikipedia.org/wiki/UTF-8">UTF-8 encoding</a>. Otherwise, special characters won’t be displayed correctly.</p>
+<p> To test your sample text, you can copy it to the subdirectory <code>~/share/scribus/loremipsum</code>, whose location will vary depending on your operating system and the way you installed Scribus (e.g. <code>/usr/share/scribus/loremipsum</code> on Linux).</p>
+<p>Once you made sure that your significant engineering effort works as expected, head over to the <a href="http://bugs.scribus.net">Scribus bugtracker</a>, file a bug report with the severity “Feature” and upload your XML file. One of the Scribus developers will add it to the next release of Scribus for all to enjoy.</p>
</body>
</html>
Modified: branches/ScribusOIF/doc/en/menu.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/doc/en/menu.xml
==============================================================================
--- branches/ScribusOIF/doc/en/menu.xml (original)
+++ branches/ScribusOIF/doc/en/menu.xml Mon Nov 22 00:02:57 2010
@@ -92,17 +92,17 @@
<submenuitem text="Adobe Reader" file="toolbox1.html"/>
<submenuitem text="Other PDF Viewers" file="toolbox2.html"/>
<submenuitem text="Batik" file="toolbox3.html"/>
- <submenuitem text="Gimp" file="toolbox4.html"/>
+ <submenuitem text="GIMP" file="toolbox4.html"/>
<submenuitem text="Ghostscript" file="toolbox5.html"/>
<submenuitem text="GSview" file="toolbox6.html"/>
<submenuitem text="Advanced Ghostscript & GSView" file="toolbox7.html"/>
- <submenuitem text="Imagemagick" file="toolbox8.html"/>
+ <submenuitem text="ImageMagick" file="toolbox8.html"/>
<submenuitem text="Inkscape" file="toolbox9.html"/>
<submenuitem text="KSnapshot" file="toolbox10.html"/>
<submenuitem text="Tracing Tools" file="toolbox11.html"/>
<submenuitem text="WINE" file="toolbox12.html"/>
- <submenuitem text="Xnview" file="toolbox13.html"/>
- <submenuitem text="Lprof" file="toolbox14.html"/>
+ <submenuitem text="XnView" file="toolbox13.html"/>
+ <submenuitem text="LProf" file="toolbox14.html"/>
<submenuitem text="Krita" file="toolbox15.html"/>
<submenuitem text="Fontmatrix" file="toolbox16.html"/>
<submenuitem text="SwatchBooker" file="toolbox17.html"/>
@@ -112,7 +112,7 @@
<submenuitem text="Development" file="faq3.html"/>
</submenuitem>
</area>
- <area text="Tutorials" file="tutorials.html" section="tutorials">
+ <area text="My Tutorials" file="tutorials.html" section="tutorials">
</area>
<area text="For Developers" file="developers.html">
<submenuitem text="Scribus Document Format" file="scribusfileformat.html"/>
@@ -142,7 +142,7 @@
<submenuitem text="GetText Howto" file="gettexthowto.html"/>
<submenuitem text="Coding Standards" file="codingstandards.html"/>
<submenuitem text="Translation Howto" file="translation_howto.html"/>
- <submenuitem text="Lipsum Howto" file="lipsum.html"/>
+ <submenuitem text="Lorem ipsum Howto" file="lipsum.html"/>
</area>
<area text="Other Information" file="otherinfo.html">
<submenuitem text="Community" file="resources.html"/>
Modified: branches/ScribusOIF/scribus/langmgr.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/scribus/langmgr.cpp
==============================================================================
--- branches/ScribusOIF/scribus/langmgr.cpp (original)
+++ branches/ScribusOIF/scribus/langmgr.cpp Mon Nov 22 00:02:57 2010
@@ -80,7 +80,7 @@
langList.insert("et", langPair("Estonian", QObject::tr( "Estonian" )) );
langList.insert("de", langPair("German", QObject::tr( "German" )) );
langList.insert("de_CH", langPair("German (Swiss)", QObject::tr( "German (Swiss)" )) );
- langList.insert("de_1901", langPair("German (Trad.)", QObject::tr( "German (Trad.)" )) );
+ langList.insert("de_1901", langPair("German (Trad.)", QObject::tr( "German (Trad.)" )) );
langList.insert("fi", langPair("Finnish", QObject::tr( "Finnish" )) );
langList.insert("fr", langPair("French", QObject::tr( "French" )) );
langList.insert("fr_FR", langPair("French", QObject::tr( "French" )) );
Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Mon Nov 22 00:02:57 2010
@@ -388,7 +388,7 @@
if (scrActions["SaveAsDocumentTemplate"])
scrActions["SaveAsDocumentTemplate"]->setEnabled(false);
- connect(ScCore->fileWatcher, SIGNAL(fileDeleted(QString )), this, SLOT(removeRecent(QString)));
+ connect(ScCore->fileWatcher, SIGNAL(fileDeleted(QString )), this, SLOT(removeRecentFromWatcher(QString)));
connect(this, SIGNAL(TextStyle(const ParagraphStyle&)), propertiesPalette, SLOT(updateStyle(const ParagraphStyle&)));
connect(this, SIGNAL(TextEffects(int)), propertiesPalette, SLOT(setStil(int)));
connect(ClipB, SIGNAL(dataChanged()), this, SLOT(ClipChange()));
@@ -3110,14 +3110,20 @@
rebuildRecentFileMenu();
}
-void ScribusMainWindow::removeRecent(QString fn)
+void ScribusMainWindow::removeRecent(QString fn, bool fromFileWatcher)
{
if (RecentDocs.indexOf(fn) != -1)
{
RecentDocs.removeAll(fn);
- ScCore->fileWatcher->removeFile(fn);
+ if (!fromFileWatcher)
+ ScCore->fileWatcher->removeFile(fn);
}
rebuildRecentFileMenu();
+}
+
+void ScribusMainWindow::removeRecentFromWatcher(QString fn)
+{
+ removeRecent(fn, true);
}
void ScribusMainWindow::loadRecent(QString fn)
Modified: branches/ScribusOIF/scribus/scribus.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/scribus/scribus.h
==============================================================================
--- branches/ScribusOIF/scribus/scribus.h (original)
+++ branches/ScribusOIF/scribus/scribus.h Mon Nov 22 00:02:57 2010
@@ -311,7 +311,8 @@
*/
void slotFileAppend();
- void removeRecent(QString fn);
+ void removeRecent(QString fn, bool fromFileWatcher = false);
+ void removeRecentFromWatcher(QString fn);
void loadRecent(QString fn);
void rebuildRecentFileMenu();
void rebuildRecentPasteMenu();
Modified: branches/ScribusOIF/scribus/scribusapp.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/scribus/scribusapp.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribusapp.cpp (original)
+++ branches/ScribusOIF/scribus/scribusapp.cpp Mon Nov 22 00:02:57 2010
@@ -339,7 +339,7 @@
QString lang;
for (QStringList::const_iterator it = langs.constBegin(); it != langs.constEnd() && !loaded; ++it)
{
- lang=(*it).left(5);
+ lang=(*it);
if (lang == "en")
{
GUILang=lang;
Modified: branches/ScribusOIF/scribus/scribuscore.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15947&path=/branches/ScribusOIF/scribus/scribuscore.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribuscore.cpp (original)
+++ branches/ScribusOIF/scribus/scribuscore.cpp Mon Nov 22 00:02:57 2010
@@ -204,24 +204,6 @@
icm.setCompressionLevel(prefsManager->appPrefs.imageCachePrefs.compressionLevel);
icm.initialize();
- /*
- initPalettes();
-
- setSplashStatus( tr("Initializing Hyphenator") );
- QString preLang = prefsManager->appPrefs.Language;
- initHyphenator();
- if (Sprachen.contains(preLang))
- prefsManager->appPrefs.Language = preLang;
- setSplashStatus( tr("Reading Scrapbook") );
- initScrapbook();
- setSplashStatus( tr("Setting up Shortcuts") );
- SetShortCut();
- scrActions["helpTooltips"]->setChecked(prefsManager->appPrefs.showToolTips);
- ToggleTips();
-
- connect(fileWatcher, SIGNAL(fileDeleted(QString )), this, SLOT(removeRecent(QString)));
- }*/
-
return retVal;
}
More information about the scribus-commit
mailing list