Merge pull request #17 from bluehazzard/test/issues/#14

Load images from the resource archive
yvesdm3000 · Feb 19, 2018 · 01b27ce · 01b27ce
2 parents 553ece0 + 29a7747
commit 01b27ce
Show file tree

Hide file tree

Showing 54 changed files with 89 additions and 6 deletions.
diff --git a/clanglib-msw_32.cbp b/clanglib-msw_32.cbp
@@ -19,6 +19,7 @@
 				</Compiler>
 				<ExtraCommands>
 					<Add after="zip -j9 bin/plugin/clanglib.zip resources/manifest.xml resources/ccsettings.xrc resources/clangcodecompletion_toolbar.xrc resources/clang_project_settings_dlg.xrc" />
+					<Add after="zip -9  bin/plugin/clanglib.zip images/*" />
 					<Add after="zip -jr9 bin/plugin/clanglib.cbplugin  bin/plugin/clanglib.dll  bin/plugin/clanglib.zip" />
 					<Mode after="always" />
 				</ExtraCommands>
@@ -38,6 +39,7 @@
 					<Add directory="." />
 				</Compiler>
 				<ExtraCommands>
+					<Add after="zip -9  $(#cb)/devel/share/codeblocks/clanglib.zip images/*" />
 					<Add after="zip -j9  $(#cb)/devel/share/codeblocks/clanglib.zip resources/manifest.xml resources/ccsettings.xrc resources/clangcodecompletion_toolbar.xrc resources/clang_project_settings_dlg.xrc" />
 					<Mode after="always" />
 				</ExtraCommands>

diff --git a/clanglib-msw_32_wx30.cbp b/clanglib-msw_32_wx30.cbp
@@ -23,6 +23,7 @@
 				</Linker>
 				<ExtraCommands>
 					<Add after="zip -j9 bin/plugin30/clanglib.zip resources/manifest.xml resources/ccsettings.xrc resources/clangcodecompletion_toolbar.xrc resources/clang_project_settings_dlg.xrc" />
+					<Add after="zip -9  bin/plugin30/clanglib.zip images/*" />
 					<Add after="zip -jr9 bin/plugin30/clanglib.cbplugin  bin/plugin30/clanglib.dll  bin/plugin30/clanglib.zip" />
 					<Mode after="always" />
 				</ExtraCommands>
@@ -46,6 +47,7 @@
 					<Add option="-m32" />
 				</Linker>
 				<ExtraCommands>
+					<Add after="zip -9  $(#cb)/devel30/share/codeblocks/clanglib.zip images/*" />
 					<Add after="zip -j9  $(#cb)/devel30/share/codeblocks/clanglib.zip resources/manifest.xml resources/ccsettings.xrc resources/clangcodecompletion_toolbar.xrc resources/clang_project_settings_dlg.xrc" />
 					<Mode after="always" />
 				</ExtraCommands>

diff --git a/clanglib-unix.cbp b/clanglib-unix.cbp
@@ -21,6 +21,7 @@
 				</Linker>
 				<ExtraCommands>
 					<Add after="zip -j9 bin/plugin/clanglib.zip resources/manifest.xml resources/ccsettings.xrc resources/clangcodecompletion_toolbar.xrc resources/clang_project_settings_dlg.xrc" />
+					<Add after="zip -9  bin/plugin/clanglib.zip images/*" />
 					<Add after="zip -j9 bin/plugin/clanglib.cbplugin bin/plugin/clanglib.so clanglib.zip" />
 					<Mode after="always" />
 				</ExtraCommands>
@@ -41,6 +42,7 @@
 				</Compiler>
 				<ExtraCommands>
 					<Add after="zip -j9 $(#cb)/devel/share/codeblocks/clanglib.zip resources/manifest.xml resources/ccsettings.xrc resources/clangcodecompletion_toolbar.xrc resources/clang_project_settings_dlg.xrc" />
+					<Add after="zip -9  $(#cb)/devel/share/codeblocks/clanglib.zip images/*" />
 					<Mode after="always" />
 				</ExtraCommands>
 			</Target>

diff --git a/clanglib-unix_wx30.cbp b/clanglib-unix_wx30.cbp
@@ -21,6 +21,7 @@
 				</Linker>
 				<ExtraCommands>
 					<Add after="zip -j9 bin/plugin30/clanglib.zip resources/manifest.xml resources/ccsettings.xrc resources/clangcodecompletion_toolbar.xrc resources/clang_project_settings_dlg.xrc" />
