r15536 by jghali - move PP image tab code into its own class
scribus-commit
scribus-commit at lists.scribus.net
Thu Oct 14 23:18:01 CEST 2010
Author: jghali
Date: Thu Oct 14 21:18:01 2010
New Revision: 15536
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15536
Log:
move PP image tab code into its own class
Added:
branches/ScribusOIF/scribus/ui/propertiespalette_image.cpp
branches/ScribusOIF/scribus/ui/propertiespalette_image.h
branches/ScribusOIF/win32/vc8/scribus-harfbuzz/
branches/ScribusOIF/win32/vc8/scribus-harfbuzz/scribus-harbuzz.vcproj
Modified:
branches/ScribusOIF/scribus/CMakeLists.txt
branches/ScribusOIF/scribus/pageitem.h
branches/ScribusOIF/scribus/plugins/scriptplugin/cmdmani.cpp
branches/ScribusOIF/scribus/scribus.cpp
branches/ScribusOIF/scribus/scribusview.cpp
branches/ScribusOIF/scribus/ui/propertiespalette.cpp
branches/ScribusOIF/scribus/ui/propertiespalette.h
branches/ScribusOIF/scribus/ui/propertiespalette_shape.cpp
branches/ScribusOIF/scribus/ui/propertiespalette_shape.h
branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h
branches/ScribusOIF/win32/vc8/Scribus.sln
branches/ScribusOIF/win32/vc8/Scribus.vcproj
Modified: branches/ScribusOIF/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/scribus/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/scribus/CMakeLists.txt (original)
+++ branches/ScribusOIF/scribus/CMakeLists.txt Thu Oct 14 21:18:01 2010
@@ -346,6 +346,7 @@
ui/preview.h
ui/printdialog.h
ui/propertiespalette.h
+ ui/propertiespalette_image.h
ui/propertiespalette_shape.h
ui/propertiespalette_utils.h
ui/propertiespalette_xyz.h
@@ -744,6 +745,7 @@
ui/preview.cpp
ui/printdialog.cpp
ui/propertiespalette.cpp
+ ui/propertiespalette_image.cpp
ui/propertiespalette_shape.cpp
ui/propertiespalette_utils.cpp
ui/propertiespalette_xyz.cpp
Modified: branches/ScribusOIF/scribus/pageitem.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/scribus/pageitem.h
==============================================================================
--- branches/ScribusOIF/scribus/pageitem.h (original)
+++ branches/ScribusOIF/scribus/pageitem.h Thu Oct 14 21:18:01 2010
@@ -70,9 +70,7 @@
class PageItem_PathText;
class PageItem_LatexFrame;
class PageItem_Symbol;
-#ifdef HAVE_OSG
class PageItem_OSGFrame;
-#endif
struct CopyPasteBuffer;
/**
@@ -190,9 +188,8 @@
virtual PageItem_PolyLine * asPolyLine() { return NULL; }
virtual PageItem_TextFrame * asTextFrame() { return NULL; }
virtual PageItem_LatexFrame * asLatexFrame() { return NULL; }
-#ifdef HAVE_OSG
+
virtual PageItem_OSGFrame * asOSGFrame() { return NULL; }
-#endif
virtual PageItem_Symbol * asSymbolFrame() { return NULL; }
virtual bool isImageFrame() const { return false; }
Modified: branches/ScribusOIF/scribus/plugins/scriptplugin/cmdmani.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/scribus/plugins/scriptplugin/cmdmani.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/scriptplugin/cmdmani.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/scriptplugin/cmdmani.cpp Thu Oct 14 21:18:01 2010
@@ -6,10 +6,11 @@
*/
#include "cmdmani.h"
#include "cmdutil.h"
-#include "ui/propertiespalette.h" //CB argh.. noooooooooooooooooooooooooooooooooooo FIXME see other FIXME
#include "selection.h"
#include "scribuscore.h"
#include "scribusdoc.h"
+#include "ui/propertiespalette.h" //CB argh.. noooooooooooooooooooooooooooooooooooo FIXME see other FIXME
+#include "ui/propertiespalette_image.h"
#include "undomanager.h"
#include "sctextstream.h"
@@ -562,7 +563,7 @@
// Force the braindead app to notice the changes
//FIXME emit or something so we dont need this
- ScCore->primaryMainWindow()->propertiesPalette->setScaleAndOffset(item->imageXScale(), item->imageYScale(), item->imageXOffset(), item->imageYOffset());
+ ScCore->primaryMainWindow()->propertiesPalette->imagePal->displayScaleAndOffset(item->imageXScale(), item->imageYScale(), item->imageXOffset(), item->imageYOffset());
item->AdjustPictScale();
//ScCore->primaryMainWindow()->view->AdjustPictScale(item);
Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Thu Oct 14 21:18:01 2010
@@ -188,8 +188,9 @@
#include "ui/preview.h"
#include "ui/printdialog.h"
#include "ui/propertiespalette.h"
+#include "ui/propertiespalette_image.h"
+#include "ui/propertiespalette_shape.h"
#include "ui/propertiespalette_xyz.h"
-#include "ui/propertiespalette_shape.h"
#include "ui/query.h"
#include "ui/reformdoc.h"
#include "ui/replacecolors.h"
@@ -4020,11 +4021,11 @@
qApp->changeOverrideCursor( QCursor(Qt::WaitCursor) );
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
doc->LoadPict(fileName, currItem->ItemNr, false, true);
- propertiesPalette->setScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
+ propertiesPalette->imagePal->displayScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
view->DrawNew();
propertiesPalette->updateColorList();
- propertiesPalette->ShowCMS();
+ propertiesPalette->imagePal->showCMSOptions();
currItem->emitAllToGUI();
}
}
@@ -4109,11 +4110,11 @@
currItem->Pfile = fileName;
img.save(fileName, "PNG");
doc->LoadPict(fileName, currItem->ItemNr, false, true);
- propertiesPalette->setScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
+ propertiesPalette->imagePal->displayScaleAndOffset(currItem->imageXScale(), currItem->imageYScale(), currItem->imageXOffset(), currItem->imageYOffset());
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
view->DrawNew();
propertiesPalette->updateColorList();
- propertiesPalette->ShowCMS();
+ propertiesPalette->imagePal->showCMSOptions();
currItem->emitAllToGUI();
}
}
@@ -7689,7 +7690,7 @@
view->reformPages();
view->GotoPage(doc->currentPage()->pageNr());
view->DrawNew();
- propertiesPalette->ShowCMS();
+ propertiesPalette->imagePal->showCMSOptions();
pagePalette->rebuildPages();
}
@@ -7761,7 +7762,7 @@
view->reformPages();
view->GotoPage(doc->currentPage()->pageNr());
view->DrawNew();
- propertiesPalette->ShowCMS();
+ propertiesPalette->imagePal->showCMSOptions();
pagePalette->rebuildPages();
}
}
@@ -9693,7 +9694,7 @@
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
view->DrawNew();
propertiesPalette->updateColorList();
- propertiesPalette->ShowCMS();
+ propertiesPalette->imagePal->showCMSOptions();
currItem->emitAllToGUI();
}
}
Modified: branches/ScribusOIF/scribus/scribusview.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/scribus/scribusview.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribusview.cpp (original)
+++ branches/ScribusOIF/scribus/scribusview.cpp Thu Oct 14 21:18:01 2010
@@ -76,15 +76,9 @@
#include "canvasmode.h"
#include "canvasmode_objimport.h"
#include "actionmanager.h"
-#include "ui/adjustcmsdialog.h"
#include "commonstrings.h"
-#include "ui/extimageprops.h"
#include "filewatcher.h"
-#include "ui/guidemanager.h"
-#include "ui/hruler.h"
#include "hyphenator.h"
-#include "ui/insertTable.h"
-#include "ui/oneclick.h"
#include "page.h"
#include "pageitem_imageframe.h"
#include "pageitem_line.h"
@@ -93,28 +87,36 @@
#include "pageitem_polyline.h"
#include "pageitem_textframe.h"
#include "pageitem_latexframe.h"
-#include "ui/pageitemattributes.h"
-#include "ui/pageselector.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "ui/propertiespalette.h"
-#include "ui/rulermover.h"
#include "scclocale.h"
-#include "ui/scmessagebox.h"
#include "scmimedata.h"
#include "scpainter.h"
#include "scpaths.h"
-#include "ui/scrapbookpalette.h"
#include "scribuscore.h"
#include "scribuswin.h"
#include "scribusXml.h"
#include "selection.h"
#include "serializer.h"
#include "stencilreader.h"
+#include "text/nlsconfig.h"
+#include "ui/adjustcmsdialog.h"
+#include "ui/extimageprops.h"
+#include "ui/guidemanager.h"
+#include "ui/hruler.h"
+#include "ui/insertTable.h"
+#include "ui/oneclick.h"
+#include "ui/pageitemattributes.h"
+#include "ui/pageselector.h"
+#include "ui/propertiespalette.h"
+#include "ui/propertiespalette_image.h"
+#include "ui/rulermover.h"
+#include "ui/scmessagebox.h"
+#include "ui/scrapbookpalette.h"
#include "ui/storyeditor.h"
#include "ui/symbolpalette.h"
-#include "text/nlsconfig.h"
+#include "ui/vruler.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
@@ -122,7 +124,6 @@
#include "util_formats.h"
#include "util_icon.h"
#include "util_math.h"
-#include "ui/vruler.h"
#include "loadsaveplugin.h"
#include "fileloader.h"
#include "plugins/formatidlist.h"
@@ -377,7 +378,7 @@
void ScribusView::toggleCMS()
{
Doc->enableCMS(!Doc->HasCMS);
- m_ScMW->propertiesPalette->ShowCMS();
+ m_ScMW->propertiesPalette->imagePal->showCMSOptions();
DrawNew();
}
@@ -391,7 +392,7 @@
{
Doc->enableCMS(Doc->cmsSettings().CMSinUse);
cmsToolbarButton->setChecked(Doc->HasCMS);
- m_ScMW->propertiesPalette->ShowCMS();
+ m_ScMW->propertiesPalette->imagePal->showCMSOptions();
DrawNew();
}
}
Modified: branches/ScribusOIF/scribus/ui/propertiespalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/scribus/ui/propertiespalette.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette.cpp Thu Oct 14 21:18:01 2010
@@ -53,6 +53,7 @@
#include "sccolorengine.h"
#include "cpalette.h"
#include "pageitem_textframe.h"
+#include "propertiespalette_image.h"
#include "propertiespalette_shape.h"
#include "propertiespalette_utils.h"
#include "propertiespalette_xyz.h"
@@ -560,149 +561,8 @@
pageLayout_4->setSpacing( 5 );
pageLayout_4->setMargin( 0 );
- imagePageNumberSelector = new QGridLayout();
- imagePageNumberSelector->setSpacing( 5 );
- imagePageNumberSelector->setMargin( 0 );
- imagePageNumber = new QSpinBox( page_4 );
- imagePageNumber->setMinimum(0);
- imagePageNumber->setSpecialValueText(tr( "Auto" ));
- imagePageNumberLabel = new QLabel( "&Page Number:", page_4 );
- imagePageNumberLabel->setBuddy(imagePageNumber);
- imagePageNumberSelector->addWidget( imagePageNumberLabel, 0, 0 );
- imagePageNumberSelector->addWidget( imagePageNumber, 0, 1);
- pageLayout_4->addLayout( imagePageNumberSelector );
-
- FreeScale = new QRadioButton( "&Free Scaling", page_4 );
- FreeScale->setChecked( true );
- pageLayout_4->addWidget( FreeScale );
-
- layout43 = new QGridLayout;
- layout43->setSpacing( 5 );
- layout43->setMargin( 0 );
- imageXOffsetSpinBox = new ScrSpinBox( page_4, 0 );
- installSniffer(imageXOffsetSpinBox);
- xposImgLabel = new QLabel( "&X-Pos:", page_4 );
- xposImgLabel->setBuddy(imageXOffsetSpinBox);
- layout43->addWidget( xposImgLabel, 0, 0 );
- layout43->addWidget( imageXOffsetSpinBox, 0, 1 );
- imageYOffsetSpinBox = new ScrSpinBox( page_4, 0 );
- installSniffer(imageYOffsetSpinBox);
- yposImgLabel = new QLabel( "&Y-Pos:", page_4 );
- yposImgLabel->setBuddy(imageYOffsetSpinBox);
- layout43->addWidget( yposImgLabel, 1, 0 );
- layout43->addWidget( imageYOffsetSpinBox, 1, 1 );
-
- imageRotation = new ScrSpinBox( page_4, 6);
- imageRotation->setWrapping( true );
- installSniffer(imageRotation);
- imageRotationLabel = new QLabel( "Rotation:", page_4 );
- imageRotationLabel->setBuddy(imageRotation);
- layout43->addWidget( imageRotationLabel, 2, 0 );
- layout43->addWidget( imageRotation, 2, 1 );
-
- imageXScaleSpinBox = new ScrSpinBox( page_4, 0 );
- installSniffer(imageXScaleSpinBox);
- xscaleLabel = new QLabel( "X-Sc&ale:", page_4 );
- xscaleLabel->setBuddy(imageXScaleSpinBox);
- layout43->addWidget( xscaleLabel, 3, 0 );
- layout43->addWidget( imageXScaleSpinBox, 3, 1 );
- imageYScaleSpinBox = new ScrSpinBox( page_4, 0 );
- installSniffer(imageYScaleSpinBox);
- yscaleLabel = new QLabel( "Y-Scal&e:", page_4 );
- yscaleLabel->setBuddy(imageYScaleSpinBox);
- layout43->addWidget( yscaleLabel, 4, 0 );
- layout43->addWidget( imageYScaleSpinBox, 4, 1 );
- keepImageWHRatioButton = new LinkButton( page_4 );
- keepImageWHRatioButton->setCheckable( true );
- keepImageWHRatioButton->setAutoRaise( true );
- keepImageWHRatioButton->setMaximumSize( QSize( 15, 32767 ) );
- layout43->addWidget( keepImageWHRatioButton, 3, 2, 2, 1 );
- imgDpiX = new ScrSpinBox( page_4, 0 );
- installSniffer(imgDpiX);
- imgDPIXLabel = new QLabel( "Actual X-DPI:", page_4 );
- imgDPIXLabel->setBuddy(imgDpiX);
- layout43->addWidget( imgDPIXLabel, 5, 0 );
- layout43->addWidget( imgDpiX, 5, 1 );
- imgDpiY = new ScrSpinBox( page_4, 0 );
- installSniffer(imgDpiY);
- imgDPIYLabel = new QLabel( "Actual Y-DPI:", page_4 );
- imgDPIYLabel->setBuddy(imgDpiY);
- layout43->addWidget( imgDPIYLabel, 6, 0 );
- layout43->addWidget( imgDpiY, 6, 1 );
- keepImageDPIRatioButton = new LinkButton( page_4 );
- keepImageDPIRatioButton->setCheckable( true );
- keepImageDPIRatioButton->setAutoRaise( true );
- keepImageDPIRatioButton->setMaximumSize( QSize( 15, 32767 ) );
- layout43->addWidget( keepImageDPIRatioButton, 5, 2, 2, 1 );
- pageLayout_4->addLayout( layout43 );
-
- Layout24 = new QVBoxLayout;
- Layout24->setSpacing( 3 );
- Layout24->setMargin( 0 );
-
- FrameScale = new QRadioButton( page_4 );
- FrameScale->setText( "Scale &To Frame Size" );
- Layout24->addWidget( FrameScale );
-
- Layout18 = new QHBoxLayout;
- Layout18->setSpacing( 5 );
- Layout18->setMargin( 0 );
-
- Frame4 = new QFrame( page_4 );
- Frame4->setMinimumSize( QSize( 15, 2 ) );
- Frame4->setMaximumSize( QSize( 15, 10 ) );
- Frame4->setFrameShape( QFrame::NoFrame );
- Frame4->setFrameShadow( QFrame::Plain );
- Layout18->addWidget( Frame4 );
-
- Aspect = new QCheckBox( page_4 );
- Aspect->setEnabled( false );
- Aspect->setText( "P&roportional" );
- Aspect->setChecked( true );
-
- Layout18->addWidget( Aspect );
- Layout24->addLayout( Layout18 );
- pageLayout_4->addLayout( Layout24 );
-
- EditEffects = new QToolButton( page_4);
- pageLayout_4->addWidget( EditEffects );
-
- EditPSDProps = new QToolButton( page_4);
- pageLayout_4->addWidget( EditPSDProps );
-
- GroupBoxCM = new QFrame( page_4 );
- 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( page_4 );
- 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 );
+ imagePal = new PropertiesPalette_Image(page_4);
+ pageLayout_4->addWidget(imagePal);
QSpacerItem* spacer9 = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
pageLayout_4->addItem( spacer9 );
@@ -845,22 +705,12 @@
connect(LineSp, SIGNAL(valueChanged(double)), this, SLOT(NewLineSpacing()));
connect(Size, SIGNAL(valueChanged(double)), this, SLOT(NewSize()));
connect(Extra, SIGNAL(valueChanged(double)), this, SLOT(NewTracking()));
- connect(imagePageNumber, SIGNAL(valueChanged(int)), this, SLOT(NewPage()));
- connect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- connect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
- connect(imageXOffsetSpinBox, SIGNAL(valueChanged(double)), this, SLOT(NewLocalXY()));
- connect(imageYOffsetSpinBox, SIGNAL(valueChanged(double)), this, SLOT(NewLocalXY()));
- connect(imageRotation, SIGNAL(valueChanged(double)), this, SLOT(NewLocalRot()));
- connect(imgDpiX, SIGNAL(valueChanged(double)), this, SLOT(HChangeD()));
- connect(imgDpiY, SIGNAL(valueChanged(double)), this, SLOT(VChangeD()));
connect(LSize, SIGNAL(valueChanged(double)), this, SLOT(NewLineWidth()));
connect(LStyle, SIGNAL(activated(int)), this, SLOT(NewLineStyle()));
connect(LJoinStyle, SIGNAL(activated(int)), this, SLOT(NewLineJoin()));
connect(LEndStyle, SIGNAL(activated(int)), this, SLOT(NewLineEnd()));
connect(LineMode, SIGNAL(activated(int)), this, SLOT(NewLineMode()));
connect(dashEditor, SIGNAL(dashChanged()), this, SLOT(dashChange()));
- connect(keepImageWHRatioButton, SIGNAL(clicked()), this, SLOT(ToggleKette()));
- connect(keepImageDPIRatioButton, SIGNAL(clicked()), this, SLOT(ToggleKetteD()));
connect(GroupAlign, SIGNAL(State(int)), this, SLOT(NewAlignement(int)));
connect(Revert, SIGNAL(clicked()), this, SLOT(DoRevert()));
connect(charStyleClear, SIGNAL(clicked()), this, SLOT(doClearCStyle()));
@@ -873,11 +723,6 @@
connect(SeStyle->UnderlineVal->LWidth, SIGNAL(valueChanged(double)), this, SLOT(newUnderline()));
connect(SeStyle->StrikeVal->LPos, SIGNAL(valueChanged(double)), this, SLOT(newStrike()));
connect(SeStyle->StrikeVal->LWidth, SIGNAL(valueChanged(double)), this, SLOT(newStrike()));
- connect(FreeScale, SIGNAL(clicked()), this, SLOT(ChangeScaling()));
- connect(FrameScale, SIGNAL(clicked()), this, SLOT(ChangeScaling()));
- connect(Aspect, SIGNAL(clicked()), this, SLOT(ChangeScaling()));
- connect(EditEffects, SIGNAL(clicked()), this, SLOT(handleImageEffects()));
- connect(EditPSDProps, SIGNAL(clicked()), this, SLOT(handleExtImgProperties()));
connect(textFlowOptionsB2, SIGNAL(buttonClicked(int)), this, SLOT(DoFlow()));
connect(SCustom2, SIGNAL(FormSel(int, int, qreal *)), this, SLOT(MakeIrre(int, int, qreal *)));
@@ -904,10 +749,6 @@
connect(flippedPathText, SIGNAL(clicked()), this, SLOT(handlePathFlip()));
connect(Dist, SIGNAL(valueChanged(double)), this, SLOT(handlePathDist()));
connect(LineW, SIGNAL(valueChanged(double)), this, SLOT(handlePathOffs()));
- connect(InputP, SIGNAL(activated(const QString&)), this, SLOT(ChangeProfile(const QString&)));
- connect(MonitorI, SIGNAL(activated(int)), this, SLOT(ChangeIntent()));
- connect(CompressionMethod, SIGNAL(activated(int)), this, SLOT(ChangeCompressionMethod()));
- connect(CompressionQuality, SIGNAL(activated(int)), this, SLOT(ChangeCompressionQuality()));
connect( TabsButton, SIGNAL( clicked() ), this, SLOT( ManageTabs() ) );
connect( TopLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
connect( LeftLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
@@ -977,6 +818,7 @@
this->xyzPal->setMainWindow(mw);
this->shapePal->setMainWindow(mw);
+ this->imagePal->setMainWindow(mw);
connect(this, SIGNAL(DocChanged()), m_ScMW, SLOT(slotDocCh()));
connect(this, SIGNAL(NewAlignment(int)), m_ScMW, SLOT(setNewAlignment(int)));
@@ -1063,13 +905,9 @@
HaveItem = false;
xyzPal->setDoc(doc);
- /*xyzPal->setCurrentItem(NULL);*/
shapePal->setDoc(doc);
-
- imageXOffsetSpinBox->setValues( -16777215, maxXYWHVal, precision, 0);
- imageYOffsetSpinBox->setValues( -16777215, maxXYWHVal, precision, 0);
-
- imageRotation->setValues( 0, 359.99, 1, 0);
+ imagePal->setDoc(doc);
+
Extra->setValues( -300, 300, 2, 0);
Size->setValues( 0.5, 2048, 2, 1);
LineSp->setValues( 1, 2048, 2, 1);
@@ -1077,10 +915,6 @@
normWordTrackingSpinBox->setValues(1, 200, 2, 100);
minGlyphExtSpinBox->setValues(90, 110, 2, 100);
maxGlyphExtSpinBox->setValues(90, 110, 2, 100);
- imageXScaleSpinBox->setValues( 1, 30000, 2, 1);
- imageYScaleSpinBox->setValues( 1, 30000, 2, 1);
- imgDpiX->setValues( 1, 30000, 2, 1);
- imgDpiY->setValues( 1, 30000, 2, 1);
dGap->setDecimals(2);
DTop->setDecimals(2);
@@ -1139,10 +973,14 @@
HaveItem = false;
doc=NULL;
CurItem = NULL;
+
xyzPal->unsetItem();
xyzPal->unsetDoc();
shapePal->unsetItem();
shapePal->unsetDoc();
+ imagePal->unsetItem();
+ imagePal->unsetDoc();
+
Cpal->setCurrentItem(NULL);
Cpal->setDocument(NULL);
Tpal->setCurrentItem(NULL);
@@ -1153,7 +991,6 @@
charStyleCombo->setDoc(0);
SetLineFormats(0);
HaveItem = false;
- imageRotation->setValue(0);
for (int ws = 1; ws < 8; ++ws)
TabStack->setItemEnabled(ws, false);
TabStack->widget(0)->setEnabled(false);
@@ -1223,6 +1060,7 @@
xyzPal->handleSelectionChanged();
shapePal->handleSelectionChanged();
+ imagePal->handleSelectionChanged();
Cpal->setCurrentItem(CurItem);
Cpal->updateFromItem();
@@ -1292,15 +1130,6 @@
connect(dGap, SIGNAL(valueChanged(double)), this, SLOT(NewGap()));
connect(DCol, SIGNAL(valueChanged(int)), this, SLOT(NewCols()));
}
- if (CurItem->asImageFrame())
- {
- disconnect(imagePageNumber, SIGNAL(valueChanged(int)), this, SLOT(NewPage()));
- imagePageNumber->setMaximum(CurItem->pixm.imgInfo.numberOfPages);
- imagePageNumber->setValue(CurItem->pixm.imgInfo.actualPageNumber);
- CompressionMethod->setCurrentIndex(CurItem->OverrideCompressionMethod ? CurItem->CompressionMethodIndex + 1 : 0);
- CompressionQuality->setCurrentIndex(CurItem->OverrideCompressionQuality ? CurItem->CompressionQualityIndex + 1 : 0);
- connect(imagePageNumber, SIGNAL(valueChanged(int)), this, SLOT(NewPage()));
- }
Revert->setChecked(CurItem->reversed());
setTextFlowMode(CurItem->textFlowMode());
if (StyledLine->currentItem())
@@ -1349,11 +1178,6 @@
disconnect(LStyle, SIGNAL(activated(int)), this, SLOT(NewLineStyle()));
disconnect(LJoinStyle, SIGNAL(activated(int)), this, SLOT(NewLineJoin()));
disconnect(LEndStyle, SIGNAL(activated(int)), this, SLOT(NewLineEnd()));
- disconnect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- disconnect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
- disconnect(imageXOffsetSpinBox, SIGNAL(valueChanged(double)), this, SLOT(NewLocalXY()));
- disconnect(imageYOffsetSpinBox, SIGNAL(valueChanged(double)), this, SLOT(NewLocalXY()));
- disconnect(imageRotation, SIGNAL(valueChanged(double)), this, SLOT(NewLocalRot()));
disconnect(DTop, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
disconnect(DLeft, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
disconnect(DRight, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
@@ -1457,69 +1281,14 @@
Cpal->setActOverprint(0);
HaveItem = true;
SelTab(TabStack->currentIndex());
- if (!CurItem->asLine())
- {
- if (CurItem->asImageFrame())
- {
- updateCmsList();
- EditEffects->setShown(CurItem->PictureIsAvailable && CurItem->isRaster);
- EditPSDProps->setShown(CurItem->PictureIsAvailable && CurItem->pixm.imgInfo.valid);
- setter = CurItem->ScaleType;
- FreeScale->setChecked(setter);
- FrameScale->setChecked(!setter);
-#ifdef HAVE_OSG
- if ((CurItem->asLatexFrame()) || (CurItem->asOSGFrame()))
-#else
- if (CurItem->asLatexFrame())
-#endif
- {
- FreeScale->setEnabled(false);
- FrameScale->setEnabled(false);
- Aspect->setEnabled(false);
- imageXScaleSpinBox->setEnabled(false);
- imageYScaleSpinBox->setEnabled(false);
- imgDpiX->setEnabled(false);
- imgDpiY->setEnabled(false);
- }
- else
- {
- imageXScaleSpinBox->setEnabled(setter);
- imageYScaleSpinBox->setEnabled(setter);
- imgDpiX->setEnabled(setter);
- imgDpiY->setEnabled(setter);
- Aspect->setEnabled(!setter);
- Aspect->setChecked(CurItem->AspectRatio);
- FreeScale->setEnabled(true);
- FrameScale->setEnabled(true);
- }
-//CB Why do we need this? Setting it too much here
-// if (setter == true)
-// {
-// keepImageWHRatioButton->setChecked(setter);
-// keepImageDPIRatioButton->setChecked(setter);
-// }
- imageXOffsetSpinBox->setEnabled(setter);
- imageYOffsetSpinBox->setEnabled(setter);
- imageRotation->setEnabled(setter);
- }
- }
- setScaleAndOffset(i->imageXScale(), i->imageYScale(), i->imageXOffset(), i->imageYOffset());
+
setLineWidth(i->lineWidth());
setLIvalue(i->lineStyle(), i->lineEnd(), i->lineJoin());
- double rrR = i->imageRotation();
- if (i->imageRotation() > 0)
- rrR = 360 - rrR;
- imageRotation->setValue(fabs(rrR));
- connect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- connect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
- connect(imageXOffsetSpinBox, SIGNAL(valueChanged(double)), this, SLOT(NewLocalXY()));
- connect(imageYOffsetSpinBox, SIGNAL(valueChanged(double)), this, SLOT(NewLocalXY()));
- connect(imageRotation, SIGNAL(valueChanged(double)), this, SLOT(NewLocalRot()));
xyzPal->handleSelectionChanged();
shapePal->handleSelectionChanged();
-
-#ifdef HAVE_OSG
+ imagePal->handleSelectionChanged();
+
if (CurItem->asOSGFrame())
{
TabStack->setItemEnabled(idXYZItem, true);
@@ -1530,12 +1299,7 @@
TabStack->setItemEnabled(idTransparencyItem, false);
TabStack->setItemEnabled(idTextItem, false);
TabStack->setItemEnabled(idImageItem, false);
- Rotation->setEnabled(false);
- RoundRect->setEnabled(false);
- EditShape->setEnabled(false);
- SCustom->setEnabled(false);
- }
-#endif
+ }
if (CurItem->asSymbolFrame())
{
TabStack->setItemEnabled(idXYZItem, true);
@@ -1577,6 +1341,7 @@
xyzPal->newSelection(nr);
shapePal->newSelection(nr);
+ imagePal->newSelection(nr);
if (doc->m_Selection->count()>1)
{
@@ -1620,7 +1385,6 @@
case PageItem::ImageFrame:
case PageItem::LatexFrame:
case PageItem::OSGFrame:
-#ifdef HAVE_OSG
if (i->asOSGFrame())
{
TabStack->setItemEnabled(idXYZItem, true);
@@ -1631,18 +1395,14 @@
TabStack->setItemEnabled(idTransparencyItem, false);
TabStack->setItemEnabled(idTextItem, false);
TabStack->setItemEnabled(idImageItem, false);
- Rotation->setEnabled(false);
}
else
{
-#endif
TabStack->setItemEnabled(idShapeItem, true);
TabStack->setItemEnabled(idTextItem, false);
TabStack->setItemEnabled(idImageItem, true);
TabStack->setItemEnabled(idLineItem, true);
-#ifdef HAVE_OSG
}
-#endif
break;
case PageItem::TextFrame:
TabStack->setItemEnabled(idShapeItem, true);
@@ -1703,6 +1463,8 @@
//these can be enabled all the time
xyzPal->setMultipleSelection(true);
shapePal->setMultipleSelection(true);
+ imagePal->setMultipleSelection(true);
+
if (doc->m_Selection->count() > 1)
{
PageItem *i;
@@ -1729,9 +1491,8 @@
xyzPal->unitChange();
shapePal->unitChange();
-
- imageXOffsetSpinBox->setNewUnit( m_unitIndex );
- imageYOffsetSpinBox->setNewUnit( m_unitIndex );
+ imagePal->unitChange();
+
dGap->setNewUnit( m_unitIndex );
DLeft->setNewUnit( m_unitIndex );
DTop->setNewUnit( m_unitIndex );
@@ -1853,100 +1614,6 @@
bool tmp = HaveItem;
HaveItem = false;
Extra->setValue(e / 10.0);
- HaveItem = tmp;
-}
-
-void PropertiesPalette::ChangeScaling()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if (FreeScale == sender())
- {
- FrameScale->setChecked(false);
- FreeScale->setChecked(true);
- Aspect->setEnabled(false);
- imageXOffsetSpinBox->setEnabled(true);
- imageYOffsetSpinBox->setEnabled(true);
- imageXScaleSpinBox->setEnabled(true);
- imageYScaleSpinBox->setEnabled(true);
- imgDpiX->setEnabled(true);
- imgDpiY->setEnabled(true);
- imageRotation->setEnabled(true);
- }
- if (FrameScale == sender())
- {
- FrameScale->setChecked(true);
- FreeScale->setChecked(false);
- Aspect->setEnabled(true);
- imageXOffsetSpinBox->setEnabled(false);
- imageYOffsetSpinBox->setEnabled(false);
- imageXScaleSpinBox->setEnabled(false);
- imageYScaleSpinBox->setEnabled(false);
- imgDpiX->setEnabled(false);
- imgDpiY->setEnabled(false);
- imageRotation->setEnabled(false);
- }
- if ((HaveDoc) && (HaveItem))
- {
- CurItem->setImageScalingMode(FreeScale->isChecked(), Aspect->isChecked());
- emit UpdtGui(PageItem::ImageFrame);
- emit DocChanged();
- }
-}
-
-void PropertiesPalette::setImgRotation(double rot)
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- disconnect(imageRotation, SIGNAL(valueChanged(double)), this, SLOT(NewLocalRot()));
- double rrR = rot;
- if (rot > 0)
- rrR = 360 - rrR;
- imageRotation->setValue(fabs(rrR));
- connect(imageRotation, SIGNAL(valueChanged(double)), this, SLOT(NewLocalRot()));
-}
-
-void PropertiesPalette::setScaleAndOffset(double scx, double scy, double x, double y)
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- bool tmp = HaveItem;
- HaveItem = false;
- disconnect(imgDpiX, SIGNAL(valueChanged(double)), this, SLOT(HChangeD()));
- disconnect(imgDpiY, SIGNAL(valueChanged(double)), this, SLOT(VChangeD()));
- disconnect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- disconnect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
- disconnect(keepImageWHRatioButton, SIGNAL(clicked()), this, SLOT(ToggleKette()));
- disconnect(keepImageDPIRatioButton, SIGNAL(clicked()), this, SLOT(ToggleKetteD()));
- if (fabs(scx - scy) > 0.0002)
- {
- keepImageWHRatioButton->setChecked(false);
- keepImageDPIRatioButton->setChecked(false);
- }
- if (tmp)
- {
- imageXOffsetSpinBox->setValue(x * m_unitRatio * CurItem->imageXScale());
- imageYOffsetSpinBox->setValue(y * m_unitRatio * CurItem->imageYScale());
- imageXScaleSpinBox->setValue(scx * 100 / 72.0 * CurItem->pixm.imgInfo.xres);
- imageYScaleSpinBox->setValue(scy * 100 / 72.0 * CurItem->pixm.imgInfo.yres);
- imgDpiX->setValue(qRound(720.0 / CurItem->imageXScale()) / 10.0);
- imgDpiY->setValue(qRound(720.0 / CurItem->imageYScale()) / 10.0);
- }
- else
- {
- imageXOffsetSpinBox->setValue(x * m_unitRatio);
- imageYOffsetSpinBox->setValue(y * m_unitRatio);
- imageXScaleSpinBox->setValue(scx * 100);
- imageYScaleSpinBox->setValue(scy * 100);
- imgDpiX->setValue(72);
- imgDpiY->setValue(72);
- }
- connect(keepImageWHRatioButton, SIGNAL(clicked()), this, SLOT(ToggleKette()));
- connect(keepImageDPIRatioButton, SIGNAL(clicked()), this, SLOT(ToggleKetteD()));
- connect(imgDpiX, SIGNAL(valueChanged(double)), this, SLOT(HChangeD()));
- connect(imgDpiY, SIGNAL(valueChanged(double)), this, SLOT(VChangeD()));
- connect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- connect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
HaveItem = tmp;
}
@@ -2289,17 +1956,6 @@
emit DocChanged();
}
-void PropertiesPalette::NewPage()
-{
- if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
- return;
- bool reallynew = (CurItem->pixm.imgInfo.actualPageNumber != imagePageNumber->value());
- CurItem->pixm.imgInfo.actualPageNumber = imagePageNumber->value();
- if (reallynew)
- CurItem->loadImage(CurItem->externalFile(), true);
- CurItem->update();
-}
-
void PropertiesPalette::NewGap()
{
if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
@@ -2333,70 +1989,6 @@
if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
return;
doc->itemSelection_SetTracking(qRound(Extra->value() * 10.0));
-}
-
-void PropertiesPalette::NewLocalXY()
-{
- if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
- return;
- doc->itemSelection_SetImageOffset(imageXOffsetSpinBox->value() / m_unitRatio / CurItem->imageXScale(), imageYOffsetSpinBox->value() / m_unitRatio / CurItem->imageYScale());
-}
-
-void PropertiesPalette::NewLocalSC()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if ((HaveDoc) && (HaveItem))
- {
- //CB Dont pass in the scale to the offset change as its taken from the new scale
- doc->itemSelection_SetImageScaleAndOffset(imageXScaleSpinBox->value() / 100.0 / CurItem->pixm.imgInfo.xres * 72.0, imageYScaleSpinBox->value() / 100.0 / CurItem->pixm.imgInfo.yres * 72.0, imageXOffsetSpinBox->value() / m_unitRatio, imageYOffsetSpinBox->value() / m_unitRatio);
- disconnect(imgDpiX, SIGNAL(valueChanged(double)), this, SLOT(HChangeD()));
- disconnect(imgDpiY, SIGNAL(valueChanged(double)), this, SLOT(VChangeD()));
- imgDpiX->setValue(qRound(720.0 / CurItem->imageXScale()) / 10.0);
- imgDpiY->setValue(qRound(720.0 / CurItem->imageYScale()) / 10.0);
- connect(imgDpiX, SIGNAL(valueChanged(double)), this, SLOT(HChangeD()));
- connect(imgDpiY, SIGNAL(valueChanged(double)), this, SLOT(VChangeD()));
- }
-}
-
-void PropertiesPalette::NewLocalDpi()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if ((HaveDoc) && (HaveItem))
- {
- //CB Dont pass in the scale to the offset change as its taken from the new scale
- doc->itemSelection_SetImageScaleAndOffset(72.0 / imgDpiX->value(), 72.0 / imgDpiY->value(), imageXOffsetSpinBox->value() / m_unitRatio, imageYOffsetSpinBox->value() / m_unitRatio);
- disconnect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- disconnect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
- imageXScaleSpinBox->setValue(CurItem->imageXScale() * 100 / 72.0 * CurItem->pixm.imgInfo.xres);
- imageYScaleSpinBox->setValue(CurItem->imageYScale() * 100 / 72.0 * CurItem->pixm.imgInfo.yres);
- connect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- connect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
- }
-}
-
-void PropertiesPalette::NewLocalRot()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if ((HaveDoc) && (HaveItem))
- doc->itemSelection_SetImageRotation(360 - imageRotation->value());
-}
-
-void PropertiesPalette::handleImageEffects()
-{
- if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
- return;
- m_ScMW->ImageEffects();
-}
-
-void PropertiesPalette::handleExtImgProperties()
-{
- if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
- return;
- m_ScMW->view->editExtendedImageProperties();
- emit DocChanged();
}
void PropertiesPalette::NewLineWidth()
@@ -2561,86 +2153,6 @@
}
if ((HaveDoc) && (HaveItem))
doc->itemSelection_SetLineEnd(c);
-}
-
-void PropertiesPalette::ToggleKette()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- disconnect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- disconnect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
- if (keepImageWHRatioButton->isChecked())
- {
- imageYScaleSpinBox->setValue(imageXScaleSpinBox->value());
- NewLocalSC();
- keepImageDPIRatioButton->setChecked(true);
- }
- else
- keepImageDPIRatioButton->setChecked(false);
- connect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- connect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
-}
-
-void PropertiesPalette::HChange()
-{
- disconnect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- disconnect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
- if (keepImageWHRatioButton->isChecked())
- imageYScaleSpinBox->setValue(imageXScaleSpinBox->value());
- NewLocalSC();
- connect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- connect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
-}
-
-void PropertiesPalette::VChange()
-{
- disconnect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- disconnect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
- if (keepImageWHRatioButton->isChecked())
- imageXScaleSpinBox->setValue(imageYScaleSpinBox->value());
- NewLocalSC();
- connect(imageXScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(HChange()));
- connect(imageYScaleSpinBox, SIGNAL(valueChanged(double)), this, SLOT(VChange()));
-}
-
-void PropertiesPalette::ToggleKetteD()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- disconnect(imgDpiX, SIGNAL(valueChanged(double)), this, SLOT(HChangeD()));
- disconnect(imgDpiY, SIGNAL(valueChanged(double)), this, SLOT(VChangeD()));
- if (keepImageDPIRatioButton->isChecked())
- {
- imgDpiY->setValue(imgDpiX->value());
- NewLocalDpi();
- keepImageWHRatioButton->setChecked(true);
- }
- else
- keepImageWHRatioButton->setChecked(false);
- connect(imgDpiX, SIGNAL(valueChanged(double)), this, SLOT(HChangeD()));
- connect(imgDpiY, SIGNAL(valueChanged(double)), this, SLOT(VChangeD()));
-}
-
-void PropertiesPalette::HChangeD()
-{
- disconnect(imgDpiX, SIGNAL(valueChanged(double)), this, SLOT(HChangeD()));
- disconnect(imgDpiY, SIGNAL(valueChanged(double)), this, SLOT(VChangeD()));
- if (keepImageDPIRatioButton->isChecked())
- imgDpiY->setValue(imgDpiX->value());
- NewLocalDpi();
- connect(imgDpiX, SIGNAL(valueChanged(double)), this, SLOT(HChangeD()));
- connect(imgDpiY, SIGNAL(valueChanged(double)), this, SLOT(VChangeD()));
-}
-
-void PropertiesPalette::VChangeD()
-{
- disconnect(imgDpiX, SIGNAL(valueChanged(double)), this, SLOT(HChangeD()));
- disconnect(imgDpiY, SIGNAL(valueChanged(double)), this, SLOT(VChangeD()));
- if (keepImageDPIRatioButton->isChecked())
- imgDpiX->setValue(imgDpiY->value());
- NewLocalDpi();
- connect(imgDpiX, SIGNAL(valueChanged(double)), this, SLOT(HChangeD()));
- connect(imgDpiY, SIGNAL(valueChanged(double)), this, SLOT(VChangeD()));
}
void PropertiesPalette::NewAlignement(int a)
@@ -3131,111 +2643,6 @@
TxStroke->view()->setMinimumWidth(TxStroke->view()->maximumViewportSize().width() + 24);
}
-void PropertiesPalette::updateCmsList()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if (HaveDoc)
- {
- if (ScCore->haveCMS() && doc->cmsSettings().CMSinUse)
- GroupBoxCM->show();
- else
- {
- GroupBoxCM->hide();
- return;
- }
- disconnect(InputP, SIGNAL(activated(const QString&)), this, SLOT(ChangeProfile(const QString&)));
- disconnect(MonitorI, SIGNAL(activated(int)), this, SLOT(ChangeIntent()));
- InputP->clear();
- if (HaveItem)
- {
- if (CurItem->pixm.imgInfo.colorspace == ColorSpaceCMYK)
- {
- ProfilesL::Iterator itP;
- ProfilesL::Iterator itPend=ScCore->InputProfilesCMYK.end();
- for (itP = ScCore->InputProfilesCMYK.begin(); itP != itPend; ++itP)
- {
- InputP->addItem(itP.key());
- if (itP.key() == CurItem->IProfile)
- InputP->setCurrentIndex(InputP->count()-1);
- }
- if (!ScCore->InputProfilesCMYK.contains(CurItem->IProfile))
- {
- InputP->addItem(CurItem->IProfile);
- InputP->setCurrentIndex(InputP->count()-1);
- }
- else
- {
- if (!CurItem->EmProfile.isEmpty())
- InputP->addItem(CurItem->EmProfile);
- }
- }
- else
- {
- ProfilesL::Iterator itP;
- ProfilesL::Iterator itPend=ScCore->InputProfiles.end();
- for (itP = ScCore->InputProfiles.begin(); itP != itPend; ++itP)
- {
- InputP->addItem(itP.key());
- if (itP.key() == CurItem->IProfile)
- InputP->setCurrentIndex(InputP->count()-1);
- }
- if (!ScCore->InputProfiles.contains(CurItem->IProfile))
- {
- InputP->addItem(CurItem->IProfile);
- InputP->setCurrentIndex(InputP->count()-1);
- }
- else
- {
- if (!CurItem->EmProfile.isEmpty())
- InputP->addItem(CurItem->EmProfile);
- }
- }
- MonitorI->setCurrentIndex(CurItem->IRender);
- }
- connect(MonitorI, SIGNAL(activated(int)), this, SLOT(ChangeIntent()));
- connect(InputP, SIGNAL(activated(const QString&)), this, SLOT(ChangeProfile(const QString&)));
- }
-}
-
-void PropertiesPalette::ChangeProfile(const QString& prn)
-{
- if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
- return;
- doc->itemSelection_SetColorProfile(InputP->currentText());
-}
-
-void PropertiesPalette::ChangeIntent()
-{
- if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
- return;
- doc->itemSelection_SetRenderIntent(MonitorI->currentIndex());
-}
-
-void PropertiesPalette::ChangeCompressionMethod()
-{
- if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
- return;
- doc->itemSelection_SetCompressionMethod(CompressionMethod->currentIndex() - 1);
-}
-
-void PropertiesPalette::ChangeCompressionQuality()
-{
- if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
- return;
- doc->itemSelection_SetCompressionQuality(CompressionQuality->currentIndex() - 1);
-}
-
-void PropertiesPalette::ShowCMS()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if (HaveItem)
- updateCmsList();
- else
- GroupBoxCM->setVisible(ScCore->haveCMS() && doc->cmsSettings().CMSinUse);
-}
-
void PropertiesPalette::newTxtFill()
{
if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
@@ -3489,6 +2896,7 @@
xyzPal->languageChange();
shapePal->languageChange();
+ imagePal->languageChange();
EditShape2->setText( tr("&Edit..."));
SRect2->setText( tr("Shape:"));
@@ -3539,53 +2947,12 @@
flopItem->setText(0, tr("First Line Offset"));
DistanceItem->setText(0, tr("Columns & Text Distances"));
Distance2Item->setText(0, tr("Path Text Properties"));
- imagePageNumberLabel->setText( tr("&Page Number:"));
- FreeScale->setText( tr("&Free Scaling"));
- imgDPIXLabel->setText( tr("Actual X-DPI:"));
- imgDPIYLabel->setText( tr("Actual Y-DPI:"));
- xposImgLabel->setText( tr("&X-Pos:"));
- yposImgLabel->setText( tr("&Y-Pos:"));
- xscaleLabel->setText( tr("X-Sc&ale:"));
- yscaleLabel->setText( tr("Y-Scal&e:"));
- imageRotationLabel->setText( tr("Rotation:"));
- FrameScale->setText( tr("Scale &To Frame Size"));
- Aspect->setText( tr("P&roportional"));
- EditEffects->setText( tr("Image Effects"));
- EditPSDProps->setText( tr("Extended Image Properties"));
- TextCms1->setText( tr("Input Profile:"));
- TextCms2->setText( tr("Rendering Intent:"));
- TextCompressionMethod->setText( tr("PDF Compression Method:"));
- TextCompressionQuality->setText( tr("PDF Compression Quality:"));
int oldLineSpacingMode = lineSpacingModeCombo->currentIndex();
lineSpacingModeCombo->clear();
lineSpacingModeCombo->addItem( tr("Fixed Linespacing"));
lineSpacingModeCombo->addItem( tr("Automatic Linespacing"));
lineSpacingModeCombo->addItem( tr("Align to Baseline Grid"));
lineSpacingModeCombo->setCurrentIndex(oldLineSpacingMode);
- 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 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 oldLineStyle = LStyle->currentIndex();
LStyle->clear();
LStyle->updateList();
@@ -3638,10 +3005,6 @@
ChBase->setSuffix(pctSuffix);
ChScale->setSuffix(pctSuffix);
ChScaleV->setSuffix(pctSuffix);
- imageXScaleSpinBox->setSuffix(pctSuffix);
- imageYScaleSpinBox->setSuffix(pctSuffix);
- imgDpiX->setSuffix("");
- imgDpiY->setSuffix("");
Extra->setSuffix(pctSuffix);
minWordTrackingSpinBox->setSuffix(pctSuffix);
normWordTrackingSpinBox->setSuffix(pctSuffix);
@@ -3660,8 +3023,6 @@
LSize->setSuffix(ein);
LSize->setSpecialValueText( tr("Hairline"));
- imageXOffsetSpinBox->setSuffix(ein);
- imageYOffsetSpinBox->setSuffix(ein);
dGap->setSuffix(ein);
DLeft->setSuffix(ein);
DTop->setSuffix(ein);
@@ -3725,21 +3086,6 @@
DLeft->setToolTip( tr("Distance of text from left of frame"));
DRight->setToolTip( tr("Distance of text from right of frame"));
TabsButton->setToolTip( tr("Edit tab settings of text frame..."));
-
- FreeScale->setToolTip( tr("Allow the image to be a different size to the frame"));
- imageXOffsetSpinBox->setToolTip( tr("Horizontal offset of image within frame"));
- imageYOffsetSpinBox->setToolTip( tr("Vertical offset of image within frame"));
- 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"));
- 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"));
}
Modified: branches/ScribusOIF/scribus/ui/propertiespalette.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/scribus/ui/propertiespalette.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette.h (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette.h Thu Oct 14 21:18:01 2010
@@ -55,6 +55,7 @@
class DashEditor;
class FontComboH;
class NameWidget;
+class PropertiesPalette_Image;
class PropertiesPalette_Shape;
class PropertiesPalette_XYZ;
class ScComboBox;
@@ -83,9 +84,7 @@
const VGradient getMaskGradientGroup();
void updateColorList();
void setGradientEditMode(bool);
- void updateCmsList();
void setTextFlowMode(PageItem::TextFlowMode mode);
- void ShowCMS();
/*! \brief fills the langs combobox in language specific order
\author 10/07/2004 - Petr Vanek - rewritten to fix #1185.
Uses sortQStringList from utils.cpp - STL!
@@ -98,6 +97,7 @@
// commmited
+ PropertiesPalette_Image* imagePal;
PropertiesPalette_Shape* shapePal;
PropertiesPalette_XYZ* xyzPal;
Cpalette *Cpal;
@@ -133,9 +133,6 @@
void setFontFace(const QString&);
void setExtra(double e);
void setTextToFrameDistances(double left, double top, double bottom, double right);
- void ChangeScaling();
- void setImgRotation(double rot);
- void setScaleAndOffset(double scx, double scy, double x, double y);
void setLineWidth(double s);
void setLIvalue(Qt::PenStyle p, Qt::PenCapStyle pc, Qt::PenJoinStyle pj);
void setFlop(FirstLineOffsetPolicy);
@@ -184,17 +181,6 @@
void NewGap();
void NewSize();
void NewTracking();
- void NewPage();
- void ToggleKette();
- void HChange();
- void VChange();
- void ToggleKetteD();
- void HChangeD();
- void VChangeD();
- void NewLocalXY();
- void NewLocalSC();
- void NewLocalDpi();
- void NewLocalRot();
void NewLineWidth();
void NewLineStyle();
void NewLineJoin();
@@ -215,18 +201,12 @@
void doClearCStyle();
void doClearPStyle();
void handleShapeEdit2();
- void handleImageEffects();
- void handleExtImgProperties();
void handlePathType();
void handlePathFlip();
void handlePathLine();
void handlePathDist();
void handlePathOffs();
void handleOverprint(int);
- void ChangeProfile(const QString& prn);
- void ChangeIntent();
- void ChangeCompressionMethod();
- void ChangeCompressionQuality();
void NewLanguage();
void HandleTLines();
void setStartArrow(int id);
@@ -274,16 +254,10 @@
QGridLayout* layout41c;
QHBoxLayout* Layout1;
QHBoxLayout* Layout1AL;
- QGridLayout* layout43;
- QVBoxLayout* Layout24;
- QHBoxLayout* Layout18;
QGridLayout* Layout12_2;
- QGridLayout* imagePageNumberSelector;
QGridLayout* DistanceLayout;
QGridLayout* DistanceLayout2;
QGridLayout* GroupBox3aLayout;
- QVBoxLayout* GroupBoxCMLayout;
- QVBoxLayout* GroupBoxCompressionLayout;
QVBoxLayout* textFlowOptionsLayout2;
QHBoxLayout* layout23;
QHBoxLayout* layout24;
@@ -320,11 +294,6 @@
QLabel* trackingLabel;
QLabel* fontsizeLabel;
QLabel* lineSpacingLabel;
- QLabel* yscaleLabel;
- QLabel* xscaleLabel;
- QLabel* xposImgLabel;
- QLabel* yposImgLabel;
- QLabel* imageRotationLabel;
QLabel* linewidthLabel;
QLabel* endingsLabel;
QLabel* linetypeLabel;
@@ -336,17 +305,10 @@
QLabel* charStyleLabel;
QLabel* langLabel;
QLabel* LineModeT;
- QLabel* TextCms1;
- QLabel* TextCms2;
- QLabel* TextCompressionMethod;
- QLabel* TextCompressionQuality;
QLabel* edgesLabel;
QLabel* ChBaseTxt;
QLabel* ScaleTxt;
QLabel* ScaleTxtV;
- QLabel* imagePageNumberLabel;
- QLabel* imgDPIXLabel;
- QLabel* imgDPIYLabel;
QLabel* startArrowText;
QLabel* endArrowText;
QLabel* TransTxt;
@@ -364,8 +326,6 @@
StyleSelect* SeStyle;
AlignSelect* GroupAlign;
- LinkButton* keepImageWHRatioButton;
- LinkButton* keepImageDPIRatioButton;
LineCombo* LStyle;
ShadeButton *PM1;
@@ -385,8 +345,6 @@
QToolBox* TabStack;
QStackedWidget* TabStack3;
- QFrame* GroupBoxCM;
- QFrame* GroupBoxCompression;
QGroupBox* TLines;
QGroupBox* GroupBox3a;
QGroupBox* TransGroup;
@@ -396,7 +354,7 @@
QToolButton* textFlowUsesBoundingBox2;
QToolButton* textFlowUsesContourLine2;
QToolButton* textFlowUsesImageClipping2;
- QCheckBox* Aspect;
+
QCheckBox* flippedPathText;
QCheckBox* showcurveCheckBox;
QCheckBox* TopLine;
@@ -406,10 +364,6 @@
ScComboBox* pathTextType;
QComboBox* langCombo;
- QComboBox* InputP;
- QComboBox* MonitorI;
- QComboBox* CompressionMethod;
- QComboBox* CompressionQuality;
QComboBox* LineMode;
QComboBox* lineSpacingModeCombo;
ColorCombo* TxStroke;
@@ -435,13 +389,6 @@
ScrSpinBox* Size;
ScrSpinBox* LineSp;
ScrSpinBox* Extra;
- ScrSpinBox* imageYOffsetSpinBox;
- ScrSpinBox* imageXOffsetSpinBox;
- ScrSpinBox* imageRotation;
- ScrSpinBox* imageYScaleSpinBox;
- ScrSpinBox* imageXScaleSpinBox;
- ScrSpinBox* imgDpiX;
- ScrSpinBox* imgDpiY;
ScrSpinBox* LSize;
ScrSpinBox* ChScale;
ScrSpinBox* ChScaleV;
@@ -450,21 +397,16 @@
ScrSpinBox* normWordTrackingSpinBox;
ScrSpinBox* minGlyphExtSpinBox;
ScrSpinBox* maxGlyphExtSpinBox;
- QSpinBox* imagePageNumber;
QSpinBox* DCol;
QSpinBox* TransSpin;
QSpinBox* startArrowScaleSpin;
QSpinBox* endArrowScaleSpin;
- QRadioButton* FreeScale;
- QRadioButton* FrameScale;
QRadioButton* flopRealHeight;
QRadioButton* flopFontAscent;
QRadioButton* flopLineSpacing;
QButtonGroup* flopGroup;
-
- QFrame* Frame4;
QMenu* lineSpacingPop;
@@ -472,8 +414,6 @@
QToolButton* charStyleClear;
QToolButton* paraStyleClear;
QToolButton* EditShape2;
- QToolButton* EditEffects;
- QToolButton* EditPSDProps;
ScTreeWidget* TextTree;
QFrame* colorWidgets;
Modified: branches/ScribusOIF/scribus/ui/propertiespalette_shape.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_shape.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_shape.cpp Thu Oct 14 21:18:01 2010
@@ -194,6 +194,8 @@
pageLayout_2->addWidget( TabStack2 );
+ languageChange();
+
connect(textFlowOptionsB , SIGNAL(buttonClicked(int)), this, SLOT(handleTextFlow()));
connect(EditShape, SIGNAL(clicked()) , this, SLOT(handleShapeEdit()));
connect(RoundRect, SIGNAL(valueChanged(double)) , this, SLOT(handleCornerRadius()));
@@ -204,6 +206,17 @@
RoundRect->showValue(0);
TabStack2->setCurrentIndex(0);
}
+
+void PropertiesPalette_Shape::changeEvent(QEvent *e)
+{
+ if (e->type() == QEvent::LanguageChange)
+ {
+ languageChange();
+ return;
+ }
+ QWidget::changeEvent(e);
+}
+
void PropertiesPalette_Shape::setMainWindow(ScribusMainWindow* mw)
{
@@ -351,14 +364,14 @@
switch (itemType)
{
case -1:
+ setEnabled(false);
RoundRect->setEnabled(false);
RoundRect->showValue(0);
break;
case PageItem::ImageFrame:
case PageItem::LatexFrame:
case PageItem::OSGFrame:
-#ifdef HAVE_OSG
- if (i->asOSGFrame())
+ if (currItem->asOSGFrame())
{
setEnabled(false);
RoundRect->setEnabled(false);
@@ -367,7 +380,6 @@
}
else
{
-#endif
setEnabled(true);
if ((!currItem->ClipEdited) && ((currItem->FrameType == 0) || (currItem->FrameType == 2)))
RoundRect->setEnabled(!currItem->locked());
@@ -375,9 +387,7 @@
RoundRect->setEnabled(false);
if ((m_doc->m_Selection->itemAt(0)->FrameType == 0) || (m_doc->m_Selection->itemAt(0)->FrameType == 2))
RoundRect->setEnabled(!currItem->locked());
-#ifdef HAVE_OSG
}
-#endif
break;
case PageItem::TextFrame:
setEnabled(true);
@@ -478,7 +488,6 @@
RoundRect->setEnabled ((m_item->asPolygon()) && (!m_item->ClipEdited) && ((m_item->FrameType == 0) || (m_item->FrameType == 2)));
}
-#ifdef HAVE_OSG
if (m_item->asOSGFrame())
{
setEnabled(false);
@@ -486,7 +495,6 @@
EditShape->setEnabled(false);
SCustom->setEnabled(false);
}
-#endif
if (m_item->asSymbolFrame())
{
Modified: branches/ScribusOIF/scribus/ui/propertiespalette_shape.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/scribus/ui/propertiespalette_shape.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_shape.h (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_shape.h Thu Oct 14 21:18:01 2010
@@ -6,9 +6,6 @@
*/
#ifndef PROPERTIESPALETTE_SHAPE_H
#define PROPERTIESPALETTE_SHAPE_H
-
-#include <QListWidgetItem>
-#include <QLineEdit>
class QButtonGroup;
class QCheckBox;
@@ -34,35 +31,20 @@
#include "scribusapi.h"
-#include "scrpalettebase.h"
#include "scrspinbox.h"
#include "pageitem.h"
-#include "page.h"
#include "linkbutton.h"
#include "linecombo.h"
-#include "spalette.h"
-#include "alignselect.h"
#include "shadebutton.h"
#include "sclistboxpixmap.h"
#include "scguardedptr.h"
#include "sctreewidget.h"
-class ArrowChooser;
class Autoforms;
-class BasePointWidget;
-class ColorCombo;
-class Cpalette;
-class DashEditor;
-class FontComboH;
-class NameWidget;
-class PropertiesPalette_XYZ;
class ScComboBox;
class ScribusDoc;
class ScribusMainWindow;
class Selection;
-class StyleSelect;
-class Tpalette;
-class UserActionSniffer;
class SCRIBUS_API PropertiesPalette_Shape : public QWidget
{
@@ -71,6 +53,8 @@
public:
PropertiesPalette_Shape(QWidget* parent);
~PropertiesPalette_Shape() {};
+
+ virtual void changeEvent(QEvent *e);
Autoforms* SCustom;
ScrSpinBox* RoundRect;
@@ -127,8 +111,6 @@
QWidget* page_2a;
QWidget* page_2c;
-
-
public slots:
void setMainWindow(ScribusMainWindow *mw);
Modified: branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp Thu Oct 14 21:18:01 2010
@@ -261,11 +261,6 @@
Rotation->showValue(0);
}
-void PropertiesPalette_XYZ::closeEvent(QCloseEvent *closeEvent)
-{
- QWidget::closeEvent(closeEvent);
-}
-
void PropertiesPalette_XYZ::setMainWindow(ScribusMainWindow* mw)
{
m_ScMW = mw;
@@ -534,13 +529,11 @@
if ((m_item->Groups.count() != 0) && (isGroup))
DoUnGroup->setEnabled(true);
}
-#ifdef HAVE_OSG
if (m_item->asOSGFrame())
{
setEnabled(true);
Rotation->setEnabled(false);
}
-#endif
if (m_item->asSymbolFrame())
{
setEnabled(true);
@@ -651,7 +644,7 @@
case PageItem::LatexFrame:
case PageItem::OSGFrame:
#ifdef HAVE_OSG
- if (i->asOSGFrame())
+ if (currItem->asOSGFrame())
{
setEnabled(true);
Rotation->setEnabled(false);
Modified: branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h Thu Oct 14 21:18:01 2010
@@ -61,7 +61,6 @@
~PropertiesPalette_XYZ() {};
virtual void changeEvent(QEvent *e);
- virtual void closeEvent(QCloseEvent *closeEvent);
/** @brief Returns true if there is a user action going on at the moment of call. */
bool userActionOn(); // not yet implemented!!! This is needed badly.
Modified: branches/ScribusOIF/win32/vc8/Scribus.sln
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/win32/vc8/Scribus.sln
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.sln (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.sln Thu Oct 14 21:18:01 2010
@@ -3,6 +3,7 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-main", "Scribus.vcproj", "{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}"
ProjectSection(ProjectDependencies) = postProject
{50C264A1-2CE7-46A3-8C79-CBC714C49510} = {50C264A1-2CE7-46A3-8C79-CBC714C49510}
+ {D0F51AA4-9D98-4057-94B0-47B46D44DA1D} = {D0F51AA4-9D98-4057-94B0-47B46D44DA1D}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svgexport", "svgexport\svgexport.vcproj", "{9652EA11-AFA0-4CDF-88AC-7912C653EFE6}"
@@ -161,14 +162,14 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pathalongpath", "pathalongpath\pathalongpath.vcproj", "{CAF6D555-0E2E-4ABB-9585-00860B8B183E}"
ProjectSection(ProjectDependencies) = postProject
- {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
{6AC5EDDC-2540-47E0-873E-FE40FB06FBFD} = {6AC5EDDC-2540-47E0-873E-FE40FB06FBFD}
+ {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshdistortion", "meshdistortion\meshdistortion.vcproj", "{2B610023-D3A6-4EC3-B7D5-868ED3B9321E}"
ProjectSection(ProjectDependencies) = postProject
- {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
{6AC5EDDC-2540-47E0-873E-FE40FB06FBFD} = {6AC5EDDC-2540-47E0-873E-FE40FB06FBFD}
+ {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pathconnect", "pathconnect\pathconnect.vcproj", "{EDE59DB3-794A-4E3F-942A-98189DF6DCE2}"
@@ -193,8 +194,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpgimport", "wpgimport\wpgimport.vcproj", "{A2A76BE2-A592-43A1-B087-068D6E082340}"
ProjectSection(ProjectDependencies) = postProject
+ {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
{50C264A1-2CE7-46A3-8C79-CBC714C49510} = {50C264A1-2CE7-46A3-8C79-CBC714C49510}
- {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pctimport", "pctimport\pctimport.vcproj", "{DB5B98E3-34C2-4909-87C6-4950BCFC9CA3}"
@@ -233,6 +234,8 @@
ProjectSection(ProjectDependencies) = postProject
{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-harfbuzz", "scribus-harfbuzz\scribus-harbuzz.vcproj", "{D0F51AA4-9D98-4057-94B0-47B46D44DA1D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -626,6 +629,14 @@
{A46C3979-E6DD-408F-BB9E-ED5EC3292AFA}.Release-arthur|Win32.Build.0 = Release-arthur|Win32
{A46C3979-E6DD-408F-BB9E-ED5EC3292AFA}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
{A46C3979-E6DD-408F-BB9E-ED5EC3292AFA}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
+ {D0F51AA4-9D98-4057-94B0-47B46D44DA1D}.Debug-arthur|Win32.ActiveCfg = Debug-arthur|Win32
+ {D0F51AA4-9D98-4057-94B0-47B46D44DA1D}.Debug-arthur|Win32.Build.0 = Debug-arthur|Win32
+ {D0F51AA4-9D98-4057-94B0-47B46D44DA1D}.Debug-cairo|Win32.ActiveCfg = Debug-cairo|Win32
+ {D0F51AA4-9D98-4057-94B0-47B46D44DA1D}.Debug-cairo|Win32.Build.0 = Debug-cairo|Win32
+ {D0F51AA4-9D98-4057-94B0-47B46D44DA1D}.Release-arthur|Win32.ActiveCfg = Release-arthur|Win32
+ {D0F51AA4-9D98-4057-94B0-47B46D44DA1D}.Release-arthur|Win32.Build.0 = Release-arthur|Win32
+ {D0F51AA4-9D98-4057-94B0-47B46D44DA1D}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
+ {D0F51AA4-9D98-4057-94B0-47B46D44DA1D}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15536&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.vcproj Thu Oct 14 21:18:01 2010
@@ -58,7 +58,7 @@
Optimization="0"
InlineFunctionExpansion="0"
EnableIntrinsicFunctions="false"
- AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(CAIRO_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
+ AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;..\..\scribus\third_party\harfbuzz\src;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(CAIRO_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CAIRO;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
IgnoreStandardIncludePath="false"
MinimalRebuild="true"
@@ -84,7 +84,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib cairo2d.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-wpg.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib cairo2d.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-harfbuzz.lib scribus-wpg.lib"
OutputFile="$(OutDir)\Scribus.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(OutDir)\.""
@@ -163,7 +163,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(CAIRO_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
+ AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;..\..\scribus\third_party\harfbuzz\src;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(CAIRO_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;;HAVE_CAIRO;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
StringPooling="true"
RuntimeLibrary="2"
@@ -188,7 +188,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib freetype.lib cairo2.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-wpg.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib freetype.lib cairo2.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-harfbuzz.lib scribus-wpg.lib"
OutputFile="$(OutDir)\Scribus.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(OutDir)\.""
@@ -266,7 +266,7 @@
Optimization="0"
InlineFunctionExpansion="0"
EnableIntrinsicFunctions="false"
- AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(CAIRO_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
+ AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;..\..\scribus\third_party\harfbuzz\src;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(CAIRO_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
IgnoreStandardIncludePath="false"
MinimalRebuild="true"
@@ -292,7 +292,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib cairo2d.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-wpg.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib cairo2d.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-harfbuzz.lib scribus-wpg.lib"
OutputFile="$(OutDir)\Scribus.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(OutDir)\.""
@@ -371,7 +371,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(CAIRO_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
+ AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;..\..\scribus\third_party\harfbuzz\src;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(CAIRO_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
StringPooling="true"
RuntimeLibrary="2"
@@ -396,7 +396,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib freetype.lib cairo2.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-wpg.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib freetype.lib cairo2.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-harfbuzz.lib scribus-wpg.lib"
OutputFile="$(OutDir)\Scribus.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(OutDir)\.""
@@ -875,6 +875,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\fonts\fontfeatureset.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\fontlistmodel.cpp"
>
</File>
@@ -1488,6 +1492,10 @@
</File>
<File
RelativePath="..\..\scribus\ui\propertiespalette.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\scribus\ui\propertiespalette_image.cpp"
>
</File>
<File
@@ -4396,6 +4404,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\scribus\fonts\fontfeatureset.h"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\fontlistmodel.h"
>
<FileConfiguration
@@ -8344,6 +8356,38 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\scribus\ui\propertiespalette_image.h"
+ >
+ <FileConfiguration
+ Name="Debug-cairo|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release-cairo|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug-arthur|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release-arthur|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\scribus\ui\propertiespalette_shape.h"
>
<FileConfiguration
@@ -13026,6 +13070,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\ui\moc_propertiespalette_image.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\ui\moc_propertiespalette_shape.cpp"
>
</File>
More information about the scribus-commit
mailing list