Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 18794 → Rev 18795

/trunk/Scribus/scribus/canvasmode_imageimport.cpp
235,7 → 235,7
currItem->IRender = m_doc->cmsSettings().DefaultIntentImages;
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
m_doc->loadPict(fileName, currItem, false, true);
m_ScMW->propertiesPalette->imagePal->displayScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
m_ScMW->propertiesPalette->imagePal->showScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
m_ScMW->repaint();
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
m_view->DrawNew();
/trunk/Scribus/scribus/plugins/scripter/api_imageitem.cpp
210,7 → 210,7
// Force the braindead app to notice the changes
 
//FIXME emit or something so we dont need this
ScCore->primaryMainWindow()->propertiesPalette->imagePal->displayScaleAndOffset(item->imageXScale(), item->imageYScale(), item->imageXOffset(), item->imageYOffset());
ScCore->primaryMainWindow()->propertiesPalette->imagePal->showScaleAndOffset(item->imageXScale(), item->imageYScale(), item->imageXOffset(), item->imageYOffset());
item->AdjustPictScale();
//ScCore->primaryMainWindow()->view->AdjustPictScale(item);
 
/trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
563,7 → 563,7
// Force the braindead app to notice the changes
 
//FIXME emit or something so we dont need this
ScCore->primaryMainWindow()->propertiesPalette->imagePal->displayScaleAndOffset(item->imageXScale(), item->imageYScale(), item->imageXOffset(), item->imageYOffset());
ScCore->primaryMainWindow()->propertiesPalette->imagePal->showScaleAndOffset(item->imageXScale(), item->imageYScale(), item->imageXOffset(), item->imageYOffset());
item->AdjustPictScale();
//ScCore->primaryMainWindow()->view->AdjustPictScale(item);
 
/trunk/Scribus/scribus/scribus.cpp
1252,8 → 1252,8
 
const ParagraphStyle& currPStyle( inEditMode ? item->currentStyle() : item->itemText.defaultStyle());
setAlignmentValue(currPStyle.alignment());
propertiesPalette->textPal->displayParStyle(currPStyle.parent());
propertiesPalette->textPal->displayCharStyle(item->currentCharStyle().parent());
propertiesPalette->textPal->showParStyle(currPStyle.parent());
propertiesPalette->textPal->showCharStyle(item->currentCharStyle().parent());
doc->currentStyle = item->currentStyle();
// #8112 : do not use operator= here as it does not update style features
doc->currentStyle.charStyle().setStyle(item->currentCharStyle());
2450,7 → 2450,7
propertiesPalette->setDoc(doc);
marksManager->setDoc(doc);
nsEditor->setDoc(doc);
//propertiesPalette->Cpal->displayGradient(0);
//propertiesPalette->Cpal->showGradient(0);
pagePalette->setView(view);
layerPalette->setDoc(doc);
guidePalette->setDoc(doc);
2666,7 → 2666,7
marksManager->setDoc(doc);
symbolPalette->setDoc(doc);
inlinePalette->setDoc(doc);
// propertiesPalette->Cpal->displayGradient(0);
// propertiesPalette->Cpal->showGradient(0);
// propertiesPalette->updateColorList();
pagePalette->setView(view);
layerPalette->setDoc(doc);
3073,8 → 3073,8
{
scrMenuMgr->setMenuEnabled("InsertMark",false);
doc->currentStyle = currItem->itemText.defaultStyle();
propertiesPalette->textPal->displayParStyle(doc->currentStyle.parent());
propertiesPalette->textPal->displayCharStyle(doc->currentStyle.charStyle().parent());
propertiesPalette->textPal->showParStyle(doc->currentStyle.parent());
propertiesPalette->textPal->showCharStyle(doc->currentStyle.charStyle().parent());
emit TextStyle(doc->currentStyle);
// to go: (av)
propertiesPalette->textPal->updateStyle(doc->currentStyle);
3155,8 → 3155,8
else
{
doc->currentStyle = currItem->itemText.defaultStyle();
propertiesPalette->textPal->displayParStyle(doc->currentStyle.parent());
propertiesPalette->textPal->displayCharStyle(doc->currentStyle.charStyle().parent());
propertiesPalette->textPal->showParStyle(doc->currentStyle.parent());
propertiesPalette->textPal->showCharStyle(doc->currentStyle.charStyle().parent());
emit TextStyle(doc->currentStyle);
// to go: (av)
propertiesPalette->textPal->updateStyle(doc->currentStyle);
4299,7 → 4299,7
doc->cmsSettings().CMSinUse = false;
}
// propertiesPalette->updateColorList();
// propertiesPalette->Cpal->displayGradient(0);
// propertiesPalette->Cpal->showGradient(0);
if (fileLoader->fileType() > FORMATID_NATIVEIMPORTEND)
{
doc->setName(FName+ tr("(converted)"));
4312,7 → 4312,7
doc->setMasterPageMode(false);
//IL doc->setHyphLanguage(GetLang(doc->hyphLanguage()));
HaveNewDoc();
// propertiesPalette->Cpal->displayGradient(0);
// propertiesPalette->Cpal->showGradient(0);
// propertiesPalette->updateCList();
doc->hasName = true;
if (doc->MasterPages.count() == 0)
4565,7 → 4565,7
currItem->Pfile = fileName;
img.save(fileName, "PNG");
doc->loadPict(fileName, currItem, false, true);
propertiesPalette->imagePal->displayScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
propertiesPalette->imagePal->showScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
view->DrawNew();
emit UpdateRequest(reqColorsUpdate | reqCmsOptionsUpdate);
7397,7 → 7397,7
doc->itemSelection_SetFontSize(c*10);
}
}
propertiesPalette->textPal->displayFontSize(c*10);
propertiesPalette->textPal->showFontSize(c*10);
}
 
