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

Prettied up SimplePreview.

Browse Source
This commit is contained in:
Jim Evins
2013-11-16 16:46:41 -05:00
parent fe87cd5d76
commit f255f561ce
3 changed files with 152 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/SimplePreview.cpp
+13 -6
View File
@@ -29,13 +29,15 @@ namespace
{ {
const QColor paperColor( 255, 255, 255 ); const QColor paperColor( 255, 255, 255 );
const QColor paperOutlineColor( 0, 0, 0 ); const QColor paperOutlineColor( 0, 0, 0 );
const double paperOutlineWidthPixels = 1;
const QColor shadowColor( 64, 64, 64 ); const QColor shadowColor( 64, 64, 64 );
const double shadowOffset = 3; const double shadowOffsetPixels = 3;
const double shadowRadius = 12; const double shadowRadiusPixels = 12;
const QColor labelColor( 242, 242, 242 ); const QColor labelColor( 255, 255, 255 );
const QColor labelOutlineColor( 64, 64, 64 ); const QColor labelOutlineColor( 128, 128, 255 );
const double labelOutlineWidthPixels = 2;
} }
@@ -51,6 +53,7 @@ namespace gLabels
viewport()->setAutoFillBackground(false); viewport()->setAutoFillBackground(false);
setFrameStyle( QFrame::NoFrame ); setFrameStyle( QFrame::NoFrame );
setRenderHints( QPainter::Antialiasing );
} }
@@ -69,6 +72,8 @@ namespace gLabels
mScene->setSceneRect( x, y, w, h ); mScene->setSceneRect( x, y, w, h );
fitInView( x, y, w, h, Qt::KeepAspectRatio ); fitInView( x, y, w, h, Qt::KeepAspectRatio );
mScale = matrix().m11();
drawPaper( tmplate->pageWidth(), tmplate->pageHeight() ); drawPaper( tmplate->pageWidth(), tmplate->pageHeight() );
drawLabels( tmplate ); drawLabels( tmplate );
} }
@@ -89,11 +94,12 @@ namespace gLabels
{ {
QGraphicsDropShadowEffect *shadowEffect = new QGraphicsDropShadowEffect(); QGraphicsDropShadowEffect *shadowEffect = new QGraphicsDropShadowEffect();
shadowEffect->setColor( shadowColor ); shadowEffect->setColor( shadowColor );
shadowEffect->setOffset( shadowOffset ); shadowEffect->setOffset( shadowOffsetPixels );
shadowEffect->setBlurRadius( shadowRadius ); shadowEffect->setBlurRadius( shadowRadiusPixels );
QBrush brush( paperColor ); QBrush brush( paperColor );
QPen pen( paperOutlineColor ); QPen pen( paperOutlineColor );
pen.setWidthF( paperOutlineWidthPixels / mScale );
QGraphicsRectItem *pageItem = new QGraphicsRectItem( 0, 0, pw, ph ); QGraphicsRectItem *pageItem = new QGraphicsRectItem( 0, 0, pw, ph );
pageItem->setBrush( brush ); pageItem->setBrush( brush );
@@ -119,6 +125,7 @@ namespace gLabels
{ {
QBrush brush( labelColor ); QBrush brush( labelColor );
QPen pen( labelOutlineColor ); QPen pen( labelOutlineColor );
pen.setWidthF( labelOutlineWidthPixels / mScale );
QGraphicsPathItem *labelItem = new QGraphicsPathItem( path ); QGraphicsPathItem *labelItem = new QGraphicsPathItem( path );
labelItem->setBrush( brush ); labelItem->setBrush( brush );
app/SimplePreview.h
+1
View File
@@ -48,6 +48,7 @@ namespace gLabels
void drawLabel( double x, double y, const QPainterPath &path ); void drawLabel( double x, double y, const QPainterPath &path );
QGraphicsScene *mScene; QGraphicsScene *mScene;
double mScale;
}; };
app/ui/NewLabelDialog.ui
+138 -150
View File
@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>860</width> <width>1012</width>
<height>777</height> <height>777</height>
</rect> </rect>
</property> </property>
@@ -138,7 +138,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="page"> <widget class="QWidget" name="page">
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
@@ -185,159 +185,147 @@
<number>12</number> <number>12</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="selectionInfoGroup"> <widget class="gLabels::SimplePreview" name="simplePreview">
<property name="title"> <property name="sizePolicy">
<string>Selection</string> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>250</width>
<height>350</height>
</size>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> <set>Qt::AlignCenter</set>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="gLabels::SimplePreview" name="simplePreview">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>250</width>
<height>350</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</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="similarLabel">
<property name="text">
<string>Similar to:</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>150</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> </widget>
</item> </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="similarLabel">
<property name="text">
<string>Similar to:</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>150</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>
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="sizePolicy"> <property name="sizePolicy">