summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2016-01-10 23:03:50 +0800
committerGravatar Chris Xiong <chirs241097@gmail.com> 2016-01-10 23:03:50 +0800
commit541f06f62286d61524be67356a5272f4428b88a6 (patch)
tree6b0d0f6a2e4eb18b5f02420f3019d056fb9d521c
parent7fccb61519fe84b2ced274f1cc4859d5000e86c6 (diff)
downloadQMidiPlayer-541f06f62286d61524be67356a5272f4428b88a6.tar.xz
Lost Dream. (WTF)
-rw-r--r--ChangeLog3
-rw-r--r--doc/mainwindow.html2
-rw-r--r--qmpchanneleditor.cpp2
-rw-r--r--qmphelpwindow.ui8
-rw-r--r--qmpmainwindow.cpp7
-rw-r--r--qmpplistwindow.hpp3
6 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 908ff7d..01977e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-01-10 0.6.2 beta
+Minor behavior changes and bug fixes.
+
2016-01-06 0.6.2 beta
Initial command line parameters handling.
Minor bug fixes.
diff --git a/doc/mainwindow.html b/doc/mainwindow.html
index 80bf2aa..bbb1ba3 100644
--- a/doc/mainwindow.html
+++ b/doc/mainwindow.html
@@ -12,7 +12,7 @@
<li>3. Playing control buttons.</li>
<li>4. Settings button.</li>
<li>5. Dialog toggle buttons.</li>
- <li>6. Master gain slier.</li>
+ <li>6. Master gain slider.</li>
<li>7. Polyphone indicator.</li>
<li>8. <s>It's me!</s></li>
</ul>
diff --git a/qmpchanneleditor.cpp b/qmpchanneleditor.cpp
index 95dedcc..ac1d8fe 100644
--- a/qmpchanneleditor.cpp
+++ b/qmpchanneleditor.cpp
@@ -17,7 +17,7 @@ qmpChannelEditor::~qmpChannelEditor()
void qmpChannelEditor::setupWindow(int chid)
{
- char str[30];if(~chid)ch=chid;
+ char str[256];if(~chid)ch=chid;
sprintf(str,"Channel Parameter Editor - Channel #%d",ch+1);
setWindowTitle(str);
CMidiPlayer* player=qmpMainWindow::getInstance()->getPlayer();
diff --git a/qmphelpwindow.ui b/qmphelpwindow.ui
index e32ebee..95e579c 100644
--- a/qmphelpwindow.ui
+++ b/qmphelpwindow.ui
@@ -6,14 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
- <width>495</width>
- <height>278</height>
+ <width>640</width>
+ <height>360</height>
</rect>
</property>
<property name="minimumSize">
<size>
- <width>495</width>
- <height>278</height>
+ <width>640</width>
+ <height>360</height>
</size>
</property>
<property name="windowTitle">
diff --git a/qmpmainwindow.cpp b/qmpmainwindow.cpp
index 242e52f..6e88f37 100644
--- a/qmpmainwindow.cpp
+++ b/qmpmainwindow.cpp
@@ -229,7 +229,12 @@ void qmpMainWindow::on_pbPlayPause_clicked()
if(stopped)
{
QString fns=plistw->getFirstItem();
- if(!fns.length())return(void)(playing=false);
+ if(!fns.length())
+ {
+ plistw->on_pbAdd_clicked();
+ fns=plistw->getFirstItem();
+ if(!fns.length())return(void)(playing=false);
+ }
ui->lbFileName->setText(QUrl(fns).fileName());
player->playerLoadFile(fns.toStdString().c_str());
char ts[100];
diff --git a/qmpplistwindow.hpp b/qmpplistwindow.hpp
index 838bff8..e86ec96 100644
--- a/qmpplistwindow.hpp
+++ b/qmpplistwindow.hpp
@@ -32,8 +32,9 @@ class qmpPlistWindow : public QDialog
void dialogClosing();
void selectionChanging();
- private slots:
+ public slots:
void on_pbAdd_clicked();
+ private slots:
void on_pbAddFolder_clicked();
void on_pbRemove_clicked();
void on_pbClear_clicked();