Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 16043 → Rev 16044

/branches/ScribusOIF/scribus/ui/propertiespalette_imagebase.ui
0,0 → 1,352
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PropertiesPalette_ImageBase</class>
<widget class="QWidget" name="PropertiesPalette_ImageBase">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>280</width>
<height>502</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>2</number>
</property>
<property name="margin">
<number>2</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QLabel" name="xposImgLabel">
<property name="text">
<string>X-Pos:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="ScrSpinBox" name="imageXOffsetSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="imageRotationLabel">
<property name="text">
<string>Rotation:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="ScrSpinBox" name="imageRotation">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="imagePageNumberLabel">
<property name="text">
<string>&amp;Page Number:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="yposImgLabel">
<property name="text">
<string>Y-Pos:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="ScrSpinBox" name="imageYOffsetSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="imagePageNumber">
<property name="specialValueText">
<string>Auto</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="scalingGroupBox">
<property name="title">
<string>Scaling</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="2" column="0">
<widget class="QLabel" name="xscaleLabel">
<property name="text">
<string>X-Sc&amp;ale:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="ScrSpinBox" name="imageXScaleSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="yscaleLabel">
<property name="text">
<string>Y-Scal&amp;e:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="ScrSpinBox" name="imageYScaleSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="2" rowspan="2">
<widget class="LinkButton" name="keepImageWHRatioButton">
<property name="maximumSize">
<size>
<width>15</width>
<height>32767</height>
</size>
</property>
<property name="text">
<string>...</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="imgDPIXLabel">
<property name="text">
<string>Actual X-DPI:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="ScrSpinBox" name="imgDpiX"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="imgDPIYLabel">
<property name="text">
<string>Actual Y-DPI:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="ScrSpinBox" name="imgDpiY"/>
</item>
<item row="4" column="2" rowspan="2">
<widget class="LinkButton" name="keepImageDPIRatioButton">
<property name="maximumSize">
<size>
<width>15</width>
<height>32767</height>
</size>
</property>
<property name="text">
<string>...</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="freeScale">
<property name="text">
<string>Free</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QCheckBox" name="cbProportional">
<property name="text">
<string>Proportional</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QRadioButton" name="frameScale">
<property name="text">
<string>To Frame Size</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="colorMgmtGroup">
<property name="title">
<string>Color Management</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="inputProfLabel">
<property name="text">
<string>Input Profile</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="inputProfiles">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="renderIntentLabel">
<property name="text">
<string>Intent</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="renderIntent"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="pdfCompressionGroup">
<property name="title">
<string>PDF Compression</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="compressionMethodLabel">
<property name="text">
<string>Method:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="compressionMethod">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="compressionQualityLabel">
<property name="text">
<string>Quality:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="compressionQuality">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="imgEffectsButton">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Image Effects</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="imgExtProperties">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Extended Properties</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ScrSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>ui/scrspinbox.h</header>
</customwidget>
<customwidget>
<class>LinkButton</class>
<extends>QToolButton</extends>
<header>ui/linkbutton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
/branches/ScribusOIF/scribus/ui/propertiespalette_image.h
31,6 → 31,7
class QVBoxLayout;
class QWidget;
 
#include "ui_propertiespalette_imagebase.h"
 
#include "scribusapi.h"
#include "scrpalettebase.h"
50,7 → 51,7
class Selection;
class UserActionSniffer;
 
