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

added LED bitmaps

Browse Source
This commit is contained in:
Volker Fischer 2009-05-01 10:06:07 +00:00
parent ac4e8a778d
commit 49cd2a1a9a
44 changed files with 152 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
linux/Makefile.am
View File

@ -46,8 +46,38 @@ llcon_SOURCES = ../src/buffer.cpp \
../src/aboutdlgbase.ui \
sound.h \
../src/resources.qrc \
../src/mainicon.png \
../src/gig.png
../src/res/gig.png \
../src/res/mainicon.png \
../src/res/CLEDBlack.png \
../src/res/CLEDGrey.png \
../src/res/CLEDGreen.png \
../src/res/CLEDYellow.png \
../src/res/CLEDRed.png \
../src/res/CLEDBlackSmall.png \
../src/res/CLEDGreySmall.png \
../src/res/CLEDGreenSmall.png \
../src/res/CLEDYellowSmall.png \
../src/res/CLEDRedSmall.png \
../src/res/VLEDBlack.png \
../src/res/VLEDGrey.png \
../src/res/VLEDGreen.png \
../src/res/VLEDYellow.png \
../src/res/VLEDRed.png \
../src/res/VLEDBlackSmall.png \
../src/res/VLEDGreySmall.png \
../src/res/VLEDGreenSmall.png \
../src/res/VLEDYellowSmall.png \
../src/res/VLEDRedSmall.png \
../src/res/VRLEDBlack.png \
../src/res/VRLEDGrey.png \
../src/res/VRLEDGreen.png \
../src/res/VRLEDYellow.png \
../src/res/VRLEDRed.png \
../src/res/VRLEDBlackSmall.png \
../src/res/VRLEDGreySmall.png \
../src/res/VRLEDGreenSmall.png \
../src/res/VRLEDYellowSmall.png \
../src/res/VRLEDRedSmall.png
# these need to be generated before the rest can be compiled

89
src/aboutdlgbase.ui
View File

@ -10,9 +10,7 @@
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>1</vsizetype>
<sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -21,32 +19,48 @@
<string>About llcon</string>
</property>
<property name="windowIcon" >
<iconset resource="resources.qrc" >:/new/prefix1/mainicon.png</iconset>
<iconset resource="resources.qrc" >:/png/main/res/mainicon.png</iconset>
</property>
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<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>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<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>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -65,9 +79,7 @@
<item>
<widget class="QLabel" name="TextLabelVersion" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -87,20 +99,38 @@
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<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>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<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" >
@ -146,12 +176,21 @@
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<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>
<spacer>
<property name="orientation" >

2
src/chatdlgbase.ui
View File

@ -19,7 +19,7 @@
<string>Chat</string>
</property>
<property name="windowIcon" >
<iconset resource="resources.qrc" >:/new/prefix1/mainicon.png</iconset>
<iconset resource="resources.qrc" >:/png/main/res/mainicon.png</iconset>
</property>
<property name="sizeGripEnabled" >
<bool>true</bool>

2
src/clientsettingsdlgbase.ui
View File

@ -13,7 +13,7 @@
<string>General Settings</string>
</property>
<property name="windowIcon" >
<iconset resource="resources.qrc" >:/new/prefix1/mainicon.png</iconset>
<iconset resource="resources.qrc" >:/png/main/res/mainicon.png</iconset>
</property>
<property name="sizeGripEnabled" >
<bool>true</bool>

3
src/global.h
View File

@ -112,9 +112,6 @@
// length of the moving average buffer for response time measurement
#define TIME_MOV_AV_RESPONSE 30 // seconds
// GUI definition: width/heigth size of LED pixmaps
#define LED_WIDTH_HEIGHT_SIZE_PIXEL 20
#define _MAXSHORT 32767
#define _MAXBYTE 255 // binary: 11111111

4
src/llconclientdlgbase.ui
View File

@ -13,7 +13,7 @@
<string>llcon</string>
</property>
<property name="windowIcon" >
<iconset resource="resources.qrc" >:/new/prefix1/mainicon.png</iconset>
<iconset resource="resources.qrc" >:/png/main/res/mainicon.png</iconset>
</property>
<property name="sizeGripEnabled" >
<bool>true</bool>
@ -52,7 +52,7 @@
</sizepolicy>
</property>
<property name="pixmap" >
<pixmap resource="resources.qrc" >:/new/prefix1/gig.png</pixmap>
<pixmap resource="resources.qrc" >:/png/main/res/gig.png</pixmap>
</property>
<property name="scaledContents" >
<bool>true</bool>

