diff --git a/linux/Makefile.am b/linux/Makefile.am index f5800bf1..c946170b 100755 --- a/linux/Makefile.am +++ b/linux/Makefile.am @@ -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 diff --git a/src/aboutdlgbase.ui b/src/aboutdlgbase.ui index f1d28f5b..04dc70be 100755 --- a/src/aboutdlgbase.ui +++ b/src/aboutdlgbase.ui @@ -10,9 +10,7 @@ - - 1 - 1 + 0 0 @@ -21,32 +19,48 @@ About llcon - :/new/prefix1/mainicon.png + :/png/main/res/mainicon.png true - - 9 - 6 + + 9 + + + 9 + + + 9 + + + 9 + - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + - - 0 - 0 + 0 0 @@ -65,9 +79,7 @@ - - 7 - 5 + 0 0 @@ -87,20 +99,38 @@ - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + @@ -146,12 +176,21 @@ - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + diff --git a/src/chatdlgbase.ui b/src/chatdlgbase.ui index 52a4fb45..752a2f65 100755 --- a/src/chatdlgbase.ui +++ b/src/chatdlgbase.ui @@ -19,7 +19,7 @@ Chat - :/new/prefix1/mainicon.png + :/png/main/res/mainicon.png true diff --git a/src/clientsettingsdlgbase.ui b/src/clientsettingsdlgbase.ui index be4840e5..eac3d97e 100755 --- a/src/clientsettingsdlgbase.ui +++ b/src/clientsettingsdlgbase.ui @@ -13,7 +13,7 @@ General Settings - :/new/prefix1/mainicon.png + :/png/main/res/mainicon.png true diff --git a/src/global.h b/src/global.h index 781a455c..e98f15d6 100755 --- a/src/global.h +++ b/src/global.h @@ -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 diff --git a/src/llconclientdlgbase.ui b/src/llconclientdlgbase.ui index 11bc97ed..7cdcc8ef 100755 --- a/src/llconclientdlgbase.ui +++ b/src/llconclientdlgbase.ui @@ -13,7 +13,7 @@ llcon - :/new/prefix1/mainicon.png + :/png/main/res/mainicon.png true @@ -52,7 +52,7 @@ - :/new/prefix1/gig.png + :/png/main/res/gig.png true diff --git a/src/llconserverdlg.cpp b/src/llconserverdlg.cpp index 279cc974..cfdab217 100755 --- a/src/llconserverdlg.cpp +++ b/src/llconserverdlg.cpp @@ -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 ); diff --git a/src/llconserverdlg.h b/src/llconserverdlg.h index 2e46391b..68273935 100755 --- a/src/llconserverdlg.h +++ b/src/llconserverdlg.h @@ -58,10 +58,6 @@ protected: QTimer Timer; CServer* pServer; - QPixmap BitmCubeGreen; - QPixmap BitmCubeYellow; - QPixmap BitmCubeRed; - CVector vecpListViewItems; QMutex ListViewMutex; diff --git a/src/llconserverdlgbase.ui b/src/llconserverdlgbase.ui index cd89b4ba..789bad4a 100755 --- a/src/llconserverdlgbase.ui +++ b/src/llconserverdlgbase.ui @@ -13,7 +13,7 @@ llcon - :/new/prefix1/mainicon.png + :/png/main/res/mainicon.png true diff --git a/src/multicolorled.cpp b/src/multicolorled.cpp index 9df203c9..da7e6787 100755 --- a/src/multicolorled.cpp +++ b/src/multicolorled.cpp @@ -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& ) ) ); } diff --git a/src/res/CLEDBlack.png b/src/res/CLEDBlack.png new file mode 100755 index 00000000..7acb70e6 Binary files /dev/null and b/src/res/CLEDBlack.png differ diff --git a/src/res/CLEDBlackSmall.png b/src/res/CLEDBlackSmall.png new file mode 100755 index 00000000..916988b8 Binary files /dev/null and b/src/res/CLEDBlackSmall.png differ diff --git a/src/res/CLEDGreen.png b/src/res/CLEDGreen.png new file mode 100755 index 00000000..95b0ea13 Binary files /dev/null and b/src/res/CLEDGreen.png differ diff --git a/src/res/CLEDGreenSmall.png b/src/res/CLEDGreenSmall.png new file mode 100755 index 00000000..11b0bbce Binary files /dev/null and b/src/res/CLEDGreenSmall.png differ diff --git a/src/res/CLEDGrey.png b/src/res/CLEDGrey.png new file mode 100755 index 00000000..b3f5d7b0 Binary files /dev/null and b/src/res/CLEDGrey.png differ diff --git a/src/res/CLEDGreySmall.png b/src/res/CLEDGreySmall.png new file mode 100755 index 00000000..16b7a679 Binary files /dev/null and b/src/res/CLEDGreySmall.png differ diff --git a/src/res/CLEDRed.png b/src/res/CLEDRed.png new file mode 100755 index 00000000..9a2368cc Binary files /dev/null and b/src/res/CLEDRed.png differ diff --git a/src/res/CLEDRedSmall.png b/src/res/CLEDRedSmall.png new file mode 100755 index 00000000..975a36cd Binary files /dev/null and b/src/res/CLEDRedSmall.png differ diff --git a/src/res/CLEDYellow.png b/src/res/CLEDYellow.png new file mode 100755 index 00000000..7c643d92 Binary files /dev/null and b/src/res/CLEDYellow.png differ diff --git a/src/res/CLEDYellowSmall.png b/src/res/CLEDYellowSmall.png new file mode 100755 index 00000000..2e8efe8f Binary files /dev/null and b/src/res/CLEDYellowSmall.png differ diff --git a/src/res/VLEDBlack.png b/src/res/VLEDBlack.png new file mode 100755 index 00000000..1b92044f Binary files /dev/null and b/src/res/VLEDBlack.png differ diff --git a/src/res/VLEDBlackSmall.png b/src/res/VLEDBlackSmall.png new file mode 100755 index 00000000..e0808ecb Binary files /dev/null and b/src/res/VLEDBlackSmall.png differ diff --git a/src/res/VLEDGreen.png b/src/res/VLEDGreen.png new file mode 100755 index 00000000..fb86baca Binary files /dev/null and b/src/res/VLEDGreen.png differ diff --git a/src/res/VLEDGreenSmall.png b/src/res/VLEDGreenSmall.png new file mode 100755 index 00000000..f104e6f6 Binary files /dev/null and b/src/res/VLEDGreenSmall.png differ diff --git a/src/res/VLEDGrey.png b/src/res/VLEDGrey.png new file mode 100755 index 00000000..b1846bf9 Binary files /dev/null and b/src/res/VLEDGrey.png differ diff --git a/src/res/VLEDGreySmall.png b/src/res/VLEDGreySmall.png new file mode 100755 index 00000000..d177c0a4 Binary files /dev/null and b/src/res/VLEDGreySmall.png differ diff --git a/src/res/VLEDRed.png b/src/res/VLEDRed.png new file mode 100755 index 00000000..4fc8152d Binary files /dev/null and b/src/res/VLEDRed.png differ diff --git a/src/res/VLEDRedSmall.png b/src/res/VLEDRedSmall.png new file mode 100755 index 00000000..2e7ebf90 Binary files /dev/null and b/src/res/VLEDRedSmall.png differ diff --git a/src/res/VLEDYellow.png b/src/res/VLEDYellow.png new file mode 100755 index 00000000..9b0638b8 Binary files /dev/null and b/src/res/VLEDYellow.png differ diff --git a/src/res/VLEDYellowSmall.png b/src/res/VLEDYellowSmall.png new file mode 100755 index 00000000..e51c5e17 Binary files /dev/null and b/src/res/VLEDYellowSmall.png differ diff --git a/src/res/VRLEDBlack.png b/src/res/VRLEDBlack.png new file mode 100755 index 00000000..878a4b49 Binary files /dev/null and b/src/res/VRLEDBlack.png differ diff --git a/src/res/VRLEDBlackSmall.png b/src/res/VRLEDBlackSmall.png new file mode 100755 index 00000000..323bbfc5 Binary files /dev/null and b/src/res/VRLEDBlackSmall.png differ diff --git a/src/res/VRLEDGreen.png b/src/res/VRLEDGreen.png new file mode 100755 index 00000000..846c7dbf Binary files /dev/null and b/src/res/VRLEDGreen.png differ diff --git a/src/res/VRLEDGreenSmall.png b/src/res/VRLEDGreenSmall.png new file mode 100755 index 00000000..5dca0993 Binary files /dev/null and b/src/res/VRLEDGreenSmall.png differ diff --git a/src/res/VRLEDGrey.png b/src/res/VRLEDGrey.png new file mode 100755 index 00000000..4915fafb Binary files /dev/null and b/src/res/VRLEDGrey.png differ diff --git a/src/res/VRLEDGreySmall.png b/src/res/VRLEDGreySmall.png new file mode 100755 index 00000000..d8d142de Binary files /dev/null and b/src/res/VRLEDGreySmall.png differ diff --git a/src/res/VRLEDRed.png b/src/res/VRLEDRed.png new file mode 100755 index 00000000..4bad9d1d Binary files /dev/null and b/src/res/VRLEDRed.png differ diff --git a/src/res/VRLEDRedSmall.png b/src/res/VRLEDRedSmall.png new file mode 100755 index 00000000..19cec881 Binary files /dev/null and b/src/res/VRLEDRedSmall.png differ diff --git a/src/res/VRLEDYellow.png b/src/res/VRLEDYellow.png new file mode 100755 index 00000000..7d945849 Binary files /dev/null and b/src/res/VRLEDYellow.png differ diff --git a/src/res/VRLEDYellowSmall.png b/src/res/VRLEDYellowSmall.png new file mode 100755 index 00000000..277cac91 Binary files /dev/null and b/src/res/VRLEDYellowSmall.png differ diff --git a/src/gig.png b/src/res/gig.png similarity index 100% rename from src/gig.png rename to src/res/gig.png diff --git a/src/mainicon.png b/src/res/mainicon.png similarity index 100% rename from src/mainicon.png rename to src/res/mainicon.png diff --git a/src/resources.qrc b/src/resources.qrc index e8eada1c..230b9125 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -1,6 +1,38 @@ - - gig.png - mainicon.png + + res/CLEDBlack.png + res/CLEDBlackSmall.png + res/CLEDGreen.png + res/CLEDGreenSmall.png + res/CLEDGrey.png + res/CLEDGreySmall.png + res/CLEDRed.png + res/CLEDRedSmall.png + res/CLEDYellow.png + res/CLEDYellowSmall.png + res/VLEDBlack.png + res/VLEDBlackSmall.png + res/VLEDGreen.png + res/VLEDGreenSmall.png + res/VLEDGrey.png + res/VLEDGreySmall.png + res/VLEDRed.png + res/VLEDRedSmall.png + res/VLEDYellow.png + res/VLEDYellowSmall.png + res/VRLEDBlack.png + res/VRLEDBlackSmall.png + res/VRLEDGreen.png + res/VRLEDGreenSmall.png + res/VRLEDGrey.png + res/VRLEDGreySmall.png + res/VRLEDRed.png + res/VRLEDRedSmall.png + res/VRLEDYellow.png + res/VRLEDYellowSmall.png + + + res/gig.png + res/mainicon.png diff --git a/src/util.cpp b/src/util.cpp index 70838567..c2ceadde 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -325,16 +325,18 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent ) "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 " "USA" "


" - "

" // libraries used by this compilation of llcon - "" + tr("llcon uses the following libraries or code snippets:") + + "

" + // libraries used by this compilation of llcon + tr("llcon uses the following libraries, resources or code snippets:") + "

" "
    " "
  • Qt cross-platform application framework: http://trolltech.com
    • " "
  • Audio reverberation code: by Perry R. Cook and Gary P. Scavone, " - "1995 - 2004 (taken from \"The Synthesis ToolKit in C++ (STK)\")
    • " + "1995 - 2004 (taken from The Synthesis ToolKit in C++ (STK))" "
  • ADPCM coders by Erik de Castro Lopo
    • " "
  • Parts from Dream DRM Receiver by Volker Fischer and Alexander " - "Kurpiers: http://drm.sf.net
    • " + "Kurpiers: http://drm.sf.net" + "
  • Some pixmaps are from Clker.com - vector clip art online, " + "royalty free & public domain
    • " "
" "
");