From 1d40b6076c94f43accf01357bf1a168aa3c77f4a Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 22 Jan 2021 13:25:10 -0500 Subject: [PATCH] 2021-01-22 Fred Gleason * Added an 'RDIconEngine::stationIcon()' method. * Added an icons for 'host' objects. Signed-off-by: Fred Gleason --- ChangeLog | 3 + icons/Makefile.am | 2 + icons/host-16x16.xpm | 148 ++++++++ icons/host-48x48.xpm | 720 +++++++++++++++++++++++++++++++++++++ lib/rdiconengine.cpp | 13 + lib/rdiconengine.h | 2 + lib/rdstationlistmodel.cpp | 22 +- 7 files changed, 904 insertions(+), 6 deletions(-) create mode 100644 icons/host-16x16.xpm create mode 100644 icons/host-48x48.xpm diff --git a/ChangeLog b/ChangeLog index 77304b35..b375cb2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20868,3 +20868,6 @@ * Added 'RDStationListModel' class * Refactored the 'List Hosts' dialog in rdadmin(1) to use the model-based API. +2021-01-22 Fred Gleason + * Added an 'RDIconEngine::stationIcon()' method. + * Added an icons for 'host' objects. diff --git a/icons/Makefile.am b/icons/Makefile.am index 90826abe..a5ebcb0d 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -287,6 +287,8 @@ EXTRA_DIST = admin.xpm\ greencheckmark.png\ greenball.xpm\ greencheckmark.xpm\ + host-16x16.xpm\ + host-48x48.xpm\ localuser.xpm\ marker.xpm\ mic16.png\ diff --git a/icons/host-16x16.xpm b/icons/host-16x16.xpm new file mode 100644 index 00000000..d4384183 --- /dev/null +++ b/icons/host-16x16.xpm @@ -0,0 +1,148 @@ +/* XPM */ +static const char * host_16x16_xpm[] = { +"16 16 129 2", +" c None", +". c #939393", +"+ c #929292", +"@ c #919191", +"# c #D9DBD7", +"$ c #E3E4E1", +"% c #DFE0E0", +"& c #E6E7E3", +"* c #D4D5D1", +"= c #909090", +"- c #E8EAE5", +"; c #2E3488", +"> c #27347C", +", c #26337B", +"' c #26327B", +") c #2D3386", +"! c #E8EAE6", +"~ c #E2E4E0", +"{ c #27327C", +"] c #5A6E8C", +"^ c #5B6F8D", +"/ c #5C708D", +"( c #5C708E", +"_ c #5D718E", +": c #5D728E", +"< c #5D718F", +"[ c #5E728F", +"} c #BEBFBE", +"| c #DBDCDA", +"1 c #898989", +"2 c #263380", +"3 c #4F678A", +"4 c #50688A", +"5 c #50678A", +"6 c #51688B", +"7 c #52698B", +"8 c #52698C", +"9 c #536A8C", +"0 c #4D6588", +"a c #39537A", +"b c #26337E", +"c c #E1E3E2", +"d c #E3E4E0", +"e c #7F7F7F", +"f c #E6E8E3", +"g c #283582", +"h c #47638B", +"i c #47648B", +"j c #48658C", +"k c #426088", +"l c #294B78", +"m c #1E4171", +"n c #273582", +"o c #BBBCBB", +"p c #D9DAD7", +"q c #8A8A8A", +"r c #767676", +"s c #E3E5E1", +"t c #283786", +"u c #3E5F8C", +"v c #3F608C", +"w c #3E608D", +"x c #3F608D", +"y c #345786", +"z c #244A7D", +"A c #23497C", +"B c #273885", +"C c #D9DCDA", +"D c #DEE0DC", +"E c #808080", +"F c #6B6B6B", +"G c #E2E3E0", +"H c #2A398B", +"I c #365D90", +"J c #375D90", +"K c #2E568B", +"L c #285188", +"M c #293B8B", +"N c #B6B7B6", +"O c #747474", +"P c #626262", +"Q c #E1E3DF", +"R c #2B3C8E", +"S c #2F5B94", +"T c #2F5A94", +"U c #2E5A93", +"V c #2D5993", +"W c #2C3E8E", +"X c #D0D2D0", +"Y c #DDDEDA", +"Z c #585858", +"` c #2D3E92", +" . c #32619F", +".. c #2D4093", +"+. c #CDCFCD", +"@. c #DCDEDB", +"#. c #606060", +"$. c #565656", +"%. c #3E4796", +"&. c #384897", +"*. c #3D4697", +"=. c #CED1CC", +"-. c #DEDFDC", +";. c #575757", +">. c #5A5A5A", +",. c #C4C5C3", +"'. c #C9CAC8", +"). c #C1C2C0", +"!. c #525252", +"~. c #535351", +"{. c #535352", +"]. c #585856", +"^. c #5D5E5C", +"/. c #60605E", +"(. c #575856", +"_. c #525251", +":. c #575A56", +"<. c #9EA19D", +"[. c #D3D5D3", +"}. c #EAEBEA", +"|. c #E9EAE9", +"1. c #D2D3D1", +"2. c #979996", +"3. c #565A55", +"4. c #515351", +"5. c #5B5E5B", +"6. c #5E615D", +"7. c #5B5F5A", +"8. c #535552", +" ", +" . + + + + + + + + + + + + . ", +"@ # $ % % % % % % % % % $ & * . ", +"= - ; > > , , , , , ' ' ) ! ~ . ", +"= - { ] ^ ^ / ( _ : < [ , } | . ", +"1 ! 2 3 4 5 6 7 8 9 0 a b c d . ", +"e f g h i i j j k l m m n o p q ", +"r s t u v w x y z A A A B C D E ", +"F G H I J J K L L L L L M N | O ", +"P Q R S T U V V V V V V W X Y F ", +"Z Q ` . . . . . . . . ...+.@.#.", +"$.Q %.&.&.&.&.&.&.&.&.&.*.=.-.;.", +">.,.'.'.'.'.'.'.'.'.'.'.'.'.).;.", +" !.~.{.{.].^././.^.(.{.{.~._. ", +" :.<.[.}.|.1.2.3. ", +" 4.5.6.6.7.8. "}; diff --git a/icons/host-48x48.xpm b/icons/host-48x48.xpm new file mode 100644 index 00000000..8d4a5fb2 --- /dev/null +++ b/icons/host-48x48.xpm @@ -0,0 +1,720 @@ +/* XPM */ +static const char * host_48x48_xpm[] = { +"48 48 669 2", +" c None", +". c #939493", +"+ c #929292", +"@ c #919191", +"# c #8F8F8F", +"$ c #8E8E8E", +"% c #8D8D8D", +"& c #8C8C8C", +"* c #8A8A8A", +"= c #898989", +"- c #888888", +"; c #878787", +"> c #868686", +", c #848484", +"' c #838383", +") c #828282", +"! c #818181", +"~ c #7E7E7E", +"{ c #7D7D7D", +"] c #7C7C7C", +"^ c #7B7B7B", +"/ c #797979", +"( c #7A7A78", +"_ c #787878", +": c #BBBCBA", +"< c #F0F2EF", +"[ c #F2F3F1", +"} c #F1F3F0", +"| c #F1F2EF", +"1 c #F0F1EF", +"2 c #F0F1EE", +"3 c #EFF1EE", +"4 c #EFF0EE", +"5 c #EFF0ED", +"6 c #EEF0ED", +"7 c #EEEFED", +"8 c #E8EAE7", +"9 c #868685", +"0 c #949494", +"a c #DBDCD9", +"b c #E7EAE4", +"c c #DCE0D9", +"d c #D0D4D5", +"e c #CFD3D4", +"f c #CFD2D4", +"g c #CED2D3", +"h c #CED1D3", +"i c #CDD1D2", +"j c #D5D8D5", +"k c #DBDFD7", +"l c #DBDED7", +"m c #DADED6", +"n c #DADDD6", +"o c #D9DDD5", +"p c #D9DCD5", +"q c #D8DCD4", +"r c #D8DBD4", +"s c #D7DBD3", +"t c #D7DAD3", +"u c #D6DAD2", +"v c #E8EAE6", +"w c #ADAEAD", +"x c #959695", +"y c #E0E1DF", +"z c #E4E8E1", +"A c #8487AE", +"B c #3B3B80", +"C c #464683", +"D c #454582", +"E c #444582", +"F c #434481", +"G c #434381", +"H c #424281", +"I c #474784", +"J c #464684", +"K c #454683", +"L c #2A2A7A", +"M c #A5A8BD", +"N c #D0D3CC", +"O c #D0D2CC", +"P c #E5E7E3", +"Q c #B5B6B4", +"R c #959594", +"S c #E4E5E3", +"T c #E3E6E0", +"U c #6E6FA2", +"V c #6F6F8C", +"W c #808096", +"X c #7F7F96", +"Y c #7E7E95", +"Z c #7D7D94", +"` c #7C7C93", +" . c #7B7B92", +".. c #7A7A91", +"+. c #797990", +"@. c #787890", +"#. c #77778F", +"$. c #76768E", +"%. c #74748D", +"&. c #74748C", +"*. c #73738B", +"=. c #72728B", +"-. c #71718A", +";. c #707089", +">. c #6F6F88", +",. c #6D6D87", +"'. c #6C6C86", +"). c #6A6A85", +"!. c #696984", +"~. c #383867", +"{. c #8B8DAF", +"]. c #B6B8B4", +"^. c #BDBFBB", +"/. c #E3E6E1", +"(. c #BDBEBC", +"_. c #E2E5DF", +":. c #5E5F99", +"<. c #6F6F8A", +"[. c #75758D", +"}. c #686883", +"|. c #676782", +"1. c #666682", +"2. c #656581", +"3. c #3A3A67", +"4. c #7779A5", +"5. c #D3D7CF", +"6. c #D1D4CD", +"7. c #E2E4DF", +"8. c #C4C5C2", +"9. c #6C6C6C", +"0. c #ECEDEA", +"a. c #E1E4DD", +"b. c #535494", +"c. c #6B6B86", +"d. c #696985", +"e. c #686884", +"f. c #676784", +"g. c #666683", +"h. c #656582", +"i. c #646481", +"j. c #636381", +"k. c #636380", +"l. c #626280", +"m. c #3F3F67", +"n. c #65679C", +"o. c #B9BBB7", +"p. c #DFE2DC", +"q. c #C9CAC8", +"r. c #6D6D6D", +"s. c #939393", +"t. c #DFE3DC", +"u. c #4D4E90", +"v. c #6E6E88", +"w. c #6E6E87", +"x. c #6C6C87", +"y. c #6B6B87", +"z. c #6A6A86", +"A. c #656583", +"B. c #646482", +"C. c #616180", +"D. c #60607F", +"E. c #5F5F7F", +"F. c #434367", +"G. c #565794", +"H. c #D2D6CE", +"I. c #D0D4CD", +"J. c #DDE0DA", +"K. c #CECFCD", +"L. c #6D6E6D", +"M. c #DDE1D9", +"N. c #494A8C", +"O. c #6D6D88", +"P. c #6C6C88", +"Q. c #696986", +"R. c #686885", +"S. c #676783", +"T. c #626281", +"U. c #616181", +"V. c #606080", +"W. c #5E5E7F", +"X. c #5D5D7E", +"Y. c #5C5C7D", +"Z. c #525275", +"`. c #45456C", +" + c #33335B", +".+ c #4F5091", +"++ c #BFC1BC", +"@+ c #B1B2B0", +"#+ c #D3D4D1", +"$+ c #6E6E6E", +"%+ c #F4F5F3", +"&+ c #DCE0D8", +"*+ c #47488B", +"=+ c #6A6A87", +"-+ c #686886", +";+ c #676785", +">+ c #666684", +",+ c #656584", +"'+ c #646483", +")+ c #636382", +"!+ c #5F5F80", +"~+ c #5D5D7F", +"{+ c #5C5C7E", +"]+ c #5B5B7D", +"^+ c #4C4C71", +"/+ c #3A3A63", +"(+ c #2C2C57", +"_+ c #282854", +":+ c #282855", +"<+ c #4A4B8E", +"[+ c #D2D5CE", +"}+ c #D0D4CC", +"|+ c #D9DBD5", +"1+ c #D8D9D6", +"2+ c #6B6B6A", +"3+ c #969696", +"4+ c #F3F4F2", +"5+ c #DCDFD8", +"6+ c #454689", +"7+ c #666685", +"8+ c #636383", +"9+ c #626282", +"0+ c #616182", +"a+ c #606081", +"b+ c #5E5E80", +"c+ c #525276", +"d+ c #3D3D66", +"e+ c #2D2D59", +"f+ c #2A2A57", +"g+ c #2B2B58", +"h+ c #45468B", +"i+ c #C5C8C2", +"j+ c #ACADAA", +"k+ c #D5D8D1", +"l+ c #DCDDDA", +"m+ c #6A6A6A", +"n+ c #9C9C9B", +"o+ c #424388", +"p+ c #636384", +"q+ c #626283", +"r+ c #606082", +"s+ c #5F5F81", +"t+ c #5C5C7F", +"u+ c #5B5B7E", +"v+ c #5A5A7D", +"w+ c #515176", +"x+ c #3A3A64", +"y+ c #2C2C59", +"z+ c #2C2C5A", +"A+ c #2D2D5A", +"B+ c #2D2D5B", +"C+ c #2E2E5B", +"D+ c #2E2E5C", +"E+ c #404188", +"F+ c #CED2CA", +"G+ c #D4D8D1", +"H+ c #DFE0DE", +"I+ c #666766", +"J+ c #A1A1A0", +"K+ c #F0F2EE", +"L+ c #404086", +"M+ c #616183", +"N+ c #5F5F82", +"O+ c #5E5E81", +"P+ c #5A5A7E", +"Q+ c #59597D", +"R+ c #515177", +"S+ c #393965", +"T+ c #2F2F5D", +"U+ c #2F2F5E", +"V+ c #30305E", +"W+ c #30305F", +"X+ c #313160", +"Y+ c #3D3D85", +"Z+ c #CACDC6", +"`+ c #A6A7A5", +" @ c #CED0CB", +".@ c #E3E4E1", +"+@ c #636363", +"@@ c #A6A8A6", +"#@ c #3E3F86", +"$@ c #5D5D80", +"%@ c #5C5C80", +"&@ c #5B5B7F", +"*@ c #5A5A7F", +"=@ c #59597E", +"-@ c #58587D", +";@ c #55557B", +">@ c #42426D", +",@ c #31315F", +"'@ c #323261", +")@ c #323262", +"!@ c #333362", +"~@ c #333363", +"{@ c #343463", +"]@ c #383983", +"^@ c #E6E8E5", +"/@ c #5F5F5F", +"(@ c #AEAEAE", +"_@ c #EDEFEB", +":@ c #3B3C83", +"<@ c #5D5D81", +"[@ c #5B5B80", +"}@ c #59597F", +"|@ c #58587E", +"1@ c #57577D", +"2@ c #57577E", +"3@ c #55557D", +"4@ c #484873", +"5@ c #363664", +"6@ c #343464", +"7@ c #353565", +"8@ c #353566", +"9@ c #363666", +"0@ c #363667", +"a@ c #353581", +"b@ c #CFD3CB", +"c@ c #CFD2CB", +"d@ c #E9EAE7", +"e@ c #5E5E5E", +"f@ c #B4B4B3", +"g@ c #EBEDE9", +"h@ c #D0D4D2", +"i@ c #3B3B81", +"j@ c #5B5B81", +"k@ c #58587F", +"l@ c #56567F", +"m@ c #56567E", +"n@ c #55557E", +"o@ c #52527B", +"p@ c #3F3F6D", +"q@ c #373768", +"r@ c #383869", +"s@ c #38386A", +"t@ c #39396A", +"u@ c #39396B", +"v@ c #313180", +"w@ c #E7E8E5", +"x@ c #626262", +"y@ c #BBBBB9", +"z@ c #E9ECE7", +"A@ c #C5C8CC", +"B@ c #3C3D7F", +"C@ c #57577F", +"D@ c #575780", +"E@ c #54547E", +"F@ c #54547D", +"G@ c #53537D", +"H@ c #474774", +"I@ c #393969", +"J@ c #3A3A6B", +"K@ c #3A3A6C", +"L@ c #3B3B6D", +"M@ c #3C3C6E", +"N@ c #31317E", +"O@ c #C7CAC8", +"P@ c #CED1CA", +"Q@ c #E5E6E3", +"R@ c #686868", +"S@ c #C1C1C0", +"T@ c #E8EAE5", +"U@ c #B9BBC7", +"V@ c #3C3D7E", +"W@ c #55557F", +"X@ c #53537E", +"Y@ c #52527E", +"Z@ c #494977", +"`@ c #3D3D6D", +" # c #3C3C6F", +".# c #3D3D6F", +"+# c #3D3D70", +"@# c #3E3E70", +"## c #3E3E71", +"$# c #3F3F72", +"%# c #33337C", +"&# c #B9BDC1", +"*# c #E2E4E0", +"=# c #717170", +"-# c #C6C7C5", +";# c #E6E8E3", +"># c #ABAEC1", +",# c #3A3A7C", +"'# c #53537F", +")# c #51517E", +"!# c #51517D", +"~# c #4E4E7B", +"{# c #424273", +"]# c #3F3F73", +"^# c #404073", +"/# c #404074", +"(# c #414174", +"_# c #414175", +":# c #424276", +"<# c #34347B", +"[# c #ADAFBD", +"}# c #CDD0C9", +"|# c #E0E2DE", +"1# c #797978", +"2# c #CCCDCB", +"3# c #E4E7E1", +"4# c #9EA1BC", +"5# c #3A3A7A", +"6# c #51517F", +"7# c #50507D", +"8# c #4A4A7A", +"9# c #424274", +"0# c #424277", +"a# c #434377", +"b# c #434378", +"c# c #444478", +"d# c #444479", +"e# c #35357C", +"f# c #A0A2B8", +"g# c #DEE0DC", +"h# c #818180", +"i# c #CFD1CE", +"j# c #8A8DB1", +"k# c #3E3E7B", +"l# c #50507F", +"m# c #4E4E7D", +"n# c #49497B", +"o# c #444477", +"p# c #45457A", +"q# c #45457B", +"r# c #46467B", +"s# c #46467C", +"t# c #47477C", +"u# c #47477D", +"v# c #38387D", +"w# c #9092B1", +"x# c #CCD0C8", +"y# c #DCDED9", +"z# c #888887", +"A# c #D4D5D3", +"B# c #E0E3DD", +"C# c #7A7DAB", +"D# c #3D3D78", +"E# c #48487E", +"F# c #48487F", +"G# c #49497F", +"H# c #494980", +"I# c #4A4A80", +"J# c #4A4A81", +"K# c #3E3E80", +"L# c #7E80A9", +"M# c #CCCFC8", +"N# c #DADCD7", +"O# c #90918F", +"P# c #848482", +"Q# c #DEE1DB", +"R# c #6B6DA3", +"S# c #40407A", +"T# c #4B4B82", +"U# c #4C4C83", +"V# c #4C4C84", +"W# c #4D4D84", +"X# c #D7DAD4", +"Y# c #989A97", +"Z# c #DCDFD9", +"`# c #5C5E9D", +" $ c #47477E", +".$ c #4D4D85", +"+$ c #4E4E85", +"@$ c #4E4E86", +"#$ c #4F4F87", +"$$ c #4F4F88", +"%$ c #505088", +"&$ c #4D4D87", +"*$ c #5E5F9C", +"=$ c #CBCEC7", +"-$ c #D6D8D3", +";$ c #9EA09C", +">$ c #808080", +",$ c #DFE1DE", +"'$ c #DADED7", +")$ c #555699", +"!$ c #464681", +"~$ c #474782", +"{$ c #474783", +"]$ c #484883", +"^$ c #484884", +"/$ c #494984", +"($ c #494985", +"_$ c #4A4A86", +":$ c #4B4B87", +"<$ c #4B4B88", +"[$ c #4C4C88", +"}$ c #4C4C89", +"|$ c #4D4D8A", +"1$ c #4D4D8B", +"2$ c #555698", +"3$ c #D4D7D0", +"4$ c #4A4A4A", +"5$ c #9A9DB8", +"6$ c #63659F", +"7$ c #63649F", +"8$ c #62649E", +"9$ c #62639E", +"0$ c #61639E", +"a$ c #61639D", +"b$ c #62639D", +"c$ c #61629D", +"d$ c #60629D", +"e$ c #5F619C", +"f$ c #9497B2", +"g$ c #D2D4CE", +"h$ c #ABADAA", +"i$ c #4E4E4E", +"j$ c #7A7A7A", +"k$ c #E5E7E4", +"l$ c #D5D9D1", +"m$ c #D4D8D0", +"n$ c #D3D6CF", +"o$ c #D1D5CD", +"p$ c #B3B5B0", +"q$ c #ACAFA9", +"r$ c #9FA29D", +"s$ c #C7CAC3", +"t$ c #D0D3CD", +"u$ c #B1B2AF", +"v$ c #505250", +"w$ c #797977", +"x$ c #C7CAC4", +"y$ c #BBBEB8", +"z$ c #BABEB7", +"A$ c #BABDB7", +"B$ c #B9BDB6", +"C$ c #B9BCB6", +"D$ c #B8BCB5", +"E$ c #B8BBB5", +"F$ c #B8BBB4", +"G$ c #B8BAB4", +"H$ c #B7BAB3", +"I$ c #B7B9B3", +"J$ c #B6B9B2", +"K$ c #B6B8B2", +"L$ c #B5B8B1", +"M$ c #B4B8B1", +"N$ c #B4B7B1", +"O$ c #B3B7B0", +"P$ c #B3B6B0", +"Q$ c #B2B5AF", +"R$ c #B1B4AE", +"S$ c #C8CBC5", +"T$ c #B2B3B0", +"U$ c #525252", +"V$ c #E3E5E0", +"W$ c #E2E3DF", +"X$ c #E1E3DE", +"Y$ c #DFE2DD", +"Z$ c #DFE1DC", +"`$ c #DEE0DB", +" % c #DDDFDA", +".% c #DBDDD9", +"+% c #DBDDD8", +"@% c #DADDD7", +"#% c #D9DCD6", +"$% c #D9DBD6", +"%% c #D8DBD6", +"&% c #D8DAD5", +"*% c #D7D9D4", +"=% c #D6D9D3", +"-% c #D5D8D3", +";% c #767775", +">% c #757575", +",% c #848483", +"'% c #838382", +")% c #828281", +"!% c #7F7F7F", +"~% c #7D7E7D", +"{% c #7C7D7C", +"]% c #7A7B7A", +"^% c #777877", +"/% c #767776", +"(% c #757675", +"_% c #747474", +":% c #727272", +"<% c #707070", +"[% c #6F6F6F", +"}% c #6B6B6B", +"|% c #686968", +"1% c #676767", +"2% c #656565", +"3% c #646464", +"4% c #616161", +"5% c #606060", +"6% c #515151", +"7% c #3E3F3E", +"8% c #4D4F4C", +"9% c #50524F", +"0% c #7F817D", +"a% c #7E807C", +"b% c #4E504D", +"c% c #4B4D4B", +"d% c #333333", +"e% c #4D4F4D", +"f% c #666966", +"g% c #939691", +"h% c #898B87", +"i% c #898B86", +"j% c #A9ACA6", +"k% c #8A8D88", +"l% c #585A57", +"m% c #4C4E4B", +"n% c #4F514E", +"o% c #90928F", +"p% c #ADB0AA", +"q% c #90928D", +"r% c #ABAEA8", +"s% c #797B78", +"t% c #3B3D3A", +"u% c #747672", +"v% c #A9ADA7", +"w% c #A4A5A0", +"x% c #A2A69F", +"y% c #5A5B57", +"z% c #616661", +"A% c #979B96", +"B% c #BDC0BB", +"C% c #CDCFCB", +"D% c #C1C4BF", +"E% c #B7B9B4", +"F% c #B0B2AD", +"G% c #AEB1AB", +"H% c #B9BCB7", +"I% c #C3C5C0", +"J% c #C7C9C5", +"K% c #90948F", +"L% c #4C4D4A", +"M% c #686966", +"N% c #888C86", +"O% c #9C9F9A", +"P% c #BEC0BC", +"Q% c #D8DAD7", +"R% c #EBEBEA", +"S% c #E5E6E4", +"T% c #E2E3E1", +"U% c #E7E8E6", +"V% c #EAEBE9", +"W% c #CCCECB", +"X% c #B1B4B0", +"Y% c #91948F", +"Z% c #868A84", +"`% c #575A56", +" & c #414341", +".& c #6B6E69", +"+& c #828580", +"@& c #838882", +"#& c #7D807C", +"$& c #8B8F8A", +"%& c #989C97", +"&& c #9DA19D", +"*& c #949793", +"=& c #848783", +"-& c #7D817C", +";& c #858883", +">& c #7D827C", +",& c #61635F", +"'& c #4E4F4D", +")& c #494D49", +"!& c #4E514D", +"~& c #4C4F4B", +"{& c #555854", +"]& c #5C605B", +"^& c #5D615C", +"/& c #5C5E5A", +"(& c #545653", +"_& c #4F514D", +":& c #464845", +" ", +" ", +" ", +" ", +" . + @ @ @ @ @ @ @ @ @ @ @ @ @ @ # $ % & * = - ; > , ' ' ) ! ~ { ] ^ / ( _ ", +" : < [ [ [ [ [ [ [ [ } } } | | | < < < 1 1 1 2 2 2 3 4 4 5 5 5 5 6 7 7 8 9 ", +" 0 a b c d d d d d d e e f g g h i i j k k l m m n o o p q q r s s t u u v w ", +" x y z A B C D D E E E E F F G H H H E I I J J J K K K K E E E F L M N O P Q ", +" R S T U V W X Y Z ` ` ...+.@.#.$.$.%.&.*.=.=.-.;.>.,.,.'.).).!.~.{.].^./.(. ", +" 0 8 _.:.<. ...+.@.#.$.[.%.&.*.=.-.-.;.>.,.,.'.).).!.}.}.|.1.1.2.3.4.5.6.7.8.9. ", +" . 0.a.b.>.[.%.&.*.=.-.-.;.>.,.'.,.c.).d.!.e.f.g.1.h.i.i.j.k.j.l.m.n.o.].p.q.r. ", +" s.4 t.u.v.;.-.;.w.w.w.x.y.c.z.d.e.e.f.g.A.h.B.j.i.j.C.D.D.D.E.E.F.G.H.I.J.K.L. ", +" @ [ M.N.O.P.P.y.z.z.Q.R.R.f.S.g.A.B.B.B.T.T.C.U.V.D.E.W.X.Y.Z.`. +.+++@+n #+$+ ", +" @ %+&+*+=+Q.-+-+;+>+,+A.'+'+)+j.T.U.T.U.V.!+E.W.~+{+]+^+/+(+_+_+:+<+[+}+|+1+2+ ", +" 3+4+5+6+;+7+,+'+'+8+9+9+U.0+U.a+a+!+b+b+~+X.{+{+c+d+e+f+f+f+g+g+g+h+i+j+k+l+m+ ", +" n+} k o+p+8+q+q+0+0+r+s+s+!+b+b+W.~+t+u+u+v+w+x+y+y+z+A+A+B+B+C+D+E+6.F+G+H+I+ ", +" J+K+k L+M+N+s+N+O+s+s+b+~+~+t+u+P+P+Q+Q+R+S+D+D+T+T+T+U+V+V+W+W+X+Y+Z+`+ @.@+@ ", +" @@6 m #@s+O+O+b+$@%@t+&@*@=@=@=@=@-@;@>@X+,@X+X+X+'@'@'@)@!@~@~@{@]@N N }+^@/@ ", +" (@_@m :@<@%@[@&@*@}@}@=@|@1@|@2@3@4@5@!@~@~@{@6@6@6@7@7@8@9@9@0@0@a@N b@c@d@e@ ", +" f@g@h@i@j@}@}@k@|@|@l@m@n@n@3@o@p@7@8@9@9@0@0@q@q@q@r@r@r@s@t@t@u@v@c@c@F+w@x@ ", +" y@z@A@B@C@D@l@n@l@m@n@E@F@G@H@I@r@r@r@s@t@u@u@J@K@K@K@L@L@L@L@M@M@N@O@F+P@Q@R@ ", +" S@T@U@V@l@l@W@E@X@X@G@Y@Z@`@K@K@K@L@L@L@M@M@M@ #.#.#+#+#@#####$#$#%#&#P@P@*#=# ", +" -#;#>#,#'#X@'#Y@)#!#~#{#M@ #.#+#+#@#######$#$#$#]#^#/#/#(#_#_#_#:#<#[#P@}#|#1# ", +" ) 2#3#4#5#Y@6#6#7#8#9###$#$#]#^#^#/#/#(#_#_#_#:#:#0#a#a#b#b#c#d#d#d#e#f#}#}#g#h# ", +" ' i#_.j#k#l#m#n#o#_#_#_#:#:#:#0#a#a#b#b#c#d#d#p#p#p#q#r#r#s#s#t#u#u#v#w#}#x#y#z# ", +" , A#B#C#D#d#a#b#b#c#d#d#d#p#p#p#q#r#r#s#t#u#u#u#E#E#E#F#G#G#H#I#J#J#K#L#x#M#N#O# ", +" P#1+Q#R#S#q#r#r#s#s#t#u#u#u#E#E#F#G#G#H#H#I#J#J#J#T#T#T#U#U#U#V#W#W#C U M#M#X#Y# ", +" ' l+Z#`# $E#F#G#G#H#H#I#J#J#T#T#T#T#U#U#U#V#W#W#.$+$@$@$@$#$#$#$$$%$&$*$M#=$-$;$ ", +" >$,$'$)$!$!$!$!$~$~${$]$]$^$^$/$($($($_$_$_$:$:$<$<$[$}$}$}$|$|$|$1$1$2$=$=$3$`+4$ ", +" ~ .@p 5$6$6$6$6$7$7$7$7$8$8$9$9$9$9$9$0$0$0$a$b$b$a$c$c$c$c$c$d$d$d$e$f$=$Z+g$h$i$ ", +" j$k$s l$k+m$m$3$5.5.n$H.[+[+o$6.6.}+p$q$r$s$c@F+P@P@P@}#}#}#M#M#M#=$=$=$Z+Z+t$u$v$ ", +" w$P x$y$z$A$A$B$C$C$D$E$E$F$G$G$H$I$I$J$K$K$L$L$L$M$N$N$O$P$P$P$Q$Q$Q$R$R$R$S$T$U$ ", +" _ : w@V$V$7.7.W$X$X$|#|#Y$Z$Z$Q#`$`$ % %y#y#.%+%@%N#N##%$%%%&%*%*%=%-$-$-%-%-$;% ", +" >%~ 9 ,%'%)%!%~%{%]%j$^%/%(%>%_%_%:%<%[%$+9.}%m+|%1%2%3%x@4%5%/@e@/@e@e@e@U$6% ", +" 7%8%9%0%0%0%0%0%0%0%0%a%b%c%d% ", +" e%f%g%q$h%h%h%h%h%h%h%h%i%j%k%l%m% ", +" n%o%q$p%q$q%q%q%q%q%q%q%q%q%p%p%r%s%8% ", +" t%u%v%R$p%p%w%w%w%w%w%w%w%w%w%p%p%p%x%y% ", +" z%A%B%C%D%E%F%p%p%p%p%G%R$H%I%J%p%K%9% ", +" L%M%N%O%P%Q%R%R%S%T%U%V%S W%X%Y%Z%`% & ", +" &8%.&+&@&#&$&%&&&*&=&-&;&>&,&'& ", +" )&!&~&{&]&^&/&(&m%_&:& ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/lib/rdiconengine.cpp b/lib/rdiconengine.cpp index b0783715..f7c02b62 100644 --- a/lib/rdiconengine.cpp +++ b/lib/rdiconengine.cpp @@ -30,6 +30,8 @@ #include "../icons/redball.xpm" #include "../icons/whiteball.xpm" +#include "../icons/host-16x16.xpm" + #include "../icons/play.xpm" #include "../icons/rml5.xpm" #include "../icons/chain.xpm" @@ -53,6 +55,11 @@ RDIconEngine::RDIconEngine() d_list_icons.push_back(QPixmap(whiteball_xpm)); d_list_icons.push_back(QPixmap(blueball_xpm)); + // + // Create Station Icon + // + d_station_icon=QPixmap(host_16x16_xpm); + // // Create Type Icons // @@ -81,6 +88,12 @@ QPixmap RDIconEngine::listIcon(RDIconEngine::IconType type) const } +QPixmap RDIconEngine::stationIcon() const +{ + return d_station_icon; +} + + QPixmap RDIconEngine::typeIcon(RDLogLine::Type type,RDLogLine::Source src) const { if((type==RDLogLine::Cart)&&(src==RDLogLine::Tracker)) { diff --git a/lib/rdiconengine.h b/lib/rdiconengine.h index 07656b89..3b883bc3 100644 --- a/lib/rdiconengine.h +++ b/lib/rdiconengine.h @@ -34,12 +34,14 @@ class RDIconEngine BlueBall=5}; RDIconEngine(); QPixmap listIcon(IconType type) const; + QPixmap stationIcon() const; QPixmap typeIcon(RDLogLine::Type type, RDLogLine::Source src=RDLogLine::Manual) const; QPixmap userIcon(RDUser::Type type) const; private: QList d_list_icons; + QPixmap d_station_icon; QMap log_type_icons; QPixmap log_track_cart_icon; QMap d_user_icons; diff --git a/lib/rdstationlistmodel.cpp b/lib/rdstationlistmodel.cpp index 7a4f5c59..3071a1b6 100644 --- a/lib/rdstationlistmodel.cpp +++ b/lib/rdstationlistmodel.cpp @@ -292,7 +292,7 @@ void RDStationListModel::updateRow(int row,RDSqlQuery *q) // Hostname texts.push_back(q->value(0)); - icons.push_back(QVariant()); + icons.push_back(rda->iconEngine()->stationIcon()); // Description texts.push_back(q->value(1)); @@ -316,16 +316,26 @@ void RDStationListModel::updateRow(int row,RDSqlQuery *q) icons.push_back(QVariant()); // Xport Host - texts.push_back(q->value(6)); - icons.push_back(QVariant()); + if(q->value(6).toString().toLower().trimmed()=="localhost") { + texts.push_back(q->value(0)); + } + else { + texts.push_back(q->value(6)); + } + icons.push_back(rda->iconEngine()->stationIcon()); // CAE Host - texts.push_back(q->value(7)); - icons.push_back(QVariant()); + if(q->value(7).toString().toLower().trimmed()=="localhost") { + texts.push_back(q->value(0)); + } + else { + texts.push_back(q->value(7)); + } + icons.push_back(rda->iconEngine()->stationIcon()); // Report Editor if(q->value(8).toString().isEmpty()) { - texts.push_back(tr("[none]")); + texts.push_back("vi"); } else { texts.push_back(q->value(8).toString().