コミット: 5093ceb887e8e922d05de50e5eeb0fcc3dc351e7 - QtSchChime (git)

コミットメタ情報

• リビジョン: 5093ceb887e8e922d05de50e5eeb0fcc3dc351e7 (tree)
• 日時: 2014-05-17 18:14:33
• 作者: alucky4416 <alucky4416@user...>
• コミッター: alucky4416

ログメッセージ

feature: add SoundVolume. and load/save SoundVolumeLevel.

変更サマリ

• modified: mainwindow.cpp
• modified: mainwindow.h
• modified: mainwindow.ui

差分

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -75,6 +75,10 @@ MainWindow::MainWindow(QWidget *parent) :
 //            this, SLOT(slot_calc_end(QString)));
     ThPlayMusic->start();
 
+    float vlmlevel = ThPlayMusic->GetSoundVolume() * 100.0;
+    // qDebug() << "vlmlevel=" << vlmlevel ;
+    ui->hSlider_Volume->setValue((int)vlmlevel);
+
     // ScheduleManager Thread
     ThSchMngr = new ThSchManager(this);
     connect(ThSchMngr, SIGNAL(sig_notify_nexttime(QString)),
@@ -121,6 +125,9 @@ void MainWindow::LoadSaveSetting(QString filepath, bool store = false)
         // Exclude AutoStart flag
         settings.setValue("SETTING/AUTO_START", ui->checkBox_AutoStart->isChecked());
 
+        // Sound Volume Level
+        settings.setValue("SETTING/VOLUME_LEVEL", ui->hSlider_Volume->value());
+
         // Exclude SS flag
         settings.setValue("SETTING/EXCLUDE_SS", ui->checkBox_Exclude_SS->isChecked());
 
@@ -144,6 +151,9 @@ void MainWindow::LoadSaveSetting(QString filepath, bool store = false)
         // Exclude AutoStart flag
         ui->checkBox_AutoStart->setChecked(settings.value("SETTING/AUTO_START", false).toBool());
 
+        // Sound Volume Level
+        ui->hSlider_Volume->setValue((settings.value("SETTING/VOLUME_LEVEL", 10).toInt()));
+
         // Exclude SS flag
         ui->checkBox_Exclude_SS->setChecked(settings.value("SETTING/EXCLUDE_SS", true).toBool());
 
@@ -399,3 +409,13 @@ void MainWindow::on_lineEdit_FilePath_textChanged(const QString &arg1)
         ui->pushButton_TestPlay->setEnabled(true);
     }
 }
+
+void MainWindow::on_hSlider_Volume_valueChanged(int value)
+{
+    float volume = value / 100.0;
+    ThPlayMusic->SetSoundVolume(volume);
+#if 0
+    volume = ThPlayMusic->GetSoundVolume() * 100.0;
+    qDebug() << "Volume" << volume;
+#endif
+}

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -48,6 +48,8 @@ private slots:
 
     void on_lineEdit_FilePath_textChanged(const QString &arg1);
 
+    void on_hSlider_Volume_valueChanged(int value);
+
 private:
     Ui::MainWindow *ui;
     QLabel *statusbar_label_status;

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -35,7 +35,7 @@
     </property>
     <property name="geometry">
      <rect>
-      <x>130</x>
+      <x>120</x>
       <y>270</y>
       <width>121</width>
       <height>41</height>
@@ -64,8 +64,8 @@
     </property>
     <property name="geometry">
      <rect>
-      <x>290</x>
-      <y>240</y>
+      <x>300</x>
+      <y>230</y>
       <width>51</width>
       <height>23</height>
      </rect>
@@ -117,7 +117,7 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>200</y>
+      <y>190</y>
       <width>121</width>
       <height>20</height>
      </rect>
@@ -216,7 +216,7 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>220</y>
+      <y>210</y>
       <width>321</width>
       <height>20</height>
      </rect>
@@ -226,7 +226,7 @@
     <property name="geometry">
      <rect>
       <x>340</x>
-      <y>220</y>
+      <y>210</y>
       <width>21</width>
       <height>18</height>
      </rect>
@@ -238,8 +238,8 @@
    <widget class="QCheckBox" name="checkBox_AutoStart">
     <property name="geometry">
      <rect>
-      <x>20</x>
-      <y>240</y>
+      <x>120</x>
+      <y>320</y>
       <width>191</width>
       <height>18</height>
      </rect>
@@ -251,6 +251,32 @@
      <bool>false</bool>
     </property>
    </widget>
+   <widget class="QSlider" name="hSlider_Volume">
+    <property name="geometry">
+     <rect>
+      <x>80</x>
+      <y>230</y>
+      <width>211</width>
+      <height>23</height>
+     </rect>
+    </property>
+    <property name="orientation">
+     <enum>Qt::Horizontal</enum>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_3">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>230</y>
+      <width>51</width>
+      <height>20</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Volume</string>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
@@ -258,7 +284,7 @@
      <x>0</x>
      <y>0</y>
      <width>407</width>
-     <height>20</height>
+     <height>18</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">