diff --git a/BPM-Studio-Net-Client-16x16.ico b/BPM-Studio-Net-Client-16x16.ico new file mode 100644 index 0000000..04bf5e8 Binary files /dev/null and b/BPM-Studio-Net-Client-16x16.ico differ diff --git a/BPM-Studio-Net-Client-32x32.ico b/BPM-Studio-Net-Client-32x32.ico new file mode 100644 index 0000000..90944e5 Binary files /dev/null and b/BPM-Studio-Net-Client-32x32.ico differ diff --git a/BPM-Studio-Net-Client.pro b/BPM-Studio-Net-Client.pro index fbc8d5a..b8edb9c 100644 --- a/BPM-Studio-Net-Client.pro +++ b/BPM-Studio-Net-Client.pro @@ -22,3 +22,8 @@ FORMS += \ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target + +RESOURCES += \ + BPM-Studio-Net-Client.qrc + +RC_ICONS = BPM-Studio-Net-Client-32x32.ico diff --git a/BPM-Studio-Net-Client.qrc b/BPM-Studio-Net-Client.qrc new file mode 100644 index 0000000..6c740c4 --- /dev/null +++ b/BPM-Studio-Net-Client.qrc @@ -0,0 +1,6 @@ + + + BPM-Studio-Net-Client-16x16.ico + BPM-Studio-Net-Client-32x32.ico + + diff --git a/mainwindow.cpp b/mainwindow.cpp index cbc4c14..f545321 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -101,12 +101,15 @@ void MainWindow::on_pushButton_play_clicked(){ while(status_loop=="ja") ui->statusbar->showMessage("~"); if(!(status_player1=="play") || !(status_player2=="play")){ - if(status_player1=="aus" || status_player1=="pause"){ + if(status_player1=="pause"){ befehl=befehl_play1; sende_befehl(); - }else if(status_player2=="aus" || status_player2=="pause"){ + }else if(status_player2=="pause"){ befehl=befehl_play2; sende_befehl(); + }else{ + befehl=befehl_play1; + sende_befehl(); } } }