Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 14729 → Rev 14730

/trunk/Scribus/scribus/prefsmanager.cpp
281,7 → 281,7
appPrefs.itemToolPrefs.lineWidth = 1;
appPrefs.itemToolPrefs.lineStartArrow = 0;
appPrefs.itemToolPrefs.lineEndArrow = 0;
appPrefs.opToolPrefs.magMin = 10;
appPrefs.opToolPrefs.magMin = 1;
appPrefs.opToolPrefs.magMax = 3200;
appPrefs.opToolPrefs.magStep = 200;
appPrefs.itemToolPrefs.imageFillColor = CommonStrings::None;
1963,7 → 1963,7
appPrefs.itemToolPrefs.shapeLineColorShade = dc.attribute("PENSHADE").toInt();
appPrefs.itemToolPrefs.lineColorShade = dc.attribute("LINESHADE").toInt();
appPrefs.itemToolPrefs.shapeFillColorShade = dc.attribute("BRUSHSHADE").toInt();
appPrefs.opToolPrefs.magMin = dc.attribute("MAGMIN", "10").toInt();
appPrefs.opToolPrefs.magMin = dc.attribute("MAGMIN", "1").toInt();
appPrefs.opToolPrefs.magMax = dc.attribute("MAGMAX", "3200").toInt();
appPrefs.opToolPrefs.magStep = dc.attribute("MAGSTEP", "200").toInt();
//CB Reset prefs zoom step value to 200% instead of old values.
/trunk/Scribus/scribus/scribusview.cpp
191,7 → 191,7
// setCurrentComboItem(previewQualitySwitcher, tr("Normal"));
previewQualitySwitcher->setCurrentIndex(Prefs->itemToolPrefs.imageLowResType);
 
zoomSpinBox = new ScrSpinBox( 10, 3200, this, 6 );
zoomSpinBox = new ScrSpinBox( 1, 3200, this, 6 );
zoomSpinBox->setTabAdvance(false);
zoomSpinBox->setFont(fo);
zoomSpinBox->setValue( 100 );
/trunk/Scribus/scribus/ui/prefs_operatortoolsbase.ui
67,8 → 67,8
<rect>
<x>0</x>
<y>0</y>
<width>505</width>
<height>365</height>
<width>535</width>
<height>390</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
104,7 → 104,7
<string> %</string>
</property>
<property name="minimum">
<number>10</number>
<number>1</number>
</property>
<property name="maximum">
<number>3200</number>
173,8 → 173,8
<rect>
<x>0</x>
<y>0</y>
<width>505</width>
<height>365</height>
<width>165</width>
<height>186</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
/trunk/Scribus/scribus/ui/tabtools.cpp
444,7 → 444,7
subTabZoomLayout->addWidget( zoomHeadLine, 0, 0, 1, 2, Qt::AlignHCenter | Qt::AlignTop );
minimumZoom = new QSpinBox( subTabZoom);
minimumZoom->setMaximum( 3200 );
minimumZoom->setMinimum( 10 );
minimumZoom->setMinimum( 1 );
minimumZoom->setSuffix( tr( " %" ) );
subTabZoomLayout->addWidget( minimumZoom, 1, 1, Qt::AlignLeft );
textLabel21b = new QLabel( tr( "Mi&nimum:" ), subTabZoom);
/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
406,7 → 406,7
m_Doc->itemToolPrefs.shapeLineColorShade = dc.attribute("PENSHADE", "100").toInt();
m_Doc->itemToolPrefs.lineColorShade = dc.attribute("LINESHADE", "100").toInt();
m_Doc->itemToolPrefs.shapeFillColorShade = dc.attribute("BRUSHSHADE", "100").toInt();
m_Doc->opToolPrefs.magMin = dc.attribute("MAGMIN", "10").toInt();
m_Doc->opToolPrefs.magMin = dc.attribute("MAGMIN", "1").toInt();
m_Doc->opToolPrefs.magMax = dc.attribute("MAGMAX", "3200").toInt();
m_Doc->opToolPrefs.magStep = dc.attribute("MAGSTEP", "200").toInt();
//CB Reset doc zoom step value to 200% instead of old values.
/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
914,7 → 914,7
doc->itemToolPrefs.shapeLineColorShade = attrs.valueAsInt("PENSHADE", 100);
doc->itemToolPrefs.lineColorShade = attrs.valueAsInt("LINESHADE", 100);
doc->itemToolPrefs.shapeFillColorShade = attrs.valueAsInt("BRUSHSHADE", 100);
doc->opToolPrefs.magMin = attrs.valueAsInt("MAGMIN", 10);
doc->opToolPrefs.magMin = attrs.valueAsInt("MAGMIN", 1);
doc->opToolPrefs.magMax = attrs.valueAsInt("MAGMAX", 3200);
doc->opToolPrefs.magStep = attrs.valueAsInt("MAGSTEP", 200);
doc->opToolPrefs.dispX = attrs.valueAsDouble("dispX", 10.0);
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
911,7 → 911,7
doc->itemToolPrefs.shapeLineColorShade = attrs.valueAsInt("PENSHADE", 100);
doc->itemToolPrefs.lineColor = attrs.valueAsInt("LINESHADE", 100);
doc->itemToolPrefs.shapeFillColorShade = attrs.valueAsInt("BRUSHSHADE", 100);
doc->opToolPrefs.magMin = attrs.valueAsInt("MAGMIN", 10);
doc->opToolPrefs.magMin = attrs.valueAsInt("MAGMIN", 1);
doc->opToolPrefs.magMax = attrs.valueAsInt("MAGMAX", 3200);
doc->opToolPrefs.magStep = attrs.valueAsInt("MAGSTEP", 200);
doc->opToolPrefs.dispX = attrs.valueAsDouble("dispX", 10.0);