r15837 by jghali - merge trunk revisions up to r15836
scribus-commit
scribus-commit at lists.scribus.net
Wed Nov 10 01:32:00 CET 2010
Author: jghali
Date: Wed Nov 10 00:32:00 2010
New Revision: 15837
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15837
Log:
merge trunk revisions up to r15836
Added:
branches/ScribusOIF/resources/dicts/README_de_1901.txt
- copied unchanged from r15836, trunk/Scribus/resources/dicts/README_de_1901.txt
branches/ScribusOIF/resources/dicts/hyph_de_1901.dic
- copied unchanged from r15836, trunk/Scribus/resources/dicts/hyph_de_1901.dic
branches/ScribusOIF/resources/translations/po/scribus.de_1901.ts
- copied unchanged from r15836, trunk/Scribus/resources/translations/po/scribus.de_1901.ts
Removed:
branches/ScribusOIF/resources/translations/po/scribus.de_ol.ts
Modified:
branches/ScribusOIF/doc/CMakeLists.txt
branches/ScribusOIF/doc/en/documentation.html
branches/ScribusOIF/doc/en/importhints1.html
branches/ScribusOIF/doc/en/intro.html
branches/ScribusOIF/doc/en/menu.xml
branches/ScribusOIF/resources/translations/po/CMakeLists.txt
branches/ScribusOIF/scribus/CMakeLists.txt
branches/ScribusOIF/scribus/actionmanager.cpp
branches/ScribusOIF/scribus/langmgr.cpp
branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp
branches/ScribusOIF/scribus/prefsmanager.cpp
branches/ScribusOIF/scribus/scimgdataloader_pgf.cpp
branches/ScribusOIF/scribus/scribus.cpp
branches/ScribusOIF/scribus/scribus.h
branches/ScribusOIF/scribus/text/storytext.cpp
branches/ScribusOIF/win32/vc8/Scribus.vcproj
Modified: branches/ScribusOIF/doc/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/doc/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/doc/CMakeLists.txt (original)
+++ branches/ScribusOIF/doc/CMakeLists.txt Wed Nov 10 00:32:00 2010
@@ -1,5 +1,1 @@
-ADD_SUBDIRECTORY(cs)
-ADD_SUBDIRECTORY(de)
ADD_SUBDIRECTORY(en)
-ADD_SUBDIRECTORY(fr)
-ADD_SUBDIRECTORY(pl)
Modified: branches/ScribusOIF/doc/en/documentation.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/doc/en/documentation.html
==============================================================================
--- branches/ScribusOIF/doc/en/documentation.html (original)
+++ branches/ScribusOIF/doc/en/documentation.html Wed Nov 10 00:32:00 2010
@@ -6,7 +6,7 @@
<body>
<h2>Documentation</h2>
-<p>This section is the main area of the documentation for Scribus. In this section we outline major areas of interest from installation through to getting your beautiful document ready for professional publishing. This area is written mainly by Peter Linnell, one of the Scribus developers who is a professional DTP consultant and with his help, we would like to think everyone out there can get their publication to print on time with great results. Read on for more, but don't hesitate to contact us if you have further questions. Read the last section of the documentation to find out how to contact the team and other users.</p>
+<p>This section is the main area of the user documentation for Scribus. In this section we will outline major areas of interest from installation through getting your beautiful document ready for professional printing or the web. Read on for more, but don't hesitate to contact us if you have further questions. Since this Online Help probably can't answer all of your questions, you should also read the last section of the documentation to find out how to contact the Scribus Team and other users, who are more than willing to help you succeed.</p>
</body>
</html>
Modified: branches/ScribusOIF/doc/en/importhints1.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/doc/en/importhints1.html
==============================================================================
--- branches/ScribusOIF/doc/en/importhints1.html (original)
+++ branches/ScribusOIF/doc/en/importhints1.html Wed Nov 10 00:32:00 2010
@@ -23,9 +23,11 @@
<p>This is usually the safest way to import an EPS. Provided Ghostscript is installed and properly <a href="gsfont.html">configured</a>, it works just like with any other <a href="WwImages.html">bitmap image</a>. However, since Scribus uses Ghostscript to rasterize the EPS, loading and rendering may take some time.</p>
<h5>Caveats</h5>
+<ul>
<li>Photoshop can export EPS natively, but these are mostly raster objects within the EPS, with some Photoshop-specific features like layers and blend modes. Photoshop also can export a special type of EPS called DCS (Desktop Color Separations). This flavor of EPS is best imported into an image frame, where Scribus will detect and enable extended image editing/displaying capabilities. See the section about <a href="psd.html">PSD import</a> for more information.</li>
<li>Image mask doesn’t work correctly.</li>
<li>Clipping paths are ignored.</li>
+</ul>
<h4>Importing as a vector drawing</h4>
<p>Importing EPS like any other <a href="importhints2.html">vector file</a> via <i>File > Import >Get Vector File</i>, if possible, does have some advantages. Since you are working with vector data, file size and exported PDF size are relatively small. It makes them resolution-independent, so they can be re-scaled without losing crispness in printing.</p>
@@ -51,7 +53,8 @@
</tbody>
</table>
<br>
-A second potential issue is bitmap file incompatibility and is most likely to occur with recent versions of Illustrator. Illustrator is often used alongside Photoshop, and the changes made to Photoshop’s PSD format since version 6 haven’t been published. Thus, Ghostscript’s attempts to read or convert those embedded PSDs may fail, which will trigger a warning in Scribus:
+</li>
+<li>A second potential issue is bitmap file incompatibility and is most likely to occur with recent versions of Illustrator. Illustrator is often used alongside Photoshop, and the changes made to Photoshop’s PSD format since version 6 haven’t been published. Thus, Ghostscript’s attempts to read or convert those embedded PSDs may fail, which will trigger a warning in Scribus:
<br><table width="100%"><tr><td align="center"><img src="images/eps-imp3.png" title="Bitmap conversion failure" alt="Bitmap conversion failure" /></td></tr></table><br></li>
<li>EPS export quality from other applications can vary widely. Some applications unfortunately like to add their own ingredients to the sauce. The first step for testing a failed import is to open the file in <a href="toolbox6.html">GSview</a>, then press <b>M</b> to watch the messages from Ghostscript while it attempts to open the file. When you have a failure in GSview, the messages can be cryptic sometimes, but they may be a helpful pointer to see what is the problem.</li>
<li>Users saving from Adobe Illustrator 9.0 or later are urged to either export to EPS versions compatible with Illustrator version 7 or less <b>or</b> use Illustrator’s native AI format for import into Scribus. Why? Illustrator 9+ actually uses PDF as a native format and embeds quite a bit of Adobe-specific data in an EPS, which can cause issues when importing. Scribus is not alone with this issue.</li>
Modified: branches/ScribusOIF/doc/en/intro.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/doc/en/intro.html
==============================================================================
--- branches/ScribusOIF/doc/en/intro.html (original)
+++ branches/ScribusOIF/doc/en/intro.html Wed Nov 10 00:32:00 2010
@@ -21,9 +21,9 @@
</i>
</blockquote>
-<p>So, that’s how the Scribus documentation started, but as Scribus attracted more developers, and the more ambitious the project became, the less maintainable the documentation appeared to be for a single person. As is natural with successful Open Source projects, more people volunteered to expand the scope of information available about Scribus. It started with the <a href="http://wiki.scribus.net/index.php/Main_Page">Scribus Wiki</a>, an ongoing successful collaborative effort, and reached a climax with the publication of the <a href="http://www.amazon.com/Scribus-Open-Source-Publishing-Christoph-Sch%C3%A4fer/dp/0956078001/ref=sr_1_1?s=books&ie=UTF8&qid=1289106422&sr=1-1">Official Scribus Manual</a>.</p>
-<p>But the documentation efforts didn’t stop with the publication of a printed book, quite the contrary! A review of the available documentation showed that many documents, while appropriately describing Scribus’s features at the time they were written, needed an update to reflect the vast number of features Scribus that had been added in the meantime, whereas some workarounds for Linux-related issues simply aren’t necessary any longer on modern Linux desktops.</p>
+<p>So, that’s how the Scribus documentation started, but as Scribus attracted more developers, and the more ambitious the project became, the less maintainable the documentation appeared to be for a single person. As is natural with successful Open Source projects, more people volunteered to expand the scope of information available about Scribus. It started with the <a href="http://wiki.scribus.net/index.php/Main_Page">Scribus Wiki</a>, an ongoing successful collaborative effort, mostly written by users for users, and reached a climax with the publication of the <a href="http://www.amazon.com/Scribus-Open-Source-Publishing-Christoph-Sch%C3%A4fer/dp/0956078001/ref=sr_1_1?s=books&ie=UTF8&qid=1289106422&sr=1-1">Official Scribus Manual</a>.</p>
+<p>But the documentation efforts didn’t stop with the publication of a printed book, quite the contrary! A review of the available documentation showed that many documents, while appropriately describing Scribus’s features at the time they were written, needed an update to reflect the vast number of features in Scribus that had been added in the meantime, whereas some workarounds for Linux-related issues simply aren’t necessary any longer on modern Linux desktops.</p>
<p>The growing complexity of Scribus also collided with the original concept of the documentation, which can be described as as a mix of a diary and a field report, with some additional elements of a manual for sysadmins. This approach was undoubtedly necessary at the time the original documentation was written, as Scribus was first and foremost a Linux program back then. Fortunately, the Linux desktop is very user-friendly these days, and Scribus has been ported to other platforms as well.</p>
-<p>As a result, the Scribus documentation can now focus on a more structured approach, which will provide much more information about the practical use of the program. The priceless background information from Peter Linnell in the original documentation will naturally survive, albeit in another form, i.e., it will be spread across those documents, for which the respective information seems applicable. And of course Peter Linnell is still <b>mrdocs</b>, which is yet another reason to have great expectations when it comes to further improvements to the Scribus documentation ...</p>
+<p>As a result, the Scribus documentation can now focus on a more structured approach, which will provide much more information about the practical use of the program. The priceless background information from Peter Linnell in the original documentation will naturally survive, albeit in another form, i.e., it will be spread across those documents for which the respective information seems applicable. And of course Peter Linnell is still <b>mrdocs</b>, which is yet another reason to have great expectations when it comes to further improvements to the Scribus documentation ...</p>
</body>
</html>
Modified: branches/ScribusOIF/doc/en/menu.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/doc/en/menu.xml
==============================================================================
--- branches/ScribusOIF/doc/en/menu.xml (original)
+++ branches/ScribusOIF/doc/en/menu.xml Wed Nov 10 00:32:00 2010
@@ -3,8 +3,8 @@
<area text="Welcome" file="index.html">
<submenuitem text="Readme First" file="readme.html"/>
</area>
- <area text="Documentation" file="documentation.html">
- <submenuitem text="Introduction" file="intro.html">
+ <area text="Introduction" file="intro.html">
+ <submenuitem text="Documentation" file="documentation.html">
<submenuitem text="About the team" file="about1.html"/>
<submenuitem text="Specifications" file="specs.html"/>
</submenuitem>
Modified: branches/ScribusOIF/resources/translations/po/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/resources/translations/po/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/resources/translations/po/CMakeLists.txt (original)
+++ branches/ScribusOIF/resources/translations/po/CMakeLists.txt Wed Nov 10 00:32:00 2010
@@ -9,7 +9,7 @@
#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB,de_DE , etc
FOREACH(TS_FILEPATH ${SCRIBUS_TS_FILES})
GET_FILENAME_COMPONENT(TS_FILENAME ${TS_FILEPATH} NAME)
- STRING(REGEX MATCH "\\.([a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
+ STRING(REGEX MATCH "\\.([0-9a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
STRING(REPLACE "." "" LANGSTR ${LANGSTR})
SET(QM_LANGS ${QM_LANGS} ${LANGSTR})
ENDFOREACH(TS_FILEPATH)
@@ -20,7 +20,7 @@
IF(WANT_GUI_LANG)
FOREACH(TS_FILEPATH ${SCRIBUS_TS_FILES})
GET_FILENAME_COMPONENT(TS_FILENAME ${TS_FILEPATH} NAME)
- STRING(REGEX MATCH "\\.([a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
+ STRING(REGEX MATCH "\\.([0-9a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
STRING(REPLACE "." "" LANGSTR ${LANGSTR})
FOREACH(WANTED_LANG ${WANT_GUI_LANG})
IF(LANGSTR STREQUAL WANTED_LANG)
@@ -38,7 +38,7 @@
#Just install all of them
FOREACH(TS_FILEPATH ${SCRIBUS_TS_FILES})
GET_FILENAME_COMPONENT(TS_FILENAME ${TS_FILEPATH} NAME)
- STRING(REGEX MATCH "\\.([a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
+ STRING(REGEX MATCH "\\.([0-9a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
STRING(REPLACE "." "" LANGSTR ${LANGSTR})
SET(QM_FILENAME "scribus.${LANGSTR}.qm")
ADD_CUSTOM_TARGET("release_ts_${LANGSTR}" ALL
Modified: branches/ScribusOIF/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/scribus/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/scribus/CMakeLists.txt (original)
+++ branches/ScribusOIF/scribus/CMakeLists.txt Wed Nov 10 00:32:00 2010
@@ -71,14 +71,14 @@
ui/charselectenhanced.ui
ui/cmsprefsbase.ui
ui/colorpalette.ui
- ui/docitemattrprefs.ui
- ui/docsections.ui
+# ui/docitemattrprefs.ui
+# ui/docsections.ui
ui/gradientaddedit.ui
ui/gradienteditor.ui
ui/gradientvectorbase.ui
ui/gtfiledialog.ui
ui/guidemanager.ui
- ui/hysettingsBase.ui
+# ui/hysettingsBase.ui
ui/insertaframe.ui
ui/latexeditor.ui
ui/newmarginwidgetbase.ui
@@ -132,14 +132,14 @@
ui/smreplacedia.ui
ui/smstyleimport.ui
ui/stylemanager.ui
- ui/tabdisplay.ui
- ui/tabexternaltoolswidget.ui
- ui/tabgeneral.ui
- ui/tabkeyboardshortcutswidget.ui
- ui/tabmiscellaneous.ui
- ui/tabprinter.ui
- ui/tabscrapbook.ui
- ui/tocindexprefs.ui
+# ui/tabdisplay.ui
+# ui/tabexternaltoolswidget.ui
+# ui/tabgeneral.ui
+# ui/tabkeyboardshortcutswidget.ui
+# ui/tabmiscellaneous.ui
+# ui/tabprinter.ui
+# ui/tabscrapbook.ui
+# ui/tocindexprefs.ui
ui/transformdialogbase.ui
ui/transparencypalette.ui
ui/copypagetomasterpage.ui
@@ -252,14 +252,14 @@
ui/dasheditor.h
ui/dcolor.h
ui/delpages.h
- ui/docitemattrprefs.h
- ui/docsections.h
+# ui/docitemattrprefs.h
+# ui/docsections.h
ui/editor.h
ui/effectsdialog.h
ui/extimageprops.h
ui/fontcombo.h
ui/fontlistview.h
- ui/fontprefs.h
+# ui/fontprefs.h
ui/fontreplacedialog.h
ui/gradientaddedit.h
ui/gradienteditor.h
@@ -271,7 +271,7 @@
ui/helpbrowser.h
ui/hruler.h
ui/hyask.h
- ui/hysettings.h
+# ui/hysettings.h
ui/imageinfodialog.h
ui/insertTable.h
ui/insertaframe.h
@@ -312,8 +312,8 @@
ui/pluginmanagerprefsgui.h
ui/polygonwidget.h
ui/polyprops.h
- ui/prefs.h
- ui/prefsdialogbase.h
+# ui/prefs.h
+# ui/prefsdialogbase.h
ui/preferencesdialog.h
ui/prefs_colormanagement.h
ui/prefs_display.h
@@ -353,7 +353,7 @@
ui/propertiespalette_utils.h
ui/propertiespalette_xyz.h
ui/query.h
- ui/reformdoc.h
+# ui/reformdoc.h
ui/replacecolors.h
ui/replaceonecolor.h
ui/rulermover.h
@@ -398,22 +398,22 @@
ui/styleview.h
ui/swatchcombo.h
ui/symbolpalette.h
- ui/tabcheckdoc.h
- ui/tabdisplay.h
- ui/tabdocument.h
- ui/tabexternaltoolswidget.h
- ui/tabgeneral.h
- ui/tabguides.h
- ui/tabkeyboardshortcutswidget.h
+# ui/tabcheckdoc.h
+# ui/tabdisplay.h
+# ui/tabdocument.h
+# ui/tabexternaltoolswidget.h
+# ui/tabgeneral.h
+# ui/tabguides.h
+# ui/tabkeyboardshortcutswidget.h
ui/tabmanager.h
- ui/tabmiscellaneous.h
+# ui/tabmiscellaneous.h
ui/tabpdfoptions.h
- ui/tabprinter.h
+# ui/tabprinter.h
ui/tabruler.h
- ui/tabscrapbook.h
- ui/tabtools.h
- ui/tabtypography.h
- ui/tocindexprefs.h
+# ui/tabscrapbook.h
+# ui/tabtools.h
+# ui/tabtypography.h
+# ui/tocindexprefs.h
ui/transformdialog.h
ui/transparencypalette.h
tt/simpletreemodel/treemodel.h
@@ -655,13 +655,13 @@
ui/dasheditor.cpp
ui/dcolor.cpp
ui/delpages.cpp
- ui/docitemattrprefs.cpp
- ui/docsections.cpp
+# ui/docitemattrprefs.cpp
+# ui/docsections.cpp
ui/editor.cpp
ui/effectsdialog.cpp
ui/extimageprops.cpp
ui/fontlistview.cpp
- ui/fontprefs.cpp
+# ui/fontprefs.cpp
ui/fontreplacedialog.cpp
ui/gradientaddedit.cpp
ui/gradienteditor.cpp
@@ -673,7 +673,7 @@
ui/helpbrowser.cpp
ui/hruler.cpp
ui/hyask.cpp
- ui/hysettings.cpp
+# ui/hysettings.cpp
ui/imageinfodialog.cpp
ui/insertTable.cpp
ui/insertaframe.cpp
@@ -716,7 +716,7 @@
ui/pluginmanagerprefsgui.cpp
ui/polygonwidget.cpp
ui/polyprops.cpp
- ui/prefs.cpp
+# ui/prefs.cpp
ui/preferencesdialog.cpp
ui/prefs_colormanagement.cpp
ui/prefs_display.cpp
@@ -743,7 +743,7 @@
ui/prefs_pdfexport.cpp
ui/prefs_tableofcontents.cpp
ui/prefs_documentitemattributes.cpp
- ui/prefsdialogbase.cpp
+# ui/prefsdialogbase.cpp
ui/prefspanel.cpp
ui/preview.cpp
ui/printdialog.cpp
@@ -756,7 +756,7 @@
ui/propertiespalette_utils.cpp
ui/propertiespalette_xyz.cpp
ui/query.cpp
- ui/reformdoc.cpp
+# ui/reformdoc.cpp
ui/replacecolors.cpp
ui/replaceonecolor.cpp
ui/rulermover.cpp
@@ -805,22 +805,22 @@
ui/styleview.cpp
ui/swatchcombo.cpp
ui/symbolpalette.cpp
- ui/tabcheckdoc.cpp
- ui/tabdisplay.cpp
- ui/tabdocument.cpp
- ui/tabexternaltoolswidget.cpp
- ui/tabgeneral.cpp
- ui/tabguides.cpp
- ui/tabkeyboardshortcutswidget.cpp
+# ui/tabcheckdoc.cpp
+# ui/tabdisplay.cpp
+# ui/tabdocument.cpp
+# ui/tabexternaltoolswidget.cpp
+# ui/tabgeneral.cpp
+# ui/tabguides.cpp
+# ui/tabkeyboardshortcutswidget.cpp
ui/tabmanager.cpp
- ui/tabmiscellaneous.cpp
+# ui/tabmiscellaneous.cpp
ui/tabpdfoptions.cpp
- ui/tabprinter.cpp
+# ui/tabprinter.cpp
ui/tabruler.cpp
- ui/tabscrapbook.cpp
- ui/tabtools.cpp
- ui/tabtypography.cpp
- ui/tocindexprefs.cpp
+# ui/tabscrapbook.cpp
+# ui/tabtools.cpp
+# ui/tabtypography.cpp
+# ui/tocindexprefs.cpp
ui/transformdialog.cpp
ui/transparencypalette.cpp
tt/simpletreemodel/treeitem.cpp
Modified: branches/ScribusOIF/scribus/actionmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/scribus/actionmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/actionmanager.cpp (original)
+++ branches/ScribusOIF/scribus/actionmanager.cpp Wed Nov 10 00:32:00 2010
@@ -137,13 +137,13 @@
name="fileExportAsPDF";
scrActions->insert(name, new ScrAction(loadIcon("acroread16.png"), loadIcon("acroread22.png"), "", defaultKey(name), mainWindow));
//Rest of File Menu
- name="fileDocSetup";
- scrActions->insert(name, new ScrAction(loadIcon("16/document-properties.png"), loadIcon("22/document-properties.png"), "", defaultKey(name), mainWindow));
+// name="fileDocSetup";
+// scrActions->insert(name, new ScrAction(loadIcon("16/document-properties.png"), loadIcon("22/document-properties.png"), "", defaultKey(name), mainWindow));
name="fileDocSetup150";
scrActions->insert(name, new ScrAction(loadIcon("16/document-properties.png"), loadIcon("22/document-properties.png"), "", defaultKey(name), mainWindow));
- name="filePreferences";
- scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
- (*scrActions)[name]->setMenuRole(QAction::NoRole);
+// name="filePreferences";
+// scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
+// (*scrActions)[name]->setMenuRole(QAction::NoRole);
name="filePreferences150";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
(*scrActions)[name]->setMenuRole(QAction::PreferencesRole);
@@ -165,9 +165,9 @@
connect( (*scrActions)["PrintPreview"], SIGNAL(triggered()), mainWindow, SLOT(printPreview()) );
connect( (*scrActions)["fileSave"], SIGNAL(triggered()), mainWindow, SLOT(slotFileSave()) );
connect( (*scrActions)["fileSaveAs"], SIGNAL(triggered()), mainWindow, SLOT(slotFileSaveAs()) );
- connect( (*scrActions)["fileDocSetup"], SIGNAL(triggered()), mainWindow, SLOT(slotDocSetup()) );
+// connect( (*scrActions)["fileDocSetup"], SIGNAL(triggered()), mainWindow, SLOT(slotDocSetup()) );
connect( (*scrActions)["fileDocSetup150"], SIGNAL(triggered()), mainWindow, SLOT(slotDocSetup150()) );
- connect( (*scrActions)["filePreferences"], SIGNAL(triggered()), mainWindow, SLOT(slotPrefsOrg()) );
+// connect( (*scrActions)["filePreferences"], SIGNAL(triggered()), mainWindow, SLOT(slotPrefsOrg()) );
connect( (*scrActions)["filePreferences150"], SIGNAL(triggered()), mainWindow, SLOT(slotPrefs150Org()) );
connect( (*scrActions)["fileRevert"], SIGNAL(triggered()), mainWindow, SLOT(slotFileRevert()) );
connect( (*scrActions)["fileCollect"], SIGNAL(triggered()), mainWindow, SLOT(fileCollect()) );
@@ -1289,9 +1289,9 @@
(*scrActions)["fileExportText"]->setTexts( tr("Save &Text..."));
(*scrActions)["fileExportAsEPS"]->setTexts( tr("Save as &EPS..."));
(*scrActions)["fileExportAsPDF"]->setTexts( tr("Save as P&DF..."));
- (*scrActions)["fileDocSetup"]->setTexts( tr("Document &Setup (old)..."));
+// (*scrActions)["fileDocSetup"]->setTexts( tr("Document &Setup (old)..."));
(*scrActions)["fileDocSetup150"]->setTexts( tr("Document &Setup..."));
- (*scrActions)["filePreferences"]->setTexts( tr("P&references (old)..."));
+// (*scrActions)["filePreferences"]->setTexts( tr("P&references (old)..."));
(*scrActions)["filePreferences150"]->setTexts( tr("P&references..."));
(*scrActions)["filePrint"]->setTexts( tr("&Print..."));
(*scrActions)["PrintPreview"]->setTexts( tr("Print Previe&w"));
@@ -1747,9 +1747,9 @@
<< "fileExportText"
<< "fileExportAsEPS"
<< "fileExportAsPDF"
- << "fileDocSetup"
+// << "fileDocSetup"
<< "fileDocSetup150"
- << "filePreferences"
+// << "filePreferences"
<< "filePreferences150"
<< "filePrint"
<< "PrintPreview"
Modified: branches/ScribusOIF/scribus/langmgr.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/scribus/langmgr.cpp
==============================================================================
--- branches/ScribusOIF/scribus/langmgr.cpp (original)
+++ branches/ScribusOIF/scribus/langmgr.cpp Wed Nov 10 00:32:00 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_ol", 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/plugins/import/svg/svgplugin.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/import/svg/svgplugin.cpp Wed Nov 10 00:32:00 2010
@@ -2670,10 +2670,13 @@
QStringList substyles = style.split(';', QString::SkipEmptyParts);
for( QStringList::Iterator it = substyles.begin(); it != substyles.end(); ++it )
{
- QStringList substyle = (*it).split(':', QString::SkipEmptyParts);
- QString command(substyle[0].trimmed());
- QString params(substyle[1].trimmed());
- parsePA( obj, command, params );
+ QStringList substyle = it->split(':', QString::SkipEmptyParts);
+ if (substyle.count() >= 2)
+ {
+ QString command(substyle.at(0).trimmed());
+ QString params(substyle.at(1).trimmed());
+ parsePA( obj, command, params );
+ }
}
return;
}
@@ -2714,13 +2717,16 @@
QStringList substyles = style.split(';', QString::SkipEmptyParts);
for( QStringList::Iterator it = substyles.begin(); it != substyles.end(); ++it )
{
- QStringList substyle = (*it).split(':', QString::SkipEmptyParts);
- QString command(substyle[0].trimmed());
- QString params(substyle[1].trimmed());
- if( command == "stop-color" )
- Col = parseColor(params);
- if( command == "stop-opacity" )
- opa = fromPercentage(params);
+ QStringList substyle = it->split(':', QString::SkipEmptyParts);
+ if (substyle.count() >= 2)
+ {
+ QString command(substyle.at(0).trimmed());
+ QString params(substyle.at(1).trimmed());
+ if( command == "stop-color" )
+ Col = parseColor(params);
+ if( command == "stop-opacity" )
+ opa = fromPercentage(params);
+ }
}
}
}
Modified: branches/ScribusOIF/scribus/prefsmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/scribus/prefsmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/prefsmanager.cpp (original)
+++ branches/ScribusOIF/scribus/prefsmanager.cpp Wed Nov 10 00:32:00 2010
@@ -38,7 +38,8 @@
#include "filewatcher.h"
#include "latexhelpers.h"
#include "ui/missing.h"
-#include "ui/tabkeyboardshortcutswidget.h"
+//#include "ui/tabkeyboardshortcutswidget.h"
+#include "ui/prefs_keyboardshortcuts.h"
#include "pagesize.h"
#include "pagestructs.h"
#include "pdfoptions.h"
@@ -1625,7 +1626,7 @@
continue;
QDomElement kscc=docu.createElement("Shortcut");
kscc.setAttribute("Action",ksc.value().actionName);
- kscc.setAttribute("KeySequence",TabKeyboardShortcutsWidget::getKeyText(ksc.value().keySequence));
+ kscc.setAttribute("KeySequence",Prefs_KeyboardShortcuts::getKeyText(ksc.value().keySequence));
elem.appendChild(kscc);
}
QDomElement cosd=docu.createElement("DefaultColorSet");
Modified: branches/ScribusOIF/scribus/scimgdataloader_pgf.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/scribus/scimgdataloader_pgf.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scimgdataloader_pgf.cpp (original)
+++ branches/ScribusOIF/scribus/scimgdataloader_pgf.cpp Wed Nov 10 00:32:00 2010
@@ -18,8 +18,8 @@
// C Ansi includes
extern "C"
{
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
@@ -78,7 +78,7 @@
return false;
if (pgfImg.Channels() > 4)
return false;
- if ((pgfImg.Mode() == 0) || (pgfImg.Mode() == 2))
+ if (pgfImg.Mode() == 2)
return false;
if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
{
@@ -89,6 +89,7 @@
m_image = QImage(pgfImg.Width(level), pgfImg.Height(level), QImage::Format_Mono);
int map[] = {0};
pgfImg.GetBitmap(m_image.bytesPerLine(), (UINT8*)m_image.bits(), m_image.depth(), map);
+ m_image.invertPixels();
}
else if (pgfImg.BPP() == 8)
{
@@ -145,6 +146,7 @@
m_image = QImage(pgfImg.Width(level), pgfImg.Height(level), QImage::Format_Mono);
int map[] = {0};
pgfImg.GetBitmap(m_image.bytesPerLine(), (UINT8*)m_image.bits(), 1, map);
+ m_image.invertPixels();
}
else if (pgfImg.BPP() == 8)
{
@@ -192,6 +194,12 @@
pgfImg.GetBitmap(m_image.bytesPerLine(), (UINT8*)m_image.bits(), m_image.depth(), map);
}
}
+ pgfImg.Close();
+#ifdef WIN32
+ CloseHandle(fd);
+#else
+ close(fd);
+#endif
m_imageInfoRecord.type = ImageTypeOther;
m_imageInfoRecord.exifDataValid = false;
float xres = m_image.dotsPerMeterX() * 0.0254;
Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Wed Nov 10 00:32:00 2010
@@ -135,21 +135,21 @@
#include "ui/bookmarkpalette.h"
#include "ui/charselect.h"
#include "ui/checkDocument.h"
-#include "ui/cmsprefs.h"
+//#include "ui/cmsprefs.h"
#include "ui/collectforoutput_ui.h"
#include "ui/colorcombo.h"
#include "ui/contextmenu.h"
#include "ui/cpalette.h"
#include "ui/customfdialog.h"
#include "ui/delpages.h"
-#include "ui/docitemattrprefs.h"
+//#include "ui/docitemattrprefs.h"
#include "ui/effectsdialog.h"
#include "ui/fontcombo.h"
-#include "ui/fontprefs.h"
+//#include "ui/fontprefs.h"
#include "ui/guidemanager.h"
#include "ui/helpbrowser.h"
#include "ui/hruler.h"
-#include "ui/hysettings.h"
+//#include "ui/hysettings.h"
#include "ui/imageinfodialog.h"
#include "ui/insertaframe.h"
#include "ui/inspage.h"
@@ -183,7 +183,7 @@
#include "ui/picstatus.h"
#include "ui/polygonwidget.h"
#include "ui/preferencesdialog.h"
-#include "ui/prefs.h"
+//#include "ui/prefs.h"
#include "ui/preview.h"
#include "ui/printdialog.h"
#include "ui/propertiespalette.h"
@@ -193,7 +193,7 @@
#include "ui/propertiespalette_text.h"
#include "ui/propertiespalette_xyz.h"
#include "ui/query.h"
-#include "ui/reformdoc.h"
+//#include "ui/reformdoc.h"
#include "ui/replacecolors.h"
#include "ui/sccombobox.h"
#include "ui/scmessagebox.h"
@@ -207,15 +207,15 @@
#include "ui/storyeditor.h"
#include "ui/stylemanager.h"
#include "ui/symbolpalette.h"
-#include "ui/tabcheckdoc.h"
-#include "ui/tabguides.h"
+//#include "ui/tabcheckdoc.h"
+//#include "ui/tabguides.h"
#include "ui/tabmanager.h"
-#include "ui/tabpdfoptions.h"
-#include "ui/tabtools.h"
-#include "ui/tabtypography.h"
+//#include "ui/tabpdfoptions.h"
+//#include "ui/tabtools.h"
+//#include "ui/tabtypography.h"
#include "text/nlsconfig.h"
#include "tocgenerator.h"
-#include "ui/tocindexprefs.h"
+//#include "ui/tocindexprefs.h"
#include "ui/transformdialog.h"
#include "ui/copypagetomasterpagedialog.h"
#include "ui/edittoolbar.h"
@@ -644,9 +644,9 @@
scrMenuMgr->addMenuItem(scrActions["fileExportAsEPS"], "FileExport", false);
scrMenuMgr->addMenuItem(scrActions["fileExportAsPDF"], "FileExport", false);
scrMenuMgr->addMenuSeparator("File");
- scrMenuMgr->addMenuItem(scrActions["fileDocSetup"], "File", false);
+// scrMenuMgr->addMenuItem(scrActions["fileDocSetup"], "File", false);
scrMenuMgr->addMenuItem(scrActions["fileDocSetup150"], "File", false);
- scrMenuMgr->addMenuItem(scrActions["filePreferences"], "File", true);
+// scrMenuMgr->addMenuItem(scrActions["filePreferences"], "File", true);
scrMenuMgr->addMenuItem(scrActions["filePreferences150"], "File", true);
scrMenuMgr->addMenuSeparator("File");
scrMenuMgr->addMenuItem(scrActions["filePrint"], "File", false);
@@ -1552,10 +1552,11 @@
void ScribusMainWindow::closeEvent(QCloseEvent *ce)
{
//Do not quit if Preferences or new doc window is open
- Preferences *prefsWin = findChild<Preferences *>(QString::fromLocal8Bit("PreferencesWindow"));
+// Preferences *prefsWin = findChild<Preferences *>(QString::fromLocal8Bit("PreferencesWindow"));
PreferencesDialog *prefsDialog = findChild<PreferencesDialog *>(QString::fromLocal8Bit("PreferencesDialog"));
NewDoc *newDocWin = findChild<NewDoc *>(QString::fromLocal8Bit("NewDocumentWindow"));
- if (prefsWin!=NULL || prefsDialog!=NULL || newDocWin!=NULL)
+// if (prefsWin!=NULL || prefsDialog!=NULL || newDocWin!=NULL)
+ if (prefsDialog!=NULL || newDocWin!=NULL)
{
ce->ignore();
return;
@@ -1705,7 +1706,7 @@
delete dia;
mainWindowStatusLabel->setText( tr("Ready"));
if (docSet)
- slotDocSetup();
+ slotDocSetup150();
}
bool ScribusMainWindow::slotFileNew()
@@ -1755,7 +1756,7 @@
}
delete dia;
if (docSet)
- slotDocSetup();
+ slotDocSetup150();
return retVal;
}
@@ -2301,7 +2302,7 @@
scrActions["filePrint"]->setEnabled(true);
scrActions["fileSave"]->setEnabled(true);
scrActions["fileClose"]->setEnabled(true);
- scrActions["fileDocSetup"]->setEnabled(true);
+// scrActions["fileDocSetup"]->setEnabled(true);
scrActions["fileDocSetup150"]->setEnabled(true);
scrActions["fileRevert"]->setEnabled(false);
scrActions["fileCollect"]->setEnabled(true);
@@ -4404,7 +4405,7 @@
{
PluginManager& pluginManager(PluginManager::instance());
pluginManager.enableOnlyStartupPluginActions(this);
- scrActions["fileDocSetup"]->setEnabled(false);
+// scrActions["fileDocSetup"]->setEnabled(false);
scrActions["fileDocSetup150"]->setEnabled(false);
scrActions["filePrint"]->setEnabled(false);
scrActions["fileSave"]->setEnabled(false);
@@ -7408,7 +7409,7 @@
return;
view->GotoPage(Page);
}
-
+/*
void ScribusMainWindow::prefsOrg(Preferences *dia)
{
//reset the appMode so we restore our tools shortcuts
@@ -7517,7 +7518,7 @@
if (dia.exec()==QDialog::Accepted)
prefsOrg(&dia);
}
-
+*/
void ScribusMainWindow::slotPrefs150Org()
{
QString oldMonitorProfile(ScCore->monitorProfile.productDescription());
@@ -7617,7 +7618,7 @@
}
}
-
+/*
void ScribusMainWindow::docSetup(ReformDoc* dia)
{
slotChangeUnit(dia->getSelectedUnit(), false);
@@ -7656,11 +7657,11 @@
doc->setMasterPageMode(true);
view->reformPages();
doc->setMasterPageMode(false);
-/* doc->setLoading(true);
- uint pageCount=doc->DocPages.count();
- for (uint c=0; c<pageCount; ++c)
- Apply_MasterPage(doc->DocPages.at(c)->MPageNam, c, false);
- doc->setLoading(false); */
+// doc->setLoading(true);
+// uint pageCount=doc->DocPages.count();
+// for (uint c=0; c<pageCount; ++c)
+// Apply_MasterPage(doc->DocPages.at(c)->MPageNam, c, false);
+// doc->setLoading(false);
view->reformPages();
view->GotoPage(doc->currentPage()->pageNr());
view->DrawNew();
@@ -7681,7 +7682,7 @@
delete dia;
return ret;
}
-
+*/
void ScribusMainWindow::slotDocSetup150()
{
if (!doc)
@@ -8387,7 +8388,7 @@
scrActions["fileClose"]->setEnabled(false);
scrMenuMgr->setMenuEnabled("FileOpenRecent", false);
scrActions["fileRevert"]->setEnabled(false);
- scrActions["fileDocSetup"]->setEnabled(false);
+// scrActions["fileDocSetup"]->setEnabled(false);
scrActions["fileDocSetup150"]->setEnabled(false);
scrActions["filePrint"]->setEnabled(false);
scrActions["PrintPreview"]->setEnabled(false);
@@ -8420,7 +8421,7 @@
scrActions["fileSave"]->setEnabled(true);
scrMenuMgr->setMenuEnabled("FileOpenRecent", true);
scrActions["fileRevert"]->setEnabled(true);
- scrActions["fileDocSetup"]->setEnabled(true);
+// scrActions["fileDocSetup"]->setEnabled(true);
scrActions["fileDocSetup150"]->setEnabled(true);
scrActions["filePrint"]->setEnabled(true);
if ( ScCore->haveGS() || ScCore->isWinGUI() )
Modified: branches/ScribusOIF/scribus/scribus.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/scribus/scribus.h
==============================================================================
--- branches/ScribusOIF/scribus/scribus.h (original)
+++ branches/ScribusOIF/scribus/scribus.h Wed Nov 10 00:32:00 2010
@@ -94,11 +94,11 @@
class PSLib;
class PageItem;
class PagePalette;
-class Preferences;
+//class Preferences;
class PrefsContext;
class PrefsManager;
class PropertiesPalette;
-class ReformDoc;
+//class ReformDoc;
class ScToolBar;
class ScrAction;
class ScribusDoc;
@@ -531,18 +531,18 @@
/*! \brief Apply changes from ReformDoc dialog.
It's called from this->slotDocSetup() or from ReformDoc directly.
\param dia a reference to the ReformDoc dialog */
- void docSetup(ReformDoc* dia);
+// void docSetup(ReformDoc* dia);
/*! \brief Apply changes from Preferences dialog.
It's called from this->slotPrefsOrg() or from Preferences directly.
\param dia a reference to the Preferences dialog */
- void prefsOrg(Preferences* dia);
+// void prefsOrg(Preferences* dia);
/*! \brief Change Preferences dialog.
See prefsOrg for more info. It's very similar to docSetup/slotDocSetup. */
- void slotPrefsOrg();
+// void slotPrefsOrg();
void slotPrefs150Org();
/** \brief Refromat the document when user click "OK" in ReformDoc dialog.
See docSetup() for more info. */
- bool slotDocSetup();
+// bool slotDocSetup();
void slotDocSetup150();
//! \brief Insert a frame friendly dialog
void slotInsertFrame();
Modified: branches/ScribusOIF/scribus/text/storytext.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/scribus/text/storytext.cpp
==============================================================================
--- branches/ScribusOIF/scribus/text/storytext.cpp (original)
+++ branches/ScribusOIF/scribus/text/storytext.cpp Wed Nov 10 00:32:00 2010
@@ -786,6 +786,7 @@
if (pos < 0)
pos += length();
assert(pos >= 0);
+ assert(pos <= length());
int len = length();
//Find the previous word position
Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15837&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.vcproj Wed Nov 10 00:32:00 2010
@@ -819,14 +819,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\docitemattrprefs.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\docsections.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\documentchecker.cpp"
>
</File>
@@ -891,10 +883,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\fontprefs.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\fontreplacedialog.cpp"
>
</File>
@@ -1039,10 +1027,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\hysettings.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\imageinfodialog.cpp"
>
</File>
@@ -1375,10 +1359,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\prefs.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\prefs_colormanagement.cpp"
>
</File>
@@ -1483,10 +1463,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\prefsdialogbase.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\prefsfile.cpp"
>
</File>
@@ -1563,10 +1539,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\reformdoc.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\replacecolors.cpp"
>
</File>
@@ -2071,66 +2043,18 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\tabcheckdoc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabdisplay.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabdocument.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabexternaltoolswidget.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabgeneral.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabguides.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabkeyboardshortcutswidget.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\tabmanager.cpp"
>
</File>
<File
- RelativePath="..\..\scribus\ui\tabmiscellaneous.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\tabpdfoptions.cpp"
>
</File>
<File
- RelativePath="..\..\scribus\ui\tabprinter.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\tabruler.cpp"
>
</File>
<File
- RelativePath="..\..\scribus\ui\tabscrapbook.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabtools.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabtypography.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\text\textlayout.cpp"
>
</File>
@@ -2140,10 +2064,6 @@
</File>
<File
RelativePath="..\..\scribus\tocgenerator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tocindexprefs.cpp"
>
</File>
<File
@@ -4044,70 +3964,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\scribus\ui\docitemattrprefs.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\scribus\ui\docsections.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\scribus\documentchecker.h"
>
<FileConfiguration
@@ -4477,38 +4333,6 @@
</File>
<File
RelativePath="..\..\scribus\ui\fontlistview.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\scribus\ui\fontprefs.h"
>
<FileConfiguration
Name="Debug-cairo|Win32"
@@ -5200,38 +5024,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\scribus\ui\hysettings.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\scribus\icons5.h"
>
</File>
@@ -7336,38 +7128,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\scribus\ui\prefs.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\scribus\ui\prefs_colormanagement.h"
>
<FileConfiguration
@@ -8204,38 +7964,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\prefsdialogbase.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\scribus\prefsfile.h"
>
</File>
@@ -8706,38 +8434,6 @@
<File
RelativePath="..\..\scribus\rc4.h"
>
- </File>
- <File
- RelativePath="..\..\scribus\ui\reformdoc.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\..\scribus\ui\replacecolors.h"
@@ -11204,230 +10900,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\scribus\ui\tabcheckdoc.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabdisplay.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabdocument.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabexternaltoolswidget.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabgeneral.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabguides.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabkeyboardshortcutswidget.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\scribus\ui\tabmanager.h"
>
<FileConfiguration
@@ -11460,38 +10932,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\scribus\ui\tabmiscellaneous.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\scribus\ui\tabpdfoptions.h"
>
<FileConfiguration
@@ -11524,38 +10964,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\scribus\ui\tabprinter.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\scribus\ui\tabruler.h"
>
<FileConfiguration
@@ -11588,102 +10996,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\scribus\ui\tabscrapbook.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabtools.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabtypography.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\scribus\text\textlayout.h"
>
</File>
@@ -11693,38 +11005,6 @@
</File>
<File
RelativePath="..\..\scribus\tocgenerator.h"
- >
- <FileConfiguration
- Name="Debug-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-cairo|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-arthur|Win32"
- >
- <Tool
- Name="moc.exe"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\scribus\ui\tocindexprefs.h"
>
<FileConfiguration
Name="Debug-cairo|Win32"
@@ -12257,14 +11537,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\ui_docitemattrprefs.h"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\ui_docsections.h"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\ui_gradientaddedit.h"
>
</File>
@@ -12502,38 +11774,6 @@
</File>
<File
RelativePath="..\..\scribus\ui\ui_stylemanager.h"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\ui_tabdisplay.h"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\ui_tabexternaltoolswidget.h"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\ui_tabgeneral.h"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\ui_tabkeyboardshortcutswidget.h"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\ui_tabmiscellaneous.h"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\ui_tabprinter.h"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\ui_tabscrapbook.h"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\ui_tocindexprefs.h"
>
</File>
<File
@@ -12758,14 +11998,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\moc_docitemattrprefs.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\moc_docsections.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\moc_editor.cpp"
>
</File>
@@ -12810,10 +12042,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\moc_fontprefs.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\moc_fontreplacedialog.cpp"
>
</File>
@@ -12874,10 +12102,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\moc_hysettings.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\moc_imageinfodialog.cpp"
>
</File>
@@ -13126,10 +12350,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\moc_prefs.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\moc_prefs_colormanagement.cpp"
>
</File>
@@ -13234,10 +12454,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\moc_prefsdialogbase.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\moc_prefsmanager.cpp"
>
</File>
@@ -13294,10 +12510,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\moc_reformdoc.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\moc_replacecolors.cpp"
>
</File>
@@ -13546,71 +12758,19 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\moc_tabcheckdoc.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\moc_tabdisplay.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\moc_tabdocument.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\moc_tabexternaltoolswidget.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\moc_tabgeneral.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\moc_tabguides.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\moc_tabkeyboardshortcutswidget.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\moc_tabmanager.cpp"
>
</File>
<File
- RelativePath="..\..\scribus\ui\moc_tabmiscellaneous.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\moc_tabpdfoptions.cpp"
>
</File>
<File
- RelativePath="..\..\scribus\ui\moc_tabprinter.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\moc_tabruler.cpp"
>
</File>
<File
- RelativePath="..\..\scribus\ui\moc_tabscrapbook.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\moc_tabtools.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\moc_tabtypography.cpp"
- >
- </File>
- <File
RelativePath="..\..\scribus\moc_tocgenerator.cpp"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\moc_tocindexprefs.cpp"
>
</File>
<File
@@ -13691,14 +12851,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\docitemattrprefs.ui"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\docsections.ui"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\gradientaddedit.ui"
>
</File>
@@ -13727,10 +12879,6 @@
>
</File>
<File
- RelativePath="..\..\scribus\ui\hysettingsBase.ui"
- >
- </File>
- <File
RelativePath="..\..\scribus\ui\insertaframe.ui"
>
</File>
@@ -13948,42 +13096,6 @@
</File>
<File
RelativePath="..\..\scribus\ui\smstyleimport.ui"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\stylemanager.ui"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabdisplay.ui"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabexternaltoolswidget.ui"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabgeneral.ui"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabkeyboardshortcutswidget.ui"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabmiscellaneous.ui"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabprinter.ui"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tabscrapbook.ui"
- >
- </File>
- <File
- RelativePath="..\..\scribus\ui\tocindexprefs.ui"
>
</File>
<File
More information about the scribus-commit
mailing list