Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: HaikuArchives/Calendar
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 28be78694345
Choose a base ref
...
head repository: HaikuArchives/Calendar
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fa7d37da972f
Choose a head ref
  • 1 commit
  • 13 files changed
  • 1 contributor

Commits on Oct 30, 2021

  1. Split icons rdefs, add event and category file icons (#95) 

    * Split icons into seperate rdefs, add IOM files

* Add 'event' and 'category' filetype icons

Using slightly modified versions of humdinger's icons posted in #22.
    @JadedCtrl
    JadedCtrl authored Oct 30, 2021
    Copy the full SHA
    fa7d37d View commit details
7 changes: 6 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -61,7 +61,12 @@ SRCS = \
# Specify the resource definition files to use. Full or relative paths can be
# used.
RDEFS = \
src/calendar.rdef \
src/calendar.rdef \
images/icons/add_event.rdef \
images/icons/app_icon.rdef \
images/icons/category.rdef \
images/icons/event.rdef \
images/icons/toolbar_placeholder.rdef \


# Specify the resource files to use. Full or relative paths can be used.
Binary file added images/icons/add_event.iom
View file
Binary file not shown.
9 changes: 9 additions & 0 deletions images/icons/add_event.rdef
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
resource(1, "ADD_EVENT") #'VICN' array {
$"6E6369660404006603800000020006020000003C6000C000000000004C000048"
$"A00000FFABABFFD90000020016020000003B3FFFC000000000004C000048A000"
$"00FFFFE50202043522BF8C22B72F22223522B72F22BF8C3548B72F48BF8C4848"
$"3548BF8C48B72F08033D353535352B060A00010030222201178322040A010100"
$"1001178300040A020100000A01010002BF286B000000000000BF286B4A59434A"
$"59430A030100023EBCA10000000000003EBCA14550D74550D70A010101100117"
$"842204"
};
Binary file added images/icons/app_icon.iom
View file
Binary file not shown.
21 changes: 21 additions & 0 deletions images/icons/app_icon.rdef
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
resource vector_icon {
$"6E6369660A04005E0500020006023930AC389E01BE897D3F17AB4CC3A3C72217"
$"005F7993FF8B9EB203496481020006023B88953D892BBF94033D936B4C947442"
$"A24F00F2F5F7FFDAE6F2020006023B88953D892BBF94033D936B4C947442A24F"
$"00F7F3DEFFF2D291020006023B88953D892BBF94033D936B4C947442A24F00F0"
$"8888FFDC4D4D020006023B88953D892BBF94033D936B4C947442A24F0084B1DE"
$"FF3A76B4020106023B80000000000000003B80004680004AE00083FFFFFFFFF2"
$"F2B7020106023B80000000000000003B80004680004AE00000FCCDFCFFA204A4"
$"0E0A04485E605A5A50224B0A06485C4F4F584E50342C26244A0A035034584E4C"
$"480A044B4D4F4F584E4C480A034B4D4F4F485C08025034485C0A04244A485C50"
$"342C260A0827493D533E4E47514A403638343E2A3A0A082B4B3D533E4E47514A"
$"403638343E2F3C0A0427492B4B2F3C2A3A0A042F2A4B354A3B2E3002042E48BA"
$"C748B66048245224C4B824C91F2E5CB6605CBAC75C385238C91F38C4B806033B"
$"B653C4ABB514C5E9B653C4AB2EC6EBB653C92CB653C92CB514C7EE08032A562E"
$"522E4A120A000100000A01010118001501178600040A0101011815FF01178400"
$"040A020102000A030103000A020104000A0101051815FF01178400040A040106"
$"000A0701071815FF01178200040A050108000A060109000A07010A000A01010B"
$"18001501178600040A01010B1815FF01178400040A08010B000A09010C0815FF"
$"0A01010D18001501178320040A01010D1A3FF5CABA40E73A40E73FF5CAC5738C"
$"42786215FF0117822204"
};
Binary file added images/icons/category.iom
View file
Binary file not shown.
19 changes: 19 additions & 0 deletions images/icons/category.rdef
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
resource(3, "CATEGORY_ICON") #'VICN' array {
$"6E6369660A04005E0500020006023930AC389E01BE897D3F17AB4CC3A3C72217"
$"005F7993FF8B9EB203496481020006023B88953D892BBF94033D936B4C947442"
$"A24F00F2F5F7FFDAE6F2020006023B88953D892BBF94033D936B4C947442A24F"
$"00F7F3DEFFF2D291020006023B88953D892BBF94033D936B4C947442A24F00F0"
$"8888FFDC4D4D020006023B88953D892BBF94033D936B4C947442A24F0084B1DE"
$"FF3A76B4020106023B80000000000000003B80004680004AE00000FFFFFF470A"
$"8703020106023B80000000000000003B80004680004AE00000FCCDFCFFA204A4"
$"0E0A04485E605A5A50224B0A06485C4F4F584E50342C26244A0A035034584E4C"
$"480A044B4D4F4F584E4C480A034B4D4F4F485C08025034485C0A04244A485C50"
$"342C260A0827493D533E4E47514A403638343E2A3A0A082B4B3D533E4E47514A"
$"403638343E2F3C0A0427492B4B2F3C2A3A0A042F2A4B354A3B2E3002042E48BA"
$"C548B66048245224C4B824C91D2E5CB6605CBAC55C385238C91D38C4B806033B"
$"B651C4A9B514C5E9B651C4A92EC6EBB651C92CB651C92CB514C7EC08032A562E"
$"522E4A0F0A000100000A01010118001501178600040A0101011815FF01178400"
$"040A020102000A030103000A020104000A0101051815FF01178400040A040106"
$"000A0701071815FF01178200040A050108000A060109000A07010A000A01010B"
$"18001501178600040A01010B1815FF01178400040A08010B00"
};
Binary file added images/icons/event.iom
View file
Binary file not shown.
19 changes: 19 additions & 0 deletions images/icons/event.rdef
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
resource(4, "EVENT_ICON") #'VICN' array {
$"6E6369660A04005E0500020006023930AC389E01BE897D3F17AB4CC3A3C72217"
$"005F7993FF8B9EB203496481020006023B88953D892BBF94033D936B4C947442"
$"A24F00F2F5F7FFDAE6F2020006023B88943D892ABF94023D936B4C947442A24F"
$"00F7F3DEFFF2D291020006023B88943D892ABF94023D936B4C947442A24F00F0"
$"8888FFDC4D4D020006023B88943D892ABF94023D936B4C947442A24F0084B1DE"
$"FF3A76B40200020238BE97366C48B93B0B3BA8C94B8C7648386800343E38FFFF"
$"00590000020006020000003BC000C000000000004C000048A00000EAEAEAFF0C"
$"87030D0A04485E605A5A50224B0A06485C4F4F584E50342C26244A0A03503458"
$"4E4C480A044B4D4F4F584E4C480A034B4D4F4F485C08025034485C0A04244A48"
$"5C50342C260A0827493D533E4E47514A403638343E2A3A0A082B4B3D533E4E47"
$"514A403638343E2F3C0A0427492B4B2F3C2A3A0A042F2A4B354A3B2E300606BF"
$"0ABFEABE69BFEABE69472F5834C7C0B969C633B7DBBD19BB994328BD19BB99BB"
$"78B72FBB30BFECC3EDBFA40607AF06C0B6BE03C0B6BE03C1E2BB924D33C344BB"
$"114D334630BDE5BB33372F3F4A0F0A000100000A01010118001501178600040A"
$"0101011815FF01178400040A020102000A030103000A020104000A0101051815"
$"FF01178400040A040106000A0701071815FF01178200040A050108000A060109"
$"000A07010A000A00010C000A08010B30231A01178422040A09010B20231A"
};
Binary file added images/icons/toolbar_placeholder.iom
View file
Binary file not shown.
7 changes: 7 additions & 0 deletions images/icons/toolbar_placeholder.rdef
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
resource(2, "CALENDAR_ICON") #'VICN' array {
$"6E6369660404006603000080020006020000003C6000C000000000004C000048"
$"9FFF00FFFFFFFFD9D9FF0380D3FF050A0426B3CB44B3CB4448264808022C283E"
$"2808022C30363008022C383A3808022C403640050A0001003022220117832204"
$"0A0101001001178322040A020100000A0304010203041001178810040A000401"
$"020304100117842204"
};
43 changes: 0 additions & 43 deletions src/calendar.rdef
View file
Original file line number Diff line number Diff line change
@@ -26,46 +26,3 @@ resource file_types message {
"types" = "application/x-calendar-event",
"types" = "text/calendar"
};

