This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/osx in repository x2goclient. from ff6231c src/onmainwindow.cpp: convert piece of code to non-Windows and non-Darwin, so that not only Linux but other operating systems are covered as well. new 64edec6 src/mediawidget.cpp: unify some redundant code. new 4f5a879 src/mediawidget.cpp: simplify expression. new 8a8713e src/mediawidget.cpp: add deprecation warning for ARTS. new f6351af src/mediawidget.cpp: add deprecation warning for ESounD. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++++ src/mediawidget.cpp | 24 +++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 64edec62fce0c7e2c48e0dc50c801a0034b1d099 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 31 01:38:10 2016 +0100 src/mediawidget.cpp: unify some redundant code. --- debian/changelog | 1 + src/mediawidget.cpp | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index fd835b7..2196271 100644 --- a/debian/changelog +++ b/debian/changelog @@ -512,6 +512,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.cpp: convert piece of code to non-Windows and non-Darwin, so that not only Linux but other operating systems are covered as well. + - src/mediawidget.cpp: unify some redundant code. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/mediawidget.cpp b/src/mediawidget.cpp index c937ba4..16d837a 100644 --- a/src/mediawidget.cpp +++ b/src/mediawidget.cpp @@ -155,16 +155,13 @@ void MediaWidget::slot_sndSysSelected ( int system ) } case ESD: { + rbStartSnd->hide (); + rbNotStartSnd->hide (); + cbSndSshTun->show (); #ifdef Q_OS_WIN - rbStartSnd->hide(); - rbNotStartSnd->hide(); - cbSndSshTun->show(); cbSndSshTun->setEnabled ( false ); cbSndSshTun->setChecked ( true ); #elif defined (Q_OS_DARWIN) - rbStartSnd->hide (); - rbNotStartSnd->hide (); - cbSndSshTun->show (); cbSndSshTun->setEnabled (true); #endif /* defined (Q_OS_WIN) */ sbSndPort->setValue ( 16001 ); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 4f5a879c76a9ad1af2ebdde6df4589c6a8501f56 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 31 01:41:02 2016 +0100 src/mediawidget.cpp: simplify expression. --- debian/changelog | 1 + src/mediawidget.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2196271..79a6882 100644 --- a/debian/changelog +++ b/debian/changelog @@ -513,6 +513,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium non-Darwin, so that not only Linux but other operating systems are covered as well. - src/mediawidget.cpp: unify some redundant code. + - src/mediawidget.cpp: simplify expression. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/mediawidget.cpp b/src/mediawidget.cpp index 16d837a..15971d6 100644 --- a/src/mediawidget.cpp +++ b/src/mediawidget.cpp @@ -210,7 +210,7 @@ void MediaWidget::slot_sndStartClicked() { lSndPort->setEnabled ( true ); sbSndPort->setEnabled ( true ); - cbDefSndPort->setEnabled ( true &&sound->isChecked()); + cbDefSndPort->setEnabled (sound->isChecked()); } else { -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 8a8713e36d9ab6e842f175d23a034d8d792fb817 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 31 01:41:54 2016 +0100 src/mediawidget.cpp: add deprecation warning for ARTS. --- debian/changelog | 1 + src/mediawidget.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 79a6882..71d1322 100644 --- a/debian/changelog +++ b/debian/changelog @@ -514,6 +514,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium covered as well. - src/mediawidget.cpp: unify some redundant code. - src/mediawidget.cpp: simplify expression. + - src/mediawidget.cpp: add deprecation warning for ARTS. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/mediawidget.cpp b/src/mediawidget.cpp index 15971d6..57f5b84 100644 --- a/src/mediawidget.cpp +++ b/src/mediawidget.cpp @@ -151,6 +151,11 @@ void MediaWidget::slot_sndSysSelected ( int system ) cbDefSndPort->setChecked ( false ); cbDefSndPort->setEnabled ( false ); sbSndPort->setValue ( 20221 ); + QMessageBox::warning (NULL, tr ("Deprecation Warning"), + tr ("ARTS support is scheduled to be removed soon.\n\n" + + "Please upgrade to PulseAudio."), + QMessageBox::Ok, QMessageBox::NoButton); break; } case ESD: -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit f6351aff0dfe77a2d071f8d8d99121874e2bad59 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 31 01:43:45 2016 +0100 src/mediawidget.cpp: add deprecation warning for ESounD. --- debian/changelog | 1 + src/mediawidget.cpp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 71d1322..2662efc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -515,6 +515,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium - src/mediawidget.cpp: unify some redundant code. - src/mediawidget.cpp: simplify expression. - src/mediawidget.cpp: add deprecation warning for ARTS. + - src/mediawidget.cpp: add deprecation warning for ESounD. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/mediawidget.cpp b/src/mediawidget.cpp index 57f5b84..d5d1b37 100644 --- a/src/mediawidget.cpp +++ b/src/mediawidget.cpp @@ -169,6 +169,14 @@ void MediaWidget::slot_sndSysSelected ( int system ) #elif defined (Q_OS_DARWIN) cbSndSshTun->setEnabled (true); #endif /* defined (Q_OS_WIN) */ + +#if !defined (Q_OS_WIN) && !defined (Q_OS_DARWIN) + QMessageBox::warning (NULL, tr ("Deprecation Warning"), + tr ("ESounD support is scheduled to be removed soon.\n\n" + + "Please upgrade to PulseAudio."), + QMessageBox::Ok, QMessageBox::NoButton); +#endif sbSndPort->setValue ( 16001 ); break; } -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org