player: add tooltips for volume and capture

zhy282289 · Jun 19, 2013 · f7b7df0 · f7b7df0
1 parent f1919ae
commit f7b7df0
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 24 deletions.
diff --git a/examples/player/MainWindow.cpp b/examples/player/MainWindow.cpp
@@ -52,6 +52,7 @@ MainWindow::MainWindow(QWidget *parent) :
   , mIsReady(false)
   , mHasPendingPlay(false)
   , mTimerId(0)
+  , mpPlayer(0)
   , mpRenderer(0)
   , mpTempRenderer(0)
 {
@@ -159,7 +160,7 @@ void MainWindow::setupUi()
     mpCaptureBtn->setIconWithSates(QPixmap(":/theme/screenshot.png"));
     mpCaptureBtn->setIconSize(QSize(a, a));
     mpCaptureBtn->setMaximumSize(a+kMaxButtonIconMargin+2, a+kMaxButtonIconMargin);
-
+    mpCaptureBtn->setToolTip(tr("Capture video frame") + "\n" + tr("Save to") + ": capture");
     mpVolumeBtn = new Button();
     mpVolumeBtn->setIconWithSates(QPixmap(":/theme/button-max-volume.png"));
     mpVolumeBtn->setIconSize(QSize(a, a));
@@ -174,6 +175,7 @@ void MainWindow::setupUi()
     mpVolumeSlider->setMaximumHeight(8);
     mpVolumeSlider->setMaximumWidth(88);
     mpVolumeSlider->setValue(int(1.0/kVolumeInterval*qreal(kVolumeSliderMax)/100.0));
+    setVolume();
 
     mpMenuBtn = new Button();
     mpMenuBtn->setAutoRaise(true);
@@ -481,10 +483,13 @@ void MainWindow::showHideVolumeBar()
 
 void MainWindow::setVolume()
 {
-    AudioOutput *ao = mpPlayer->audio();
+    AudioOutput *ao = mpPlayer ? mpPlayer->audio() : 0;
+    qreal v = qreal(mpVolumeSlider->value())*kVolumeInterval;
     if (ao) {
-        ao->setVolume(qreal(mpVolumeSlider->value())*0.05);
+        ao->setVolume(v);
     }
+    mpVolumeSlider->setToolTip(QString::number(v));
+    mpVolumeBtn->setToolTip(QString::number(v));
 }
 
 void MainWindow::resizeEvent(QResizeEvent *e)

diff --git a/examples/player/res/player_zh_CN.qm b/examples/player/res/player_zh_CN.qm
diff --git a/examples/player/res/player_zh_CN.ts b/examples/player/res/player_zh_CN.ts
@@ -4,78 +4,88 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../MainWindow.cpp" line="157"/>
+        <location filename="../MainWindow.cpp" line="163"/>
+        <source>Capture video frame</source>
+        <translation>视频截图</translation>
+    </message>
+    <message>
+        <location filename="../MainWindow.cpp" line="163"/>
+        <source>Save to</source>
+        <translation>保存至</translation>
+    </message>
+    <message>
+        <location filename="../MainWindow.cpp" line="190"/>
         <source>Open Url</source>
         <translation>打开 Url</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="158"/>
+        <location filename="../MainWindow.cpp" line="191"/>
         <source>Online channels</source>
         <translation>在线频道</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="184"/>
+        <location filename="../MainWindow.cpp" line="217"/>
         <source>Setup</source>
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="185"/>
+        <location filename="../MainWindow.cpp" line="218"/>
         <source>Report</source>
         <translation>反馈</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="186"/>
+        <location filename="../MainWindow.cpp" line="219"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="187"/>
+        <location filename="../MainWindow.cpp" line="220"/>
         <source>Help</source>
         <translation>帮助</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="189"/>
+        <location filename="../MainWindow.cpp" line="222"/>
         <source>About Qt</source>
         <translation>关于 Qt</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="192"/>
-        <location filename="../MainWindow.cpp" line="506"/>
+        <location filename="../MainWindow.cpp" line="225"/>
+        <location filename="../MainWindow.cpp" line="560"/>
         <source>Aspect ratio</source>
         <translation>比例</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="195"/>
+        <location filename="../MainWindow.cpp" line="228"/>
         <source>Video</source>
         <translation>视频</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="197"/>
+        <location filename="../MainWindow.cpp" line="230"/>
         <source>Window</source>
         <translation>窗口</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="200"/>
+        <location filename="../MainWindow.cpp" line="233"/>
         <source>Custom</source>
         <translation>自定义</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="206"/>
+        <location filename="../MainWindow.cpp" line="239"/>
         <source>Renderer</source>
         <translation>渲染引擎</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="366"/>
+        <location filename="../MainWindow.cpp" line="399"/>
         <source>Open a media file</source>
         <translation>打开媒体文件</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="487"/>
+        <location filename="../MainWindow.cpp" line="541"/>
         <source>Open an url</source>
         <translation>打开 url</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="487"/>
+        <location filename="../MainWindow.cpp" line="541"/>
         <source>Url</source>
         <translation></translation>
     </message>

diff --git a/i18n/QtAV_zh_CN.ts b/i18n/QtAV_zh_CN.ts
@@ -105,7 +105,7 @@
     </message>
     <message>
         <location filename="../src/EventFilter.cpp" line="103"/>
-        <location filename="../src/EventFilter.cpp" line="302"/>
+        <location filename="../src/EventFilter.cpp" line="330"/>
         <source>Help</source>
         <translation>帮助</translation>
     </message>
@@ -220,22 +220,22 @@
 </translation>
     </message>
     <message>
-        <location filename="../src/EventFilter.cpp" line="298"/>
+        <location filename="../src/EventFilter.cpp" line="326"/>
         <source>Open</source>
         <translation>打开</translation>
     </message>
     <message>
-        <location filename="../src/EventFilter.cpp" line="299"/>
+        <location filename="../src/EventFilter.cpp" line="327"/>
         <source>Open Url</source>
         <translation>打开 Url</translation>
     </message>
     <message>
-        <location filename="../src/EventFilter.cpp" line="301"/>
+        <location filename="../src/EventFilter.cpp" line="329"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
     <message>
-        <location filename="../src/EventFilter.cpp" line="304"/>
+        <location filename="../src/EventFilter.cpp" line="332"/>
         <source>About Qt</source>
         <translation>关于 Qt</translation>
     </message>