+					<Add after="zip -9  bin/plugin30/clanglib.zip images/*" />
 					<Add after="zip -j9 bin/plugin30/clanglib.cbplugin bin/plugin30/clanglib.so clanglib.zip" />
 					<Mode after="always" />
 				</ExtraCommands>
@@ -41,6 +42,7 @@
 				</Compiler>
 				<ExtraCommands>
 					<Add after="zip -j9 $(#cb)/devel30/share/codeblocks/clanglib.zip resources/manifest.xml resources/ccsettings.xrc resources/clangcodecompletion_toolbar.xrc resources/clang_project_settings_dlg.xrc" />
+					<Add after="zip -9  $(#cb)/devel30/share/codeblocks/clanglib.zip images/*" />
 					<Mode after="always" />
 				</ExtraCommands>
 			</Target>

diff --git a/images/clanglib/class.png → images/class.png b/images/clanglib/class.png → images/class.png
diff --git a/images/clanglib/class_folder.png → images/class_folder.png b/images/clanglib/class_folder.png → images/class_folder.png
diff --git a/images/clanglib/class_private.png → images/class_private.png b/images/clanglib/class_private.png → images/class_private.png
diff --git a/images/clanglib/class_protected.png → images/class_protected.png b/images/clanglib/class_protected.png → images/class_protected.png
diff --git a/images/clanglib/class_public.png → images/class_public.png b/images/clanglib/class_public.png → images/class_public.png
diff --git a/images/clanglib/cpp_lang.png → images/cpp_lang.png b/images/clanglib/cpp_lang.png → images/cpp_lang.png
diff --git a/images/clanglib/ctor_private.png → images/ctor_private.png b/images/clanglib/ctor_private.png → images/ctor_private.png
diff --git a/images/clanglib/ctor_protected.png → images/ctor_protected.png b/images/clanglib/ctor_protected.png → images/ctor_protected.png
diff --git a/images/clanglib/ctor_public.png → images/ctor_public.png b/images/clanglib/ctor_public.png → images/ctor_public.png
diff --git a/images/clanglib/dtor_private.png → images/dtor_private.png b/images/clanglib/dtor_private.png → images/dtor_private.png
diff --git a/images/clanglib/dtor_protected.png → images/dtor_protected.png b/images/clanglib/dtor_protected.png → images/dtor_protected.png
diff --git a/images/clanglib/dtor_public.png → images/dtor_public.png b/images/clanglib/dtor_public.png → images/dtor_public.png
diff --git a/images/clanglib/enum.png → images/enum.png b/images/clanglib/enum.png → images/enum.png
diff --git a/images/clanglib/enum_private.png → images/enum_private.png b/images/clanglib/enum_private.png → images/enum_private.png
diff --git a/images/clanglib/enum_protected.png → images/enum_protected.png b/images/clanglib/enum_protected.png → images/enum_protected.png
diff --git a/images/clanglib/enum_public.png → images/enum_public.png b/images/clanglib/enum_public.png → images/enum_public.png
diff --git a/images/clanglib/enumerator.png → images/enumerator.png b/images/clanglib/enumerator.png → images/enumerator.png
diff --git a/images/clanglib/enums_folder.png → images/enums_folder.png b/images/clanglib/enums_folder.png → images/enums_folder.png
diff --git a/images/clanglib/folder.png → images/folder.png b/images/clanglib/folder.png → images/folder.png
diff --git a/images/clanglib/folder_blue.png → images/folder_blue.png b/images/clanglib/folder_blue.png → images/folder_blue.png
diff --git a/images/clanglib/folder_blue_open.png → images/folder_blue_open.png b/images/clanglib/folder_blue_open.png → images/folder_blue_open.png
diff --git a/images/clanglib/folder_green.png → images/folder_green.png b/images/clanglib/folder_green.png → images/folder_green.png
diff --git a/images/clanglib/folder_green_open.png → images/folder_green_open.png b/images/clanglib/folder_green_open.png → images/folder_green_open.png
diff --git a/images/clanglib/folder_open.png → images/folder_open.png b/images/clanglib/folder_open.png → images/folder_open.png
diff --git a/images/clanglib/funcs_folder.png → images/funcs_folder.png b/images/clanglib/funcs_folder.png → images/funcs_folder.png
diff --git a/images/clanglib/hierarchy_child.png → images/hierarchy_child.png b/images/clanglib/hierarchy_child.png → images/hierarchy_child.png
diff --git a/images/clanglib/hierarchy_parent.png → images/hierarchy_parent.png b/images/clanglib/hierarchy_parent.png → images/hierarchy_parent.png
diff --git a/images/clanglib/macro_def.png → images/macro_def.png b/images/clanglib/macro_def.png → images/macro_def.png
diff --git a/images/clanglib/macro_def_folder.png → images/macro_def_folder.png b/images/clanglib/macro_def_folder.png → images/macro_def_folder.png
diff --git a/images/clanglib/macro_use.png → images/macro_use.png b/images/clanglib/macro_use.png → images/macro_use.png
diff --git a/images/clanglib/macro_use_folder.png → images/macro_use_folder.png b/images/clanglib/macro_use_folder.png → images/macro_use_folder.png
diff --git a/images/clanglib/macro_use_private.png → images/macro_use_private.png b/images/clanglib/macro_use_private.png → images/macro_use_private.png
diff --git a/images/clanglib/macro_use_protected.png → images/macro_use_protected.png b/images/clanglib/macro_use_protected.png → images/macro_use_protected.png
diff --git a/images/clanglib/macro_use_public.png → images/macro_use_public.png b/images/clanglib/macro_use_public.png → images/macro_use_public.png
diff --git a/images/clanglib/method_private.png → images/method_private.png b/images/clanglib/method_private.png → images/method_private.png
diff --git a/images/clanglib/method_protected.png → images/method_protected.png b/images/clanglib/method_protected.png → images/method_protected.png
diff --git a/images/clanglib/method_public.png → images/method_public.png b/images/clanglib/method_public.png → images/method_public.png
diff --git a/images/clanglib/namespace.png → images/namespace.png b/images/clanglib/namespace.png → images/namespace.png
diff --git a/images/clanglib/others_folder.png → images/others_folder.png b/images/clanglib/others_folder.png → images/others_folder.png
diff --git a/images/clanglib/symbols_folder.png → images/symbols_folder.png b/images/clanglib/symbols_folder.png → images/symbols_folder.png
diff --git a/images/clanglib/typedef.png → images/typedef.png b/images/clanglib/typedef.png → images/typedef.png
diff --git a/images/clanglib/typedef_private.png → images/typedef_private.png b/images/clanglib/typedef_private.png → images/typedef_private.png
diff --git a/images/clanglib/typedef_protected.png → images/typedef_protected.png b/images/clanglib/typedef_protected.png → images/typedef_protected.png
diff --git a/images/clanglib/typedef_public.png → images/typedef_public.png b/images/clanglib/typedef_public.png → images/typedef_public.png
diff --git a/images/clanglib/typedefs_folder.png → images/typedefs_folder.png b/images/clanglib/typedefs_folder.png → images/typedefs_folder.png
diff --git a/images/clanglib/var_private.png → images/var_private.png b/images/clanglib/var_private.png → images/var_private.png
diff --git a/images/clanglib/var_protected.png → images/var_protected.png b/images/clanglib/var_protected.png → images/var_protected.png
diff --git a/images/clanglib/var_public.png → images/var_public.png b/images/clanglib/var_public.png → images/var_public.png
diff --git a/images/clanglib/vars_folder.png → images/vars_folder.png b/images/clanglib/vars_folder.png → images/vars_folder.png
diff --git a/src/clangplugin.cpp b/src/clangplugin.cpp
@@ -38,15 +38,78 @@
 #include <wx/timer.h>
 #endif // CB_PRECOMP
 #include <wx/graphics.h>
