fixed lyrics window

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1574 90c681e8-e032-0410-971d-27865f9a5e38

11 files changed, 10 insertions, 60 deletions

diff --git a/src/plugins/General/lyrics/lyricswindow.ui b/src/plugins/General/lyrics/lyricswindow.ui
index a63f99424..79cc67b1f 100644
--- a/src/plugins/General/lyrics/lyricswindow.ui
+++ b/src/plugins/General/lyrics/lyricswindow.ui
@@ -82,9 +82,9 @@
     </spacer>
    </item>
    <item row="2" column="2">
-    <widget class="QPushButton" name="pushButton">
-     <property name="text">
-      <string>Close</string>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
      </property>
     </widget>
    </item>
@@ -93,18 +93,18 @@
  <resources/>
  <connections>
   <connection>
-   <sender>pushButton</sender>
-   <signal>clicked()</signal>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
    <receiver>LyricsWindow</receiver>
    <slot>close()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>440</x>
-     <y>333</y>
+     <x>465</x>
+     <y>405</y>
     </hint>
     <hint type="destinationlabel">
-     <x>174</x>
-     <y>343</y>
+     <x>513</x>
+     <y>391</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts
index eaac098d6..1a8ffc6b7 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts
@@ -110,10 +110,5 @@
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
-    <message>
-        <location filename="../lyricswindow.ui" line="87"/>
-        <source>Close</source>
-        <translation>Zavřít</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts
index 574d90c36..9c2ff86d6 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts
@@ -110,10 +110,5 @@
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
-    <message>
-        <location filename="../lyricswindow.ui" line="87"/>
-        <source>Close</source>
-        <translation>Schließen</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts
index 5a377eef6..5f6064364 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts
@@ -110,10 +110,5 @@
         <source>Search</source>
         <translation>Cerca</translation>
     </message>
-    <message>
-        <location filename="../lyricswindow.ui" line="87"/>
-        <source>Close</source>
-        <translation>Chiudi</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts
index ab01f47eb..d6b6d1968 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts
@@ -110,10 +110,5 @@
         <source>Search</source>
         <translation>Ieškoti</translation>
     </message>
-    <message>
-        <location filename="../lyricswindow.ui" line="87"/>
-        <source>Close</source>
-        <translation>Uždaryti</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts
index 548241ba7..a51e01cf2 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts
@@ -110,10 +110,5 @@
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
-    <message>
-        <location filename="../lyricswindow.ui" line="87"/>
-        <source>Close</source>
-        <translation>Zamknij</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts
index 3926c385e..5e9dcb420 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts
@@ -58,7 +58,7 @@
     <message>
         <location filename="../lyricswindow.cpp" line="77"/>
         <source>Not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Не найдено</translation>
     </message>
     <message>
         <location filename="../lyricswindow.cpp" line="93"/>
@@ -110,10 +110,5 @@
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
-    <message>
-        <location filename="../lyricswindow.ui" line="87"/>
-        <source>Close</source>
-        <translation>Закрыть</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts
index 7ca6fbbde..857f22b3c 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts
@@ -110,10 +110,5 @@
         <source>Search</source>
         <translation>Ara</translation>
     </message>
-    <message>
-        <location filename="../lyricswindow.ui" line="87"/>
-        <source>Close</source>
-        <translation>Kapat</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts
index 2a29c6b43..f14f8e845 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts
@@ -110,10 +110,5 @@
         <source>Search</source>
         <translation>Пошук</translation>
     </message>
-    <message>
-        <location filename="../lyricswindow.ui" line="87"/>
-        <source>Close</source>
-        <translation>Закрити</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts
index 3b6af0bb3..c1ed710b1 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts
@@ -110,10 +110,5 @@
         <source>Search</source>
         <translation>搜索</translation>
     </message>
-    <message>
-        <location filename="../lyricswindow.ui" line="87"/>
-        <source>Close</source>
-        <translation>关闭</translation>
-    </message>
 </context>
 </TS>
diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts
index cb804de88..6fe69de73 100644
--- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts
+++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts
@@ -110,10 +110,5 @@
         <source>Search</source>
         <translation>搜索</translation>
     </message>
-    <message>
-        <location filename="../lyricswindow.ui" line="87"/>
-        <source>Close</source>
-        <translation>關閉</translation>
-    </message>
 </context>
 </TS>