class SCRIBUS_API PropertiesPalette_Image : public QWidget
class SCRIBUS_API PropertiesPalette_Image : public QWidget, Ui::PropertiesPalette_ImageBase
{
Q_OBJECT
 
129,61 → 130,6
void handleImageEffects();
void handleExtImgProperties();
 
protected:
 
QCheckBox* Aspect;
 
QFrame* Frame4;
QFrame* GroupBoxCM;
QFrame* GroupBoxCompression;
 
QHBoxLayout* Layout18;
 
QVBoxLayout* pageLayout_4;
QVBoxLayout* GroupBoxCMLayout;
QVBoxLayout* GroupBoxCompressionLayout;
QVBoxLayout* Layout24;
 
QGridLayout* imagePageNumberSelector;
QGridLayout* layout43;
 
QLabel* xposImgLabel;
QLabel* yposImgLabel;
QLabel* xscaleLabel;
QLabel* yscaleLabel;
QLabel* imagePageNumberLabel;
QLabel* imageRotationLabel;
QLabel* imgDPIXLabel;
QLabel* imgDPIYLabel;
QLabel* TextCms1;
QLabel* TextCms2;
QLabel* TextCompressionMethod;
QLabel* TextCompressionQuality;
 
QSpinBox* imagePageNumber;
 
QRadioButton* FreeScale;
QRadioButton* FrameScale;
 
QToolButton* EditEffects;
QToolButton* EditPSDProps;
 
LinkButton* keepImageWHRatioButton;
LinkButton* keepImageDPIRatioButton;
 
ScComboBox* InputP;
ScComboBox* MonitorI;
ScComboBox* CompressionMethod;
ScComboBox* CompressionQuality;
 
ScrSpinBox* imageXOffsetSpinBox;
ScrSpinBox* imageYOffsetSpinBox;
ScrSpinBox* imageXScaleSpinBox;
ScrSpinBox* imageYScaleSpinBox;
ScrSpinBox* imageRotation;
ScrSpinBox* imgDpiX;
ScrSpinBox* imgDpiY;
 
signals:
void DocChanged();
void UpdtGui(int);
/branches/ScribusOIF/scribus/ui/propertiespalette_image.cpp
78,159 → 78,49
connect(userActionSniffer, SIGNAL(actionStart()), this, SLOT(spinboxStartUserAction()));
connect(userActionSniffer, SIGNAL(actionEnd()), this, SLOT(spinboxFinishUserAction()));
 
pageLayout_4 = new QVBoxLayout( this );
pageLayout_4->setSpacing( 5 );
pageLayout_4->setMargin( 0 );
setupUi(this);
setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
 
imagePageNumberSelector = new QGridLayout();
imagePageNumberSelector->setSpacing( 5 );
imagePageNumberSelector->setMargin( 0 );
imagePageNumber = new QSpinBox( this );
imagePageNumber->setMinimum(0);
imagePageNumber->setSpecialValueText(tr( "Auto" ));
imagePageNumberLabel = new QLabel( "&Page Number:", this );
imagePageNumberLabel->setBuddy(imagePageNumber);
imagePageNumberSelector->addWidget( imagePageNumberLabel, 0, 0 );
imagePageNumberSelector->addWidget( imagePageNumber, 0, 1);
pageLayout_4->addLayout( imagePageNumberSelector );
// FreeScale = new QRadioButton( "&Free Scaling", this );
// FreeScale->setChecked( true );
// pageLayout_4->addWidget( FreeScale );
// freeScale = new QRadioButton( "&Free Scaling", this );
// freeScale->setChecked( true );
// pageLayout_4->addWidget( freeScale );
 
layout43 = new QGridLayout;
layout43->setSpacing( 5 );
layout43->setMargin( 0 );
imageXOffsetSpinBox = new ScrSpinBox( this, 0 );
installSniffer(imageXOffsetSpinBox);
xposImgLabel = new QLabel( "&X-Pos:", this );
xposImgLabel->setBuddy(imageXOffsetSpinBox);
layout43->addWidget( xposImgLabel, 0, 0 );
layout43->addWidget( imageXOffsetSpinBox, 0, 1 );
imageYOffsetSpinBox = new ScrSpinBox( this, 0 );
installSniffer(imageYOffsetSpinBox);
yposImgLabel = new QLabel( "&Y-Pos:", this );
yposImgLabel->setBuddy(imageYOffsetSpinBox);
layout43->addWidget( yposImgLabel, 1, 0 );
layout43->addWidget( imageYOffsetSpinBox, 1, 1 );
imageRotation = new ScrSpinBox( this, 6);
imageRotation->setWrapping( true );
installSniffer(imageRotation);
imageRotationLabel = new QLabel( "Rotation:", this );
imageRotationLabel->setBuddy(imageRotation);
layout43->addWidget( imageRotationLabel, 2, 0 );
layout43->addWidget( imageRotation, 2, 1 );
 
FreeScale = new QRadioButton( "&Free Scaling", this );
FreeScale->setChecked( true );
layout43->addWidget( FreeScale );
freeScale->setChecked( true );
imageXScaleSpinBox = new ScrSpinBox( this, 0 );
installSniffer(imageXScaleSpinBox);
xscaleLabel = new QLabel( "X-Sc&ale:", this );
xscaleLabel->setBuddy(imageXScaleSpinBox);
layout43->addWidget( xscaleLabel, 4, 0 );
layout43->addWidget( imageXScaleSpinBox, 4, 1 );
imageYScaleSpinBox = new ScrSpinBox( this, 0 );
installSniffer(imageYScaleSpinBox);
yscaleLabel = new QLabel( "Y-Scal&e:", this );
yscaleLabel->setBuddy(imageYScaleSpinBox);
layout43->addWidget( yscaleLabel, 5, 0 );
layout43->addWidget( imageYScaleSpinBox, 5, 1 );
keepImageWHRatioButton = new LinkButton( this );
 
keepImageWHRatioButton->setCheckable( true );
keepImageWHRatioButton->setAutoRaise( true );
keepImageWHRatioButton->setMaximumSize( QSize( 15, 32767 ) );
layout43->addWidget( keepImageWHRatioButton, 4, 2, 2, 1 );
 
imgDpiX = new ScrSpinBox( this, 0 );
installSniffer(imgDpiX);
imgDPIXLabel = new QLabel( "Actual X-DPI:", this );
imgDPIXLabel->setBuddy(imgDpiX);
layout43->addWidget( imgDPIXLabel, 6, 0 );
layout43->addWidget( imgDpiX, 6, 1 );
imgDpiY = new ScrSpinBox( this, 0 );
 
installSniffer(imgDpiY);
imgDPIYLabel = new QLabel( "Actual Y-DPI:", this );
imgDPIYLabel->setBuddy(imgDpiY);
layout43->addWidget( imgDPIYLabel, 7, 0 );
layout43->addWidget( imgDpiY, 7, 1 );
keepImageDPIRatioButton = new LinkButton( this );
 
keepImageDPIRatioButton->setCheckable( true );
keepImageDPIRatioButton->setAutoRaise( true );
keepImageDPIRatioButton->setMaximumSize( QSize( 15, 32767 ) );
layout43->addWidget( keepImageDPIRatioButton, 6, 2, 2, 1 );
pageLayout_4->addLayout( layout43 );
 
Layout24 = new QVBoxLayout;
Layout24->setSpacing( 3 );
Layout24->setMargin( 0 );
frameScale->setText( "&To Frame Size" );
 
FrameScale = new QRadioButton( this );
FrameScale->setText( "Scale &To Frame Size" );
Layout24->addWidget( FrameScale );
cbProportional->setEnabled( false );
cbProportional->setText( "P&roportional" );
cbProportional->setChecked( true );
 
Layout18 = new QHBoxLayout;
Layout18->setSpacing( 5 );
Layout18->setMargin( 0 );
 
Frame4 = new QFrame( this );
Frame4->setMinimumSize( QSize( 15, 2 ) );
Frame4->setMaximumSize( QSize( 15, 10 ) );
Frame4->setFrameShape( QFrame::NoFrame );
Frame4->setFrameShadow( QFrame::Plain );
Layout18->addWidget( Frame4 );
 
Aspect = new QCheckBox( this );
Aspect->setEnabled( false );
Aspect->setText( "P&roportional" );
Aspect->setChecked( true );
 
Layout18->addWidget( Aspect );
Layout24->addLayout( Layout18 );
pageLayout_4->addLayout( Layout24 );
 
EditEffects = new QToolButton( this);
pageLayout_4->addWidget( EditEffects );
 
EditPSDProps = new QToolButton( this);
pageLayout_4->addWidget( EditPSDProps );
 
GroupBoxCM = new QFrame( this );
GroupBoxCM->setFrameShape( QFrame::NoFrame );
GroupBoxCM->setFrameShadow( QFrame::Plain );
GroupBoxCMLayout = new QVBoxLayout( GroupBoxCM );
GroupBoxCMLayout->setSpacing( 2 );
GroupBoxCMLayout->setMargin( 5 );
GroupBoxCMLayout->setAlignment( Qt::AlignTop );
TextCms1 = new QLabel( GroupBoxCM );
GroupBoxCMLayout->addWidget( TextCms1 );
InputP = new ScComboBox( GroupBoxCM );
GroupBoxCMLayout->addWidget(InputP);
TextCms2 = new QLabel( GroupBoxCM );
GroupBoxCMLayout->addWidget(TextCms2);
MonitorI = new ScComboBox( GroupBoxCM );
GroupBoxCMLayout->addWidget(MonitorI);
pageLayout_4->addWidget(GroupBoxCM);
 
GroupBoxCompression = new QFrame( this );
GroupBoxCompression->setFrameShape( QFrame::NoFrame );
GroupBoxCompression->setFrameShadow( QFrame::Plain );
GroupBoxCompressionLayout = new QVBoxLayout( GroupBoxCompression );
GroupBoxCompressionLayout->setSpacing( 2 );
GroupBoxCompressionLayout->setMargin( 5 );
GroupBoxCompressionLayout->setAlignment( Qt::AlignTop );
TextCompressionMethod = new QLabel( GroupBoxCompression );
GroupBoxCompressionLayout->addWidget( TextCompressionMethod );
CompressionMethod = new ScComboBox( GroupBoxCompression );
GroupBoxCompressionLayout->addWidget(CompressionMethod);
TextCompressionQuality = new QLabel( GroupBoxCompression );
GroupBoxCompressionLayout->addWidget( TextCompressionQuality );
CompressionQuality = new ScComboBox( GroupBoxCompression );
GroupBoxCompressionLayout->addWidget( CompressionQuality );
pageLayout_4->addWidget( GroupBoxCompression );
 
languageChange();
 
connect(imagePageNumber , SIGNAL(valueChanged(int)) , this, SLOT(handleImagePageNumber()));
243,15 → 133,15
connect(imgDpiY , SIGNAL(valueChanged(double)), this, SLOT(handleDpiY()));
connect(keepImageWHRatioButton , SIGNAL(clicked()) , this, SLOT(handleImageWHRatio()));
connect(keepImageDPIRatioButton, SIGNAL(clicked()) , this, SLOT(handleImageDPIRatio()));
connect(FreeScale , SIGNAL(clicked()) , this, SLOT(handleScaling()));
connect(FrameScale , SIGNAL(clicked()) , this, SLOT(handleScaling()));
connect(Aspect , SIGNAL(clicked()) , this, SLOT(handleScaling()));
connect(EditEffects , SIGNAL(clicked()) , this, SLOT(handleImageEffects()));
connect(EditPSDProps , SIGNAL(clicked()) , this, SLOT(handleExtImgProperties()));
connect(InputP , SIGNAL(activated(const QString&)), this, SLOT(handleProfile(const QString&)));
connect(MonitorI , SIGNAL(activated(int)) , this, SLOT(handleIntent()));
connect(CompressionMethod , SIGNAL(activated(int)) , this, SLOT(handleCompressionMethod()));
connect(CompressionQuality , SIGNAL(activated(int)) , this, SLOT(handleCompressionQuality()));
connect(freeScale , SIGNAL(clicked()) , this, SLOT(handleScaling()));
connect(frameScale , SIGNAL(clicked()) , this, SLOT(handleScaling()));
connect(cbProportional , SIGNAL(clicked()) , this, SLOT(handleScaling()));
connect(imgEffectsButton , SIGNAL(clicked()) , this, SLOT(handleImageEffects()));
connect(imgExtProperties , SIGNAL(clicked()) , this, SLOT(handleExtImgProperties()));
connect(inputProfiles , SIGNAL(activated(const QString&)), this, SLOT(handleProfile(const QString&)));
connect(renderIntent , SIGNAL(activated(int)) , this, SLOT(handleIntent()));
connect(compressionMethod , SIGNAL(activated(int)) , this, SLOT(handleCompressionMethod()));
connect(compressionQuality , SIGNAL(activated(int)) , this, SLOT(handleCompressionQuality()));
}
 
