Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Added initial selection info to NewLabelDialog.

Browse Source
This commit is contained in:
Jim Evins
2013-11-15 00:54:31 -05:00
parent 9dce9addf1
commit 932ab5b65b
13 changed files with 209 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/NewLabelDialog.cpp
+36 -1
View File
@@ -87,7 +87,42 @@ namespace gLabels
{
// Set template to preview
TemplatePickerItem *tItem = dynamic_cast<TemplatePickerItem*>(selectedItems.first());
simplePreview->setTemplate( tItem->tmplate() );
const libglabels::Template *tmplate = tItem->tmplate();
const libglabels::Frame *frame = tmplate->frames().first();
simplePreview->setTemplate( tmplate );
const libglabels::Vendor *vendor = libglabels::Db::lookupVendorFromName( tmplate->brand() );
if ( (vendor != NULL) && (vendor->url() != NULL) )
{
QString markup = "<a href='" + vendor->url() + "'>" + vendor->name() + "</a>";
vendorLabel->setText( markup );
}
else
{
vendorLabel->setText( tmplate->brand() );
}
if ( tmplate->productUrl() != NULL )
{
QString markup = "<a href='" + tmplate->productUrl() + "'>" + tmplate->part() + "</a>";
partLabel->setText( markup );
}
else
{
partLabel->setText( tmplate->part() );
}
descriptionLabel->setText( tmplate->description() );
QString pgSizeString = libglabels::Db::lookupPaperNameFromId( tmplate->paperId() );
pageSizeLabel->setText( pgSizeString );
QString labelSizeString = frame->sizeDescription( libglabels::Units::inch() );
labelSizeLabel->setText( labelSizeString );
QString layoutString = frame->layoutDescription();
layoutLabel->setText( layoutString );
}
}
app/ui/NewLabelDialog.ui
+127 -17
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1036</width>
<height>735</height>
<width>958</width>
<height>759</height>
</rect>
</property>
<property name="windowTitle">
@@ -133,7 +133,7 @@
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Preview</string>
<string>Selection info</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
@@ -158,6 +158,129 @@
</property>
</widget>
</item>
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Vendor:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="vendorLabel">
<property name="text">
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Part #:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="partLabel">
<property name="text">
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="descriptionLabel">
<property name="text">
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Page size:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="pageSizeLabel">
<property name="text">
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Label size:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="labelSizeLabel">
<property name="text">
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Layout:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="layoutLabel">
<property name="text">
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Similar products:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QTextBrowser" name="similarBrowser">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>180</width>
<height>16777215</height>
</size>
</property>
<property name="acceptDrops">
<bool>false</bool>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="openLinks">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
@@ -170,7 +293,7 @@
</sizepolicy>
</property>
<property name="title">
<string>Label Orientation</string>
<string>Orientation</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="leftMargin">
@@ -253,19 +376,6 @@
</layout>
</item>
</layout>
<zorder>createButton</zorder>
<zorder>horizontalSpacer</zorder>
<zorder>orientationNormalRadio</zorder>
<zorder>orientationRotatedRadio</zorder>
<zorder>label</zorder>
<zorder></zorder>
<zorder>label</zorder>
<zorder>groupBox_2</zorder>
<zorder>groupBox_3</zorder>
<zorder>templatePicker</zorder>
<zorder>searchEntry</zorder>
<zorder>groupBox</zorder>
<zorder>horizontalSpacer</zorder>
</widget>
<customwidgets>
<customwidget>
libglabels/Frame.h
+4 -4
View File
@@ -52,9 +52,9 @@ namespace libglabels
inline const QString &id() const { return mId; }
inline int nLabels() const { return mNLabels; }
inline const QString &layoutDescription() { return mLayoutDescription; }
inline const QList<Layout*> &layouts() { return mLayouts; }
inline const QList<Markup*> &markups() { return mMarkups; }
inline const QString &layoutDescription() const { return mLayoutDescription; }
inline const QList<Layout*> &layouts() const { return mLayouts; }
inline const QList<Markup*> &markups() const { return mMarkups; }
QVector<Point> getOrigins() const;
@@ -64,7 +64,7 @@ namespace libglabels
virtual double w() const = 0;
virtual double h() const = 0;
virtual const QString &sizeDescription( Units *units ) = 0;
virtual const QString sizeDescription( const Units *units ) const = 0;
virtual bool isSimilarTo( Frame *other ) const = 0;
virtual const QPainterPath &path() const = 0;
libglabels/FrameCd.cpp
+9 -11
View File
@@ -29,26 +29,24 @@
namespace libglabels
{
const QString &FrameCd::sizeDescription( Units *units )
const QString FrameCd::sizeDescription( const Units *units ) const
{
if ( units->id() == "in" )
{
QString dStr = StrUtil::formatFraction( 2 * mR1 * units->unitsPerPoint() );
mSizeDescription = QString().sprintf( "%s %s %s",
qPrintable(dStr),
qPrintable(units->name()),
qPrintable(tr("diameter")) );
return QString().sprintf( "%s %s %s",
qPrintable(dStr),
qPrintable(units->name()),
qPrintable(tr("diameter")) );
}
else
{
mSizeDescription = QString().sprintf( "%.5g %s %s",
2 * mR1 * units->unitsPerPoint(),
qPrintable(units->name()),
qPrintable(tr("diameter")) );
return QString().sprintf( "%.5g %s %s",
2 * mR1 * units->unitsPerPoint(),
qPrintable(units->name()),
qPrintable(tr("diameter")) );
}
return mSizeDescription;
}
libglabels/FrameCd.h
+1 -3
View File
@@ -56,7 +56,7 @@ namespace libglabels
double w() const { return (mW == 0) ? 2*mR1 : mW; }
double h() const { return (mH == 0) ? 2*mR1 : mH; }
const QString &sizeDescription( Units *units );
const QString sizeDescription( const Units *units ) const;
bool isSimilarTo( Frame *other ) const;
const QPainterPath &path() const { return mPath; }
@@ -71,8 +71,6 @@ namespace libglabels
double mH;
double mWaste;
QString mSizeDescription;
QPainterPath mPath;
};
libglabels/FrameEllipse.cpp
+9 -9
View File
@@ -29,24 +29,24 @@
namespace libglabels
{
const QString &FrameEllipse::sizeDescription( Units *units )
const QString FrameEllipse::sizeDescription( const Units *units ) const
{
if ( units->id() == "in" )
{
QString wStr = StrUtil::formatFraction( mW * units->unitsPerPoint() );
QString hStr = StrUtil::formatFraction( mH * units->unitsPerPoint() );
mSizeDescription = QString().sprintf( "%s x %s %s",
qPrintable(wStr),
qPrintable(hStr),
qPrintable(units->name()) );
return QString().sprintf( "%s x %s %s",
qPrintable(wStr),
qPrintable(hStr),
qPrintable(units->name()) );
}
else
{
mSizeDescription = QString().sprintf( "%.5g x %.5g %s",
mW * units->unitsPerPoint(),
mH * units->unitsPerPoint(),
qPrintable(units->name()) );
return QString().sprintf( "%.5g x %.5g %s",
mW * units->unitsPerPoint(),
mH * units->unitsPerPoint(),
qPrintable(units->name()) );
}
}
libglabels/FrameEllipse.h
+1 -3
View File
@@ -51,7 +51,7 @@ namespace libglabels
double w() const { return mW; }
double h() const { return mH; }
const QString &sizeDescription( Units *units );
const QString sizeDescription( const Units *units ) const;
bool isSimilarTo( Frame *other ) const;
const QPainterPath &path() const { return mPath; }
@@ -62,8 +62,6 @@ namespace libglabels
double mH;
double mWaste;
QString mSizeDescription;
QPainterPath mPath;
};
libglabels/FrameRect.cpp
+9 -11
View File
@@ -29,27 +29,25 @@
namespace libglabels
{
const QString &FrameRect::sizeDescription( Units *units )
const QString FrameRect::sizeDescription( const Units *units ) const
{
if ( units->id() == "in" )
{
QString wStr = StrUtil::formatFraction( mW * units->unitsPerPoint() );
QString hStr = StrUtil::formatFraction( mH * units->unitsPerPoint() );
mSizeDescription = QString().sprintf( "%s x %s %s",
qPrintable(wStr),
qPrintable(hStr),
qPrintable(units->name()) );
return QString().sprintf( "%s x %s %s",
qPrintable(wStr),
qPrintable(hStr),
qPrintable(units->name()) );
}
else
{
mSizeDescription = QString().sprintf( "%.5g x %.5g %s",
mW * units->unitsPerPoint(),
mH * units->unitsPerPoint(),
qPrintable(units->name()) );
return QString().sprintf( "%.5g x %.5g %s",
mW * units->unitsPerPoint(),
mH * units->unitsPerPoint(),
qPrintable(units->name()) );
}
return mSizeDescription;
}
libglabels/FrameRect.h
+1 -3
View File
@@ -56,7 +56,7 @@ namespace libglabels
double w() const { return mW; }
double h() const { return mH; }
const QString &sizeDescription( Units *units );
const QString sizeDescription( const Units *units ) const;
bool isSimilarTo( Frame *other ) const;
const QPainterPath &path() const { return mPath; }
@@ -69,8 +69,6 @@ namespace libglabels
double mXWaste;
double mYWaste;
QString mSizeDescription;
QPainterPath mPath;
};
libglabels/FrameRound.cpp
+9 -11
View File
@@ -29,26 +29,24 @@
namespace libglabels
{
const QString &FrameRound::sizeDescription( Units *units )
const QString FrameRound::sizeDescription( const Units *units ) const
{
if ( units->id() == "in" )
{
QString dStr = StrUtil::formatFraction( 2 * mR * units->unitsPerPoint() );
mSizeDescription = QString().sprintf( "%s %s %s",
qPrintable(dStr),
qPrintable(units->name()),
qPrintable(tr("diameter")) );
return QString().sprintf( "%s %s %s",
qPrintable(dStr),
qPrintable(units->name()),
qPrintable(tr("diameter")) );
}
else
{
mSizeDescription = QString().sprintf( "%.5g %s %s",
2 * mR * units->unitsPerPoint(),
qPrintable(units->name()),
qPrintable(tr("diameter")) );
return QString().sprintf( "%.5g %s %s",
2 * mR * units->unitsPerPoint(),
qPrintable(units->name()),
qPrintable(tr("diameter")) );
}
return mSizeDescription;
}
libglabels/FrameRound.h
+1 -3
View File
@@ -51,7 +51,7 @@ namespace libglabels
double w() const { return 2*mR; }
double h() const { return 2*mR; }
const QString &sizeDescription( Units *units );
const QString sizeDescription( const Units *units ) const;
bool isSimilarTo( Frame *other ) const;
const QPainterPath &path() const { return mPath; }
@@ -61,8 +61,6 @@ namespace libglabels
double mR;
double mWaste;
QString mSizeDescription;
QPainterPath mPath;
};
libglabels/StrUtil.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ namespace libglabels
namespace StrUtil
{
QString &formatFraction( double x )
QString formatFraction( double x )
{
int i;
double product, remainder;
libglabels/StrUtil.h
+1 -1
View File
@@ -30,7 +30,7 @@ namespace libglabels
namespace StrUtil
{
QString &formatFraction( double x );
QString formatFraction( double x );
int comparePartNames( const QString &s1, const QString &s2 );