Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25195 → Rev 25196

/trunk/Scribus/scribus/scribus.cpp
494,7 → 494,7
 
void ScribusMainWindow::getScreenPosition(int& xPos, int& yPos) const
{
QScreen* screen(getScreen());
const QScreen* screen(getScreen());
QRect screenGeom = screen->geometry();
xPos = screenGeom.left();
yPos = screenGeom.top();
502,7 → 502,7
 
void ScribusMainWindow::getScreenDPI(int& dpiX, int& dpiY) const
{
QScreen* screen(getScreen());
const QScreen* screen(getScreen());
dpiX = screen->physicalDotsPerInchX();
dpiY = screen->physicalDotsPerInchY();
}
4263,7 → 4263,7
if (completeBaseName.length() > 3)
completeBaseName.chop(3);
}
doc->Print_Options.filename = fi.path()+"/"+completeBaseName+".ps";
doc->Print_Options.filename = fi.path() + "/" + completeBaseName + ".ps";
}
else
{
4856,19 → 4856,19
bool Resize = false;
dia->getUsedAttributesValues(Type, fill, line, LWidth, Print, Locked, Resize);
LWidth = LWidth / doc->unitRatio();
if ((useType) && (Type != currItem->realItemType()))
if (useType && (Type != currItem->realItemType()))
continue;
if ((useFill) && ((fill != currItem->fillColor()) || (currItem->GrType != 0)))
if (useFill && ((fill != currItem->fillColor()) || (currItem->GrType != 0)))
continue;
if ((useLine) && (line != currItem->lineColor()))
if (useLine && (line != currItem->lineColor()))
continue;
if ((useLWidth) && ((LWidth != currItem->lineWidth()) || (currItem->lineColor() == CommonStrings::None)))
if (useLWidth && ((LWidth != currItem->lineWidth()) || (currItem->lineColor() == CommonStrings::None)))
continue;
if ((usePrint) && (Print != currItem->printEnabled()))
if (usePrint && (Print != currItem->printEnabled()))
continue;
if ((useLocked) && (Locked != currItem->locked()))
if (useLocked && (Locked != currItem->locked()))
continue;
if ((useResize) && (Resize != currItem->sizeLocked()))
if (useResize && (Resize != currItem->sizeLocked()))
continue;
doc->m_Selection->addItem(currItem);
}
5343,15 → 5343,15
 
void ScribusMainWindow::slotZoom(double zoomFactor)
{
double finalZoomFactor=0.0;
double finalZoomFactor = 0.0;
//Zoom to Fit
if (zoomFactor == -100.0)
{
finalZoomFactor = (view->height() - 70) / (doc->currentPage()->height()+30);
finalZoomFactor = (view->height() - 70) / (doc->currentPage()->height() + 30);
}
else if (zoomFactor == -200.0)
{
finalZoomFactor = (view->width() - 50) / (doc->currentPage()->width()+30);
finalZoomFactor = (view->width() - 50) / (doc->currentPage()->width() + 30);
}
//Zoom to %
else
6352,7 → 6352,7
itemPage = parentItem->OwnPage;
parentItem = parentItem->Parent;
}
if ((itemPage != -1) && (itemPage != static_cast<int>(doc->currentPage()->pageNr())))
if ((itemPage != -1) && (itemPage != doc->currentPage()->pageNr()))
view->GotoPage(itemPage);
}
doc->m_Selection->delaySignalsOn();
8713,11 → 8713,9
 
