Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 5900 → Rev 5901

/branches/Version13x/Scribus/scribus/guidemanager.cpp
22,16 → 22,6
* *
***************************************************************************/
 
#include "guidemanager.h"
#include "guidemanager.moc"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "selection.h"
#include "page.h"
#include "units.h"
#include "commonstrings.h"
#include "pagestructs.h"
 
#include <qradiobutton.h>
#include <qlayout.h>
#include <qcursor.h>
48,10 → 38,18
#include <qinputdialog.h>
#include <qtabwidget.h>
 
#include "guidemanager.h"
#include "guidemanager.moc"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "selection.h"
#include "page.h"
#include "units.h"
#include "util.h"
#include "commonstrings.h"
#include "pagestructs.h"
 
extern QPixmap loadIcon(QString nam);
 
 
int GuideListItem::compare(QListViewItem *i, int col, bool asc) const
{
if (col == 0)
73,10 → 71,10
//ScrPaletteBase(parent, "GuideManager", false, 0)
{
setIcon(loadIcon("AppIcon.png"));
/* horizontalAutoGapSpin->setMinValue(0.0);
horizontalAutoGapSpin->setMinValue(0.0);
horizontalAutoGapSpin->setMaxValue(100.0);
verticalAutoGapSpin->setMinValue(0.0);
verticalAutoGapSpin->setMaxValue(100.0);*/
verticalAutoGapSpin->setMaxValue(100.0);
 
// signals that cannot be defined in designer (mspinbox related)
connect(horizontalAutoGapSpin, SIGNAL(valueChanged(int)), this, SLOT(horizontalAutoGapSpin_valueChanged(int)));
112,8 → 110,8
suffix = unitGetSuffixFromIndex(docUnitIndex);
horizontalAutoGapSpin->setSuffix(suffix);
verticalAutoGapSpin->setSuffix(suffix);
// horizontalAutoGapSpin->setDecimals(docUnitDecimals);
// verticalAutoGapSpin->setDecimals(docUnitDecimals);
horizontalAutoGapSpin->setDecimals(docUnitDecimals);
verticalAutoGapSpin->setDecimals(docUnitDecimals);
}
 
bool GuideManager::deleteValueFormList(QListView *list)
/branches/Version13x/Scribus/scribus/guidemanagerbase.ui
306,7 → 306,7
</property>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout15</cstring>
<cstring>layout16</cstring>
</property>
<vbox>
<property name="name">
352,10 → 352,16
<string>Alt+S</string>
</property>
</widget>
<widget class="QSpinBox">
<widget class="MSpinBox">
<property name="name">
<cstring>horizontalAutoGapSpin</cstring>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>10</height>
</size>
</property>
</widget>
</vbox>
</widget>
420,10 → 426,16
<string>Alt+G</string>
</property>
</widget>
<widget class="QSpinBox">
<widget class="MSpinBox">
<property name="name">
<cstring>verticalAutoGapSpin</cstring>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>10</height>
</size>
</property>
</widget>
</vbox>
</widget>
518,6 → 530,22
</widget>
<customwidgets>
<customwidget>
<class>MSpinBox</class>
<header location="local">mspinbox.h</header>
<sizehint>
<width>-1</width>
<height>-1</height>
</sizehint>
<container>0</container>
<sizepolicy>
<hordata>5</hordata>
<verdata>5</verdata>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<pixmap>image0</pixmap>
</customwidget>
<customwidget>
<class>ScrPaletteBase</class>
<header location="local">scrpalettebase.h</header>
<sizehint>
683,5 → 711,7
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>scrpalettebase.h</includehint>
<includehint>mspinbox.h</includehint>
<includehint>mspinbox.h</includehint>
</includehints>
</UI>