void PropertiesPalette_Image::changeEvent(QEvent *e)
377,17 → 267,17
if (m_haveDoc)
{
if (ScCore->haveCMS() && m_doc->cmsSettings().CMSinUse)
GroupBoxCM->show();
colorMgmtGroup->show();
else
{
GroupBoxCM->hide();
colorMgmtGroup->hide();
return;
}
 
InputP->blockSignals(true);
MonitorI->blockSignals(true);
inputProfiles->blockSignals(true);
renderIntent->blockSignals(true);
 
InputP->clear();
inputProfiles->clear();
if (m_haveItem)
{
if (m_item->pixm.imgInfo.colorspace == ColorSpaceCMYK)
396,19 → 286,19
ProfilesL::Iterator itPend = ScCore->InputProfilesCMYK.end();
for (itP = ScCore->InputProfilesCMYK.begin(); itP != itPend; ++itP)
{
InputP->addItem(itP.key());
inputProfiles->addItem(itP.key());
if (itP.key() == m_item->IProfile)
InputP->setCurrentIndex(InputP->count()-1);
inputProfiles->setCurrentIndex(inputProfiles->count()-1);
}
if (!ScCore->InputProfilesCMYK.contains(m_item->IProfile))
{
InputP->addItem(m_item->IProfile);
InputP->setCurrentIndex(InputP->count()-1);
inputProfiles->addItem(m_item->IProfile);
inputProfiles->setCurrentIndex(inputProfiles->count()-1);
}
else
{
if (!m_item->EmProfile.isEmpty())
InputP->addItem(m_item->EmProfile);
inputProfiles->addItem(m_item->EmProfile);
}
}
else
417,26 → 307,26
ProfilesL::Iterator itPend=ScCore->InputProfiles.end();
for (itP = ScCore->InputProfiles.begin(); itP != itPend; ++itP)
{
InputP->addItem(itP.key());
inputProfiles->addItem(itP.key());
if (itP.key() == m_item->IProfile)
InputP->setCurrentIndex(InputP->count()-1);
inputProfiles->setCurrentIndex(inputProfiles->count()-1);
}
if (!ScCore->InputProfiles.contains(m_item->IProfile))
{
InputP->addItem(m_item->IProfile);
InputP->setCurrentIndex(InputP->count()-1);
inputProfiles->addItem(m_item->IProfile);
inputProfiles->setCurrentIndex(inputProfiles->count()-1);
}
else
{
if (!m_item->EmProfile.isEmpty())
InputP->addItem(m_item->EmProfile);
inputProfiles->addItem(m_item->EmProfile);
}
}
MonitorI->setCurrentIndex(m_item->IRender);
renderIntent->setCurrentIndex(m_item->IRender);
}
 
