diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 4f1cb9a2d6..1b29273927 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -881,6 +881,28 @@ public class SnarkManager implements CompleteListener, ClientApp { } return theme; } + + /** + * Get the path to the preferred embedded icons for toImg, "solid/" for + * dark and light, "" for everything else. + * + * If you add a theme with a new icon set, then you need to add a + * corresponding condition here. + * + * @return String "solid/" or "" + * @since 0.9.48 + */ + public String getThemeIconSet() { + String iconset = ""; + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Theme was: " + this.getTheme()); + if (this.getTheme().equals("dark") || this.getTheme().equals("light")) { + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Using solid iconset."); + iconset = "solid/"; + } + return iconset; + } /** * Get all themes diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index b4737ee610..d74d579287 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -4206,7 +4206,7 @@ public class I2PSnarkServlet extends BasicServlet { * @since 0.8.2 */ private String toImg(String icon, String altText) { - return "\"""; + return "\"""; } /** diff --git a/installer/resources/themes/snark/dark/images/icons/application.png b/apps/i2psnark/resources/icons/solid/application.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/application.png rename to apps/i2psnark/resources/icons/solid/application.png diff --git a/installer/resources/themes/snark/dark/images/icons/basket_put.png b/apps/i2psnark/resources/icons/solid/basket_put.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/basket_put.png rename to apps/i2psnark/resources/icons/solid/basket_put.png diff --git a/installer/resources/themes/snark/dark/images/icons/cancel.png b/apps/i2psnark/resources/icons/solid/cancel.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/cancel.png rename to apps/i2psnark/resources/icons/solid/cancel.png diff --git a/installer/resources/themes/snark/dark/images/icons/cd.png b/apps/i2psnark/resources/icons/solid/cd.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/cd.png rename to apps/i2psnark/resources/icons/solid/cd.png diff --git a/installer/resources/themes/snark/dark/images/icons/clock.png b/apps/i2psnark/resources/icons/solid/clock.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/clock.png rename to apps/i2psnark/resources/icons/solid/clock.png diff --git a/installer/resources/themes/snark/dark/images/icons/clock_red.png b/apps/i2psnark/resources/icons/solid/clock_red.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/clock_red.png rename to apps/i2psnark/resources/icons/solid/clock_red.png diff --git a/installer/resources/themes/snark/dark/images/icons/compress.png b/apps/i2psnark/resources/icons/solid/compress.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/compress.png rename to apps/i2psnark/resources/icons/solid/compress.png diff --git a/installer/resources/themes/snark/dark/images/icons/ebook.png b/apps/i2psnark/resources/icons/solid/ebook.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/ebook.png rename to apps/i2psnark/resources/icons/solid/ebook.png diff --git a/installer/resources/themes/snark/dark/images/icons/film.png b/apps/i2psnark/resources/icons/solid/film.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/film.png rename to apps/i2psnark/resources/icons/solid/film.png diff --git a/installer/resources/themes/snark/dark/images/icons/folder.png b/apps/i2psnark/resources/icons/solid/folder.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/folder.png rename to apps/i2psnark/resources/icons/solid/folder.png diff --git a/installer/resources/themes/snark/dark/images/icons/html.png b/apps/i2psnark/resources/icons/solid/html.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/html.png rename to apps/i2psnark/resources/icons/solid/html.png diff --git a/installer/resources/themes/snark/dark/images/icons/itoopie_xxsm.png b/apps/i2psnark/resources/icons/solid/itoopie_xxsm.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/itoopie_xxsm.png rename to apps/i2psnark/resources/icons/solid/itoopie_xxsm.png diff --git a/installer/resources/themes/snark/dark/images/icons/magnet.png b/apps/i2psnark/resources/icons/solid/magnet.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/magnet.png rename to apps/i2psnark/resources/icons/solid/magnet.png diff --git a/installer/resources/themes/snark/dark/images/icons/music.png b/apps/i2psnark/resources/icons/solid/music.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/music.png rename to apps/i2psnark/resources/icons/solid/music.png diff --git a/installer/resources/themes/snark/dark/images/icons/package.png b/apps/i2psnark/resources/icons/solid/package.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/package.png rename to apps/i2psnark/resources/icons/solid/package.png diff --git a/installer/resources/themes/snark/dark/images/icons/page.png b/apps/i2psnark/resources/icons/solid/page.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/page.png rename to apps/i2psnark/resources/icons/solid/page.png diff --git a/installer/resources/themes/snark/dark/images/icons/page_white.png b/apps/i2psnark/resources/icons/solid/page_white.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/page_white.png rename to apps/i2psnark/resources/icons/solid/page_white.png diff --git a/installer/resources/themes/snark/dark/images/icons/page_white_acrobat.png b/apps/i2psnark/resources/icons/solid/page_white_acrobat.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/page_white_acrobat.png rename to apps/i2psnark/resources/icons/solid/page_white_acrobat.png diff --git a/installer/resources/themes/snark/dark/images/icons/photo.png b/apps/i2psnark/resources/icons/solid/photo.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/photo.png rename to apps/i2psnark/resources/icons/solid/photo.png diff --git a/installer/resources/themes/snark/dark/images/icons/plugin.png b/apps/i2psnark/resources/icons/solid/plugin.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/plugin.png rename to apps/i2psnark/resources/icons/solid/plugin.png diff --git a/installer/resources/themes/snark/dark/images/icons/tick.png b/apps/i2psnark/resources/icons/solid/tick.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/tick.png rename to apps/i2psnark/resources/icons/solid/tick.png diff --git a/installer/resources/themes/snark/dark/snark.css b/installer/resources/themes/snark/dark/snark.css index 49a00edd32..3cb668a784 100644 --- a/installer/resources/themes/snark/dark/snark.css +++ b/installer/resources/themes/snark/dark/snark.css @@ -3272,83 +3272,3 @@ th a img { background-size: 14px auto !important; } -.snarkTorrentDetails img { - height: 0px !important; - width: 0px !important; - padding: 16px !important; -} - -.snarkDirInfo img { - height: 0px !important; - width: 0px !important; - padding: 16px !important; -} - -img[src*="i2psnark/.resources/icons/application.png"]{ - background: url("/themes/snark/dark/images/icons/") center no-repeat -} -img[src*="i2psnark/.resources/icons/basket_put.png"]{ - background: url("/themes/snark/dark/images/icons/basket_put.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/cancel.png"]{ - background: url("/themes/snark/dark/images/icons/cancel.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/cd.png"]{ - background: url("/themes/snark/dark/images/icons/cd.pmg") center no-repeat -} -img[src*="i2psnark/.resources/icons/clock.png"]{ - background: url("/themes/snark/dark/images/icons/clock.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/clock_red.png"]{ - background: url("/themes/snark/dark/images/icons/clock_red.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/compress.png"]{ - background: url("/themes/snark/dark/images/icons/compress.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/ebook.png"]{ - background: url("/themes/snark/dark/images/icons/ebook.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/film.png"]{ - background: url("/themes/snark/dark/images/icons/film.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/folder.png"]{ - background: url("/themes/snark/dark/images/icons/folder.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/html.png"]{ - background: url("/themes/snark/dark/images/icons/html.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/itoopie_xxsm.png"]{ - background: url("/themes/snark/dark/images/icons/itoopie_xxsm.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/magnet.png"]{ - background: url("/themes/snark/dark/images/icons/magnet.png") center no-repeat; - height: 0px; - width: 0px; - padding: 16px; - margin: -4px !important; -} -img[src*="i2psnark/.resources/icons/music.png"]{ - background: url("/themes/snark/dark/images/icons/music.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/package.png"]{ - background: url("/themes/snark/dark/images/icons/package.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/page.png"]{ - background: url("/themes/snark/dark/images/icons/page.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/page_white.png"]{ - background: url("/themes/snark/dark/images/icons/page_white.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/page_white_acrobat.png"]{ - background: url("/themes/snark/dark/images/icons/page_white_acrobat.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/photo.png"]{ - background: url("/themes/snark/dark/images/icons/photo.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/plugin.png"]{ - background: url("/themes/snark/dark/images/icons/plugin.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/tick.png"]{ - background: url("/themes/snark/dark/images/icons/tick.png") center no-repeat -} - diff --git a/installer/resources/themes/snark/light/images/icons/application.png b/installer/resources/themes/snark/light/images/icons/application.png deleted file mode 100644 index 3ae1e2e419..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/application.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/basket_put.png b/installer/resources/themes/snark/light/images/icons/basket_put.png deleted file mode 100644 index 96cebb8d87..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/basket_put.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/cancel.png b/installer/resources/themes/snark/light/images/icons/cancel.png deleted file mode 100644 index fd36e7ae45..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/cancel.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/cd.png b/installer/resources/themes/snark/light/images/icons/cd.png deleted file mode 100644 index 8303483dfa..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/cd.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/clock.png b/installer/resources/themes/snark/light/images/icons/clock.png deleted file mode 100644 index 5263abbc80..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/clock.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/clock_red.png b/installer/resources/themes/snark/light/images/icons/clock_red.png deleted file mode 100644 index 5d674a3ff0..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/clock_red.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/compress.png b/installer/resources/themes/snark/light/images/icons/compress.png deleted file mode 100644 index b4c3e83200..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/compress.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/ebook.png b/installer/resources/themes/snark/light/images/icons/ebook.png deleted file mode 100644 index c114c853f0..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/ebook.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/film.png b/installer/resources/themes/snark/light/images/icons/film.png deleted file mode 100644 index fafa9417d1..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/film.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/folder.png b/installer/resources/themes/snark/light/images/icons/folder.png deleted file mode 100644 index 1d66db72e8..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/folder.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/html.png b/installer/resources/themes/snark/light/images/icons/html.png deleted file mode 100644 index 03f83ce0d9..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/html.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/itoopie_xxsm.png b/installer/resources/themes/snark/light/images/icons/itoopie_xxsm.png deleted file mode 100644 index 0cec9e5c97..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/itoopie_xxsm.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/magnet.png b/installer/resources/themes/snark/light/images/icons/magnet.png deleted file mode 100644 index d50e84e11a..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/magnet.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/music.png b/installer/resources/themes/snark/light/images/icons/music.png deleted file mode 100644 index 5a8252b61d..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/music.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/package.png b/installer/resources/themes/snark/light/images/icons/package.png deleted file mode 100644 index f7730fca6c..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/package.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/page.png b/installer/resources/themes/snark/light/images/icons/page.png deleted file mode 100644 index 05fb6f8eb4..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/page.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/page_white.png b/installer/resources/themes/snark/light/images/icons/page_white.png deleted file mode 100644 index f76c0652ca..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/page_white.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/page_white_acrobat.png b/installer/resources/themes/snark/light/images/icons/page_white_acrobat.png deleted file mode 100644 index 33e8e88c6a..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/page_white_acrobat.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/photo.png b/installer/resources/themes/snark/light/images/icons/photo.png deleted file mode 100644 index 1ee15b6d8f..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/photo.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/plugin.png b/installer/resources/themes/snark/light/images/icons/plugin.png deleted file mode 100644 index cbf0266510..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/plugin.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/images/icons/tick.png b/installer/resources/themes/snark/light/images/icons/tick.png deleted file mode 100644 index 2431994ab7..0000000000 Binary files a/installer/resources/themes/snark/light/images/icons/tick.png and /dev/null differ diff --git a/installer/resources/themes/snark/light/snark.css b/installer/resources/themes/snark/light/snark.css index f97743e1ba..3d81895e20 100644 --- a/installer/resources/themes/snark/light/snark.css +++ b/installer/resources/themes/snark/light/snark.css @@ -2709,83 +2709,3 @@ a, a:link, th, td, button, input, select, textarea { background-size: 14px auto !important; } -.snarkTorrentDetails img { - height: 0px !important; - width: 0px !important; - padding: 16px !important; -} - -.snarkDirInfo img { - height: 0px !important; - width: 0px !important; - padding: 16px !important; -} - -img[src*="i2psnark/.resources/icons/application.png"]{ - background: url("/themes/snark/light/images/icons/application") center no-repeat -} -img[src*="i2psnark/.resources/icons/basket_put.png"]{ - background: url("/themes/snark/light/images/icons/basket_put.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/cancel.png"]{ - background: url("/themes/snark/light/images/icons/cancel.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/cd.png"]{ - background: url("/themes/snark/light/images/icons/cd.pmg") center no-repeat -} -img[src*="i2psnark/.resources/icons/clock.png"]{ - background: url("/themes/snark/light/images/icons/clock.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/clock_red.png"]{ - background: url("/themes/snark/light/images/icons/clock_red.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/compress.png"]{ - background: url("/themes/snark/light/images/icons/compress.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/ebook.png"]{ - background: url("/themes/snark/light/images/icons/ebook.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/film.png"]{ - background: url("/themes/snark/light/images/icons/film.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/folder.png"]{ - background: url("/themes/snark/light/images/icons/folder.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/html.png"]{ - background: url("/themes/snark/light/images/icons/html.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/itoopie_xxsm.png"]{ - background: url("/themes/snark/light/images/icons/itoopie_xxsm.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/magnet.png"]{ - background: url("/themes/snark/light/images/icons/magnet.png") center no-repeat; - height: 0px; - width: 0px; - padding: 16px; - margin: -4px !important; -} -img[src*="i2psnark/.resources/icons/music.png"]{ - background: url("/themes/snark/light/images/icons/music.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/package.png"]{ - background: url("/themes/snark/light/images/icons/package.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/page.png"]{ - background: url("/themes/snark/light/images/icons/page.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/page_white.png"]{ - background: url("/themes/snark/light/images/icons/page_white.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/page_white_acrobat.png"]{ - background: url("/themes/snark/light/images/icons/page_white_acrobat.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/photo.png"]{ - background: url("/themes/snark/light/images/icons/photo.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/plugin.png"]{ - background: url("/themes/snark/light/images/icons/plugin.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/tick.png"]{ - background: url("/themes/snark/light/images/icons/tick.png") center no-repeat -} -