Fixed: database explorer tree view supports HiRes views

lssssj · Sep 22, 2016 · c305993 · c305993
1 parent 07460a1
commit c305993
Show file tree

Hide file tree

Showing 18 changed files with 283 additions and 8 deletions.
diff --git a/DatabaseExplorer/DbViewerPanel.cpp b/DatabaseExplorer/DbViewerPanel.cpp
@@ -236,12 +236,12 @@ void DbViewerPanel::RefreshDbView()
     // clear items from tree
     m_treeDatabases->DeleteAllItems();
     // create imageList for icons
-    wxImageList* pImageList = new wxImageList(16, 16, true, 3);
-    pImageList->Add(m_mgr->GetStdIcons()->LoadBitmap(wxT("toolbars/16/standard/file_open"))); // folder icon
-    pImageList->Add(m_mgr->GetStdIcons()->LoadBitmap(wxT("db-explorer/16/table")));           // table icon
-    pImageList->Add(m_mgr->GetStdIcons()->LoadBitmap(wxT("toolbars/16/search/find")));        // view icon
-    pImageList->Add(m_mgr->GetStdIcons()->LoadBitmap(wxT("db-explorer/16/database")));        // database
-    pImageList->Add(m_mgr->GetStdIcons()->LoadBitmap(wxT("db-explorer/16/column")));          // column
+    wxImageList* pImageList = new wxImageList(clGetScaledSize(16), clGetScaledSize(16), true);
+    pImageList->Add(m_mgr->GetStdIcons()->LoadBitmap(wxT("folder-yellow"))); // 0, folder icon
+    pImageList->Add(m_mgr->GetStdIcons()->LoadBitmap(wxT("db-table")));      // 1, table icon
+    pImageList->Add(m_mgr->GetStdIcons()->LoadBitmap(wxT("cscope")));        // 2, view icon
+    pImageList->Add(m_mgr->GetStdIcons()->LoadBitmap(wxT("database")));      // 3, database
+    pImageList->Add(m_mgr->GetStdIcons()->LoadBitmap(wxT("db-column")));     // 4, column
 
     m_treeDatabases->AssignImageList(pImageList);
 

diff --git a/LiteEditor.workspace b/LiteEditor.workspace
@@ -302,7 +302,7 @@
       <Project Name="LLDBProtocol" ConfigName="Debug"/>
       <Project Name="AutoSave" ConfigName="Win_x64_Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Win_x64_Release" Selected="yes">
+    <WorkspaceConfiguration Name="Win_x64_Release" Selected="no">
       <Environment>WXWIN=D:\src\wxWidgets
 WXCFG=gcc_dll\mswu</Environment>
       <Project Name="abbreviation" ConfigName="Win_x64_Release"/>
@@ -352,7 +352,7 @@ WXCFG=gcc_dll\mswu</Environment>
       <Project Name="ZoomNavigator" ConfigName="Win_x64_Release"/>
       <Project Name="AutoSave" ConfigName="Win_x64_Release"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Win_x64_Debug" Selected="no">
+    <WorkspaceConfiguration Name="Win_x64_Debug" Selected="yes">
       <Environment/>
       <Project Name="abbreviation" ConfigName="Win_x64_Debug"/>
       <Project Name="CallGraph" ConfigName="Win_x64_Debug"/>

diff --git a/Runtime/codelite-bitmaps.zip b/Runtime/codelite-bitmaps.zip
diff --git a/bitmaps/16-database.png b/bitmaps/16-database.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/16-db-column.png b/bitmaps/16-db-column.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/16-db-table.png b/bitmaps/16-db-table.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-database.png b/bitmaps/24-database.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-db-column.png b/bitmaps/24-db-column.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-db-table.png b/bitmaps/24-db-table.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/svgs/database.svg b/svgs/database.svg
diff --git a/svgs/db-column.svg b/svgs/db-column.svg
diff --git a/svgs/db-table.svg b/svgs/db-table.svg