From 479c5d9b2078d49330cd9da98f93986eb11de700 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Fri, 9 Oct 2009 01:29:33 +0000 Subject: [PATCH] directories relayout (in progress) git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1035 6a642e6f-84f6-412e-ac94-c4a38d5a04b0 --- ...teRawResources.pt => createRawResources.py | 19 ++++++++---------- .../icons}/application/48x48.png | Bin .../icons}/application/64x64.png | Bin .../icons}/booktree/tree-bookinfo.png | Bin .../icons}/booktree/tree-remove.png | Bin .../icons}/booktree/tree-removetag.png | Bin .../icons}/booktree/tree-taginfo.png | Bin {icons => obsolete/icons}/toolbar/addBook.png | Bin .../icons}/toolbar/bookInfo.png | Bin .../icons}/toolbar/findNext.png | Bin .../icons}/toolbar/findPrevious.png | Bin .../icons}/toolbar/gotoHome.png | Bin .../icons}/toolbar/preferences.png | Bin {icons => obsolete/icons}/toolbar/redo.png | Bin {icons => obsolete/icons}/toolbar/rotate.png | Bin {icons => obsolete/icons}/toolbar/search.png | Bin .../icons}/toolbar/showHelp.png | Bin .../icons}/toolbar/showLibrary.png | Bin .../icons}/toolbar/showRecent.png | Bin {icons => obsolete/icons}/toolbar/toc.png | Bin {icons => obsolete/icons}/toolbar/undo.png | Bin 21 files changed, 8 insertions(+), 11 deletions(-) rename createRawResources.pt => createRawResources.py (64%) rename {icons => obsolete/icons}/application/48x48.png (100%) rename {icons => obsolete/icons}/application/64x64.png (100%) rename {icons => obsolete/icons}/booktree/tree-bookinfo.png (100%) rename {icons => obsolete/icons}/booktree/tree-remove.png (100%) rename {icons => obsolete/icons}/booktree/tree-removetag.png (100%) rename {icons => obsolete/icons}/booktree/tree-taginfo.png (100%) rename {icons => obsolete/icons}/toolbar/addBook.png (100%) rename {icons => obsolete/icons}/toolbar/bookInfo.png (100%) rename {icons => obsolete/icons}/toolbar/findNext.png (100%) rename {icons => obsolete/icons}/toolbar/findPrevious.png (100%) rename {icons => obsolete/icons}/toolbar/gotoHome.png (100%) rename {icons => obsolete/icons}/toolbar/preferences.png (100%) rename {icons => obsolete/icons}/toolbar/redo.png (100%) rename {icons => obsolete/icons}/toolbar/rotate.png (100%) rename {icons => obsolete/icons}/toolbar/search.png (100%) rename {icons => obsolete/icons}/toolbar/showHelp.png (100%) rename {icons => obsolete/icons}/toolbar/showLibrary.png (100%) rename {icons => obsolete/icons}/toolbar/showRecent.png (100%) rename {icons => obsolete/icons}/toolbar/toc.png (100%) rename {icons => obsolete/icons}/toolbar/undo.png (100%) diff --git a/createRawResources.pt b/createRawResources.py similarity index 64% rename from createRawResources.pt rename to createRawResources.py index 1fee371e2..4bafae0c5 100755 --- a/createRawResources.pt +++ b/createRawResources.py @@ -3,16 +3,14 @@ import os, sys, shutil; project_dir = sys.argv[1] -platform_dir = project_dir + "/platform/android" -raw_res_dir = platform_dir + "/res/raw" -drawable_res_dir = platform_dir + "/res/drawable" +raw_res_dir = project_dir + "/res/raw" +drawable_res_dir = project_dir + "/res/drawable" data_dir_common = project_dir + "/data" -application_icons_dir_common = project_dir + "/icons/application" -tree_icons_dir_android = platform_dir + "/icons/tree" -menu_icons_dir_android = platform_dir + "/icons/menu" -tabs_icons_dir_android = platform_dir + "/icons/tabs" -text_search_icons_dir_android = platform_dir + "/icons/text_search" -data_dir_android = platform_dir + "/data" +tree_icons_dir_android = project_dir + "/android_icons/tree" +menu_icons_dir_android = project_dir + "/android_icons/menu" +tabs_icons_dir_android = project_dir + "/android_icons/tabs" +text_search_icons_dir_android = project_dir + "/android_icons/text_search" +data_dir_android = project_dir + "/data" print os.getcwd() @@ -38,8 +36,7 @@ clean_res_dir(raw_res_dir) clean_res_dir(drawable_res_dir) process_data_dir("data__", data_dir_common, raw_res_dir) process_data_dir("data__", data_dir_android, raw_res_dir) -#shutil.copyfile(application_icons_dir_common + "/48x48.png", drawable_res_dir + "/fbreader.png") -shutil.copyfile(platform_dir + "/icons/fbreader.png", drawable_res_dir + "/fbreader.png") +shutil.copyfile(project_dir + "/android_icons/fbreader.png", drawable_res_dir + "/fbreader.png") process_data_dir("", tree_icons_dir_android, drawable_res_dir, 0) process_data_dir("", menu_icons_dir_android, drawable_res_dir, 0) process_data_dir("", tabs_icons_dir_android, drawable_res_dir, 0) diff --git a/icons/application/48x48.png b/obsolete/icons/application/48x48.png similarity index 100% rename from icons/application/48x48.png rename to obsolete/icons/application/48x48.png diff --git a/icons/application/64x64.png b/obsolete/icons/application/64x64.png similarity index 100% rename from icons/application/64x64.png rename to obsolete/icons/application/64x64.png diff --git a/icons/booktree/tree-bookinfo.png b/obsolete/icons/booktree/tree-bookinfo.png similarity index 100% rename from icons/booktree/tree-bookinfo.png rename to obsolete/icons/booktree/tree-bookinfo.png diff --git a/icons/booktree/tree-remove.png b/obsolete/icons/booktree/tree-remove.png similarity index 100% rename from icons/booktree/tree-remove.png rename to obsolete/icons/booktree/tree-remove.png diff --git a/icons/booktree/tree-removetag.png b/obsolete/icons/booktree/tree-removetag.png similarity index 100% rename from icons/booktree/tree-removetag.png rename to obsolete/icons/booktree/tree-removetag.png diff --git a/icons/booktree/tree-taginfo.png b/obsolete/icons/booktree/tree-taginfo.png similarity index 100% rename from icons/booktree/tree-taginfo.png rename to obsolete/icons/booktree/tree-taginfo.png diff --git a/icons/toolbar/addBook.png b/obsolete/icons/toolbar/addBook.png similarity index 100% rename from icons/toolbar/addBook.png rename to obsolete/icons/toolbar/addBook.png diff --git a/icons/toolbar/bookInfo.png b/obsolete/icons/toolbar/bookInfo.png similarity index 100% rename from icons/toolbar/bookInfo.png rename to obsolete/icons/toolbar/bookInfo.png diff --git a/icons/toolbar/findNext.png b/obsolete/icons/toolbar/findNext.png similarity index 100% rename from icons/toolbar/findNext.png rename to obsolete/icons/toolbar/findNext.png diff --git a/icons/toolbar/findPrevious.png b/obsolete/icons/toolbar/findPrevious.png similarity index 100% rename from icons/toolbar/findPrevious.png rename to obsolete/icons/toolbar/findPrevious.png diff --git a/icons/toolbar/gotoHome.png b/obsolete/icons/toolbar/gotoHome.png similarity index 100% rename from icons/toolbar/gotoHome.png rename to obsolete/icons/toolbar/gotoHome.png diff --git a/icons/toolbar/preferences.png b/obsolete/icons/toolbar/preferences.png similarity index 100% rename from icons/toolbar/preferences.png rename to obsolete/icons/toolbar/preferences.png diff --git a/icons/toolbar/redo.png b/obsolete/icons/toolbar/redo.png similarity index 100% rename from icons/toolbar/redo.png rename to obsolete/icons/toolbar/redo.png diff --git a/icons/toolbar/rotate.png b/obsolete/icons/toolbar/rotate.png similarity index 100% rename from icons/toolbar/rotate.png rename to obsolete/icons/toolbar/rotate.png diff --git a/icons/toolbar/search.png b/obsolete/icons/toolbar/search.png similarity index 100% rename from icons/toolbar/search.png rename to obsolete/icons/toolbar/search.png diff --git a/icons/toolbar/showHelp.png b/obsolete/icons/toolbar/showHelp.png similarity index 100% rename from icons/toolbar/showHelp.png rename to obsolete/icons/toolbar/showHelp.png diff --git a/icons/toolbar/showLibrary.png b/obsolete/icons/toolbar/showLibrary.png similarity index 100% rename from icons/toolbar/showLibrary.png rename to obsolete/icons/toolbar/showLibrary.png diff --git a/icons/toolbar/showRecent.png b/obsolete/icons/toolbar/showRecent.png similarity index 100% rename from icons/toolbar/showRecent.png rename to obsolete/icons/toolbar/showRecent.png diff --git a/icons/toolbar/toc.png b/obsolete/icons/toolbar/toc.png similarity index 100% rename from icons/toolbar/toc.png rename to obsolete/icons/toolbar/toc.png diff --git a/icons/toolbar/undo.png b/obsolete/icons/toolbar/undo.png similarity index 100% rename from icons/toolbar/undo.png rename to obsolete/icons/toolbar/undo.png