diff --git a/dlanguilib.visualdproj b/dlanguilib.visualdproj index 96e5fe2b..03b447c7 100644 --- a/dlanguilib.visualdproj +++ b/dlanguilib.visualdproj @@ -48,7 +48,7 @@ 0 $(DMDInstallDir)windows\bin\dmd.exe 3rdparty ../DerelictGL3/source ../DerelictUtil/source ../DerelictFT/source ../de_image/source/interfaces ../de_image/source/png $(SolutionDir)/../dlib - + $(SolutionDir)/views $(SolutionDir)/views/res $(SolutionDir)/views/res/i18n $(SolutionDir)/views/res/mdpi $(ConfigurationName) $(OutDir) @@ -66,7 +66,7 @@ 0 DebugFocus 0 - Unicode USE_SDL USE_OPENGL + EmbedStandardResources Unicode USE_SDL USE_OPENGL 0 0 1 diff --git a/examples/helloworld/helloworld.visualdproj b/examples/helloworld/helloworld.visualdproj index 0530db0d..9dd8c4f3 100644 --- a/examples/helloworld/helloworld.visualdproj +++ b/examples/helloworld/helloworld.visualdproj @@ -191,6 +191,6 @@ *.obj;*.cmd;*.build;*.json;*.dep - + diff --git a/src/dlangui/graphics/resources.d b/src/dlangui/graphics/resources.d index 922600de..31d10083 100644 --- a/src/dlangui/graphics/resources.d +++ b/src/dlangui/graphics/resources.d @@ -33,9 +33,50 @@ import dlangui.core.logger; import std.file; import std.algorithm; import std.xml; -import std.algorithm; import std.conv; +import std.string; +import std.path; +struct EmbeddedResource { + string name; + ubyte[] data; +} + +struct EmbeddedResourceList { + private EmbeddedResource[] list; + void addResources(EmbeddedResource[] resources) { + list ~= resources; + } +} + +__gshared EmbeddedResourceList embeddedResourceList; + +EmbeddedResource[] embedResource(string resourceName)() { + static if ((baseName(resourceName)).length > 0) + return [EmbeddedResource(resourceName, cast(ubyte[])import(baseName(resourceName)))]; + else + return []; +} + +/// embed all resources from list +EmbeddedResource[] embedResources(string[] resourceNames)() { + static if (resourceNames.length == 0) + return []; + else + return embedResource!(resourceNames[0])() ~ embedResources!(resourceNames[1..$])(); +} + +/// embed all resources from list +EmbeddedResource[] embedResourcesFromList(string resourceList)() { + return embedResources!(split(import(resourceList), "\n"))(); +} + + +__gshared static this() { + version (EmbedStandardResources) { + embeddedResourceList.addResources(embedResourcesFromList!("standard_resources.list")()); + } +} class Drawable : RefCountedObject { //private static int _instanceCount; diff --git a/src/dlangui/platforms/common/platform.d b/src/dlangui/platforms/common/platform.d index c80e65bc..364d7619 100644 --- a/src/dlangui/platforms/common/platform.d +++ b/src/dlangui/platforms/common/platform.d @@ -845,14 +845,16 @@ version (Windows) { /// put "mixin APP_ENTRY_POINT;" to main module of your dlangui based app mixin template APP_ENTRY_POINT() { version (linux) { - //pragma(lib, "png"); - pragma(lib, "xcb"); - pragma(lib, "xcb-shm"); - pragma(lib, "xcb-image"); - pragma(lib, "xcb-keysyms"); - pragma(lib, "X11-xcb"); - pragma(lib, "X11"); - pragma(lib, "dl"); + version (USE_XCB) { + //pragma(lib, "png"); + pragma(lib, "xcb"); + pragma(lib, "xcb-shm"); + pragma(lib, "xcb-image"); + pragma(lib, "xcb-keysyms"); + pragma(lib, "X11-xcb"); + pragma(lib, "X11"); + pragma(lib, "dl"); + } } /// workaround for link issue when WinMain is located in library diff --git a/res/btn_background.xml b/views/res/btn_background.xml similarity index 100% rename from res/btn_background.xml rename to views/res/btn_background.xml diff --git a/res/btn_background_transparent.xml b/views/res/btn_background_transparent.xml similarity index 100% rename from res/btn_background_transparent.xml rename to views/res/btn_background_transparent.xml diff --git a/res/btn_check.xml b/views/res/btn_check.xml similarity index 100% rename from res/btn_check.xml rename to views/res/btn_check.xml diff --git a/res/btn_default_normal.9.png b/views/res/btn_default_normal.9.png similarity index 100% rename from res/btn_default_normal.9.png rename to views/res/btn_default_normal.9.png diff --git a/res/btn_default_pressed.9.png b/views/res/btn_default_pressed.9.png similarity index 100% rename from res/btn_default_pressed.9.png rename to views/res/btn_default_pressed.9.png diff --git a/res/btn_default_selected.9.png b/views/res/btn_default_selected.9.png similarity index 100% rename from res/btn_default_selected.9.png rename to views/res/btn_default_selected.9.png diff --git a/res/btn_default_small.xml b/views/res/btn_default_small.xml similarity index 100% rename from res/btn_default_small.xml rename to views/res/btn_default_small.xml diff --git a/res/btn_default_small_transparent.xml b/views/res/btn_default_small_transparent.xml similarity index 100% rename from res/btn_default_small_transparent.xml rename to views/res/btn_default_small_transparent.xml diff --git a/res/btn_radio.xml b/views/res/btn_radio.xml similarity index 100% rename from res/btn_radio.xml rename to views/res/btn_radio.xml diff --git a/res/btn_radio_background.xml b/views/res/btn_radio_background.xml similarity index 100% rename from res/btn_radio_background.xml rename to views/res/btn_radio_background.xml diff --git a/res/close.png b/views/res/close.png similarity index 100% rename from res/close.png rename to views/res/close.png diff --git a/res/combobox_background.xml b/views/res/combobox_background.xml similarity index 100% rename from res/combobox_background.xml rename to views/res/combobox_background.xml diff --git a/res/editbox_background.xml b/views/res/editbox_background.xml similarity index 100% rename from res/editbox_background.xml rename to views/res/editbox_background.xml diff --git a/res/exit.png b/views/res/exit.png similarity index 100% rename from res/exit.png rename to views/res/exit.png diff --git a/res/fileclose.png b/views/res/fileclose.png similarity index 100% rename from res/fileclose.png rename to views/res/fileclose.png diff --git a/res/fileopen.png b/views/res/fileopen.png similarity index 100% rename from res/fileopen.png rename to views/res/fileopen.png diff --git a/res/frame_blue.9.png b/views/res/frame_blue.9.png similarity index 100% rename from res/frame_blue.9.png rename to views/res/frame_blue.9.png diff --git a/res/i18n/en.ini b/views/res/i18n/en.ini similarity index 100% rename from res/i18n/en.ini rename to views/res/i18n/en.ini diff --git a/res/i18n/ru.ini b/views/res/i18n/ru.ini similarity index 100% rename from res/i18n/ru.ini rename to views/res/i18n/ru.ini diff --git a/res/list_item_background.xml b/views/res/list_item_background.xml similarity index 100% rename from res/list_item_background.xml rename to views/res/list_item_background.xml diff --git a/res/list_item_background_solid.xml b/views/res/list_item_background_solid.xml similarity index 100% rename from res/list_item_background_solid.xml rename to views/res/list_item_background_solid.xml diff --git a/res/main_menu_item_background.xml b/views/res/main_menu_item_background.xml similarity index 100% rename from res/main_menu_item_background.xml rename to views/res/main_menu_item_background.xml diff --git a/res/main_menu_item_background_hover.9.png b/views/res/main_menu_item_background_hover.9.png similarity index 100% rename from res/main_menu_item_background_hover.9.png rename to views/res/main_menu_item_background_hover.9.png diff --git a/res/main_menu_item_background_normal.9.png b/views/res/main_menu_item_background_normal.9.png similarity index 100% rename from res/main_menu_item_background_normal.9.png rename to views/res/main_menu_item_background_normal.9.png diff --git a/res/main_menu_item_background_selected.9.png b/views/res/main_menu_item_background_selected.9.png similarity index 100% rename from res/main_menu_item_background_selected.9.png rename to views/res/main_menu_item_background_selected.9.png diff --git a/res/mdpi/arrow_right_down_black.png b/views/res/mdpi/arrow_right_down_black.png similarity index 100% rename from res/mdpi/arrow_right_down_black.png rename to views/res/mdpi/arrow_right_down_black.png diff --git a/res/mdpi/arrow_right_hollow.png b/views/res/mdpi/arrow_right_hollow.png similarity index 100% rename from res/mdpi/arrow_right_hollow.png rename to views/res/mdpi/arrow_right_hollow.png diff --git a/res/mdpi/btn_check_off.png b/views/res/mdpi/btn_check_off.png similarity index 100% rename from res/mdpi/btn_check_off.png rename to views/res/mdpi/btn_check_off.png diff --git a/res/mdpi/btn_check_off_disabled.png b/views/res/mdpi/btn_check_off_disabled.png similarity index 100% rename from res/mdpi/btn_check_off_disabled.png rename to views/res/mdpi/btn_check_off_disabled.png diff --git a/res/mdpi/btn_check_off_focused.png b/views/res/mdpi/btn_check_off_focused.png similarity index 100% rename from res/mdpi/btn_check_off_focused.png rename to views/res/mdpi/btn_check_off_focused.png diff --git a/res/mdpi/btn_check_off_pressed.png b/views/res/mdpi/btn_check_off_pressed.png similarity index 100% rename from res/mdpi/btn_check_off_pressed.png rename to views/res/mdpi/btn_check_off_pressed.png diff --git a/res/mdpi/btn_check_on.png b/views/res/mdpi/btn_check_on.png similarity index 100% rename from res/mdpi/btn_check_on.png rename to views/res/mdpi/btn_check_on.png diff --git a/res/mdpi/btn_check_on_disabled.png b/views/res/mdpi/btn_check_on_disabled.png similarity index 100% rename from res/mdpi/btn_check_on_disabled.png rename to views/res/mdpi/btn_check_on_disabled.png diff --git a/res/mdpi/btn_check_on_focused.png b/views/res/mdpi/btn_check_on_focused.png similarity index 100% rename from res/mdpi/btn_check_on_focused.png rename to views/res/mdpi/btn_check_on_focused.png diff --git a/res/mdpi/btn_check_on_pressed.png b/views/res/mdpi/btn_check_on_pressed.png similarity index 100% rename from res/mdpi/btn_check_on_pressed.png rename to views/res/mdpi/btn_check_on_pressed.png diff --git a/res/mdpi/btn_default.9.png b/views/res/mdpi/btn_default.9.png similarity index 100% rename from res/mdpi/btn_default.9.png rename to views/res/mdpi/btn_default.9.png diff --git a/res/mdpi/btn_default_small_normal.9.png b/views/res/mdpi/btn_default_small_normal.9.png similarity index 100% rename from res/mdpi/btn_default_small_normal.9.png rename to views/res/mdpi/btn_default_small_normal.9.png diff --git a/res/mdpi/btn_default_small_normal_disable.9.png b/views/res/mdpi/btn_default_small_normal_disable.9.png similarity index 100% rename from res/mdpi/btn_default_small_normal_disable.9.png rename to views/res/mdpi/btn_default_small_normal_disable.9.png diff --git a/res/mdpi/btn_default_small_normal_disable_focused.9.png b/views/res/mdpi/btn_default_small_normal_disable_focused.9.png similarity index 100% rename from res/mdpi/btn_default_small_normal_disable_focused.9.png rename to views/res/mdpi/btn_default_small_normal_disable_focused.9.png diff --git a/res/mdpi/btn_default_small_pressed.9.png b/views/res/mdpi/btn_default_small_pressed.9.png similarity index 100% rename from res/mdpi/btn_default_small_pressed.9.png rename to views/res/mdpi/btn_default_small_pressed.9.png diff --git a/res/mdpi/btn_default_small_selected.9.png b/views/res/mdpi/btn_default_small_selected.9.png similarity index 100% rename from res/mdpi/btn_default_small_selected.9.png rename to views/res/mdpi/btn_default_small_selected.9.png diff --git a/res/mdpi/btn_disabled.9.png b/views/res/mdpi/btn_disabled.9.png similarity index 100% rename from res/mdpi/btn_disabled.9.png rename to views/res/mdpi/btn_disabled.9.png diff --git a/res/mdpi/btn_hover.9.png b/views/res/mdpi/btn_hover.9.png similarity index 100% rename from res/mdpi/btn_hover.9.png rename to views/res/mdpi/btn_hover.9.png diff --git a/res/mdpi/btn_normal.9.png b/views/res/mdpi/btn_normal.9.png similarity index 100% rename from res/mdpi/btn_normal.9.png rename to views/res/mdpi/btn_normal.9.png diff --git a/res/mdpi/btn_pressed.9.png b/views/res/mdpi/btn_pressed.9.png similarity index 100% rename from res/mdpi/btn_pressed.9.png rename to views/res/mdpi/btn_pressed.9.png diff --git a/res/mdpi/btn_radio_off.png b/views/res/mdpi/btn_radio_off.png similarity index 100% rename from res/mdpi/btn_radio_off.png rename to views/res/mdpi/btn_radio_off.png diff --git a/res/mdpi/btn_radio_off_disabled.png b/views/res/mdpi/btn_radio_off_disabled.png similarity index 100% rename from res/mdpi/btn_radio_off_disabled.png rename to views/res/mdpi/btn_radio_off_disabled.png diff --git a/res/mdpi/btn_radio_off_focused.png b/views/res/mdpi/btn_radio_off_focused.png similarity index 100% rename from res/mdpi/btn_radio_off_focused.png rename to views/res/mdpi/btn_radio_off_focused.png diff --git a/res/mdpi/btn_radio_off_pressed.png b/views/res/mdpi/btn_radio_off_pressed.png similarity index 100% rename from res/mdpi/btn_radio_off_pressed.png rename to views/res/mdpi/btn_radio_off_pressed.png diff --git a/res/mdpi/btn_radio_on.png b/views/res/mdpi/btn_radio_on.png similarity index 100% rename from res/mdpi/btn_radio_on.png rename to views/res/mdpi/btn_radio_on.png diff --git a/res/mdpi/btn_radio_on_disabled.png b/views/res/mdpi/btn_radio_on_disabled.png similarity index 100% rename from res/mdpi/btn_radio_on_disabled.png rename to views/res/mdpi/btn_radio_on_disabled.png diff --git a/res/mdpi/btn_radio_on_focused.png b/views/res/mdpi/btn_radio_on_focused.png similarity index 100% rename from res/mdpi/btn_radio_on_focused.png rename to views/res/mdpi/btn_radio_on_focused.png diff --git a/res/mdpi/btn_radio_on_pressed.png b/views/res/mdpi/btn_radio_on_pressed.png similarity index 100% rename from res/mdpi/btn_radio_on_pressed.png rename to views/res/mdpi/btn_radio_on_pressed.png diff --git a/res/mdpi/computer.png b/views/res/mdpi/computer.png similarity index 100% rename from res/mdpi/computer.png rename to views/res/mdpi/computer.png diff --git a/res/mdpi/dlangui-logo1.png b/views/res/mdpi/dlangui-logo1.png similarity index 100% rename from res/mdpi/dlangui-logo1.png rename to views/res/mdpi/dlangui-logo1.png diff --git a/res/mdpi/drive-harddisk.png b/views/res/mdpi/drive-harddisk.png similarity index 100% rename from res/mdpi/drive-harddisk.png rename to views/res/mdpi/drive-harddisk.png diff --git a/res/mdpi/drive-optical.png b/views/res/mdpi/drive-optical.png similarity index 100% rename from res/mdpi/drive-optical.png rename to views/res/mdpi/drive-optical.png diff --git a/res/mdpi/drive-removable-media.png b/views/res/mdpi/drive-removable-media.png similarity index 100% rename from res/mdpi/drive-removable-media.png rename to views/res/mdpi/drive-removable-media.png diff --git a/res/mdpi/editbox_background_disabled.9.png b/views/res/mdpi/editbox_background_disabled.9.png similarity index 100% rename from res/mdpi/editbox_background_disabled.9.png rename to views/res/mdpi/editbox_background_disabled.9.png diff --git a/res/mdpi/editbox_background_disabled_focus.9.png b/views/res/mdpi/editbox_background_disabled_focus.9.png similarity index 100% rename from res/mdpi/editbox_background_disabled_focus.9.png rename to views/res/mdpi/editbox_background_disabled_focus.9.png diff --git a/res/mdpi/editbox_background_focus.9.png b/views/res/mdpi/editbox_background_focus.9.png similarity index 100% rename from res/mdpi/editbox_background_focus.9.png rename to views/res/mdpi/editbox_background_focus.9.png diff --git a/res/mdpi/editbox_background_normal.9.png b/views/res/mdpi/editbox_background_normal.9.png similarity index 100% rename from res/mdpi/editbox_background_normal.9.png rename to views/res/mdpi/editbox_background_normal.9.png diff --git a/res/mdpi/folder-blue.png b/views/res/mdpi/folder-blue.png similarity index 100% rename from res/mdpi/folder-blue.png rename to views/res/mdpi/folder-blue.png diff --git a/res/mdpi/folder-bookmark.png b/views/res/mdpi/folder-bookmark.png similarity index 100% rename from res/mdpi/folder-bookmark.png rename to views/res/mdpi/folder-bookmark.png diff --git a/res/mdpi/folder-network.png b/views/res/mdpi/folder-network.png similarity index 100% rename from res/mdpi/folder-network.png rename to views/res/mdpi/folder-network.png diff --git a/res/mdpi/folder.png b/views/res/mdpi/folder.png similarity index 100% rename from res/mdpi/folder.png rename to views/res/mdpi/folder.png diff --git a/res/mdpi/media-flash-sd-mmc.png b/views/res/mdpi/media-flash-sd-mmc.png similarity index 100% rename from res/mdpi/media-flash-sd-mmc.png rename to views/res/mdpi/media-flash-sd-mmc.png diff --git a/res/mdpi/tab_btn_dark_up_focused.9.png b/views/res/mdpi/tab_btn_dark_up_focused.9.png similarity index 100% rename from res/mdpi/tab_btn_dark_up_focused.9.png rename to views/res/mdpi/tab_btn_dark_up_focused.9.png diff --git a/res/mdpi/tab_btn_dark_up_focused_selected.9.png b/views/res/mdpi/tab_btn_dark_up_focused_selected.9.png similarity index 100% rename from res/mdpi/tab_btn_dark_up_focused_selected.9.png rename to views/res/mdpi/tab_btn_dark_up_focused_selected.9.png diff --git a/res/mdpi/tab_btn_dark_up_hover.9.png b/views/res/mdpi/tab_btn_dark_up_hover.9.png similarity index 100% rename from res/mdpi/tab_btn_dark_up_hover.9.png rename to views/res/mdpi/tab_btn_dark_up_hover.9.png diff --git a/res/mdpi/tab_btn_dark_up_normal.9.png b/views/res/mdpi/tab_btn_dark_up_normal.9.png similarity index 100% rename from res/mdpi/tab_btn_dark_up_normal.9.png rename to views/res/mdpi/tab_btn_dark_up_normal.9.png diff --git a/res/mdpi/tab_btn_dark_up_selected.9.png b/views/res/mdpi/tab_btn_dark_up_selected.9.png similarity index 100% rename from res/mdpi/tab_btn_dark_up_selected.9.png rename to views/res/mdpi/tab_btn_dark_up_selected.9.png diff --git a/res/mdpi/tab_up_background_dark_focused.9.png b/views/res/mdpi/tab_up_background_dark_focused.9.png similarity index 100% rename from res/mdpi/tab_up_background_dark_focused.9.png rename to views/res/mdpi/tab_up_background_dark_focused.9.png diff --git a/res/mdpi/tab_up_background_dark_normal.9.png b/views/res/mdpi/tab_up_background_dark_normal.9.png similarity index 100% rename from res/mdpi/tab_up_background_dark_normal.9.png rename to views/res/mdpi/tab_up_background_dark_normal.9.png diff --git a/res/mdpi/text-plain.png b/views/res/mdpi/text-plain.png similarity index 100% rename from res/mdpi/text-plain.png rename to views/res/mdpi/text-plain.png diff --git a/res/mdpi/toolbar_background.9.png b/views/res/mdpi/toolbar_background.9.png similarity index 100% rename from res/mdpi/toolbar_background.9.png rename to views/res/mdpi/toolbar_background.9.png diff --git a/res/mdpi/toolbar_button_hover.9.png b/views/res/mdpi/toolbar_button_hover.9.png similarity index 100% rename from res/mdpi/toolbar_button_hover.9.png rename to views/res/mdpi/toolbar_button_hover.9.png diff --git a/res/mdpi/toolbar_button_pressed.9.png b/views/res/mdpi/toolbar_button_pressed.9.png similarity index 100% rename from res/mdpi/toolbar_button_pressed.9.png rename to views/res/mdpi/toolbar_button_pressed.9.png diff --git a/res/mdpi/toolbar_control_disabled.9.png b/views/res/mdpi/toolbar_control_disabled.9.png similarity index 100% rename from res/mdpi/toolbar_control_disabled.9.png rename to views/res/mdpi/toolbar_control_disabled.9.png diff --git a/res/mdpi/toolbar_control_normal.9.png b/views/res/mdpi/toolbar_control_normal.9.png similarity index 100% rename from res/mdpi/toolbar_control_normal.9.png rename to views/res/mdpi/toolbar_control_normal.9.png diff --git a/res/mdpi/toolbar_separator.png b/views/res/mdpi/toolbar_separator.png similarity index 100% rename from res/mdpi/toolbar_separator.png rename to views/res/mdpi/toolbar_separator.png diff --git a/res/mdpi/user-home.png b/views/res/mdpi/user-home.png similarity index 100% rename from res/mdpi/user-home.png rename to views/res/mdpi/user-home.png diff --git a/res/menu_item_background.xml b/views/res/menu_item_background.xml similarity index 100% rename from res/menu_item_background.xml rename to views/res/menu_item_background.xml diff --git a/res/popup_menu_background_normal.9.png b/views/res/popup_menu_background_normal.9.png similarity index 100% rename from res/popup_menu_background_normal.9.png rename to views/res/popup_menu_background_normal.9.png diff --git a/res/scrollbar_btn_down.png b/views/res/scrollbar_btn_down.png similarity index 100% rename from res/scrollbar_btn_down.png rename to views/res/scrollbar_btn_down.png diff --git a/res/scrollbar_btn_left.png b/views/res/scrollbar_btn_left.png similarity index 100% rename from res/scrollbar_btn_left.png rename to views/res/scrollbar_btn_left.png diff --git a/res/scrollbar_btn_right.png b/views/res/scrollbar_btn_right.png similarity index 100% rename from res/scrollbar_btn_right.png rename to views/res/scrollbar_btn_right.png diff --git a/res/scrollbar_btn_up.png b/views/res/scrollbar_btn_up.png similarity index 100% rename from res/scrollbar_btn_up.png rename to views/res/scrollbar_btn_up.png diff --git a/res/scrollbar_indicator_horizontal.png b/views/res/scrollbar_indicator_horizontal.png similarity index 100% rename from res/scrollbar_indicator_horizontal.png rename to views/res/scrollbar_indicator_horizontal.png diff --git a/res/scrollbar_indicator_vertical.png b/views/res/scrollbar_indicator_vertical.png similarity index 100% rename from res/scrollbar_indicator_vertical.png rename to views/res/scrollbar_indicator_vertical.png diff --git a/res/tab_btn_dark_up.xml b/views/res/tab_btn_dark_up.xml similarity index 100% rename from res/tab_btn_dark_up.xml rename to views/res/tab_btn_dark_up.xml diff --git a/res/tab_btn_normal.9.png b/views/res/tab_btn_normal.9.png similarity index 100% rename from res/tab_btn_normal.9.png rename to views/res/tab_btn_normal.9.png diff --git a/res/tab_btn_up.xml b/views/res/tab_btn_up.xml similarity index 100% rename from res/tab_btn_up.xml rename to views/res/tab_btn_up.xml diff --git a/res/tab_btn_up_focused.9.png b/views/res/tab_btn_up_focused.9.png similarity index 100% rename from res/tab_btn_up_focused.9.png rename to views/res/tab_btn_up_focused.9.png diff --git a/res/tab_btn_up_focused_selected.9.png b/views/res/tab_btn_up_focused_selected.9.png similarity index 100% rename from res/tab_btn_up_focused_selected.9.png rename to views/res/tab_btn_up_focused_selected.9.png diff --git a/res/tab_btn_up_hover.9.png b/views/res/tab_btn_up_hover.9.png similarity index 100% rename from res/tab_btn_up_hover.9.png rename to views/res/tab_btn_up_hover.9.png diff --git a/res/tab_btn_up_normal.9.png b/views/res/tab_btn_up_normal.9.png similarity index 100% rename from res/tab_btn_up_normal.9.png rename to views/res/tab_btn_up_normal.9.png diff --git a/res/tab_btn_up_selected.9.png b/views/res/tab_btn_up_selected.9.png similarity index 100% rename from res/tab_btn_up_selected.9.png rename to views/res/tab_btn_up_selected.9.png diff --git a/res/tab_more.png b/views/res/tab_more.png similarity index 100% rename from res/tab_more.png rename to views/res/tab_more.png diff --git a/res/tab_up_background.9.png b/views/res/tab_up_background.9.png similarity index 100% rename from res/tab_up_background.9.png rename to views/res/tab_up_background.9.png diff --git a/res/tab_up_background_dark.xml b/views/res/tab_up_background_dark.xml similarity index 100% rename from res/tab_up_background_dark.xml rename to views/res/tab_up_background_dark.xml diff --git a/res/tab_up_background_focused.9.png b/views/res/tab_up_background_focused.9.png similarity index 100% rename from res/tab_up_background_focused.9.png rename to views/res/tab_up_background_focused.9.png diff --git a/res/tab_up_background_selected.9.png b/views/res/tab_up_background_selected.9.png similarity index 100% rename from res/tab_up_background_selected.9.png rename to views/res/tab_up_background_selected.9.png diff --git a/res/theme_default.xml b/views/res/theme_default.xml similarity index 100% rename from res/theme_default.xml rename to views/res/theme_default.xml diff --git a/res/toolbar_button_background.xml b/views/res/toolbar_button_background.xml similarity index 100% rename from res/toolbar_button_background.xml rename to views/res/toolbar_button_background.xml diff --git a/res/toolbar_control_background.xml b/views/res/toolbar_control_background.xml similarity index 100% rename from res/toolbar_control_background.xml rename to views/res/toolbar_control_background.xml diff --git a/res/transparent_button_background.xml b/views/res/transparent_button_background.xml similarity index 100% rename from res/transparent_button_background.xml rename to views/res/transparent_button_background.xml diff --git a/views/standard_resources.list b/views/standard_resources.list new file mode 100644 index 00000000..ca61059a --- /dev/null +++ b/views/standard_resources.list @@ -0,0 +1,107 @@ +res/btn_background.xml +res/btn_background_transparent.xml +res/btn_check.xml +res/btn_default_normal.9.png +res/btn_default_pressed.9.png +res/btn_default_selected.9.png +res/btn_default_small.xml +res/btn_default_small_transparent.xml +res/btn_radio.xml +res/btn_radio_background.xml +res/close.png +res/combobox_background.xml +res/editbox_background.xml +res/exit.png +res/fileclose.png +res/fileopen.png +res/frame_blue.9.png +res/i18n/en.ini +res/i18n/ru.ini +res/list_item_background.xml +res/list_item_background_solid.xml +res/main_menu_item_background.xml +res/main_menu_item_background_hover.9.png +res/main_menu_item_background_normal.9.png +res/main_menu_item_background_selected.9.png +res/mdpi/arrow_right_down_black.png +res/mdpi/arrow_right_hollow.png +res/mdpi/btn_check_off.png +res/mdpi/btn_check_off_disabled.png +res/mdpi/btn_check_off_focused.png +res/mdpi/btn_check_off_pressed.png +res/mdpi/btn_check_on.png +res/mdpi/btn_check_on_disabled.png +res/mdpi/btn_check_on_focused.png +res/mdpi/btn_check_on_pressed.png +res/mdpi/btn_default.9.png +res/mdpi/btn_default_small_normal.9.png +res/mdpi/btn_default_small_normal_disable.9.png +res/mdpi/btn_default_small_normal_disable_focused.9.png +res/mdpi/btn_default_small_pressed.9.png +res/mdpi/btn_default_small_selected.9.png +res/mdpi/btn_disabled.9.png +res/mdpi/btn_hover.9.png +res/mdpi/btn_normal.9.png +res/mdpi/btn_pressed.9.png +res/mdpi/btn_radio_off.png +res/mdpi/btn_radio_off_disabled.png +res/mdpi/btn_radio_off_focused.png +res/mdpi/btn_radio_off_pressed.png +res/mdpi/btn_radio_on.png +res/mdpi/btn_radio_on_disabled.png +res/mdpi/btn_radio_on_focused.png +res/mdpi/btn_radio_on_pressed.png +res/mdpi/computer.png +res/mdpi/dlangui-logo1.png +res/mdpi/drive-harddisk.png +res/mdpi/drive-optical.png +res/mdpi/drive-removable-media.png +res/mdpi/editbox_background_disabled.9.png +res/mdpi/editbox_background_disabled_focus.9.png +res/mdpi/editbox_background_focus.9.png +res/mdpi/editbox_background_normal.9.png +res/mdpi/folder-blue.png +res/mdpi/folder-bookmark.png +res/mdpi/folder-network.png +res/mdpi/folder.png +res/mdpi/media-flash-sd-mmc.png +res/mdpi/tab_btn_dark_up_focused.9.png +res/mdpi/tab_btn_dark_up_focused_selected.9.png +res/mdpi/tab_btn_dark_up_hover.9.png +res/mdpi/tab_btn_dark_up_normal.9.png +res/mdpi/tab_btn_dark_up_selected.9.png +res/mdpi/tab_up_background_dark_focused.9.png +res/mdpi/tab_up_background_dark_normal.9.png +res/mdpi/text-plain.png +res/mdpi/toolbar_background.9.png +res/mdpi/toolbar_button_hover.9.png +res/mdpi/toolbar_button_pressed.9.png +res/mdpi/toolbar_control_disabled.9.png +res/mdpi/toolbar_control_normal.9.png +res/mdpi/toolbar_separator.png +res/mdpi/user-home.png +res/menu_item_background.xml +res/popup_menu_background_normal.9.png +res/scrollbar_btn_down.png +res/scrollbar_btn_left.png +res/scrollbar_btn_right.png +res/scrollbar_btn_up.png +res/scrollbar_indicator_horizontal.png +res/scrollbar_indicator_vertical.png +res/tab_btn_dark_up.xml +res/tab_btn_normal.9.png +res/tab_btn_up.xml +res/tab_btn_up_focused.9.png +res/tab_btn_up_focused_selected.9.png +res/tab_btn_up_hover.9.png +res/tab_btn_up_normal.9.png +res/tab_btn_up_selected.9.png +res/tab_more.png +res/tab_up_background.9.png +res/tab_up_background_dark.xml +res/tab_up_background_focused.9.png +res/tab_up_background_selected.9.png +res/theme_default.xml +res/toolbar_button_background.xml +res/toolbar_control_background.xml +res/transparent_button_background.xml