More icons update

lssssj · Nov 6, 2015 · aac2488 · aac2488
1 parent ac9a3b8
commit aac2488
Show file tree

Hide file tree

Showing 38 changed files with 652 additions and 132 deletions.
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
@@ -279,7 +279,7 @@
       <Project Name="WebTools" ConfigName="DebugUnicode"/>
       <Project Name="HelpPlugin" ConfigName="Win_x64_Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Win_x64_Release" Selected="no">
+    <WorkspaceConfiguration Name="Win_x64_Release" Selected="yes">
       <Project Name="abbreviation" ConfigName="Win_x64_Release"/>
       <Project Name="CallGraph" ConfigName="Win_x64_Release"/>
       <Project Name="CMakePlugin" ConfigName="Win_x64_Release"/>
@@ -324,7 +324,7 @@
       <Project Name="wxsqlite3" ConfigName="Win_x64_Release"/>
       <Project Name="ZoomNavigator" ConfigName="Win_x64_Release"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Win_x64_Debug" Selected="yes">
+    <WorkspaceConfiguration Name="Win_x64_Debug" Selected="no">
       <Project Name="abbreviation" ConfigName="Win_x64_Debug"/>
       <Project Name="CallGraph" ConfigName="Win_x64_Debug"/>
       <Project Name="CMakePlugin" ConfigName="Win_x64_Debug"/>

diff --git a/LiteEditor/findresultstab.cpp b/LiteEditor/findresultstab.cpp
@@ -87,11 +87,11 @@ FindResultsTab::FindResultsTab(wxWindow* parent, wxWindowID id, const wxString&
 
     m_tb->AddTool(XRCID("stop_search"),
                   _("Stop current search"),
-                  loader.LoadBitmap(wxT("toolbars/16/build/stop")),
+                  loader.LoadBitmap("stop"),
                   _("Stop current search"));
     m_tb->AddTool(XRCID("recent_searches"),
                   _("Show Recent Searches"),
-                  loader.LoadBitmap(wxT("output-pane/16/history")),
+                  loader.LoadBitmap("history"),
                   _("Show Recent Searches"))->SetHasDropDown(true);
 
     Connect(XRCID("stop_search"),

diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
diff --git a/LiteEditor/outputtabwindow.cpp b/LiteEditor/outputtabwindow.cpp
@@ -170,7 +170,7 @@ void OutputTabWindow::CreateGUIControls()
 
     m_vSizer = new wxBoxSizer(wxVERTICAL);
 
-    // Create the default scintilla control
+// Create the default scintilla control
 #ifdef __WXGTK__
     m_sci = new wxStyledTextCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER);
 #else
@@ -188,39 +188,28 @@ void OutputTabWindow::CreateGUIControls()
     BitmapLoader* bmpLoader = PluginManager::Get()->GetStdIcons();
 
     // Create the toolbar
-    m_tb = new wxAuiToolBar(
-        this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_PLAIN_BACKGROUND);
+    m_tb = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_PLAIN_BACKGROUND);
     m_tb->SetToolBitmapSize(wxSize(16, 16));
-    
+
     m_tb->AddTool(XRCID("hold_pane_open"),
                   _("Keep open"),
-                  bmpLoader->LoadBitmap(wxT("output-pane/16/ToolPin")),
+                  bmpLoader->LoadBitmap("ToolPin"),
                   _("Don't close this pane when an editor gets focus"),
                   wxITEM_CHECK);
 
     m_tb->AddTool(XRCID("scroll_on_output"),
                   _("Scroll on Output"),
-                  wxXmlResource::Get()->LoadBitmap(wxT("link_editor")),
+                  bmpLoader->LoadBitmap("link_editor"),
                   _("Scroll on Output"),
                   wxITEM_CHECK);
     m_tb->ToggleTool(XRCID("scroll_on_output"), m_outputScrolls);
 
-    m_tb->AddTool(XRCID("word_wrap_output"),
-                  _("Word Wrap"),
-                  wxXmlResource::Get()->LoadBitmap(wxT("word_wrap")),
-                  _("Word Wrap"),
-                  wxITEM_CHECK);
-
     m_tb->AddTool(
-        XRCID("clear_all_output"), _("Clear All"), bmpLoader->LoadBitmap(wxT("output-pane/16/clear")), _("Clear All"));
+        XRCID("word_wrap_output"), _("Word Wrap"), bmpLoader->LoadBitmap("word_wrap"), _("Word Wrap"), wxITEM_CHECK);
 
-    m_tb->AddTool(XRCID("collapse_all"),
-                  _("Fold All Results"),
-                  wxXmlResource::Get()->LoadBitmap(wxT("fold_airplane")),
-                  _("Fold All Results"));
-
-    m_tb->AddTool(
-        XRCID("repeat_output"), _("Repeat"), bmpLoader->LoadBitmap(wxT("output-pane/16/reload")), _("Repeat"));
+    m_tb->AddTool(XRCID("clear_all_output"), _("Clear All"), bmpLoader->LoadBitmap("clear"), _("Clear All"));
+    m_tb->AddTool(XRCID("collapse_all"), _("Fold All Results"), bmpLoader->LoadBitmap("fold"), _("Fold All Results"));
+    m_tb->AddTool(XRCID("repeat_output"), _("Repeat"), bmpLoader->LoadBitmap("debugger_restart"), _("Repeat"));
 
     m_tb->Realize();
 

diff --git a/Runtime/codelite-bitmaps.zip b/Runtime/codelite-bitmaps.zip
diff --git a/bitmaps/16-ToolPin.png b/bitmaps/16-ToolPin.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/16-clear.png b/bitmaps/16-clear.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/16-fold.png b/bitmaps/16-fold.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/16-history.png b/bitmaps/16-history.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/16-link_editor.png b/bitmaps/16-link_editor.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/16-word_wrap.png b/bitmaps/16-word_wrap.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-ToolPin.png b/bitmaps/24-ToolPin.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-clear.png b/bitmaps/24-clear.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-fold.png b/bitmaps/24-fold.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-history.png b/bitmaps/24-history.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-link_editor.png b/bitmaps/24-link_editor.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/bitmaps/24-word_wrap.png b/bitmaps/24-word_wrap.png
diff --git a/bitmaps/[email protected] b/bitmaps/[email protected]
diff --git a/svgs/ToolPin.svg b/svgs/ToolPin.svg
diff --git a/svgs/clear.svg b/svgs/clear.svg
diff --git a/svgs/create-humanity-icons.php b/svgs/create-humanity-icons.php
@@ -61,6 +61,9 @@ public function copy() {
 $IN_FILES[] = new ImageFile("actions\\24\\go-down.svg", "next.svg");
 $IN_FILES[] = new ImageFile("actions\\24\\go-next.svg", "show_current_line.svg");
 
+// Others
+$IN_FILES[] = new ImageFile("actions\\24\\document-open-recent.svg", "history.svg");
+
 /** @var ImageFile */
 foreach($IN_FILES as $file) {
     $file->copy();

diff --git a/svgs/fold.svg b/svgs/fold.svg