//CB-->Doc partly
7738,7 → 7738,7
{
// doc->currentStyle.setAlignment(static_cast<ParagraphStyle::AlignmentType>(a));
doc->itemSelection_SetAlignment(a);
propertiesPalette->textPal->displayAlignment(a);
propertiesPalette->textPal->showAlignment(a);
PageItem *currItem = doc->m_Selection->itemAt(0);
setTBvals(currItem);
}
7780,7 → 7780,7
{
// doc->currentStyle = doc->docParagraphStyles[a];
// doc->currentStyle.setAlignment(static_cast<ParagraphStyle::AlignmentType>(a<5 ? a : 0));
propertiesPalette->textPal->displayAlignment(a);
propertiesPalette->textPal->showAlignment(a);
QString alignment[] = {"Left", "Center", "Right", "Block", "Forced"};
for (int b=0; b<5; ++b)
{
/trunk/Scribus/scribus/ui/cpalette.cpp
233,10 → 233,10
return;
 
updateCList();
displayOverprint(currentItem->doOverprint ? 1 : 0);
displayColorValues(currentItem->lineColor(), currentItem->fillColor(), currentItem->lineShade(), currentItem->fillShade());
displayGradient(currentItem->gradientType());
displayGradientStroke(currentItem->strokeGradientType());
showOverprint(currentItem->doOverprint ? 1 : 0);
showColorValues(currentItem->lineColor(), currentItem->fillColor(), currentItem->lineShade(), currentItem->fillShade());
showGradient(currentItem->gradientType());
showGradientStroke(currentItem->strokeGradientType());
gradEdit->setGradient(currentItem->fill_gradient);
gradEditStroke->setGradient(currentItem->stroke_gradient);
if (!currentItem->gradient().isEmpty())
376,7 → 376,7
 
if (oldDoc != currentDoc)
{
displayGradient(0);
showGradient(0);
}
}
 
474,7 → 474,7
}
}
 
void Cpalette::displayOverprint(int val)
void Cpalette::showOverprint(int val)
{
bool sigBlocked = overPrintCombo->blockSignals(true);
overPrintCombo->setCurrentIndex(val);
538,7 → 538,7
}
}
 
void Cpalette::displayColorValues(QString stroke, QString fill, int sShade, int fShade)
void Cpalette::showColorValues(QString stroke, QString fill, int sShade, int fShade)
{
bool sigBlocked1 = fillShade->blockSignals(true);
bool sigBlocked2 = strokeShade->blockSignals(true);
907,7 → 907,7
strokeModeStack->setCurrentIndex(number);
}
 
void Cpalette::displayGradient(int number)
void Cpalette::showGradient(int number)
{
bool sigBlocked = fillModeCombo->blockSignals(true);
if (number==-1)
998,7 → 998,7
fillModeCombo->blockSignals(sigBlocked);
}
 
void Cpalette::displayGradientStroke(int number)
void Cpalette::showGradientStroke(int number)
{
bool sigBlocked = strokeModeCombo->blockSignals(true);
if (number==-1 || number == 0)
/trunk/Scribus/scribus/ui/cpalette.h
79,15 → 79,15
/*void editLineColorSelectorButton();
void editFillColorSelectorButton();*/
void fillStrokeSelector(int /*index*/);
void displayColorValues(QString stroke, QString fille, int sShade, int fShade);
void displayGradient(int nr);
void displayGradientStroke(int nr);
void displayOverprint(int);
void handleFillShade(double);
void handleStrokeShade(double);
void handleOverprint(int);
void handleFillGradient();
void handleStrokeGradient();
void showColorValues(QString stroke, QString fille, int sShade, int fShade);
void showGradient(int nr);
void showGradientStroke(int nr);
void showOverprint(int);
void updateCList();
void toggleColorDisplay();
void setNamedGradient(const QString &name);
/trunk/Scribus/scribus/ui/propertiespalette.cpp
306,8 → 306,8
{
if (!m_ScMW || m_ScMW->scriptIsRunning() || !m_haveItem)
return;
shapePal->displayTextFlowMode(mode);
groupPal->displayTextFlowMode(mode);
shapePal->showTextFlowMode(mode);
groupPal->showTextFlowMode(mode);
}
 
PageItem* PropertiesPalette::currentItemFromSelection()
506,7 → 506,7
TabStack->setItemEnabled(ws, false);
TabStack->widget(0)->setEnabled(false);
TabStack->setItemEnabled(idXYZItem, false);
Cpal->displayGradient(0);
Cpal->showGradient(0);
break;
case PageItem::ImageFrame:
case PageItem::LatexFrame:
637,7 → 637,7
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
xyzPal->setLineMode(mode);
xyzPal->displayWH(m_item->width(), m_item->height());
xyzPal->showWH(m_item->width(), m_item->height());
updateGeometry();
repaint();
}
/trunk/Scribus/scribus/ui/propertiespalette_group.cpp
339,10 → 339,10
textFlowUsesContourLine->setEnabled(true);
textFlowUsesImageClipping->setEnabled(false);
}
displayTextFlowMode(m_item->textFlowMode());
showTextFlowMode(m_item->textFlowMode());
}
 
