Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25136 → Rev 25137

/trunk/Scribus/CMakeLists.txt
202,7 → 202,7
 
## Do our Apple OSX version setup
if (APPLE)
if ((CMAKE_SIZEOF_VOID_P EQUAL 8) AND (ARCH_ARM))
if ((CMAKE_SIZEOF_VOID_P EQUAL 8) AND (ARCH_ARM_64))
string(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
if (_apple_ver EQUAL "21")
message(STATUS "Found macOS Monterey Target: Apple, 64 bit, ARM")
/trunk/Scribus/scribus/actionmanager.cpp
26,7 → 26,6
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
#include "text/storytext.h"
#include "undomanager.h"
#include "urllauncher.h"
#include "iconmanager.h"
/trunk/Scribus/scribus/canvasgesture_pan.cpp
19,7 → 19,6
#include "canvasgesture_pan.h"
 
#include "canvas.h"
#include "scribusapp.h" // for qApp
#include "scribusview.h"
#include "iconmanager.h"
 
/trunk/Scribus/scribus/canvasmode.cpp
758,15 → 758,14
#ifdef GESTURE_FRAME_PREVIEW
void CanvasMode::clearPixmapCache()
{
if (m_pixmapCache.count())
if (m_pixmapCache.isEmpty())
return;
foreach(PageItemPreview* ip, m_pixmapCache)
{
foreach(PageItemPreview* ip, m_pixmapCache)
{
if (ip)
delete ip;
}
m_pixmapCache.clear();
if (ip)
delete ip;
}
m_pixmapCache.clear();
}
#endif // GESTURE_FRAME_PREVIEW
 
/trunk/Scribus/scribus/canvasmode_edit.cpp
34,30 → 34,20
#include "appmodes.h"
#include "canvas.h"
#include "fpoint.h"
#include "fpointarray.h"
#include "hyphenator.h"
#include "iconmanager.h"
#include "pageitem_noteframe.h"
#include "pageitem_textframe.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
#include "sccolorengine.h"
#include "scmimedata.h"
#include "scribus.h"
#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
#include "ui/aligndistribute.h"
#include "ui/contextmenu.h"
#include "ui/hruler.h"
#include "ui/insertTable.h"
#include "ui/pageselector.h"
#include "ui/propertiespalette.h"
#include "ui/scrspinbox.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
#include "util_math.h"
 
 
949,7 → 939,6
FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPosition());
Mxp = mousePointDoc.x();
Myp = mousePointDoc.y();
double grabRadius = m_doc->guidesPrefs().grabRadius / m_canvas->scale();
int MxpS = static_cast<int>(mousePointDoc.x());
int MypS = static_cast<int>(mousePointDoc.y());
//QRectF mpo(Mxp - grabRadius, Myp - grabRadius, grabRadius * 2, grabRadius * 2);
/trunk/Scribus/scribus/pageitem.cpp
65,18 → 65,15
#include "sclimits.h"
#include "scpage.h"
#include "scpainter.h"
#include "scpaths.h"
#include "scpattern.h"
#include "scribusapp.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "scribuswin.h"
#include "sctextstream.h"
#include "selection.h"
#include "text/storytext.h"
#include "ui/contentpalette.h"
#include "ui/guidemanager.h"
#include "ui/propertiespalette.h"
#include "undomanager.h"
#include "undostate.h"
85,7 → 82,6
#include "util_file.h"
#include "util_formats.h"
#include "util_math.h"
#include "util_text.h"
 
 
 
