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

Improvements to SelectTemplateDialog (#109 and #142)

Browse Source 
- Added side pane for product preview and information
- Product selection is done with a separate pushbutton, so that user gets a
  chance to preview the complete product information before committing to the
  selection
- Supports two view modes: Grid View and List View
- View mode is automatically stored in Settings, so it will default to the
  user's prefered mode
- Should address most concerns in #109 and #142
This commit is contained in:
Jaye Evins
2025-05-26 19:23:36 -04:00
parent 43cbc8fc3c
commit 4c0ce1146a
26 changed files with 1073 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/Icons.h
+20
View File
@@ -541,6 +541,26 @@ namespace glabels
}
};
class ViewGrid : public QIcon
{
public:
ViewGrid()
{
addPixmap( QPixmap( ":icons/flat/22x22/glabels-view-grid.svg" ) );
}
};
class ViewList : public QIcon
{
public:
ViewList()
{
addPixmap( QPixmap( ":icons/flat/22x22/glabels-view-list.svg" ) );
}
};
}
}
glabels/PropertiesView.cpp
+7 -11
View File
@@ -18,6 +18,7 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#include "PropertiesView.h"
#include "SelectProductDialog.h"
@@ -100,11 +101,12 @@ namespace glabels
///
void PropertiesView::onLabelSizeChanged()
{
const model::Template* tmplate = mModel->tmplate();
const model::Frame* frame = tmplate->frames().first();
auto* tmplate = mModel->tmplate();
auto* frame = tmplate->frames().first();
bool isRotated = mModel->rotate();
preview->setTemplate( tmplate );
preview->setShowArrow( true );
preview->setRotate( isRotated );
const model::Vendor* vendor = model::Db::lookupVendorFromName( tmplate->brand() );
@@ -129,15 +131,9 @@ namespace glabels
}
descriptionLabel->setText( tmplate->description() );
QString pgSizeString = model::Db::lookupPaperNameFromId( tmplate->paperId() );
pageSizeLabel->setText( pgSizeString );
QString labelSizeString = frame->sizeDescription( mUnits );
labelSizeLabel->setText( labelSizeString );
QString layoutString = frame->layoutDescription();
layoutLabel->setText( layoutString );
pageSizeLabel->setText( tmplate->paperDescription( mUnits ) );
labelSizeLabel->setText( frame->sizeDescription( mUnits ) );
layoutLabel->setText( frame->layoutDescription() );
QStringList list = model::Db::getNameListOfSimilarTemplates( tmplate->name() );
if ( list.isEmpty() )
glabels/SelectProductDialog.cpp
+88 -15
View File
@@ -18,8 +18,10 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#include "SelectProductDialog.h"
#include "Icons.h"
#include "NotebookUtil.h"
#include "TemplatePickerItem.h"
@@ -36,9 +38,10 @@ namespace glabels
/// Constructor
///
SelectProductDialog::SelectProductDialog( QWidget *parent )
: QDialog(parent), mCanceled(false)
: QDialog(parent)
{
setupUi( this );
productInfoWidget->setVisible( false );
pageSizeIsoCheck->setChecked( model::Settings::searchIsoPaperSizes() );
pageSizeUsCheck->setChecked( model::Settings::searchUsPaperSizes() );
@@ -65,6 +68,17 @@ namespace glabels
NotebookUtil::establishSize( modeNotebook );
if ( templatePicker->mode() == QListView::IconMode )
{
viewModeButton->setIcon( Icons::ViewList() );
viewModeButton->setToolTip( tr( "List View" ) );
}
else
{
viewModeButton->setIcon( Icons::ViewGrid() );
viewModeButton->setToolTip( tr( "Grid View" ) );
}
QList<model::Template*> tmplates = model::Db::templates();
templatePicker->setTemplates( tmplates );
@@ -82,7 +96,7 @@ namespace glabels
///
const model::Template* SelectProductDialog::tmplate() const
{
if ( !mCanceled )
if ( mHasSelection )
{
return templatePicker->selectedTemplate();
}
@@ -189,13 +203,83 @@ namespace glabels
}
///
/// View Mode Button Clicked Slot
///
void SelectProductDialog::onViewModeButtonClicked()
{
if ( templatePicker->mode() == QListView::IconMode )
{
templatePicker->setMode( QListView::ListMode );
viewModeButton->setIcon( Icons::ViewList() );
viewModeButton->setToolTip( tr( "List View" ) );
}
else
{
templatePicker->setMode( QListView::IconMode );
viewModeButton->setIcon( Icons::ViewGrid() );
viewModeButton->setToolTip( tr( "Grid View" ) );
}
}
///
/// Template Picker Selection Changed Slot
///
void SelectProductDialog::onTemplatePickerSelectionChanged()
{
// Delay close. This should make the selection more apparent to the user.
mTimer.start( 125, this );
auto* tmplate = templatePicker->selectedTemplate();
if ( !tmplate )
{
productInfoWidget->setVisible( false );
selectButton->setEnabled( false );
return;
}
auto* frame = tmplate->frames().first();
preview->setTemplate( tmplate );
const model::Vendor* vendor = model::Db::lookupVendorFromName( tmplate->brand() );
if ( (vendor != nullptr) && (vendor->url() != nullptr) )
{
QString markup = QString( "<a href='%1'>%2</a>" ).arg( vendor->url(), vendor->name() );
vendorLabel->setText( markup );
}
else
{
vendorLabel->setText( tmplate->brand() );
}
if ( tmplate->productUrl() != nullptr )
{
QString markup = QString( "<a href='%1'>%2</a>" ).arg( tmplate->productUrl(), tmplate->part() );
partLabel->setText( markup );
}
else
{
partLabel->setText( tmplate->part() );
}
descriptionLabel->setText( tmplate->description() );
pageSizeLabel->setText( tmplate->paperDescription( model::Settings::units() ) );
labelSizeLabel->setText( frame->sizeDescription( model::Settings::units() ) );
layoutLabel->setText( frame->layoutDescription() );
productInfoWidget->setVisible( true );
selectButton->setEnabled( true );
}
///
/// Select Button Clicked Slot
///
void SelectProductDialog::onSelectButtonClicked()
{
mHasSelection = true;
close();
}
@@ -204,17 +288,6 @@ namespace glabels
///
void SelectProductDialog::onCancelButtonClicked()
{
mCanceled = true;
close();
}
///
/// Cancel Button Clicked Slot
///
void SelectProductDialog::timerEvent( QTimerEvent *event )
{
mTimer.stop();
close();
}
glabels/SelectProductDialog.h
+3 -12
View File
@@ -24,8 +24,6 @@
#include "ui_SelectProductDialog.h"
#include <QBasicTimer>
namespace glabels
{
@@ -60,17 +58,12 @@ namespace glabels
void onPageSizeCheckClicked();
void onCategoryRadioClicked();
void onCategoryCheckClicked();
void onViewModeButtonClicked();
void onTemplatePickerSelectionChanged();
void onSelectButtonClicked();
void onCancelButtonClicked();
/////////////////////////////////
// Events
/////////////////////////////////
protected:
void timerEvent(QTimerEvent *event) override;
/////////////////////////////////
// Private methods
/////////////////////////////////
@@ -82,13 +75,11 @@ namespace glabels
// Private data
/////////////////////////////////
private:
QBasicTimer mTimer;
QMap<QCheckBox*,QString> mCheckToCategoryMap;
QList<QCheckBox*> mCheckList;
QStringList mCategoryIdList;
bool mCanceled;
bool mHasSelection { false };
};
glabels/SimplePreview.cpp
+15 -1
View File
@@ -18,6 +18,7 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#include "SimplePreview.h"
#include "RollTemplatePath.h"
@@ -61,7 +62,7 @@ namespace glabels
/// Constructor
///
SimplePreview::SimplePreview( QWidget *parent )
: QGraphicsView(parent), mTmplate(nullptr), mRotateFlag(false)
: QGraphicsView(parent)
{
mScene = new QGraphicsScene();
setScene( mScene );
@@ -84,6 +85,16 @@ namespace glabels
}
///
/// Show Arrow Property Setter
///
void SimplePreview::setShowArrow( bool showArrow )
{
mShowArrow = showArrow;
update();
}
///
/// Rotate Property Setter
///
@@ -132,9 +143,12 @@ namespace glabels
drawPaper();
drawLabels();
if ( mShowArrow )
{
drawArrow();
}
}
}
///
glabels/SimplePreview.h
+5 -3
View File
@@ -52,6 +52,7 @@ namespace glabels
/////////////////////////////////
public:
void setTemplate( const model::Template *tmplate );
void setShowArrow( bool showArrow );
void setRotate( bool rotateFlag );
@@ -77,10 +78,11 @@ namespace glabels
// Private Data
/////////////////////////////////
private:
const model::Template* mTmplate;
bool mRotateFlag;
const model::Template* mTmplate { nullptr };
bool mShowArrow { false };
bool mRotateFlag { false };
QGraphicsScene* mScene;
QGraphicsScene* mScene { nullptr };
};
glabels/TemplatePicker.cpp
+166 -23
View File
@@ -18,11 +18,78 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#include "TemplatePicker.h"
#include "TemplatePickerItem.h"
#include "model/Settings.h"
#include <QAbstractTextDocumentLayout>
#include <QApplication>
#include <QIcon>
#include <QPainter>
#include <QStyledItemDelegate>
#include <algorithm>
namespace
{
//
// Custom item delegate to render text as HTML in List View
//
// Based on solutions at
// https://stackoverflow.com/questions/1956542/how-to-make-item-view-render-rich-html-text-in-qt/1956781#1956781
// Note: assumes that the text rectangle does not need to be resized, so does not reimplement sizeHint().
// This delegate does not work correctly in IconMode, and may not work correctly in other applications,
// for instance, when the height is not dominated by the icon.
//
class HtmlDelegate : public QStyledItemDelegate
{
protected:
void paint ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const override;
};
void HtmlDelegate::paint( QPainter* painter,
const QStyleOptionViewItem& option,
const QModelIndex& index) const
{
auto opt = option;
initStyleOption( &opt, index );
QStyle *style = opt.widget? opt.widget->style() : QApplication::style();
QTextDocument doc;
doc.setHtml( opt.text );
/// Painting everything other than text
opt.text = QString();
style->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
QAbstractTextDocumentLayout::PaintContext ctx;
// Highlighting text if item is selected
if ( opt.state & QStyle::State_Selected )
{
ctx.palette.setColor( QPalette::Text, opt.palette.color( QPalette::Active, QPalette::HighlightedText ) );
}
else
{
ctx.palette.setColor( QPalette::Text, opt.palette.color( QPalette::Active, QPalette::Text ) );
}
QRect textRect = style->subElementRect( QStyle::SE_ItemViewItemText, &opt );
painter->save();
painter->translate( textRect.topLeft() );
painter->setClipRect( textRect.translated( -textRect.topLeft() ) );
doc.documentLayout()->draw( painter, ctx );
painter->restore();
}
}
namespace glabels
@@ -31,29 +98,83 @@ namespace glabels
///
/// Constructor
///
TemplatePicker::TemplatePicker( QWidget *parent ) : QListWidget(parent)
TemplatePicker::TemplatePicker( QWidget* parent ) : QListWidget(parent)
{
setViewMode( QListView::IconMode );
setResizeMode( QListView::Adjust );
setSpacing( 24 );
setWordWrap( true );
setUniformItemSizes( true );
setIconSize( QSize(TemplatePickerItem::SIZE, TemplatePickerItem::SIZE) );
setWordWrap( true );
setIconSize( QSize( TemplatePickerItem::SIZE, TemplatePickerItem::SIZE ) );
setMode( model::Settings::templatePickerMode() );
}
///
/// Set List of Templates to Pick From
///
void TemplatePicker::setTemplates( const QList <model::Template*> &tmplates )
void TemplatePicker::setTemplates( const QList<model::Template*>& tmplates )
{
auto mode = model::Settings::templatePickerMode();
foreach (model::Template *tmplate, tmplates)
{
new TemplatePickerItem( tmplate, this );
new TemplatePickerItem( tmplate, mode, this );
}
}
///
/// Set View Mode
///
void TemplatePicker::setMode( QListView::ViewMode mode )
{
model::Settings::setTemplatePickerMode( mode );
for ( unsigned int i = 0; i < count(); i++ )
{
if (auto* tItem = dynamic_cast<TemplatePickerItem *>(item(i)))
{
tItem->setMode( mode );
}
}
switch ( mode )
{
case QListView::IconMode:
setItemDelegate( new QStyledItemDelegate() ); // Use default delegate
setViewMode( QListView::IconMode );
setSpacing( 24 );
break;
case QListView::ListMode:
setItemDelegate( new HtmlDelegate() );
setViewMode( QListView::ListMode );
setSpacing( 8 );
break;
default:
qWarning() << "TemplatePicker: unknown mode!";
break;
}
if ( auto* selected = selectedItem() )
{
scrollToItem( selected, QAbstractItemView::PositionAtCenter );
}
}
///
/// Get current View Mode
///
QListView::ViewMode TemplatePicker::mode() const
{
return model::Settings::templatePickerMode();
}
///
/// Apply Filter to Narrow Template Choices by search criteria
///
@@ -61,9 +182,9 @@ namespace glabels
bool isoMask, bool usMask, bool otherMask,
bool anyCategory, const QStringList& categoryIds )
{
foreach ( QListWidgetItem *item, findItems( "*", Qt::MatchWildcard ) )
for ( unsigned int i = 0; i < count(); i++ )
{
if (auto *tItem = dynamic_cast<TemplatePickerItem *>(item))
if (auto* tItem = dynamic_cast<TemplatePickerItem *>(item(i)))
{
bool nameMask = tItem->tmplate()->name().contains( searchString, Qt::CaseInsensitive );
@@ -89,15 +210,20 @@ namespace glabels
if ( nameMask && sizeMask && categoryMask )
{
item->setHidden( false );
tItem->setHidden( false );
}
else
{
item->setHidden( true );
item->setSelected( false );
tItem->setHidden( true );
tItem->setSelected( false );
}
}
}
if ( auto* selected = selectedItem() )
{
scrollToItem( selected, QAbstractItemView::PositionAtCenter );
}
}
@@ -106,9 +232,9 @@ namespace glabels
///
void TemplatePicker::applyFilter( const QStringList& names )
{
foreach ( QListWidgetItem *item, findItems( "*", Qt::MatchWildcard ) )
for ( unsigned int i = 0; i < count(); i++ )
{
if (auto *tItem = dynamic_cast<TemplatePickerItem *>(item))
if (auto *tItem = dynamic_cast<TemplatePickerItem *>(item(i)))
{
bool match = false;
foreach ( QString name, names )
@@ -122,33 +248,50 @@ namespace glabels
if ( match )
{
item->setHidden( false );
tItem->setHidden( false );
}
else
{
item->setHidden( true );
item->setSelected( false );
tItem->setHidden( true );
tItem->setSelected( false );
}
}
}
if ( auto* selected = selectedItem() )
{
scrollToItem( selected, QAbstractItemView::PositionAtCenter );
}
}
///
/// Get Currently Selected Template
///
const model::Template *TemplatePicker::selectedTemplate()
const model::Template* TemplatePicker::selectedTemplate() const
{
QList<QListWidgetItem *> items = selectedItems();
if ( !items.isEmpty() )
{
if (auto *tItem = dynamic_cast<TemplatePickerItem*>(items.first()))
if ( auto* tItem = selectedItem() )
{
return tItem->tmplate();
}
}
return nullptr;
}
///
/// Get Currently Selected Item
///
TemplatePickerItem* TemplatePicker::selectedItem() const
{
QList<QListWidgetItem*> items = selectedItems();
if ( !items.isEmpty() )
{
return dynamic_cast<TemplatePickerItem*>( items.first() );
}
return nullptr;
}
} // namespace glabels
glabels/TemplatePicker.h
+10 -4
View File
@@ -22,6 +22,8 @@
#define TemplatePicker_h
#include "TemplatePickerItem.h"
#include "model/Template.h"
#include <QList>
@@ -38,19 +40,21 @@ namespace glabels
{
Q_OBJECT
/////////////////////////////////
// Life Cycle
/////////////////////////////////
public:
TemplatePicker( QWidget *parent = nullptr );
TemplatePicker( QWidget* parent = nullptr );
/////////////////////////////////
// Properties
/////////////////////////////////
public:
void setTemplates( const QList <model::Template*> &tmplates );
void setTemplates( const QList<model::Template*>& tmplates );
void setMode( QListView::ViewMode mode );
QListView::ViewMode mode() const;
/////////////////////////////////
@@ -62,7 +66,9 @@ namespace glabels
void applyFilter( const QStringList& names );
const model::Template *selectedTemplate();
const model::Template* selectedTemplate() const;
TemplatePickerItem* selectedItem() const;
};
glabels/TemplatePickerItem.cpp
+37 -4
View File
@@ -18,10 +18,13 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#include "TemplatePickerItem.h"
#include "MiniPreviewPixmap.h"
#include "model/Settings.h"
#include <QHBoxLayout>
#include <QIcon>
#include <QListWidgetItem>
@@ -33,19 +36,49 @@ namespace glabels
///
/// Constructor
///
TemplatePickerItem::TemplatePickerItem( model::Template *tmplate, QListWidget *parent )
: QListWidgetItem(parent)
TemplatePickerItem::TemplatePickerItem( model::Template* tmplate,
QListView::ViewMode mode,
QListWidget* parent )
: QListWidgetItem( parent )
{
mTmplate = tmplate;
setIcon( QIcon( MiniPreviewPixmap( tmplate, SIZE, SIZE ) ) );
setText( tmplate->name() );
setToolTip( tmplate->name() );
setMode( mode );
setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
}
///
/// Configure for given View Mode
///
void TemplatePickerItem::setMode( QListView::ViewMode mode )
{
auto* frame = mTmplate->frames().first();
switch ( mode )
{
case QListView::IconMode:
setText( mTmplate->name() );
break;
case QListView::ListMode:
setText( "<b>" + mTmplate->name() + "</b><br/>" +
mTmplate->description() + "<br/>" +
frame->sizeDescription( model::Settings::units() ) + "<br/>" +
frame->layoutDescription() );
break;
default:
qWarning() << "TemplatePickerItem: unknown mode!";
break;
}
}
///
/// Template Property Getter
///
glabels/TemplatePickerItem.h
+11 -1
View File
@@ -39,11 +39,21 @@ namespace glabels
public:
static const int SIZE = 80;
/////////////////////////////////
// Life Cycle
/////////////////////////////////
public:
TemplatePickerItem( model::Template *tmplate, QListWidget *parent = nullptr );
TemplatePickerItem( model::Template* tmplate,
QListView::ViewMode mode,
QListWidget* parent = nullptr );
/////////////////////////////////
// Manipulate widget
/////////////////////////////////
public:
void setMode( QListView::ViewMode mode );
/////////////////////////////////
glabels/icons.qrc
+2
View File
@@ -63,6 +63,8 @@
<file>icons/flat/22x22/glabels-valign-text-bottom.svg</file>
<file>icons/flat/22x22/glabels-valign-text-middle.svg</file>
<file>icons/flat/22x22/glabels-valign-text-top.svg</file>
<file>icons/flat/22x22/glabels-view-grid.svg</file>
<file>icons/flat/22x22/glabels-view-list.svg</file>
<file>icons/flat/22x22/glabels-zoom-in.svg</file>
<file>icons/flat/22x22/glabels-zoom-one-to-one.svg</file>
<file>icons/flat/22x22/glabels-zoom-out.svg</file>
glabels/icons/flat/22x22/glabels-view-grid.svg
+15
View File
@@ -0,0 +1,15 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
<rect x="3" y="3" width="7" height="7"
style="fill:#333333;fill-opacity:1;stroke:none" />
<rect x="12" y="3" width="7" height="7"
style="fill:#333333;fill-opacity:1;stroke:none" />
<rect x="3" y="12" width="7" height="7"
style="fill:#333333;fill-opacity:1;stroke:none" />
<rect x="12" y="12" width="7" height="7"
style="fill:#333333;fill-opacity:1;stroke:none" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 483 B

