diff --git a/bundle.sh b/bundle.sh index a1d53ba..591a903 100755 --- a/bundle.sh +++ b/bundle.sh @@ -11,9 +11,9 @@ rm_if() { elif [[ -f $1 ]] then rm -f "$1" && echo "removed file $1" - fi + fi - return 0 + return 0 } perish() { rm_if "${tmpdir}" @@ -32,7 +32,7 @@ err() { } declare -A icon_names=( - [Tycho]="resources/color/pfhor-hand.png" + [Tycho]="resources/icons/pfhor-hand.png" ) name=$1 diff --git a/tycho/resources/color/lines.png b/tycho/resources/color/lines.png deleted file mode 100644 index 23fca96..0000000 Binary files a/tycho/resources/color/lines.png and /dev/null differ diff --git a/tycho/resources/color/map.png b/tycho/resources/color/map.png deleted file mode 100644 index 56ccc3a..0000000 Binary files a/tycho/resources/color/map.png and /dev/null differ diff --git a/tycho/resources/color/pfhor-hand.png b/tycho/resources/color/pfhor-hand.png deleted file mode 100644 index 579768e..0000000 Binary files a/tycho/resources/color/pfhor-hand.png and /dev/null differ diff --git a/tycho/resources/color/pfhor-hand.svg b/tycho/resources/color/pfhor-hand.svg deleted file mode 100644 index 3648864..0000000 --- a/tycho/resources/color/pfhor-hand.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/tycho/resources/color/points.png b/tycho/resources/color/points.png deleted file mode 100644 index bab249f..0000000 Binary files a/tycho/resources/color/points.png and /dev/null differ diff --git a/tycho/resources/color/polygons.png b/tycho/resources/color/polygons.png deleted file mode 100644 index ce49766..0000000 Binary files a/tycho/resources/color/polygons.png and /dev/null differ diff --git a/tycho/resources/hc/lines.png b/tycho/resources/hc/lines.png deleted file mode 100644 index 769a58c..0000000 Binary files a/tycho/resources/hc/lines.png and /dev/null differ diff --git a/tycho/resources/hc/map.png b/tycho/resources/hc/map.png deleted file mode 100644 index 54ae882..0000000 Binary files a/tycho/resources/hc/map.png and /dev/null differ diff --git a/tycho/resources/hc/points.png b/tycho/resources/hc/points.png deleted file mode 100644 index ce116a0..0000000 Binary files a/tycho/resources/hc/points.png and /dev/null differ diff --git a/tycho/resources/hc/polygons.png b/tycho/resources/hc/polygons.png deleted file mode 100644 index 62f1d27..0000000 Binary files a/tycho/resources/hc/polygons.png and /dev/null differ diff --git a/tycho/resources/icons/lines.png b/tycho/resources/icons/lines.png new file mode 100644 index 0000000..903c047 Binary files /dev/null and b/tycho/resources/icons/lines.png differ diff --git a/tycho/resources/icons/lines.svg b/tycho/resources/icons/lines.svg new file mode 100644 index 0000000..29951df --- /dev/null +++ b/tycho/resources/icons/lines.svg @@ -0,0 +1,2 @@ + + diff --git a/tycho/resources/icons/map.png b/tycho/resources/icons/map.png new file mode 100644 index 0000000..a6cb47d Binary files /dev/null and b/tycho/resources/icons/map.png differ diff --git a/tycho/resources/icons/map.svg b/tycho/resources/icons/map.svg new file mode 100644 index 0000000..c0ea502 --- /dev/null +++ b/tycho/resources/icons/map.svg @@ -0,0 +1,2 @@ + + diff --git a/tycho/resources/icons/pfhor-hand.png b/tycho/resources/icons/pfhor-hand.png new file mode 100644 index 0000000..dad128a Binary files /dev/null and b/tycho/resources/icons/pfhor-hand.png differ diff --git a/tycho/resources/icons/pfhor-hand.svg b/tycho/resources/icons/pfhor-hand.svg new file mode 100644 index 0000000..1a85cab --- /dev/null +++ b/tycho/resources/icons/pfhor-hand.svg @@ -0,0 +1,2 @@ + + diff --git a/tycho/resources/icons/points.png b/tycho/resources/icons/points.png new file mode 100644 index 0000000..2cdf86f Binary files /dev/null and b/tycho/resources/icons/points.png differ diff --git a/tycho/resources/icons/points.svg b/tycho/resources/icons/points.svg new file mode 100644 index 0000000..9f1ec97 --- /dev/null +++ b/tycho/resources/icons/points.svg @@ -0,0 +1,2 @@ + + diff --git a/tycho/resources/icons/polygons.png b/tycho/resources/icons/polygons.png new file mode 100644 index 0000000..780d299 Binary files /dev/null and b/tycho/resources/icons/polygons.png differ diff --git a/tycho/resources/icons/polygons.svg b/tycho/resources/icons/polygons.svg new file mode 100644 index 0000000..abfcd16 --- /dev/null +++ b/tycho/resources/icons/polygons.svg @@ -0,0 +1,2 @@ + + diff --git a/tycho/resources/misc/tycho1.png b/tycho/resources/images/tycho1.png similarity index 100% rename from tycho/resources/misc/tycho1.png rename to tycho/resources/images/tycho1.png diff --git a/tycho/resources/misc/tycho2.png b/tycho/resources/images/tycho2.png similarity index 100% rename from tycho/resources/misc/tycho2.png rename to tycho/resources/images/tycho2.png diff --git a/tycho/resources/resources.qrc b/tycho/resources/resources.qrc index 8d369a9..f1d669c 100644 --- a/tycho/resources/resources.qrc +++ b/tycho/resources/resources.qrc @@ -1,11 +1,11 @@ - - color/lines.png - color/map.png - color/pfhor-hand.png - color/points.png - color/polygons.png - misc/tycho1.png - misc/tycho2.png - + + icons/lines.png + icons/map.png + icons/points.png + icons/polygons.png + icons/pfhor-hand.png + images/tycho1.png + images/tycho2.png + diff --git a/tycho/resources/sources/icons.psd b/tycho/resources/sources/icons.psd deleted file mode 100644 index 65188fc..0000000 Binary files a/tycho/resources/sources/icons.psd and /dev/null differ diff --git a/tycho/resources/sources/lines.svg b/tycho/resources/sources/lines.svg new file mode 100644 index 0000000..52872af --- /dev/null +++ b/tycho/resources/sources/lines.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/tycho/resources/sources/map.svg b/tycho/resources/sources/map.svg new file mode 100644 index 0000000..ae885da --- /dev/null +++ b/tycho/resources/sources/map.svg @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/tycho/resources/sources/pfhor-hand.svg b/tycho/resources/sources/pfhor-hand.svg index 11c834e..12f0511 100644 --- a/tycho/resources/sources/pfhor-hand.svg +++ b/tycho/resources/sources/pfhor-hand.svg @@ -179,7 +179,8 @@ y1="518" x2="895" y2="532" - gradientUnits="userSpaceOnUse" /> + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.26458333,0,0,0.26458333,-3.7337712,0)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.26458333,0,0,0.26458333,-3.7337712,0)" /> + y2="476" + gradientTransform="matrix(0.26458333,0,0,0.26458333,-3.7337712,0)" /> + y2="496.75217" + gradientTransform="matrix(0.26458333,0,0,0.26458333,-3.7337712,0)" /> + y2="182.26581" + gradientTransform="translate(-3.7337712)" /> + gradientTransform="translate(-3.7337712)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-3.7337712)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-3.7337712)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.26458333,0,0,0.26458333,-3.7337712,0)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-3.7337712)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-3.7337712)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-3.7337712)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-3.7337712)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="rotate(-10.064246,-1.8668856,21.201687)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-3.7337712)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-3.7337712)" /> image/svg+xml - + @@ -399,31 +414,31 @@ style="display:inline"> @@ -435,58 +450,55 @@ style="display:inline"> + sodipodi:nodetypes="csccc" /> @@ -507,37 +518,32 @@ inkscape:label="Blue Lines" style="display:inline"> @@ -586,12 +588,12 @@ inkscape:label="Digit Shadows"> @@ -603,19 +605,19 @@ style="display:inline"> @@ -626,19 +628,19 @@ inkscape:label="Hand Shadows"> @@ -650,43 +652,43 @@ style="display:inline"> @@ -698,19 +700,19 @@ style="display:inline"> @@ -724,11 +726,10 @@ + inkscape:label="Gauntlet Midtone"> @@ -736,16 +737,15 @@ + inkscape:label="Gauntlet Shadow"> @@ -753,18 +753,16 @@ + inkscape:label="Gauntlet Highlight"> @@ -776,7 +774,7 @@ style="display:inline"> diff --git a/tycho/resources/sources/pfhor-hand.xcf b/tycho/resources/sources/pfhor-hand.xcf deleted file mode 100644 index 5390e57..0000000 Binary files a/tycho/resources/sources/pfhor-hand.xcf and /dev/null differ diff --git a/tycho/resources/sources/points.svg b/tycho/resources/sources/points.svg new file mode 100644 index 0000000..5ba8a5a --- /dev/null +++ b/tycho/resources/sources/points.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/tycho/resources/sources/polygons.svg b/tycho/resources/sources/polygons.svg new file mode 100644 index 0000000..fd9d066 --- /dev/null +++ b/tycho/resources/sources/polygons.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/tycho/source/gui/mapmodel.rs b/tycho/source/gui/mapmodel.rs index 77b22af..03ba338 100644 --- a/tycho/source/gui/mapmodel.rs +++ b/tycho/source/gui/mapmodel.rs @@ -52,7 +52,7 @@ impl IMapModelTrait for IMapModel { match self.get(index.into()).1.get_type() { EntryType::Image => "image-x-generic".to_string(), - EntryType::Map => ":/tycho/color/map.png".to_string(), + EntryType::Map => ":/tycho/icons/map.png".to_string(), EntryType::Other => "image-missing".to_string(), EntryType::Physics => "applications-system".to_string(), } diff --git a/tycho/ui/about.ui b/tycho/ui/about.ui index 68b6000..06f848d 100644 --- a/tycho/ui/about.ui +++ b/tycho/ui/about.ui @@ -26,7 +26,7 @@ - <img src="qrc:///tycho/misc/tycho2.png"/> + <img src=":/tycho/images/tycho2.png"/> diff --git a/tycho/ui/menu.ui b/tycho/ui/menu.ui index d7955c8..c707c06 100644 --- a/tycho/ui/menu.ui +++ b/tycho/ui/menu.ui @@ -21,7 +21,7 @@ - :/tycho/color/pfhor-hand.png:/tycho/color/pfhor-hand.png + :/tycho/icons/pfhor-hand.png:/tycho/icons/pfhor-hand.png