7549,7 → 7545,7
for (int a = 0; a < effectsInUse.count(); ++a)
{
QString tmpstr = effectsInUse.at(a).effectParameters;
QString tmpstr2 = "";
QString tmpstr2;
ScTextStream fp(&tmpstr, QIODevice::ReadOnly);
switch (effectsInUse.at(a).effectCode)
{
/trunk/Scribus/scribus/pdflib_core.cpp
88,7 → 88,6
#include "util_formats.h"
#include "util_math.h"
#include "util_ghostscript.h"
#include "text/boxes.h"
 
#ifdef HAVE_OSG
#include "third_party/prc/exportPRC.h"
789,12 → 788,12
{
if (in.size() < 1)
return true;
bool succeed = false;
if (Options.Encrypt)
{
ScStreamFilter* rc4Encode = writer.openStreamFilter(true, ObjNum);
if (rc4Encode->openFilter())
{
bool succeed = false;
succeed = rc4Encode->writeData(in.data(), in.size());
succeed &= rc4Encode->closeFilter();
}
9128,7 → 9127,6
PutDoc("/BC [ " + SetColor(ite->annotation().borderColor(), 100) + " ] ");
else
PutDoc("/BC [ ] ");
PdfId IconOb = 0;
switch (ite->annotation().Type())
{
case Annotation::Button:
9139,6 → 9137,7
PutDoc("/AC " + EncStringUTF16(ite->annotation().Down(), annotationObj) + " ");
if (ite->annotation().UseIcons())
{
PdfId IconOb = 0;
if (!ite->Pfile.isEmpty())
{
IconOb += ite->pixm.hasAlpha() ? 3 : 2;
/trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
34,7 → 34,6
#include "svgexplugin.h"
 
#include "scconfig.h"
#include "canvas.h"
#include "cmsettings.h"
#include "commonstrings.h"
#include "pageitem_table.h"
44,12 → 43,11
#include "qtiocompressor.h"
#include "scpage.h"
#include "scpattern.h"
#include "scribuscore.h"
#include "scribus.h"
#include "sctextstruct.h"
#include "tableutils.h"
#include "util.h"
#include "ui/customfdialog.h"
#include "ui/guidemanager.h"
#include "ui/scmessagebox.h"
#include "sccolorengine.h"
#include "util_formats.h"
56,7 → 54,6
#include "util_math.h"
#include "text/textlayout.h"
#include "text/textlayoutpainter.h"
#include "text/boxes.h"
 
int svgexplugin_getPluginAPIVersion()
{
/trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
21,6 → 21,7
* *
***************************************************************************/
 
#include <QBoxLayout>
#include <QBuffer>
#include <QByteArray>
#include <QComboBox>
29,6 → 30,7
#include <QList>
#include <QMessageBox>
#include <QScopedPointer>
#include <QSpacerItem>
#include <QTemporaryDir>
#include <QTextStream>
#include <QUuid>
53,13 → 55,10
#include "text/textlayoutpainter.h"
#include "util.h"
#include "ui/customfdialog.h"
#include "ui/guidemanager.h"
#include "ui/scmessagebox.h"
#include "sccolorengine.h"
#include "util_formats.h"
#include "util_math.h"
#include "third_party/zip/scribus_zip.h"
#include "text/boxes.h"
 
int xpsexplugin_getPluginAPIVersion()
{
/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
19,7 → 19,6
#include "../../formatidlist.h"
#include "commonstrings.h"
#include "langmgr.h"
#include "ui/missing.h"
#include "prefsmanager.h"
#include "pageitem_latexframe.h"
#include "pageitem_line.h"
/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
27,29 → 27,15
#include "commonstrings.h"
#include "importcgm.h"
#include "loadsaveplugin.h"
#include "pagesize.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
#include "prefstable.h"
#include "rawimage.h"
#include "scclocale.h"
#include "sccolorengine.h"
#include "scconfig.h"
#include "scmimedata.h"
#include "scpaths.h"
#include "scribusXml.h"
#include "scribuscore.h"
#include "scribusview.h"
#include "sctextstream.h"
#include "selection.h"
#include "ui/customfdialog.h"
#include "ui/missing.h"
#include "ui/multiprogressdialog.h"
#include "ui/propertiespalette.h"
#include "undomanager.h"
#include "util.h"
#include "util_formats.h"
#include "util_math.h"
 
ScBitReader::ScBitReader(QByteArray &data)
198,8 → 184,6
else
progressDialog = nullptr;
/* Set default Page to size defined in Preferences */
b = 0.0;
h = 0.0;
if (progressDialog)
{
progressDialog->setOverallProgress(1);
/trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
20,30 → 20,15
 
#include "commonstrings.h"
#include "loadsaveplugin.h"
#include "pagesize.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
#include "prefstable.h"
#include "rawimage.h"
#include "scclocale.h"
#include "sccolorengine.h"
#include "scconfig.h"
#include "scmimedata.h"
#include "scpaths.h"
#include "scribusXml.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "sctextstream.h"
#include "selection.h"
#include "ui/customfdialog.h"
#include "ui/missing.h"
#include "ui/multiprogressdialog.h"
#include "ui/propertiespalette.h"
#include "undomanager.h"
#include "util.h"
#include "util_formats.h"
#include "util_math.h"
 
CvgPlug::CvgPlug(ScribusDoc* doc, int flags)
/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
28,31 → 28,19
#include "commonstrings.h"
#include "loadsaveplugin.h"
#include "pageitem_imageframe.h"
#include "pagesize.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
#include "prefstable.h"
#include "rawimage.h"
#include "scclocale.h"
#include "sccolorengine.h"
#include "scconfig.h"
#include "scmimedata.h"
#include "scpaths.h"
#include "scpattern.h"
#include "scribusXml.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "sctextstream.h"
#include "selection.h"
#include "ui/customfdialog.h"
#include "ui/missing.h"
#include "ui/multiprogressdialog.h"
#include "ui/propertiespalette.h"
#include "undomanager.h"
#include "util.h"
#include "util_formats.h"
#include "util_math.h"
 
DrwPlug::DrwPlug(ScribusDoc* doc, int flags)
168,8 → 156,6
else
progressDialog = nullptr;
/* Set default Page to size defined in Preferences */
b = 0.0;
h = 0.0;
if (progressDialog)
{
progressDialog->setOverallProgress(1);
/trunk/Scribus/scribus/plugins/import/fh/importfh.cpp
21,34 → 21,17
#include <libfreehand/libfreehand.h>
 
#include "commonstrings.h"
#include "ui/customfdialog.h"
#include "fileloader.h"
#include "loadsaveplugin.h"
#include "ui/missing.h"
#include "ui/multiprogressdialog.h"
#include "pagesize.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
#include "prefstable.h"
#include "ui/propertiespalette.h"
#include "rawimage.h"
#include "scclocale.h"
#include "sccolorengine.h"
#include "scconfig.h"
#include "scmimedata.h"
#include "scpaths.h"
#include "scpattern.h"
#include "scribus.h"
#include "scribusXml.h"
#include "scribuscore.h"
#include "scribusview.h"
#include "sctextstream.h"
#include "selection.h"
#include "undomanager.h"
#include "util.h"
#include "util_formats.h"
#include "util_math.h"
 
FhPlug::FhPlug(ScribusDoc* doc, int flags)
{
/trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
135,7 → 135,7
imageViewArea->SetModel(pModel);
 
//register item selections
connect(imageViewArea->SelectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(previewImageSelectionChanged(QItemSelection, QItemSelection)));
connect(imageViewArea->SelectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(previewImageSelectionChanged(QItemSelection,QItemSelection)));
 
//documentbrowser setup
connect(documentWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(documentChosen(QTreeWidgetItem*,int)));
/trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
149,7 → 149,7
QPainterPath objekt = mm.map(Item2->PoLine.toQPainterPath(true));
if ((objekt.contains(QPointF(start.x(), start.y()))) || (objekt.contains(QPointF(end.x(), end.y()))))
{
ScMessageBox::information(doc->scMW(), tr("Error"), tr("The cutting line must cross the polygon and\nboth end points must lie outside of the polygon"));
ScMessageBox::information(currDoc->scMW(), tr("Error"), tr("The cutting line must cross the polygon and\nboth end points must lie outside of the polygon"));
return true;
}
QPainterPath result = objekt.subtracted(cutter);
/trunk/Scribus/scribus/scimagecachemanager.cpp
713,9 → 713,9
return;
}
 
connect(d2, SIGNAL(fileCreated(ScImageCacheFile*, QFileInfo)), SLOT(fileCreated(ScImageCacheFile*, QFileInfo)));
connect(d2, SIGNAL(fileChanged(ScImageCacheFile*, QFileInfo)), SLOT(fileChanged(ScImageCacheFile*, QFileInfo)));
connect(d2, SIGNAL(fileRemoved(ScImageCacheFile*)), SLOT(fileRemoved(ScImageCacheFile *)));
connect(d2, SIGNAL(fileCreated(ScImageCacheFile*,QFileInfo)), SLOT(fileCreated(ScImageCacheFile*,QFileInfo)));
connect(d2, SIGNAL(fileChanged(ScImageCacheFile*,QFileInfo)), SLOT(fileChanged(ScImageCacheFile*,QFileInfo)));
connect(d2, SIGNAL(fileRemoved(ScImageCacheFile*)), SLOT(fileRemoved(ScImageCacheFile*)));
}
}
}
/trunk/Scribus/scribus/scribusdoc.cpp
95,24 → 95,15
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "scribuswin.h"
#include "selection.h"
#include "serializer.h"
#include "tableborder.h"
#include "textnote.h"
#include "text/textlayoutpainter.h"
#include "text/textshaper.h"
#include "ui/guidemanager.h"
#include "ui/hruler.h"
#include "ui/inserttablecolumnsdialog.h"
#include "ui/inserttablerowsdialog.h"
#include "ui/layers.h"
#include "ui/mark2item.h"
#include "ui/mark2mark.h"
#include "ui/markanchor.h"
#include "ui/markinsert.h"
#include "ui/marksmanager.h"
#include "ui/markvariabletext.h"
#include "ui/notesstyleseditor.h"
#include "ui/outlinepalette.h"
#include "ui/pagepalette.h"
16311,7 → 16302,7
 
void ScribusDoc::itemSelection_UnlinkTextFrameAndCutText( Selection *customSelection)
{
Selection* itemSelection = (customSelection != nullptr) ? customSelection : m_Selection;
Selection* itemSelection = (customSelection != nullptr) ? customSelection : m_Selection;
assert(itemSelection != nullptr);
int selectedItemCount = itemSelection->count();
if (selectedItemCount == 0)
16402,17 → 16393,17
 
int start = 0;
int stop = it->itemText.length();
for (int e = start; e < stop; ++e)
for (int i = start; i < stop; ++i)
{
if (it->itemText.hasObject(e))
if (it->itemText.hasObject(i))
{
if (it->itemText.object(e).getInlineCharID() == fIndex)
deleteList.prepend(e);
if (it->itemText.object(i).getInlineCharID() == fIndex)
deleteList.prepend(i);
}
}
for (int a = 0; a < deleteList.count(); a++)
for (int i = 0; i < deleteList.count(); i++)
{
it->itemText.removeChars(deleteList[a], 1);
it->itemText.removeChars(deleteList[i], 1);
}
it->invalid = true;
}
/trunk/Scribus/scribus/text/storytext.cpp
28,15 → 28,12
#include <QList>
#include <cassert> //added to make Fedora-5 happy
 
#include "fpoint.h"
#include "notesstyles.h"
#include "scfonts.h"
#include "scribusdoc.h"
#include "sctext_shared.h"
#include "selection.h"
#include "storytext.h"
#include "textnote.h"
//
#include "util.h"
#include "resourcecollection.h"
#include "desaxe/saxiohelper.h"
2709,7 → 2706,7
class Paragraph_body : public Action_body
{
public:
Paragraph_body() : lastPos(0), numPara(0), lastStyle(nullptr)
Paragraph_body()
{}
~Paragraph_body()
2763,9 → 2760,9
}
}
private:
int lastPos;
int numPara;
ParagraphStyle* lastStyle;
int lastPos {0};
int numPara {0};
ParagraphStyle* lastStyle {nullptr};
};
 
struct Paragraph : public MakeAction<Paragraph_body>
2777,7 → 2774,7
class SpanAction_body : public Action_body
{
public:
SpanAction_body() : lastPos(0), lastStyle(nullptr)
SpanAction_body()
{}
~SpanAction_body()
2816,8 → 2813,8
}
}
private:
int lastPos;
CharStyle* lastStyle;
int lastPos {0};
CharStyle* lastStyle {nullptr};
};
 
struct SpanAction : public MakeAction<SpanAction_body>
/trunk/Scribus/scribus/ui/cmykfw.cpp
524,7 → 524,7
else
{
CurrSwatch.clear();
QString pfadC2 = "";
QString pfadC2;
QString txt = c->data(0, Qt::UserRole).toString() + "/" + c->text(0);
if (!customColSet.contains(txt))
pfadC2 = csm.paletteFileFromName(txt);
/trunk/Scribus/scribus/ui/colorsandfills.cpp
1118,8 → 1118,8
}
allFormats += "*.sce *.SCE ";
formats.append("Scribus Objects (*.sce *.SCE)");
QString form1 = "";
QString form2 = "";
QString form1;
QString form2;
QStringList imgFormats;
bool jpgFound = false;
bool tiffFound = false;
1236,7 → 1236,7
formats += "eps";
formats += "epsi";
formats += "pdf";
QString form1 = "";
QString form1;
for (int i = 0; i < QImageReader::supportedImageFormats().count(); ++i)
{
form1 = QString(QImageReader::supportedImageFormats().at(i)).toLower();
1886,7 → 1886,7
dialogGradients.clear();
dialogPatterns.clear();
}
QString pfadC2 = "";
QString pfadC2;
if (item->text(0) == "Scribus Small")
{
m_colorList.insert("White", ScColor(0, 0, 0, 0));
/trunk/Scribus/scribus/ui/customfdialog.cpp
54,7 → 54,6
#include "scfilewidget.h"
#include "scimage.h"
#include "scpreview.h"
#include "scribusstructs.h"
#include "scslainforeader.h"
#include "units.h"
#include "util.h"
/trunk/Scribus/scribus/ui/helpbrowser.cpp
656,7 → 656,7
helpNav->listView->setSelectionMode(QAbstractItemView::SingleSelection);
QItemSelectionModel *selectionModel = new QItemSelectionModel(m_menuModel);
helpNav->listView->setSelectionModel(selectionModel);
connect(helpNav->listView->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(itemSelected(QItemSelection, QItemSelection)));
connect(helpNav->listView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(itemSelected(QItemSelection,QItemSelection)));
helpNav->listView->setColumnHidden(1,true);
}
/trunk/Scribus/scribus/ui/hyask.cpp
141,18 → 141,18
 
void HyAsk::Check()
{
disconnect ( Wort, SIGNAL ( textChanged ( const QString & ) ), this, SLOT ( Check() ) );
disconnect(Wort, SIGNAL(textChanged(const QString&)), this, SLOT(Check()));
QString newText(Wort->text());
newText.replace ( QRegularExpression ( "(-)+" ), "-" );
Wort->setText(newText);
addToExceptionList->setEnabled(true);
addToExceptionListText->setEnabled(true);
connect ( Wort, SIGNAL ( textChanged ( const QString & ) ), this, SLOT ( Check() ) );
connect(Wort, SIGNAL(textChanged(const QString &)), this, SLOT(Check()));
}
 
void HyAsk::DoSkip()
{
disconnect ( Wort, SIGNAL ( textChanged ( const QString & ) ), this, SLOT ( Check() ) );
disconnect (Wort, SIGNAL (textChanged(const QString &)), this, SLOT(Check()));
QString newText(Wort->text());
newText.replace ( QRegularExpression ( "(-)+" ), "" );
Wort->setText(newText);
/trunk/Scribus/scribus/ui/javadocs.cpp
74,7 → 74,7
connect(EditScript, SIGNAL(clicked()), this, SLOT(slotEdit()));
connect(DeleteScript, SIGNAL(clicked()), this, SLOT(slotDelete()));
connect(ExitDia, SIGNAL(clicked()), this, SLOT(accept()));
connect(Scripts, SIGNAL(itemActivated (QListWidgetItem*)), this, SLOT(slotEdit()));
connect(Scripts, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(slotEdit()));
connect(Scripts, SIGNAL(itemSelectionChanged()), this, SLOT(slotSelectionChanged()));
AddScript->setToolTip( "<qt>" + tr( "Adds a new Script, predefines a function with the same name. If you want to use this script as an \"Open Action\" script be sure not to change the name of the function." ) + "</qt>" );
}
/trunk/Scribus/scribus/ui/latexeditor.cpp
559,7 → 559,7
iconList->setWrapping(true);
iconList->setResizeMode(QListView::Adjust);
connect(iconList, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(newItemSelected(QListWidgetItem*,QListWidgetItem*)));
connect(iconList, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(newItemSelected(QListWidgetItem*,QListWidgetItem*)));
connect(iconList, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(itemDoubleClicked(QListWidgetItem*)));
QHBoxLayout *hLayout = new QHBoxLayout();
/trunk/Scribus/scribus/ui/modetoolbar.cpp
108,7 → 108,7
 
languageChange();
 
connect(autoFormButtonGroup, SIGNAL(FormSel(int, int, qreal *)), this, SLOT(SelShape(int, int, qreal *)));
connect(autoFormButtonGroup, SIGNAL(FormSel(int,int,qreal*)), this, SLOT(SelShape(int,int,qreal*)));
connect(Angle, SIGNAL(valueChanged(double)), this, SLOT(newCalValues()));
connect(PWidth, SIGNAL(valueChanged(double)), this, SLOT(newCalValues()));
connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange()));
/trunk/Scribus/scribus/ui/picsearchoptions.cpp
122,7 → 122,7
int recurse = (recursiveSearch->isChecked()) ? -1 : 0;
FileSearch* search = new FileSearch(this, fileEdit->text(), m_strLastDirSearched, recurse, caseInsensitiveCheck->isChecked());
Q_CHECK_PTR(search);
connect(search, SIGNAL(searchComplete(QStringList, QString)), SLOT(slotSearchPicFinished(QStringList, QString)));
connect(search, SIGNAL(searchComplete(QStringList,QString)), SLOT(slotSearchPicFinished(QStringList,QString)));
connect(search, SIGNAL(aborted(bool)), SLOT(slotSearchPicAborted(bool)));
// Set up the UI to let the user cancel the search, then start it
setSearchButton(true, search);
/trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp
306,7 → 306,7
softShadowBlendMode->setStringValue( tr("Normal"));
softShadowBlendMode->setText(0, tr( "Blendmode:"));
 
connect(this->model(), SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SLOT(handleNewValues()));
connect(this->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(handleNewValues()));
}
 
void PropertiesPalette_Shadow::updateSpinBoxConstants()
/trunk/Scribus/scribus/ui/propertiespalette_xyzbase.ui
110,13 → 110,77
<property name="spacing">
<number>3</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="xposLabel">
<item row="1" column="1">
<widget class="ScrSpinBox" name="yposSpin">
<property name="toolTip">
<string>Vertical position of current basepoint</string>
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="ScrSpinBox" name="rotationSpin">
<property name="toolTip">
<string>Rotation of object at current basepoint</string>
</property>
<property name="wrapping">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="rotateCCW">
<property name="toolTip">
<string>Rotate the selection anti-clockwise by 90º</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="rotateCW">
<property name="toolTip">
<string>Rotate the selection alockwise by 90º</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="1">
<widget class="ScrSpinBox" name="widthSpin">
<property name="toolTip">
<string>Width of current selection</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="heightLabel">
<property name="text">
<string>&amp;X-Pos:</string>
<string>&amp;Height:</string>
</property>
<property name="buddy">
<cstring>xposSpin</cstring>
<cstring>heightSpin</cstring>
</property>
</widget>
</item>
133,13 → 197,23
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="widthLabel">
<item row="5" column="0">
<widget class="QLabel" name="basepointLabel">
<property name="toolTip">
<string>Point from which measurements or rotation angles are referenced</string>
</property>
<property name="text">
<string>&amp;Width:</string>
<string>Basepoint:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="xposLabel">
<property name="text">
<string>&amp;X-Pos:</string>
</property>
<property name="buddy">
<cstring>widthSpin</cstring>
<cstring>xposSpin</cstring>
</property>
</widget>
</item>
153,27 → 227,20
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="ScrSpinBox" name="yposSpin">
<property name="toolTip">
<string>Vertical position of current basepoint</string>
<item row="4" column="0">
<widget class="QLabel" name="rotationLabel">
<property name="text">
<string>&amp;Rotation:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="ScrSpinBox" name="widthSpin">
<property name="toolTip">
<string>Width of current selection</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="heightLabel">
<item row="2" column="0">
<widget class="QLabel" name="widthLabel">
<property name="text">
<string>&amp;Height:</string>
<string>&amp;Width:</string>
</property>
<property name="buddy">
<cstring>heightSpin</cstring>
<cstring>widthSpin</cstring>
</property>
</widget>
</item>
184,36 → 251,6
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="rotationLabel">
<property name="text">
<string>&amp;Rotation:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="ScrSpinBox" name="rotationSpin">
<property name="toolTip">
<string>Rotation of object at current basepoint</string>
</property>
<property name="wrapping">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="basepointLabel">
<property name="toolTip">
<string>Point from which measurements or rotation angles are referenced</string>
</property>
<property name="text">
<string>Basepoint:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="BasePointWidget" name="basePointWidget" native="true"/>
</item>
<item row="2" column="2" rowspan="2">
<widget class="LinkButton" name="keepFrameWHRatioButton">
<property name="maximumSize">
233,6 → 270,9
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="BasePointWidget" name="basePointWidget" native="true"/>
</item>
</layout>
</item>
</layout>
319,32 → 359,18
</spacer>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0,0,0" columnminimumwidth="0,0,0,0,0">
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0,0">
<property name="spacing">
<number>3</number>
</property>
<item row="1" column="3">
<widget class="QToolButton" name="noPrint">
<property name="toolTip">
<string>Enable or disable exporting of the object</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="doUnGroup">
<widget class="QToolButton" name="flipV">
<property name="toolTip">
<string>Ungroup the selected group</string>
<string>Flip vertically</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QToolButton" name="flipH">
<property name="toolTip">
<string>Flip horizontally</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QToolButton" name="doLock">
<property name="toolTip">
<string>Lock or unlock the object</string>
351,45 → 377,39
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QToolButton" name="noResize">
<item row="0" column="0">
<widget class="QToolButton" name="doGroup">
<property name="toolTip">
<string>Lock or unlock the size of the object</string>
<string>Group the selected objects</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QToolButton" name="doGroup">
<widget class="QToolButton" name="flipH">
<property name="toolTip">
<string>Group the selected objects</string>
<string>Flip horizontally</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="flipV">
<widget class="QToolButton" name="noPrint">
<property name="toolTip">
<string>Flip vertically</string>
<string>Enable or disable exporting of the object</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QToolButton" name="rotateCCW">
<item row="0" column="3">
<widget class="QToolButton" name="noResize">
<property name="toolTip">
<string>Rotate the selection anti-clockwise by 90º</string>
<string>Lock or unlock the size of the object</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QToolButton" name="rotateCW">
<widget class="QToolButton" name="doUnGroup">
<property name="toolTip">
<string>Rotate the selection alockwise by 90º</string>
<string>Ungroup the selected group</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
626,7 → 626,7
QApplication::changeOverrideCursor(QCursor(Qt::WaitCursor));
m_enhanced = new CharSelectEnhanced(this);
m_enhanced->setModal(true);
connect(m_enhanced, SIGNAL(insertSpecialChars(const QVector<uint> &)), this, SLOT(insertSpecialChars(const QVector<uint> &)));
connect(m_enhanced, SIGNAL(insertSpecialChars(const QVector<uint>&)), this, SLOT(insertSpecialChars(const QVector<uint>&)));
connect(m_enhanced, SIGNAL(paletteShown(bool)), bulletCharTableButton, SLOT(setChecked(bool)));
m_enhanced->setDoc(m_doc);
m_enhanced->setEnabled(true);
/trunk/Scribus/scribus/ui/resourcemanager.cpp
945,7 → 945,7
connect(ScQApp->dlManager(), SIGNAL(fileReceived(QString)), this, SLOT(updateProgressBar()));
connect(ScQApp->dlManager(), SIGNAL(fileFailed(QString)), this, SLOT(updateProgressBar()));
connect(ScQApp->dlManager(), SIGNAL(fileFailed(QString)), this, SLOT(updateProgressBar()));
connect(ScQApp->dlManager(), SIGNAL(fileDownloadProgress(qint64, qint64)), this, SLOT(updateProgressData(qint64, qint64)));
connect(ScQApp->dlManager(), SIGNAL(fileDownloadProgress(qint64,qint64)), this, SLOT(updateProgressData(qint64,qint64)));
ScQApp->dlManager()->startDownloads();
}
 
