RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 17:47:44 +00:00
Code Issues Activity Actions

LibGUI: Move Icon and FontDatabase into the GUI namespace

Browse source 
We also clean up some old references to the old G prefixed GUI classes

This also fixes a potential bug with using: C_OBJECT_ABSTRACT(GAbstractButton)
instead of C_OBJECT_ABSTRACT(AbstractButton)
This commit is contained in:
Shannon Booth 2020-03-07 12:02:21 +13:00 • committed by Andreas Kling
parent 57f1c919df
commit 6a3b12664a
24 changed files with 120 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

10
DevTools/HackStudio/Project.cpp
View file

@ -169,11 +169,11 @@ Project::Project(const String& path, Vector<String>&& filenames)
{
m_name = FileSystemPath(m_path).basename();
m_file_icon = GIcon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-unknown.png"));
m_cplusplus_icon = GIcon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-cplusplus.png"));
m_header_icon = GIcon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-header.png"));
m_directory_icon = GIcon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-folder.png"));
m_project_icon = GIcon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-hack-studio.png"));
m_file_icon = GUI::Icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-unknown.png"));
m_cplusplus_icon = GUI::Icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-cplusplus.png"));
m_header_icon = GUI::Icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-header.png"));
m_directory_icon = GUI::Icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-folder.png"));
m_project_icon = GUI::Icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-hack-studio.png"));
for (auto& filename : filenames) {
m_files.append(ProjectFile::construct_with_name(filename));

10
DevTools/HackStudio/Project.h
View file

@ -71,9 +71,9 @@ private:
NonnullRefPtrVector<ProjectFile> m_files;
RefPtr<ProjectTreeNode> m_root_node;
GIcon m_directory_icon;
GIcon m_file_icon;
GIcon m_cplusplus_icon;
GIcon m_header_icon;
GIcon m_project_icon;
GUI::Icon m_directory_icon;
GUI::Icon m_file_icon;
GUI::Icon m_cplusplus_icon;
GUI::Icon m_header_icon;
GUI::Icon m_project_icon;
};

2
DevTools/HackStudio/WidgetTreeModel.h
View file

@ -47,5 +47,5 @@ private:
explicit WidgetTreeModel(GUI::Widget&);
NonnullRefPtr<GUI::Widget> m_root;
GIcon m_widget_icon;
GUI::Icon m_widget_icon;
};