InputP->blockSignals(false);
MonitorI->blockSignals(false);
inputProfiles->blockSignals(false);
renderIntent->blockSignals(false);
}
}
 
447,7 → 337,7
if (m_haveItem)
updateProfileList();
else if (m_doc)
GroupBoxCM->setVisible(ScCore->haveCMS() && m_doc->cmsSettings().CMSinUse);
colorMgmtGroup->setVisible(ScCore->haveCMS() && m_doc->cmsSettings().CMSinUse);
}
 
void PropertiesPalette_Image::displayImageRotation(double rot)
570,8 → 460,8
imagePageNumber->blockSignals(true);
imagePageNumber->setMaximum(m_item->pixm.imgInfo.numberOfPages);
imagePageNumber->setValue(m_item->pixm.imgInfo.actualPageNumber);
CompressionMethod->setCurrentIndex(m_item->OverrideCompressionMethod ? m_item->CompressionMethodIndex + 1 : 0);
CompressionQuality->setCurrentIndex(m_item->OverrideCompressionQuality ? m_item->CompressionQualityIndex + 1 : 0);
compressionMethod->setCurrentIndex(m_item->OverrideCompressionMethod ? m_item->CompressionMethodIndex + 1 : 0);
compressionQuality->setCurrentIndex(m_item->OverrideCompressionQuality ? m_item->CompressionQualityIndex + 1 : 0);
imagePageNumber->blockSignals(false);
 
