Skip to content

Update left-side gui section #1752

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.

Sign up for GitHub

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

Closed
henkdegroot wants to merge 1 commit into from
Closed

Update left-side gui section #1752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions Jamulus.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,8 @@ DISTFILES += ChangeLog \
src/res/IndicatorGreen.png \
src/res/IndicatorYellow.png \
src/res/IndicatorRed.png \
src/res/IndicatorYellowFancy.png \
src/res/IndicatorRedFancy.png \
src/res/faderbackground.png \
src/res/faderhandle.png \
src/res/faderhandlesmall.png \
Expand Down
38 changes: 9 additions & 29 deletions src/clientdlgbase.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,6 @@
<property name="spacing">
<number>3</number>
</property>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="pxlLogo">
<property name="sizePolicy">
Expand Down Expand Up @@ -115,7 +102,7 @@
<item>
<layout class="QVBoxLayout">
<property name="spacing">
<number>3</number>
<number>6</number>
</property>
<item>
<widget class="QLabel" name="lblAudioReverb">
Expand Down Expand Up @@ -147,6 +134,12 @@
</item>
<item>
<widget class="QSlider" name="sldAudioReverb">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
Expand Down Expand Up @@ -215,7 +208,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>0</height>
<height>10</height>
</size>
</property>
</spacer>
Expand Down Expand Up @@ -270,7 +263,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>5</height>
<height>3</height>
</size>
</property>
</spacer>
Expand Down Expand Up @@ -314,19 +307,6 @@
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
Expand Down
4 changes: 2 additions & 2 deletions src/multicolorled.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ CMultiColorLED::CMultiColorLED ( QWidget* parent ) :
BitmCubeDisabled ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDDisabledSmall.png" ) ),
BitmCubeGrey ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreySmall.png" ) ),
BitmCubeGreen ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenSmall.png" ) ),
BitmCubeYellow ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDYellowSmall.png" ) ),
BitmCubeRed ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDRedSmall.png" ) ),
BitmCubeYellow ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorYellowFancy.png" ) ),
BitmCubeRed ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorRedFancy.png" ) ),
BitmIndicatorGreen ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorGreen.png" ) ),
BitmIndicatorYellow ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorYellow.png" ) ),
BitmIndicatorRed ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorRed.png" ) )
Expand Down
Binary file added src/res/IndicatorRedFancy.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/res/IndicatorYellowFancy.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
<file>res/IndicatorGreen.png</file>
<file>res/IndicatorYellow.png</file>
<file>res/IndicatorRed.png</file>
<file>res/IndicatorYellowFancy.png</file>
<file>res/IndicatorRedFancy.png</file>
<file>res/HLEDGreenSmall.png</file>
<file>res/HLEDBlackSmall.png</file>
<file>res/HLEDRedSmall.png</file>
Expand Down