diff --git a/icons/desktop/128x128/wcm.png b/icons/desktop/128x128/wcm.png deleted file mode 100644 index a2be95b..0000000 Binary files a/icons/desktop/128x128/wcm.png and /dev/null differ diff --git a/icons/desktop/160x160/wcm.png b/icons/desktop/160x160/wcm.png deleted file mode 100644 index 7893b8c..0000000 Binary files a/icons/desktop/160x160/wcm.png and /dev/null differ diff --git a/icons/desktop/192x192/wcm.png b/icons/desktop/192x192/wcm.png deleted file mode 100644 index b3772a3..0000000 Binary files a/icons/desktop/192x192/wcm.png and /dev/null differ diff --git a/icons/desktop/48x48/wcm.png b/icons/desktop/48x48/wcm.png deleted file mode 100644 index 92a148f..0000000 Binary files a/icons/desktop/48x48/wcm.png and /dev/null differ diff --git a/icons/desktop/64x64/wcm.png b/icons/desktop/64x64/wcm.png deleted file mode 100644 index bc3049c..0000000 Binary files a/icons/desktop/64x64/wcm.png and /dev/null differ diff --git a/icons/desktop/72x72/wcm.png b/icons/desktop/72x72/wcm.png deleted file mode 100644 index 0247d95..0000000 Binary files a/icons/desktop/72x72/wcm.png and /dev/null differ diff --git a/icons/desktop/96x96/wcm.png b/icons/desktop/96x96/wcm.png deleted file mode 100644 index b79f437..0000000 Binary files a/icons/desktop/96x96/wcm.png and /dev/null differ diff --git a/icons/desktop/meson.build b/icons/desktop/meson.build index c2bc109..4aa10eb 100644 --- a/icons/desktop/meson.build +++ b/icons/desktop/meson.build @@ -1,8 +1,2 @@ -install_data('wcm.png', install_dir: icon_dir) -install_data(join_paths('48x48', 'wcm.png'), install_dir: join_paths(share_dir, 'icons', 'hicolor', '48x48', 'apps')) -install_data(join_paths('64x64', 'wcm.png'), install_dir: join_paths(share_dir, 'icons', 'hicolor', '64x64', 'apps')) -install_data(join_paths('72x72', 'wcm.png'), install_dir: join_paths(share_dir, 'icons', 'hicolor', '72x72', 'apps')) -install_data(join_paths('96x96', 'wcm.png'), install_dir: join_paths(share_dir, 'icons', 'hicolor', '96x96', 'apps')) -install_data(join_paths('128x128', 'wcm.png'), install_dir: join_paths(share_dir, 'icons', 'hicolor', '128x128', 'apps')) -install_data(join_paths('160x160', 'wcm.png'), install_dir: join_paths(share_dir, 'icons', 'hicolor', '160x160', 'apps')) -install_data(join_paths('192x192', 'wcm.png'), install_dir: join_paths(share_dir, 'icons', 'hicolor', '192x192', 'apps')) \ No newline at end of file +install_data('wcm.svg', install_dir: join_paths(share_dir, 'icons')) +install_data('wcm.svg', install_dir: join_paths(share_dir, 'wcm', 'icons')) diff --git a/icons/desktop/wcm.png b/icons/desktop/wcm.png deleted file mode 100644 index 7716064..0000000 Binary files a/icons/desktop/wcm.png and /dev/null differ diff --git a/icons/desktop/wcm.svg b/icons/desktop/wcm.svg new file mode 100644 index 0000000..cd6d619 --- /dev/null +++ b/icons/desktop/wcm.svg @@ -0,0 +1,280 @@ + + + + + + + + + + diff --git a/meson.build b/meson.build index c481747..be68a03 100644 --- a/meson.build +++ b/meson.build @@ -10,7 +10,7 @@ wayfire_metadata_dir = wayfire.get_variable(pkgconfig: 'metadatadir') wayfire_sysconf_dir = wayfire.get_variable(pkgconfig: 'sysconfdir') share_dir = join_paths(get_option('prefix'), 'share') -icon_dir = join_paths(share_dir, 'wayfire', 'icons') +icon_dir = join_paths(share_dir, 'wcm', 'icons') add_global_arguments('-DWAYFIRE_METADATADIR="' + wayfire_metadata_dir + '"', language : 'cpp') add_global_arguments('-DWAYFIRE_SYSCONFDIR="' + wayfire_sysconf_dir + '"', language : 'cpp') diff --git a/src/main.cpp b/src/main.cpp index 6b5fa0f..ba2ef10 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,7 +2,7 @@ int main(int argc, char **argv) { - auto app = Gtk::Application::create(); + auto app = Gtk::Application::create("org.gtk.wcm"); std::unique_ptr wcm = std::make_unique(app); return app->run(argc, argv); } diff --git a/src/wcm.cpp b/src/wcm.cpp index 29e4ca1..3624912 100644 --- a/src/wcm.cpp +++ b/src/wcm.cpp @@ -1336,7 +1336,7 @@ WCM::WCM(Glib::RefPtr app) } window = std::make_unique(app); - auto icon = Gdk::Pixbuf::create_from_file(find_icon("wcm.png")); + auto icon = Gdk::Pixbuf::create_from_file(find_icon("wcm.svg")); window->set_icon(icon); window->set_size_request(750, 550); window->set_default_size(1000, 580);