added LED bitmaps

linux/Makefile.am

@@ -46,8 +46,38 @@ llcon_SOURCES = ../src/buffer.cpp \
 	../src/aboutdlgbase.ui \
 	sound.h \
 	../src/resources.qrc \
-	../src/mainicon.png \
+	../src/res/gig.png \
-	../src/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
 

src/aboutdlgbase.ui

@@ -10,9 +10,7 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
+   <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
-    <hsizetype>1</hsizetype>
-    <vsizetype>1</vsizetype>
     <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>
+        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-         <hsizetype>0</hsizetype>
-         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -65,9 +79,7 @@
      <item>
       <widget class="QLabel" name="TextLabelVersion" >
        <property name="sizePolicy" >
-        <sizepolicy>
+        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
-         <hsizetype>7</hsizetype>
-         <vsizetype>5</vsizetype>
          <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" >

src/chatdlgbase.ui

@@ -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>

src/clientsettingsdlgbase.ui

@@ -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>

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

src/llconclientdlgbase.ui

@@ -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>

src/llconserverdlg.cpp

@@ -27,10 +27,7 @@
 
 /* Implementation *************************************************************/
 CLlconServerDlg::CLlconServerDlg ( CServer* pNServP, QWidget* parent )
-    : pServer ( pNServP ), QDialog ( 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 )
 {
     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 );

src/llconserverdlg.h

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

src/llconserverdlgbase.ui

@@ -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>

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 ),
+    BitmCubeGreen  ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenSmall.png" ) ),
-    BitmCubeRed    ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ),
+    BitmCubeRed    ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDRedSmall.png" ) ),
-    BitmCubeGrey   ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL ),
+    BitmCubeGrey   ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreySmall.png" ) ),
-    BitmCubeYellow ( LED_WIDTH_HEIGHT_SIZE_PIXEL, LED_WIDTH_HEIGHT_SIZE_PIXEL )
+    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& ) ) );
 }
 

src/resources.qrc

@@ -1,6 +1,38 @@
 <RCC>
-    <qresource prefix="/new/prefix1" >
+    <qresource prefix="/png/LEDs" >
-        <file>gig.png</file>
+        <file>res/CLEDBlack.png</file>
-        <file>mainicon.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>

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"
         "</font></p><br>"
-        "<p>" // libraries used by this compilation of llcon
+        "<p><b>" + // libraries used by this compilation of llcon
-        "<b>" + tr("llcon uses the following libraries or code snippets:") +
+        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>");