Commit: dfc0d989ea20cd3d134e1614f02cc6d9e7187661 - QtKarutaEishow (git)

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

Commit MetaInfo

• Revision: dfc0d989ea20cd3d134e1614f02cc6d9e7187661 (tree)
• Zeit: 2011-11-05 09:41:22
• Autor: arakaki <alucky4416@user...>
• Commiter: arakaki

Log Message

CHG: add ui Wait1Time spinbox

Ändern Zusammenfassung

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

Diff

--- a/fudaselectdlg.cpp
+++ b/fudaselectdlg.cpp
@@ -34,18 +34,18 @@ void FudaSelectDlg::SetFList(QList<int> *List)
 
 void FudaSelectDlg::on_buttonBox_accepted()
 {
-    qDebug() << "Click Dialog->OkBtn";
-
+//    qDebug() << "Click Dialog->OkBtn";
     GetCheckedList_CheckBox();
 
-    for (int i = 0; i < FudaList->count(); i++) {
-        qDebug() << QString("FudaList[%1] = %2").arg(i).arg(FudaList->at(i));
-    }
+//    for (int i = 0; i < FudaList->count(); i++) {
+//        qDebug() << QString("FudaList[%1] = %2").arg(i).arg(FudaList->at(i));
+//    }
 }
 
 void FudaSelectDlg::on_buttonBox_rejected()
 {
-    qDebug() << "Click Dialog->CancelBtn";
+//    qDebug() << "Click Dialog->CancelBtn";
+    ;
 }
 
 void FudaSelectDlg::ConnectSlotSignal_BtnAndCheckBox()

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -38,7 +38,7 @@ MainWindow::MainWindow(QWidget *parent) :
     QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); // source codec is UTF-8
 
     QCoreApplication::setApplicationName("QtKarutaEishow");
-    QCoreApplication::setApplicationVersion("1.0 beta4");
+    QCoreApplication::setApplicationVersion("1.0 beta6");
     this->setWindowTitle(QCoreApplication::applicationName());
     IniFilePath = QCoreApplication::applicationDirPath() + QDir::separator() + QCoreApplication::applicationName() + ".ini";
 
@@ -62,10 +62,11 @@ MainWindow::MainWindow(QWidget *parent) :
 
     // Play setting
     chk_joka = true;
-    Wait1Time = 1;
+    Wait1Time = 10;
     Wait2Time = 3;
     ui->checkBox->setChecked(chk_joka);
-    ui->spinBox->setValue(Wait2Time);
+    ui->spinBox_1->setValue(Wait1Time);
+    ui->spinBox_2->setValue(Wait2Time);
     PlayCounter = 0;
     PlayListCount = 0;
     // statusBar
