Commit: 24ca2094ed61d08c8b5053be9d4445bdf0d7a14b - QtKarutaEishow (git)

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

Commit MetaInfo

• Revisão: 24ca2094ed61d08c8b5053be9d4445bdf0d7a14b (tree)
• Hora: 2011-11-19 16:38:23
• Autor: arakaki <alucky4416@user...>
• Commiter: arakaki

Mensagem de Log

ADD: kaminoku, status bar message

Mudança Sumário

• modified: QtKarutaEishow.pro
• modified: mainwindow.cpp
• add: textrsc.h

Diff

--- a/QtKarutaEishow.pro
+++ b/QtKarutaEishow.pro
@@ -19,7 +19,8 @@ SOURCES += main.cpp \
 HEADERS  += mainwindow.h \
     PlayMusicThread.h \
     PlaySequenceThread.h \
-    fudaselectdlg.h
+    fudaselectdlg.h \
+    textrsc.h
 
 FORMS    += mainwindow.ui \
     fudaselectdlg.ui
@@ -34,3 +35,4 @@ RESOURCES += \
 
 RC_FILE = Icon.rc
 
+

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -5,6 +5,8 @@
 #include "ui_mainwindow.h"
 #include "fudaselectdlg.h"
 
+#include "textrsc.h" // kamiku text resource
+
 int RandomNumber(int min, int max)
 {
     return min + (int)(qrand() * (max - min + 1.0) / (1.0 + RAND_MAX));
@@ -38,7 +40,7 @@ MainWindow::MainWindow(QWidget *parent) :
     QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); // source codec is UTF-8
 
     QCoreApplication::setApplicationName("QtKarutaEishow");
-    QCoreApplication::setApplicationVersion("1.0 beta6");
+    QCoreApplication::setApplicationVersion("1.0 beta7");
     this->setWindowTitle(QCoreApplication::applicationName());
     IniFilePath = QCoreApplication::applicationDirPath() + QDir::separator() + QCoreApplication::applicationName() + ".ini";
 
@@ -219,36 +221,35 @@ void MainWindow::SequencStartded()
 void MainWindow::Music1Starteded(int fudaNum)
 {
     PlayCounter++;
-//    ui->statusBar->showMessage(QString("Music1Starteded, FudaN = %1").arg(fudaNum));
-    ui->statusBar->showMessage(QString(tr("%1 / %2 再生中: 第%3首")).arg(PlayCounter).arg(PlayListCount).arg(fudaNum));
+    QString kamiku = tr(kaminoku[fudaNum-1]);
+    ui->statusBar->showMessage(QString(tr("%1 / %2 再生中: 第%3首 : %4")).arg(PlayCounter).arg(PlayListCount).arg(fudaNum).arg(kamiku));
 
-    qDebug() << QString("Music1Starteded, FudaN = %1").arg(fudaNum);
+//    qDebug() << QString("Music1Starteded, FudaN = %1").arg(fudaNum);
 }
 // SLOT
 void MainWindow::Music1Ended()
 {
     ;
-    qDebug() << "Music1Ended";
+//    qDebug() << "Music1Ended";
 }
 // SLOT
 void MainWindow::Music2Starteded(int fudaNum)
 {
     ;
-    qDebug() << QString("Music2Starteded, FudaN = %1").arg(fudaNum);
+//    qDebug() << QString("Music2Starteded, FudaN = %1").arg(fudaNum);
 }
 // SLOT
 void MainWindow::Music2Ended()
 {
     ui->statusBar->clearMessage();
 
-    qDebug() << "Music2Ended";
+//    qDebug() << "Music2Ended";
 }
 // SLOT
 void MainWindow::SequenceEnded(int status)
 {
     ui->statusBar->clearMessage();
     // status 0 is success, !0 is Fail
-    qDebug() << "SequenceEnd";
 
     flag_playseqstate = false;
     flag_pause = false;
@@ -259,6 +260,8 @@ void MainWindow::SequenceEnded(int status)
     ui->checkBox->setEnabled(true);
 
     ui->Btn_Start->setIcon(QIcon(QPixmap(":/images/Play.png")));
+
+//    qDebug() << "SequenceEnd";
 }
 
 

--- /dev/null
+++ b/textrsc.h
@@ -0,0 +1,107 @@
+#ifndef TEXTRSC_H
+#define TEXTRSC_H
+
+const char* kaminoku[100] = {
+    "あきのたの",
+    "はるすぎて",
+    "あしびきの",
+    "たごのうらに",
+    "おくやまに",
+    "かささぎの",
+    "あまのはら",
+    "わがいほは",
+    "はなのいろは",
+    "これやこの", // 10
+    "わたのはらや",
+    "あまつかぜ",
+    "つくばねの",
+    "みちのくの",
+    "はるののに",
+    "たちわかれ",
+    "ちはやぶる",
+    "すみのえの",
+    "なにはがた",
+    "わびぬれば", // 20
+    "いまこむと",
+    "ふくからに",
+    "つきみれば",
+    "このたびは",
+    "なにしおはば",
+    "おぐらやま",
+    "みかのはら",
+    "やまざとは",
+    "こころあてに",
+    "ありあけの", // 30
+    "あさぼらけあ",
+    "やまがはに",
+    "ひさかたの",
+    "たれをかも",
+    "ひとはいざ",
+    "なつのよは",
+    "しらつゆに",
+    "わすらるる",
+    "あさじふの",
+    "しのぶれど", // 40
+    "こいすてふ",
+    "ちぎりきな",
+    "あいみての",
+    "おおことの",
+    "あはれとも",
+    "ゆらのとを",
+    "やえむぐら",
+    "かぜをいたみ",
+    "みかきもり",
+    "きみがためは", // 50
+    "かくとだに",
+    "あけぬれば",
+    "なげきつつ",
+    "わすれじの",
+    "たきのおとは",
+    "あらざらん",
+    "めぐりあいて",
+    "ありまやま",
+    "やすらはで",
+    "おおえやま", // 60
+    "いにしへの",
+    "よをこめて",
+    "いまはただ",
+    "あさぼらけう",
+    "うらみわび",
+    "もろともに",
+    "はるのよの",
+    "こころにも",
+    "あらしふく",
+    "さびしさに", // 70
+    "ゆうされば",
+    "おとにきく",
+    "たかさごの",
+    "うかりける",
+    "ちぎりおきし",
+    "わたのはらこ",
+    "せをはやみ",
+    "あはじしま",
+    "あきかぜに",
+    "ながからむ", // 80
+    "ほとどぎす",
+    "おもひわび",
+    "よのなかよ",
+    "ながらへば",
+    "よもすがら",
+    "なげけとて",
+    "むらさめの",
+    "なにはえの",
+    "たまのをよ",
+    "みせばやな", // 90
+    "きりぎりす",
+    "わがそでは",
+    "よのなかは",
+    "みよしのの",
+    "おおけなく",
+    "はなさそふ",
+    "こぬひとを",
+    "かぜそよぐ",
+    "ひともおし",
+    "ももしきや" // 100
+};
+
+#endif // TEXTRSC_H