Bugs fixed

diff --git a/debian/changelog b/debian/changelog
index 0149223..381ab10 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qstardict (0.13.2-3) unstable; urgency=low
+
+  * Some bugs fixed
+
+ -- SR <sbir@list.ru>  Sun, 31 Jan 2010 19:50:00 +0300
+
 qstardict (0.13.2-2) unstable; urgency=low
 
   * Some bugs fixed

diff --git a/debian/control b/debian/control
index 94aa014..38d562c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: qstardict
-Version: 0.13.2-2
+Version: 0.13.2-3
 Section: user/office
 Priority: optional
 Maintainer: Alexander R <sbir@list.ru>

diff --git a/plugins/stardict/settingsdialog.cpp b/plugins/stardict/settingsdialog.cpp
index 795e0c0..b59d705 100644 (file)
--- a/plugins/stardict/settingsdialog.cpp
+++ b/plugins/stardict/settingsdialog.cpp
@@ -28,7 +28,7 @@ SettingsDialog::SettingsDialog(StarDict *plugin, QWidget *parent)
 {
     setupUi(this);
 
-    reformatListsBox->setChecked(m_plugin->m_reformatLists);
+    //reformatListsBox->setChecked(m_plugin->m_reformatLists);
     expandAbbreviationsBox->setChecked(m_plugin->m_expandAbbreviations);
     dictDirsList->addItems(m_plugin->m_dictDirs);
     dictDirsList->setProperty("FingerScrollable", true);

diff --git a/plugins/stardict/settingsdialog.ui b/plugins/stardict/settingsdialog.ui
index 6a66a0d..b6b5666 100644 (file)
--- a/plugins/stardict/settingsdialog.ui
+++ b/plugins/stardict/settingsdialog.ui
@@ -30,6 +30,9 @@
        <property name="text">
         <string>Expand abbreviations</string>
        </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item row="0" column="2">

diff --git a/plugins/web/settingsdialog.cpp b/plugins/web/settingsdialog.cpp
index 614271d..e2eb2eb 100644 (file)
--- a/plugins/web/settingsdialog.cpp
+++ b/plugins/web/settingsdialog.cpp
@@ -103,9 +103,12 @@ void SettingsDialog::on_addDictButton_clicked()
 
 void SettingsDialog::on_removeDictButton_clicked()
 {
-    QListWidgetItem *item = dictsList->takeItem(dictsList->currentRow());
-    m_dicts.remove(item->text());
-    delete item;
+    if(dictsList->count()) {
+        QListWidgetItem *item = dictsList->takeItem(dictsList->currentRow());
+    //if(item) {
+        m_dicts.remove(item->text());
+        delete item;
+    }
 }
 
 void SettingsDialog::refresh()

diff --git a/qstardict/mainwindow.cpp b/qstardict/mainwindow.cpp
index cdc3eb1..ceeb3e0 100644 (file)
--- a/qstardict/mainwindow.cpp
+++ b/qstardict/mainwindow.cpp
@@ -52,10 +52,10 @@ MainWindow::MainWindow(QWidget *parent)
     QFont font;
     font.setPointSize(16);
 
-    menu_File->insertActions(actionQuit, translationView->toolBar()->actions());
+    menu->insertActions(actionQuit, translationView->toolBar()->actions());
 
     QAction *actionWordsListDock = wordsListDock->toggleViewAction();
-    menu_Options->insertAction(menu_Options->actions().first(), actionWordsListDock);
+    menu->insertAction(menu->actions().first(), actionWordsListDock);
     actionWordsListDock->setFont(font);
     //wordsList->setProperty("FingerScrollable", true);
     //translationView->setProperty("FingerScrollable", true);

diff --git a/qstardict/mainwindow.ui b/qstardict/mainwindow.ui
index 8f55516..0f5264b 100644 (file)
--- a/qstardict/mainwindow.ui
+++ b/qstardict/mainwindow.ui
@@ -144,30 +144,21 @@
      <pointsize>16</pointsize>
     </font>
    </property>
-   <widget class="QMenu" name="menu_File">
-    <property name="title">
-     <string>&amp;File</string>
+   <widget class="QMenu" name="menu">
+    <property name="acceptDrops">
+     <bool>true</bool>
     </property>
-    <addaction name="actionQuit"/>
-   </widget>
-   <widget class="QMenu" name="menuHelp">
     <property name="title">
-     <string>&amp;Help</string>
+     <string>Menu</string>
     </property>
+    <addaction name="actionSettings"/>
+    <addaction name="actionScan"/>
     <addaction name="actionHelp"/>
     <addaction name="actionAbout"/>
     <addaction name="actionAboutQt"/>
+    <addaction name="actionQuit"/>
    </widget>
-   <widget class="QMenu" name="menu_Options">
-    <property name="title">
-     <string>&amp;Settings</string>
-    </property>
-    <addaction name="actionScan"/>
-    <addaction name="actionSettings"/>
-   </widget>
-   <addaction name="menu_File"/>
-   <addaction name="menu_Options"/>
-   <addaction name="menuHelp"/>
+   <addaction name="menu"/>
   </widget>
   <widget class="QDockWidget" name="wordsListDock">
    <property name="features">

diff --git a/qstardict/settingsdialog.cpp b/qstardict/settingsdialog.cpp
index f6a14ef..6c6b1e8 100644 (file)
--- a/qstardict/settingsdialog.cpp
+++ b/qstardict/settingsdialog.cpp
@@ -128,6 +128,8 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 
     connect(m_pluginsModel, SIGNAL(itemChanged(QStandardItem*)),
             SLOT(pluginsItemChanged(QStandardItem*)));
+    connect(m_dictsModel, SIGNAL(itemChanged(QStandardItem*)),
+            SLOT(dictionariesItemChanged(QStandardItem*)));
 }
 
 void SettingsDialog::accept()
