From 421a46e3d3036ea0dea4889125ee58309d0ed21e Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Mon, 30 Jun 2014 02:02:57 +0200
Subject: Redo the console window. Log is now a page. Console window has
relevant pages.
Dirty fix for screenshot thumbnail generation. Needs more QTimer.
---
gui/widgets/IconLabel.cpp | 2 +-
gui/widgets/PageContainer.cpp | 6 ++++++
gui/widgets/PageContainer.h | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
(limited to 'gui/widgets')
diff --git a/gui/widgets/IconLabel.cpp b/gui/widgets/IconLabel.cpp
index 1bfe8dc9..773f0b99 100644
--- a/gui/widgets/IconLabel.cpp
+++ b/gui/widgets/IconLabel.cpp
@@ -7,7 +7,7 @@
#include <QRect>
IconLabel::IconLabel(QWidget *parent, QIcon icon, QSize size)
- : QWidget(parent), m_icon(icon), m_size(size)
+ : QWidget(parent), m_size(size), m_icon(icon)
{
setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
}
diff --git a/gui/widgets/PageContainer.cpp b/gui/widgets/PageContainer.cpp
index fd2a1e28..237e7224 100644
--- a/gui/widgets/PageContainer.cpp
+++ b/gui/widgets/PageContainer.cpp
@@ -138,6 +138,12 @@ void PageContainer::addButtons(QWidget *buttons)
m_layout->addWidget(buttons, 2, 0, 1, 2);
}
+void PageContainer::addButtons(QLayout *buttons)
+{
+ m_layout->addLayout(buttons, 2, 0, 1, 2);
+}
+
+
void PageContainer::showPage(int row)
{
if(row != -1)
diff --git a/gui/widgets/PageContainer.h b/gui/widgets/PageContainer.h
index d56c6bff..c0f17e90 100644
--- a/gui/widgets/PageContainer.h
+++ b/gui/widgets/PageContainer.h
@@ -18,6 +18,7 @@
#include <QModelIndex>
#include <gui/pages/BasePageProvider.h>
+class QLayout;
class IconLabel;
class QSortFilterProxyModel;
class PageModel;
@@ -36,6 +37,7 @@ public:
virtual ~PageContainer() {};
void addButtons(QWidget * buttons);
+ void addButtons(QLayout * buttons);
bool requestClose(QCloseEvent *event);
private:
--
cgit