Russian translation. Gui fix.

diff --git a/qstardict/dictwidget.cpp b/qstardict/dictwidget.cpp
index 12cd2e1..5bbaafa 100644 (file)
--- a/qstardict/dictwidget.cpp
+++ b/qstardict/dictwidget.cpp
@@ -115,6 +115,12 @@ DictWidget::DictWidget(QWidget *parent, Qt::WindowFlags f)
     setLayout(layout);
 }
 
+void DictWidget::toggleToolBar(bool CheckedState)
+{
+    CheckedState ? this->m_toolBar->show() : this->m_toolBar->hide();
+    //m_toolBar->setVisible(CheckedState);
+}
+
 void DictWidget::translate(const QString &str)
 {
     m_translationView->setSource(QUrl("qstardict:" + str));
@@ -133,7 +139,7 @@ void DictWidget::saveToFile()
     QFileDialog dialog(this, tr("Save translation"),
                        dir.path(), filter); //updated by Frank
        dialog.selectFile(translatedWord());//added by Frank
-    dialog.setNameFilters(QStringList() << tr("HTML files (*.html *.htm)") << tr("Text files (*.txt)"));//updated by Frank
+    dialog.setNameFilters(QStringList() << tr("HTML files (*.html, *.htm)") << tr("Text files (*.txt)"));//updated by Frank
     dialog.selectNameFilter(filter); //added by Frank
 
        if (dialog.exec() && dialog.selectedFiles().size())

diff --git a/qstardict/dictwidget.h b/qstardict/dictwidget.h
index 1a31b63..9cf5001 100644 (file)
--- a/qstardict/dictwidget.h
+++ b/qstardict/dictwidget.h
@@ -92,6 +92,8 @@ class DictWidget: public QFrame
         void reload()
         { m_translationView->reload(); }
 
+        void toggleToolBar(bool CheckedState);
+
     signals:
         /**
          * Emits when translated word is shown.

diff --git a/qstardict/mainwindow.cpp b/qstardict/mainwindow.cpp
index cdc3eb1..fffe6e2 100644 (file)
--- a/qstardict/mainwindow.cpp
+++ b/qstardict/mainwindow.cpp
@@ -107,6 +107,8 @@ void MainWindow::loadSettings()
     wordsListDock->setGeometry(config.value("MainWindow/wordsListDock/geometry", wordsListDock->geometry()).toRect());
     setInstantSearch(config.value("MainWindow/instantSearch", true).toBool());
     setDefaultStyleSheet(config.value("MainWindow/defaultStyleSheet", defaultStyleSheet()).toString());
+    actionToolBar->setChecked(config.value("MainWindow/toolBar",true).toBool());
+    translationView->toggleToolBar(actionToolBar->isChecked());
 }
 
 void MainWindow::saveSettings()
@@ -119,17 +121,16 @@ void MainWindow::saveSettings()
     config.setValue("MainWindow/wordsListDock/geometry", wordsListDock->geometry());
     config.setValue("MainWindow/instantSearch", m_instantSearch);
     config.setValue("MainWindow/defaultStyleSheet", defaultStyleSheet());
+    config.setValue("MainWindow/toolBar", actionToolBar->isChecked());
 }
 
 void MainWindow::on_actionAbout_triggered()
 {
     QMessageBox::about(this,
             tr("About QStarDict"),
-            tr("<b>QStarDict %1 </b> - Qt version of StarDict<br>").arg(QSTARDICT_VERSION) +
-            tr("Copyright (C) 2007-2009 Alexander Rodin "
-               "<a href=\"http://qstardict.ylsoftware.com\">http://qstardict.ylsoftware.com</a><br>"
-               "Package by SR<br>"
-               "<a href=\"http://sr.uz\">http://sr.uz</a>"));
+            tr("<b>QStarDict %1 </b> - Qt version of StarDict ").arg(QSTARDICT_VERSION) +
+            tr("Copyright (C) 2007-2009 Alexander Rodin<br>"
+               "Package by SR"));
 }
 
 void MainWindow::on_actionSettings_triggered()
@@ -254,6 +255,12 @@ void MainWindow::closeEvent(QCloseEvent *event)
     QMainWindow::closeEvent(event);
 }
 
+void MainWindow::on_actionToolBar_toggled(bool CheckedState)
+{
+    translationView->toggleToolBar(CheckedState);
+    //CheckedState ? translationView->m_toolBar->hide() : translationView->m_toolBar->show();
+}
+
 }
 
 // vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab cindent textwidth=120 formatoptions=tc

diff --git a/qstardict/mainwindow.h b/qstardict/mainwindow.h
index 7d7cc82..7b8e002 100644 (file)
--- a/qstardict/mainwindow.h
+++ b/qstardict/mainwindow.h
@@ -102,6 +102,7 @@ class MainWindow: public QMainWindow, private Ui::MainWindow
         void on_actionSettings_triggered();
         void on_actionHelp_triggered();
         void on_queryButton_clicked();
+        void on_actionToolBar_toggled(bool CheckedState);
 
         void wordsListItemActivated(QListWidgetItem *item);
         void wordTranslated(const QString &word);

diff --git a/qstardict/mainwindow.ui b/qstardict/mainwindow.ui
index 8f55516..3a52cec 100644 (file)
--- a/qstardict/mainwindow.ui
+++ b/qstardict/mainwindow.ui
@@ -14,7 +14,7 @@
    <string>QStarDict</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="pixmaps/pixmaps.qrc">
     <normaloff>:/icons/qstardict.png</normaloff>:/icons/qstardict.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
@@ -25,7 +25,7 @@
     <property name="spacing">
      <number>6</number>
     </property>
-    <item row="0" column="0">
+    <item row="1" column="0">
      <layout class="QHBoxLayout">
       <property name="spacing">
        <number>6</number>
@@ -54,7 +54,7 @@
          <string>Clear</string>
         </property>
         <property name="icon">
-         <iconset>
+         <iconset resource="pixmaps/pixmaps.qrc">
           <normaloff>:/icons/clear-right.png</normaloff>:/icons/clear-right.png</iconset>
         </property>
         <property name="iconSize">
@@ -109,7 +109,7 @@
          <string>Search</string>
         </property>
         <property name="icon">
-         <iconset>
+         <iconset resource="pixmaps/pixmaps.qrc">
           <normaloff>:/icons/search-filter.png</normaloff>:/icons/search-filter.png</iconset>
         </property>
         <property name="iconSize">
@@ -125,7 +125,7 @@
       </item>
      </layout>
     </item>
-    <item row="1" column="0">
+    <item row="0" column="0">
      <widget class="DictWidget" name="translationView" native="true"/>
     </item>
    </layout>
@@ -136,7 +136,7 @@
      <x>0</x>
      <y>0</y>
      <width>742</width>
-     <height>36</height>
+     <height>34</height>
     </rect>
    </property>
    <property name="font">
@@ -163,6 +163,7 @@
      <string>&amp;Settings</string>
     </property>
     <addaction name="actionScan"/>
+    <addaction name="actionToolBar"/>
     <addaction name="actionSettings"/>
    </widget>
    <addaction name="menu_File"/>
@@ -204,7 +205,7 @@
   </widget>
   <action name="actionQuit">
    <property name="icon">
-    <iconset>
+    <iconset resource="pixmaps/pixmaps.qrc">
      <normaloff>:/icons/application-exit.png</normaloff>:/icons/application-exit.png</iconset>
    </property>
    <property name="text">
@@ -241,7 +242,7 @@
   </action>
   <action name="actionSettings">
    <property name="icon">
-    <iconset>
+    <iconset resource="pixmaps/pixmaps.qrc">
      <normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset>
    </property>
    <property name="text">
@@ -268,7 +269,7 @@
   </action>
   <action name="actionHelp">
    <property name="icon">
-    <iconset>
+    <iconset resource="pixmaps/pixmaps.qrc">
      <normaloff>:/icons/help-contents.png</normaloff>:/icons/help-contents.png</iconset>
    </property>
    <property name="text">
@@ -283,6 +284,17 @@
     <string>F1</string>
    </property>
   </action>
+  <action name="actionToolBar">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>ToolBar</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
@@ -297,7 +309,9 @@
   <tabstop>wordsList</tabstop>
   <tabstop>searchClearButton</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="pixmaps/pixmaps.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>searchClearButton</sender>

diff --git a/qstardict/settingsdialog.cpp b/qstardict/settingsdialog.cpp
index 6c6b1e8..1524f1d 100644 (file)
--- a/qstardict/settingsdialog.cpp
+++ b/qstardict/settingsdialog.cpp
@@ -217,7 +217,7 @@ void SettingsDialog::loadDictsList()
         QStandardItem *item = new QStandardItem();
         item->setCheckable(true);
         item->setCheckState(Qt::Checked);
-        item->setText("V");
+        //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()));
@@ -230,7 +230,7 @@ void SettingsDialog::loadDictsList()
             QStandardItem *item = new QStandardItem();
             item->setCheckable(true);
             item->setCheckState(Qt::Unchecked);
-            item->setText("O");
+            //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()));
@@ -250,7 +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");
+        //item->setText(loaded.contains(plugins[i]) ? "V" : "O");
         m_pluginsModel->setItem(i, 0, item);
         m_pluginsModel->setItem(i, 1, new QStandardItem(plugins[i]));
     }
@@ -334,6 +334,7 @@ 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();
@@ -341,13 +342,13 @@ void SettingsDialog::pluginsItemChanged(QStandardItem *item)
     }
 }
 
-void SettingsDialog::dictionariesItemChanged(QStandardItem *item)
-{
-    if (item->isCheckable())
-    {
-        item->setText(item->checkState() ? "V" : "O");
-    }
-}
+//void SettingsDialog::dictionariesItemChanged(QStandardItem *item)
+//{
+//    if (item->isCheckable())
+//    {
+//        item->setText(item->checkState() ? "V" : "O");
+//    }
+//}
 
 void SettingsDialog::closeEvent(QCloseEvent *event)
 {

diff --git a/qstardict/settingsdialog.h b/qstardict/settingsdialog.h
index 59fcd32..6775246 100644 (file)
--- a/qstardict/settingsdialog.h
+++ b/qstardict/settingsdialog.h
@@ -59,7 +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);
+        //void dictionariesItemChanged(QStandardItem *item);
 
     private slots:
         void loadDictsList();

diff --git a/qstardict/settingsdialog.ui b/qstardict/settingsdialog.ui
index 9db5632..bc37f4f 100644 (file)
--- a/qstardict/settingsdialog.ui
+++ b/qstardict/settingsdialog.ui
@@ -128,6 +128,21 @@
          <attribute name="verticalHeaderMinimumSectionSize">
           <number>24</number>
          </attribute>
+         <attribute name="verticalHeaderDefaultSectionSize">
+          <number>32</number>
+         </attribute>
+         <attribute name="verticalHeaderCascadingSectionResizes">
+          <bool>true</bool>
+         </attribute>
+         <attribute name="horizontalHeaderMinimumSectionSize">
+          <number>60</number>
+         </attribute>
+         <attribute name="verticalHeaderMinimumSectionSize">
+          <number>24</number>
+         </attribute>
+         <attribute name="horizontalHeaderDefaultSectionSize">
+          <number>112</number>
+         </attribute>
         </widget>
        </item>
        <item>
@@ -282,6 +297,21 @@
          <attribute name="verticalHeaderMinimumSectionSize">
           <number>24</number>
          </attribute>
+         <attribute name="verticalHeaderDefaultSectionSize">
+          <number>32</number>
+         </attribute>
+         <attribute name="verticalHeaderCascadingSectionResizes">
+          <bool>true</bool>
+         </attribute>
+         <attribute name="horizontalHeaderMinimumSectionSize">
+          <number>60</number>
+         </attribute>
+         <attribute name="verticalHeaderMinimumSectionSize">
+          <number>24</number>
+         </attribute>
+         <attribute name="horizontalHeaderDefaultSectionSize">
+          <number>112</number>
+         </attribute>
         </widget>
        </item>
        <item>

diff --git a/qstardict/translations/qstardict-ru_RU.ts b/qstardict/translations/qstardict-ru_RU.ts
index 792b9d2..617d30b 100644 (file)
--- a/qstardict/translations/qstardict-ru_RU.ts
+++ b/qstardict/translations/qstardict-ru_RU.ts
@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="ru_RU">
-<defaultcodec></defaultcodec>
+<!DOCTYPE TS>
+<TS version="2.0" language="ru_RU">
 <context>
     <name>QStarDict::CSSEdit</name>
     <message>
-        <location filename="../cssedit.ui" line="16"/>
         <source>Preview</source>
-        <translation>Предварительный просмотр</translation>
+        <translation type="obsolete">Предварительный просмотр</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="30"/>
+        <location filename="cssedit.ui" line="24"/>
         <source>Element</source>
         <translation>Элемент</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="37"/>
+        <location filename="cssedit.ui" line="31"/>
         <source>Foreground</source>
         <translation>Цвет шрифта</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="44"/>
+        <location filename="cssedit.ui" line="38"/>
         <source>Background</source>
         <translation>Цвет фона</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="51"/>
+        <location filename="cssedit.ui" line="45"/>
         <source>Select element</source>
         <translation>Выберите элемент</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="68"/>
+        <location filename="cssedit.ui" line="52"/>
+        <location filename="cssedit.ui" line="62"/>
         <source>Click to select color</source>
         <translation>Нажмите чтобы выбрать элемент</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="71"/>
+        <location filename="cssedit.ui" line="55"/>
+        <location filename="cssedit.ui" line="65"/>
         <source>#000000</source>
         <translation>#000000</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="78"/>
+        <location filename="cssedit.ui" line="72"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="85"/>
         <source>Size</source>
-        <translation>Размер</translation>
+        <translation type="obsolete">Размер</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="92"/>
+        <location filename="cssedit.ui" line="79"/>
         <source>Select font</source>
         <translation>Выберите шрифт</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="99"/>
+        <location filename="cssedit.ui" line="86"/>
         <source>Select font size</source>
         <translation>Выберите размер шрифта</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="102"/>
+        <location filename="cssedit.ui" line="89"/>
         <source>pt</source>
         <translation>пт</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="127"/>
+        <location filename="cssedit.ui" line="114"/>
         <source>Bold</source>
         <translation>Жирный</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="130"/>
+        <location filename="cssedit.ui" line="117"/>
         <source>B</source>
         <translation>Ж</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="147"/>
+        <location filename="cssedit.ui" line="134"/>
         <source>Italic</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="150"/>
+        <location filename="cssedit.ui" line="137"/>
         <source>I</source>
         <translation>К</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="167"/>
+        <location filename="cssedit.ui" line="154"/>
         <source>Underline</source>
         <translation>Подчеркнутый</translation>
     </message>
     <message>
-        <location filename="../cssedit.ui" line="170"/>
+        <location filename="cssedit.ui" line="157"/>
         <source>U</source>
         <translation>П</translation>
     </message>
@@ -97,7 +97,7 @@
 <context>
     <name>QStarDict::DictBrowser</name>
     <message>
-        <location filename="../dictbrowser.cpp" line="74"/>
+        <location filename="dictbrowser.cpp" line="74"/>
         <source>The word &lt;b&gt;%1&lt;/b&gt; is not found.</source>
         <translation>Слово &lt;b&gt;%1&lt;/b&gt; не найдено.</translation>
     </message>
@@ -105,52 +105,64 @@
 <context>
     <name>QStarDict::DictWidget</name>
     <message>
-        <location filename="../dictwidget.cpp" line="114"/>
+        <location filename="dictwidget.cpp" line="139"/>
         <source>Save translation</source>
         <translation>Сохранить перевод</translation>
     </message>
     <message>
-        <location filename="../dictwidget.cpp" line="135"/>
+        <location filename="dictwidget.cpp" line="142"/>
+        <location filename="dictwidget.cpp" line="150"/>
+        <location filename="dictwidget.cpp" line="164"/>
         <source>HTML files (*.html, *.htm)</source>
         <translation>HTML-файлы (*.html, *.htm)</translation>
     </message>
     <message>
-        <location filename="../dictwidget.cpp" line="124"/>
+        <location filename="dictwidget.cpp" line="137"/>
+        <location filename="dictwidget.cpp" line="142"/>
+        <location filename="dictwidget.cpp" line="153"/>
         <source>Text files (*.txt)</source>
         <translation>Текстовые файлы (*.txt)</translation>
     </message>
     <message>
-        <location filename="../dictwidget.cpp" line="130"/>
+        <location filename="dictwidget.cpp" line="77"/>
+        <source>Previous</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <location filename="dictwidget.cpp" line="82"/>
+        <source>Next</source>
+        <translation>Вперед</translation>
+    </message>
+    <message>
+        <location filename="dictwidget.cpp" line="159"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../dictwidget.cpp" line="131"/>
+        <location filename="dictwidget.cpp" line="160"/>
         <source>Cannot save translation as %1</source>
         <translation>Невозможно сохранить перевод как %1</translation>
     </message>
     <message>
-        <location filename="../dictwidget.cpp" line="75"/>
         <source>Go to &amp;previous translation</source>
-        <translation>Перейти к &amp;предыдущему переводу</translation>
+        <translation type="obsolete">Перейти к &amp;предыдущему переводу</translation>
     </message>
     <message>
-        <location filename="../dictwidget.cpp" line="80"/>
         <source>Go to &amp;next translation</source>
-        <translation>Перейти к &amp;следующему переводу</translation>
+        <translation type="obsolete">Перейти к &amp;следующему переводу</translation>
     </message>
     <message>
-        <location filename="../dictwidget.cpp" line="85"/>
+        <location filename="dictwidget.cpp" line="87"/>
         <source>&amp;Save to file</source>
         <translation>&amp;Сохранить в файл</translation>
     </message>
     <message>
-        <location filename="../dictwidget.cpp" line="91"/>
+        <location filename="dictwidget.cpp" line="102"/>
         <source>Speak &amp;word</source>
         <translation>П&amp;роизнести слово</translation>
     </message>
     <message>
-        <location filename="../dictwidget.cpp" line="88"/>
+        <location filename="dictwidget.cpp" line="97"/>
         <source>Prin&amp;t translation</source>
         <translation>Напечата&amp;ть перевод</translation>
     </message>
@@ -158,107 +170,136 @@
 <context>
     <name>QStarDict::MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="118"/>
+        <location filename="mainwindow.cpp" line="130"/>
         <source>About QStarDict</source>
         <translation>О программе QStarDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="119"/>
+        <location filename="mainwindow.cpp" line="131"/>
+        <source>&lt;b&gt;QStarDict %1 &lt;/b&gt; - Qt version of StarDict </source>
+        <translation>&lt;b&gt;QStarDict %1 &lt;/b&gt; - Qt версия StarDict </translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="132"/>
+        <source>Copyright (C) 2007-2009 Alexander Rodin&lt;br&gt;Package by SR</source>
+        <translatorcomment>Автор программы - Александр Родин&lt;br&gt;Автор пакета - SR (Александр Р.)</translatorcomment>
+        <translation>Copyright (C) 2007-2009 Alexander Rodin&lt;br&gt;Package by SR</translation>
+    </message>
+    <message>
         <source>&lt;b&gt;QStarDict %1 &lt;/b&gt; - Qt version of StarDict&lt;br&gt;</source>
-        <translation>&lt;b&gt;QStarDict %1 &lt;/b&gt; - Qt-версия программы StarDict&lt;br&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;QStarDict %1 &lt;/b&gt; - Qt-версия программы StarDict&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="121"/>
         <source>Copyright (C) 2007-2009 Alexander Rodin &lt;a href=&quot;http://qstardict.ylsoftware.com&quot;&gt;http://qstardict.ylsoftware.com&lt;/a&gt;</source>
-        <translation>Copyright (C) 2007-2009 Александр Родин &lt;a href=&quot;http://qstardict.ylsoftware.com&quot;&gt;http://qstardict.ylsoftware.com&lt;/a&gt;</translation>
+        <translation type="obsolete">Copyright (C) 2007-2009 Александр Родин &lt;a href=&quot;http://qstardict.ylsoftware.com&quot;&gt;http://qstardict.ylsoftware.com&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="13"/>
+        <location filename="mainwindow.ui" line="14"/>
+        <location filename="mainwindow.cpp" line="151"/>
+        <location filename="mainwindow.cpp" line="191"/>
         <source>QStarDict</source>
         <translation>QStarDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="192"/>
+        <location filename="mainwindow.cpp" line="193"/>
+        <location filename="mainwindow.cpp" line="207"/>
         <source>%1 - QStarDict</source>
         <translation>%1 - QStarDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="38"/>
+        <location filename="mainwindow.ui" line="51"/>
         <source>Clear the search box</source>
         <translation>Очистить строку поиска</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="41"/>
+        <location filename="mainwindow.ui" line="54"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="58"/>
+        <location filename="mainwindow.ui" line="106"/>
         <source>Fuzzy query</source>
         <translation>Неточный запрос</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="61"/>
+        <location filename="mainwindow.ui" line="109"/>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="87"/>
+        <location filename="mainwindow.ui" line="181"/>
         <source>Words list</source>
         <translation>Список слов</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="117"/>
+        <location filename="mainwindow.ui" line="225"/>
+        <source>About</source>
+        <translation>О программе</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="249"/>
+        <source>&amp;Configure</source>
+        <translation>&amp;Настройки</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="276"/>
+        <source>Help</source>
+        <translation>Помощь</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="295"/>
+        <source>ToolBar</source>
+        <translation>Панель инструментов</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="149"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="123"/>
+        <location filename="mainwindow.ui" line="155"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="131"/>
+        <location filename="mainwindow.ui" line="163"/>
         <source>&amp;Settings</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="146"/>
+        <location filename="mainwindow.ui" line="212"/>
         <source>&amp;Quit</source>
         <translation>&amp;Выход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="149"/>
+        <location filename="mainwindow.ui" line="220"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="154"/>
         <source>&amp;About</source>
-        <translation>&amp;О программе QStarDict</translation>
+        <translation type="obsolete">&amp;О программе QStarDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="159"/>
+        <location filename="mainwindow.ui" line="235"/>
         <source>About &amp;Qt</source>
         <translation>О &amp;библиотеке Qt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="168"/>
         <source>&amp;Configure QStarDict</source>
-        <translation>&amp;Конфигурация</translation>
+        <translation type="obsolete">&amp;Конфигурация</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="176"/>
+        <location filename="mainwindow.ui" line="262"/>
         <source>&amp;Scan</source>
         <translation>&amp;Сканировать</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="185"/>
         <source>QStarDict &amp;Help</source>
-        <translation>&amp;Справка по QStarDict</translation>
+        <translation type="obsolete">&amp;Справка по QStarDict</translation>
     </message>
     <message>
-        <location filename="../mainwindow.ui" line="188"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>F1</source>
         <translation></translation>
     </message>
@@ -266,340 +307,364 @@
 <context>
     <name>QStarDict::SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.cpp" line="69"/>
+        <location filename="settingsdialog.cpp" line="61"/>
+        <location filename="settingsdialog.cpp" line="70"/>
         <source>Enabled</source>
         <translation>Включен</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="69"/>
+        <location filename="settingsdialog.cpp" line="61"/>
+        <location filename="settingsdialog.cpp" line="70"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="69"/>
+        <location filename="settingsdialog.cpp" line="70"/>
         <source>Plugin</source>
         <translation>Плагин</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="273"/>
+        <location filename="settingsdialog.cpp" line="288"/>
         <source>Information about dictionary &quot;%1&quot;</source>
         <translation>Информация о словаре &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="291"/>
+        <location filename="settingsdialog.cpp" line="289"/>
+        <location filename="settingsdialog.cpp" line="306"/>
         <source>&lt;b&gt;Name:&lt;/b&gt; %1&lt;br&gt;</source>
         <translation>&lt;b&gt;Название:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="275"/>
+        <location filename="settingsdialog.cpp" line="290"/>
         <source>&lt;b&gt;Plugin:&lt;/b&gt; %1&lt;br&gt;</source>
         <translation>&lt;b&gt;Плагин:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="277"/>
+        <location filename="settingsdialog.cpp" line="292"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="295"/>
+        <location filename="settingsdialog.cpp" line="293"/>
+        <location filename="settingsdialog.cpp" line="310"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1</source>
         <translation>&lt;b&gt;Описание:&lt;/b&gt; %1</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="290"/>
+        <location filename="settingsdialog.cpp" line="305"/>
         <source>Information about %1 plugin</source>
         <translation>Информация о плагине %1</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="292"/>
+        <location filename="settingsdialog.cpp" line="307"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;br&gt;</source>
         <translation>&lt;b&gt;Версия:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="293"/>
+        <location filename="settingsdialog.cpp" line="308"/>
         <source>&lt;b&gt;Authors:&lt;/b&gt; %1&lt;br&gt;</source>
         <translation>&lt;b&gt;Авторы:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="293"/>
+        <location filename="settingsdialog.cpp" line="308"/>
         <source>&lt;br&gt;</source>
         <translation>&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="294"/>
+        <location filename="settingsdialog.cpp" line="309"/>
         <source>&lt;b&gt;Can search similar words:&lt;/b&gt; %1&lt;br&gt;</source>
         <translation>&lt;b&gt;Возможность искать похожие слова:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="294"/>
+        <location filename="settingsdialog.cpp" line="309"/>
         <source>yes</source>
         <translation>есть</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="294"/>
+        <location filename="settingsdialog.cpp" line="309"/>
         <source>no</source>
         <translation>нет</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
+        <location filename="settingsdialog.ui" line="14"/>
         <source>QStarDict Settings</source>
         <translation>Настройки QStarDict</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="161"/>
+        <location filename="settingsdialog.ui" line="229"/>
         <source>Show information about dictionary</source>
         <translation>Показать информацию о словаре</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="45"/>
         <source>Global settings</source>
-        <translation>Общие настройки</translation>
+        <translation type="obsolete">Общие настройки</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="58"/>
+        <location filename="settingsdialog.ui" line="51"/>
         <source>Instant search</source>
         <translation>Поиск при наборе</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="73"/>
+        <location filename="settingsdialog.ui" line="66"/>
         <source>Pronounce words using this command:</source>
         <translation>Произносить слова, используя программу:</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="80"/>
+        <location filename="settingsdialog.ui" line="73"/>
         <source>Enter cmd for the speaching program.&lt;br&gt;If cmd contains &quot;%s&quot; it will be replaced to word, else word will be writen to stdin of speech process.</source>
         <translation>Введите команду для запуска программы.&lt;br&gt;Если команда содержит выражение &quot;%s&quot;, оно будет заменено на слово; иначе слово будет записано в стандартный поток ввода процесса.</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="109"/>
+        <location filename="settingsdialog.ui" line="96"/>
         <source>Dictionaries</source>
         <translation>Словари</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="133"/>
+        <location filename="settingsdialog.ui" line="165"/>
         <source>Move up</source>
         <translation>Переместить вверх</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="136"/>
+        <location filename="settingsdialog.ui" line="168"/>
         <source>Up</source>
         <translation>Вверх</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="147"/>
+        <location filename="settingsdialog.ui" line="197"/>
         <source>Move down</source>
         <translation>Переместить вниз</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="150"/>
+        <location filename="settingsdialog.ui" line="200"/>
         <source>Down</source>
         <translation>Вниз</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="164"/>
+        <location filename="settingsdialog.ui" line="232"/>
         <source>Show info</source>
-        <translation>Показывать информацию</translation>
+        <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="199"/>
+        <location filename="settingsdialog.ui" line="265"/>
         <source>Plugins</source>
         <translation>Плагины</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="226"/>
+        <location filename="settingsdialog.ui" line="334"/>
         <source>Show information about plugin</source>
         <translation>Показать информацию о плагине</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="229"/>
+        <location filename="settingsdialog.ui" line="337"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="240"/>
+        <location filename="settingsdialog.ui" line="366"/>
         <source>Configure plugin</source>
         <translation>Настроить плагин</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="243"/>
+        <location filename="settingsdialog.ui" line="369"/>
         <source>Configure</source>
         <translation>Настроить</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="273"/>
+        <location filename="settingsdialog.ui" line="682"/>
+        <source>Fonts</source>
+        <translation>Шрифты</translation>
+    </message>
+    <message>
         <source>Popup window</source>
-        <translation>Всплывающее окно</translation>
+        <translation type="obsolete">Всплывающее окно</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="285"/>
         <source>Behavior</source>
-        <translation>Поведение</translation>
+        <translation type="obsolete">Поведение</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="305"/>
+        <location filename="settingsdialog.ui" line="659"/>
         <source>Pronounce the word</source>
         <translation>Произносить слово</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="322"/>
+        <location filename="settingsdialog.ui" line="617"/>
         <source>Timeout before hide after mouse over</source>
         <translation>Задержка перед скрытием после отведения указателя мыши</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="329"/>
+        <location filename="settingsdialog.ui" line="624"/>
         <source>Don&apos;t hide</source>
         <translation>Не скрывать</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="332"/>
+        <location filename="settingsdialog.ui" line="627"/>
         <source> sec</source>
         <translation>сек</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="367"/>
+        <location filename="settingsdialog.ui" line="573"/>
         <source>Show only if modifier pressed</source>
         <translation>Показывать только если нажата клавиша-модификатор</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="378"/>
+        <location filename="settingsdialog.ui" line="45"/>
+        <source>Global</source>
+        <translation>Общик</translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="402"/>
+        <source>Appearance</source>
+        <translation>Вид</translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="414"/>
+        <source>Popup window appearance</source>
+        <translation>Вид всплывающего окна</translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="539"/>
+        <source>Popup</source>
+        <translation>Popup</translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="584"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="383"/>
+        <location filename="settingsdialog.ui" line="589"/>
         <source>Control</source>
         <translation>Control</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="388"/>
+        <location filename="settingsdialog.ui" line="594"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="393"/>
+        <location filename="settingsdialog.ui" line="599"/>
         <source>Win</source>
         <translation>Win</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="403"/>
+        <location filename="settingsdialog.ui" line="545"/>
         <source>Scan selection</source>
         <translation>Сканировать выделение</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="413"/>
+        <location filename="settingsdialog.ui" line="555"/>
         <source>Show if word not found</source>
         <translation>Показывать если слово не найдено</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="548"/>
         <source>Apperance</source>
-        <translation>Внешний вид</translation>
+        <translation type="obsolete">Внешний вид</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="443"/>
+        <location filename="settingsdialog.ui" line="434"/>
         <source>Opacity</source>
         <translation>Непрозрачность</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="450"/>
+        <location filename="settingsdialog.ui" line="441"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="479"/>
+        <location filename="settingsdialog.ui" line="470"/>
         <source>Default width</source>
         <translation>Ширина по умолчанию</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="509"/>
+        <location filename="settingsdialog.ui" line="500"/>
         <source>Default height</source>
         <translation>Высота по умолчанию</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="276"/>
+        <location filename="settingsdialog.cpp" line="291"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;br&gt;</source>
         <translation>&lt;b&gt;Автор:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="277"/>
+        <location filename="settingsdialog.cpp" line="292"/>
         <source>&lt;b&gt;Words count:&lt;/b&gt; %1&lt;br&gt;</source>
         <translation>&lt;b&gt;Количество слов:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="115"/>
+        <location filename="settingsdialog.cpp" line="119"/>
         <source>All translation</source>
         <translation>Весь перевод</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="116"/>
+        <location filename="settingsdialog.cpp" line="120"/>
         <source>Dictionary name</source>
         <translation>Название словаря</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="117"/>
+        <location filename="settingsdialog.cpp" line="121"/>
         <source>Title</source>
         <translation>Заголовок</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="118"/>
+        <location filename="settingsdialog.cpp" line="122"/>
         <source>Explanation</source>
         <translation>Пояснение</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="119"/>
+        <location filename="settingsdialog.cpp" line="123"/>
         <source>Abbreviation</source>
         <translation>Аббревиатура</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="120"/>
+        <location filename="settingsdialog.cpp" line="124"/>
         <source>Example</source>
-        <translation>Пример употребления слова</translation>
+        <translation>Пример</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="121"/>
+        <location filename="settingsdialog.cpp" line="125"/>
         <source>Transcription</source>
         <translation>Транскрипция</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="51"/>
         <source>Use system tray</source>
-        <translation type="unfinished">Использовать значок в системном трее</translation>
+        <translation type="obsolete">Использовать значок в системном трее</translation>
     </message>
 </context>
 <context>
     <name>QStarDict::TrayIcon</name>
     <message>
-        <location filename="../trayicon.cpp" line="37"/>
+        <location filename="trayicon.cpp" line="38"/>
         <source>QStarDict</source>
         <translation>QStarDict</translation>
     </message>
     <message>
-        <location filename="../trayicon.cpp" line="38"/>
+        <location filename="trayicon.cpp" line="39"/>
         <source>&amp;Scan</source>
         <translation>&amp;Сканировать</translation>
     </message>
     <message>
-        <location filename="../trayicon.cpp" line="48"/>
+        <location filename="trayicon.cpp" line="49"/>
         <source>&amp;Configure QStarDict</source>
         <translation>&amp;Конфигурация</translation>
     </message>
     <message>
-        <location filename="../trayicon.cpp" line="51"/>
+        <location filename="trayicon.cpp" line="52"/>
         <source>&amp;Quit</source>
         <translation>&amp;Выход</translation>
     </message>
     <message>
-        <location filename="../trayicon.cpp" line="92"/>
+        <location filename="trayicon.cpp" line="93"/>
         <source>QStarDict: scanning is %1</source>
         <translation>QStarDict: сканирование %1</translation>
     </message>
     <message>
-        <location filename="../trayicon.cpp" line="92"/>
+        <location filename="trayicon.cpp" line="93"/>
         <source>enabled</source>
         <translation>включено</translation>
     </message>
     <message>
-        <location filename="../trayicon.cpp" line="92"/>
+        <location filename="trayicon.cpp" line="93"/>
         <source>disabled</source>
         <translation>выключено</translation>
     </message>

diff --git a/qstardict/translations/translations.pri b/qstardict/translations/translations.pri
index 1fd3374..27ae079 100644 (file)
--- a/qstardict/translations/translations.pri
+++ b/qstardict/translations/translations.pri
@@ -26,7 +26,7 @@ TRANSLATIONS += \
 #    qstardict-it_IT.ts \
 #    qstardict-pl_PL.ts \
 #    qstardict-pt_BR.ts \
-#    qstardict-ru_RU.ts \
+    qstardict-ru_RU.ts \
 #    qstardict-ua_UA.ts \
 #    qstardict-tr_TR.ts \
 #    qstardict-zh_CN.ts \
@@ -41,7 +41,7 @@ COMPILED_TRANSLATIONS += \
 #    qstardict-it_IT.qm \
 #    qstardict-pl_PL.qm \
 #    qstardict-pt_BR.qm \
-#    qstardict-ru_RU.qm \
+    qstardict-ru_RU.qm \
 #    qstardict-ua_UA.qm \
 #    qstardict-tr_TR.qm \
 #    qstardict-zh_CN.qm \