imageXScaleSpinBox->blockSignals(true);
580,17 → 470,16
imageYOffsetSpinBox->blockSignals(true);
imageRotation->blockSignals(true);
 
updateProfileList();
EditEffects->setShown(m_item->PictureIsAvailable && m_item->isRaster);
EditPSDProps->setShown(m_item->PictureIsAvailable && m_item->pixm.imgInfo.valid);
imgEffectsButton->setShown(m_item->PictureIsAvailable && m_item->isRaster);
imgExtProperties->setShown(m_item->PictureIsAvailable && m_item->pixm.imgInfo.valid);
bool setter = m_item->ScaleType;
FreeScale->setChecked(setter);
FrameScale->setChecked(!setter);
freeScale->setChecked(setter);
frameScale->setChecked(!setter);
if ((m_item->asLatexFrame()) || (m_item->asOSGFrame()))
{
FreeScale->setEnabled(false);
FrameScale->setEnabled(false);
Aspect->setEnabled(false);
freeScale->setEnabled(false);
frameScale->setEnabled(false);
cbProportional->setEnabled(false);
imageXScaleSpinBox->setEnabled(false);
imageYScaleSpinBox->setEnabled(false);
imgDpiX->setEnabled(false);
602,10 → 491,10
imageYScaleSpinBox->setEnabled(setter);
imgDpiX->setEnabled(setter);
imgDpiY->setEnabled(setter);
Aspect->setEnabled(!setter);
Aspect->setChecked(m_item->AspectRatio);
FreeScale->setEnabled(true);
FrameScale->setEnabled(true);
cbProportional->setEnabled(!setter);
cbProportional->setChecked(m_item->AspectRatio);
freeScale->setEnabled(true);
frameScale->setEnabled(true);
}
//CB Why do we need this? Setting it too much here
// if (setter == true)
631,6 → 520,10
rrR = 360 - rrR;
imageRotation->showValue(fabs(rrR));
 