void PropertiesPalette_Group::displayTextFlowMode(PageItem::TextFlowMode mode)
void PropertiesPalette_Group::showTextFlowMode(PageItem::TextFlowMode mode)
{
if (!m_ScMW || m_ScMW->scriptIsRunning() || !m_haveItem)
return;
/trunk/Scribus/scribus/ui/propertiespalette_group.h
27,7 → 27,7
 
virtual void changeEvent(QEvent *e);
 
void displayTextFlowMode(PageItem::TextFlowMode mode);
void showTextFlowMode(PageItem::TextFlowMode mode);
 
void updateColorList();
void updateColorSpecialGradient();
/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
317,7 → 317,7
colorMgmtGroup->setVisible(ScCore->haveCMS() && m_doc->cmsSettings().CMSinUse);
}
 
void PropertiesPalette_Image::displayImageRotation(double rot)
void PropertiesPalette_Image::showImageRotation(double rot)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
327,7 → 327,7
imageRotation->showValue(fabs(rrR));
}
 
void PropertiesPalette_Image::displayScaleAndOffset(double scx, double scy, double x, double y)
void PropertiesPalette_Image::showScaleAndOffset(double scx, double scy, double x, double y)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
511,7 → 511,7
}
m_haveItem = true;
 
displayScaleAndOffset(m_item->imageXScale(), m_item->imageYScale(), m_item->imageXOffset(), m_item->imageYOffset());
showScaleAndOffset(m_item->imageXScale(), m_item->imageYScale(), m_item->imageXOffset(), m_item->imageYOffset());
double rrR = m_item->imageRotation();
if (m_item->imageRotation() > 0)
rrR = 360 - rrR;
/trunk/Scribus/scribus/ui/propertiespalette_image.h
68,8 → 68,8
void handleSelectionChanged();
void handleUpdateRequest(int updateFlags);
 
void displayImageRotation(double rot);
void displayScaleAndOffset(double scx, double scy, double x, double y);
void showImageRotation(double rot);
void showScaleAndOffset(double scx, double scy, double x, double y);
 
void languageChange();
void unitChange();
/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
332,8 → 332,8
 
m_haveItem = true;
 
displayLineWidth(m_item->lineWidth());
displayLineValues(m_item->lineStyle(), m_item->lineEnd(), m_item->lineJoin());
showLineWidth(m_item->lineWidth());
showLineValues(m_item->lineStyle(), m_item->lineEnd(), m_item->lineJoin());
 
if (m_item->asOSGFrame())
{
384,7 → 384,7
lineStyles->blockSignals(false);
}
 
void PropertiesPalette_Line::displayLineWidth(double s)
void PropertiesPalette_Line::showLineWidth(double s)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
406,7 → 406,7
}
}
 
void PropertiesPalette_Line::displayLineValues(Qt::PenStyle p, Qt::PenCapStyle pc, Qt::PenJoinStyle pj)
void PropertiesPalette_Line::showLineValues(Qt::PenStyle p, Qt::PenCapStyle pc, Qt::PenJoinStyle pj)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
/trunk/Scribus/scribus/ui/propertiespalette_line.h
62,8 → 62,8
void handleSelectionChanged();
void handleUpdateRequest(int);
 
void displayLineWidth(double s);
void displayLineValues(Qt::PenStyle p, Qt::PenCapStyle pc, Qt::PenJoinStyle pj);
void showLineWidth(double s);
void showLineValues(Qt::PenStyle p, Qt::PenCapStyle pc, Qt::PenJoinStyle pj);
 
void languageChange();
void unitChange();
/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
350,7 → 350,7
customShape->setIcon(customShape->getIconPixmap(m_item->FrameType-2));
 
roundRect->setValue(m_item->cornerRadius()*m_unitRatio);
displayTextFlowMode(m_item->textFlowMode());
showTextFlowMode(m_item->textFlowMode());
 
if (m_item->asPathText())
{
397,7 → 397,7
customShape->setEnabled(false);
}
m_haveItem = true;
displayTextFlowMode(m_item->textFlowMode());
showTextFlowMode(m_item->textFlowMode());
}
 
