Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 6062 → Rev 6063

/branches/Version13x/Scribus/scribus/scimgdataloader_psd.cpp
275,6 → 275,7
col2.setHsv(255 - (c >> 8), m >> 8, y >> 8);
col.fromQColor(col2);
colorTableSc.append(col);
qDebug("HSB as RGB = "+col.nameRGB());
break;
case 2: // CMYK colour
col.setColor(c >> 8, m >> 8, y >> 8, k >> 8);
/branches/Version13x/Scribus/scribus/scimage.h
83,6 → 83,7
void initialize();
 
const QImage& qImage();
QImage* qImagePtr();
QImage smoothScale(int h, int w, QImage::ScaleMode mode = ScaleFree) const;
int height() const { return QImage::height(); }
/branches/Version13x/Scribus/scribus/tabpdfoptions.cpp
665,6 → 665,7
pageLayoutLayout->addWidget( doublePageRight );
LayoutSpecial->addWidget( pageLayout );
groupNavigation = new QButtonGroup( groupDisplay, "groupNavigation" );
groupNavigation->setRadioButtonExclusive(true);
groupNavigation->setTitle( tr( "Visual Appearance" ) );
groupNavigation->setColumnLayout(0, Qt::Vertical );
groupNavigation->layout()->setSpacing( 5 );
703,6 → 704,7
fitWindow = new QCheckBox( tr( "Zoom Pages to fit Viewer Window" ), groupNavigation, "fitWindow" );
// fitWindow->setChecked(Opts.fitWindow);
groupNavigationLayout->addWidget( fitWindow );
groupNavigation->setRadioButtonExclusive(true);
LayoutSpecial->addWidget( groupNavigation );
groupDisplayLayout->addLayout( LayoutSpecial );
tabSpecialLayout->addWidget( groupDisplay );
1365,7 → 1367,8
bool df = true;
if ((Opts.displayBookmarks) || (Opts.displayFullscreen) || (Opts.displayLayers) || (Opts.displayThumbs))
df = false;
useViewDefault->setChecked(df);
if (df)
useViewDefault->setChecked(df);
useFullScreen->setChecked(Opts.displayFullscreen);
useBookmarks->setChecked(Opts.displayBookmarks);
useThumbnails->setChecked(Opts.displayThumbs);
1844,7 → 1847,7
Pages->setEnabled(setter);
Effects->setEnabled(setter);
PagePrev->setEnabled(setter);
useFullScreen->setChecked(setter);
// useFullScreen->setChecked(setter);
}
 
void TabPDFOptions::ValidDI(int nr)
/branches/Version13x/Scribus/scribus/scimage.cpp
71,6 → 71,11
return *this;
}
 
QImage* ScImage::qImagePtr()
{
return this;
}
 
QImage ScImage::smoothScale(int h, int w, QImage::ScaleMode mode) const
{
return QImage::smoothScale(h,w,mode);
/branches/Version13x/Scribus/scribus/pageitem_imageframe.cpp
126,8 → 126,9
p->scale(LocalScX, LocalScY);
if (pixm.imgInfo.lowResType != 0)
p->scale(pixm.imgInfo.lowResScale, pixm.imgInfo.lowResScale);
QImage img(pixm.qImage());
p->drawImage(&img);
// QImage img(pixm.qImage());
// p->drawImage(&img);
p->drawImage(pixm.qImagePtr());
}
}
p->restore();