if (m_item->asImageFrame())
{
updateProfileList();
}
if (m_item->asOSGFrame())
{
setEnabled(false);
688,11 → 581,11
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
 
if (FreeScale == sender())
if (freeScale == sender())
{
FrameScale->setChecked(false);
FreeScale->setChecked(true);
Aspect->setEnabled(false);
frameScale->setChecked(false);
freeScale->setChecked(true);
cbProportional->setEnabled(false);
// imageXOffsetSpinBox->setEnabled(true);
// imageYOffsetSpinBox->setEnabled(true);
imageXScaleSpinBox->setEnabled(true);
703,11 → 596,11
keepImageWHRatioButton->setEnabled(true);
keepImageDPIRatioButton->setEnabled(true);
}
if (FrameScale == sender())
if (frameScale == sender())
{
FrameScale->setChecked(true);
FreeScale->setChecked(false);
Aspect->setEnabled(true);
frameScale->setChecked(true);
freeScale->setChecked(false);
cbProportional->setEnabled(true);
// imageXOffsetSpinBox->setEnabled(false);
// imageYOffsetSpinBox->setEnabled(false);
imageXScaleSpinBox->setEnabled(false);
721,7 → 614,7
 
if ((m_haveDoc) && (m_haveItem))
{
m_item->setImageScalingMode(FreeScale->isChecked(), Aspect->isChecked());
m_item->setImageScalingMode(freeScale->isChecked(), cbProportional->isChecked());
emit UpdtGui(PageItem::ImageFrame);
emit DocChanged();
}
837,7 → 730,7
{
if (!m_haveDoc || !m_haveItem || !m_ScMW || m_ScMW->scriptIsRunning())
return;
m_doc->itemSelection_SetColorProfile(InputP->currentText());
m_doc->itemSelection_SetColorProfile(inputProfiles->currentText());
}
 
void PropertiesPalette_Image::handleIntent()
844,7 → 737,7
{
if (!m_haveDoc || !m_haveItem || !m_ScMW || m_ScMW->scriptIsRunning())
return;
m_doc->itemSelection_SetRenderIntent(MonitorI->currentIndex());
m_doc->itemSelection_SetRenderIntent(renderIntent->currentIndex());
}
void PropertiesPalette_Image::handleCompressionMethod()
851,7 → 744,7
{
if (!m_haveDoc || !m_haveItem || !m_ScMW || m_ScMW->scriptIsRunning())
return;
m_doc->itemSelection_SetCompressionMethod(CompressionMethod->currentIndex() - 1);
m_doc->itemSelection_SetCompressionMethod(compressionMethod->currentIndex() - 1);
}
 
void PropertiesPalette_Image::handleCompressionQuality()
858,7 → 751,7
{
if (!m_haveDoc || !m_haveItem || !m_ScMW || m_ScMW->scriptIsRunning())
return;
m_doc->itemSelection_SetCompressionQuality(CompressionQuality->currentIndex() - 1);
m_doc->itemSelection_SetCompressionQuality(compressionQuality->currentIndex() - 1);
}
 
void PropertiesPalette_Image::languageChange()
869,45 → 762,45
yposImgLabel->setText( tr("&Y-Pos:"));
xscaleLabel->setText( tr("X-Sc&ale:"));
yscaleLabel->setText( tr("Y-Scal&e:"));
FreeScale->setText( tr("&Free Scaling"));
freeScale->setText( tr("&Free Scaling"));
imagePageNumberLabel->setText( tr("&Page Number:"));
imageRotationLabel->setText( tr("Rotation:"));
 
Aspect->setText( tr("P&roportional"));
EditEffects->setText( tr("Image Effects"));
EditPSDProps->setText( tr("Extended Image Properties"));
cbProportional->setText( tr("P&roportional"));
imgEffectsButton->setText( tr("Image Effects"));
imgExtProperties->setText( tr("Extended Properties"));
 
TextCms1->setText( tr("Input Profile:"));
TextCms2->setText( tr("Rendering Intent:"));
TextCompressionMethod->setText( tr("PDF Compression Method:"));
TextCompressionQuality->setText( tr("PDF Compression Quality:"));
inputProfLabel->setText( tr("Input Profile:"));
renderIntentLabel->setText( tr("Rendering Intent:"));
compressionMethodLabel->setText( tr("Method:"));
compressionQualityLabel->setText( tr("Quality:"));
 
int oldMonitorI=MonitorI->currentIndex();
MonitorI->clear();
MonitorI->addItem( tr("Perceptual"));
MonitorI->addItem( tr("Relative Colorimetric"));
MonitorI->addItem( tr("Saturation"));
MonitorI->addItem( tr("Absolute Colorimetric"));
MonitorI->setCurrentIndex(oldMonitorI);
int oldMonitorI=renderIntent->currentIndex();
renderIntent->clear();
renderIntent->addItem( tr("Perceptual"));
renderIntent->addItem( tr("Relative Colorimetric"));
renderIntent->addItem( tr("Saturation"));
renderIntent->addItem( tr("Absolute Colorimetric"));
renderIntent->setCurrentIndex(oldMonitorI);
 
int oldCompressionMethod=CompressionMethod->currentIndex();
CompressionMethod->clear();
CompressionMethod->addItem( tr( "Global" ) );
CompressionMethod->addItem( tr( "Automatic" ) );
CompressionMethod->addItem( tr( "Lossy - JPEG" ) );
CompressionMethod->addItem( tr( "Lossless - Zip" ) );
CompressionMethod->addItem( tr( "None" ) );
CompressionMethod->setCurrentIndex(oldCompressionMethod);
int oldCompressionMethod=compressionMethod->currentIndex();
compressionMethod->clear();
compressionMethod->addItem( tr( "Global" ) );
compressionMethod->addItem( tr( "Automatic" ) );
compressionMethod->addItem( tr( "Lossy - JPEG" ) );
compressionMethod->addItem( tr( "Lossless - Zip" ) );
compressionMethod->addItem( tr( "None" ) );
compressionMethod->setCurrentIndex(oldCompressionMethod);
 
int oldCompressionQuality=CompressionQuality->currentIndex();
CompressionQuality->clear();
CompressionQuality->addItem( tr( "Global" ) );
CompressionQuality->addItem( tr( "Maximum" ) );
CompressionQuality->addItem( tr( "High" ) );
CompressionQuality->addItem( tr( "Medium" ) );
CompressionQuality->addItem( tr( "Low" ) );
CompressionQuality->addItem( tr( "Minimum" ) );
CompressionQuality->setCurrentIndex(oldCompressionQuality);
int oldCompressionQuality=compressionQuality->currentIndex();
compressionQuality->clear();
compressionQuality->addItem( tr( "Global" ) );
compressionQuality->addItem( tr( "Maximum" ) );
compressionQuality->addItem( tr( "High" ) );
compressionQuality->addItem( tr( "Medium" ) );
compressionQuality->addItem( tr( "Low" ) );
compressionQuality->addItem( tr( "Minimum" ) );
compressionQuality->setCurrentIndex(oldCompressionQuality);
 
QString pctSuffix = tr(" %");
imageXScaleSpinBox->setSuffix(pctSuffix);
926,15 → 819,15
imageXScaleSpinBox->setToolTip( tr("Resize the image horizontally"));
imageYScaleSpinBox->setToolTip( tr("Resize the image vertically"));
keepImageWHRatioButton->setToolTip( tr("Keep the X and Y scaling the same"));
FreeScale->setToolTip( tr("Allow the image to be a different size to the frame"));
FrameScale->setToolTip( tr("Make the image fit within the size of the frame"));
freeScale->setToolTip( tr("Allow the image to be a different size to the frame"));
frameScale->setToolTip( tr("Make the image fit within the size of the frame"));
imgDpiX->setToolTip( tr("Effective horizontal DPI of the image after scaling"));
imgDpiY->setToolTip( tr("Effective vertical DPI of the image after scaling"));
Aspect->setToolTip( tr("Use image proportions rather than those of the frame"));
InputP->setToolTip( tr("Source profile of the image"));
MonitorI->setToolTip( tr("Rendering intent for the image"));
CompressionMethod->setToolTip( tr("Compression method used in PDF export for the image"));
CompressionQuality->setToolTip( tr("Compression quality used in PDF export for the image"));
cbProportional->setToolTip( tr("Use image proportions rather than those of the frame"));
inputProfiles->setToolTip( tr("Source profile of the image"));
renderIntent->setToolTip( tr("Rendering intent for the image"));
compressionMethod->setToolTip( tr("Compression method used in PDF export for the image"));
compressionQuality->setToolTip( tr("Compression quality used in PDF export for the image"));
}
 
void PropertiesPalette_Image::unitChange()
/branches/ScribusOIF/scribus/CMakeLists.txt
122,6 → 122,7
ui/prefs_tableofcontentsbase.ui
ui/prefs_documentitemattributesbase.ui
ui/printdialogbase.ui
ui/propertiespalette_imagebase.ui
ui/propertiespalette_textbase.ui
ui/propertiespalette_xyzbase.ui
ui/replacecolors.ui
/branches/ScribusOIF/win32/vc8/Scribus.vcproj
11717,6 → 11717,10
>
</File>
<File
RelativePath="..\..\scribus\ui\ui_propertiespalette_imagebase.h"
>
</File>
<File
RelativePath="..\..\scribus\ui\ui_propertiespalette_textbase.h"
>
</File>
13035,6 → 13039,10
>
</File>
<File
RelativePath="..\..\scribus\ui\propertiespalette_imagebase.ui"
>
</File>
<File
RelativePath="..\..\scribus\ui\propertiespalette_textbase.ui"
>
</File>