- 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:
+167
-24
@@ -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 = selectedItem() )
|
||||
{
|
||||
if (auto *tItem = dynamic_cast<TemplatePickerItem*>(items.first()))
|
||||
{
|
||||
return tItem->tmplate();
|
||||
}
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user