void PropertiesPalette_Shape::handleTextFlow()
519,7 → 519,7
}
}
 
void PropertiesPalette_Shape::displayTextFlowMode(PageItem::TextFlowMode mode)
void PropertiesPalette_Shape::showTextFlowMode(PageItem::TextFlowMode mode)
{
if (!m_ScMW || m_ScMW->scriptIsRunning() || !m_haveItem)
return;
/trunk/Scribus/scribus/ui/propertiespalette_shape.h
36,7 → 36,7
void setLocked(bool isLocked);
void setSizeLocked(bool isLocked);
void setRoundRectEnabled(bool enabled);
void displayTextFlowMode(PageItem::TextFlowMode mode);
void showTextFlowMode(PageItem::TextFlowMode mode);
 
protected:
 
/trunk/Scribus/scribus/ui/propertiespalette_table.cpp
146,7 → 146,7
updateStyleControls();
}
 
void PropertiesPalette_Table::displayTableStyle(const QString& name)
void PropertiesPalette_Table::showTableStyle(const QString& name)
{
bool blocked = tableStyleCombo->blockSignals(true);
tableStyleCombo->setFormat(name);
153,7 → 153,7
tableStyleCombo->blockSignals(blocked);
}
 
void PropertiesPalette_Table::displayCellStyle(const QString& name)
void PropertiesPalette_Table::showCellStyle(const QString& name)
{
bool blocked = cellStyleCombo->blockSignals(true);
cellStyleCombo->setFormat(name);
172,14 → 172,14
// Fill in values.
if (m_doc->appMode != modeEditTable)
{
displayTableStyle(table->style());
showTableStyle(table->style());
cellStyleCombo->setEnabled(false);
buttonClearCellStyle->setEnabled(false);
}
else
{
// displayTableStyle(table->style());
displayCellStyle(table->activeCell().style());
// showTableStyle(table->style());
showCellStyle(table->activeCell().style());
}
}
else
197,7 → 197,7
return;
m_item->asTable()->setStyle(name);
m_item->asTable()->update();
displayTableStyle(name);
showTableStyle(name);
}
 
void PropertiesPalette_Table::setCellStyle(const QString &name)
208,7 → 208,7
m_item->asTable()->activeCell().setStyle(name);
m_doc->dontResize = true;
m_item->asTable()->update();
displayCellStyle(name);
showCellStyle(name);
}
 
void PropertiesPalette_Table::on_sideSelector_selectionChanged()
/trunk/Scribus/scribus/ui/propertiespalette_table.h
100,8 → 100,8
};
 
private:
void displayTableStyle(const QString& name);
void displayCellStyle(const QString& name);
void showTableStyle(const QString& name);
void showCellStyle(const QString& name);
/// Updates the list of border lines from the current border.
void updateBorderLineList();
/// Updates the current item in the list of border lines.
/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
306,7 → 306,7
m_haveItem = false;
m_item = i;
 
displayFirstLinePolicy(m_item->firstLineOffset());
showFirstLinePolicy(m_item->firstLineOffset());
 
if ((m_item->isGroup()) && (!m_item->isSingleSel))
{
392,7 → 392,7
}
}
 
void PropertiesPalette_Text::displayLineSpacing(double r)
void PropertiesPalette_Text::showLineSpacing(double r)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
409,7 → 409,7
m_haveItem = tmp;
}
 
void PropertiesPalette_Text::displayFontFace(const QString& newFont)
void PropertiesPalette_Text::showFontFace(const QString& newFont)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
421,7 → 421,7
m_haveItem = tmp;
}
 
void PropertiesPalette_Text::displayFontSize(double s)
void PropertiesPalette_Text::showFontSize(double s)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
428,7 → 428,7
fontSize->showValue(s / 10.0);
}
 
void PropertiesPalette_Text::displayFirstLinePolicy( FirstLineOffsetPolicy f )
void PropertiesPalette_Text::showFirstLinePolicy( FirstLineOffsetPolicy f )
{
if(f == FLOPFontAscent)
flopBox->flopFontAscent->setChecked(true);
471,8 → 471,8
advancedWidgets->updateCharStyle(charStyle);
colorWidgets->updateCharStyle(charStyle);
 
displayFontFace(charStyle.font().scName());
displayFontSize(charStyle.fontSize());
showFontFace(charStyle.font().scName());
showFontSize(charStyle.fontSize());
}
 
void PropertiesPalette_Text::updateStyle(const ParagraphStyle& newCurrent)
488,8 → 488,8
orphanBox->updateStyle (newCurrent);
parEffectWidgets->updateStyle(newCurrent);
 
displayFontFace(charStyle.font().scName());
displayFontSize(charStyle.fontSize());
showFontFace(charStyle.font().scName());
showFontSize(charStyle.fontSize());
 
bool tmp = m_haveItem;
m_haveItem = false;
520,7 → 520,7
charStyleCombo->updateFormatList();
}
 