10
src/llconserverdlg.cpp
View File

@ -27,10 +27,7 @@
/* Implementation *************************************************************/
CLlconServerDlg::CLlconServerDlg ( CServer* pNServP, QWidget* parent )
: pServer ( pNServP ), QDialog ( parent ),
BitmCubeGreen ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ),
BitmCubeRed ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ),
BitmCubeYellow ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL )
: pServer ( pNServP ), QDialog ( parent )
{
setupUi ( this );
@ -38,11 +35,6 @@ CLlconServerDlg::CLlconServerDlg ( CServer* pNServP, QWidget* parent )
TextLabelNameVersion->setText ( QString ( APP_NAME ) +
tr ( " server " ) + QString ( VERSION ) );
// create bitmaps
BitmCubeGreen.fill ( QColor ( 0, 255, 0 ) );
BitmCubeRed.fill ( QColor ( 255, 0, 0 ) );
BitmCubeYellow.fill ( QColor ( 255, 255, 0 ) );
// set up list view for connected clients
ListViewClients->setColumnWidth ( 0, 170 );
ListViewClients->setColumnWidth ( 1, 130 );

4
src/llconserverdlg.h
View File

@ -58,10 +58,6 @@ protected:
QTimer Timer;
CServer* pServer;
QPixmap BitmCubeGreen;
QPixmap BitmCubeYellow;
QPixmap BitmCubeRed;
CVector<CServerListViewItem*> vecpListViewItems;
QMutex ListViewMutex;

2
src/llconserverdlgbase.ui
View File

@ -13,7 +13,7 @@
<string>llcon</string>
</property>
<property name="windowIcon" >
<iconset resource="resources.qrc" >:/new/prefix1/mainicon.png</iconset>
<iconset resource="resources.qrc" >:/png/main/res/mainicon.png</iconset>
</property>
<property name="sizeGripEnabled" >
<bool>true</bool>

29
src/multicolorled.cpp
View File

@ -5,7 +5,7 @@
* Volker Fischer
*
* Description:
* Implements a multi-color LED
* Implements a multi color LED
*
*
******************************************************************************
@ -32,25 +32,14 @@
/* Implementation *************************************************************/
CMultiColorLED::CMultiColorLED ( QWidget* parent, Qt::WindowFlags f )
: QLabel ( parent, f ),
BitmCubeGreen ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ),
BitmCubeRed ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ),
BitmCubeGrey ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ),
BitmCubeYellow ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL )
BitmCubeGreen ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenSmall.png" ) ),
BitmCubeRed ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDRedSmall.png" ) ),
BitmCubeGrey ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreySmall.png" ) ),
BitmCubeYellow ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDYellowSmall.png" ) )
{
// create bitmaps
BitmCubeGreen.fill ( QColor ( 0, 255, 0 ) );
BitmCubeRed.fill ( QColor ( 255, 0, 0 ) );
BitmCubeGrey.fill ( QColor ( 192, 192, 192 ) );
BitmCubeYellow.fill ( QColor ( 255, 255, 0 ) );
// init color flags
Reset();
// set modified style of label
setFrameShape ( QFrame::Panel );
setFrameShadow ( QFrame::Sunken );
setIndent ( 0 );
// set init bitmap
setPixmap ( BitmCubeGrey );
eColorFlag = RL_GREY;
@ -64,14 +53,14 @@ CMultiColorLED::CMultiColorLED ( QWidget* parent, Qt::WindowFlags f )
TimerYellowLight.setSingleShot ( true );
// connect timer events to the desired slots
connect ( &TimerRedLight, SIGNAL ( timeout() ),
connect ( &TimerRedLight, SIGNAL ( timeout() ),
this, SLOT ( OnTimerRedLight() ) );
connect ( &TimerGreenLight, SIGNAL ( timeout() ),
connect ( &TimerGreenLight, SIGNAL ( timeout() ),
this, SLOT ( OnTimerGreenLight() ) );
connect ( &TimerYellowLight, SIGNAL ( timeout() ),
connect ( &TimerYellowLight, SIGNAL ( timeout() ),
this, SLOT ( OnTimerYellowLight() ) );
connect ( this, SIGNAL ( newPixmap ( const QPixmap& ) ),
connect ( this, SIGNAL ( newPixmap ( const QPixmap& ) ),
this, SLOT ( OnNewPixmap ( const QPixmap& ) ) );
}

BIN
src/res/CLEDBlack.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 40 KiB

BIN
src/res/CLEDBlackSmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/res/CLEDGreen.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 44 KiB

BIN
src/res/CLEDGreenSmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/res/CLEDGrey.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
src/res/CLEDGreySmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/res/CLEDRed.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 44 KiB

BIN
src/res/CLEDRedSmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/res/CLEDYellow.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
src/res/CLEDYellowSmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/res/VLEDBlack.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
src/res/VLEDBlackSmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/res/VLEDGreen.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
src/res/VLEDGreenSmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/res/VLEDGrey.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
src/res/VLEDGreySmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/res/VLEDRed.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
src/res/VLEDRedSmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/res/VLEDYellow.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
src/res/VLEDYellowSmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/res/VRLEDBlack.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
src/res/VRLEDBlackSmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/res/VRLEDGreen.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
src/res/VRLEDGreenSmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/res/VRLEDGrey.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
src/res/VRLEDGreySmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/res/VRLEDRed.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
src/res/VRLEDRedSmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/res/VRLEDYellow.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
src/res/VRLEDYellowSmall.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

0
src/gig.png → src/res/gig.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

0
src/mainicon.png → src/res/mainicon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 277 B

After

Width:  |  Height:  |  Size: 277 B

38
src/resources.qrc
View File

@ -1,6 +1,38 @@
<RCC>
<qresource prefix="/new/prefix1" >
<file>gig.png</file>
<file>mainicon.png</file>
<qresource prefix="/png/LEDs" >
<file>res/CLEDBlack.png</file>
<file>res/CLEDBlackSmall.png</file>
<file>res/CLEDGreen.png</file>
<file>res/CLEDGreenSmall.png</file>
<file>res/CLEDGrey.png</file>
<file>res/CLEDGreySmall.png</file>
<file>res/CLEDRed.png</file>
<file>res/CLEDRedSmall.png</file>
<file>res/CLEDYellow.png</file>
<file>res/CLEDYellowSmall.png</file>
<file>res/VLEDBlack.png</file>
<file>res/VLEDBlackSmall.png</file>
<file>res/VLEDGreen.png</file>
<file>res/VLEDGreenSmall.png</file>
<file>res/VLEDGrey.png</file>
<file>res/VLEDGreySmall.png</file>
<file>res/VLEDRed.png</file>
<file>res/VLEDRedSmall.png</file>
<file>res/VLEDYellow.png</file>
<file>res/VLEDYellowSmall.png</file>
<file>res/VRLEDBlack.png</file>
<file>res/VRLEDBlackSmall.png</file>
<file>res/VRLEDGreen.png</file>
<file>res/VRLEDGreenSmall.png</file>
<file>res/VRLEDGrey.png</file>
<file>res/VRLEDGreySmall.png</file>
<file>res/VRLEDRed.png</file>
<file>res/VRLEDRedSmall.png</file>
<file>res/VRLEDYellow.png</file>
<file>res/VRLEDYellowSmall.png</file>
</qresource>
<qresource prefix="/png/main" >
<file>res/gig.png</file>
<file>res/mainicon.png</file>
</qresource>
</RCC>

10
src/util.cpp
View File

@ -325,16 +325,18 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 "
"USA"
"</font></p><br>"
"<p>" // libraries used by this compilation of llcon
"<b>" + tr("llcon uses the following libraries or code snippets:") +
"<p><b>" + // libraries used by this compilation of llcon
tr("llcon uses the following libraries, resources or code snippets:") +
"</b></p>"
"<ul>"
"<li>Qt cross-platform application framework: <i>http://trolltech.com</li>"
"<li>Audio reverberation code: by Perry R. Cook and Gary P. Scavone, "
"1995 - 2004 (taken from \"The Synthesis ToolKit in C++ (STK)\")</li>"
"1995 - 2004 (taken from <i>The Synthesis ToolKit in C++ (STK)</i>)</li>"
"<li>ADPCM coders by Erik de Castro Lopo</li>"
"<li>Parts from Dream DRM Receiver by Volker Fischer and Alexander "
"Kurpiers: <i>http://drm.sf.net</li>"
"Kurpiers: <i>http://drm.sf.net</i></li>"
"<li>Some pixmaps are from <i>Clker.com - vector clip art online, "
"royalty free & public domain</i></li>"
"</ul>"
"</center><br>");