mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 08:27:46 +00:00
LibGUI: Move Icon and FontDatabase into the GUI namespace
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:
parent
57f1c919df
commit
6a3b12664a
24 changed files with 120 additions and 104 deletions
|
@ -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));
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -47,5 +47,5 @@ private:
|
|||
explicit WidgetTreeModel(GUI::Widget&);
|
||||
|
||||
NonnullRefPtr<GUI::Widget> m_root;
|
||||
GIcon m_widget_icon;
|
||||
GUI::Icon m_widget_icon;
|
||||
};
|
||||
|
|
|
@ -55,8 +55,8 @@ private:
|
|||
|
||||
RemoteProcess& m_process;
|
||||
|
||||
GIcon m_object_icon;
|
||||
GIcon m_window_icon;
|
||||
GIcon m_layout_icon;
|
||||
GIcon m_timer_icon;
|
||||
GUI::Icon m_object_icon;
|
||||
GUI::Icon m_window_icon;
|
||||
GUI::Icon m_layout_icon;
|
||||
GUI::Icon m_timer_icon;
|
||||
};
|
||||
|
|
|
@ -61,6 +61,6 @@ private:
|
|||
|
||||
Profile& m_profile;
|
||||
|
||||
GIcon m_user_frame_icon;
|
||||
GIcon m_kernel_frame_icon;
|
||||
GUI::Icon m_user_frame_icon;
|
||||
GUI::Icon m_kernel_frame_icon;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue