eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

some cleanup, added logopicture to about dialog

Browse source
This commit is contained in:
Volker Fischer 2011-03-20 13:25:06 +00:00
parent 2dc520014a
commit 8906baeca6
3 changed files with 158 additions and 253 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

281
src/aboutdlgbase.ui
View file

@ -6,7 +6,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>630</width> <width>630</width>
<height>397</height> <height>465</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@ -25,149 +25,172 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="PixmapLabelDreamLogo" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="pixmap" >
<pixmap/>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="TextLabelVersion" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>TextLabelVersion</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="TextLabelAuthorNames" > <layout class="QHBoxLayout" >
<property name="text" > <property name="spacing" >
<string>Author: Volker Fischer</string> <number>6</number>
</property> </property>
<property name="wordWrap" > <property name="leftMargin" >
<bool>false</bool> <number>0</number>
</property> </property>
</widget> <property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="PixmapLabelDreamLogo" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="pixmap" >
<pixmap/>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="TextLabelVersion" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>TextLabelVersion</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QLabel" name="TextLabelCopyright" > <layout class="QHBoxLayout" >
<property name="text" > <property name="spacing" >
<string>Copyright (C) 2005 - 2011</string> <number>6</number>
</property> </property>
<property name="wordWrap" > <property name="leftMargin" >
<bool>false</bool> <number>0</number>
</property> </property>
</widget> <property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="TextLabelAuthorNames" >
<property name="text" >
<string>Author: Volker Fischer</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="TextLabelCopyright" >
<property name="text" >
<string>Copyright (C) 2005 - 2011</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<spacer> <layout class="QVBoxLayout" >
<property name="orientation" > <item>
<enum>Qt::Horizontal</enum> <widget class="QLabel" name="label" >
</property> <property name="text" >
<property name="sizeType" > <string/>
<enum>QSizePolicy::Expanding</enum> </property>
</property> <property name="pixmap" >
<property name="sizeHint" > <pixmap resource="resources.qrc" >:/png/main/res/logopicture.png</pixmap>
<size> </property>
<width>20</width> </widget>
<height>20</height> </item>
</size> <item>
</property> <spacer>
</spacer> <property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </item>

38
src/audiomixerboard.cpp
View file

