diff --git a/gui b/gui index 8aae9a6..d9477ab 100755 --- a/gui +++ b/gui @@ -103,9 +103,9 @@ while true;do if [ "$guimode" == yad ];then if [ -z "$prefix" ];then - buttons=("--button=Install!${DIRECTORY}/icons/install.png:4" \ - "--button=Uninstall!${DIRECTORY}/icons/uninstall.png:2" \ - "--button=Details!${DIRECTORY}/icons/info.png!View more about the selected software:0" ) + buttons=("--button=!${DIRECTORY}/icons/install.png!Install:4" \ + "--button=!${DIRECTORY}/icons/uninstall.png!Uninstall:2" \ + "--button=!${DIRECTORY}/icons/info.png!View more about the selected software:0" ) else buttons=("--button=!${DIRECTORY}/icons/back.png!Back:3" \ "--button=!${DIRECTORY}/icons/install.png!Install:4" \ @@ -293,14 +293,14 @@ $installedpackages" fi if [ ! -f "${DIRECTORY}/data/status/${output}" ];then #Taking a chance here. If status file is nonexistent, assume uninstalled. - echo "--button=Install!${DIRECTORY}/icons/install.png:4" + echo "--button=!${DIRECTORY}/icons/install.png:4" elif [ "$(cat "${DIRECTORY}/data/status/${output}")" == 'installed' ];then - echo "--button=Uninstall!${DIRECTORY}/icons/uninstall.png:2" + echo "--button=!${DIRECTORY}/icons/uninstall.png:2" elif [ "$(cat "${DIRECTORY}/data/status/${output}")" == 'uninstalled' ];then - echo "--button=Install!${DIRECTORY}/icons/install.png:4" + echo "--button=!${DIRECTORY}/icons/install.png:4" else #if status is corrupted or unknown, then show both buttons - echo "--button=Uninstall!${DIRECTORY}/icons/uninstall.png:2 --button=Install!${DIRECTORY}/icons/install.png:4" + echo "--button=!${DIRECTORY}/icons/uninstall.png:2 --button=!${DIRECTORY}/icons/install.png:4" fi )" diff --git a/icons/back.png b/icons/back.png index aad8b8a..9213272 100644 Binary files a/icons/back.png and b/icons/back.png differ diff --git a/icons/backup.png b/icons/backup.png index 2599743..fd22622 100644 Binary files a/icons/backup.png and b/icons/backup.png differ diff --git a/icons/badge.png b/icons/badge.png index b5dce5e..d6eb9ee 100644 Binary files a/icons/badge.png and b/icons/badge.png differ diff --git a/icons/badge.svg b/icons/badge.svg index 8c6ec5e..81303cd 100644 --- a/icons/badge.svg +++ b/icons/badge.svg @@ -1,66 +1,43 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + orij capsule - - outer - - - - inner - - - logo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Get it on​ - Pi-Apps + Get it on​ + Pi-Apps + \ No newline at end of file diff --git a/icons/categories.png b/icons/categories.png index 9e4d12f..d3494ee 100644 Binary files a/icons/categories.png and b/icons/categories.png differ diff --git a/icons/check.png b/icons/check.png index 26c6152..871b4d9 100644 Binary files a/icons/check.png and b/icons/check.png differ diff --git a/icons/corrupted.png b/icons/corrupted.png index 623069d..3a66c5b 100644 Binary files a/icons/corrupted.png and b/icons/corrupted.png differ diff --git a/icons/create.png b/icons/create.png index 8bfb26f..94d8ce6 100644 Binary files a/icons/create.png and b/icons/create.png differ diff --git a/icons/credits.png b/icons/credits.png index 85bc7c7..de9d867 100644 Binary files a/icons/credits.png and b/icons/credits.png differ diff --git a/icons/down.png b/icons/down.png index f1e72bd..f5c6f44 100644 Binary files a/icons/down.png and b/icons/down.png differ diff --git a/icons/download.png b/icons/download.png index 07e2076..3112f36 100644 Binary files a/icons/download.png and b/icons/download.png differ diff --git a/icons/edit.png b/icons/edit.png index 40b5571..ceaa5ff 100644 Binary files a/icons/edit.png and b/icons/edit.png differ diff --git a/icons/exit.png b/icons/exit.png index 3de8f67..ec1b220 100644 Binary files a/icons/exit.png and b/icons/exit.png differ diff --git a/icons/folder.png b/icons/folder.png index f7d0144..36603ad 100644 Binary files a/icons/folder.png and b/icons/folder.png differ diff --git a/icons/forward.png b/icons/forward.png index 1d783a4..2ed2c49 100644 Binary files a/icons/forward.png and b/icons/forward.png differ diff --git a/icons/info.png b/icons/info.png index 9ce5041..b025177 100644 Binary files a/icons/info.png and b/icons/info.png differ diff --git a/icons/install.png b/icons/install.png index 7d0c959..c8a749a 100644 Binary files a/icons/install.png and b/icons/install.png differ diff --git a/icons/installed.png b/icons/installed.png index d80536d..86d0f53 100644 Binary files a/icons/installed.png and b/icons/installed.png differ diff --git a/icons/logo-128.png b/icons/logo-128.png index 93f1dc6..3fb9475 100644 Binary files a/icons/logo-128.png and b/icons/logo-128.png differ diff --git a/icons/logo-64.png b/icons/logo-64.png index f9f1322..2ffa18c 100644 Binary files a/icons/logo-64.png and b/icons/logo-64.png differ diff --git a/icons/logo-trans.svg b/icons/logo-trans.svg index 2c8ab72..804ae18 100644 --- a/icons/logo-trans.svg +++ b/icons/logo-trans.svg @@ -1,45 +1,198 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + shadow handle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + black + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + shadow handle + + + basket + + + white cover + + + handle + + + + + + + + + - - - - - - - - - - - + + logo + + black + + + + + + + + + + + + + crescents + + + + + + + shadows around handle + + + + + + + accents + + white accents + + + black accents + \ No newline at end of file diff --git a/icons/logo.png b/icons/logo.png index 14457b9..7e1b66f 100644 Binary files a/icons/logo.png and b/icons/logo.png differ diff --git a/icons/logo.svg b/icons/logo.svg index d43b5da..ecd2141 100644 --- a/icons/logo.svg +++ b/icons/logo.svg @@ -1,44 +1,197 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + shadow handle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + black + + + - - - - - - - - - - - - - - - - - - - - - - - + + shadow handle + + + basket + + + white cover + + + handle + + + + + + + + + - - - - - - - - - - - + + logo + + black + + + + + + + + + + + + + crescents + + + + + + + shadows around handle + + + + + + + accents + + white accents + + + black accents + \ No newline at end of file diff --git a/icons/none.png b/icons/none.png index 95fe63f..23aff38 100644 Binary files a/icons/none.png and b/icons/none.png differ diff --git a/icons/proglogo.png b/icons/proglogo.png index 1290a7d..5c3dbea 100644 Binary files a/icons/proglogo.png and b/icons/proglogo.png differ diff --git a/icons/proglogo.svg b/icons/proglogo.svg index 81dcc90..e9ebea2 100644 --- a/icons/proglogo.svg +++ b/icons/proglogo.svg @@ -1,46 +1,21 @@ - + + + + + + + + + + + + + + - - logo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pi-Apps + Pi-Apps + \ No newline at end of file diff --git a/icons/question.png b/icons/question.png deleted file mode 100644 index cefdc10..0000000 Binary files a/icons/question.png and /dev/null differ diff --git a/icons/save.png b/icons/save.png index cdade1c..3d21572 100644 Binary files a/icons/save.png and b/icons/save.png differ diff --git a/icons/trash.png b/icons/trash.png index 57f4604..fd26ec7 100644 Binary files a/icons/trash.png and b/icons/trash.png differ diff --git a/icons/uninstall.png b/icons/uninstall.png index bf20d9a..8aec21c 100644 Binary files a/icons/uninstall.png and b/icons/uninstall.png differ diff --git a/icons/uninstalled.png b/icons/uninstalled.png index 4ff9ba4..7ece042 100644 Binary files a/icons/uninstalled.png and b/icons/uninstalled.png differ diff --git a/icons/up.png b/icons/up.png index 24f18ae..6b96a19 100644 Binary files a/icons/up.png and b/icons/up.png differ