Compare commits

..

No commits in common. "0.5" and "0.3" have entirely different histories.
0.5 ... 0.3

5 changed files with 23 additions and 42 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 766 B

View file

@ -22,8 +22,3 @@ FORMS += \
qnx: target.path = /tmp/$${TARGET}/bin qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target !isEmpty(target.path): INSTALLS += target
RESOURCES += \
BPM-Studio-Net-Client.qrc
RC_ICONS = BPM-Studio-Net-Client-32x32.ico

View file

@ -1,6 +0,0 @@
<RCC>
<qresource prefix="/">
<file>BPM-Studio-Net-Client-16x16.ico</file>
<file>BPM-Studio-Net-Client-32x32.ico</file>
</qresource>
</RCC>

View file

@ -85,45 +85,37 @@ bool MainWindow::sende_befehl(){
} }
void MainWindow::on_pushButton_pause_clicked(){ void MainWindow::on_pushButton_pause_clicked(){
if(status_auto=="an"){ while(status_loop=="ja")
while(status_loop=="ja") ui->statusbar->showMessage("~");
ui->statusbar->showMessage("~"); if(status_player1=="play"){
if(status_player1=="play"){ befehl=befehl_pause1;
befehl=befehl_pause1; sende_befehl();
sende_befehl();
}else if(status_player2=="play"){ }else if(status_player2=="play"){
befehl=befehl_pause2; befehl=befehl_pause2;
sende_befehl(); sende_befehl();
}
} }
} }
void MainWindow::on_pushButton_play_clicked(){ void MainWindow::on_pushButton_play_clicked(){
if(status_auto=="an"){ while(status_loop=="ja")
while(status_loop=="ja") ui->statusbar->showMessage("~");
ui->statusbar->showMessage("~"); if(!(status_player1=="play") || !(status_player2=="play")){
if(!(status_player1=="play") || !(status_player2=="play")){ if(status_player1=="aus" || status_player1=="pause"){
if(status_player1=="pause"){ befehl=befehl_play1;
befehl=befehl_play1; sende_befehl();
sende_befehl(); }else if(status_player2=="aus" || status_player2=="pause"){
}else if(status_player2=="pause"){ befehl=befehl_play2;
befehl=befehl_play2; sende_befehl();
sende_befehl();
}else{
befehl=befehl_play1;
sende_befehl();
}
} }
} }
} }
void MainWindow::on_pushButton_fade_clicked(){ void MainWindow::on_pushButton_fade_clicked(){
if(status_auto=="an"){ while(status_loop=="ja")
while(status_loop=="ja") ui->statusbar->showMessage("~");
ui->statusbar->showMessage("~"); if(status_player1=="play" || status_player2=="play"){
if(status_player1=="play" || status_player2=="play"){ befehl=befehl_fade;
befehl=befehl_fade; sende_befehl();
sende_befehl();
}
} }
} }