Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testbranch #3

Open
wants to merge 3 commits into
base: ASIO_UI
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/clientsettingsdlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP,

// init driver button
#ifdef _WIN32
butDriverSetup->setText ( tr ( "ASIO Setup" ) );
butDriverSetup->setText ( tr ( "ASIO Device Setup" ) );
#else
// no use for this button for MacOS/Linux right now -> hide it
butDriverSetup->hide();
Expand Down
66 changes: 36 additions & 30 deletions src/clientsettingsdlgbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>575</width>
<height>394</height>
<width>576</width>
<height>413</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -28,26 +28,44 @@
</property>
<layout class="QVBoxLayout">
<item>
<widget class="QLabel" name="lblSoundcardDevice">
<property name="text">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Device</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbxSoundcard">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<property name="flat">
<bool>false</bool>
</property>
<property name="minimumSize">
<size>
<width>153</width>
<height>0</height>
</size>
<property name="checkable">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QComboBox" name="cbxSoundcard">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>153</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="butDriverSetup">
<property name="text">
<string>Driver Setup</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
Expand Down Expand Up @@ -241,16 +259,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="butDriverSetup">
<property name="text">
<string>Driver Setup</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -665,7 +673,6 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>cbxSoundcard</tabstop>
<tabstop>cbxLInChan</tabstop>
<tabstop>cbxRInChan</tabstop>
<tabstop>cbxLOutChan</tabstop>
Expand All @@ -674,7 +681,6 @@
<tabstop>rbtBufferDelayPreferred</tabstop>
<tabstop>rbtBufferDelayDefault</tabstop>
<tabstop>rbtBufferDelaySafe</tabstop>
<tabstop>butDriverSetup</tabstop>
<tabstop>chbAutoJitBuf</tabstop>
<tabstop>sldNetBuf</tabstop>
<tabstop>sldNetBufServer</tabstop>
Expand Down