Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

diff --git a/trunk/src/base/gui/DictManagerWidget.cpp b/trunk/src/base/gui/DictManagerWidget.cpp
index c8a1659..aee710e 100644 (file)
--- a/trunk/src/base/gui/DictManagerWidget.cpp
+++ b/trunk/src/base/gui/DictManagerWidget.cpp
@@ -163,6 +163,7 @@ void DictManagerWidget::hideEvent(QHideEvent *e)
 
 
 void DictManagerWidget::addNewDictButtonClicked() {
+    #ifndef Q_WS_MAEMO_5
     if(!_changed || QMessageBox::question(this,
             "Save", "Do you want to save changes?",
             QMessageBox::Save, QMessageBox::Cancel) == QMessageBox::Save) {
@@ -170,6 +171,7 @@ void DictManagerWidget::addNewDictButtonClicked() {
         saveChanges();
         _save = false;
     }
+    #endif
 
    CommonDictInterface* selectedPlugin =
            DictTypeSelectDialog::addNewDict(guiInterface->getPlugins(),this);
@@ -203,6 +205,7 @@ void DictManagerWidget::removeButtonClicked() {
 }
 
 void DictManagerWidget::settingsButtonClicked() {
+    #ifndef Q_WS_MAEMO_5
     if(!_changed || QMessageBox::question(this,
             "Save", "Do you want to save changes?",
             QMessageBox::Save, QMessageBox::Cancel) == QMessageBox::Save) {
@@ -210,6 +213,7 @@ void DictManagerWidget::settingsButtonClicked() {
         saveChanges();
         _save = false;
     }
+    #endif
    QList<QListWidgetItem*> selected = dictListWidget->selectedItems();
    if(selected.count() > 0) {
        dictsHash[selected[0]]->dictDialog()->changeSettings(this);

diff --git a/trunk/src/base/gui/SearchBarWidget.h b/trunk/src/base/gui/SearchBarWidget.h
index 25eed8b..1972053 100644 (file)
--- a/trunk/src/base/gui/SearchBarWidget.h
+++ b/trunk/src/base/gui/SearchBarWidget.h
@@ -60,6 +60,10 @@ Q_SIGNALS:
     void historyNext();
 
     //! Requests to show history list
+    /*!
+      \param p this argument is used only on desktop, it defines place on
+      which popup with history will be shown
+    */
     void historyShow(QPoint p = QPoint(-1,-1));
 
     //! Requests to refresh state of history buttons
@@ -77,37 +81,49 @@ public Q_SLOTS:
     //! Sets search bar in busy state
     /*!
       Displays "busy" bar and disables search word text edit and history buttons
-      */
+    */
     void setBusy();
 
     //! Sets search bar in idle state
     /*!
       Hides "busy" bar and enables all widgets, refreshes state of history buttons
       by emitting refreshHistoryButtons signal
-      */
+    */
     void setIdle();
 
     //! Searches for given word
     /*!
       Sets word as text in search word line edit
-      */
+    */
     void search(QString word);
 
-    //! Starts to search for given word after 500 ms
+    //! Starts to search for given word after 500 ms delay
     /*!
       Sets word as text in search word line edit, and waits 500 ms to start
       search. If in meanwhile this slot is called again it will stop previous
       timers.
-      */
+    */
     void searchDelay(QString word);
 
     //! Updates state of history buttons
+    /*!
+      \param prev if set to true, the history have some previous words
+      \param next if set to true, the history have some next words
+      \param list if set to true, the history can show word list
+    */
     void updateHistoryButtons(bool prev, bool next, bool list);
 
 private Q_SLOTS:
+    //! Clears search word line edit
     void clearSearchWordToolButtonClicked();
+
+    //! Starts to search for given words
     void searchPushButtonClicked();
+
+    //! starts to search word wich was passed to searchDelay
     void delaySearchTimeout();
+
+    //! shows history
     void showHistoryButtonClicked();
 
 
@@ -124,6 +140,8 @@ private:
     QHBoxLayout* horizontalLayout;
     QProgressBar* searchingProgressBar;
 
+
+    //! generates icon for maemo
     QIcon generateIcon(QIcon oryginal, qreal rotation=0);
 
     QVBoxLayout* verticalLayout;