void PropertiesPalette_Text::displayAlignment(int e)
void PropertiesPalette_Text::showAlignment(int e)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
531,7 → 531,7
m_haveItem = tmp;
}
 
void PropertiesPalette_Text::displayCharStyle(const QString& name)
void PropertiesPalette_Text::showCharStyle(const QString& name)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
540,7 → 540,7
charStyleCombo->blockSignals(blocked);
}
 
void PropertiesPalette_Text::displayParStyle(const QString& name)
void PropertiesPalette_Text::showParStyle(const QString& name)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
/trunk/Scribus/scribus/ui/propertiespalette_text.h
82,13 → 82,13
void languageChange();
void unitChange();
 
void displayAlignment(int e);
void displayCharStyle(const QString& name);
void displayFontFace(const QString&);
void displayFontSize(double s);
void displayFirstLinePolicy(FirstLineOffsetPolicy);
void displayLineSpacing(double r);
void displayParStyle(const QString& name);
void showAlignment(int e);
void showCharStyle(const QString& name);
void showFontFace(const QString&);
void showFontSize(double s);
void showFirstLinePolicy(FirstLineOffsetPolicy);
void showLineSpacing(double r);
void showParStyle(const QString& name);
void setupLineSpacingSpinbox(int mode, double value);
/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
315,8 → 315,8
double selH = m_item->height();
if (m_doc->m_Selection->count() > 1)
m_doc->m_Selection->getGroupRect(&selX, &selY, &selW, &selH);
// displayXY(selX, selY);
// displayWH(selW, selH);
// showXY(selX, selY);
// showWH(selW, selH);
bool checkableFlip = (i->isImageFrame() || i->isTextFrame() || i->isLatexFrame() || i->isOSGFrame() || i->isSymbol() || i->isGroup() || i->isSpiral());
flipH->setCheckable(checkableFlip);
323,8 → 323,8
flipV->setCheckable(checkableFlip);
 
noPrint->setChecked(!i->printEnabled());
displayFlippedH(i->imageFlippedH());
displayFlippedV(i->imageFlippedV());
showFlippedH(i->imageFlippedH());
showFlippedV(i->imageFlippedV());
m_oldRotation = i->rotation();
double rr = i->rotation();
if (i->rotation() > 0)
379,10 → 379,10
heightSpin->setEnabled(true);
keepFrameWHRatioButton->setEnabled(true);
}
displayXY(selX, selY);
displayWH(selW, selH);
displayLocked(i->locked());
displaySizeLocked(i->sizeLocked());
showXY(selX, selY);
showWH(selW, selH);
showLocked(i->locked());
showSizeLocked(i->sizeLocked());
double rrR = i->imageRotation();
if (i->imageRotation() > 0)
rrR = 360 - rrR;
559,7 → 559,7
m_haveItem = tmp;
}
 
void PropertiesPalette_XYZ::displayXY(double x, double y)
void PropertiesPalette_XYZ::showXY(double x, double y)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
623,13 → 623,13
xposSpin->setValue(inX*m_unitRatio);
yposSpin->setValue(inY*m_unitRatio);
if (useLineMode)
displayWH(m_item->width(), m_item->height());
showWH(m_item->width(), m_item->height());
m_haveItem = tmp;
connect(xposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
connect(yposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
}
 
void PropertiesPalette_XYZ::displayWH(double x, double y)
void PropertiesPalette_XYZ::showWH(double x, double y)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
654,7 → 654,7
heightSpin->blockSignals(sigBlocked2);
}
 