@@ -215,6 +217,7 @@ void SettingsDialog::loadDictsList()
         QStandardItem *item = new QStandardItem();
         item->setCheckable(true);
         item->setCheckState(Qt::Checked);
+        item->setText("V");
         m_dictsModel->setItem(i, 0, item);
         m_dictsModel->setItem(i, 1, new QStandardItem(loadedDicts[i].name()));
         m_dictsModel->setItem(i, 2, new QStandardItem(loadedDicts[i].plugin()));
@@ -227,6 +230,7 @@ void SettingsDialog::loadDictsList()
             QStandardItem *item = new QStandardItem();
             item->setCheckable(true);
             item->setCheckState(Qt::Unchecked);
+            item->setText("O");
             m_dictsModel->setItem(i, 0, item);
             m_dictsModel->setItem(i, 1, new QStandardItem(iter->name()));
             m_dictsModel->setItem(i, 2, new QStandardItem(iter->plugin()));
@@ -246,6 +250,7 @@ void SettingsDialog::loadPluginsList()
         QStandardItem *item = new QStandardItem();
         item->setCheckable(true);
         item->setCheckState(loaded.contains(plugins[i]) ? Qt::Checked : Qt::Unchecked);
+        item->setText(loaded.contains(plugins[i]) ? "V" : "O");
         m_pluginsModel->setItem(i, 0, item);
         m_pluginsModel->setItem(i, 1, new QStandardItem(plugins[i]));
     }
@@ -329,12 +334,21 @@ void SettingsDialog::pluginsItemChanged(QStandardItem *item)
         for (int i = 0; i < rowCount; ++i)
             if (m_pluginsModel->item(i, 0)->checkState() == Qt::Checked)
                 loadedPlugins << m_pluginsModel->item(i, 1)->text();
+        item->setText(item->checkState() ? "V" : "O");
         dict->setLoadedPlugins(loadedPlugins);
         dict->reloadDicts();
         loadDictsList();
     }
 }
 
+void SettingsDialog::dictionariesItemChanged(QStandardItem *item)
+{
+    if (item->isCheckable())
+    {
+        item->setText(item->checkState() ? "V" : "O");
+    }
+}
+
 void SettingsDialog::closeEvent(QCloseEvent *event)
 {
     SettingsDialog::accept();

diff --git a/qstardict/settingsdialog.h b/qstardict/settingsdialog.h
index 11c904d..59fcd32 100644 (file)
--- a/qstardict/settingsdialog.h
+++ b/qstardict/settingsdialog.h
@@ -59,6 +59,7 @@ class SettingsDialog: public QDialog, private Ui::SettingsDialog
         void on_pluginsShowInfoButton_clicked();
         void on_pluginsConfigureButton_clicked();
         void pluginsItemChanged(QStandardItem *item);
+        void dictionariesItemChanged(QStandardItem *item);
 
     private slots:
         void loadDictsList();

diff --git a/qstardict/settingsdialog.ui b/qstardict/settingsdialog.ui
index 3f0f4df..9db5632 100644 (file)
--- a/qstardict/settingsdialog.ui
+++ b/qstardict/settingsdialog.ui
@@ -252,6 +252,9 @@
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QTableView" name="pluginsTableView">
+         <property name="midLineWidth">
+          <number>0</number>
+         </property>
          <property name="editTriggers">
           <set>QAbstractItemView::NoEditTriggers</set>
          </property>