void ScribusMainWindow::slotEditCopyContents()
{
PageItem *currItem = nullptr;
if (!HaveDoc || (currItem = doc->m_Selection->itemAt(0)) == nullptr)
PageItem* currItem = HaveDoc ? doc->m_Selection->itemAt(0) : nullptr;
if (!currItem || currItem->itemType() != PageItem::ImageFrame)
return;
if (currItem->itemType() != PageItem::ImageFrame)
return;
 
const PageItem_ImageFrame* imageItem = currItem->asImageFrame();
if (!imageItem->imageIsAvailable)
9691,7 → 9689,8
editMDialog->setWindowTitle(tr("Edit %1").arg(editMDialog->windowTitle()));
if (editMDialog->exec())
{
QString label, text;
QString label;
QString text;
QString oldLabel = mrk->label;
MarkData oldData = mrk->getData();
QString oldStr = mrk->getString();
/trunk/Scribus/scribus/ui/layers.cpp
437,7 → 437,7
const QObject* senderBox = sender();
if (strcmp(senderBox->metaObject()->className(), "QCheckBox") == 0)
{
bool isLayerVisible = ((QCheckBox*)(senderBox))->isChecked();
bool isLayerVisible = ((const QCheckBox*)(senderBox))->isChecked();
m_Doc->setLayerVisible(layerID, isLayerVisible);
if (!isLayerVisible)
m_Doc->m_Selection->removeItemsOfLayer(layerID);
457,7 → 457,7
const QObject* senderBox = sender();
if (strcmp(senderBox->metaObject()->className(), "QCheckBox") == 0)
{
m_Doc->setLayerPrintable(layerID, ((QCheckBox*)(senderBox))->isChecked());
m_Doc->setLayerPrintable(layerID, ((const QCheckBox*)(senderBox))->isChecked());
setActiveLayer(Table->currentRow(), -1);
emit LayerChanged();
}
474,7 → 474,7
const QObject* senderBox = sender();
if (strcmp(senderBox->metaObject()->className(), "QCheckBox") == 0)
{
bool isLayerLocked = ((QCheckBox*)(senderBox))->isChecked();
bool isLayerLocked = ((const QCheckBox*)(senderBox))->isChecked();
m_Doc->setLayerLocked(layerID, isLayerLocked);
if (isLayerLocked)
m_Doc->m_Selection->removeItemsOfLayer(layerID);
495,7 → 495,7
const QObject* senderBox = sender();
if (strcmp(senderBox->metaObject()->className(), "QCheckBox") == 0)
{
m_Doc->setLayerFlow(layerID, ((QCheckBox*)(senderBox))->isChecked());
m_Doc->setLayerFlow(layerID, ((const QCheckBox*)(senderBox))->isChecked());
emit LayerChanged();
setActiveLayer(Table->currentRow(), -1);
}
512,7 → 512,7
const QObject* senderBox = sender();
if (strcmp(senderBox->metaObject()->className(), "QCheckBox") == 0)
{
m_Doc->setLayerOutline(layerID, ((QCheckBox*)(senderBox))->isChecked());
m_Doc->setLayerOutline(layerID, ((const QCheckBox*)(senderBox))->isChecked());
emit LayerChanged();
setActiveLayer(Table->currentRow(), -1);
}
529,7 → 529,7
const QObject* senderBox = sender();
if (strcmp(senderBox->metaObject()->className(), "QCheckBox") == 0)
{
bool isLayerSelectable = ((QCheckBox*)(senderBox))->isChecked();
bool isLayerSelectable = ((const QCheckBox*)(senderBox))->isChecked();
m_Doc->setLayerSelectable(layerID, isLayerSelectable);
emit LayerChanged();
setActiveLayer(Table->currentRow(), -1);
582,16 → 582,17
int layerID = m_Doc->layerIDFromLevel(level);
if (layerID == -1)
return;
 
const QObject* senderBox = sender();
if (strcmp(senderBox->metaObject()->className(), "QToolButton") == 0)
{
QColor neu(QColorDialog::getColor(m_Doc->layerMarker(layerID), this));
if (neu.isValid())
QColor newColor(QColorDialog::getColor(m_Doc->layerMarker(layerID), this));
if (newColor.isValid())
{
QPixmap pm(20,15);
pm.fill(neu);
pm.fill(newColor);
((QToolButton*)(senderBox))->setIcon(pm);
m_Doc->setLayerMarker(layerID, neu);
m_Doc->setLayerMarker(layerID, newColor);
m_Doc->scMW()->updateLayerMenu();
m_Doc->scMW()->rebuildLayersList();
emit LayerChanged();
/trunk/Scribus/scribus/util.cpp
251,7 → 251,8
qDebug("compress2 failed with code %i", errcode);
out = *in;
}
else {
else
{
for (uint cl = 0; cl < exlen; ++cl)
out += QChar(bc[cl]);
}