954,7 → 954,7
disconnect(ScQApp->dlManager(), SIGNAL(finished()), this, SLOT(downloadListFinished()));
disconnect(ScQApp->dlManager(), SIGNAL(fileReceived(QString)), this, SLOT(updateProgressBar()));
disconnect(ScQApp->dlManager(), SIGNAL(fileFailed(QString)), this, SLOT(updateProgressBar()));
disconnect(ScQApp->dlManager(), SIGNAL(fileDownloadProgress(qint64, qint64)), this, SLOT(updateProgressData(qint64, qint64)));
disconnect(ScQApp->dlManager(), SIGNAL(fileDownloadProgress(qint64,qint64)), this, SLOT(updateProgressData(qint64,qint64)));
 
int category = categoryComboBox->currentData().toInt();
bool fileOk = checkFileHash(ScPaths::downloadDir(), m_dataFiles[category], m_dataFiles[category] + ".sha256", QCryptographicHash::Sha256);
/trunk/Scribus/scribus/ui/scrapbookpalette.cpp
800,7 → 800,7
connect(importButton, SIGNAL(clicked()), this, SLOT(Import()));
connect(closeButton, SIGNAL(clicked()), this, SLOT(closeLib()));
connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int)));
connect(configMenue, SIGNAL(triggered(QAction *)), this, SLOT(updateView()));
connect(configMenue, SIGNAL(triggered(QAction*)), this, SLOT(updateView()));
}
 