void PropertiesPalette_XYZ::displayRotation(double r)
void PropertiesPalette_XYZ::showRotation(double r)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
704,7 → 704,7
m_ScMW->view->endGroupTransaction();
}
m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
displayXY(gx, gy);
showXY(gx, gy);
}
else
{
783,7 → 783,7
m_ScMW->view->endGroupTransaction();
}
m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
displayXY(gx, gy);
showXY(gx, gy);
}
else
{
846,13 → 846,13
if (keepFrameWHRatioButton->isChecked())
{
m_doc->scaleGroup(w / gw, w / gw, false);
displayWH(w, (w / gw) * gh);
showWH(w, (w / gw) * gh);
}
else
{
m_doc->scaleGroup(w / gw, 1.0, false);
m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
displayWH(gw, gh);
showWH(gw, gh);
}
if (!_userActionOn)
{
879,7 → 879,7
{
if (keepFrameWHRatioButton->isChecked())
{
displayWH(w, (w / oldW) * m_item->height());
showWH(w, (w / oldW) * m_item->height());
m_doc->SizeItem(w, (w / oldW) * m_item->height(), m_item, true, true, false);
}
else
928,13 → 928,13
if (keepFrameWHRatioButton->isChecked())
{
m_doc->scaleGroup(h / gh, h / gh, false);
displayWH((h / gh) * gw, h);
showWH((h / gh) * gw, h);
}
else
{
m_doc->scaleGroup(1.0, h / gh, false);
m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
displayWH(gw, gh);
showWH(gw, gh);
}
if (!_userActionOn)
{
961,7 → 961,7
{
if (keepFrameWHRatioButton->isChecked())
{
displayWH((h / oldH) * m_item->width(), h);
showWH((h / oldH) * m_item->width(), h);
m_doc->SizeItem((h / oldH) * m_item->width(), h, m_item, true, true, false);
}
else
1003,7 → 1003,7
{
m_doc->rotateGroup((rotationSpin->value() - m_oldRotation)*(-1), m_ScMW->view->RCenter);
m_doc->m_Selection->getGroupRect(&gx, &gy, &gw, &gh);
displayXY(gx, gy);
showXY(gx, gy);
}
else
m_doc->RotateItem(rotationSpin->value()*(-1), m_item);
1340,7 → 1340,7
 
}
 
void PropertiesPalette_XYZ::displayLocked(bool isLocked)
void PropertiesPalette_XYZ::showLocked(bool isLocked)
{
xposSpin->setReadOnly(isLocked);
yposSpin->setReadOnly(isLocked);
1360,7 → 1360,7
doLock->setChecked(isLocked);
}
 
void PropertiesPalette_XYZ::displaySizeLocked(bool isSizeLocked)
void PropertiesPalette_XYZ::showSizeLocked(bool isSizeLocked)
{
bool b=isSizeLocked;
if (m_haveItem && m_item->locked())
1377,17 → 1377,17
noResize->setChecked(isSizeLocked);
}
 
void PropertiesPalette_XYZ::displayPrintingEnabled(bool isPrintingEnabled)
void PropertiesPalette_XYZ::showPrintingEnabled(bool isPrintingEnabled)
{
noPrint->setChecked(!isPrintingEnabled);
}
 
void PropertiesPalette_XYZ::displayFlippedH(bool isFlippedH)
void PropertiesPalette_XYZ::showFlippedH(bool isFlippedH)
{
flipH->setChecked(isFlippedH);
}
 
void PropertiesPalette_XYZ::displayFlippedV(bool isFlippedV)
void PropertiesPalette_XYZ::showFlippedV(bool isFlippedV)
{
flipV->setChecked(isFlippedV);
}
/trunk/Scribus/scribus/ui/propertiespalette_xyz.h
56,14 → 56,14
void languageChange();
void unitChange();
 
void displayXY(double x, double y);
void displayWH(double x, double y);
void displayRotation(double r);
void displayLocked(bool);
void displaySizeLocked(bool);
void displayPrintingEnabled(bool);
void displayFlippedH(bool);
void displayFlippedV(bool);
void showXY(double x, double y);
void showWH(double x, double y);
void showRotation(double r);
void showLocked(bool);
void showSizeLocked(bool);
void showPrintingEnabled(bool);
void showFlippedH(bool);
void showFlippedV(bool);
 
void handleAppModeChanged(int oldMode, int mode);
void handleSelectionChanged();
/trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
168,7 → 168,7
repaint();
}
 
void PropertyWidget_Advanced::displayBaseLineOffset(double e)
void PropertyWidget_Advanced::showBaseLineOffset(double e)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
175,7 → 175,7
textBase->showValue(e / 10.0);
}
 
void PropertyWidget_Advanced::displayTextScaleH(double e)
void PropertyWidget_Advanced::showTextScaleH(double e)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
182,7 → 182,7
scaleH->showValue(e / 10.0);
}
 
void PropertyWidget_Advanced::displayTextScaleV(double e)
void PropertyWidget_Advanced::showTextScaleV(double e)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
189,7 → 189,7
scaleV->showValue(e / 10.0);
}
 
void PropertyWidget_Advanced::displayTracking(double e)
void PropertyWidget_Advanced::showTracking(double e)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
329,10 → 329,10
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
 
displayTextScaleH(charStyle.scaleH());
displayTextScaleV(charStyle.scaleV());
displayTracking(charStyle.tracking());
displayBaseLineOffset(charStyle.baselineOffset());
showTextScaleH(charStyle.scaleH());
showTextScaleV(charStyle.scaleV());
showTracking(charStyle.tracking());
showBaseLineOffset(charStyle.baselineOffset());
 
normWordTrackingSpinBox->showValue(charStyle.wordTracking() * 100.0);
}
344,10 → 344,10
 
const CharStyle& charStyle = newCurrent.charStyle();
 
displayTextScaleH(charStyle.scaleH());
displayTextScaleV(charStyle.scaleV());
displayTracking(charStyle.tracking());
displayBaseLineOffset(charStyle.baselineOffset());
showTextScaleH(charStyle.scaleH());
showTextScaleV(charStyle.scaleV());
showTracking(charStyle.tracking());
showBaseLineOffset(charStyle.baselineOffset());
 
minWordTrackingSpinBox->showValue(newCurrent.minWordTracking() * 100.0);
normWordTrackingSpinBox->showValue(newCurrent.charStyle().wordTracking() * 100.0);
/trunk/Scribus/scribus/ui/propertywidget_advanced.h
49,10 → 49,10
void languageChange();
void unitChange() {};
 