resource(1, "ADD_EVENT") #'VICN' array {
$"6E6369660404006603800000020006020000003C6000C000000000004C000048"
$"A00000FFABABFFD90000020016020000003B3FFFC000000000004C000048A000"
$"00FFFFE50202043522BF8C22B72F22223522B72F22BF8C3548B72F48BF8C4848"
$"3548BF8C48B72F08033D353535352B060A00010030222201178322040A010100"
$"1001178300040A020100000A01010002BF286B000000000000BF286B4A59434A"
$"59430A030100023EBCA10000000000003EBCA14550D74550D70A010101100117"
$"842204"
};

## Temporary Placeholder Toolbar Icon

resource(2, "CALENDAR_ICON") #'VICN' array {
$"6E6369660404006603000080020006020000003C6000C000000000004C000048"
$"9FFF00FFFFFFFFD9D9FF0380D3FF050A0426B3CB44B3CB4448264808022C283E"
$"2808022C30363008022C383A3808022C403640050A0001003022220117832204"
$"0A0101001001178322040A020100000A0304010203041001178810040A000401"
$"020304100117842204"
};


resource vector_icon {
$"6E6369660A04005E0500020006023930AC389E01BE897D3F17AB4CC3A3C72217"
$"005F7993FF8B9EB203496481020006023B88953D892BBF94033D936B4C947442"
$"A24F00F2F5F7FFDAE6F2020006023B88953D892BBF94033D936B4C947442A24F"
$"00F7F3DEFFF2D291020006023B88953D892BBF94033D936B4C947442A24F00F0"
$"8888FFDC4D4D020006023B88953D892BBF94033D936B4C947442A24F0084B1DE"
$"FF3A76B4020106023B80000000000000003B80004680004AE00083FFFFFFFFF2"
$"F2B7020106023B80000000000000003B80004680004AE00000FCCDFCFFA204A4"
$"0E0A04485E605A5A50224B0A06485C4F4F584E50342C26244A0A035034584E4C"
$"480A044B4D4F4F584E4C480A034B4D4F4F485C08025034485C0A04244A485C50"
$"342C260A0827493D533E4E47514A403638343E2A3A0A082B4B3D533E4E47514A"
$"403638343E2F3C0A0427492B4B2F3C2A3A0A042F2A4B354A3B2E3002042E48BA"
$"C748B66048245224C4B824C91F2E5CB6605CBAC75C385238C91F38C4B806033B"
$"B653C4ABB514C5E9B653C4AB2EC6EBB653C92CB653C92CB514C7EE08032A562E"
$"522E4A120A000100000A01010118001501178600040A0101011815FF01178400"
$"040A020102000A030103000A020104000A0101051815FF01178400040A040106"
$"000A0701071815FF01178200040A050108000A060109000A07010A000A01010B"
$"18001501178600040A01010B1815FF01178400040A08010B000A09010C0815FF"
$"0A01010D18001501178320040A01010D1A3FF5CABA40E73A40E73FF5CAC5738C"
$"42786215FF0117822204"
};
21 changes: 19 additions & 2 deletions src/db/QueryDBManager.cpp
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
#include <time.h>