glabels/icons/flat/22x22/glabels-view-list.svg
+21
View File
@@ -0,0 +1,21 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
<rect x="3" y="3" width="4" height="4"
style="fill:#333333;fill-opacity:1;stroke:none" />
<rect x="3" y="9" width="4" height="4"
style="fill:#333333;fill-opacity:1;stroke:none" />
<rect x="3" y="15" width="4" height="4"
style="fill:#333333;fill-opacity:1;stroke:none" />
<rect x="9" y="4" width="10" height="2"
style="fill:#333333;fill-opacity:1;stroke:none" />
<rect x="9" y="10" width="10" height="2"
style="fill:#333333;fill-opacity:1;stroke:none" />
<rect x="9" y="16" width="10" height="2"
style="fill:#333333;fill-opacity:1;stroke:none" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 681 B

glabels/ui/SelectProductDialog.ui
+290 -20
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>997</width>
<height>823</height>
<width>1078</width>
<height>796</height>
</rect>
</property>
<property name="sizePolicy">
@@ -22,11 +22,9 @@
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,1,0">
<item>
<widget class="QTabWidget" name="modeNotebook">
<property name="sizePolicy">
@@ -255,7 +253,7 @@
<widget class="glabels::TemplatePicker" name="templatePicker">
<property name="minimumSize">
<size>
<width>140</width>
<width>500</width>
<height>0</height>
</size>
</property>
@@ -264,10 +262,233 @@
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="productGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>Product information</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QWidget" name="productInfoWidget" native="true">
<layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,1">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Vendor:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="vendorLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Part #:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="partLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Description:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="descriptionLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Page size:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="pageSizeLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Label size:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="labelSizeLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_11">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Layout:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="layoutLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="glabels::SimplePreview" name="preview">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="viewModeButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../icons.qrc">
<normaloff>:/icons/flat/22x22/glabels-view-grid.svg</normaloff>:/icons/flat/22x22/glabels-view-grid.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
@@ -286,9 +507,20 @@
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
<item>
<widget class="QPushButton" name="selectButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Select</string>
</property>
</widget>
</item>
</layout>
</item>
@@ -300,6 +532,11 @@
<extends>QListWidget</extends>
<header>TemplatePicker.h</header>
</customwidget>
<customwidget>
<class>glabels::SimplePreview</class>
<extends>QGraphicsView</extends>
<header>SimplePreview.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../icons.qrc"/>
@@ -312,8 +549,8 @@
<slot>onPageSizeCheckClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>78</x>
<y>184</y>
<x>130</x>
<y>196</y>
</hint>
<hint type="destinationlabel">
<x>4</x>
@@ -344,8 +581,8 @@
<slot>onPageSizeCheckClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>80</x>
<y>161</y>
<x>132</x>
<y>170</y>
</hint>
<hint type="destinationlabel">
<x>2</x>
@@ -360,8 +597,8 @@
<slot>onCancelButtonClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>955</x>
<y>648</y>
<x>981</x>
<y>783</y>
</hint>
<hint type="destinationlabel">
<x>689</x>
@@ -376,8 +613,8 @@
<slot>onSearchEntryTextChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>93</x>
<y>104</y>
<x>107</x>
<y>102</y>
</hint>
<hint type="destinationlabel">
<x>2</x>
@@ -392,8 +629,8 @@
<slot>onCategoryRadioClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>76</x>
<y>270</y>
<x>126</x>
<y>296</y>
</hint>
<hint type="destinationlabel">
<x>0</x>
@@ -408,8 +645,8 @@
<slot>onCategoryRadioClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>72</x>
<y>294</y>
<x>122</x>
<y>322</y>
</hint>
<hint type="destinationlabel">
<x>1</x>
@@ -433,6 +670,38 @@
</hint>
</hints>
</connection>
<connection>
<sender>selectButton</sender>
<signal>clicked()</signal>
<receiver>SelectProductDialog</receiver>
<slot>onSelectButtonClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>1022</x>
<y>769</y>
</hint>
<hint type="destinationlabel">
<x>1067</x>
<y>682</y>
</hint>
</hints>
</connection>
<connection>
<sender>viewModeButton</sender>
<signal>clicked()</signal>
<receiver>SelectProductDialog</receiver>
<slot>onViewModeButtonClicked()</slot>
<hints>
<hint type="sourcelabel">
<x>20</x>
<y>760</y>
</hint>
<hint type="destinationlabel">
<x>-2</x>
<y>762</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>onSearchClearButtonClicked()</slot>
@@ -444,5 +713,6 @@
<slot>onPageSizeCheckClicked()</slot>
<slot>onCategoryRadioClicked()</slot>
<slot>onModeTabChanged()</slot>
<slot>onViewModeButtonClicked()</slot>
</slots>
</ui>
model/Settings.cpp
+23
View File
@@ -18,6 +18,7 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Settings.h"
#include <QLocale>
@@ -262,6 +263,28 @@ namespace glabels
}
QListView::ViewMode Settings::templatePickerMode()
{
QString defaultMode = "icon";
mInstance->beginGroup( "TemplatePicker" );
QString returnMode = mInstance->value( "viewMode", defaultMode ).toString();
mInstance->endGroup();
return returnMode == "icon" ? QListView::IconMode : QListView::ListMode;
}
void Settings::setTemplatePickerMode( QListView::ViewMode viewMode )
{
mInstance->beginGroup( "TemplatePicker" );
mInstance->setValue( "viewMode", viewMode == QListView::IconMode ? "icon" : "list" );
mInstance->endGroup();
emit mInstance->changed();
}
QStringList Settings::recentTemplateList()
{
QStringList defaultList;
model/Settings.h
+4
View File
@@ -24,6 +24,7 @@
#include "Distance.h"
#include <QListView>
#include <QSettings>
#include <QStringList>
@@ -87,6 +88,9 @@ namespace glabels
static QStringList searchCategoryList();
static void setSearchCategoryList( const QStringList& searchCategoryList );
static QListView::ViewMode templatePickerMode();
static void setTemplatePickerMode( QListView::ViewMode viewMode );
static QStringList recentTemplateList();
static void addToRecentTemplateList( const QString& name );
model/Template.cpp
+26
View File
@@ -18,10 +18,12 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Template.h"
#include "Db.h"
#include "FrameContinuous.h"
#include "StrUtil.h"
#include <QtDebug>
@@ -190,6 +192,30 @@ namespace glabels
}
QString Template::paperDescription( const Units& units ) const
{
if ( mPaperId == "other" )
{
if ( units.toEnum() == Units::IN )
{
QString wStr = StrUtil::formatFraction( mPageWidth.in() );
QString hStr = StrUtil::formatFraction( mPageHeight.in() );
return QString("%1 x %2 %3").arg(wStr).arg(hStr).arg(units.toTrName());
}
else
{
return QString("%1 x %2 %3")
.arg(mPageWidth.inUnits(units), 0, 'g', 5)
.arg(mPageHeight.inUnits(units), 0, 'g', 5)
.arg(units.toTrName());
}
}
return Db::lookupPaperNameFromId( mPaperId );
}
QString Template::paperId() const
{
return mPaperId;
model/Template.h
+1
View File
@@ -73,6 +73,7 @@ namespace glabels
QString part() const;
QString description() const;
QString paperDescription( const Units& units ) const;
QString paperId() const;
Distance pageWidth() const;
Distance pageHeight() const;
templates/avery-other-templates.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<!-- =================================================================== -->
<!-- Avery 6141 family: File folder labels, 5/8'' x 2_3/4'', 7 per sheet -->
<!-- =================================================================== -->
<Template brand="Avery" part="6141" size="Other" width="207pt" height="351pt"
<Template brand="Avery" part="6141" size="other" width="207pt" height="351pt"
_description="File folder labels">
<Meta category="label"/>
<Label-rectangle id="0" width="198pt" height="45pt" round="4.5pt" waste="0pt">
templates/canon-other-templates.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<!-- =================================================================== -->
<!-- Type J CD/DVD Tray. -->
<!-- =================================================================== -->
<Template brand="Canon" part="Type J Tray" size="Other" width="135mm" height="295mm" _description="CD/DVD tray">
<Template brand="Canon" part="Type J Tray" size="other" width="135mm" height="295mm" _description="CD/DVD tray">
<Label-cd id="0" radius="59mm" hole="11mm" waste="2mm">
<Markup-margin size="3.175mm"/>
<Layout nx="1" ny="1" x0="5.6mm" y0="58.5mm" dx="122mm" dy="122mm"/>
templates/dymo-other-templates.xml
+16 -16
View File
@@ -74,7 +74,7 @@
<!-- =================================================================== -->
<!-- Dymo 11353 Multipurpose labels. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="11353" size="Other" width="13mm" height="25mm" _description="Multipurpose labels">
<Template brand="Dymo" part="11353" size="other" width="13mm" height="25mm" _description="Multipurpose labels">
<Meta category="label"/>
<Meta category="mail"/>
<Label-rectangle id="0" width="13mm" height="25mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -86,7 +86,7 @@
<!-- =================================================================== -->
<!-- Dymo 11355 Return address labels. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="11355" size="Other" width="19mm" height="51mm" _description="Return address labels">
<Template brand="Dymo" part="11355" size="other" width="19mm" height="51mm" _description="Return address labels">
<Meta category="label"/>
<Meta category="mail"/>
<Label-rectangle id="0" width="19mm" height="51mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -98,7 +98,7 @@
<!-- =================================================================== -->
<!-- Dymo 11356 Small Name Badge labels. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="11356" size="Other" width="41mm" height="89mm" _description="Name badge labels">
<Template brand="Dymo" part="11356" size="other" width="41mm" height="89mm" _description="Name badge labels">
<Meta category="label"/>
<Meta category="name-badge"/>
<Label-rectangle id="0" width="41mm" height="89mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -110,7 +110,7 @@
<!-- =================================================================== -->
<!-- Dymo 30256 Address labels. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="30256" size="Other" width="59mm" height="102mm" _description="Address labels">
<Template brand="Dymo" part="30256" size="other" width="59mm" height="102mm" _description="Address labels">
<Meta category="label"/>
<Meta category="media"/>
<Label-rectangle id="0" width="59mm" height="102mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -122,7 +122,7 @@
<!-- =================================================================== -->
<!-- Dymo 30327 File folder labels. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="30327" size="Other" width="14mm" height="87mm" _description="File folder labels">
<Template brand="Dymo" part="30327" size="other" width="14mm" height="87mm" _description="File folder labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta category="filing"/>
@@ -135,7 +135,7 @@
<!-- =================================================================== -->
<!-- Dymo 30258 Multipurpose labels (was 3.5" Disk labels). -->
<!-- =================================================================== -->
<Template brand="Dymo" part="30258" size="Other" width="54mm" height="70mm" _description="Multipurpose labels">
<Template brand="Dymo" part="30258" size="other" width="54mm" height="70mm" _description="Multipurpose labels">
<Meta category="label"/>
<Meta category="media"/>
<Label-rectangle id="0" width="54mm" height="70mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -147,7 +147,7 @@
<!-- =================================================================== -->
<!-- Dymo 30332 File folder labels. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="30332" size="Other" width="25mm" height="25mm" _description="File folder labels">
<Template brand="Dymo" part="30332" size="other" width="25mm" height="25mm" _description="File folder labels">
<Meta category="label"/>
<Meta category="square-label"/>
<Meta category="filing"/>
@@ -160,7 +160,7 @@
<!-- =================================================================== -->
<!-- Dymo 30374 Name badge. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="30374" size="Other" width="51mm" height="89mm" _description="Name badge labels">
<Template brand="Dymo" part="30374" size="other" width="51mm" height="89mm" _description="Name badge labels">
<Meta category="label"/>
<Meta category="name-badge"/>
<Label-rectangle id="0" width="51mm" height="89mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -172,7 +172,7 @@
<!-- =================================================================== -->
<!-- Dymo 30376 Hanging Folder labels. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="30376" size="Other" width="14mm" height="51mm" _description="Hanging folder labels">
<Template brand="Dymo" part="30376" size="other" width="14mm" height="51mm" _description="Hanging folder labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta category="filing"/>
@@ -185,7 +185,7 @@
<!-- =================================================================== -->
<!-- Dymo 30856 Name badge -->
<!-- =================================================================== -->
<Template brand="Dymo" part="30856" size="Other" width="62mm" height="106mm" _description="Name badge labels">
<Template brand="Dymo" part="30856" size="other" width="62mm" height="106mm" _description="Name badge labels">
<Meta category="label"/>
<Meta category="name-badge"/>
<Label-rectangle id="0" width="62mm" height="106mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -197,7 +197,7 @@
<!-- =================================================================== -->
<!-- Dymo 99012 Large address labels. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="99012" size="Other" width="36mm" height="89mm" _description="Large address labels">
<Template brand="Dymo" part="99012" size="other" width="36mm" height="89mm" _description="Large address labels">
<Meta category="label"/>
<Meta category="mail"/>
<Label-rectangle id="0" width="36mm" height="89mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -209,7 +209,7 @@
<!-- =================================================================== -->
<!-- Dymo 99013 Large address labels. Transparent Plastic -->
<!-- =================================================================== -->
<Template brand="Dymo" part="99013" size="Other" width="36mm" height="89mm" _description="Large address labels">
<Template brand="Dymo" part="99013" size="other" width="36mm" height="89mm" _description="Large address labels">
<Meta category="label"/>
<Meta category="mail"/>
<Label-rectangle id="0" width="36mm" height="89mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -221,7 +221,7 @@
<!-- =================================================================== -->
<!-- Dymo 99014 Shipping address labels. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="99014" size="Other" width="54mm" height="101mm" _description="Address labels">
<Template brand="Dymo" part="99014" size="other" width="54mm" height="101mm" _description="Address labels">
<Meta category="label"/>
<Meta category="mail"/>
<Meta category="name-badge"/>
@@ -234,7 +234,7 @@
<!-- =================================================================== -->
<!-- Dymo 99015 Name badge. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="99015" size="Other" width="54mm" height="70mm" _description="Name badge labels">
<Template brand="Dymo" part="99015" size="other" width="54mm" height="70mm" _description="Name badge labels">
<Meta category="label"/>
<Meta category="name-badge"/>
<Label-rectangle id="0" width="54mm" height="70mm" round="0pt" x_waste="0pt" y_waste="0pt">
@@ -246,7 +246,7 @@
<!-- =================================================================== -->
<!-- Dymo 99017 Hanging Folder labels. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="99017" size="Other" width="12mm" height="50mm" _description="Hanging folder labels">
<Template brand="Dymo" part="99017" size="other" width="12mm" height="50mm" _description="Hanging folder labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta category="filing"/>
@@ -259,7 +259,7 @@
<!-- =================================================================== -->
<!-- Dymo 99019 Lever arch labels. -->
<!-- =================================================================== -->
<Template brand="Dymo" part="99019" size="Other" width="59mm" height="190mm" _description="File folder labels">
<Template brand="Dymo" part="99019" size="other" width="59mm" height="190mm" _description="File folder labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta category="filing"/>
templates/felga-templates.xml
+2 -2
View File
@@ -7,14 +7,14 @@
<!-- http://www.felga.it -->
<!-- =================================================================== -->
<Template brand="Felga" part="EP1220" size="Other" width="210mm" height="261mm" description="Plant labels">
<Template brand="Felga" part="EP1220" size="other" width="210mm" height="261mm" description="Plant labels">
<Label-rectangle id="0" width="20mm" height="100mm" round="0mm" x_waste="0mm" y_waste="0mm">
<Markup-margin size="0mm"/>
<Layout nx="10" ny="2" x0="5mm" y0="5mm" dx="20mm" dy="130mm"/>
</Label-rectangle>
</Template>
<Template brand="Felga" part="ES210" size="Other" width="595.276pt" height="793.701pt" description="Plant labels">
<Template brand="Felga" part="ES210" size="other" width="595.276pt" height="793.701pt" description="Plant labels">
<Meta category="user-defined"/>
<Label-rectangle id="0" width="595.276pt" height="36pt" round="0pt" x_waste="0pt" y_waste="0pt">
<Markup-margin size="0pt"/>
templates/hisago-templates.xml
+13 -13
View File
@@ -1092,7 +1092,7 @@
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=GB2600"/>
</Template>
<Template brand="Hisago" part="OP2501" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP2501" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP2501"/>
@@ -1101,7 +1101,7 @@
</Label-rectangle>
</Template>
<Template brand="Hisago" part="OP2502" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP2502" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP2502"/>
@@ -1110,7 +1110,7 @@
</Label-rectangle>
</Template>
<Template brand="Hisago" part="OP2503" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP2503" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP2503"/>
@@ -1119,7 +1119,7 @@
</Label-rectangle>
</Template>
<Template brand="Hisago" part="OP2504" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP2504" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP2504"/>
@@ -1128,7 +1128,7 @@
</Label-rectangle>
</Template>
<Template brand="Hisago" part="OP2505" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP2505" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP2505"/>
@@ -1161,7 +1161,7 @@
<!-- OP920-B -->
<!-- OP920-R -->
<Template brand="Hisago" part="OP1903-N" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP1903-N" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP1903-N"/>
@@ -1170,7 +1170,7 @@
</Label-rectangle>
</Template>
<Template brand="Hisago" part="OP1904-N" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP1904-N" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP1904-N"/>
@@ -1179,7 +1179,7 @@
</Label-rectangle>
</Template>
<Template brand="Hisago" part="OP1905-N" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP1905-N" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP1905-N"/>
@@ -1188,7 +1188,7 @@
</Label-rectangle>
</Template>
<Template brand="Hisago" part="OP1906-N" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP1906-N" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP1906-N"/>
@@ -1197,7 +1197,7 @@
</Label-rectangle>
</Template>
<Template brand="Hisago" part="OP1900-N" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP1900-N" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP1900-N"/>
@@ -1206,7 +1206,7 @@
</Label-rectangle>
</Template>
<Template brand="Hisago" part="OP1901-N" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP1901-N" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP1901-N"/>
@@ -1215,7 +1215,7 @@
</Label-rectangle>
</Template>
<Template brand="Hisago" part="OP1902-N" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP1902-N" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP1902-N"/>
@@ -1224,7 +1224,7 @@
</Label-rectangle>
</Template>
<Template brand="Hisago" part="OP1907-N" size="Other" width="100mm" height="148mm" _description="Rectangular labels">
<Template brand="Hisago" part="OP1907-N" size="other" width="100mm" height="148mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Meta product_url="https://www.hisago.co.jp/Search/detail.asp?id=OP1907-N"/>
templates/jac-iso-templates.xml
+12 -12
View File
@@ -463,7 +463,7 @@
<!-- ******************************************************************* -->
<!-- JAC F-32 PVC labels, 54 per sheet -->
<!-- ******************************************************************* -->
<Template brand="JAC" part="F-32" size="Other" width="323mm" height="222.25mm" _description="Round labels">
<Template brand="JAC" part="F-32" size="other" width="323mm" height="222.25mm" _description="Round labels">
<Meta category="label"/>
<Meta category="round-label"/>
<Label-round id="0" radius="16mm" waste="1.1mm">
@@ -475,7 +475,7 @@
<!-- ******************************************************************* -->
<!-- JAC F-50 PVC labels, 20 per sheet -->
<!-- ******************************************************************* -->
<Template brand="JAC" part="F-50" size="Other" width="323mm" height="222.25mm" _description="Round labels">
<Template brand="JAC" part="F-50" size="other" width="323mm" height="222.25mm" _description="Round labels">
<Meta category="label"/>
<Meta category="round-label"/>
<Label-round id="0" radius="25mm" waste="0.9mm">
@@ -487,7 +487,7 @@
<!-- ******************************************************************* -->
<!-- JAC F-67 PVC labels, 12 per sheet -->
<!-- ******************************************************************* -->
<Template brand="JAC" part="F-67" size="Other" width="323mm" height="222.25mm" _description="Round labels">
<Template brand="JAC" part="F-67" size="other" width="323mm" height="222.25mm" _description="Round labels">
<Meta category="label"/>
<Meta category="round-label"/>
<Label-round id="0" radius="33.5mm" waste="2mm">
@@ -499,7 +499,7 @@
<!-- ******************************************************************* -->
<!-- JAC F-100 PVC labels, 6 per sheet -->
<!-- ******************************************************************* -->
<Template brand="JAC" part="F-100" size="Other" width="323mm" height="222.25mm" _description="Round labels">
<Template brand="JAC" part="F-100" size="other" width="323mm" height="222.25mm" _description="Round labels">
<Meta category="label"/>
<Meta category="round-label"/>
<Label-round id="0" radius="50mm" waste="3mm">
@@ -511,7 +511,7 @@
<!-- ******************************************************************* -->
<!-- JAC F-120 PVC labels, 4 per sheet -->
<!-- ******************************************************************* -->
<Template brand="JAC" part="F-120" size="Other" width="250mm" height="258mm" _description="Round labels">
<Template brand="JAC" part="F-120" size="other" width="250mm" height="258mm" _description="Round labels">
<Meta category="label"/>
<Meta category="round-label"/>
<Label-round id="0" radius="60mm" waste="0mm">
@@ -523,7 +523,7 @@
<!-- ******************************************************************* -->
<!-- JAC F-147 PVC labels, 4 per sheet -->
<!-- ******************************************************************* -->
<Template brand="JAC" part="F-147" size="Other" width="323mm" height="304.8mm" _description="Round labels">
<Template brand="JAC" part="F-147" size="other" width="323mm" height="304.8mm" _description="Round labels">
<Meta category="label"/>
<Meta category="round-label"/>
<Label-round id="0" radius="73.5mm" waste="2.5mm">
@@ -535,7 +535,7 @@
<!-- ******************************************************************* -->
<!-- JAC F-2048 PVC labels, 48 per sheet -->
<!-- ******************************************************************* -->
<Template brand="JAC" part="F-2048" size="Other" width="323mm" height="222.2mm" _description="Rectangular labels">
<Template brand="JAC" part="F-2048" size="other" width="323mm" height="222.2mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Label-rectangle id="0" width="20mm" height="48mm" round="2.5mm" x_waste="2.5mm" y_waste="2.5mm">
@@ -548,7 +548,7 @@
<!-- ******************************************************************* -->
<!-- JAC F-3070 PVC labels, 24 per sheet -->
<!-- ******************************************************************* -->
<Template brand="JAC" part="F-3070" size="Other" width="323mm" height="222.25mm" _description="Rectangular labels">
<Template brand="JAC" part="F-3070" size="other" width="323mm" height="222.25mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Label-rectangle id="0" width="70mm" height="30mm" round="2.5mm" x_waste="2.4mm" y_waste="2.4mm">
@@ -561,7 +561,7 @@
<!-- ******************************************************************* -->
<!-- JAC F-3248 PVC labels, 32 per sheet -->
<!-- ******************************************************************* -->
<Template brand="JAC" part="F-3248" size="Other" width="323mm" height="222.25mm" _description="Rectangular labels">
<Template brand="JAC" part="F-3248" size="other" width="323mm" height="222.25mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Label-rectangle id="0" width="32mm" height="48mm" round="2.5mm" x_waste="2mm" y_waste="2mm">
@@ -574,7 +574,7 @@
<!-- ******************************************************************* -->
<!-- JAC F-32102 PVC labels, 16 per sheet -->
<!-- ******************************************************************* -->
<Template brand="JAC" part="F-32102" size="Other" width="323mm" height="222.25mm" _description="Rectangular labels">
<Template brand="JAC" part="F-32102" size="other" width="323mm" height="222.25mm" _description="Rectangular labels">
<Meta category="label"/>
<Meta category="rectangle-label"/>
<Label-rectangle id="0" width="32mm" height="102mm" round="2.5mm" x_waste="2.5mm" y_waste="2.5mm">
@@ -587,7 +587,7 @@
<!-- ******************************************************************* -->
<!-- JAC F-68102 PVC labels, 8 per sheet -->
<!-- ******************************************************************* -->
<Template brand="JAC" part="F-68102" size="Other" width="323mm" height="222.25mm" _description="Elliptical labels">
<Template brand="JAC" part="F-68102" size="other" width="323mm" height="222.25mm" _description="Elliptical labels">
<Meta category="label"/>
<Meta category="elliptical-label"/>
<Label-ellipse id="0" width="68mm" height="102mm" waste="2.5mm">
@@ -599,7 +599,7 @@
<!-- ******************************************************************* -->
<!-- JAC F-102150 PVC labels, 4 per sheet -->
<!-- ******************************************************************* -->
<Template brand="JAC" part="F-102150" size="Other" width="323mm" height="222.25mm" _description="Elliptical labels">
<Template brand="JAC" part="F-102150" size="other" width="323mm" height="222.25mm" _description="Elliptical labels">
<Meta category="label"/>
<Meta category="elliptical-label"/>
<Label-ellipse id="0" width="150mm" height="102mm" waste="2mm">
templates/misc-other-templates.xml
+1 -1
View File
@@ -37,7 +37,7 @@
<!-- =================================================================== -->
<!-- OfficeMax 86112: Multipurpose labels, 2'' x 4'', 3 per sheet -->
<!-- =================================================================== -->
<Template brand="OfficeMax" part="86112" size="Other" width="297pt" height="450pt"
<Template brand="OfficeMax" part="86112" size="other" width="297pt" height="450pt"
_description="Multipurpose labels">
<Meta category="label"/>
<Label-rectangle id="0" width="288pt" height="144pt" round="9pt" waste="0pt">
translations/glabels_C.ts
+47
View File
@@ -756,6 +756,42 @@
<source>&amp;Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Product information</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Vendor:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Part #:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Description:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Page size:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Label size:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Layout:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>StartupView</name>
@@ -2079,6 +2115,17 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::SelectProductDialog</name>
<message>
<source>List View</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Grid View</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::SimplePreview</name>
<message>