Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3946 → Rev 3947

/branches/Version13x/Scribus/scribus/effectsdialog.cpp
321,12 → 321,16
connect( colData, SIGNAL(activated(int)), this, SLOT( createPreview()));
connect( shade, SIGNAL(clicked()), this, SLOT(createPreview()));
connect( brightnessSlider, SIGNAL(valueChanged(int)), this, SLOT(updateBright(int)));
connect( brightnessSlider, SIGNAL(sliderReleased()), this, SLOT(createPreview()));
connect( contrastSlider, SIGNAL(valueChanged(int)), this, SLOT(updateContrast(int)));
connect( contrastSlider, SIGNAL(sliderReleased()), this, SLOT(createPreview()));
connect( shRadius, SIGNAL(valueChanged(int)), this, SLOT(createPreview()));
connect( shValue, SIGNAL(valueChanged(int)), this, SLOT(createPreview()));
connect( blRadius, SIGNAL(valueChanged(int)), this, SLOT(createPreview()));
connect( blValue, SIGNAL(valueChanged(int)), this, SLOT(createPreview()));
connect( solarizeSlider, SIGNAL(valueChanged(int)), this, SLOT(updateSolarize(int)));
connect( solarizeSlider, SIGNAL(sliderReleased()), this, SLOT(createPreview()));
tim.start();
}
 
void EffectsDialog::leaveOK()
361,10 → 365,13
 
void EffectsDialog::createPreview()
{
if (tim.elapsed() < 50)
return;
ScImage im = image.copy();
saveValues();
im.applyEffect(effectsList, doc->PageColors, false);
pixmapLabel1->setPixmap( im );
tim.start();
}
 
void EffectsDialog::saveValues()
637,6 → 644,7
else if (c->text() == tr("Brightness"))
{
disconnect( brightnessSlider, SIGNAL(valueChanged(int)), this, SLOT(updateBright(int)));
disconnect( brightnessSlider, SIGNAL(sliderReleased()), this, SLOT(createPreview()));
QString tmpstr = effectValMap[c];
int brightness;
QTextStream fp(&tmpstr, IO_ReadOnly);
647,10 → 655,12
textLabel7->setText(tmp);
optionStack->raiseWidget(2);
connect( brightnessSlider, SIGNAL(valueChanged(int)), this, SLOT(updateBright(int)));
connect( brightnessSlider, SIGNAL(sliderReleased()), this, SLOT(createPreview()));
}
else if (c->text() == tr("Contrast"))
{
disconnect( contrastSlider, SIGNAL(valueChanged(int)), this, SLOT(updateContrast(int)));
disconnect( contrastSlider, SIGNAL(sliderReleased()), this, SLOT(createPreview()));
QString tmpstr = effectValMap[c];
int contrast;
QTextStream fp(&tmpstr, IO_ReadOnly);
661,6 → 671,7
textLabel9->setText(tmp);
optionStack->raiseWidget(3);
connect( contrastSlider, SIGNAL(valueChanged(int)), this, SLOT(updateContrast(int)));
connect( contrastSlider, SIGNAL(sliderReleased()), this, SLOT(createPreview()));
}
else if (c->text() == tr("Sharpen"))
{
695,6 → 706,7
else if (c->text() == tr("Posterize"))
{
disconnect( solarizeSlider, SIGNAL(valueChanged(int)), this, SLOT(updateSolarize(int)));
disconnect( solarizeSlider, SIGNAL(sliderReleased()), this, SLOT(createPreview()));
QString tmpstr = effectValMap[c];
int solarize;
QTextStream fp(&tmpstr, IO_ReadOnly);
705,6 → 717,7
textLabel15->setText(tmp);
optionStack->raiseWidget(6);
connect( solarizeSlider, SIGNAL(valueChanged(int)), this, SLOT(updateSolarize(int)));
connect( solarizeSlider, SIGNAL(sliderReleased()), this, SLOT(createPreview()));
}
else
optionStack->raiseWidget(0);
/branches/Version13x/Scribus/scribus/about.cpp
46,7 → 46,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString BUILD_DAY = "20";
QString BUILD_DAY = "24";
QString BUILD_MONTH = tr("November");
QString BUILD_YEAR = "2005";
QString BUILD_TIME = "";
/branches/Version13x/Scribus/scribus/scribusview.cpp
1825,10 → 1825,13
ScApp->scrActions["itemPreviewFull"]->addTo(pmenResolution);
if ((currItem->PicAvail) && (currItem->pixm.imgInfo.valid))
ScApp->scrActions["itemExtendedImageProperties"]->addTo(pmen);
if (currItem->PicAvail && currItem->isRaster)
{
ScApp->scrActions["styleInvertPict"]->addTo(pmen);
ScApp->scrActions["editEditWithImageEditor"]->addTo(pmen);
}
if (currItem->PicAvail)
ScApp->scrActions["itemUpdateImage"]->addTo(pmen);
if (currItem->PicAvail && currItem->isRaster)
ScApp->scrActions["editEditWithImageEditor"]->addTo(pmen);
if ((currItem->PicAvail) && (!currItem->isTableItem))
ScApp->scrActions["itemAdjustFrameToImage"]->addTo(pmen);
}
10554,7 → 10557,7
if ((currItem->PicAvail) && (currItem->Pfile == name))
{
currItem->PicAvail = false;
currItem->pixm = QImage();
currItem->pixm = ScImage();
/* if (currItem->itemType() == PageItem::ImageFrame)
emit UpdtObj(Doc->currentPage->pageNr(), currItem->ItemNr); */
}
10565,7 → 10568,7
if ((currItem->PicAvail) && (currItem->Pfile == name))
{
currItem->PicAvail = false;
currItem->pixm = QImage();
currItem->pixm = ScImage();
}
}
for (uint a = 0; a < Doc->FrameItems.count(); ++a)
10574,7 → 10577,7
if ((currItem->PicAvail) && (currItem->Pfile == name))
{
currItem->PicAvail = false;
currItem->pixm = QImage();
currItem->pixm = ScImage();
}
}
updateContents();
/branches/Version13x/Scribus/scribus/effectsdialog.h
80,6 → 80,7
ScribusDoc* doc;
PageItem* currItem;
ScImage image;
QTime tim;
 