@ -152,13 +152,6 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
pFader->setStyleSheet ( "" ); pFader->setStyleSheet ( "" );
pcbMute->setStyleSheet ( "" ); pcbMute->setStyleSheet ( "" );
pcbSolo->setStyleSheet ( "" ); pcbSolo->setStyleSheet ( "" );
/*
// TEST
pFader->setStyleSheet (
"QSlider::handle { image: url(:/png/fader/res/faderhandle.png); }" );
*/
pcbMute->setText ( "Mute" ); pcbMute->setText ( "Mute" );
pcbSolo->setText ( "Solo" ); pcbSolo->setText ( "Solo" );
break; break;
@ -335,36 +328,7 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags f ) :
void CAudioMixerBoard::SetGUIDesign ( const EGUIDesign eNewDesign ) void CAudioMixerBoard::SetGUIDesign ( const EGUIDesign eNewDesign )
{ {
// apply GUI design to current window // apply GUI design to child GUI controls
switch ( eNewDesign )
{
case GD_ORIGINAL:
/*
// group box
setStyleSheet (
"QGroupBox { border-image: url(:/png/fader/res/mixerboardbackground.png) 34px 30px 40px 40px;"
" border-top: 34px transparent;"
" border-bottom: 40px transparent;"
" border-left: 30px transparent;"
" border-right: 40px transparent;"
" padding: -5px;"
" margin: -5px, -5px, 0px, 0px; }"
"QGroupBox::title { margin-top: 13px;"
" margin-left: 35px;"
" background-color: transparent;"
" color: rgb(148, 148, 148); }" );
layout()->setMargin ( 3 );
*/
break;
default:
// reset style sheet and set original paramters
setStyleSheet ( "" );
layout()->setMargin ( 9 );
break;
}
// also apply GUI design to child GUI controls
for ( int i = 0; i < USED_NUM_CHANNELS; i++ ) for ( int i = 0; i < USED_NUM_CHANNELS; i++ )
{ {
vecpChanFader[i]->SetGUIDesign ( eNewDesign ); vecpChanFader[i]->SetGUIDesign ( eNewDesign );

92
src/llconclientdlg.cpp
View file

@ -823,98 +823,16 @@ void CLlconClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )
" border-right: 40px transparent;" " border-right: 40px transparent;"
" padding: -5px;" " padding: -5px;"
" margin: -5px, -5px, 0px, 0px; }" " margin: -5px, -5px, 0px, 0px; }"
"QLabel { color: rgb(148, 148, 148);" "QLabel { color: rgb(148, 148, 148);"
" font: bold; }" " font: bold; }"
"QRadioButton { color: rgb(148, 148, 148);" "QRadioButton { color: rgb(148, 148, 148);"
" font: bold; }" " font: bold; }"
"QGroupBox::title { color: rgb(148, 148, 148); }" ); "QGroupBox::title { color: rgb(148, 148, 148); }" );
/*
// group box
groupBoxLocal->setStyleSheet (
"QGroupBox { border-image: url(:/png/fader/res/mixerboardbackground.png) 34px 30px 40px 40px;"
" border-top: 34px transparent;"
" border-bottom: 40px transparent;"
" border-left: 30px transparent;"
" border-right: 40px transparent;"
" padding: -5px;"
" margin: -5px, -5px, 0px, 0px; }"
"QGroupBox::title { margin-top: 13px;"
" margin-left: 35px;"
" background-color: transparent;"
" color: rgb(148, 148, 148); }" );
groupBoxLocal->layout()->setMargin ( 3 );
*/
/*
// audio fader
SliderAudInFader->setStyleSheet (
"QSlider { background-image: url(:/png/fader/res/faderbackground.png);"
" width: 45px; }"
"QSlider::groove { image: url(); }"
"QSlider::handle { image: url(:/png/fader/res/faderhandlesmall.png); }" );
TextLabelAudFader->setStyleSheet (
"QLabel { color: rgb(148, 148, 148);"
" font: bold; }" );
TextAudInFader->setStyleSheet (
"QLabel { color: rgb(148, 148, 148);"
" font: bold; }" );
// Reverberation
SliderAudReverb->setStyleSheet (
"QSlider { background-image: url(:/png/fader/res/faderbackground.png);"
" width: 45px; }"
"QSlider::groove { image: url(); }"
"QSlider::handle { image: url(:/png/fader/res/faderhandlesmall.png); }" );
RadioButtonRevSelL->setStyleSheet (
"QRadioButton { color: rgb(148, 148, 148);"
" font: bold; }" );
RadioButtonRevSelR->setStyleSheet (
"QRadioButton { color: rgb(148, 148, 148);"
" font: bold; }" );
TextLabelAudReverb->setStyleSheet (
"QLabel { color: rgb(148, 148, 148);"
" font: bold; }" );
*/
break; break;
default: default:
// reset style sheet and set original paramters // reset style sheet and set original paramters
/*
backgroundFrame->setStyleSheet ( "QFrame#backgroundFrame { border-image: url(:/png/fader/res/mixerboardbackground.png) 34px 30px 40px 40px;"
" border-top: 34px transparent;"
" border-bottom: 40px transparent;"
" border-left: 30px transparent;"
" border-right: 40px transparent;"
" padding: -5px;"
" margin: -5px, -5px, 0px, 0px; }"
"QLabel { color: rgb(148, 148, 148);"
" font: bold; }"
"QRadioButton {color: rgb(148, 148, 148);"
" font: bold; }");
*/
// groupBoxLocal->setStyleSheet ( "" );
// groupBoxLocal->layout()->setMargin ( 9 );
backgroundFrame->setStyleSheet ( "" ); backgroundFrame->setStyleSheet ( "" );
SliderAudInFader->setStyleSheet ( "" );
SliderAudReverb->setStyleSheet ( "" );
RadioButtonRevSelL->setStyleSheet ( "" );
RadioButtonRevSelR->setStyleSheet ( "" );
TextLabelAudReverb->setStyleSheet ( "" );
TextLabelAudFader->setStyleSheet ( "" );
TextAudInFader->setStyleSheet ( "" );
/*
SliderAudInFader->setStyleSheet (
"QSlider { background-image: url(:/png/fader/res/faderbackground.png);"
" width: 45px; }"
"QSlider::groove { image: url(); }"
"QSlider::handle { image: url(:/png/fader/res/faderhandlesmall.png); }" );
*/
break; break;
} }