From 434f1707c717e9405e2010ae90ccac5813615ae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Sat, 12 May 2012 11:02:37 +0200
Subject: [PATCH] Fix problems with layout and SearchBanner

---
 src/view/AccountPanel.cpp | 2 +-
 src/view/ExportPanel.cpp  | 2 +-
 src/view/SearchBanner.cpp | 7 +++++++
 src/view/SearchPanel.cpp  | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/view/AccountPanel.cpp b/src/view/AccountPanel.cpp
index 93115da..41cdab9 100644
--- a/src/view/AccountPanel.cpp
+++ b/src/view/AccountPanel.cpp
@@ -318,7 +318,7 @@ void AccountPanel::InitStatsGrid(User* user)
     _statsGrid->item(BALANCE, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
     _statsGrid->item(NON_FIX, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
 
-    _accountsGrid->resizeColumnToContents(0);
+    _statsGrid->resizeColumnToContents(0);
 }
 
 void AccountPanel::ChangeUser()
diff --git a/src/view/ExportPanel.cpp b/src/view/ExportPanel.cpp
index 51221de..2f5ff53 100644
--- a/src/view/ExportPanel.cpp
+++ b/src/view/ExportPanel.cpp
@@ -52,7 +52,7 @@ ExportPanel::ExportPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, parent
 
     hbox->addLayout(vbox2);
 
-    vbox->addLayout(hbox);
+    vbox->addLayout(hbox, 2);
 }
 
 ExportPanel::~ExportPanel()
diff --git a/src/view/SearchBanner.cpp b/src/view/SearchBanner.cpp
index 9e4d26f..70b98f5 100644
--- a/src/view/SearchBanner.cpp
+++ b/src/view/SearchBanner.cpp
@@ -41,12 +41,14 @@ SearchBanner::SearchBanner(KissCount* kiss, QFrame *parent, void* caller, OnButt
     _calendarFrom->setFirstDayOfWeek(Qt::Monday);
     // _calendarFrom->setNavigationBarVisible(false);
     _calendarFrom->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
+    _calendarFrom->setMaximumSize(_calendarFrom->sizeHint());
 
     _calendarTo = new QCalendarWidget(this);
     _calendarTo->setGridVisible(false);
     _calendarTo->setFirstDayOfWeek(Qt::Monday);
     // _calendarTo->setNavigationBarVisible(false);
     _calendarTo->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
+    _calendarTo->setMaximumSize(_calendarTo->sizeHint());
 
   
     _description = new QLineEdit(this);
@@ -65,6 +67,7 @@ SearchBanner::SearchBanner(KissCount* kiss, QFrame *parent, void* caller, OnButt
 	item = new QListWidgetItem(_(categoryIt->name.toStdString().c_str()), _category);
 	item->setCheckState (Qt::Unchecked);
     }
+    _category->setMaximumSize(_category->sizeHint());
 
     _optype = new QListWidget(this);
     item = new QListWidgetItem(_("Fix"), _optype);
@@ -75,6 +78,7 @@ SearchBanner::SearchBanner(KissCount* kiss, QFrame *parent, void* caller, OnButt
     item->setCheckState (Qt::Unchecked);
     item = new QListWidgetItem(_("Not checked"), _optype);
     item->setCheckState (Qt::Unchecked);
+    _optype->setMaximumSize(_optype->sizeHint());
 
     _account = new QListWidget(this);
     item = new QListWidgetItem(_("Unknown"), _account);
@@ -84,6 +88,7 @@ SearchBanner::SearchBanner(KissCount* kiss, QFrame *parent, void* caller, OnButt
 	item = new QListWidgetItem(accountIt->name, _account);
 	item->setCheckState (Qt::Unchecked);
     }
+    _account->setMaximumSize(_account->sizeHint());
 
     QLabel* labelDescription = new QLabel(_("Description"));
     QLabel* labelAmountFrom = new QLabel(_("Amount from"));
@@ -108,6 +113,8 @@ SearchBanner::SearchBanner(KissCount* kiss, QFrame *parent, void* caller, OnButt
     gridBagSizer->addWidget(_optype, 1, 6);
     gridBagSizer->addWidget(labelAccount, 0, 7);
     gridBagSizer->addWidget(_account, 1, 7);
+
+    setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 }
 
 SearchBanner::~SearchBanner()
diff --git a/src/view/SearchPanel.cpp b/src/view/SearchPanel.cpp
index cf64f13..7f1e2f0 100644
--- a/src/view/SearchPanel.cpp
+++ b/src/view/SearchPanel.cpp
@@ -58,7 +58,7 @@ SearchPanel::SearchPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, parent
 
     hbox->addLayout(vbox2);
 
-    vbox->addLayout(hbox);
+    vbox->addLayout(hbox, 2);
 }
 
 SearchPanel::~SearchPanel()