From b0be2c2666a1834e64c6d183ae58beadaa595d00 Mon Sep 17 00:00:00 2001 From: NicJA Date: Mon, 3 May 2010 13:04:56 +0000 Subject: [PATCH] Use standard MUIV_ values for IconList sorting flags. Add provisional DisplayMode flag for list view git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@33161 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/system/Wanderer/Classes/iconlist.c | 54 +++---- workbench/system/Wanderer/Classes/iconlist.conf | 4 +- .../system/Wanderer/Classes/iconlist_attributes.h | 169 +++++++++++---------- workbench/system/Wanderer/Classes/iconvolumelist.c | 2 +- .../system/Wanderer/Classes/iconvolumelist.conf | 4 +- workbench/system/Wanderer/version.h | 4 +- workbench/system/Wanderer/wanderer.c | 62 ++++---- 7 files changed, 155 insertions(+), 144 deletions(-) diff --git a/workbench/system/Wanderer/Classes/iconlist.c b/workbench/system/Wanderer/Classes/iconlist.c index ca62728cd0..1d8b1b16fe 100644 --- a/workbench/system/Wanderer/Classes/iconlist.c +++ b/workbench/system/Wanderer/Classes/iconlist.c @@ -113,16 +113,16 @@ static struct Hook __iconlist_UpdateLabels_hook; // N.B: We Handle frame/background rendering so make sure icon.library doesnt do it .. static struct TagItem __iconList_DrawIconStateTags[] = { - { ICONDRAWA_Frameless, TRUE}, - { ICONDRAWA_Borderless, TRUE}, - { ICONDRAWA_EraseBackground, FALSE}, - { TAG_DONE, } + { ICONDRAWA_Frameless, TRUE }, + { ICONDRAWA_Borderless, TRUE }, + { ICONDRAWA_EraseBackground, FALSE }, + { TAG_DONE, } }; static struct TagItem __iconList_BackBuffLayerTags[] = { - //{LA_Visible , (IPTR)FALSE }, - {TAG_DONE } + { LA_Visible, FALSE }, + { TAG_DONE, } }; #ifndef NO_ICON_POSITION @@ -491,19 +491,19 @@ static void IconList_GetIconLabelRectangle(Object *obj, struct IconList_DATA *da only list regular files like this (drawers have no size/date output) */ if( icon->ie_IconListEntry.type != ST_USERDIR && - ((data->icld_SortFlags & ICONLIST_SORT_BY_SIZE) || (data->icld_SortFlags & ICONLIST_SORT_BY_DATE)) + ((data->icld_SortFlags & MUIV_IconList_Sort_BySize) || (data->icld_SortFlags & MUIV_IconList_Sort_ByDate)) ) { SetFont(data->icld_BufferRastPort, data->icld_IconInfoFont); - if( (data->icld_SortFlags & ICONLIST_SORT_BY_SIZE) && !(data->icld_SortFlags & ICONLIST_SORT_BY_DATE) ) + if( (data->icld_SortFlags & MUIV_IconList_Sort_BySize) && !(data->icld_SortFlags & MUIV_IconList_Sort_ByDate) ) { icon->ie_TxtBuf_SIZEWidth = TextLength(data->icld_BufferRastPort, icon->ie_TxtBuf_SIZE, strlen(icon->ie_TxtBuf_SIZE)); textwidth = icon->ie_TxtBuf_SIZEWidth; } else { - if( !(data->icld_SortFlags & ICONLIST_SORT_BY_SIZE) && (data->icld_SortFlags & ICONLIST_SORT_BY_DATE) ) + if( !(data->icld_SortFlags & MUIV_IconList_Sort_BySize) && (data->icld_SortFlags & MUIV_IconList_Sort_ByDate) ) { if( icon->ie_Flags & ICONENTRY_FLAG_TODAY ) { @@ -1238,17 +1238,17 @@ IPTR IconList__MUIM_IconList_DrawEntryLabel(struct IClass *CLASS, Object *obj, s /*date/size sorting has the date/size appended under the message->icon label*/ - if ((message->icon->ie_IconListEntry.type != ST_USERDIR) && ((data->icld_SortFlags & (ICONLIST_SORT_BY_SIZE|ICONLIST_SORT_BY_DATE)) != 0)) + if ((message->icon->ie_IconListEntry.type != ST_USERDIR) && ((data->icld_SortFlags & (MUIV_IconList_Sort_BySize|MUIV_IconList_Sort_ByDate)) != 0)) { buf = NULL; SetFont(data->icld_BufferRastPort, data->icld_IconInfoFont); - if ((data->icld_SortFlags & ICONLIST_SORT_MASK) == ICONLIST_SORT_BY_SIZE) + if ((data->icld_SortFlags & MUIV_IconList_Sort_MASK) == MUIV_IconList_Sort_BySize) { buf = message->icon->ie_TxtBuf_SIZE; txwidth = message->icon->ie_TxtBuf_SIZEWidth; } - else if ((data->icld_SortFlags & ICONLIST_SORT_MASK) == ICONLIST_SORT_BY_DATE) + else if ((data->icld_SortFlags & MUIV_IconList_Sort_MASK) == MUIV_IconList_Sort_ByDate) { if (message->icon->ie_Flags & ICONENTRY_FLAG_TODAY) { @@ -1572,7 +1572,7 @@ IPTR IconList__OM_NEW(struct IClass *CLASS, Object *obj, struct opSet *message) data->ehn.ehn_Object = obj; data->ehn.ehn_Class = CLASS; - data->icld_SortFlags = ICONLIST_SORT_BY_NAME; + data->icld_SortFlags = MUIV_IconList_Sort_ByName; data->icld_DisplayFlags = ICONLIST_DISP_SHOWINFO; __iconlist_UpdateLabels_hook.h_Entry = (HOOKFUNC)IconList__HookFunc_UpdateLabelsFunc; @@ -5801,10 +5801,10 @@ IPTR IconList__MUIM_IconList_Sort(struct IClass *CLASS, Object *obj, struct MUIP data->icld_IconLargestHeight = 0; data->icld_LabelLargestHeight = 0; - if ((data->icld_SortFlags & ICONLIST_SORT_MASK) != 0) + if ((data->icld_SortFlags & MUIV_IconList_Sort_MASK) != 0) { #if defined(DEBUG_ILC_ICONSORTING) - D(bug("[IconList] %s: Sorting (Flags %x)\n", __PRETTY_FUNCTION__, (data->icld_SortFlags & ICONLIST_SORT_MASK))); + D(bug("[IconList] %s: Sorting (Flags %x)\n", __PRETTY_FUNCTION__, (data->icld_SortFlags & MUIV_IconList_Sort_MASK))); #endif NewList((struct List*)&list_VisibleIcons); NewList((struct List*)&list_SortedIcons); @@ -5818,13 +5818,13 @@ IPTR IconList__MUIM_IconList_Sort(struct IClass *CLASS, Object *obj, struct MUIP if (entry->ie_IconX != entry->ie_DiskObj->do_CurrentX) { entry->ie_IconX = entry->ie_DiskObj->do_CurrentX; - if ((data->icld_SortFlags & ICONLIST_SORT_MASK) == 0) + if ((data->icld_SortFlags & MUIV_IconList_Sort_MASK) == 0) entry->ie_Flags |= ICONENTRY_FLAG_NEEDSUPDATE; } if (entry->ie_IconY != entry->ie_DiskObj->do_CurrentY) { entry->ie_IconY = entry->ie_DiskObj->do_CurrentY; - if ((data->icld_SortFlags & ICONLIST_SORT_MASK) == 0) + if ((data->icld_SortFlags & MUIV_IconList_Sort_MASK) == 0) entry->ie_Flags |= ICONENTRY_FLAG_NEEDSUPDATE; } } @@ -5859,7 +5859,7 @@ IPTR IconList__MUIM_IconList_Sort(struct IClass *CLASS, Object *obj, struct MUIP if(entry->ie_IconHeight > data->icld_IconLargestHeight) data->icld_IconLargestHeight = entry->ie_IconHeight; if((entry->ie_AreaHeight - entry->ie_IconHeight) > data->icld_LabelLargestHeight) data->icld_LabelLargestHeight = entry->ie_AreaHeight - entry->ie_IconHeight; - if (((data->icld_SortFlags & ICONLIST_SORT_MASK) == 0) && (entry->ie_IconX == NO_ICON_POSITION)) + if (((data->icld_SortFlags & MUIV_IconList_Sort_MASK) == 0) && (entry->ie_IconX == NO_ICON_POSITION)) AddTail((struct List*)&list_VisibleIcons, (struct Node *)&entry->ie_IconNode); else AddHead((struct List*)&list_VisibleIcons, (struct Node *)&entry->ie_IconNode); @@ -5894,7 +5894,7 @@ IPTR IconList__MUIM_IconList_Sort(struct IClass *CLASS, Object *obj, struct MUIP while (icon1) { if(((icon1->ie_IconListEntry.type == ST_ROOT) || (icon1->ie_IconListEntry.type == ST_LINKDIR) || (icon1->ie_IconListEntry.type == ST_LINKFILE)) - || (data->icld_SortFlags & ICONLIST_SORT_DRAWERS_MIXED)) + || (data->icld_SortFlags & MUIV_IconList_Sort_DrawersMixed)) { /*volume list or drawers mixed*/ sortme = TRUE; @@ -5930,17 +5930,17 @@ IPTR IconList__MUIM_IconList_Sort(struct IClass *CLASS, Object *obj, struct MUIP { i = 0; - if ((data->icld_SortFlags & ICONLIST_SORT_MASK) == ICONLIST_SORT_BY_DATE) + if ((data->icld_SortFlags & MUIV_IconList_Sort_MASK) == MUIV_IconList_Sort_ByDate) { /* Sort by Date */ i = CompareDates((const struct DateStamp *)&entry->ie_FileInfoBlock->fib_Date,(const struct DateStamp *)&icon1->ie_FileInfoBlock->fib_Date); } - else if ((data->icld_SortFlags & ICONLIST_SORT_MASK) == ICONLIST_SORT_BY_SIZE) + else if ((data->icld_SortFlags & MUIV_IconList_Sort_MASK) == MUIV_IconList_Sort_BySize) { /* Sort by Size .. */ i = entry->ie_FileInfoBlock->fib_Size - icon1->ie_FileInfoBlock->fib_Size; } - else if (((data->icld_SortFlags & ICONLIST_SORT_MASK) == ICONLIST_SORT_MASK) && ((entry->ie_IconListEntry.type == ST_FILE) || (entry->ie_IconListEntry.type == ST_USERDIR))) + else if (((data->icld_SortFlags & MUIV_IconList_Sort_MASK) == MUIV_IconList_Sort_MASK) && ((entry->ie_IconListEntry.type == ST_FILE) || (entry->ie_IconListEntry.type == ST_USERDIR))) { /* Sort by Type .. */ #warning "TODO: Sort icons based on type using datatypes" @@ -5948,14 +5948,14 @@ IPTR IconList__MUIM_IconList_Sort(struct IClass *CLASS, Object *obj, struct MUIP else { if ( - ((data->icld_SortFlags & ICONLIST_SORT_MASK) == ICONLIST_SORT_MASK) || - ((data->icld_SortFlags & ICONLIST_SORT_MASK) == ICONLIST_SORT_BY_NAME) || + ((data->icld_SortFlags & MUIV_IconList_Sort_MASK) == MUIV_IconList_Sort_MASK) || + ((data->icld_SortFlags & MUIV_IconList_Sort_MASK) == MUIV_IconList_Sort_ByName) || (entry->ie_IconX == NO_ICON_POSITION) ) { /* Sort by Name .. */ i = Stricmp(entry->ie_IconListEntry.label, icon1->ie_IconListEntry.label); - if ((data->icld_SortFlags & ICONLIST_SORT_MASK) == ICONLIST_SORT_MASK) + if ((data->icld_SortFlags & MUIV_IconList_Sort_MASK) == MUIV_IconList_Sort_MASK) enqueue = TRUE; } else @@ -5965,7 +5965,7 @@ IPTR IconList__MUIM_IconList_Sort(struct IClass *CLASS, Object *obj, struct MUIP } } - if (data->icld_SortFlags & ICONLIST_SORT_REVERSE) + if (data->icld_SortFlags & MUIV_IconList_Sort_Reverse) { if (i > 0) break; @@ -6006,7 +6006,7 @@ IPTR IconList__MUIM_IconList_Sort(struct IClass *CLASS, Object *obj, struct MUIP DoMethod(obj, MUIM_IconList_PositionIcons); MUI_Redraw(obj, MADF_DRAWOBJECT); - if ((data->icld_SortFlags & ICONLIST_SORT_MASK) != 0) + if ((data->icld_SortFlags & MUIV_IconList_Sort_MASK) != 0) { DoMethod(obj, MUIM_IconList_CoordsSort); diff --git a/workbench/system/Wanderer/Classes/iconlist.conf b/workbench/system/Wanderer/Classes/iconlist.conf index 97ca9067a1..8d80651e65 100644 --- a/workbench/system/Wanderer/Classes/iconlist.conf +++ b/workbench/system/Wanderer/Classes/iconlist.conf @@ -1,7 +1,7 @@ ##begin config basename IconList -version 1.10 -date 02.05.2010 +version 1.11 +date 03.05.2010 superclass MUIC_Area classdatatype struct IconList_DATA ##end config diff --git a/workbench/system/Wanderer/Classes/iconlist_attributes.h b/workbench/system/Wanderer/Classes/iconlist_attributes.h index bce8d0e256..8b57a12217 100644 --- a/workbench/system/Wanderer/Classes/iconlist_attributes.h +++ b/workbench/system/Wanderer/Classes/iconlist_attributes.h @@ -7,101 +7,112 @@ */ /*** Identifier base ********************************************************/ -#define MUIB_IconList (MUIB_ZUNE | 0x00042000) +#define MUIB_IconList (MUIB_ZUNE | 0x00042000) -#define MUIV_IconList_NextIcon_Start 0 -#define MUIV_IconList_NextIcon_End 1 +#define MUIV_IconList_NextIcon_Start 0x00 +#define MUIV_IconList_NextIcon_End 0x01 -#define MUIV_IconList_NextIcon_Selected 2 -#define MUIV_IconList_NextIcon_Visible 3 +#define MUIV_IconList_NextIcon_Selected 0x02 +#define MUIV_IconList_NextIcon_Visible 0x03 + +/* # SORTFLAGS + + ((flags & (MUIV_IconList_Sort_MASK) == 0) + place icons with coords at specified locations, sort remainder by name + + ((flags & (MUIV_IconList_Sort_MASK) == ICONLIST_SORT_BY_NAME) + sort icons by Name + + ((flags & (MUIV_IconList_Sort_MASK) == ICONLIST_SORT_BY_DATE) + sort icons by Date + + ((flags & (MUIV_IconList_Sort_MASK) == ICONLIST_SORT_BY_SIZE) + sort icons by Size + + ((flags & (MUIV_IconList_Sort_MASK) == (MUIV_IconList_Sort_MASK)) + sort icons by Type +*/ +#define MUIV_IconList_Sort_DrawersMixed (1<<0) /* mix folders and files when sorting */ +#define MUIV_IconList_Sort_DrawersLast (1<<1) /* ignored if mixed is set */ +#define MUIV_IconList_Sort_Reverse (1<<2) /* reverse sort direction */ + +#define MUIV_IconList_Sort_ByName (1<<4) +#define MUIV_IconList_Sort_ByDate (1<<5) +#define MUIV_IconList_Sort_BySize (1<<6) + +#define MUIV_IconList_Sort_MASK (MUIV_IconList_Sort_ByName|MUIV_IconList_Sort_ByDate|MUIV_IconList_Sort_BySize) /*** Attributes *************************************************************/ -#define MUIA_IconList_Changed (MUIB_IconList | 0x00000001) /* Zune: V1 .SG BOOL */ -#define MUIA_IconList_Clicked (MUIB_IconList | 0x00000002) /* Zune: V1 ..G (struct IconList_Click *) */ -#define MUIA_IconList_DoubleClick (MUIB_IconList | 0x00000003) /* Zune: V1 ..G BOOL */ -#define MUIA_IconList_SelectionChanged (MUIB_IconList | 0x00000004) /* Zune: V1 ..G BOOL */ +#define MUIA_IconList_Changed (MUIB_IconList | 0x00000001) /* Zune: V1 .SG BOOL */ +#define MUIA_IconList_Clicked (MUIB_IconList | 0x00000002) /* Zune: V1 ..G (struct IconList_Click *) */ +#define MUIA_IconList_DoubleClick (MUIB_IconList | 0x00000003) /* Zune: V1 ..G BOOL */ +#define MUIA_IconList_SelectionChanged (MUIB_IconList | 0x00000004) /* Zune: V1 ..G BOOL */ -#define MUIA_IconList_Width (MUIB_IconList | 0x0000000c) /* Zune: V1 .SG LONG */ -#define MUIA_IconList_Height (MUIB_IconList | 0x0000000d) /* Zune: V1 .SG LONG */ -#define MUIA_IconList_IconsMoved (MUIB_IconList | 0x00000010) /* Zune: V1 ..G (struct IconList_Entry *) */ -#define MUIA_IconList_IconsDropped (MUIB_IconList | 0x00000011) /* Zune: V1 ..G (struct IconList_Entry *) */ -#define MUIA_IconList_AppWindowDrop (MUIB_IconList | 0x00000012) /* Zune: V1 ..G (struct IconList_Entry *) */ -#define MUIA_IconList_FocusIcon (MUIB_IconList | 0x00000013) /* Zune: V1 .SG (struct IconList_Entry *) */ +#define MUIA_IconList_Width (MUIB_IconList | 0x0000000c) /* Zune: V1 .SG LONG */ +#define MUIA_IconList_Height (MUIB_IconList | 0x0000000d) /* Zune: V1 .SG LONG */ +#define MUIA_IconList_IconsMoved (MUIB_IconList | 0x00000010) /* Zune: V1 ..G (struct IconList_Entry *) */ +#define MUIA_IconList_IconsDropped (MUIB_IconList | 0x00000011) /* Zune: V1 ..G (struct IconList_Entry *) */ +#define MUIA_IconList_AppWindowDrop (MUIB_IconList | 0x00000012) /* Zune: V1 ..G (struct IconList_Entry *) */ +#define MUIA_IconList_FocusIcon (MUIB_IconList | 0x00000013) /* Zune: V1 .SG (struct IconList_Entry *) */ -#define MUIA_IconList_DisplayFlags (MUIB_IconList | 0x00000020) /* Zune: V1 ISG ULONG */ -#define MUIA_IconList_SortFlags (MUIB_IconList | 0x00000021) /* Zune: V1 ISG ULONG */ +#define MUIA_IconList_DisplayFlags (MUIB_IconList | 0x00000020) /* Zune: V1 ISG ULONG */ +#define MUIA_IconList_SortFlags (MUIB_IconList | 0x00000021) /* Zune: V1 ISG ULONG */ +#define MUIA_IconList_BufferLeft (MUIB_IconList | 0x000000F0) /* Zune: V1 ..G LONG */ +#define MUIA_IconList_BufferTop (MUIB_IconList | 0x000000F1) /* Zune: V1 ..G LONG */ +#define MUIA_IconList_BufferWidth (MUIB_IconList | 0x000000F2) /* Zune: V1 ..G LONG */ +#define MUIA_IconList_BufferHeight (MUIB_IconList | 0x000000F3) /* Zune: V1 ..G LONG */ -/* OBSOLETE */ -//#define MUIA_IconList_Left (MUIB_IconList | 0x0000000a) /* Zune: V1 .SG LONG */ -//#define MUIA_IconList_Top (MUIB_IconList | 0x0000000b) /* Zune: V1 .SG LONG */ +#define MUIA_IconList_Rastport (MUIB_IconList | 0x000000FF) /* Zune: V1 .SG (struct RastPort *) */ +#define MUIA_IconList_BufferRastport (MUIB_IconList | 0x000000FE) /* Zune: V1 ..G BOOL */ /* Configuration Attributes */ #define MUIB_IconList_ConfigTags (MUIB_IconList | 0x00000100) -#define MUIA_IconList_IconListMode (MUIB_IconList_ConfigTags | 0x00000000) /* Zune: V1 ISG UBYTE */ -#define MUIA_IconList_LabelText_Mode (MUIB_IconList_ConfigTags | 0x00000001) /* Zune: V1 ISG UBYTE */ -#define MUIA_IconList_LabelText_Pen (MUIB_IconList_ConfigTags | 0x00000002) /* Zune: V1 ISG UBYTE */ -#define MUIA_IconList_LabelText_ShadowPen (MUIB_IconList_ConfigTags | 0x00000003) /* Zune: V1 ISG UBYTE */ -#define MUIA_IconList_LabelInfoText_Font (MUIB_IconList_ConfigTags | 0x00000004) /* Zune: V1 ISG (struct TextFont *) */ -#define MUIA_IconList_LabelInfoText_Pen (MUIB_IconList_ConfigTags | 0x00000005) /* Zune: V1 ISG UBYTE */ -#define MUIA_IconList_LabelInfoText_ShadowPen (MUIB_IconList_ConfigTags | 0x00000006) /* Zune: V1 ISG UBYTE */ -#define MUIA_IconList_LabelText_MaxLineLen (MUIB_IconList_ConfigTags | 0x00000007) /* Zune: V1 ISG ULONG */ -#define MUIA_IconList_LabelText_MultiLine (MUIB_IconList_ConfigTags | 0x00000008) /* Zune: V1 ISG ULONG */ -#define MUIA_IconList_LabelText_MultiLineOnFocus (MUIB_IconList_ConfigTags | 0x00000009) /* Zune: V1 ISG BOOL */ - -#define MUIA_IconList_Icon_HorizontalSpacing (MUIB_IconList_ConfigTags | 0x00000010) /* Zune: V1 ISG UBYTE */ -#define MUIA_IconList_Icon_VerticalSpacing (MUIB_IconList_ConfigTags | 0x00000011) /* Zune: V1 ISG UBYTE */ -#define MUIA_IconList_Icon_ImageSpacing (MUIB_IconList_ConfigTags | 0x00000012) /* Zune: V1 ISG UBYTE */ -#define MUIA_IconList_LabelText_HorizontalPadding (MUIB_IconList_ConfigTags | 0x00000013) /* Zune: V1 ISG UBYTE */ -#define MUIA_IconList_LabelText_VerticalPadding (MUIB_IconList_ConfigTags | 0x00000014) /* Zune: V1 ISG UBYTE */ -#define MUIA_IconList_LabelText_BorderWidth (MUIB_IconList_ConfigTags | 0x00000015) /* Zune: V1 ISG UBYTE */ -#define MUIA_IconList_LabelText_BorderHeight (MUIB_IconList_ConfigTags | 0x00000016) /* Zune: V1 ISG UBYTE */ - -#define MUIA_IconList_Rastport (MUIB_IconList | 0x000000FF) /* Zune: V1 .SG (struct RastPort *) */ -#define MUIA_IconList_BufferRastport (MUIB_IconList | 0x000000FE) /* Zune: V1 ..G BOOL */ - -#define MUIA_IconList_BufferLeft (MUIB_IconList | 0x00000050) /* Zune: V1 ..G LONG */ -#define MUIA_IconList_BufferTop (MUIB_IconList | 0x00000051) /* Zune: V1 ..G LONG */ -#define MUIA_IconList_BufferWidth (MUIB_IconList | 0x00000052) /* Zune: V1 ..G LONG */ -#define MUIA_IconList_BufferHeight (MUIB_IconList | 0x00000053) /* Zune: V1 ..G LONG */ - -/****************************************************************************/ -/* iconlist rendering control flags */ -/* SORTFLAGS - ((flags & (ICONLIST_SORT_BY_NAME|ICONLIST_SORT_BY_DATE|ICONLIST_SORT_BY_SIZE) == 0) - place icons with coords at fixed locations and sort remainder by name - - ((flags & (ICONLIST_SORT_BY_NAME|ICONLIST_SORT_BY_DATE|ICONLIST_SORT_BY_SIZE) == ICONLIST_SORT_BY_NAME) - sort icons by Name - - ((flags & (ICONLIST_SORT_BY_NAME|ICONLIST_SORT_BY_DATE|ICONLIST_SORT_BY_SIZE) == ICONLIST_SORT_BY_DATE) - sort icons by Date - - ((flags & (ICONLIST_SORT_BY_NAME|ICONLIST_SORT_BY_DATE|ICONLIST_SORT_BY_SIZE) == ICONLIST_SORT_BY_SIZE) - sort icons by Size - - ((flags & (ICONLIST_SORT_BY_NAME|ICONLIST_SORT_BY_DATE|ICONLIST_SORT_BY_SIZE) == (ICONLIST_SORT_BY_NAME|ICONLIST_SORT_BY_DATE|ICONLIST_SORT_BY_SIZE)) - sort icons by Type -*/ -#define ICONLIST_SORT_DRAWERS_MIXED (1<<0) /* mix folders and files when sorting */ -#define ICONLIST_SORT_DRAWERS_LAST (1<<1) /* ignored if mixed is set */ -#define ICONLIST_SORT_REVERSE (1<<2) /* reverse sort direction */ -#define ICONLIST_SORT_BY_NAME (1<<4) -#define ICONLIST_SORT_BY_DATE (1<<5) -#define ICONLIST_SORT_BY_SIZE (1<<6) +#define MUIA_IconList_IconListMode (MUIB_IconList_ConfigTags | 0x00000000) /* Zune: V1 ISG UBYTE */ +#define MUIA_IconList_LabelText_Mode (MUIB_IconList_ConfigTags | 0x00000001) /* Zune: V1 ISG UBYTE */ +#define MUIA_IconList_LabelText_Pen (MUIB_IconList_ConfigTags | 0x00000002) /* Zune: V1 ISG UBYTE */ +#define MUIA_IconList_LabelText_ShadowPen (MUIB_IconList_ConfigTags | 0x00000003) /* Zune: V1 ISG UBYTE */ +#define MUIA_IconList_LabelInfoText_Font (MUIB_IconList_ConfigTags | 0x00000004) /* Zune: V1 ISG (struct TextFont *) */ +#define MUIA_IconList_LabelInfoText_Pen (MUIB_IconList_ConfigTags | 0x00000005) /* Zune: V1 ISG UBYTE */ +#define MUIA_IconList_LabelInfoText_ShadowPen (MUIB_IconList_ConfigTags | 0x00000006) /* Zune: V1 ISG UBYTE */ + +/* options only relevant in List view-mode */ + +/* Options only relevant in Icon view-mode */ +#define MUIA_IconList_LabelText_MaxLineLen (MUIB_IconList_ConfigTags | 0x00000007) /* Zune: V1 ISG ULONG */ +#define MUIA_IconList_LabelText_MultiLine (MUIB_IconList_ConfigTags | 0x00000008) /* Zune: V1 ISG ULONG */ +#define MUIA_IconList_LabelText_MultiLineOnFocus (MUIB_IconList_ConfigTags | 0x00000009) /* Zune: V1 ISG BOOL */ + +#define MUIA_IconList_Icon_HorizontalSpacing (MUIB_IconList_ConfigTags | 0x00000010) /* Zune: V1 ISG UBYTE */ +#define MUIA_IconList_Icon_VerticalSpacing (MUIB_IconList_ConfigTags | 0x00000011) /* Zune: V1 ISG UBYTE */ +#define MUIA_IconList_Icon_ImageSpacing (MUIB_IconList_ConfigTags | 0x00000012) /* Zune: V1 ISG UBYTE */ +#define MUIA_IconList_LabelText_HorizontalPadding (MUIB_IconList_ConfigTags | 0x00000013) /* Zune: V1 ISG UBYTE */ +#define MUIA_IconList_LabelText_VerticalPadding (MUIB_IconList_ConfigTags | 0x00000014) /* Zune: V1 ISG UBYTE */ +#define MUIA_IconList_LabelText_BorderWidth (MUIB_IconList_ConfigTags | 0x00000015) /* Zune: V1 ISG UBYTE */ +#define MUIA_IconList_LabelText_BorderHeight (MUIB_IconList_ConfigTags | 0x00000016) /* Zune: V1 ISG UBYTE */ + +/********************************************************************************/ +/* IconList rendering control flags */ +/********************************************************************************/ + +/* # DISPLAYFLAGS */ + +#define ICONLIST_DISP_BUFFERED (1<<0) /* use buffered IconList rendering */ + +#define ICONLIST_DISP_MODEDEFAULT (1<<1) /* icons view-mode (with labels below) */ +#define ICONLIST_DISP_MODELABELRIGHT (1<<2) /* icons view-mode (with labels to the right) */ +#define ICONLIST_DISP_MODELIST (1<<3) /* list view-mode */ -#define ICONLIST_SORT_MASK (ICONLIST_SORT_BY_NAME|ICONLIST_SORT_BY_DATE|ICONLIST_SORT_BY_SIZE) +#define ICONLIST_DISP_SHOWHIDDEN (1<<6) /* show system "hidden" files */ +#define ICONLIST_DISP_SHOWINFO (1<<7) /* only show icon(s) which have *.info files */ -/* DISPLAYFLAGS */ -#define ICONLIST_DISP_SHOWHIDDEN (1<<0) /* show system "hidden" files */ -#define ICONLIST_DISP_SHOWINFO (1<<1) /* only show icon(s) which have *.info files */ +#define ICONLIST_DISP_NOICONS (1<<10) /* name only mode */ -#define ICONLIST_DISP_VERTICAL (1<<7) /* tile icons vertically */ -#define ICONLIST_DISP_NOICONS (1<<8) /* name only mode */ -#define ICONLIST_DISP_DETAILS (1<<9) /* name=details mode, icon=?? */ +/* Display Flags only relevant in List view-modes */ -#define ICONLIST_DISP_BUFFERED (1<<15) /* Iconlist uses buffered rendering */ +/* Display Flags only relevant in Icon view-modes */ +#define ICONLIST_DISP_VERTICAL (1<<15) /* tile icons vertically */ enum iconlist_ListViewModes { diff --git a/workbench/system/Wanderer/Classes/iconvolumelist.c b/workbench/system/Wanderer/Classes/iconvolumelist.c index 03d918accc..6353e089fd 100644 --- a/workbench/system/Wanderer/Classes/iconvolumelist.c +++ b/workbench/system/Wanderer/Classes/iconvolumelist.c @@ -432,7 +432,7 @@ D(bug("[IconVolumeList]: %s()\n", __PRETTY_FUNCTION__)); data = INST_DATA(CLASS, obj); SET(obj, MUIA_IconList_DisplayFlags, ICONLIST_DISP_VERTICAL); - SET(obj, MUIA_IconList_SortFlags, ICONLIST_SORT_MASK); + SET(obj, MUIA_IconList_SortFlags, MUIV_IconList_Sort_MASK); D(bug("[IconVolumeList] obj @ %p\n", obj)); return (IPTR)obj; diff --git a/workbench/system/Wanderer/Classes/iconvolumelist.conf b/workbench/system/Wanderer/Classes/iconvolumelist.conf index fca1999c2f..715d529abf 100644 --- a/workbench/system/Wanderer/Classes/iconvolumelist.conf +++ b/workbench/system/Wanderer/Classes/iconvolumelist.conf @@ -1,7 +1,7 @@ ##begin config basename IconVolumeList -version 1.8 -date 02.05.2010 +version 1.9 +date 03.05.2010 superclass MUIC_IconList classdatatype struct IconVolumeList_DATA ##end config diff --git a/workbench/system/Wanderer/version.h b/workbench/system/Wanderer/version.h index 9ac2baa891..c6d2aa3272 100644 --- a/workbench/system/Wanderer/version.h +++ b/workbench/system/Wanderer/version.h @@ -1,6 +1,6 @@ #define WANDERERVERS 0 -#define WANDERERREV 85 -#define WANDERERSTR "Wanderer 0.85 (02.05.2010)" +#define WANDERERREV 86 +#define WANDERERSTR "Wanderer 0.86 (03.05.2010)" #define WANDERERAUTH "The AROS Dev Team" #define WANDERERCOPY "© " WANDERERAUTH #define VERSION "$VER: " WANDERERSTR " " WANDERERCOPY diff --git a/workbench/system/Wanderer/wanderer.c b/workbench/system/Wanderer/wanderer.c index e7bd398e0b..30032ee7ee 100644 --- a/workbench/system/Wanderer/wanderer.c +++ b/workbench/system/Wanderer/wanderer.c @@ -1358,11 +1358,11 @@ D(bug("[Wanderer] %s: ICONLIST_DISP_SHOWINFO\n", __PRETTY_FUNCTION__)); #warning "TODO: Icon sort flags are only really for text list mode ... fix" GET(iconList, MUIA_IconList_SortFlags, &sort_bits); - if (sort_bits & ICONLIST_SORT_BY_DATE) + if (sort_bits & MUIV_IconList_Sort_ByDate) { drawericon->do_DrawerData->dd_ViewModes = 3; } - else if (sort_bits & ICONLIST_SORT_BY_SIZE) + else if (sort_bits & MUIV_IconList_Sort_BySize) { drawericon->do_DrawerData->dd_ViewModes = 4; } @@ -1456,8 +1456,8 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); GET(iconList, MUIA_IconList_SortFlags, &sort_bits); - sort_bits &= ~(ICONLIST_SORT_MASK|ICONLIST_SORT_REVERSE); - sort_bits |= ICONLIST_SORT_DRAWERS_MIXED; + sort_bits &= ~(MUIV_IconList_Sort_MASK|MUIV_IconList_Sort_Reverse); + sort_bits |= MUIV_IconList_Sort_DrawersMixed; if( XGET(item, MUIA_Menuitem_Checked) ) { @@ -1466,7 +1466,7 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); NNSET(item, MUIA_Disabled, FALSE); if( XGET(item, MUIA_Menuitem_Checked) ) { - sort_bits |= ICONLIST_SORT_BY_DATE; + sort_bits |= MUIV_IconList_Sort_ByDate; } } if ((item = FindMenuitem(strip, MEN_WINDOW_SORT_SIZE)) != NULL) @@ -1474,7 +1474,7 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); NNSET(item, MUIA_Disabled, FALSE); if( XGET(item, MUIA_Menuitem_Checked) ) { - sort_bits |= ICONLIST_SORT_BY_SIZE; + sort_bits |= MUIV_IconList_Sort_BySize; } } if ((item = FindMenuitem(strip, MEN_WINDOW_SORT_TYPE)) != NULL) @@ -1482,7 +1482,7 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); NNSET(item, MUIA_Disabled, FALSE); if( XGET(item, MUIA_Menuitem_Checked) ) { - sort_bits |= ICONLIST_SORT_MASK; + sort_bits |= MUIV_IconList_Sort_MASK; } } if ((item = FindMenuitem(strip, MEN_WINDOW_SORT_NAME)) != NULL) @@ -1490,13 +1490,13 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); NNSET(item, MUIA_Disabled, FALSE); if( XGET(item, MUIA_Menuitem_Checked) ) { - sort_bits |= ICONLIST_SORT_BY_NAME; + sort_bits |= MUIV_IconList_Sort_ByName; } else - if ((sort_bits & ICONLIST_SORT_MASK) == 0) + if ((sort_bits & MUIV_IconList_Sort_MASK) == 0) { NNSET(item, MUIA_Menuitem_Checked, TRUE); - sort_bits |= ICONLIST_SORT_BY_NAME; + sort_bits |= MUIV_IconList_Sort_ByName; } } if ((item = FindMenuitem(strip, MEN_WINDOW_SORT_REVERSE)) != NULL) @@ -1504,7 +1504,7 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); NNSET(item, MUIA_Disabled, FALSE); if( XGET(item, MUIA_Menuitem_Checked) ) { - sort_bits |= ICONLIST_SORT_REVERSE; + sort_bits |= MUIV_IconList_Sort_Reverse; } } if ((item = FindMenuitem(strip, MEN_WINDOW_SORT_TOPDRAWERS)) != NULL) @@ -1512,7 +1512,7 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); NNSET(item, MUIA_Disabled, FALSE); if( XGET(item, MUIA_Menuitem_Checked) ) { - sort_bits &= ~ICONLIST_SORT_DRAWERS_MIXED; + sort_bits &= ~MUIV_IconList_Sort_DrawersMixed; } } D(bug("[Wanderer] %s: (enable) Setting sort flags %08x\n", __PRETTY_FUNCTION__, sort_bits)); @@ -1570,10 +1570,10 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); GET(item, MUIA_Menuitem_Checked, &checked); /*name = date and size bit both NOT set*/ - sort_bits &= ~ICONLIST_SORT_MASK; + sort_bits &= ~MUIV_IconList_Sort_MASK; if (checked == TRUE) { - sort_bits |= ICONLIST_SORT_BY_NAME; + sort_bits |= MUIV_IconList_Sort_ByName; } SET(iconList, MUIA_IconList_SortFlags, sort_bits); DoMethod(iconList, MUIM_IconList_Sort); @@ -1598,10 +1598,10 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); GET(item, MUIA_Menuitem_Checked, &checked); /*exclude size bit*/ - sort_bits &= ~ICONLIST_SORT_MASK; + sort_bits &= ~MUIV_IconList_Sort_MASK; if (checked == TRUE) { - sort_bits |= ICONLIST_SORT_BY_DATE; + sort_bits |= MUIV_IconList_Sort_ByDate; } SET(iconList, MUIA_IconList_SortFlags, sort_bits); DoMethod(iconList, MUIM_IconList_Sort); @@ -1627,11 +1627,11 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); D(bug("[Wanderer]: %s: (start) sort flags %08x\n", __PRETTY_FUNCTION__, sort_bits)); /*exclude date bit*/ - sort_bits &= ~ICONLIST_SORT_MASK; + sort_bits &= ~MUIV_IconList_Sort_MASK; if (checked == TRUE) { - sort_bits |= ICONLIST_SORT_BY_SIZE; + sort_bits |= MUIV_IconList_Sort_BySize; } D(bug("[Wanderer]: %s: (end) sort flags %08x\n", __PRETTY_FUNCTION__, sort_bits)); SET(iconList, MUIA_IconList_SortFlags, sort_bits); @@ -1657,10 +1657,10 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); GET(item, MUIA_Menuitem_Checked, &checked); /*type = all sort bits set (name+date+size) */ - sort_bits &= ~ICONLIST_SORT_MASK; + sort_bits &= ~MUIV_IconList_Sort_MASK; if (checked == TRUE) { - sort_bits |= ICONLIST_SORT_MASK; + sort_bits |= MUIV_IconList_Sort_MASK; } SET(iconList, MUIA_IconList_SortFlags, sort_bits); DoMethod(iconList, MUIM_IconList_Sort); @@ -1686,11 +1686,11 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); if (checked == TRUE) { - sort_bits |= ICONLIST_SORT_REVERSE; + sort_bits |= MUIV_IconList_Sort_Reverse; } else { - sort_bits &= ~ICONLIST_SORT_REVERSE; + sort_bits &= ~MUIV_IconList_Sort_Reverse; } SET(iconList, MUIA_IconList_SortFlags, sort_bits); @@ -1717,11 +1717,11 @@ D(bug("[Wanderer]: %s()\n", __PRETTY_FUNCTION__)); if (checked == TRUE) { - sort_bits &= ~ICONLIST_SORT_DRAWERS_MIXED; + sort_bits &= ~MUIV_IconList_Sort_DrawersMixed; } else { - sort_bits |= ICONLIST_SORT_DRAWERS_MIXED; + sort_bits |= MUIV_IconList_Sort_DrawersMixed; } SET(iconList, MUIA_IconList_SortFlags, sort_bits); @@ -2953,27 +2953,27 @@ D(bug("[Wanderer] %s: ST_USERDIR/ST_FILE\n", __PRETTY_FUNCTION__)); // } if ((current_MenuItem = FindMenuitem(current_Menustrip, MEN_WINDOW_SORT_NAME)) != NULL) { - NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & ICONLIST_SORT_MASK) == ICONLIST_SORT_BY_NAME) ? TRUE : FALSE); + NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & MUIV_IconList_Sort_MASK) == MUIV_IconList_Sort_ByName) ? TRUE : FALSE); } if ((current_MenuItem = FindMenuitem(current_Menustrip, MEN_WINDOW_SORT_DATE)) != NULL) { - NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & ICONLIST_SORT_MASK) == ICONLIST_SORT_BY_DATE) ? TRUE : FALSE); + NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & MUIV_IconList_Sort_MASK) == MUIV_IconList_Sort_ByDate) ? TRUE : FALSE); } if ((current_MenuItem = FindMenuitem(current_Menustrip, MEN_WINDOW_SORT_SIZE)) != NULL) { - NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & ICONLIST_SORT_MASK) == ICONLIST_SORT_BY_SIZE) ? TRUE : FALSE); + NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & MUIV_IconList_Sort_MASK) == MUIV_IconList_Sort_BySize) ? TRUE : FALSE); } if ((current_MenuItem = FindMenuitem(current_Menustrip, MEN_WINDOW_SORT_TYPE)) != NULL) { - NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & ICONLIST_SORT_MASK) == ICONLIST_SORT_MASK) ? TRUE : FALSE); + NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & MUIV_IconList_Sort_MASK) == MUIV_IconList_Sort_MASK) ? TRUE : FALSE); } if ((current_MenuItem = FindMenuitem(current_Menustrip, MEN_WINDOW_SORT_REVERSE)) != NULL) { - NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & ICONLIST_SORT_REVERSE) == ICONLIST_SORT_REVERSE) ? TRUE : FALSE); + NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & MUIV_IconList_Sort_Reverse) == MUIV_IconList_Sort_Reverse) ? TRUE : FALSE); } if ((current_MenuItem = FindMenuitem(current_Menustrip, MEN_WINDOW_SORT_TOPDRAWERS)) != NULL) { - NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & ICONLIST_SORT_DRAWERS_MIXED) == ICONLIST_SORT_DRAWERS_MIXED) ? FALSE : TRUE); + NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & MUIV_IconList_Sort_DrawersMixed) == MUIV_IconList_Sort_DrawersMixed) ? FALSE : TRUE); } if ((current_MenuItem = FindMenuitem(current_Menustrip, MEN_WINDOW_SORT_ENABLE)) != NULL) { @@ -2986,7 +2986,7 @@ D(bug("[Wanderer] %s: ST_USERDIR/ST_FILE\n", __PRETTY_FUNCTION__)); NNSET(current_MenuItem, MUIA_Menuitem_Enabled, TRUE); } - NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & ICONLIST_SORT_MASK) == 0) ? FALSE : TRUE); + NNSET(current_MenuItem, MUIA_Menuitem_Checked, ((current_SortFlags & MUIV_IconList_Sort_MASK) == 0) ? FALSE : TRUE); } } } -- 2.11.4.GIT