void displayBaseLineOffset(double e);
void displayTextScaleH(double e);
void displayTextScaleV(double e);
void displayTracking(double e);
void showBaseLineOffset(double e);
void showTextScaleH(double e);
void showTextScaleV(double e);
void showTracking(double e);
 
void updateCharStyle(const CharStyle& charStyle);
void updateStyle(const ParagraphStyle& newCurrent);
/trunk/Scribus/scribus/ui/propertywidget_distance.cpp
148,7 → 148,7
columnGapLabel->setEnabled(true);
}
 
displayTextDistances(textItem->textToFrameDistLeft(), textItem->textToFrameDistTop(), textItem->textToFrameDistBottom(), textItem->textToFrameDistRight());
showTextDistances(textItem->textToFrameDistLeft(), textItem->textToFrameDistTop(), textItem->textToFrameDistBottom(), textItem->textToFrameDistRight());
connectSignals();
}
 
223,7 → 223,7
// Nothing to do in this widget
}
 
void PropertyWidget_Distance::displayColumns(int r, double g)
void PropertyWidget_Distance::showColumns(int r, double g)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
263,7 → 263,7
columnGap->blockSignals(cGapSigWasBlocked);
}
 
void PropertyWidget_Distance::displayTextDistances(double left, double top, double bottom, double right)
void PropertyWidget_Distance::showTextDistances(double left, double top, double bottom, double right)
{
leftDistance->showValue(left * m_unitRatio);
topDistance->showValue(top * m_unitRatio);
283,8 → 283,8
if (textItem)
{
textItem->setColumns(static_cast<int>(columns->value()));
displayColumns(textItem->Cols, textItem->ColGap);
//this is already done in displayColumns()
showColumns(textItem->Cols, textItem->ColGap);
//this is already done in showColumns()
/*if (static_cast<int>(columns->value()) == 1)
{
columnGap->setEnabled(false);
339,7 → 339,7
if (m_doc->appMode == modeEditTable)
textItem = m_item->asTable()->activeCell().textFrame();
if (textItem != NULL)
displayColumns(textItem->Cols, textItem->ColGap);
showColumns(textItem->Cols, textItem->ColGap);
 
int index = columnGapLabel->currentIndex();
columnGap->setToolTip((index == 0) ? tr( "Distance between columns" ) : tr( "Column width" ));
391,7 → 391,7
double top = topDistance->value() / m_unitRatio;
double bottom = bottomDistance->value() / m_unitRatio;
textItem->setTextToFrameDist(left, right, top, bottom);
displayColumns(textItem->Cols, textItem->ColGap);
showColumns(textItem->Cols, textItem->ColGap);
 
textItem->update();
if (m_doc->appMode == modeEditTable)
/trunk/Scribus/scribus/ui/propertywidget_distance.h
49,8 → 49,8
void languageChange();
void unitChange();
 
void displayColumns(int r, double g);
void displayTextDistances(double left, double top, double bottom, double right);
void showColumns(int r, double g);
void showTextDistances(double left, double top, double bottom, double right);
 
private slots:
void handleColumns();
/trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
85,7 → 85,7
ParagraphStyle parStyle = m_item->itemText.defaultStyle();
if (m_doc->appMode == modeEdit)
m_item->currentTextProps(parStyle);
displayOpticalMargins(parStyle);
showOpticalMargins(parStyle);
}
 
connectSignals();
144,7 → 144,7
repaint();
}
 
void PropertyWidget_OptMargins::displayOpticalMargins(const ParagraphStyle & pStyle)
void PropertyWidget_OptMargins::showOpticalMargins(const ParagraphStyle & pStyle)
{
ParagraphStyle::OpticalMarginType omt(static_cast<ParagraphStyle::OpticalMarginType>(pStyle.opticalMargins()));
bool blocked = optMarginRadioBoth->blockSignals(true);
161,7 → 161,7
 
void PropertyWidget_OptMargins::updateStyle(const ParagraphStyle& newCurrent)
{
displayOpticalMargins(newCurrent);
showOpticalMargins(newCurrent);
}
 
void PropertyWidget_OptMargins::handleOpticalMargins()
/trunk/Scribus/scribus/ui/propertywidget_optmargins.h
49,7 → 49,7
void languageChange();
void unitChange() {};
 
void displayOpticalMargins(const ParagraphStyle& pStyle);
void showOpticalMargins(const ParagraphStyle& pStyle);
 
private slots:
void handleOpticalMargins();
/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
135,7 → 135,7
peCharStyleCombo->updateFormatList();
}
 
void PropertyWidget_ParEffect::displayCharStyle(const QString& name)
void PropertyWidget_ParEffect::showCharStyle(const QString& name)
{
bool blocked = peCharStyleCombo->blockSignals(true);
peCharStyleCombo->setFormat(name);
246,7 → 246,7
numFormatCombo->setCurrentIndex(nFormat);
peOffset->setValue(newPStyle.parEffectOffset() * m_unitRatio);
peIndent->setChecked(newPStyle.parEffectIndent());
displayCharStyle(newPStyle.peCharStyleName());
showCharStyle(newPStyle.peCharStyleName());
 
enableParEffect(enablePE);
connectSignals ();
/trunk/Scribus/scribus/ui/propertywidget_pareffect.h
21,7 → 21,7
void updateStyle(const ParagraphStyle& newPStyle);
void updateCharStyles();
 
void displayCharStyle(const QString& name);
void showCharStyle(const QString& name);
void connectSignals();
void disconnectSignals();
CharSelectEnhanced * m_enhanced;
/trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
207,12 → 207,12
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
 
displayOutlineW (charStyle.outlineWidth());
displayShadowOffset(charStyle.shadowXOffset(), charStyle.shadowYOffset());
displayTextColors(charStyle.strokeColor(), charStyle.fillColor(), charStyle.strokeShade(), charStyle.fillShade());
displayTextEffects(charStyle.effects());
displayStrikeThru(charStyle.strikethruOffset() , charStyle.strikethruWidth());
displayUnderline (charStyle.underlineOffset(), charStyle.underlineWidth());
showOutlineW (charStyle.outlineWidth());
showShadowOffset(charStyle.shadowXOffset(), charStyle.shadowYOffset());
showTextColors(charStyle.strokeColor(), charStyle.fillColor(), charStyle.strokeShade(), charStyle.fillShade());
showTextEffects(charStyle.effects());
showStrikeThru(charStyle.strikethruOffset() , charStyle.strikethruWidth());
showUnderline (charStyle.underlineOffset(), charStyle.underlineWidth());
}
 
void PropertyWidget_TextColor::updateStyle(const ParagraphStyle& newCurrent)
222,15 → 222,15
 
const CharStyle& charStyle = newCurrent.charStyle();
 
displayOutlineW (charStyle.outlineWidth());
displayShadowOffset(charStyle.shadowXOffset(), charStyle.shadowYOffset());
displayTextColors(charStyle.strokeColor(), charStyle.fillColor(), charStyle.strokeShade(), charStyle.fillShade());
displayTextEffects(charStyle.effects());
displayStrikeThru(charStyle.strikethruOffset() , charStyle.strikethruWidth());
displayUnderline (charStyle.underlineOffset(), charStyle.underlineWidth());
showOutlineW (charStyle.outlineWidth());
showShadowOffset(charStyle.shadowXOffset(), charStyle.shadowYOffset());
showTextColors(charStyle.strokeColor(), charStyle.fillColor(), charStyle.strokeShade(), charStyle.fillShade());
showTextEffects(charStyle.effects());
showStrikeThru(charStyle.strikethruOffset() , charStyle.strikethruWidth());
showUnderline (charStyle.underlineOffset(), charStyle.underlineWidth());
}
 
void PropertyWidget_TextColor::displayOutlineW(double x)
void PropertyWidget_TextColor::showOutlineW(double x)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
237,7 → 237,7
textEffects->OutlineVal->LWidth->showValue(x / 10.0);
}
 
void PropertyWidget_TextColor::displayShadowOffset(double x, double y)
void PropertyWidget_TextColor::showShadowOffset(double x, double y)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
245,7 → 245,7
textEffects->ShadowVal->Yoffset->showValue(y / 10.0);
}
 
void PropertyWidget_TextColor::displayStrikeThru(double p, double w)
void PropertyWidget_TextColor::showStrikeThru(double p, double w)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
253,7 → 253,7
textEffects->StrikeVal->LWidth->showValue(w / 10.0);
}
 
void PropertyWidget_TextColor::displayTextColors(QString p, QString b, double shp, double shb)
void PropertyWidget_TextColor::showTextColors(QString p, QString b, double shp, double shb)
{
if (!m_doc || !m_item || !m_ScMW || m_ScMW->scriptIsRunning())
return;
285,7 → 285,7
strokeColor->setCurrentIndex(c);
}
 
void PropertyWidget_TextColor::displayTextEffects(int s)
void PropertyWidget_TextColor::showTextEffects(int s)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
447,7 → 447,7
}
}
 
void PropertyWidget_TextColor::displayUnderline(double p, double w)
void PropertyWidget_TextColor::showUnderline(double p, double w)
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
/trunk/Scribus/scribus/ui/propertywidget_textcolor.h
47,12 → 47,12
void languageChange();
void unitChange() {};
 
void displayOutlineW(double x);
void displayShadowOffset(double x, double y);
void displayStrikeThru(double p, double w);
void displayTextColors(QString p, QString b, double shp, double shb);
void displayTextEffects(int s);
void displayUnderline(double p, double w);
void showOutlineW(double x);
void showShadowOffset(double x, double y);
void showStrikeThru(double p, double w);
void showTextColors(QString p, QString b, double shp, double shb);
void showTextEffects(int s);
void showUnderline(double p, double w);
 
void updateCharStyle(const CharStyle& charStyle);
void updateStyle(const ParagraphStyle& newCurrent);