Merge branch 'master' into google

[mdictionary] / trunk / src / base / gui / SearchBarWidget.cpp

diff --git a/trunk/src/base/gui/SearchBarWidget.cpp b/trunk/src/base/gui/SearchBarWidget.cpp
index 6534ef3..6921e26 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,22 +111,19 @@ 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
 
 
     //create layout for lineEdit to have clear button on it
-    QHBoxLayout* lineEditLayout = new QHBoxLayout;
+    QHBoxLayout* lineEditLayout = new QHBoxLayout();
     searchWordLineEdit->setLayout(lineEditLayout);
 
 
@@ -137,11 +134,13 @@ void SearchBarWidget::initializeUI() {
         clearSearchWordToolButton->setMaximumSize(
                 clearSearchWordToolButton->sizeHint().height()/2,
                 clearSearchWordToolButton->sizeHint().height()/2);
+        lineEditLayout->setContentsMargins(0,0,10,0);
     #else
         clearSearchWordToolButton->setIcon(QIcon::fromTheme("edit-clear"));
         clearSearchWordToolButton->setMinimumSize(
-                clearSearchWordToolButton->sizeHint().height(),
-                clearSearchWordToolButton->sizeHint().height());
+                searchWordLineEdit->sizeHint().height()*1.2,
+                searchWordLineEdit->sizeHint().height()*1.2);
+        lineEditLayout->setContentsMargins(0,0,5,0);
     #endif
 
 
@@ -152,9 +151,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 +162,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 +173,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();
@@ -197,7 +187,6 @@ void SearchBarWidget::initializeUI() {
                 fullScreenToolButton->sizeHint().height()*2);
     #endif*/
 
-
     searchingProgressBar = new QProgressBar();
     //progress bar have minimum and maximum values set to 0, which will effect
     //with "I'm alive" bar
@@ -222,8 +211,8 @@ void SearchBarWidget::initializeUI() {
    // horizontalLayout->addWidget(fullScreenToolButton);
 
     //adding clear toolButton to textEdit with right alignment
-    lineEditLayout->addWidget(clearSearchWordToolButton, 0,
-                              Qt::AlignRight | Qt::AlignVCenter);
+    lineEditLayout->addWidget(clearSearchWordToolButton, 0, Qt::AlignRight);
+
 
     verticalLayout->addLayout(horizontalLayout);
 }
@@ -231,7 +220,7 @@ void SearchBarWidget::initializeUI() {
 
 void SearchBarWidget::searchPushButtonClicked() {
     if(_isSearching) {
-        emit stopSearching();
+        Q_EMIT stopSearching();
     }
     else {
         search(searchWordLineEdit->text());
@@ -242,7 +231,7 @@ void SearchBarWidget::searchPushButtonClicked() {
 void SearchBarWidget::search(QString word) {
     if(!_isSearching && !word.isEmpty()) {
         searchWordLineEdit->setText(word);
-        emit searchForTranslations(word);
+        Q_EMIT searchForTranslations(word);
     }
 }
 
@@ -263,7 +252,7 @@ void SearchBarWidget::searchDelay(QString word) {
 void SearchBarWidget::delaySearchTimeout() {
     delayTimer.stop();
     if(!_isSearching) {
-        emit searchForTranslations(delayString);
+        Q_EMIT searchForTranslations(delayString);
     }
 }
 
@@ -291,7 +280,7 @@ void SearchBarWidget::setIdle() {
     searchPushButton->setText(tr("Search"));
     setEnabled(true);
     _isSearching = false;
-    emit refreshHistoryButtons();
+    Q_EMIT refreshHistoryButtons();
 }