normal sizes of buttons in meego/desktop gui

diff --git a/trunk/src/base/gui/SearchBarWidget.cpp b/trunk/src/base/gui/SearchBarWidget.cpp
index 6534ef3..60fd4e6 100644 (file)
--- a/trunk/src/base/gui/SearchBarWidget.cpp
+++ b/trunk/src/base/gui/SearchBarWidget.cpp
@@ -101,7 +101,7 @@ void SearchBarWidget::initializeUI() {
     #ifdef Q_WS_MAEMO_5
         setMaximumHeight(150);
     #else
-        setMaximumHeight(100);
+        setMaximumHeight(70);
     #endif
 
 
@@ -111,17 +111,14 @@ void SearchBarWidget::initializeUI() {
 
     searchPushButton = new QPushButton(tr("Search"));
     searchPushButton->setMinimumWidth(125);
-    #ifndef Q_WS_MAEMO_5
-        searchPushButton->setMinimumHeight(
-                searchPushButton->sizeHint().height()*2);
-    #endif
+
 
     searchWordLineEdit = new QLineEdit();
     searchWordLineEdit->setMinimumWidth(250);
 
     #ifndef Q_WS_MAEMO_5
         searchWordLineEdit->setMinimumHeight(
-                searchWordLineEdit->sizeHint().height()*2);
+                searchWordLineEdit->sizeHint().height()*3/2);
     #endif
 
 
@@ -152,9 +149,6 @@ void SearchBarWidget::initializeUI() {
     #else
         historyNextToolButton->setIcon(
                 generateIcon(QIcon::fromTheme("go-next")));
-        historyNextToolButton->setMinimumSize(
-                clearSearchWordToolButton->sizeHint().height()*2,
-                clearSearchWordToolButton->sizeHint().height()*2);
     #endif
 
 
@@ -166,9 +160,6 @@ void SearchBarWidget::initializeUI() {
     #else
         historyPrevToolButton->setIcon(
                 generateIcon(QIcon::fromTheme("go-previous")));
-        historyPrevToolButton->setMinimumSize(
-                clearSearchWordToolButton->sizeHint().height()*2,
-                clearSearchWordToolButton->sizeHint().height()*2);
     #endif
 
 
@@ -180,9 +171,6 @@ void SearchBarWidget::initializeUI() {
     #else
         historyShowToolButton->setIcon(
                 generateIcon(QIcon::fromTheme("go-up")));
-        historyShowToolButton->setMinimumSize(
-                clearSearchWordToolButton->sizeHint().height()*2,
-                clearSearchWordToolButton->sizeHint().height()*2);
     #endif
 
     /*fullScreenToolButton = new QToolButton();

diff --git a/trunk/src/base/gui/TranslationWidget.cpp b/trunk/src/base/gui/TranslationWidget.cpp
index 2589afc..75ebb51 100644 (file)
--- a/trunk/src/base/gui/TranslationWidget.cpp
+++ b/trunk/src/base/gui/TranslationWidget.cpp
@@ -33,7 +33,6 @@
 TranslationWidget::TranslationWidget(QWidget *parent):
     QScrollArea(parent) {
 
-    qDebug()<<parent;
     #ifdef Q_WS_MAEMO_5
         setAttribute(Qt::WA_Maemo5StackedWindow);
         setWindowFlags(windowFlags() | Qt::Window);

diff --git a/trunk/src/base/gui/WordListWidget.cpp b/trunk/src/base/gui/WordListWidget.cpp
index bde5e7b..e8bc18e 100644 (file)
--- a/trunk/src/base/gui/WordListWidget.cpp
+++ b/trunk/src/base/gui/WordListWidget.cpp
@@ -175,7 +175,7 @@ void WordListWidget::resizeEvent(QResizeEvent *event) {
 }
 
 void WordListWidget::resizeColumns() {
-    setColumnWidth(0, viewport()->width() -checkBoxWidth);
+    setColumnWidth(0, viewport()->width() -checkBoxWidth - 5);
     setColumnWidth(1, checkBoxWidth);
 }