public slots:
virtual void leaveOK();
/branches/Version13x/Scribus/scribus/pageitem_imageframe.cpp
118,6 → 118,7
{
Pfile = "";
PicAvail = false;
effectsInUse.clear();
pixm = ScImage();
LocalScX = 1;
/branches/Version13x/Scribus/scribus/scribus.cpp
2259,7 → 2259,7
scrActions["editSearchReplace"]->setEnabled(false);
scrActions["extrasHyphenateText"]->setEnabled(false);
scrActions["extrasDeHyphenateText"]->setEnabled(false);
scrMenuMgr->setMenuEnabled("Style", true);
scrMenuMgr->setMenuEnabled("Style", false);
scrMenuMgr->setMenuEnabled("Item", true);
scrMenuMgr->setMenuEnabled("ItemShapes", !(currItem->isTableItem && currItem->isSingleSel));
scrMenuMgr->setMenuEnabled("ItemConvertTo", true);
2269,9 → 2269,9
scrActions["itemConvertToPolygon"]->setEnabled(!currItem->isTableItem && doc->appMode != modeEdit);
scrActions["itemConvertToTextFrame"]->setEnabled(doc->appMode != modeEdit);
scrMenuMgr->clearMenu("Style");
scrMenuMgr->addMenuToMenu("Color","Style");
if (currItem->isRaster)
scrMenuMgr->addMenuItem(scrActions["styleInvertPict"], "Style");
// scrMenuMgr->addMenuToMenu("Color","Style");
// if (currItem->isRaster)
// scrMenuMgr->addMenuItem(scrActions["styleInvertPict"], "Style");
scrActions["toolsUnlinkTextFrame"]->setEnabled(false);
scrActions["toolsLinkTextFrame"]->setEnabled(false);
scrActions["toolsEditContents"]->setEnabled(currItem->ScaleType);
2474,11 → 2474,11
 
scrActions["extrasHyphenateText"]->setEnabled(false);
scrActions["extrasDeHyphenateText"]->setEnabled(false);
scrMenuMgr->setMenuEnabled("Style", true);
scrMenuMgr->setMenuEnabled("Style", false);
scrMenuMgr->setMenuEnabled("Item", true);
scrMenuMgr->clearMenu("Style");
scrMenuMgr->addMenuToMenu("Color","Style");
scrMenuMgr->addMenuToMenu("Shade","Style");
// scrMenuMgr->addMenuToMenu("Color","Style");
// scrMenuMgr->addMenuToMenu("Shade","Style");
if (Nr == 6) //Polygon
{
scrMenuMgr->setMenuEnabled("ItemShapes", true);