diff --git a/ChangeLog b/ChangeLog index 6bf3934d..f862524e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20934,3 +20934,6 @@ * Added 'RDMatrixListModel'. * Refactored the 'Rivendell Switcher List' dialog in rdadmin(1) to use the model-based API. +2021-01-27 Fred Gleason + * Added 'RDIconEngine::Input' and 'RDIconEngine::Output' icons + to 'RDIconEngine'. diff --git a/icons/Makefile.am b/icons/Makefile.am index a5ebcb0d..b8fdb3d7 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -289,6 +289,7 @@ EXTRA_DIST = admin.xpm\ greencheckmark.xpm\ host-16x16.xpm\ host-48x48.xpm\ + input.xpm\ localuser.xpm\ marker.xpm\ mic16.png\ @@ -304,6 +305,7 @@ EXTRA_DIST = admin.xpm\ play.png\ play.xpm\ macro.xpm\ + output.xpm\ post.xpm\ post2.xpm\ post3.xpm\ diff --git a/icons/input.xpm b/icons/input.xpm new file mode 100644 index 00000000..022f3c83 --- /dev/null +++ b/icons/input.xpm @@ -0,0 +1,62 @@ +/* XPM */ +static const char * input_xpm[] = { +"16 16 43 1", +" c None", +". c #000000", +"+ c #133755", +"@ c #010101", +"# c #3B3A3B", +"$ c #292929", +"% c #4C7497", +"& c #51758D", +"* c #020202", +"= c #4C637B", +"- c #6A86A0", +"; c #8494A7", +"> c #B4BCC9", +", c #82A6C1", +"' c #B6D8E9", +") c #59798E", +"! c #040404", +"~ c #314D6B", +"{ c #AECEE2", +"] c #89C7E1", +"^ c #60B6DA", +"/ c #2A97C8", +"( c #1191C9", +"_ c #BADCEC", +": c #50748C", +"< c #133354", +"[ c #AFD2E8", +"} c #1F99C2", +"| c #229EC7", +"1 c #1198CA", +"2 c #40B7DA", +"3 c #0F4F74", +"4 c #0C2E51", +"5 c #114366", +"6 c #0E3F61", +"7 c #0B3A5A", +"8 c #0E74A6", +"9 c #30B6DA", +"0 c #105074", +"a c #1A5A84", +"b c #0A2F4F", +"c c #1C1C1C", +"d c #294A6B", +" ", +" ", +" ", +" . ", +" +@ ", +" ##$.%&* ", +" =-;>,')! ", +" ~{]^/(_:@ ", +" <[}|1(23$ ", +" 4567890$ ", +" a3# ", +" bc ", +" d ", +" ", +" ", +" "}; diff --git a/icons/output.xpm b/icons/output.xpm new file mode 100644 index 00000000..72fb6190 --- /dev/null +++ b/icons/output.xpm @@ -0,0 +1,61 @@ +/* XPM */ +static const char * output_xpm[] = { +"16 16 42 1", +" c None", +". c #343434", +"+ c #2B333E", +"@ c #0E4870", +"# c #040404", +"$ c #6A86A0", +"% c #0F4F74", +"& c #3B3A3B", +"* c #50748C", +"= c #AECEE2", +"- c #4D9DC5", +"; c #1191C9", +"> c #A5AEB8", +", c #8A959F", +"' c #425061", +") c #292929", +"! c #38577A", +"~ c #77C4E0", +"{ c #108AC1", +"] c #42A4D0", +"^ c #60B6DA", +"/ c #70AFD2", +"( c #26445E", +"_ c #072136", +": c #168ABA", +"< c #1CA8D6", +"[ c #118DC7", +"} c #239EC9", +"| c #2AA0C6", +"1 c #1695C4", +"2 c #0A3052", +"3 c #092A46", +"4 c #2495BF", +"5 c #1C95BE", +"6 c #0C3559", +"7 c #0E3758", +"8 c #061528", +"9 c #092843", +"0 c #105686", +"a c #07172D", +"b c #10365C", +"c c #080C15", +" ", +" ", +" ", +" . ", +" +@ ", +" #$@ ", +" .+%@&&& ", +" #*=-;>,' ", +" )!=~{]^/( ", +" _:<[}|12 ", +" 345@678 ", +" 90@ ", +" ab ", +" c ", +" ", +" "}; diff --git a/lib/rdiconengine.cpp b/lib/rdiconengine.cpp index 671cabc3..99016c7a 100644 --- a/lib/rdiconengine.cpp +++ b/lib/rdiconengine.cpp @@ -112,6 +112,8 @@ #include "../icons/redball.xpm" #include "../icons/whiteball.xpm" #include "../icons/switch3.xpm" +#include "../icons/input.xpm" +#include "../icons/output.xpm" #include "../icons/record.xpm" #include "../icons/upload.xpm" #include "../icons/download.xpm" @@ -261,6 +263,8 @@ RDIconEngine::RDIconEngine() d_list_icons.push_back(QPixmap(whiteball_xpm)); d_list_icons.push_back(QPixmap(blueball_xpm)); d_list_icons.push_back(QPixmap(switch3_xpm)); + d_list_icons.push_back(QPixmap(input_xpm)); + d_list_icons.push_back(QPixmap(output_xpm)); d_list_icons.push_back(QPixmap(record_xpm)); d_list_icons.push_back(QPixmap(rss_xpm)); d_list_icons.push_back(QPixmap(upload_xpm)); diff --git a/lib/rdiconengine.h b/lib/rdiconengine.h index 057d5d9b..8bd6df34 100644 --- a/lib/rdiconengine.h +++ b/lib/rdiconengine.h @@ -31,7 +31,8 @@ class RDIconEngine { public: enum IconType {GreenCheck=0,RedX=1,GreenBall=2,RedBall=3,WhiteBall=4, - BlueBall=5,Switcher=6,Record=7,Download=8,Upload=9}; + BlueBall=5,Switcher=6,Input=7,Output=8,Record=9,Download=10, + Upload=11}; enum Application {Rivendell=0,RdAdmin=1,RdAirPlay=2,RdCartSlots=3, RdCastManager=4,RdCatch=5,RdLibrary=6,RdLogEdit=7, RdLogManager=8,RdPanel=9,LastApplication=10};