reformat
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
parent
18df74394a
commit
5681751ab4
@ -1,14 +1,15 @@
|
|||||||
#include "IconImageProvider.h"
|
#include "IconImageProvider.h"
|
||||||
|
|
||||||
IconImageProvider::IconImageProvider(std::shared_ptr<IconList> iconList, int iconSize) : QQuickImageProvider(QQuickImageProvider::Pixmap), m_iconList(iconList), m_iconSize(iconSize)
|
IconImageProvider::IconImageProvider(std::shared_ptr<IconList> iconList, int iconSize)
|
||||||
{
|
: QQuickImageProvider(QQuickImageProvider::Pixmap), m_iconList(iconList), m_iconSize(iconSize)
|
||||||
}
|
{}
|
||||||
|
|
||||||
QPixmap IconImageProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
|
QPixmap IconImageProvider::requestPixmap(const QString& id, QSize* size, const QSize& requestedSize)
|
||||||
{
|
{
|
||||||
if (size)
|
if (size)
|
||||||
*size = QSize(m_iconSize, m_iconSize);
|
*size = QSize(m_iconSize, m_iconSize);
|
||||||
|
|
||||||
QIcon i = m_iconList->getIcon(id);
|
QIcon i = m_iconList->getIcon(id);
|
||||||
return i.pixmap(requestedSize.width() > 0 ? requestedSize.width() : m_iconSize, requestedSize.height() > 0 ? requestedSize.height() : m_iconSize);
|
return i.pixmap(requestedSize.width() > 0 ? requestedSize.width() : m_iconSize,
|
||||||
|
requestedSize.height() > 0 ? requestedSize.height() : m_iconSize);
|
||||||
}
|
}
|
||||||
|
@ -3,14 +3,13 @@
|
|||||||
|
|
||||||
#include <QQuickImageProvider>
|
#include <QQuickImageProvider>
|
||||||
|
|
||||||
class IconImageProvider : public QQuickImageProvider
|
class IconImageProvider : public QQuickImageProvider {
|
||||||
{
|
public:
|
||||||
public:
|
|
||||||
IconImageProvider(std::shared_ptr<IconList> iconList, int iconSize = 48);
|
IconImageProvider(std::shared_ptr<IconList> iconList, int iconSize = 48);
|
||||||
|
|
||||||
QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override;
|
QPixmap requestPixmap(const QString& id, QSize* size, const QSize& requestedSize) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::shared_ptr<IconList> m_iconList;
|
std::shared_ptr<IconList> m_iconList;
|
||||||
int m_iconSize;
|
int m_iconSize;
|
||||||
};
|
};
|
||||||
|
@ -62,7 +62,7 @@ void InstancesView::switchDisplayMode(InstancesView::DisplayMode mode)
|
|||||||
QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
|
QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
|
||||||
setCurrentWidget(m_table);
|
setCurrentWidget(m_table);
|
||||||
} else {
|
} else {
|
||||||
//m_grid->selectionModel()->setCurrentIndex(m_gridProxy->mapFromSource(sourceIndex),
|
// m_grid->selectionModel()->setCurrentIndex(m_gridProxy->mapFromSource(sourceIndex),
|
||||||
// QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
|
// QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
|
||||||
setCurrentWidget(m_grid);
|
setCurrentWidget(m_grid);
|
||||||
}
|
}
|
||||||
@ -151,8 +151,8 @@ void InstancesView::createGrid()
|
|||||||
m_grid->setContextMenuPolicy(Qt::CustomContextMenu);
|
m_grid->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||||
m_grid->show();
|
m_grid->show();
|
||||||
|
|
||||||
//connect(m_grid, &QAbstractItemView::doubleClicked, this, &InstancesView::activateInstance);
|
// connect(m_grid, &QAbstractItemView::doubleClicked, this, &InstancesView::activateInstance);
|
||||||
//connect(m_grid->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &InstancesView::currentRowChanged);
|
// connect(m_grid->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &InstancesView::currentRowChanged);
|
||||||
connect(m_grid, &QWidget::customContextMenuRequested, this, &InstancesView::contextMenuRequested);
|
connect(m_grid, &QWidget::customContextMenuRequested, this, &InstancesView::contextMenuRequested);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -19,9 +19,9 @@
|
|||||||
|
|
||||||
#include <QAbstractItemView>
|
#include <QAbstractItemView>
|
||||||
#include <QListView>
|
#include <QListView>
|
||||||
|
#include <QQuickWidget>
|
||||||
#include <QStackedWidget>
|
#include <QStackedWidget>
|
||||||
#include <QTableView>
|
#include <QTableView>
|
||||||
#include <QQuickWidget>
|
|
||||||
|
|
||||||
#include "BaseInstance.h"
|
#include "BaseInstance.h"
|
||||||
#include "InstanceList.h"
|
#include "InstanceList.h"
|
||||||
@ -71,7 +71,7 @@ class InstancesView : public QStackedWidget {
|
|||||||
void contextMenuRequested(const QPoint pos);
|
void contextMenuRequested(const QPoint pos);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool eventFilter(QObject *obj, QEvent *event) override;
|
bool eventFilter(QObject* obj, QEvent* event) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void createTable();
|
void createTable();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user