void Biblio::setOpenScrapbooks(const QStringList &fileNames)
836,9 → 836,9
updateView();
connect(Frame3, SIGNAL(currentChanged(int)), this, SLOT(libChanged(int)));
connect(activeBView, SIGNAL(objDropped(QString)), this, SLOT(objFromMenu(QString)));
connect(activeBView, SIGNAL(fileDropped(QString, int)), this, SLOT(objFromFile(QString, int)));
connect(activeBView, SIGNAL(customContextMenuRequested (const QPoint &)), this, SLOT(handleMouse(QPoint)));
connect(activeBView, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(handleDoubleClick(QListWidgetItem *)));
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*)));
}
 
QStringList Biblio::getOpenScrapbooks() const
1022,9 → 1022,9
upButton->setEnabled(!((Frame3->currentIndex() == 0) || (Frame3->currentIndex() == 1)));
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 *)));
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*)));
emit scrapbookListChanged();
}
 
/trunk/Scribus/scribus/ui/shadebutton.cpp
20,7 → 20,7
setPopupMode(QToolButton::InstantPopup);
setText("100 %");
fillShadeMenu->actions().at(11)->setChecked(true);
connect( fillShadeMenu, SIGNAL(triggered(QAction *)), this, SLOT(setShade(QAction *)));
connect( fillShadeMenu, SIGNAL(triggered(QAction*)), this, SLOT(setShade(QAction*)));
}
 
void ShadeButton::setShade(QAction *act)
/trunk/Scribus/scribus/ui/storyeditor.cpp
60,7 → 60,6
#include "alignselect.h"
#include "directionselect.h"
#include "colorcombo.h"
#include "colorlistbox.h"
#include "commonstrings.h"
#include "fontcombo.h"
#include "iconmanager.h"
83,16 → 82,13
#include "serializer.h"
#include "shadebutton.h"
#include "storyeditor.h"
#include "styleitem.h"
#include "styleselect.h"
#include "ui/charselect.h"
#include "ui/customfdialog.h"
#include "ui/scmessagebox.h"
#include "ui/stylecombos.h"
#include "ui/stylemanager.h"
#include "units.h"
#include "util.h"
#include "util_debug.h"
 
 
class StyledTextMimeData : public QMimeData