Compare commits
6 Commits
8354207c75
...
350bb402d2
Author | SHA1 | Date |
---|---|---|
an | 350bb402d2 | |
an | e3875b956f | |
an | 3ba5499bb9 | |
an | 77467ab69b | |
an | f74981d814 | |
an | e3eaeeec66 |
|
@ -5,3 +5,5 @@ Cargo.lock
|
|||
perf.data*
|
||||
*.bat
|
||||
*.user
|
||||
/tycho/resources/icons/*
|
||||
/tycho/resources/icons.qrc
|
||||
|
|
|
@ -32,7 +32,7 @@ err() {
|
|||
}
|
||||
|
||||
declare -A icon_names=(
|
||||
[Tycho]="resources/color/pfhor-hand.png"
|
||||
[Tycho]="resources/icons/pfhor-hand_1024.png"
|
||||
)
|
||||
|
||||
name=$1
|
||||
|
|
|
@ -29,8 +29,7 @@ fn exists(path: String) -> Result<(), String>
|
|||
|
||||
fn each_value<F>(opt: &clap::ArgMatches<'_>,
|
||||
name: &str,
|
||||
mut f: F)
|
||||
-> ResultS<()>
|
||||
mut f: F) -> ResultS<()>
|
||||
where F: FnMut(&str) -> ResultS<()>
|
||||
{
|
||||
if let Some(values) = opt.values_of(name) {
|
||||
|
@ -107,7 +106,6 @@ fn main() -> ResultS<()>
|
|||
|
||||
write!(&mut std::fs::File::create("dicks.txt").unwrap(), "{:#?}", ed);
|
||||
|
||||
/*
|
||||
use clap::clap_app;
|
||||
|
||||
let sub_data = clap_app! {
|
||||
|
|
|
@ -16,7 +16,7 @@ pub fn read(mut im: Image8,
|
|||
for _ in 0..im.w() {
|
||||
let idx = usize::from(b[p]);
|
||||
|
||||
im.cr.push(ok!(clut.get(idx), "invalid index")?.clone());
|
||||
im.cr.push(ok!(clut.get(idx), "bad index")?.clone());
|
||||
|
||||
p += 1;
|
||||
}
|
||||
|
@ -39,8 +39,7 @@ pub fn read(mut im: Image8,
|
|||
p += pp;
|
||||
|
||||
for &idx in &d {
|
||||
im.cr
|
||||
.push(ok!(clut.get(usize::from(idx)), "invalid index")?.clone());
|
||||
im.cr.push(ok!(clut.get(usize::from(idx)), "bad index")?.clone());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -35,7 +35,9 @@ add_library(
|
|||
cc/menu.cc
|
||||
cc/project.cc
|
||||
cc/tycho.h
|
||||
resources/resources.qrc
|
||||
cc/utility.cc
|
||||
resources/icons.qrc
|
||||
resources/images.qrc
|
||||
ui/about.ui
|
||||
ui/license.ui
|
||||
ui/mapprops.ui
|
||||
|
|
|
@ -1,11 +1,6 @@
|
|||
#include "tycho.h"
|
||||
|
||||
extern "C" {
|
||||
void critical_msg(char const *title, char const *msg)
|
||||
{
|
||||
QMessageBox::critical(nullptr, QObject::tr(title), QObject::tr(msg));
|
||||
}
|
||||
|
||||
int main_cc(char *app_path)
|
||||
{
|
||||
dbgPrint("cc entry");
|
||||
|
|
|
@ -31,10 +31,7 @@ QVariant MapModel::data(const QModelIndex &index, int role) const
|
|||
{
|
||||
switch(role) {
|
||||
case Qt::DecorationRole: {
|
||||
auto name = propIcon(index.row());
|
||||
auto icon = name.front() == ':' ? QIcon(name)
|
||||
: QIcon::fromTheme(name);
|
||||
return QVariant::fromValue(icon);
|
||||
return QVariant::fromValue(::getIcon(propIcon(index.row())));
|
||||
}
|
||||
default:
|
||||
return IMapModel::data(index, role);
|
||||
|
|
|
@ -5,6 +5,8 @@ Menu::Menu(QWidget *parent) :
|
|||
{
|
||||
setupUi(this);
|
||||
|
||||
setWindowIcon(::getIcon("pfhor-hand"));
|
||||
|
||||
actionAbout->setShortcut(QKeySequence(QKeySequence::HelpContents));
|
||||
actionClose->setShortcut(QKeySequence(QKeySequence::Close));
|
||||
actionMapProps->setShortcut(QKeySequence(tr("Ctrl+P")));
|
||||
|
@ -58,10 +60,10 @@ void Menu::openAbout()
|
|||
auto text = ui.labelText->text();
|
||||
|
||||
text.replace("AUTHORS",
|
||||
tr(tychoAuthors()).replace(':', ", ").toHtmlEscaped());
|
||||
text.replace("HOMEPAGE", tr(tychoHomepage()));
|
||||
text.replace("REPOSITORY", tr(tychoRepository()));
|
||||
text.replace("VERSION", tr(tychoVersion()));
|
||||
tr(::tychoAuthors()).replace(':', ", ").toHtmlEscaped());
|
||||
text.replace("HOMEPAGE", tr(::tychoHomepage()));
|
||||
text.replace("REPOSITORY", tr(::tychoRepository()));
|
||||
text.replace("VERSION", tr(::tychoVersion()));
|
||||
|
||||
ui.labelText->setText(text);
|
||||
|
||||
|
|
|
@ -159,6 +159,8 @@ std::uint32_t fourCC(byte a, byte b, byte c, byte d)
|
|||
static_cast<std::uint32_t>(d);
|
||||
}
|
||||
|
||||
QIcon getIcon(QString const &name);
|
||||
|
||||
extern "C" {
|
||||
char const *tychoAuthors();
|
||||
char const *tychoHomepage();
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
#include "tycho.h"
|
||||
|
||||
QIcon getIcon(QString const &name)
|
||||
{
|
||||
constexpr auto sizes = std::array{std::make_pair(16, "_16.svgz"),
|
||||
std::make_pair(24, "_24.svgz"),
|
||||
std::make_pair(32, "_32.svgz"),
|
||||
std::make_pair(64, "_64.svgz"),
|
||||
std::make_pair(128, "_128.svgz"),
|
||||
std::make_pair(256, "_256.svgz"),
|
||||
std::make_pair(512, "_512.svgz"),
|
||||
std::make_pair(1024, "_1024.svgz")};
|
||||
|
||||
QIcon icon;
|
||||
|
||||
for(auto const &sz : sizes) {
|
||||
auto res = ":/tycho/icons/" + name + sz.second;
|
||||
|
||||
if(QFile(res).exists()) {
|
||||
icon.addFile(res, QSize(sz.first, sz.first));
|
||||
}
|
||||
}
|
||||
|
||||
if(icon.isNull()) {
|
||||
return QIcon::fromTheme(name);
|
||||
} else {
|
||||
return icon;
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" {
|
||||
void critical_msg(char const *title, char const *msg)
|
||||
{
|
||||
QMessageBox::critical(nullptr, QObject::tr(title), QObject::tr(msg));
|
||||
}
|
||||
}
|
||||
|
||||
// EOF
|
|
@ -0,0 +1,49 @@
|
|||
#!/usr/bin/env fish
|
||||
|
||||
set sizes 16 24 32 48 64 128 256 512 1024
|
||||
set hidpi 32 48 64 96 128 256 512 1024 2048
|
||||
set numsize 9
|
||||
|
||||
mkdir -p resources/icons
|
||||
rm -f resources/icons/* resources/icons.qrc
|
||||
|
||||
echo "<RCC>" > resources/icons.qrc
|
||||
echo '<qresource prefix="/tycho">' >> resources/icons.qrc
|
||||
|
||||
function conv_icon -a out sz inf
|
||||
rsvg-convert -w "$sz" -h "$sz" -f svg -o "$out" "$inf" &
|
||||
end
|
||||
|
||||
function compress -a out
|
||||
pigz --best -fm -S z "$out"
|
||||
end
|
||||
|
||||
function comp_icon -a f i
|
||||
set sz $sizes[$i]
|
||||
set hz $hidpi[$i]
|
||||
set out icons/(basename -s .svg "$f")_$sz
|
||||
set out_s $out.svg
|
||||
set out_h $out@2x.svg
|
||||
echo \t"<file>$out_s""z</file>" >> resources/icons.qrc
|
||||
echo \t"<file>$out_h""z</file>" >> resources/icons.qrc
|
||||
set out_s resources/$out_s
|
||||
set out_h resources/$out_h
|
||||
conv_icon "$out_s" "$sz" "$f"
|
||||
conv_icon "$out_h" "$hz" "$f"
|
||||
wait rsvg-convert
|
||||
compress "$out_s"
|
||||
compress "$out_h"
|
||||
end
|
||||
|
||||
for f in resources/mini/*.svg
|
||||
for i in (seq 1 "$numsize")
|
||||
comp_icon "$f" "$i"
|
||||
end
|
||||
end
|
||||
|
||||
echo "</qresource>" >> resources/icons.qrc
|
||||
echo "</RCC>" >> resources/icons.qrc
|
||||
|
||||
echo "done"
|
||||
|
||||
## EOF
|
Before Width: | Height: | Size: 805 B |
Before Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 190 KiB |
Before Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 761 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 343 B |
Before Width: | Height: | Size: 972 B |
Before Width: | Height: | Size: 306 B |
Before Width: | Height: | Size: 673 B |
|
@ -0,0 +1,6 @@
|
|||
<RCC>
|
||||
<qresource prefix="/tycho">
|
||||
<file>images/tycho1.png</file>
|
||||
<file>images/tycho2.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
After Width: | Height: | Size: 25 KiB |
|
@ -0,0 +1,2 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="1024mm" height="1024mm" version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="b" x1="471.01474" x2="595.67206" y1="394.4631" y2="-67.423805" gradientUnits="userSpaceOnUse"><stop stop-color="#06a811" offset="0"/><stop stop-color="#297708" offset="1"/></linearGradient><linearGradient id="a" x1="458.91949" x2="569.21374" y1="210.01071" y2="210.01071" gradientUnits="userSpaceOnUse"><stop stop-color="#002f08" offset="0"/><stop stop-color="#00ff34" offset="1"/></linearGradient></defs><g transform="translate(0,727)"><rect transform="rotate(-45)" x="466.04965" y="-211.3382" width="96.033936" height="842.69781" fill="url(#a)" stroke="url(#b)" stroke-width="14.26031303"/></g></svg>
|
After Width: | Height: | Size: 820 B |
|
@ -0,0 +1,2 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="1024mm" height="1024mm" version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="c" x1="219.07498" x2="397.9321" y1="690.38951" y2="690.38951" gradientTransform="translate(.7826085 -5.5119185)" gradientUnits="userSpaceOnUse"><stop stop-color="#47ba47" offset="0"/></linearGradient><radialGradient id="a" cx="251.10182" cy="129.53458" r="480.21413" gradientTransform="matrix(1.0966194 1.4243566 -.78707209 .60597085 114.08351 -299.82679)" gradientUnits="userSpaceOnUse"><stop stop-color="#288628" offset="0"/><stop stop-color="#1f601f" stop-opacity=".99186993" offset="1"/></radialGradient><linearGradient id="b" x1="473.22769" x2="707.85828" y1="52.035297" y2="927.61029" gradientTransform="translate(.7826085 -5.5119185)" gradientUnits="userSpaceOnUse"><stop stop-color="#154715" offset="0"/><stop stop-color="#133e13" offset="1"/></linearGradient></defs><g><path d="m395.53969 602.71428-1.66187-558.230658-171.96775 0.0094 1.12252 558.221258-26.04255 22.86754h-165.204168v112.8078h167.812208l23.43451 28.65132 2.37142 221.965h170.07078l0.0649-221.965 34.24587-32.41298h70.68156l22.86754 22.86756v214.87945h88.25746v-213.93451l28.72618-28.72619h80.88691l30.10871 52.1498h62.87341l28.35368 28.35368v175.0084h113.76538v-182.18451l35.90774-35.90774v-156.10414l-42.14434-42.14434v-222.43899l-23.34003-23.34003v-34.11236h43.93972v-106.58927l-39.86922-23.01851v-124.392202h-88.64269v112.636902l-28.72618 28.72619h-304.72478v106.58928l23.05656 23.05653v82.02084h80.50892v-77.8631l24.56844-24.56844h181.88253l19.84375 19.84375v28.91518l-17.85938 17.85937h-148.63913v45.64063h148.92261l16.63096 16.63094v155.72618l-13.60715 13.60715h-83.91072l-18.14285 44.60118h-80.88691l-25.32438-25.32438v-143.25298h-87.3125v142.875l-24.56847 24.56844h-83.7526z" fill="url(#a)"/></g><path d="m829.90305 159.38602h100.89719zm-321.19641 123.56041h129.21279zm311.30502 6.04771h106.71804zm-597.52682 41.57729h172.24581zm613.57133 4.02767h100.63726zm-613.57133 130.38066h172.24581zm612.2608 103.90582h115.32423zm-611.71303 33.82893v164.32641h172.50729v-164.32641zm288.01808 16.60467v114.25039h119.9379v-114.25039zm210.1546 8.3075v102.08783zm116.73707 175.41514h118.36382zm-615.45752 91.62127h172.24581z" fill="none" stroke="url(#c)" stroke-width="6.3499999"/><path d="m395.53969 602.71428-1.66187-558.230658-171.96775 0.0094 1.12252 558.221258-26.04255 22.86754h-165.204168v112.8078h167.812208l23.43451 28.65132 2.37142 221.965h170.07078l0.0649-221.965 34.24587-32.41298h70.68156l22.86754 22.86756v214.87945h88.25746v-213.93451l28.72618-28.72619h80.88691l30.10871 52.1498h62.87341l28.35368 28.35368v175.0084h113.76538v-182.18451l35.90774-35.90774v-156.10414l-42.14434-42.14434v-222.43899l-23.34003-23.34003v-34.11236h43.93972v-106.58927l-39.86922-23.01851v-124.392202h-88.64269v112.636902l-28.72618 28.72619h-304.72478v106.58928l23.05656 23.05653v82.02084h80.50892v-77.8631l24.56844-24.56844h181.88253l19.84375 19.84375v28.91518l-17.85938 17.85937h-148.63913v45.64063h148.92261l16.63096 16.63094v155.72618l-13.60715 13.60715h-83.91072l-18.14285 44.60118h-80.88691l-25.32438-25.32438v-143.25298h-87.3125v142.875l-24.56847 24.56844h-83.7526z" fill="none" stroke="url(#b)" stroke-width="10.58333302"/></svg>
|
After Width: | Height: | Size: 3.3 KiB |
|
@ -0,0 +1,2 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="1024mm" height="1024mm" version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><radialGradient id="a" cx="474.72876" cy="-277.48386" r="148.29896" gradientTransform="matrix(1.7034536,0,0,1.7034536,-331.45225,182.08562)" gradientUnits="userSpaceOnUse"><stop stop-color="#5887ff" offset="0"/><stop stop-color="#001a75" offset="1"/></radialGradient><linearGradient id="b" x1="360.65833" x2="658.80597" y1="-390.38095" y2="-48.690479" gradientUnits="userSpaceOnUse"><stop stop-color="#040d7f" offset="0"/><stop stop-color="#0819f7" offset="1"/></linearGradient></defs><g transform="translate(0,727)"><circle cx="512" cy="-215" r="148.16667" fill="url(#a)" stroke="url(#b)" stroke-width="12.7"/></g></svg>
|
After Width: | Height: | Size: 819 B |
|
@ -0,0 +1,2 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="1024mm" height="1024mm" version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="b" x1="283.00687" x2="973.67822" y1="-597.68164" y2="69.42305" gradientUnits="userSpaceOnUse"><stop stop-color="#df5f00" offset="0"/><stop stop-color="#7c1400" offset="1"/></linearGradient><linearGradient id="a" x1="178.91055" x2="1031.5234" y1="-533.71918" y2="60.936119" gradientUnits="userSpaceOnUse"><stop stop-color="#762e04" offset="0"/><stop stop-color="#c94c08" offset="1"/></linearGradient></defs><g transform="translate(0,727)"><path transform="rotate(8.9302154,134.23353,-216.27906)" d="m151.80909-224.71008 221.56542-407.59018 456.10878 84.76895 60.3253 459.980267-418.82569 199.514493z" fill="url(#b)" stroke="url(#a)" stroke-width="12.69999981"/></g></svg>
|
After Width: | Height: | Size: 888 B |
|
@ -1,11 +0,0 @@
|
|||
<RCC>
|
||||
<qresource prefix="/tycho">
|
||||
<file>color/lines.png</file>
|
||||
<file>color/map.png</file>
|
||||
<file>color/pfhor-hand.png</file>
|
||||
<file>color/points.png</file>
|
||||
<file>color/polygons.png</file>
|
||||
<file>misc/tycho1.png</file>
|
||||
<file>misc/tycho2.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
|
@ -0,0 +1,105 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="1024mm"
|
||||
height="1024mm"
|
||||
viewBox="0 0 1024 1024"
|
||||
version="1.1"
|
||||
id="svg8"
|
||||
inkscape:version="0.92.4 5da689c313, 2019-01-14"
|
||||
sodipodi:docname="lines.svg">
|
||||
<defs
|
||||
id="defs2">
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient861">
|
||||
<stop
|
||||
style="stop-color:#002f08;stop-opacity:1"
|
||||
offset="0"
|
||||
id="stop857" />
|
||||
<stop
|
||||
style="stop-color:#00ff34;stop-opacity:1"
|
||||
offset="1"
|
||||
id="stop859" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient853">
|
||||
<stop
|
||||
style="stop-color:#06a811;stop-opacity:1"
|
||||
offset="0"
|
||||
id="stop849" />
|
||||
<stop
|
||||
style="stop-color:#297708;stop-opacity:1"
|
||||
offset="1"
|
||||
id="stop851" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient853"
|
||||
id="linearGradient855"
|
||||
x1="471.01474"
|
||||
y1="394.4631"
|
||||
x2="595.67206"
|
||||
y2="-67.423805"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient861"
|
||||
id="linearGradient863"
|
||||
x1="458.91949"
|
||||
y1="210.01071"
|
||||
x2="569.21374"
|
||||
y2="210.01071"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#3e0052"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.12374369"
|
||||
inkscape:cx="1869.2582"
|
||||
inkscape:cy="1837.1872"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
inkscape:pagecheckerboard="false" />
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,727)">
|
||||
<rect
|
||||
style="fill:url(#linearGradient863);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient855);stroke-width:14.26031303;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="rect812"
|
||||
width="96.033936"
|
||||
height="842.69781"
|
||||
x="466.04965"
|
||||
y="-211.3382"
|
||||
transform="rotate(-45)" />
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 3.0 KiB |
|
@ -0,0 +1,154 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="1024mm"
|
||||
height="1024mm"
|
||||
viewBox="0 0 1024 1024"
|
||||
version="1.1"
|
||||
id="svg8"
|
||||
inkscape:version="0.92.4 5da689c313, 2019-01-14"
|
||||
sodipodi:docname="map.svg">
|
||||
<defs
|
||||
id="defs2">
|
||||
<linearGradient
|
||||
id="linearGradient953"
|
||||
osb:paint="gradient">
|
||||
<stop
|
||||
style="stop-color:#154715;stop-opacity:1"
|
||||
offset="0"
|
||||
id="stop949" />
|
||||
<stop
|
||||
style="stop-color:#133e13;stop-opacity:1"
|
||||
offset="1"
|
||||
id="stop951" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient859">
|
||||
<stop
|
||||
style="stop-color:#288628;stop-opacity:1"
|
||||
offset="0"
|
||||
id="stop855" />
|
||||
<stop
|
||||
style="stop-color:#1f601f;stop-opacity:0.99186993"
|
||||
offset="1"
|
||||
id="stop857" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient847"
|
||||
osb:paint="solid">
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop845" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient841"
|
||||
osb:paint="solid">
|
||||
<stop
|
||||
style="stop-color:#47ba47;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop839" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient841"
|
||||
id="linearGradient843"
|
||||
x1="219.07498"
|
||||
y1="690.38951"
|
||||
x2="397.9321"
|
||||
y2="690.38951"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(0.7826085,-5.5119185)" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient859"
|
||||
id="radialGradient861"
|
||||
cx="251.10182"
|
||||
cy="129.53458"
|
||||
fx="251.10182"
|
||||
fy="129.53458"
|
||||
r="480.21413"
|
||||
gradientTransform="matrix(1.0966194,1.4243566,-0.78707209,0.60597085,114.08351,-299.82679)"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient953"
|
||||
id="linearGradient957"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="473.22769"
|
||||
y1="52.035297"
|
||||
x2="707.85828"
|
||||
y2="927.61029"
|
||||
gradientTransform="translate(0.7826085,-5.5119185)" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#3e0052"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.125"
|
||||
inkscape:cx="2199.3205"
|
||||
inkscape:cy="1832.1891"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:current-layer="layer6"
|
||||
showgrid="false"
|
||||
inkscape:pagecheckerboard="false" />
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:groupmode="layer"
|
||||
id="layer2"
|
||||
inkscape:label="Midtone"
|
||||
style="display:inline">
|
||||
<path
|
||||
id="path826"
|
||||
style="display:inline;fill:url(#radialGradient861);fill-opacity:1"
|
||||
d="m 395.53969,602.71428 -1.66187,-558.230658 -171.96775,0.0094 1.12252,558.221258 -26.04255,22.86754 H 31.785872 v 112.8078 H 199.59808 l 23.43451,28.65132 2.37142,221.965 h 170.07078 l 0.0649,-221.965 34.24587,-32.41298 h 70.68156 l 22.86754,22.86756 v 214.87945 h 88.25746 V 758.44046 l 28.72618,-28.72619 h 80.88691 l 30.10871,52.1498 h 62.87341 l 28.35368,28.35368 v 175.0084 H 956.30639 V 803.04164 L 992.21413,767.1339 V 611.02976 L 950.06979,568.88542 V 346.44643 L 926.72976,323.1064 v -34.11236 h 43.93972 V 182.40477 L 930.80026,159.38626 V 34.994058 H 842.15757 V 147.63096 l -28.72618,28.72619 H 508.70661 v 106.58928 l 23.05656,23.05653 v 82.02084 h 80.50892 v -77.8631 l 24.56844,-24.56844 h 181.88253 l 19.84375,19.84375 v 28.91518 l -17.85938,17.85937 H 672.0683 v 45.64063 h 148.92261 l 16.63096,16.63094 v 155.72618 l -13.60715,13.60715 H 740.104 l -18.14285,44.60118 H 641.07424 L 615.74986,603.09226 V 459.83928 h -87.3125 v 142.875 l -24.56847,24.56844 h -83.7526 z"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
|
||||
</g>
|
||||
<g
|
||||
inkscape:groupmode="layer"
|
||||
id="layer7"
|
||||
inkscape:label="Lines">
|
||||
<path
|
||||
style="display:inline;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient843);stroke-width:6.3499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 829.90305,159.38602 H 930.80024 Z M 508.70664,282.94643 h 129.21279 z m 311.30502,6.04771 H 926.7297 Z m -597.52682,41.57729 h 172.24581 z m 613.57133,4.02767 H 936.69343 Z M 222.48484,464.97976 h 172.24581 z m 612.2608,103.90582 H 950.06987 Z M 223.03261,602.71451 V 767.04092 H 395.5399 V 602.71451 Z m 288.01808,16.60467 v 114.25039 h 119.9379 V 619.31918 Z m 210.1546,8.3075 v 102.08783 z m 116.73707,175.41514 h 118.36382 z m -615.45752,91.62127 h 172.24581 z"
|
||||
id="rect834"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<g
|
||||
inkscape:groupmode="layer"
|
||||
id="layer6"
|
||||
inkscape:label="Outline">
|
||||
<path
|
||||
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
|
||||
inkscape:connector-curvature="0"
|
||||
d="m 395.53969,602.71428 -1.66187,-558.230658 -171.96775,0.0094 1.12252,558.221258 -26.04255,22.86754 H 31.785872 v 112.8078 H 199.59808 l 23.43451,28.65132 2.37142,221.965 h 170.07078 l 0.0649,-221.965 34.24587,-32.41298 h 70.68156 l 22.86754,22.86756 v 214.87945 h 88.25746 V 758.44046 l 28.72618,-28.72619 h 80.88691 l 30.10871,52.1498 h 62.87341 l 28.35368,28.35368 v 175.0084 H 956.30639 V 803.04164 L 992.21413,767.1339 V 611.02976 L 950.06979,568.88542 V 346.44643 L 926.72976,323.1064 v -34.11236 h 43.93972 V 182.40477 L 930.80026,159.38626 V 34.994058 H 842.15757 V 147.63096 l -28.72618,28.72619 H 508.70661 v 106.58928 l 23.05656,23.05653 v 82.02084 h 80.50892 v -77.8631 l 24.56844,-24.56844 h 181.88253 l 19.84375,19.84375 v 28.91518 l -17.85938,17.85937 H 672.0683 v 45.64063 h 148.92261 l 16.63096,16.63094 v 155.72618 l -13.60715,13.60715 H 740.104 l -18.14285,44.60118 H 641.07424 L 615.74986,603.09226 V 459.83928 h -87.3125 v 142.875 l -24.56847,24.56844 h -83.7526 z"
|
||||
style="display:inline;fill:none;fill-opacity:1;stroke:url(#linearGradient957);stroke-width:10.58333302;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path851" />
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 7.0 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
|
@ -0,0 +1,105 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="1024mm"
|
||||
height="1024mm"
|
||||
viewBox="0 0 1024 1024"
|
||||
version="1.1"
|
||||
id="svg8"
|
||||
inkscape:version="0.92.4 5da689c313, 2019-01-14"
|
||||
sodipodi:docname="points.svg">
|
||||
<defs
|
||||
id="defs2">
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient826">
|
||||
<stop
|
||||
style="stop-color:#040d7f;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop822" />
|
||||
<stop
|
||||
style="stop-color:#0819f7;stop-opacity:1"
|
||||
offset="1"
|
||||
id="stop824" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient818">
|
||||
<stop
|
||||
style="stop-color:#5887ff;stop-opacity:1"
|
||||
offset="0"
|
||||
id="stop814" />
|
||||
<stop
|
||||
style="stop-color:#001a75;stop-opacity:1"
|
||||
offset="1"
|
||||
id="stop816" />
|
||||
</linearGradient>
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient818"
|
||||
id="radialGradient820"
|
||||
cx="474.72876"
|
||||
cy="-277.48386"
|
||||
fx="474.72876"
|
||||
fy="-277.48386"
|
||||
r="148.29896"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(1.7034536,0,0,1.7034536,-331.45225,182.08562)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient826"
|
||||
id="linearGradient828"
|
||||
x1="360.65833"
|
||||
y1="-390.38095"
|
||||
x2="658.80597"
|
||||
y2="-48.690479"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#3e0052"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.175"
|
||||
inkscape:cx="2418.1221"
|
||||
inkscape:cy="1904.2867"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
inkscape:pagecheckerboard="false" />
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,727)">
|
||||
<circle
|
||||
style="fill:url(#radialGradient820);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient828);stroke-width:12.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path812"
|
||||
cx="512"
|
||||
cy="-215"
|
||||
r="148.16667" />
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 3.0 KiB |
|
@ -0,0 +1,115 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="1024mm"
|
||||
height="1024mm"
|
||||
viewBox="0 0 1024 1024"
|
||||
version="1.1"
|
||||
id="svg8"
|
||||
inkscape:version="0.92.4 5da689c313, 2019-01-14"
|
||||
sodipodi:docname="polygons.svg">
|
||||
<defs
|
||||
id="defs2">
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient828">
|
||||
<stop
|
||||
style="stop-color:#762e04;stop-opacity:1"
|
||||
offset="0"
|
||||
id="stop824" />
|
||||
<stop
|
||||
style="stop-color:#c94c08;stop-opacity:1"
|
||||
offset="1"
|
||||
id="stop826" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient818">
|
||||
<stop
|
||||
style="stop-color:#df5f00;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop814" />
|
||||
<stop
|
||||
style="stop-color:#7c1400;stop-opacity:1"
|
||||
offset="1"
|
||||
id="stop816" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient818"
|
||||
id="linearGradient822"
|
||||
x1="283.00687"
|
||||
y1="-597.68164"
|
||||
x2="973.67822"
|
||||
y2="69.42305"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient828"
|
||||
id="linearGradient830"
|
||||
x1="178.91055"
|
||||
y1="-533.71918"
|
||||
x2="1031.5234"
|
||||
y2="60.936119"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#3e0052"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="0.12374369"
|
||||
inkscape:cx="1506.5459"
|
||||
inkscape:cy="2258.1171"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
inkscape:pagecheckerboard="false" />
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,727)">
|
||||
<path
|
||||
sodipodi:type="star"
|
||||
style="fill:url(#linearGradient822);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient830);stroke-width:12.69999981;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path812"
|
||||
sodipodi:sides="5"
|
||||
sodipodi:cx="543.09167"
|
||||
sodipodi:cy="-276.02585"
|
||||
sodipodi:r1="394.63321"
|
||||
sodipodi:r2="319.26495"
|
||||
sodipodi:arg1="3.0111893"
|
||||
sodipodi:arg2="3.6395079"
|
||||
inkscape:flatsided="true"
|
||||
inkscape:rounded="0"
|
||||
inkscape:randomized="0"
|
||||
d="m 151.80909,-224.71008 221.56542,-407.59018 456.10878,84.76895 60.3253,459.980267 L 470.9829,111.96345 Z"
|
||||
inkscape:transform-center-x="34.719587"
|
||||
inkscape:transform-center-y="-3.1042782"
|
||||
transform="rotate(8.9302154,134.23353,-216.27906)" />
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 3.5 KiB |
|
@ -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-map".to_string(),
|
||||
EntryType::Other => "image-missing".to_string(),
|
||||
EntryType::Physics => "applications-system".to_string(),
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
<item>
|
||||
<widget class="QLabel" name="labelImage">
|
||||
<property name="text">
|
||||
<string><img src="qrc:///tycho/misc/tycho2.png"/></string>
|
||||
<string><img src=":/tycho/images/tycho2.png"/></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
@ -19,10 +19,6 @@
|
|||
<property name="windowTitle">
|
||||
<string>Tycho</string>
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset resource="../resources/resources.qrc">
|
||||
<normaloff>:/tycho/color/pfhor-hand.png</normaloff>:/tycho/color/pfhor-hand.png</iconset>
|
||||
</property>
|
||||
<widget class="QWidget" name="widget">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<property name="spacing">
|
||||
|
@ -153,9 +149,6 @@
|
|||
</action>
|
||||
</widget>
|
||||
<layoutdefault spacing="6" margin="11"/>
|
||||
<resources>
|
||||
<include location="../resources/resources.qrc"/>
|
||||
</resources>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>actionMapProps</sender>
|
||||
|
|
|
@ -34,6 +34,12 @@
|
|||
<property name="horizontalScrollBarPolicy">
|
||||
<enum>Qt::ScrollBarAsNeeded</enum>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="viewMode">
|
||||
<enum>QListView::IconMode</enum>
|
||||
</property>
|
||||
|
|