napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

There are no Category items any more.

Browse Source 
As of this commit, the ProgressTree{Model,View} behaves like a flat
list model/view.
This commit is contained in:
Teo Mrnjavac 2015-06-19 22:45:53 +02:00
parent 02a8226b76
commit 6de46fcd25
2 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/calamares/progresstree/ProgressTreeDelegate.cpp
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -30,8 +30,7 @@
#include <QPainter> #include <QPainter>
#define ITEM_MARGIN 12 #define ITEM_MARGIN 12
#define VS_FONTSIZE CalamaresUtils::defaultFontSize() + 2 #define VS_FONTSIZE CalamaresUtils::defaultFontSize() + 4
#define CAT_FONTSIZE CalamaresUtils::defaultFontSize() + 5
ProgressTreeDelegate::ProgressTreeDelegate( QAbstractItemView* parent ) ProgressTreeDelegate::ProgressTreeDelegate( QAbstractItemView* parent )
: QStyledItemDelegate( parent ) : QStyledItemDelegate( parent )
@ -47,18 +46,9 @@ ProgressTreeDelegate::sizeHint( const QStyleOptionViewItem& option,
if ( !index.isValid() ) if ( !index.isValid() )
return option.rect.size(); return option.rect.size();
bool isFirstLevel = !index.parent().isValid();
QFont font = qApp->font(); QFont font = qApp->font();
if ( isFirstLevel ) font.setPointSize( VS_FONTSIZE );
{
font.setPointSize( CAT_FONTSIZE );
}
else
{
font.setPointSize( VS_FONTSIZE );
}
QFontMetrics fm( font ); QFontMetrics fm( font );
int height = fm.height(); int height = fm.height();
@ -87,43 +77,18 @@ ProgressTreeDelegate::paint( QPainter* painter,
painter->setPen( QColor( Calamares::Branding::instance()-> painter->setPen( QColor( Calamares::Branding::instance()->
styleString( Calamares::Branding::SidebarText ) ) ); styleString( Calamares::Branding::SidebarText ) ) );
if ( isFirstLevel ) paintViewStep( painter, opt, index );
paintCategory( painter, opt, index );
else
paintViewStep( painter, opt, index );
painter->restore(); painter->restore();
} }
void
ProgressTreeDelegate::paintCategory( QPainter* painter,
const QStyleOptionViewItem& option,
const QModelIndex& index ) const
{
QRect textRect = option.rect.adjusted( ITEM_MARGIN,
ITEM_MARGIN,
ITEM_MARGIN,
ITEM_MARGIN );
bool isCurrent = index.data( ProgressTreeModel::ProgressTreeItemCurrentRole ).toBool();
QFont font = qApp->font();
font.setPointSize( CAT_FONTSIZE );
font.setBold( false );
font.setUnderline( isCurrent ); // FIXME: Figure out a nicer way to highlight the current category step
painter->setFont( font );
painter->drawText( textRect, index.data().toString() );
}
void void
ProgressTreeDelegate::paintViewStep( QPainter* painter, ProgressTreeDelegate::paintViewStep( QPainter* painter,
const QStyleOptionViewItem& option, const QStyleOptionViewItem& option,
const QModelIndex& index ) const const QModelIndex& index ) const
{ {
QRect textRect = option.rect.adjusted( ITEM_MARGIN + 32 /*indentation*/, QRect textRect = option.rect.adjusted( ITEM_MARGIN,
ITEM_MARGIN, ITEM_MARGIN,
ITEM_MARGIN, ITEM_MARGIN,
ITEM_MARGIN ); ITEM_MARGIN );

5
src/calamares/progresstree/ProgressTreeDelegate.h
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -35,9 +35,6 @@ protected:
const QModelIndex& index ) const override; const QModelIndex& index ) const override;
private: private:
void paintCategory( QPainter* painter,
const QStyleOptionViewItem& option,
const QModelIndex& index ) const;
void paintViewStep( QPainter* painter, void paintViewStep( QPainter* painter,
const QStyleOptionViewItem& option, const QStyleOptionViewItem& option,
const QModelIndex& index ) const; const QModelIndex& index ) const;