#include <Alert.h>
#include <Bitmap.h>
#include <Catalog.h>
#include <Directory.h>
#include <Entry.h>
@@ -18,6 +19,7 @@
#include <Message.h>
#include <MimeType.h>
#include <Query.h>
#include <Resources.h>
#include <String.h>
#include <StringList.h>
#include <VolumeRoster.h>
@@ -901,8 +903,11 @@ bool
QueryDBManager::_CategoryMimetype()
{
BMessage info;
uint8* iconData;
size_t iconLength = 0;
BMimeType mime("application/x-calendar-category" );
if (mime.IsInstalled())
if (mime.IsInstalled()
&& mime.GetIcon(&iconData, &iconLength) != B_ENTRY_NOT_FOUND)
return true;

mime.GetAttrInfo(&info);
@@ -915,6 +920,11 @@ QueryDBManager::_CategoryMimetype()
_AddAttribute(info, "Category:Color", "Color", B_RGB_COLOR_TYPE, false, 100);
_AddAttribute(info, "Calendar:ID", "ID", B_STRING_TYPE, true, 100);

size_t length = 0;
BResources* res = BApplication::AppResources();
const void* icon = res->LoadResource('VICN', "CATEGORY_ICON", &length);
mime.SetIcon((uint8*)icon, length);

return mime.SetAttrInfo( &info );
}

@@ -923,8 +933,11 @@ bool
QueryDBManager::_EventMimetype()
{
BMessage info;
uint8* iconData;
size_t iconLength = 0;
BMimeType mime("application/x-calendar-event" );
if (mime.IsInstalled())
if (mime.IsInstalled()
&& mime.GetIcon(&iconData, &iconLength) != B_ENTRY_NOT_FOUND)
return true;

mime.GetAttrInfo(&info);
@@ -945,6 +958,10 @@ QueryDBManager::_EventMimetype()
_AddAttribute(info, "Event:Status", "Status", B_STRING_TYPE, true, 50);
_AddAttribute(info, "Calendar:ID", "ID", B_STRING_TYPE, true, 100);

BResources* res = BApplication::AppResources();
const void* icon = res->LoadResource('VICN', "EVENT_ICON", &iconLength);
mime.SetIcon((uint8*)icon, iconLength);

return mime.SetAttrInfo( &info );
}