Move icon to module

yast · Nov 22, 2018 · 382c251 · 382c251
1 parent d0d0e88
commit 382c251
Show file tree

Hide file tree

Showing 6 changed files with 236 additions and 3 deletions.
diff --git a/configure.in.in b/configure.in.in
@@ -8,5 +8,8 @@
 @YAST2-CHECKS-COMMON@
 @YAST2-CHECKS-YCP@
 
+icondir=/usr/share/icons
+AC_SUBST(icondir)
+
 ## and generate the output...
 @YAST2-OUTPUT@
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -32,6 +32,14 @@ ylib_DATA = \
 desktop_DATA = \
   desktop/apparmor.desktop
 
-EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(ylib_DATA) $(desktop_DATA)
+symbolicdir = @icondir@/hicolor/symbolic/apps
+symbolic_DATA = \
+  icons/hicolor/symbolic/apps/yast-apparmor-symbolic.svg
+
+scalabledir = @icondir@/hicolor/scalable/apps
+scalable_DATA = \
+  icons/hicolor/scalable/apps/yast-apparmor.svg
+
+EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(ylib_DATA) $(desktop_DATA) $(symbolic_DATA) $(scalable_DATA)
 
 include $(top_srcdir)/Makefile.am.common
diff --git a/src/desktop/apparmor.desktop b/src/desktop/apparmor.desktop
@@ -15,7 +15,7 @@ X-SuSE-YaST-SortKey=
 X-SuSE-YaST-AutoInstClonable=false
 X-SuSE-YaST-Keywords=security,LSM,MAC,DAC,access,control
 
-Icon=apparmor_view_profile
+Icon=yast-apparmor
 Exec=/usr/bin/xdg-su -c '/sbin/yast2 apparmor'
 
 Name=AppArmor Configuration

diff --git a/src/icons/hicolor/scalable/apps/yast-apparmor.svg b/src/icons/hicolor/scalable/apps/yast-apparmor.svg
diff --git a/src/icons/hicolor/symbolic/apps/yast-apparmor-symbolic.svg b/src/icons/hicolor/symbolic/apps/yast-apparmor-symbolic.svg
diff --git a/src/include/apparmor/aa-config.rb b/src/include/apparmor/aa-config.rb
@@ -119,7 +119,6 @@ def displayAppArmorConfig
 
       # May want to replace Wizard() with UI()
       Wizard.CreateDialog
-      Wizard.SetTitleIcon("apparmor/control_panel")
       Wizard.SetContentsButtons(
         caption,
         contents,