r15519 by jghali - merge trunk revisions upto r15517
scribus-commit
scribus-commit at lists.scribus.net
Sun Oct 10 15:48:58 CEST 2010
Author: jghali
Date: Sun Oct 10 13:48:58 2010
New Revision: 15519
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15519
Log:
merge trunk revisions upto r15517
Modified:
branches/ScribusOIF/doc/de/scripterapi-setobjprop.html
branches/ScribusOIF/doc/en/scripterapi-setobjprop.html
branches/ScribusOIF/doc/fr/scripterapi-setobjprop.html
branches/ScribusOIF/scribus/actionmanager.cpp
branches/ScribusOIF/scribus/langmgr.cpp
branches/ScribusOIF/scribus/pageitem.cpp
branches/ScribusOIF/scribus/scribus.cpp
branches/ScribusOIF/scribus/scribus.h
branches/ScribusOIF/scribus/ui/contextmenu.cpp
branches/ScribusOIF/scribus/ui/prefs_fonts.cpp
branches/ScribusOIF/scribus/ui/preview.cpp
branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp
branches/ScribusOIF/scribus/ui/scrapbookpalette.h
branches/ScribusOIF/scribus/ui/smlinestyle.cpp
branches/ScribusOIF/scribus/ui/smlinestyle.h
branches/ScribusOIF/scribus/ui/smlinestylewidget.cpp
branches/ScribusOIF/scribus/ui/smlinestylewidget.h
branches/ScribusOIF/scribus/ui/smpstylewidget.h
Modified: branches/ScribusOIF/doc/de/scripterapi-setobjprop.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/doc/de/scripterapi-setobjprop.html
==============================================================================
--- branches/ScribusOIF/doc/de/scripterapi-setobjprop.html (original)
+++ branches/ScribusOIF/doc/de/scripterapi-setobjprop.html Sun Oct 10 13:48:58 2010
@@ -42,7 +42,7 @@
<p>Sets the gradient fill of the object "name" to type. Color descriptions are the same as for <a href="#-setFillColor">setFillColor</a>() and <a href="#-setFillShade">setFillShade</a>(). See the constants for available types (FILL_<type>).</p></dd>
<dt><a name="-setLineCap"><strong>setLineCap</strong></a>(...)</dt>
-<dd><code>setLineEnd(endtype, ["name"])</code>
+<dd><code>setLineCap(captype, ["name"])</code>
<p>Sets the line cap style of the object "name" to the style "cap". If "name" is not given the currently selected item is used. There are predefined constants for "cap" - CAP_<type>.</p></dd>
<dt><a name="-setLineColor"><strong>setLineColor</strong></a>(...)</dt>
Modified: branches/ScribusOIF/doc/en/scripterapi-setobjprop.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/doc/en/scripterapi-setobjprop.html
==============================================================================
--- branches/ScribusOIF/doc/en/scripterapi-setobjprop.html (original)
+++ branches/ScribusOIF/doc/en/scripterapi-setobjprop.html Sun Oct 10 13:48:58 2010
@@ -57,7 +57,7 @@
<p>Set or add a gradient stop to the gradient fill of the object \"name\" at position ramppoint. Color descriptions are the same as for <a href="#-setFillColor">setFillColor</a>() and <a href="#-setFillShade">setFillShade</a>(). setGradientFill() must have been called previously for the gradient fill to be visible.</p></dd>
<dt><a name="-setLineCap"><strong>setLineCap</strong></a>(...)</dt>
-<dd><code>setLineEnd(endtype, ["name"])</code>
+<dd><code>setLineCap(captype, ["name"])</code>
<p>Sets the line cap style of the object "name" to the style "cap". If "name" is not given the currently selected item is used. There are predefined constants for "cap" - CAP_<type>.</p></dd>
<dt><a name="-setLineColor"><strong>setLineColor</strong></a>(...)</dt>
Modified: branches/ScribusOIF/doc/fr/scripterapi-setobjprop.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/doc/fr/scripterapi-setobjprop.html
==============================================================================
--- branches/ScribusOIF/doc/fr/scripterapi-setobjprop.html (original)
+++ branches/ScribusOIF/doc/fr/scripterapi-setobjprop.html Sun Oct 10 13:48:58 2010
@@ -24,7 +24,7 @@
<p>Peut générer <a href="scripterapi.html#WrongFrameTypeError">WrongFrameTypeError</a> si le cadre cible n'est pas un cadre d'image</p></dd>
<dt><a name="-setImageScale"><strong>setImageScale</strong></a>(...)</dt>
-<dd><code><a href="#-setImageScale">setImageScale</a>(x, y [, "nom"])</code>
+<dd><code><a href="#-setImageScale">setImageScale</a>(x, y [, "nom"])</code>
<p>Définit les facteurs de redimensionnement de l'image dans le cadre d'image "nom". Si le "nom" n'est pas fourni, l'élément sélectionné est utilisé. Un nombre de 1 signifie 100 %. Les facteurs de redimensionnement sont égaux aux valeurs indiquées dans la palette des propriétés.</p>
<p>Peut générer <a href="scripterapi.html#WrongFrameTypeError">WrongFrameTypeError</a> si le cadre cible n'est pas un cadre d'image</p></dd>
@@ -55,7 +55,7 @@
les constantes pour les types disponibles (FILL_<type>).</p></dd>
<dt><a name="-setLineCap"><strong>setLineCap</strong></a>(...)</dt>
-<dd><code>setLineEnd(typeFin, ["nom"])</code>
+<dd><code>setLineCap(typeFin, ["nom"])</code>
<p>Établit la valeur de style "typeFin" pour le bout de ligne de l'objet "nom".
Si le "nom" n'est pas fourni, l'élément sélectionné est utilisé. Il
y a des constantes prédéfinies pour "typeFin" - CAP_<type>.</p></dd>
Modified: branches/ScribusOIF/scribus/actionmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/actionmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/actionmanager.cpp (original)
+++ branches/ScribusOIF/scribus/actionmanager.cpp Sun Oct 10 13:48:58 2010
@@ -416,8 +416,8 @@
scrActions->insert(name, new ScrAction(loadIcon("16/go-down.png"), loadIcon("22/go-down.png"), "", defaultKey(name), mainWindow));
name="itemRaise";
scrActions->insert(name, new ScrAction(loadIcon("16/go-up.png"), loadIcon("22/go-up.png"), "", defaultKey(name), mainWindow));
- name="itemSendToScrapbook";
- scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
+// name="itemSendToScrapbook";
+// scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name="itemSendToPattern";
scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
name="itemImageInfo";
@@ -488,7 +488,7 @@
connect( (*scrActions)["itemUngroup"], SIGNAL(triggered()), mainWindow, SLOT(UnGroupObj()) );
connect( (*scrActions)["itemPDFAnnotationProps"], SIGNAL(triggered()), mainWindow, SLOT(ModifyAnnot()) );
connect( (*scrActions)["itemPDFFieldProps"], SIGNAL(triggered()), mainWindow, SLOT(ModifyAnnot()) );
- connect( (*scrActions)["itemSendToScrapbook"], SIGNAL(triggered()), mainWindow, SLOT(PutScrap()) );
+// connect( (*scrActions)["itemSendToScrapbook"], SIGNAL(triggered()), mainWindow, SLOT(PutScrap()) );
connect( (*scrActions)["itemSendToPattern"], SIGNAL(triggered()), mainWindow, SLOT(PutToPatterns()) );
connect( (*scrActions)["itemAttributes"], SIGNAL(triggered()), mainWindow, SLOT(objectAttributes()) );
connect( (*scrActions)["itemShapeEdit"], SIGNAL(triggered()), mainWindow, SLOT(toggleNodeEdit()) );
@@ -1377,7 +1377,7 @@
(*scrActions)["itemRaiseToTop"]->setTexts( tr("Raise to &Top"));
(*scrActions)["itemLower"]->setTexts( tr("&Lower"));
(*scrActions)["itemRaise"]->setTexts( tr("&Raise"));
- (*scrActions)["itemSendToScrapbook"]->setTexts( tr("Send to S&crapbook"));
+// (*scrActions)["itemSendToScrapbook"]->setTexts( tr("Send to S&crapbook"));
(*scrActions)["itemSendToPattern"]->setTexts( tr("Send to Patterns"));
(*scrActions)["itemAttributes"]->setTexts( tr("&Attributes..."));
(*scrActions)["itemImageInfo"]->setTexts( tr("More Info..."));
@@ -1778,7 +1778,45 @@
itmenu->second << "typeEffectNormal" << "typeEffectUnderline" << "typeEffectUnderlineWords" << "typeEffectStrikeThrough" << "typeEffectAllCaps" << "typeEffectSmallCaps" << "typeEffectSuperscript" << "typeEffectSubscript" << "typeEffectOutline" << "typeEffectShadow" << "styleImageEffects" << "styleTabulators";
//Item
++itmenu;
- itmenu->second << "itemDuplicate" << "itemMulDuplicate" << "itemTransform" << "itemDelete" << "itemGroup" << "itemUngroup" << "itemLock" << "itemLockSize" << "itemImageIsVisible" << "itemUpdateImage" << "itemAdjustFrameToImage" << "itemAdjustImageToFrame" << "itemToggleInlineImage" << "itemExtendedImageProperties" << "itemPreviewLow" << "itemPreviewNormal" << "itemPreviewFull" << "itemRaise" << "itemLower" << "itemRaiseToTop" << "itemLowerToBottom" << "itemSendToScrapbook" << "itemSendToPattern" << "itemAttributes" << "itemPDFIsAnnotation" << "itemPDFIsBookmark" << "itemPDFAnnotationProps" << "itemPDFFieldProps" << "itemShapeEdit" << "itemConvertToBezierCurve" << "itemConvertToImageFrame" << "itemConvertToOutlines" << "itemConvertToPolygon" << "itemConvertToTextFrame" << "itemAttachTextToPath" << "itemDetachTextFromPath" << "itemCombinePolygons" << "itemSplitPolygons";
+ itmenu->second
+ << "itemDuplicate"
+ << "itemMulDuplicate"
+ << "itemTransform"
+ << "itemDelete"
+ << "itemGroup"
+ << "itemUngroup"
+ << "itemLock"
+ << "itemLockSize"
+ << "itemImageIsVisible"
+ << "itemUpdateImage"
+ << "itemAdjustFrameToImage"
+ << "itemAdjustImageToFrame"
+ << "itemToggleInlineImage"
+ << "itemExtendedImageProperties"
+ << "itemPreviewLow"
+ << "itemPreviewNormal"
+ << "itemPreviewFull"
+ << "itemRaise"
+ << "itemLower"
+ << "itemRaiseToTop"
+ << "itemLowerToBottom"
+// << "itemSendToScrapbook"
+ << "itemSendToPattern"
+ << "itemAttributes"
+ << "itemPDFIsAnnotation"
+ << "itemPDFIsBookmark"
+ << "itemPDFAnnotationProps"
+ << "itemPDFFieldProps"
+ << "itemShapeEdit"
+ << "itemConvertToBezierCurve"
+ << "itemConvertToImageFrame"
+ << "itemConvertToOutlines"
+ << "itemConvertToPolygon"
+ << "itemConvertToTextFrame"
+ << "itemAttachTextToPath"
+ << "itemDetachTextFromPath"
+ << "itemCombinePolygons"
+ << "itemSplitPolygons";
//Insert
++itmenu;
itmenu->second
Modified: branches/ScribusOIF/scribus/langmgr.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/langmgr.cpp
==============================================================================
--- branches/ScribusOIF/scribus/langmgr.cpp (original)
+++ branches/ScribusOIF/scribus/langmgr.cpp Sun Oct 10 13:48:58 2010
@@ -84,8 +84,6 @@
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" )) );
- langList.insert("ga", langPair("Galician", QObject::tr( "Galician" )) );
- langList.insert("galician", langPair("Galician", QObject::tr( "Galician" )) );
langList.insert("gl", langPair("Galician", QObject::tr( "Galician" )) );
langList.insert("el", langPair("Greek", QObject::tr( "Greek" )) );
langList.insert("he", langPair("Hebrew", QObject::tr( "Hebrew" )) );
Modified: branches/ScribusOIF/scribus/pageitem.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/pageitem.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pageitem.cpp (original)
+++ branches/ScribusOIF/scribus/pageitem.cpp Sun Oct 10 13:48:58 2010
@@ -114,6 +114,9 @@
GrCol3Shade(other.GrCol3Shade),
GrCol4Shade(other.GrCol4Shade),
meshGradientArray(other.meshGradientArray),
+ selectedMeshPointX(other.selectedMeshPointX),
+ selectedMeshPointY(other.selectedMeshPointY),
+ selectedMeshControlPoint(other.selectedMeshControlPoint),
Cols(other.Cols),
ColGap(other.ColGap),
PLineArt(other.PLineArt),
Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Sun Oct 10 13:48:58 2010
@@ -309,6 +309,7 @@
scrRecentPasteActions.clear();
scrWindowsActions.clear();
scrLayersActions.clear();
+ scrScrapActions.clear();
scrMenuMgr = new ScMWMenuManager(menuBar());
prefsManager = PrefsManager::instance();
formatsManager = FormatsManager::instance();
@@ -737,7 +738,9 @@
scrMenuMgr->addMenuItem(scrActions["itemLowerToBottom"], "ItemLevel", false);
scrMenuMgr->createMenu("ItemLayer", tr("Send to La&yer"));
scrMenuMgr->addMenuToMenu("ItemLayer", "Item");
- scrMenuMgr->addMenuItem(scrActions["itemSendToScrapbook"], "Item", false);
+ scrMenuMgr->createMenu("itemSendToScrapbook", tr("Send to Scrapbook"));
+ scrMenuMgr->addMenuToMenu("itemSendToScrapbook", "Item");
+// scrMenuMgr->addMenuItem(scrActions["itemSendToScrapbook"], "Item", false);
scrMenuMgr->addMenuItem(scrActions["itemSendToPattern"], "Item", false);
scrMenuMgr->addMenuSeparator("Item");
scrMenuMgr->addMenuItem(scrActions["itemAdjustFrameToImage"], "Item", false);
@@ -2570,7 +2573,8 @@
scrActions["itemLower"]->setEnabled(false);
scrActions["itemRaiseToTop"]->setEnabled(false);
scrActions["itemLowerToBottom"]->setEnabled(false);
- scrActions["itemSendToScrapbook"]->setEnabled(false);
+// scrActions["itemSendToScrapbook"]->setEnabled(false);
+ scrMenuMgr->setMenuEnabled("itemSendToScrapbook", false);
scrActions["itemSendToPattern"]->setEnabled(false);
scrActions["itemAdjustFrameToImage"]->setEnabled(false);
scrActions["itemAdjustImageToFrame"]->setEnabled(false);
@@ -2632,7 +2636,8 @@
scrActions["itemLower"]->setEnabled(true);
scrActions["itemRaiseToTop"]->setEnabled(true);
scrActions["itemLowerToBottom"]->setEnabled(true);
- scrActions["itemSendToScrapbook"]->setEnabled(true);
+// scrActions["itemSendToScrapbook"]->setEnabled(true);
+ scrMenuMgr->setMenuEnabled("itemSendToScrapbook", true);
scrActions["itemSendToPattern"]->setEnabled(true);
scrActions["itemAdjustFrameToImage"]->setEnabled(true);
scrActions["itemAdjustImageToFrame"]->setEnabled(true);
@@ -2686,7 +2691,8 @@
scrActions["itemLower"]->setEnabled(true);
scrActions["itemRaiseToTop"]->setEnabled(true);
scrActions["itemLowerToBottom"]->setEnabled(true);
- scrActions["itemSendToScrapbook"]->setEnabled(true);
+// scrActions["itemSendToScrapbook"]->setEnabled(true);
+ scrMenuMgr->setMenuEnabled("itemSendToScrapbook", true);
scrActions["itemSendToPattern"]->setEnabled(true);
scrActions["itemAdjustFrameToImage"]->setEnabled(true);
scrActions["itemAdjustImageToFrame"]->setEnabled(true);
@@ -2789,7 +2795,8 @@
scrActions["itemLower"]->setEnabled(true);
scrActions["itemRaiseToTop"]->setEnabled(true);
scrActions["itemLowerToBottom"]->setEnabled(true);
- scrActions["itemSendToScrapbook"]->setEnabled(true);
+// scrActions["itemSendToScrapbook"]->setEnabled(true);
+ scrMenuMgr->setMenuEnabled("itemSendToScrapbook", true);
scrActions["itemSendToPattern"]->setEnabled(true);
scrActions["itemAdjustFrameToImage"]->setEnabled(true);
scrActions["itemAdjustImageToFrame"]->setEnabled(true);
@@ -2859,7 +2866,8 @@
scrActions["itemLower"]->setEnabled(true);
scrActions["itemRaiseToTop"]->setEnabled(true);
scrActions["itemLowerToBottom"]->setEnabled(true);
- scrActions["itemSendToScrapbook"]->setEnabled(true);
+// scrActions["itemSendToScrapbook"]->setEnabled(true);
+ scrMenuMgr->setMenuEnabled("itemSendToScrapbook", true);
scrActions["itemSendToPattern"]->setEnabled(true);
scrActions["itemAdjustFrameToImage"]->setEnabled(true);
scrActions["itemAdjustImageToFrame"]->setEnabled(true);
@@ -2973,6 +2981,18 @@
{
actionManager->setPDFActions(view);
updateItemLayerList();
+ QStringList scrapNames = scrapbookPalette->getOpenScrapbooksNames();
+ scrapNames.removeAt(1);
+ for( QMap<QString, QPointer<ScrAction> >::Iterator it0s = scrScrapActions.begin(); it0s != scrScrapActions.end(); ++it0s )
+ scrMenuMgr->removeMenuItem((*it0s), "itemSendToScrapbook");
+ scrScrapActions.clear();
+ for (int i = 0; i < scrapNames.count(); i++)
+ {
+ ScrAction *act = new ScrAction( ScrAction::DataInt, QPixmap(), QPixmap(), scrapNames[i], QKeySequence(), this, i);
+ scrScrapActions.insert(scrapNames[i], act);
+ scrMenuMgr->addMenuItem(act, "itemSendToScrapbook", true);
+ connect(act, SIGNAL(triggeredData(int)), this, SLOT(PutScrap(int)));
+ }
//propertiesPalette->textFlowsAroundFrame->setChecked(currItem->textFlowsAroundFrame());
propertiesPalette->setTextFlowMode(currItem->textFlowMode());
scrActions["itemLock"]->setEnabled(true);
@@ -3004,7 +3024,8 @@
scrActions["itemRaiseToTop"]->setEnabled(false);
scrActions["itemRaise"]->setEnabled(false);
scrActions["itemLower"]->setEnabled(false);
- scrActions["itemSendToScrapbook"]->setEnabled(!(currItem->isTableItem && currItem->isSingleSel));
+// scrActions["itemSendToScrapbook"]->setEnabled(!(currItem->isTableItem && currItem->isSingleSel));
+ scrMenuMgr->setMenuEnabled("itemSendToScrapbook", !(currItem->isTableItem && currItem->isSingleSel));
scrActions["itemSendToPattern"]->setEnabled(!(currItem->isTableItem && currItem->isSingleSel));
scrActions["editCut"]->setEnabled(false);
scrActions["editClearContents"]->setEnabled(false);
@@ -3022,7 +3043,8 @@
scrActions["itemRaiseToTop"]->setEnabled(setter);
scrActions["itemRaise"]->setEnabled(setter);
scrActions["itemLower"]->setEnabled(setter);
- scrActions["itemSendToScrapbook"]->setEnabled(setter);
+// scrActions["itemSendToScrapbook"]->setEnabled(setter);
+ scrMenuMgr->setMenuEnabled("itemSendToScrapbook", setter);
scrActions["itemSendToPattern"]->setEnabled(setter);
}
scrActions["itemLock"]->setChecked(currItem->locked());
@@ -4458,7 +4480,8 @@
scrActions["itemLower"]->setEnabled(false);
scrActions["itemRaiseToTop"]->setEnabled(false);
scrActions["itemLowerToBottom"]->setEnabled(false);
- scrActions["itemSendToScrapbook"]->setEnabled(false);
+// scrActions["itemSendToScrapbook"]->setEnabled(false);
+ scrMenuMgr->setMenuEnabled("itemSendToScrapbook", false);
scrActions["itemSendToPattern"]->setEnabled(false);
scrActions["itemAdjustFrameToImage"]->setEnabled(false);
scrActions["itemAdjustImageToFrame"]->setEnabled(false);
@@ -6253,7 +6276,8 @@
scrActions["itemLower"]->setEnabled(true);
scrActions["itemRaiseToTop"]->setEnabled(true);
scrActions["itemLowerToBottom"]->setEnabled(true);
- scrActions["itemSendToScrapbook"]->setEnabled(true);
+// scrActions["itemSendToScrapbook"]->setEnabled(true);
+ scrMenuMgr->setMenuEnabled("itemSendToScrapbook", true);
scrActions["itemSendToPattern"]->setEnabled(true);
scrActions["itemAdjustFrameToImage"]->setEnabled(true);
scrActions["itemAdjustImageToFrame"]->setEnabled(true);
@@ -6301,7 +6325,8 @@
scrActions["itemLower"]->setEnabled(false);
scrActions["itemRaiseToTop"]->setEnabled(false);
scrActions["itemLowerToBottom"]->setEnabled(false);
- scrActions["itemSendToScrapbook"]->setEnabled(false);
+// scrActions["itemSendToScrapbook"]->setEnabled(false);
+ scrMenuMgr->setMenuEnabled("itemSendToScrapbook", false);
scrActions["itemSendToPattern"]->setEnabled(false);
scrActions["itemAdjustFrameToImage"]->setEnabled(false);
scrActions["itemAdjustImageToFrame"]->setEnabled(false);
@@ -8895,7 +8920,7 @@
}
}
-void ScribusMainWindow::PutScrap()
+void ScribusMainWindow::PutScrap(int scID)
{
ScriXmlDoc ss;
QString objectString = ss.WriteElem(doc, doc->m_Selection);
@@ -8917,7 +8942,7 @@
DOC = DOC.nextSibling();
}
objectString = docu.toString();
- scrapbookPalette->ObjFromMenu(objectString);
+ scrapbookPalette->ObjFromMainMenu(objectString, scID);
}
void ScribusMainWindow::changeLayer(int )
Modified: branches/ScribusOIF/scribus/scribus.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/scribus.h
==============================================================================
--- branches/ScribusOIF/scribus/scribus.h (original)
+++ branches/ScribusOIF/scribus/scribus.h Sun Oct 10 13:48:58 2010
@@ -242,6 +242,7 @@
QMap<QString, QPointer<ScrAction> > scrActions;
QMap<QString, QPointer<ScrAction> > scrRecentFileActions;
QMap<QString, QPointer<ScrAction> > scrWindowsActions;
+ QMap<QString, QPointer<ScrAction> > scrScrapActions;
QMap<QString, QPointer<ScrAction> > scrLayersActions;
QMap<QString, QPointer<ScrAction> > scrRecentPasteActions;
QMap<QString, QPointer<ScToolBar> > scrToolBars;
@@ -285,7 +286,7 @@
//void doDeHyphenate();
void slotTest();
void slotTest2();
- void PutScrap();
+ void PutScrap(int scID);
void PutToPatterns();
void changeLayer(int);
void showLayer();
Modified: branches/ScribusOIF/scribus/ui/contextmenu.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/ui/contextmenu.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/contextmenu.cpp (original)
+++ branches/ScribusOIF/scribus/ui/contextmenu.cpp Sun Oct 10 13:48:58 2010
@@ -25,8 +25,10 @@
#include "prefsmanager.h"
#include "scmimedata.h"
#include "scraction.h"
+#include "scrapbookpalette.h"
#include "scribus.h"
#include "scribusdoc.h"
+#include "ui/scmwmenumanager.h"
#include "undomanager.h"
#include "canvasmode_legacy.h"
@@ -90,6 +92,7 @@
QMenu *menuInfo = new QMenu(this);
QMenu *menuLayer = new QMenu(this);
QMenu *menuLevel = new QMenu(this);
+ QMenu *menuScrap = new QMenu(this);
QMenu *menuPDF = new QMenu(this);
QMenu *menuResolution = new QMenu(this);
@@ -281,7 +284,16 @@
if (selectedItemCount>0)
{
- addAction(m_AP->scrActions["itemSendToScrapbook"]);
+// QStringList scrapNames = m_AP->scrapbookPalette->getOpenScrapbooksNames();
+// scrapNames.removeAt(1);
+// for (int i = 0; i < scrapNames.count(); i++)
+// {
+// menuScrap->addAction(scrapNames[i], m_AP, SLOT(PutScrap(int)));
+// }
+ QAction *actSc = addMenu(m_AP->scrMenuMgr->getLocalPopupMenu("itemSendToScrapbook"));
+ actSc->setText( ScribusView::tr("Send to Scrapbook"));
+
+// addAction(m_AP->scrActions["itemSendToScrapbook"]);
addAction(m_AP->scrActions["itemSendToPattern"]);
//<-- Add Layer Items
if (m_doc->layerCount() > 1)
Modified: branches/ScribusOIF/scribus/ui/prefs_fonts.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/ui/prefs_fonts.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/prefs_fonts.cpp (original)
+++ branches/ScribusOIF/scribus/ui/prefs_fonts.cpp Sun Oct 10 13:48:58 2010
@@ -208,7 +208,8 @@
void Prefs_Fonts::saveGuiToPrefs(struct ApplicationPrefs *prefsData) const
{
- writePaths();
+ if (m_doc==0)
+ writePaths();
prefsData->fontPrefs.GFontSub.clear();
uint a = 0;
for (QMap<QString,QString>::ConstIterator itfsu = RList.begin(); itfsu != RList.end(); ++itfsu)
Modified: branches/ScribusOIF/scribus/ui/preview.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/ui/preview.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/preview.cpp (original)
+++ branches/ScribusOIF/scribus/ui/preview.cpp Sun Oct 10 13:48:58 2010
@@ -758,7 +758,7 @@
QStringList spots = usedSpots.keys();
args3.append( "-sDEVICE=tiffsep" );
- args3.append( "-c" );
+// args3.append( "-c" );
cmd = "<< /SeparationColorNames ";
QString allSeps ="[ /Cyan /Magenta /Yellow /Black ";
for (int sp = 0; sp < spots.count(); ++sp)
@@ -767,9 +767,18 @@
}
allSeps += "]";
cmd += allSeps + " /SeparationOrder [ /Cyan /Magenta /Yellow /Black] >> setpagedevice";
- args3.append(cmd);
-
+ QFile fx(QDir::convertSeparators(ScPaths::getTempFileDir()+"/sep.ps"));
+ if (fx.open(QIODevice::WriteOnly))
+ {
+ QTextStream tsx(&fx);
+ tsx << cmd;
+ fx.close();
+ }
args3.append("-f");
+ args3.append(QDir::convertSeparators(ScPaths::getTempFileDir()+"/sep.ps"));
+// args3.append(cmd);
+
+// args3.append("-f");
QString gsExe(getShortPathName(prefsManager->ghostscriptExecutable()));
ret = System(gsExe, args1 + args3 + args2, ScPaths::getTempFileDir()+"/sc.tif.txt" );
@@ -802,9 +811,18 @@
{
args3.clear();
args3.append("-sDEVICE=tiffsep");
- args3.append("-c");
- args3.append("<< /SeparationColorNames "+allSeps+" /SeparationOrder [ "+currSeps+" ] >> setpagedevice");
+ QFile fx(QDir::convertSeparators(ScPaths::getTempFileDir()+"/sep.ps"));
+ if (fx.open(QIODevice::WriteOnly))
+ {
+ QTextStream tsx(&fx);
+ tsx << QString("<< /SeparationColorNames "+allSeps+" /SeparationOrder [ "+currSeps+" ] >> setpagedevice");
+ fx.close();
+ }
args3.append("-f");
+ args3.append(QDir::convertSeparators(ScPaths::getTempFileDir()+"/sep.ps"));
+ // args3.append("-c");
+ // args3.append("<< /SeparationColorNames "+allSeps+" /SeparationOrder [ "+currSeps+" ] >> setpagedevice");
+ // args3.append("-f");
ret = System(gsExe, args1 + args3 + args2);
currSeps = "";
spc = 0;
@@ -814,9 +832,18 @@
{
args3.clear();
args3.append("-sDEVICE=tiffsep");
- args3.append("-c");
- args3.append("<< /SeparationColorNames "+allSeps+" /SeparationOrder [ "+currSeps+" ] >> setpagedevice");
+ QFile fx(QDir::convertSeparators(ScPaths::getTempFileDir()+"/sep.ps"));
+ if (fx.open(QIODevice::WriteOnly))
+ {
+ QTextStream tsx(&fx);
+ tsx << QString("<< /SeparationColorNames "+allSeps+" /SeparationOrder [ "+currSeps+" ] >> setpagedevice");
+ fx.close();
+ }
args3.append("-f");
+ args3.append(QDir::convertSeparators(ScPaths::getTempFileDir()+"/sep.ps"));
+ // args3.append("-c");
+ // args3.append("<< /SeparationColorNames "+allSeps+" /SeparationOrder [ "+currSeps+" ] >> setpagedevice");
+ // args3.append("-f");
ret = System(gsExe, args1 + args3 + args2);
}
return ret;
@@ -945,7 +972,7 @@
cms.allowColorManagement(false);
if (flagsVisible["Cyan"]->isChecked())
{
- if (GsMinor < 54)
+ if ((GsMinor < 54) && (GsMajor < 9))
loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.tif.Cyan.tif", 1, cms, ScImage::RGBData, 72, &mode);
else
loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.Cyan.tif", 1, cms, ScImage::RGBData, 72, &mode);
@@ -961,7 +988,7 @@
}
if (flagsVisible["Magenta"]->isChecked())
{
- if (GsMinor < 54)
+ if ((GsMinor < 54) && (GsMajor < 9))
loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.tif.Magenta.tif", 1, cms, ScImage::RGBData, 72, &mode);
else
loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.Magenta.tif", 1, cms, ScImage::RGBData, 72, &mode);
@@ -977,7 +1004,7 @@
}
if (flagsVisible["Yellow"]->isChecked())
{
- if (GsMinor < 54)
+ if ((GsMinor < 54) && (GsMajor < 9))
loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.tif.Yellow.tif", 1, cms, ScImage::RGBData, 72, &mode);
else
loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.Yellow.tif", 1, cms, ScImage::RGBData, 72, &mode);
@@ -1000,7 +1027,7 @@
if (checkBox && checkBox->isChecked())
{
QString fnam;
- if (GsMinor < 54)
+ if ((GsMinor < 54) && (GsMajor < 9))
fnam = QString(ScPaths::getTempFileDir()+"/sc.tif.s%1.tif").arg(sepit.value());
else
fnam = QString(ScPaths::getTempFileDir()+"/sc.s%1.tif").arg(sepit.value());
@@ -1020,7 +1047,7 @@
{
CMSettings cms(doc, "", Intent_Perceptual);
cms.allowColorManagement(false);
- if (GsMinor < 54)
+ if ((GsMinor < 54) && (GsMajor < 9))
loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.tif.Black.tif", 1, cms, ScImage::RGBData, 72, &mode);
else
loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.Black.tif", 1, cms, ScImage::RGBData, 72, &mode);
Modified: branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp (original)
+++ branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp Sun Oct 10 13:48:58 2010
@@ -66,6 +66,7 @@
setIconSize(QSize(60, 60));
objectMap.clear();
ScFilename = "";
+ visibleName = "";
canWrite = true;
}
@@ -714,8 +715,10 @@
Frame3 = new QToolBox( this );
activeBView = new BibView(this);
Frame3->addItem(activeBView, tr("Main"));
+ activeBView->visibleName = tr("Main");
tempBView = new BibView(this);
Frame3->addItem(tempBView, tr("Copied Items"));
+ tempBView->visibleName = tr("Copied Items");
tempCount = 0;
actItem = 0;
BiblioLayout->addWidget( Frame3 );
@@ -753,6 +756,7 @@
Frame3->addItem(activeBView, QIcon(loadIcon("16/lock.png")), d.dirName());
activeBView->ReadContents(fileName);
activeBView->ScFilename = fileName;
+ activeBView->visibleName = d.dirName();
activeBView->scrollToTop();
}
}
@@ -780,6 +784,18 @@
return ret;
}
+QStringList Biblio::getOpenScrapbooksNames()
+{
+ QStringList ret;
+ ret.clear();
+ for (int a = 0; a < Frame3->count(); a++)
+ {
+ BibView* bv = (BibView*)Frame3->widget(a);
+ ret.append(bv->visibleName);
+ }
+ return ret;
+}
+
void Biblio::setScrapbookFileName(QString fileName)
{
activeBView->ScFilename=fileName;
@@ -821,38 +837,6 @@
}
void Biblio::NewLib()
-{
- PrefsContext* dirs = PrefsManager::instance()->prefsFile->getContext("dirs");
- QString fileName = QFileDialog::getExistingDirectory(this, tr("Choose a Scrapbook Directory"), dirs->get("scrap_load", "."));
- if (!fileName.isEmpty())
- {
- for (int a = 0; a < Frame3->count(); a++)
- {
- BibView* bv = (BibView*)Frame3->widget(a);
- if (fileName == bv->ScFilename)
- return;
- }
- disconnect(activeBView, SIGNAL(objDropped(QString)), this, SLOT(ObjFromMenu(QString)));
- disconnect(activeBView, SIGNAL(fileDropped(QString, int)), this, SLOT(ObjFromFile(QString, int)));
- disconnect(activeBView, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(HandleMouse(QPoint)));
- disconnect(activeBView, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(handleDoubleClick(QListWidgetItem *)));
- disconnect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
- QDir d(fileName);
- activeBView = new BibView(this);
- Frame3->addItem(activeBView, d.dirName());
- activeBView->ScFilename = fileName;
- Frame3->setCurrentWidget(activeBView);
- d.cdUp();
- dirs->set("scrap_load", d.absolutePath());
- 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)));
- connect(activeBView, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(HandleMouse(QPoint)));
- connect(activeBView, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(handleDoubleClick(QListWidgetItem *)));
- }
-}
-
-void Biblio::Load()
{
PrefsContext* dirs = PrefsManager::instance()->prefsFile->getContext("dirs");
QString fileName = QFileDialog::getExistingDirectory(this, tr("Choose a Scrapbook Directory"), dirs->get("scrap_load", "."));
@@ -880,6 +864,48 @@
Frame3->addItem(activeBView, QIcon(loadIcon("16/lock.png")), d.dirName());
activeBView->ReadContents(fileName);
activeBView->ScFilename = fileName;
+ activeBView->visibleName = d.dirName();
+ Frame3->setCurrentWidget(activeBView);
+ d.cdUp();
+ dirs->set("scrap_load", d.absolutePath());
+ activeBView->scrollToTop();
+ 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)));
+ connect(activeBView, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(HandleMouse(QPoint)));
+ connect(activeBView, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(handleDoubleClick(QListWidgetItem *)));
+ }
+}
+
+void Biblio::Load()
+{
+ PrefsContext* dirs = PrefsManager::instance()->prefsFile->getContext("dirs");
+ QString fileName = QFileDialog::getExistingDirectory(this, tr("Choose a Scrapbook Directory"), dirs->get("scrap_load", "."));
+ if (!fileName.isEmpty())
+ {
+ for (int a = 0; a < Frame3->count(); a++)
+ {
+ BibView* bv = (BibView*)Frame3->widget(a);
+ if (fileName == bv->ScFilename)
+ return;
+ }
+ disconnect(activeBView, SIGNAL(objDropped(QString)), this, SLOT(ObjFromMenu(QString)));
+ disconnect(activeBView, SIGNAL(fileDropped(QString, int)), this, SLOT(ObjFromFile(QString, int)));
+ disconnect(activeBView, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(HandleMouse(QPoint)));
+ disconnect(activeBView, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(handleDoubleClick(QListWidgetItem *)));
+ disconnect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int )));
+ QDir d(fileName);
+ activeBView = new BibView(this);
+ QFileInfo fd(fileName);
+ activeBView->canWrite = fd.isWritable();
+ activeBView->setAcceptDrops(activeBView->canWrite);
+ if (activeBView->canWrite)
+ Frame3->addItem(activeBView, d.dirName());
+ else
+ Frame3->addItem(activeBView, QIcon(loadIcon("16/lock.png")), d.dirName());
+ activeBView->ReadContents(fileName);
+ activeBView->ScFilename = fileName;
+ activeBView->visibleName = d.dirName();
Frame3->setCurrentWidget(activeBView);
d.cdUp();
dirs->set("scrap_load", d.absolutePath());
@@ -1637,6 +1663,53 @@
}
}
+void Biblio::ObjFromMainMenu(QString text, int scrapID)
+{
+ QString nam = "";
+ QString tmp;
+ int scID = scrapID;
+ if (scID > 0)
+ scID++;
+ BibView* actBView = (BibView*)Frame3->widget(scID);
+ if (!actBView->canWrite)
+ return;
+ nam = getObjectName(text);
+ if (nam.isEmpty())
+ nam = tr("Object") + tmp.setNum(actBView->objectMap.count());
+ if (actBView->objectMap.contains(nam))
+ nam += "("+ tmp.setNum(tempCount) + ")";
+ qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
+ Query *dia = new Query(this, "tt", 1, 0, tr("&Name:"), tr("New Entry"));
+ dia->setEditText(nam, true);
+ dia->setTestList(actBView->objectMap.keys());
+ if (dia->exec())
+ {
+ nam = dia->getEditText();
+ }
+ else
+ {
+ delete dia;
+ return;
+ }
+ delete dia;
+ QString ff = text;
+ actBView->checkAndChange(ff, QDir::cleanPath(QDir::convertSeparators(actBView->ScFilename + "/" + nam + ".sce")), QDir::cleanPath(QDir::convertSeparators(actBView->ScFilename)));
+ ScPreview *pre = new ScPreview();
+ QPixmap pm = QPixmap::fromImage(pre->createPreview(ff));
+ actBView->AddObj(nam, QDir::cleanPath(QDir::convertSeparators(actBView->ScFilename + "/" + nam + ".sce")), pm);
+ if (PrefsManager::instance()->appPrefs.scrapbookPrefs.writePreviews)
+ pm.save(QDir::cleanPath(QDir::convertSeparators(actBView->ScFilename + "/" + nam +".png")), "PNG");
+ pm = pm.scaled(60, 60, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+ 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, actBView);
+ delete pre;
+}
+
void Biblio::CleanUpTemp()
{
QMap<QString,BibView::Elem>::Iterator it;
Modified: branches/ScribusOIF/scribus/ui/scrapbookpalette.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/ui/scrapbookpalette.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/scrapbookpalette.h (original)
+++ branches/ScribusOIF/scribus/ui/scrapbookpalette.h Sun Oct 10 13:48:58 2010
@@ -44,6 +44,7 @@
};
QMap<QString,Elem> objectMap;
QString ScFilename;
+ QString visibleName;
bool canWrite;
signals:
@@ -83,6 +84,7 @@
void installEventFilter(QObject *);
void setOpenScrapbooks(QStringList &fileNames);
QStringList getOpenScrapbooks();
+ QStringList getOpenScrapbooksNames();
QString getObjectName(QString &text);
BibView* tempBView;
BibView* activeBView;
@@ -92,6 +94,7 @@
void languageChange();
void ObjFromFile(QString path, int testResult);
void ObjFromMenu(QString text);
+ void ObjFromMainMenu(QString text, int scrapID);
private slots:
void handleDoubleClick(QListWidgetItem *ite);
Modified: branches/ScribusOIF/scribus/ui/smlinestyle.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/ui/smlinestyle.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/smlinestyle.cpp (original)
+++ branches/ScribusOIF/scribus/ui/smlinestyle.cpp Sun Oct 10 13:48:58 2010
@@ -20,7 +20,7 @@
#include "util.h"
-SMLineStyle::SMLineStyle() : StyleItem(), doc_(0), widget_(0), twidget_(0), selectionIsDirty_(false)
+SMLineStyle::SMLineStyle() : StyleItem(), doc_(0), widget_(0), twidget_(0), selectionIsDirty_(false), unitRatio_(1.0)
{
}
@@ -32,6 +32,7 @@
twidget_ = new QTabWidget();
widget_ = new SMLineStyleWidget();
twidget_->addTab(widget_, tr("Properties"));
+ unitChange();
// connect(widget_->lineStyles, SIGNAL(highlighted(int)), this, SLOT(slotCurrentLineChanged(int)));
connect(widget_->lineStyles, SIGNAL(currentRowChanged(int)), this, SLOT(slotCurrentLineChanged(int)));
}
@@ -55,6 +56,11 @@
{
tmpLines = doc_->MLineStyles;
selection_.clear();
+ if (widget_)
+ {
+ if (unitRatio_ != doc_->unitRatio())
+ unitChange();
+ }
}
else
{
@@ -369,7 +375,10 @@
void SMLineStyle::unitChange()
{
-
+ double oldRatio = unitRatio_;
+ unitRatio_ = doc_->unitRatio();
+ if (widget_)
+ widget_->unitChange(oldRatio, unitRatio_, doc_->unitIndex());
}
void SMLineStyle::setupConnections()
Modified: branches/ScribusOIF/scribus/ui/smlinestyle.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/ui/smlinestyle.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/smlinestyle.h (original)
+++ branches/ScribusOIF/scribus/ui/smlinestyle.h Sun Oct 10 13:48:58 2010
@@ -58,6 +58,7 @@
QTabWidget *twidget_;
QMap<QString, multiLine> tmpLines;
bool selectionIsDirty_;
+ double unitRatio_;
QMap<QString, multiLine*> selection_;
QList<RemoveItem> deleted_;
int currentLine_;
Modified: branches/ScribusOIF/scribus/ui/smlinestylewidget.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/ui/smlinestylewidget.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/smlinestylewidget.cpp (original)
+++ branches/ScribusOIF/scribus/ui/smlinestylewidget.cpp Sun Oct 10 13:48:58 2010
@@ -71,8 +71,12 @@
/***********************************/
/* End Tooltips */
/***********************************/
+}
+void SMLineStyleWidget::unitChange(double oldRatio, double newRatio, int unitIndex)
+{
+ lineWidth->setNewUnit(unitIndex);
}
void SMLineStyleWidget::showStyle(const multiLine &lineStyle, ColorList &colorList, int subLine)
@@ -145,7 +149,7 @@
for (multiLine::iterator it = currentStyle.begin(); it != currentStyle.end(); ++it)
{
pm2 = getWidePixmap(getColor((*it).Color, (*it).Shade));
- tmp2 = " "+tmp.setNum((*it).Width)+ tr(" pt")+" ";
+ tmp2 = " "+tmp.setNum((*it).Width)+ lineWidth->suffix()+" ";
if ((*it).Dash < 6)
tmp2 += CommonStrings::translatePenStyleName(static_cast<Qt::PenStyle>((*it).Dash));
tmp2 += " ";
Modified: branches/ScribusOIF/scribus/ui/smlinestylewidget.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/ui/smlinestylewidget.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/smlinestylewidget.h (original)
+++ branches/ScribusOIF/scribus/ui/smlinestylewidget.h Sun Oct 10 13:48:58 2010
@@ -29,6 +29,7 @@
void showStyle(const multiLine &lineStyle, ColorList &colorList, int subLine = 0);
void languageChange();
+ void unitChange(double oldRatio, double newRatio, int unitIndex);
private:
LineCombo *dashCombo;
Modified: branches/ScribusOIF/scribus/ui/smpstylewidget.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15519&path=/branches/ScribusOIF/scribus/ui/smpstylewidget.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/smpstylewidget.h (original)
+++ branches/ScribusOIF/scribus/ui/smpstylewidget.h Sun Oct 10 13:48:58 2010
@@ -28,9 +28,7 @@
void show(QList<ParagraphStyle*> &pstyles, QList<ParagraphStyle> &pstylesAll, QList<CharStyle> &cstyles, int unitIndex, const QString &defLang);
void clearAll();
-
void languageChange();
-
void unitChange(double oldRatio, double newRatio, int unitIndex);
private:
More information about the scribus-commit
mailing list