From e16f15ff12eb654d2c09f5a280d28389a3ad74fc Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 4 Aug 2008 20:12:45 +0000 Subject: 0.2 fixes git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@490 90c681e8-e032-0410-971d-27865f9a5e38 --- .../translations/incdecvolume_plugin_cs.ts | 7 ++-- .../FileDialogs/QmmpFileDialog/qmmpfiledialog.ui | 10 ++++- .../translations/qmmp_file_dialog_plugin_cs.ts | 43 ++++++++++++---------- src/plugins/General/statusicon/statusicon.cpp | 10 ++++- src/plugins/General/statusicon/statusicon.h | 1 + .../modplug/translations/modplug_plugin_cs.ts | 5 ++- .../Output/alsa/translations/alsa_plugin_cs.ts | 3 +- .../Output/oss/translations/oss_plugin_cs.ts | 3 +- 8 files changed, 52 insertions(+), 30 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/translations/incdecvolume_plugin_cs.ts b/src/plugins/CommandLineOptions/IncDecVolumeOption/translations/incdecvolume_plugin_cs.ts index 3525045ae..d2567c603 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/translations/incdecvolume_plugin_cs.ts +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/translations/incdecvolume_plugin_cs.ts @@ -1,16 +1,17 @@ - + + IncDecVolumeCommandLineOption Increase volume with step 5 - + Zvýšit hlasitost s krokem 5 Decrease volume with step 5 - + Snížit hlasitost s krokem 5 diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui index 6c249b46f..74d572307 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui +++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.ui @@ -15,7 +15,7 @@ true - + @@ -109,10 +109,13 @@ - 0 + 1 + + 0 + @@ -142,6 +145,9 @@ + + 0 + diff --git a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_cs.ts b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_cs.ts index b9b3600db..d6f4c2a33 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_cs.ts +++ b/src/plugins/FileDialogs/QmmpFileDialog/translations/qmmp_file_dialog_plugin_cs.ts @@ -1,56 +1,57 @@ - + + QmmpFileDialog Add Files - + Přidat soubory Up - + Nahoru ... - + … List view - + Seznam Detailed view - + Podrobnosti Close dialog on add - + Zavřít dialog po přidání File name: - + Název souboru: Add - + Přidat Files of type: - + Soubory typu: Close - + Zavřít @@ -58,24 +59,26 @@ Qmmp File Dialog - + Souborový dialog Qmmp About Qmmp File Dialog - + O souborovém dialogu Qmmp Writen by: Vladimir Kuznetsov <vovanec@gmail.com> Ilya Kotov <forkotov02@hotmail.ru> - + Autoři: +Vladimír Kuzněcov <vovanec@gmail.com> +Ilja Kotov <forkotov02@hotmail.ru> Some code is copied from the Qt library - + Část k=odu je zkopírována z knihovny Qt @@ -83,27 +86,27 @@ Ilya Kotov <forkotov02@hotmail.ru> Add - + Přidat Save - + Uložit Directories - + Adresáře already exists. - + již existuje. Do you want to replace it? - + Chcete jej nahradit? diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp index 53d92f36f..4946a4ba2 100644 --- a/src/plugins/General/statusicon/statusicon.cpp +++ b/src/plugins/General/statusicon/statusicon.cpp @@ -54,7 +54,7 @@ StatusIcon::StatusIcon(Control *control, QObject *parent) settings.endGroup(); m_enabled = FALSE; QTimer::singleShot(200, this, SLOT(enable())); - + m_state = General::Stopped; } @@ -63,6 +63,7 @@ StatusIcon::~StatusIcon() void StatusIcon::setState(const uint &state) { + m_state = state; switch ((uint) state) { case General::Playing: @@ -106,7 +107,12 @@ void StatusIcon::trayActivated(QSystemTrayIcon::ActivationReason reason) if (reason == QSystemTrayIcon::Trigger) m_control->toggleVisibility(); else if (reason == QSystemTrayIcon::MiddleClick) - m_control->pause(); + { + if(m_state == General::Stopped) + m_control->play(); + else + m_control->pause(); + } } void StatusIcon::enable() diff --git a/src/plugins/General/statusicon/statusicon.h b/src/plugins/General/statusicon/statusicon.h index 549cf5f18..b6d8a3e04 100644 --- a/src/plugins/General/statusicon/statusicon.h +++ b/src/plugins/General/statusicon/statusicon.h @@ -53,6 +53,7 @@ private: bool m_enabled; int m_messageDelay; Control *m_control; + uint m_state; }; diff --git a/src/plugins/Input/modplug/translations/modplug_plugin_cs.ts b/src/plugins/Input/modplug/translations/modplug_plugin_cs.ts index 8e1889a34..39a536e31 100644 --- a/src/plugins/Input/modplug/translations/modplug_plugin_cs.ts +++ b/src/plugins/Input/modplug/translations/modplug_plugin_cs.ts @@ -136,7 +136,10 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Arial'; font-size:10pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_cs.ts b/src/plugins/Output/alsa/translations/alsa_plugin_cs.ts index b672ca366..a1fc2d0a3 100644 --- a/src/plugins/Output/alsa/translations/alsa_plugin_cs.ts +++ b/src/plugins/Output/alsa/translations/alsa_plugin_cs.ts @@ -1,5 +1,6 @@ + OutputALSAFactory @@ -88,7 +89,7 @@ Use mmap access - + Použít mmap diff --git a/src/plugins/Output/oss/translations/oss_plugin_cs.ts b/src/plugins/Output/oss/translations/oss_plugin_cs.ts index 29a9bec68..f39069db5 100644 --- a/src/plugins/Output/oss/translations/oss_plugin_cs.ts +++ b/src/plugins/Output/oss/translations/oss_plugin_cs.ts @@ -1,5 +1,6 @@ + OutputOSSFactory @@ -73,7 +74,7 @@ PCM over Master - + PCM přes Master -- cgit v1.2.3-13-gbd6f