From c0265b1d4f347078653a7fdbbe674b812d5851d7 Mon Sep 17 00:00:00 2001 From: Rejean Loyer Date: Sun, 4 Sep 2011 11:13:55 -0400 Subject: [PATCH] explorer: fixed compile errors or whatnot. --- explorer/Explorer.epj | 25 +++++++++++++------------ explorer/res/view-showcase-left.png | Bin 0 -> 542 bytes explorer/src/Skin.ec | 6 +++--- explorer/src/Structures/ArrayUtilities.ec | 8 +++++++- 4 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 explorer/res/view-showcase-left.png diff --git a/explorer/Explorer.epj b/explorer/Explorer.epj index 66f4f52..08bb9f4 100644 --- a/explorer/Explorer.epj +++ b/explorer/Explorer.epj @@ -35,10 +35,9 @@ ], "Files" : [ { - "Folder" : "notes", + "Folder" : "extern", "Files" : [ - "Info.txt", - "Todo.txt" + ] }, { @@ -61,16 +60,18 @@ "src/Structures/ArrayUtilities.ec", "src/Skin.ec" ] - } + }, + "info.txt", + "todo.txt" ], - "ResourcesPath" : "", + "ResourcesPath" : "res", "Resources" : [ - "res/panel-tree.png", - "res/view-cards.png", - "res/view-details.png", - "res/view-icons.png", - "res/view-list.png", - "res/view-showcase-right.png", - "res/browse.png" + "panel-tree.png", + "view-cards.png", + "view-details.png", + "view-icons.png", + "view-list.png", + "view-showcase-right.png", + "browse.png" ] } \ No newline at end of file diff --git a/explorer/res/view-showcase-left.png b/explorer/res/view-showcase-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c3e85dec4e1798e94b2e2632dcd4215a07a46788 GIT binary patch literal 542 zcmV+(0^$9MP)q`}35C(A1KU!a+ zK12jXK@>_66k$;iQ51@HQS7FfnwFU6wGuV$Vw#C|@luvWiADW-&#_(4IW4ulFzmat z^UOXo^GpUMzfXLL97WGeLR_XKn;=*g{8!7y6vyS>Bj<(+BHLKWmh)_{W%m_I8`gf1 zaMrxpj}drtHQQ>~6@dHdIoL#b>w1EGrUeW(Rk8IFJL}kcodY*Ha*Gq~oas!#U`GJ% zxyJrR4!3ap4yW%@*+b3!LIzPga^#~D%5HF|nPay(6@V4pTpZx)AWe@F8RP~KCpg;1 z$qvrl<3c}|AJRBN+he+(|Jj3hC=r9RT~zl`7k~}Jv<6`3IQ>%$&!p%e#hK0AHJ~iZC!i+RN~7}=i84g1>o0Je*7#HZj>NNiT|@q#S4+sLA;Sk g+mh$YkB#rY06Ct|nEqxMO8@`>07*qoM6N<$f=bos7XSbN literal 0 HcmV?d00001 diff --git a/explorer/src/Skin.ec b/explorer/src/Skin.ec index fe5ba20..b936456 100644 --- a/explorer/src/Skin.ec +++ b/explorer/src/Skin.ec @@ -588,9 +588,9 @@ class AcovelSkin_ScrollBar : ScrollBar background = { skinBackground.r * 9 / 6, skinBackground.g * 9 / 6, skinBackground.b * 9 / 6 }; upBtn.background = Color { 70 * 6/10, 130* 6/10, 180* 6/10 }; //skinBackground; - upBtn.bitmap = { "<:ecere>elements/arrow-up.png", monochrome = true }; + upBtn.bitmap = { "<:ecere>elements/arrowUp.png", monochrome = true }; downBtn.background = Color { 70 * 6/10, 130* 6/10, 180* 6/10 }; //skinBackground; - downBtn.bitmap = { "<:ecere>elements/arrow-down.png", monochrome = true }; + downBtn.bitmap = { "<:ecere>elements/arrowDown.png", monochrome = true }; thumb.background = Color { 70 * 6/10, 130* 6/10, 180* 6/10 }; //skinBackground; } } @@ -600,7 +600,7 @@ class AcovelSkin_DropBox : DropBox void OnApplyGraphics() { PUREVTBL(DropBox)[__ecereVMethodID___ecereNameSpace__ecere__gui__Window_OnApplyGraphics](this); - button.bitmap = { "<:ecere>elements/arrow-down.png", monochrome = true }; + button.bitmap = { "<:ecere>elements/arrowDown.png", monochrome = true }; background = skinBackground; foreground = skinForeground; this.selectionColor = ::selectionColor; diff --git a/explorer/src/Structures/ArrayUtilities.ec b/explorer/src/Structures/ArrayUtilities.ec index bb305a4..040d1fe 100644 --- a/explorer/src/Structures/ArrayUtilities.ec +++ b/explorer/src/Structures/ArrayUtilities.ec @@ -6,5 +6,11 @@ private: define sizeoftype = GetTypeSize(type); int GetTypeSize(Class type) { - return type.typeSize; + // todo tocheck: is this code any good? + /*if(!strcmp(type.name, "int")) + return sizeof(int); + else if(!strcmp(type.name, "unsigned int")) + return sizeof(uint); + else + */return type.typeSize; } -- 1.8.3.1