diff --git a/data/apol.ui b/data/apol.ui index c2c0d63..d26b26b 100644 --- a/data/apol.ui +++ b/data/apol.ui @@ -117,8 +117,7 @@ - - icons/Folder.pngicons/Folder.png + &Open Policy @@ -145,8 +144,7 @@ - - icons/Add.pngicons/Add.png + New Analysis diff --git a/data/exclude_types.ui b/data/exclude_types.ui index a2cdf78..8804065 100644 --- a/data/exclude_types.ui +++ b/data/exclude_types.ui @@ -88,11 +88,7 @@ - - icons/Button_Next.pngicons/Button_Next.png - - - true + @@ -105,11 +101,7 @@ - - icons/Button_Back.pngicons/Button_Back.png - - - true + diff --git a/data/icons/Add.png b/data/icons/Add.png deleted file mode 100755 index 5bbad72..0000000 Binary files a/data/icons/Add.png and /dev/null differ diff --git a/data/icons/Button_Back.png b/data/icons/Button_Back.png deleted file mode 100755 index e56e3e0..0000000 Binary files a/data/icons/Button_Back.png and /dev/null differ diff --git a/data/icons/Button_Next.png b/data/icons/Button_Next.png deleted file mode 100755 index 684cb9c..0000000 Binary files a/data/icons/Button_Next.png and /dev/null differ diff --git a/data/icons/COPYING b/data/icons/COPYING deleted file mode 100644 index 48e0eee..0000000 --- a/data/icons/COPYING +++ /dev/null @@ -1,10 +0,0 @@ -Icons are sourced from the Koloria Free Icons Set - -Terms of Use -* Koloria Icon Set can be used in open source or commercial projects for free. -* When you mention Koloria Icon Set, please refer to this[1] page/download link. -* Do not sell the package on graphic stock sites -- this pack is intended to be - free. You may include the icons in your commercial themes/designs/creations. -* Do not claim to be the author of this icon set. - -[1] http://www.graphicrating.com/2012/06/14/koloria-free-icons-set/ diff --git a/data/icons/Folder.png b/data/icons/Folder.png deleted file mode 100755 index 677df7a..0000000 Binary files a/data/icons/Folder.png and /dev/null differ diff --git a/data/icons/expand_active.png b/data/icons/expand_active.png deleted file mode 100644 index 49bca44..0000000 Binary files a/data/icons/expand_active.png and /dev/null differ diff --git a/data/icons/expand_inactive.png b/data/icons/expand_inactive.png deleted file mode 100644 index 82415bf..0000000 Binary files a/data/icons/expand_inactive.png and /dev/null differ diff --git a/qhc/apol.qhc b/qhc/apol.qhc index 93a7a0a..5dc3d62 100644 Binary files a/qhc/apol.qhc and b/qhc/apol.qhc differ diff --git a/qhc/apol.qhp b/qhc/apol.qhp index 45855b2..450af6d 100644 --- a/qhc/apol.qhp +++ b/qhc/apol.qhp @@ -28,7 +28,6 @@ *.html - *.png diff --git a/qhc/index.html b/qhc/index.html index 36da668..f3c3852 100644 --- a/qhc/index.html +++ b/qhc/index.html @@ -38,8 +38,8 @@ and saving permission mappings. These are used by apol's information flow analysis.

Starting an Analysis

-

To begin analyzing a policy, click the green '+' -icon. A menu of available analysis tools will be presented. Select one, and +

To begin analyzing a policy, click the new analysis button. +A menu of available analysis tools will be presented. Select one, and a new analysis tab will open. Any analysis can be started multiple times, and each will operate independently, so multiple concurrent analyses can be performed. To help manage multiple tabs, the tabs can be diff --git a/setup.py b/setup.py index d5a1084..d8fa364 100644 --- a/setup.py +++ b/setup.py @@ -169,8 +169,7 @@ setup(name='setools', scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1") ), (join(sys.prefix, 'share/setools'), glob.glob("data/*.ui") + - ["data/perm_map", "qhc/apol.qhc"] ), - (join(sys.prefix, 'share/setools/icons'), glob.glob("data/icons/*.png"))], + ["data/perm_map", "qhc/apol.qhc"] )], ext_modules=ext_py_mods, test_suite='tests', license='GPLv2+, LGPLv2.1+',