marrub
/
Maraiah
1
0
Fork 0
Code Issues Pull Requests Releases Activity

begin work on Tycho

png-branch
an 2019-02-25 07:06:11 -05:00
parent 0361e9cdfd
commit d9151a53dd
8 changed files with 412 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
/target
/out
data/*.res
**/*.rs.bk
Cargo.lock
perf.data*

18
Cargo.toml
View File

@ -10,17 +10,27 @@ license = "MIT"
edition = "2018"
publish = false
build = "src/build.rs"
[dependencies]
argparse = "0.2"
bitflags = "1.0"
failure = "0.1"
generic-array = "0.12"
#gtk = "0.4"
memmap = "0.6"
memmap = "0.7"
serde = {version = "1.0", features = ["derive"]}
serde_yaml = "0.8"
# note: these have to be updated all at once, check the gtk crate for versions
atk = "0.6"
cairo-rs = "0.6"
gdk = "0.10"
gdk-pixbuf = "0.6"
gtk = "0.6"
gio = "0.6"
glib = "0.7"
pango = "0.6"
[profile.dev]
opt-level = 1
@ -35,3 +45,7 @@ path = "src/lib.rs"
[[bin]]
name = "leela"
path = "src/leela/main.rs"
[[bin]]
name = "tycho"
path = "src/tycho/main.rs"

319
data/tycho.xml Normal file
View File

@ -0,0 +1,319 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1
The MIT License (MIT)
Copyright (c) 2018-2019 Alison Sanderson
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Author: Alison Sanderson
-->
<interface>
<requires lib="gtk+" version="3.10"/>
<!-- interface-license-type mit -->
<!-- interface-name Maraiah Tycho -->
<!-- interface-description Tycho map editor for Maraiah. -->
<!-- interface-copyright 2018-2019 Alison Sanderson -->
<!-- interface-authors Alison Sanderson -->
<object class="GtkAboutDialog" id="win_about">
<property name="can_focus">False</property>
<property name="type_hint">dialog</property>
<property name="program_name">Tycho</property>
<property name="copyright" translatable="yes">2018-2019 Alison Sanderson</property>
<property name="comments" translatable="yes">greetigs i am tico the of superior ai to durdumbal go shoot my soldiers because its funny or ill put you in space</property>
<property name="website_label" translatable="yes">Website</property>
<property name="logo">resource:///net/greyserv/maraiah/tycho/tycho2.png</property>
<property name="license_type">mit-x11</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<object class="GtkWindow" id="win_tycho">
<property name="can_focus">False</property>
<property name="default_width">440</property>
<property name="default_height">250</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkMenuBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_File</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem">
<property name="label">gtk-new</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem">
<property name="label">gtk-open</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem">
<property name="label">gtk-save</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem">
<property name="label">gtk-save-as</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem">
<property name="label">gtk-quit</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkMenuItem">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Edit</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem">
<property name="label">gtk-cut</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem">
<property name="label">gtk-copy</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem">
<property name="label">gtk-paste</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem">
<property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkMenuItem">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_View</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="btn_about">
<property name="label">gtk-about</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkToolPalette">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkToolItemGroup">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkToolButton">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Points</property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-media-play</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkDrawingArea" id="draw_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkPaned">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<child internal-child="accessible">
<object class="AtkObject" id="win_tycho-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Tycho Map Editor</property>
<property name="AtkObject::accessible-description" translatable="yes">The main window of the Tycho map editor.</property>
<property name="AtkObject::accessible-role" translatable="yes">window</property>
</object>
</child>
</object>
</interface>

BIN
data/tycho1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
data/tycho2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

7
data/tycho_res.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/net/greyserv/maraiah/tycho">
<file compressed="true" alias="tycho1.png">data/tycho1.png</file>
<file compressed="true" alias="tycho2.png">data/tycho2.png</file>
</gresource>
</gresources>

14
src/build.rs Normal file
View File

@ -0,0 +1,14 @@
use std::process::Command;
fn main()
{
println!("cargo:rerun-if-changed=data");
Command::new("glib-compile-resources")
.arg("data/tycho_res.xml")
.arg("--target=data/tycho.res")
.status()
.unwrap();
}
// EOF

55
src/tycho/main.rs Normal file
View File

@ -0,0 +1,55 @@
use gtk::prelude::*;
use gio::prelude::*;
use maraiah::durandal::err::*;
// TODO: add detached draw area mode, make everything detachable
const RESOURCE: &'static [u8] =
include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/data/tycho.res"));
const XML: &'static str =
include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/data/tycho.xml"));
fn run_app(app: &gtk::Application)
{
let b = gtk::Builder::new_from_string(XML);
let win: gtk::Window = b.get_object("win_tycho").unwrap();
let abt: gtk::AboutDialog = b.get_object("win_about").unwrap();
let bt_abt: gtk::MenuItem = b.get_object("btn_about").unwrap();
abt.set_authors(&env!("CARGO_PKG_AUTHORS").split(';').collect::<Vec<_>>());
abt.set_version(env!("CARGO_PKG_VERSION"));
abt.set_website(env!("CARGO_PKG_HOMEPAGE"));
{
let abt = abt.clone();
bt_abt.connect_activate(move |_| {
abt.run();
abt.hide();
});
}
win.set_application(app);
win.show_all();
}
fn main() -> ResultS<()>
{
let rsrc = glib::Bytes::from(&RESOURCE[..]);
let rsrc = gio::Resource::new_from_data(&rsrc)?;
gio::resources_register(&rsrc);
let app = gtk::Application::new("net.greyserv.maraiah.tycho",
gio::ApplicationFlags::empty())?;
app.connect_activate(run_app);
if app.run(&[]) == 0 {
Ok(())
} else {
Err(err_msg("bad return"))
}
}
// EOF