diff --git a/Makefile b/Makefile index 4833bf7..77c7a55 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,8 @@ SRCS = \ # used. RDEFS = \ src/Pogger.rdef \ + art/FeedIcon.rdef \ + art/EntryIcon.rdef \ # Specify the resource files to use. Full or relative paths can be used. diff --git a/art/EntryIcon b/art/EntryIcon new file mode 100644 index 0000000..71bfe20 Binary files /dev/null and b/art/EntryIcon differ diff --git a/art/EntryIcon.rdef b/art/EntryIcon.rdef new file mode 100644 index 0000000..059854b --- /dev/null +++ b/art/EntryIcon.rdef @@ -0,0 +1,24 @@ + +resource(2, "entry-type-icon") #'VICN' array { + $"6E636966090401740501020106023B32F3BB51843CAA363C91AA45272C4AD4C6" + $"00FCFAF4FF808076020116023B32F3BB51843CAA363C91AA45272C4AD4C600AC" + $"FF01020106023B32F3BB51843CAA363C91AA45272C4AD4C600FF90AAFB6D021B" + $"020106023DCD59BCD7233BA2893C6ECF49FEE74906E554FCFBF4FFBFBFB00201" + $"06023DCD59BCD7233BA2893C6ECF49FEE74906E55489BBFFFF0552BB02010602" + $"3CE2ACBB54AF36E288387FC949E15A46B04454E2E2D7FF949490020116023DCD" + $"59BCD7233BA2893C6ECF49FEE74906E554ACFF4A110606FE033A5E435D415E45" + $"5C50504956574A5E445D455F435A3A633E5A3A3A060DFFBFFB032250224C2251" + $"2E56285334593A5C355C3F5C4B4E455351495843584359425B3D5B415B39502E" + $"53324D2A4A28472B472B462A412836343C303038283C283A283F2E46273F284A" + $"0606EF0F283C283F28BD52363430383C304128482C472A492E502E4D2B502E2E" + $"462E46273F060EEFFFFA0F283C283F2A3C3E313536472C4A28502E4D2A53325B" + $"3D5B395B3F5843594258434B4E514945533A5C3F5C355C2E5623502F562A5334" + $"593A5B385B3C5B3C563D5839512E46344C273F02044B3D4B3D4D3E5146514452" + $"46593E5941593C53365636523608054C304B3249324934473408052F42324233" + $"3F363F373D0802493F424508024945454908023F47384C08024E47484D080243" + $"4B3C51080244513F560604AF3247324632482750274F275030543A4B08023C4E" + $"345608023F51385802043C3F3D3F3C3E383A393A393943344234443446384637" + $"46390B0A000100000A0101011001178400040A020101000A04010D000A03020E" + $"0F1001178200040A070102000A050103000A08060708090A0B0C100117820004" + $"0A060206051001178200040A080110000A06010400" +}; diff --git a/art/FeedIcon b/art/FeedIcon new file mode 100644 index 0000000..b79c9bc Binary files /dev/null and b/art/FeedIcon differ diff --git a/art/FeedIcon.rdef b/art/FeedIcon.rdef new file mode 100644 index 0000000..76b02ef --- /dev/null +++ b/art/FeedIcon.rdef @@ -0,0 +1,13 @@ + +resource(1, "feed-type-icon") #'VICN' array { + $"6E6369660603010000020006023CC7EE389BC0BA16573E39B04977C842ADC700" + $"FFE2BAFFFF9500020016023CC7EE389BC0BA16573E39B04977C842ADC700FFFF" + $"E7020006023C96323A4D3FBAFC013D5A974B57A549844D00992600FFBF500002" + $"000602BC592FBB29A73C0CE4BD0B7C4892C04B796600BF5000FFF2A100040180" + $"080A06223C2249445B5A3E5A3139250A04223C444B5A3139250A04444B445B5A" + $"3E5A310A04223C2249445B444B0A05445D495D603E5A3B5B3F0204BF8D3DC08A" + $"3DBE8F3D3B403BBF173BC068BF8D43BE8F43C08A43444044C06844BF17020435" + $"3F353F3A39483C4239483C4C394C394435313D3835313D02042D3C36322D3C29" + $"3A293A342E5333462D53334F364F364431060A050104000A0001001001178400" + $"040A010101000A030102000A040103000A020306070500" +}; diff --git a/art/README.txt b/art/README.txt new file mode 100644 index 0000000..6d79cb6 --- /dev/null +++ b/art/README.txt @@ -0,0 +1,8 @@ +These cons are copied over from Haiku's source tree at + haiku/data/artwork/icons/File_RSS_Feed + haiku/data/artwork/icons/Server_NewsFeed + +As far as I can tell, they aren't included in base installs. We just use them +as the mimetype icons for application/x-feed-source and text/x-feed-entry. + +They're under the MIT license, as per haiku/data/artwork/ReadMe diff --git a/src/Mimetypes.cpp b/src/Mimetypes.cpp index 766cc8f..9ac6fc6 100644 --- a/src/Mimetypes.cpp +++ b/src/Mimetypes.cpp @@ -1,8 +1,8 @@ /* - * Copyright 2007-2016, Haiku, Inc. All rights reserved. - * Copyright 2001-2002 Dr. Zoidberg Enterprises. All rights reserved. - * Copyright 2011, Clemens Zeidler * Copyright 2020, Jaidyn Levesque + * Copyright 2007-2016, Haiku, Inc. All rights reserved. + * Copyright 2011, Clemens Zeidler + * Copyright 2001-2002 Dr. Zoidberg Enterprises. All rights reserved. * All rights reserved. Distributed under the terms of the MIT license. */ @@ -12,6 +12,7 @@ #include #include #include +#include bool installMimeTypes() @@ -28,6 +29,13 @@ feedMimeType() if (mime.IsInstalled()) return true; + BResources* res = BApplication::AppResources(); + size_t length = 0; + const void* data = res->LoadResource(B_VECTOR_ICON_TYPE, "feed-type-icon", &length); + mime.SetIcon((uint8*)data, length); + + mime.SetPreferredApp("application/x-vnd.Pogger"); + mime.GetAttrInfo(&info); mime.SetShortDescription("Feed"); @@ -51,6 +59,13 @@ feedEntryMimeType() if (mime.IsInstalled()) return true; + BResources* res = BApplication::AppResources(); + size_t length = 0; + const void* data = res->LoadResource(B_VECTOR_ICON_TYPE, "entry-type-icon", &length); + mime.SetIcon((uint8*)data, length); + + mime.SetPreferredApp("application/x-vnd.Pogger"); + mime.GetAttrInfo(&info); mime.SetShortDescription("Feed Entry");