@@ -143,7 +144,8 @@ void MainWindow::on_Btn_Start_clicked()
 {
     if (!flag_playseqstate) {
         // WaitTime, CheckBox disable
-        ui->spinBox->setEnabled(false);
+        ui->spinBox_1->setEnabled(false);
+        ui->spinBox_2->setEnabled(false);
         ui->checkBox->setEnabled(false);
 
         // Generate Play FudaList
@@ -252,25 +254,27 @@ void MainWindow::SequenceEnded(int status)
     flag_pause = false;
 
     // WaitTime, CheckBox enable
-    ui->spinBox->setEnabled(true);
+    ui->spinBox_1->setEnabled(true);
+    ui->spinBox_2->setEnabled(true);
     ui->checkBox->setEnabled(true);
 
     ui->Btn_Start->setIcon(QIcon(QPixmap(":/images/Play.png")));
 }
 
-void MainWindow::on_spinBox_valueChanged(int arg1)
+
+void MainWindow::on_spinBox_1_valueChanged(int arg1)
 {
-//    chk_joka = true;
-//    Wait1Time = 1;
-    Wait2Time = arg1;
+    Wait1Time = arg1;
 }
 
+void MainWindow::on_spinBox_2_valueChanged(int arg1)
+{
+    Wait2Time = arg1;
+}
 
 void MainWindow::on_checkBox_toggled(bool checked)
 {
     chk_joka = checked;
-//    Wait1Time = 1;
-//    Wait2Time = arg1;
 }
 
 
@@ -298,14 +302,14 @@ void MainWindow::LoadSaveSetting(QString filepath, bool store = false)
     if (store) {
         // Save
         QString FudaListStr = FudaList_ToCSVString(FList);
-        qDebug() << "FudaListStr is " << FudaListStr;
+        // qDebug() << "FudaListStr is " << FudaListStr;
 
         settings.setValue("SETTING/FudaList", FudaListStr);
 
     } else {
         // Load
         QString FudaListStr(settings.value("SETTING/FudaList", QString("")).toString());
-        qDebug() << "FudaListStr is " << FudaListStr;
+        // qDebug() << "FudaListStr is " << FudaListStr;
 
         FList->clear();
         if (FudaListStr.isEmpty()) {
@@ -320,7 +324,7 @@ void MainWindow::LoadSaveSetting(QString filepath, bool store = false)
                 x = FudaStrList.at(i).toInt();
                 if (1 <= x && x <= 100) {
                     FList->append(x);
-                    qDebug() << QString("FList [%1] is %2").arg(i).arg(FList->last());
+                    // qDebug() << QString("FList [%1] is %2").arg(i).arg(FList->last());
                 }
             }
         }

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -26,6 +26,10 @@ private slots:
     void on_Btn_Start_clicked();
     void on_Btn_Stop_clicked();
     void on_Btn_FudaSelect_clicked();
+    void on_spinBox_1_valueChanged(int arg1);
+    void on_spinBox_2_valueChanged(int arg1);
+    void on_checkBox_toggled(bool checked);
+    void on_actionFuda_triggered();
 
     //    signals:
     //        void SequencStartded();
@@ -41,12 +45,6 @@ private slots:
     void Music2Ended();
     void SequenceEnded(int status); // status 0 is success, !0 is Fail
 
-    void on_spinBox_valueChanged(int arg1);
-
-    void on_checkBox_toggled(bool checked);
-
-    void on_actionFuda_triggered();
-
 private:
     Ui::MainWindow *ui;
 

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,20 +6,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>348</width>
-    <height>367</height>
+    <width>391</width>
+    <height>429</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>277</width>
-    <height>296</height>
+    <width>391</width>
+    <height>429</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>400</width>
-    <height>500</height>
+    <width>391</width>
+    <height>429</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -33,8 +33,8 @@
    <widget class="QCommandLinkButton" name="Btn_Stop">
     <property name="geometry">
      <rect>
-      <x>210</x>
-      <y>190</y>
+      <x>230</x>
+      <y>250</y>
       <width>41</width>
       <height>81</height>
      </rect>
@@ -68,8 +68,8 @@
    <widget class="QCommandLinkButton" name="Btn_Start">
     <property name="geometry">
      <rect>
-      <x>100</x>
-      <y>180</y>
+      <x>120</x>
+      <y>240</y>
       <width>51</width>
       <height>101</height>
      </rect>
@@ -125,8 +125,8 @@
    <widget class="QLabel" name="label_4">
     <property name="geometry">
      <rect>
-      <x>20</x>
-      <y>70</y>
+      <x>70</x>
+      <y>120</y>
       <width>81</width>
       <height>31</height>
      </rect>
@@ -141,11 +141,11 @@
      <bool>true</bool>
     </property>
    </widget>
-   <widget class="QSpinBox" name="spinBox">
+   <widget class="QSpinBox" name="spinBox_2">
     <property name="geometry">
      <rect>
-      <x>120</x>
-      <y>70</y>
+      <x>160</x>
+      <y>120</y>
       <width>51</width>
       <height>30</height>
      </rect>
@@ -174,8 +174,8 @@
    <widget class="QLabel" name="label_3">
     <property name="geometry">
      <rect>
-      <x>190</x>
-      <y>70</y>
+      <x>220</x>
+      <y>120</y>
       <width>31</width>
       <height>31</height>
      </rect>
@@ -193,8 +193,8 @@
    <widget class="QLabel" name="label_2">
     <property name="geometry">
      <rect>
-      <x>110</x>
-      <y>110</y>
+      <x>150</x>
+      <y>180</y>
       <width>51</width>
       <height>31</height>
      </rect>
@@ -212,8 +212,8 @@
    <widget class="QCheckBox" name="checkBox">
     <property name="geometry">
      <rect>
-      <x>80</x>
-      <y>120</y>
+      <x>120</x>
+      <y>190</y>
       <width>16</width>
       <height>16</height>
      </rect>
@@ -228,8 +228,8 @@
    <widget class="QPushButton" name="Btn_FudaSelect">
     <property name="geometry">
      <rect>
-      <x>280</x>
-      <y>10</y>
+      <x>310</x>
+      <y>70</y>
       <width>41</width>
       <height>71</height>
      </rect>
@@ -248,13 +248,81 @@
      </size>
     </property>
    </widget>
+   <widget class="QSpinBox" name="spinBox_1">
+    <property name="geometry">
+     <rect>
+      <x>160</x>
+      <y>70</y>
+      <width>51</width>
+      <height>30</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>18</pointsize>
+     </font>
+    </property>
+    <property name="layoutDirection">
+     <enum>Qt::LeftToRight</enum>
+    </property>
+    <property name="autoFillBackground">
+     <bool>false</bool>
+    </property>
+    <property name="minimum">
+     <number>1</number>
+    </property>
+    <property name="maximum">
+     <number>20</number>
+    </property>
+    <property name="value">
+     <number>10</number>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_5">
+    <property name="geometry">
+     <rect>
+      <x>220</x>
+      <y>70</y>
+      <width>31</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+    <property name="pixmap">
+     <pixmap resource="QtKarutaEishow.qrc">:/images/Image/second_jp.png</pixmap>
+    </property>
+    <property name="scaledContents">
+     <bool>true</bool>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_6">
+    <property name="geometry">
+     <rect>
+      <x>70</x>
+      <y>70</y>
+      <width>81</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+    <property name="pixmap">
+     <pixmap resource="QtKarutaEishow.qrc">:/images/Image/maai_jp.png</pixmap>
+    </property>
+    <property name="scaledContents">
+     <bool>true</bool>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>348</width>
+     <width>391</width>
      <height>19</height>
     </rect>
    </property>