+#include <wx/animate.h>
 
+#include <exception>
 #define CLANGPLUGIN_TRACE_FUNCTIONS
 
 // this auto-registers the plugin
+
+const wxString ResourceFileName(wxT("clanglib.zip"));
+
+
 namespace
 {
 
+
 PluginRegistrant<ClangPlugin> reg(wxT("ClangLib"));
 
+/** \brief Short exception class for file loading
+ */
+struct bad_file_execp : public  std::exception
+{
+    bad_file_execp(wxString msg) : m_msg(msg)    {};
+    const char* what()      { return m_msg.ToUTF8().data(); };
+    const wxString  whatStr()  { return m_msg; };
+    wxString m_msg;
+};
+
+
+/** \brief Load PNG file with the name \p name from the resource zip file
+ *
+ * \param name wxString Name of the PNG file.
+ * \return wxBitmap On success the loaded Bitmap. On error it throws a \ref bad_file_execp exception
+ *
+ */
+wxBitmap LoadPNGFromResourceFile(wxString name)
+{
+	wxFileSystem filesystem;
+	wxString filename =  wxT("file:") + ConfigManager::GetDataFolder() + wxT("/") + ResourceFileName + wxT("#zip:/") + name;
+	wxFSFile *file = filesystem.OpenFile( filename, wxFS_READ | wxFS_SEEKABLE );
+	if(file == nullptr)
+        throw bad_file_execp(_("File not found: ") + filename);
+	wxImage img;
+	img.LoadFile(*file->GetStream(), wxBITMAP_TYPE_PNG);
+	wxBitmap ret(img);
+	if(!ret.IsOk())
+        throw bad_file_execp(_("File not loaded correctly: ") + filename);
+
+	return ret;
+}
+/** \brief Load GIF file with the name \p name from the resource zip file
+ *
+ * \param name wxString Name of the PNG file.
+ * \return wxAnimation On success the loaded GIF animation. On error it throws a \ref bad_file_execp exception
+ *
+ */
+wxAnimation LoadGifFromResourceFile(wxString name)
+{
+	wxFileSystem filesystem;
+	wxString filename =  wxT("file:") + ConfigManager::GetDataFolder() + wxT("/") + ResourceFileName + wxT("#zip:/") + name;
+	wxFSFile *file = filesystem.OpenFile( filename, wxFS_READ | wxFS_SEEKABLE);
+	if(file == nullptr)
+        throw bad_file_execp(_("File not found: ") + filename);
+
+	wxAnimation ret;
+	if( ret.Load(*file->GetStream(), wxANIMATION_TYPE_GIF) == false)
+        throw bad_file_execp(_("File not loaded correctly: ") + filename);
+	if(!ret.IsOk())
+        throw bad_file_execp(_("File not loaded correctly: ") + filename);
+
+	return ret;
+}
+
+
 void AddImages(wxBitmap& directionImage, unsigned cnt, wxImageList& destList)
 {
     for (unsigned i=0; i<cnt; ++i)
@@ -136,8 +199,8 @@ ClangPlugin::ClangPlugin() :
     m_StoreIndexDBTimer(this, idStoreIndexDBTimer)
 {
     CCLogger::Get()->Init(this, g_idCCLogger, g_idCCDebugLogger, g_idCCErrorLogger);
-    if (!Manager::LoadResource(wxT("clanglib.zip")))
-        NotifyMissingFile(wxT("clanglib.zip"));
+    if (!Manager::LoadResource(ResourceFileName))
+        NotifyMissingFile(ResourceFileName);
 }
 
 ClangPlugin::~ClangPlugin()
@@ -148,7 +211,7 @@ void ClangPlugin::OnAttach()
 {
     wxBitmap bmp;
     ConfigManager* cfg = Manager::Get()->GetConfigManager(CLANG_CONFIGMANAGER);
-    wxString prefix = ConfigManager::GetDataFolder() + wxT("/images/clanglib/");
+    wxString prefix = wxT("images/");
     // bitmaps must be added by order of PARSER_IMG_* consts (which are also TokenCategory enums)
     const char* imgs[] =
     {
@@ -195,18 +258,30 @@ void ClangPlugin::OnAttach()
         "cpp_lang.png",            // tcLangKeyword
         nullptr
     };
+
+    try
+    {
+
     for (const char** itr = imgs; *itr; ++itr)
     {
-        m_ImageList.Add(cbLoadBitmap(prefix + wxString::FromUTF8(*itr), wxBITMAP_TYPE_PNG));
+        m_ImageList.Add(LoadPNGFromResourceFile(prefix + wxString::FromUTF8(*itr)));
     }
-    wxBitmap parentBitmap = cbLoadBitmap( prefix + wxT("hierarchy_parent.png"), wxBITMAP_TYPE_PNG );
+    wxBitmap parentBitmap = LoadPNGFromResourceFile( prefix + wxT("hierarchy_parent.png"));
     m_ImageListRefParentIndex = m_ImageList.GetImageCount();
 
     AddImages(parentBitmap,m_ImageListRefParentIndex,m_ImageList);
-    wxBitmap childBitmap = cbLoadBitmap( prefix + wxT("hierarchy_child.png"), wxBITMAP_TYPE_PNG );
+    wxBitmap childBitmap = LoadPNGFromResourceFile( prefix + wxT("hierarchy_child.png"));
     m_ImageListRefChildIndex = m_ImageList.GetImageCount();
     AddImages(childBitmap, m_ImageListRefParentIndex,m_ImageList);
 
+    }
+    catch(bad_file_execp& e)
+    {
+        Manager::Get()->GetLogManager()->LogError( e.whatStr() );
+    }
+
+
+
     EditorColourSet* theme = Manager::Get()->GetEditorManager()->GetColourSet();
     wxStringTokenizer tokenizer(theme->GetKeywords(theme->GetHighlightLanguage(wxT("C/C++")), 0));
     while (tokenizer.HasMoreTokens())