[X2Go-Commits] [x2goclient] 147/197: src/configdialog.{cpp, h}: add "no record" support for OS X (through PulseManager.)
git-admin at x2go.org
git-admin at x2go.org
Thu Jun 30 23:53:23 CEST 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 45375be5bfc0d2ef179549597319d1059ba318a5
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Apr 29 02:00:42 2016 +0200
src/configdialog.{cpp,h}: add "no record" support for OS X (through PulseManager.)
---
debian/changelog | 2 ++
src/configdialog.cpp | 31 ++++++++++++++++---------------
src/configdialog.h | 4 ++--
3 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 046ed08..3f1848b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -275,6 +275,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
- src/pulsemanager.cpp: add "FIXME" debug logging (and cleanup.)
- src/pulsemanager.cpp: backport fix for 526.
- src/pulsemanager.cpp: backport fix for 422.
+ - src/configdialog.{cpp,h}: add "no record" support for OS X (through
+ PulseManager.)
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 2f70a13..93c0225 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -352,18 +352,16 @@ ConfigDialog::ConfigDialog ( QWidget * parent, Qt::WindowFlags f )
tabWidg->addTab(xsetWidg, tr("X.Org Server settings"));
#endif
-#ifdef Q_OS_WIN
- QFrame* frp=new QFrame(this);
- tabWidg->addTab(frp, tr("Pulseaudio settings"));
- QVBoxLayout* l=new QVBoxLayout(frp);
- cbNoRecord=new QCheckBox(tr("Disable audio input"),frp);
- QLabel* lw=new QLabel(tr("<font size=\"5\">You must restart the X2Go Client for the changes to take effect</font><br><br>"),frp);
- lw->setWordWrap(true);
- l->addWidget(lw);
- l->addWidget(cbNoRecord);
- l->addStretch(1);
- cbNoRecord->setChecked ( st.setting()->value ( "pulse/norecord", false ).toBool() );
-#endif
+#if defined (Q_OS_WIN) || defined (Q_OS_DARWIN)
+ QFrame* frp = new QFrame (this);
+ tabWidg->addTab (frp, tr ("PulseAudio settings"));
+ QVBoxLayout* l = new QVBoxLayout (frp);
+ cbNoRecord = new QCheckBox (tr ("Disable sound input"), frp);
+ lw->setWordWrap (true);
+ l->addWidget (cbNoRecord);
+ l->addStretch (1);
+ cbNoRecord->setChecked (st.setting ()->value ("pulse/norecord", false).toBool ());
+#endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */
}
@@ -381,9 +379,9 @@ void ConfigDialog::slot_accepted()
st.setting()->setValue ( "trayicon/mincon", cbMinimizeTray->isChecked() );
st.setting()->setValue ( "trayicon/maxdiscon", cbMaxmizeTray->isChecked() );
#endif
-#ifdef Q_OS_WIN
+#if defined (Q_OS_WIN) || defined (Q_OS_DARWIN)
st.setting()->setValue ( "pulse/norecord", cbNoRecord->isChecked() );
-#endif
+#endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */
#ifdef USELDAP
if ( !embedMode )
{
@@ -661,12 +659,15 @@ void ConfigDialog::slotDefaults()
cbNoRecord->setChecked(false);
}
break;
-#endif
+#endif /* defined (Q_OS_WIN) */
case 0:
{
if ( embedMode )
cbStartEmbed->setChecked ( true );
clientSshPort->setValue ( 22 );
+#ifdef Q_OS_DARWIN
+ cbNoRecord->setChecked (false);
+#endif /* defined (Q_OS_DARWIN) */
#ifndef CFGPLUGIN
gbTrayIcon->setChecked (false);
cbMinimizeTray->setChecked (false);
diff --git a/src/configdialog.h b/src/configdialog.h
index e9b6582..5b55454 100644
--- a/src/configdialog.h
+++ b/src/configdialog.h
@@ -93,9 +93,9 @@ private:
XSettingsWidget* xsetWidg;
#endif
-#ifdef Q_OS_WIN
+#if defined (Q_OS_WIN) || defined (Q_OS_DARWIN)
QCheckBox *cbNoRecord;
-#endif
+#endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */
QGroupBox *gbTrayIcon;
QCheckBox *cbMinimizeTray;
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list