浏览代码

HackStudio: Use GUI::FileIconProvider::icon_for_path() for Locator icons

No need to duplicate file icon association logic as well as artificially
limiting the number of recognized file types.
Linus Groh 4 年之前
父节点
当前提交
b1754bf8f8
共有 1 个文件被更改,包括 3 次插入25 次删除
  1. 3 25
      DevTools/HackStudio/Locator.cpp

+ 3 - 25
DevTools/HackStudio/Locator.cpp

@@ -28,18 +28,13 @@
 #include "HackStudio.h"
 #include "Project.h"
 #include <LibGUI/BoxLayout.h>
+#include <LibGUI/FileIconProvider.h>
 #include <LibGUI/TableView.h>
 #include <LibGUI/TextBox.h>
 #include <LibGUI/Window.h>
 
 namespace HackStudio {
 
-static RefPtr<Gfx::Bitmap> s_file_icon;
-static RefPtr<Gfx::Bitmap> s_cplusplus_icon;
-static RefPtr<Gfx::Bitmap> s_header_icon;
-static RefPtr<Gfx::Bitmap> s_form_icon;
-static RefPtr<Gfx::Bitmap> s_hackstudio_icon;
-
 class LocatorSuggestionModel final : public GUI::Model {
 public:
     explicit LocatorSuggestionModel(Vector<String>&& suggestions)
@@ -60,17 +55,8 @@ public:
         if (role == GUI::ModelRole::Display) {
             if (index.column() == Column::Name)
                 return suggestion;
-            if (index.column() == Column::Icon) {
-                if (suggestion.ends_with(".cpp"))
-                    return *s_cplusplus_icon;
-                if (suggestion.ends_with(".frm"))
-                    return *s_form_icon;
-                if (suggestion.ends_with(".h"))
-                    return *s_header_icon;
-                if (suggestion.ends_with(".hsp"))
-                    return *s_hackstudio_icon;
-                return *s_file_icon;
-            }
+            if (index.column() == Column::Icon)
+                return GUI::FileIconProvider::icon_for_path(suggestion);
         }
         return {};
     }
@@ -82,14 +68,6 @@ private:
 
 Locator::Locator()
 {
-    if (!s_cplusplus_icon) {
-        s_file_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-unknown.png");
-        s_cplusplus_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-cplusplus.png");
-        s_header_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-header.png");
-        s_form_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-form.png");
-        s_hackstudio_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-hackstudio.png");
-    }
-
     set_layout<GUI::VerticalBoxLayout>();
     set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
     set_preferred_size(0, 20);