Clean and order documentation in source files. Source ready to beta 2 release

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

diff --git a/src/mdictionary/gui/SearchBarWidget.cpp b/src/mdictionary/gui/SearchBarWidget.cpp
index 0652236..78b1f35 100644 (file)
--- a/src/mdictionary/gui/SearchBarWidget.cpp
+++ b/src/mdictionary/gui/SearchBarWidget.cpp
@@ -19,13 +19,16 @@
 
 *******************************************************************************/
 
-//! \file SearchBarWidget.cpp
-//! \author Mateusz Półrola <mateusz.polrola@comarch.pl>
+/*! \file SearchBarWidget.cpp
+    \brief Displays search bar
+
+    \author Mateusz Półrola <mateusz.polrola@comarch.pl>
+*/
 
 
 #include "SearchBarWidget.h"
 #include <QDebug>
-#include "../../common/DictDialog.h"
+#include "../../include/DictDialog.h"
 #include "HistoryListDialog.h"
 
 
@@ -73,8 +76,9 @@ SearchBarWidget::~SearchBarWidget() {
 
 }
 
-QIcon SearchBarWidget::generateIcon(QIcon oryginal, qreal rotation) {
-    QPixmap p = oryginal.pixmap(64);
+QIcon SearchBarWidget::generateIcon(QIcon original, qreal rotation) {
+    QPixmap p = original.pixmap(64);
+
 
     if(rotation != 0) {
         QMatrix m;
@@ -88,8 +92,20 @@ QIcon SearchBarWidget::generateIcon(QIcon oryginal, qreal rotation) {
 
 
     #ifdef Q_WS_MAEMO_5
-        QPainter painter(&p);
-        painter.fillRect(p.rect(), QColor(0,0,0,192));
+        QImage img = p.toImage();
+
+        for(int i=0; i < img.width(); i++) {
+            for(int j=0; j < img.height(); j++) {
+                QColor c = img.pixel(i,j);
+                if(c != QColor(0,0,0,255)) {
+                    c.setRed(c.red()/2);
+                    c.setGreen(c.green()/2);
+                    c.setBlue(c.blue()/2);
+                    img.setPixel(i, j, c.rgb());
+                }
+            }
+        }
+        p = p.fromImage(img);
 
         newIcon.addPixmap(p, QIcon::Disabled, QIcon::Off);
     #endif
@@ -98,6 +114,10 @@ QIcon SearchBarWidget::generateIcon(QIcon oryginal, qreal rotation) {
 }
 
 
+void SearchBarWidget::setFocus() {
+    searchWordLineEdit->setFocus();
+}
+
 void SearchBarWidget::initializeUI() {
 
     #ifdef Q_WS_MAEMO_5
@@ -120,7 +140,7 @@ void SearchBarWidget::initializeUI() {
 
 
 
-    completerModel = new QStringListModel;
+    completerModel = new QStringListModel(this);
 
 
     lineEditCompleter = new QCompleter(searchWordLineEdit);
@@ -147,7 +167,7 @@ void SearchBarWidget::initializeUI() {
         clearSearchWordToolButton->setMaximumSize(
                 clearSearchWordToolButton->sizeHint().height()/2,
                 clearSearchWordToolButton->sizeHint().height()/2);
-        lineEditLayout->setContentsMargins(0,0,10,0);
+        lineEditLayout->setContentsMargins(0,0,15,0);
     #else
         clearSearchWordToolButton->setIcon(QIcon::fromTheme("edit-clear"));
         clearSearchWordToolButton->setMinimumSize(
@@ -189,7 +209,7 @@ void SearchBarWidget::initializeUI() {
     #endif
 
     searchingProgressBar = new QProgressBar;
-    //progress bar have minimum and maximum values set to 0, which will effect
+    //progress bar has minimum and maximum values set to 0, which will effect
     //with "I'm alive" bar
     searchingProgressBar->setMinimum(0);
     searchingProgressBar->setMaximum(0);