Commit: 60d40a1b34c33a301e0eab4d57be3f02fa764d65 - QtKarutaEishow (git)

百人一首かるた自動読み上げソフト

Commit MetaInfo

• Revisão: 60d40a1b34c33a301e0eab4d57be3f02fa764d65 (tree)
• Hora: 2012-01-10 22:28:54
• Autor: arakaki <alucky4416@user...>
• Commiter: arakaki

Mensagem de Log

CHG: Release v1.0. Commentout qDebug Message, and optiondialog decoration

Mudança Sumário

• modified: PlayMusicThread.cpp
• modified: mainwindow.cpp
• modified: optiondialog.ui

Diff

--- a/PlayMusicThread.cpp
+++ b/PlayMusicThread.cpp
@@ -13,7 +13,7 @@ PlayMusicThread::PlayMusicThread(WId winId)
     if (!BASS_Init(-1, 44100, 0, (void*)winId, NULL)) {
 #endif
 //        QMessageBox::warning(this, "Error", "BASS_Init, Fail");
-        qDebug() << "BASS_Init Error";
+        // qDebug() << "BASS_Init Error";
     }
 
     FilePath = "";
@@ -86,11 +86,11 @@ void PlayMusicThread::run()
 
 int PlayMusicThread::MusicStart(const QString &musicfilepath)
 {
-    qDebug() << "Play Music : " << musicfilepath;
+    // qDebug() << "Play Music : " << musicfilepath;
     if (hStrm = BASS_StreamCreateFile(FALSE, musicfilepath.toLocal8Bit(), 0, 0, 0)) {
         ;
     } else {
-        qDebug() << "BASS_StreamCreateFile Error";
+        // qDebug() << "BASS_StreamCreateFile Error";
 //        QMessageBox::warning(this, "Error", "BASS_StreamCreateFile, Fail");;
         return 1;
     }
@@ -108,7 +108,7 @@ int PlayMusicThread::MusicStart(const QString &musicfilepath)
 
 void PlayMusicThread::MusicStop()
 {
-    qDebug() << "Stop Music";
+    // qDebug() << "Stop Music";
     if (hStrm) {
         BASS_ChannelStop(hStrm);
         BASS_StreamFree(hStrm);

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -41,7 +41,7 @@ MainWindow::MainWindow(QWidget *parent) :
     QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); // source codec is UTF-8
 
     QCoreApplication::setApplicationName("QtKarutaEishow");
-    QCoreApplication::setApplicationVersion("1.0 RC1");
+    QCoreApplication::setApplicationVersion("1.0");
     this->setWindowTitle(QCoreApplication::applicationName());
     IniFilePath = QCoreApplication::applicationDirPath() + QDir::separator() + QCoreApplication::applicationName() + ".ini";
 

--- a/optiondialog.ui
+++ b/optiondialog.ui
@@ -44,67 +44,69 @@
     <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
    </property>
   </widget>
-  <widget class="QRadioButton" name="radioButton_1">
+  <widget class="QGroupBox" name="groupBox">
    <property name="geometry">
     <rect>
-     <x>60</x>
-     <y>60</y>
-     <width>111</width>
-     <height>20</height>
+     <x>40</x>
+     <y>20</y>
+     <width>281</width>
+     <height>101</height>
     </rect>
    </property>
-   <property name="text">
-    <string>音声1　（女性）</string>
-   </property>
-   <attribute name="buttonGroup">
-    <string>buttonGroup_voice</string>
-   </attribute>
-  </widget>
-  <widget class="QRadioButton" name="radioButton_2">
-   <property name="geometry">
-    <rect>
-     <x>60</x>
-     <y>90</y>
-     <width>111</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>音声2　（男性）</string>
-   </property>
-   <attribute name="buttonGroup">
-    <string>buttonGroup_voice</string>
-   </attribute>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>50</x>
-     <y>30</y>
-     <width>61</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="text">
+   <property name="title">
     <string>音声の選択</string>
    </property>
+   <widget class="QPushButton" name="Btn_TestPlay">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
+    <property name="geometry">
+     <rect>
+      <x>150</x>
+      <y>40</y>
+      <width>75</width>
+      <height>23</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>試聴</string>
+    </property>
+   </widget>
+   <widget class="QRadioButton" name="radioButton_1">
+    <property name="geometry">
+     <rect>
+      <x>30</x>
+      <y>30</y>
+      <width>111</width>
+      <height>20</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>音声1　（女性）</string>
+    </property>
+    <attribute name="buttonGroup">
+     <string>buttonGroup_voice</string>
+    </attribute>
+   </widget>
+   <widget class="QRadioButton" name="radioButton_2">
+    <property name="geometry">
+     <rect>
+      <x>30</x>
+      <y>60</y>
+      <width>111</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>音声2　（男性）</string>
+    </property>
+    <attribute name="buttonGroup">
+     <string>buttonGroup_voice</string>
+    </attribute>
+   </widget>
   </widget>
-  <widget class="QPushButton" name="Btn_TestPlay">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>180</x>
-     <y>70</y>
-     <width>75</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>試聴</string>
-   </property>
-  </widget>
+  <zorder>groupBox</zorder>
+  <zorder>buttonBox</zorder>
  </widget>
  <resources/>
  <connections>