Touching up the application #200
|
@ -74,4 +74,12 @@
|
||||||
.step-view {
|
.step-view {
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
margin: 8px;
|
margin: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.about__content {
|
||||||
|
padding: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.about label {
|
||||||
|
margin-bottom: 16px;
|
||||||
}
|
}
|
|
@ -0,0 +1,80 @@
|
||||||
|
/*
|
||||||
|
Copyright 2023 - 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
|
||||||
|
|
||||||
|
This file is part of FitnessTrax.
|
||||||
|
|
||||||
|
FitnessTrax is free software: you can redistribute it and/or modify it under the terms of the GNU
|
||||||
|
General Public License as published by the Free Software Foundation, either version 3 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
FitnessTrax is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
|
||||||
|
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along with FitnessTrax. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
use glib::Object;
|
||||||
|
use gtk::{prelude::*, subclass::prelude::*};
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct AboutWindowPrivate {}
|
||||||
|
|
||||||
|
#[glib::object_subclass]
|
||||||
|
impl ObjectSubclass for AboutWindowPrivate {
|
||||||
|
const NAME: &'static str = "AboutWindow";
|
||||||
|
type Type = AboutWindow;
|
||||||
|
type ParentType = gtk::Window;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ObjectImpl for AboutWindowPrivate {}
|
||||||
|
impl WidgetImpl for AboutWindowPrivate {}
|
||||||
|
impl WindowImpl for AboutWindowPrivate {}
|
||||||
|
|
||||||
|
glib::wrapper! {
|
||||||
|
pub struct AboutWindow(ObjectSubclass<AboutWindowPrivate>) @extends gtk::Window, gtk::Widget;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for AboutWindow {
|
||||||
|
fn default() -> Self {
|
||||||
|
let s: Self = Object::builder().build();
|
||||||
|
s.set_width_request(600);
|
||||||
|
s.set_height_request(700);
|
||||||
|
s.add_css_class("about");
|
||||||
|
|
||||||
|
s.set_title(Some("About Fitnesstrax"));
|
||||||
|
let copyright = gtk::Label::builder()
|
||||||
|
.label("Copyright 2023-2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>")
|
||||||
|
.halign(gtk::Align::Start)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
let gtk_rs_thanks = gtk::Label::builder()
|
||||||
|
.label("I owe a huge debt of gratitude to the GTK-RS project (https://gtk-rs.org/), which makes it possible for me to write this application to begin with. Further, I owe a particular debt to Julian Hofer and his book, GUI development with Rust and GTK 4 (https://gtk-rs.org/gtk4-rs/stable/latest/book/). Without this book, I would have continued to stumble around writing bad user interfaces with even worse code.")
|
||||||
|
.halign(gtk::Align::Start).wrap(true)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
let dependencies = gtk::Label::builder()
|
||||||
|
.label("This application depends on many libraries, most of which are licensed under the BSD-3 or GPL-3 licenses.")
|
||||||
|
.halign(gtk::Align::Start).wrap(true)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
let content = gtk::Box::builder()
|
||||||
|
.orientation(gtk::Orientation::Vertical)
|
||||||
|
.css_classes(["about__content"])
|
||||||
|
.build();
|
||||||
|
content.append(©right);
|
||||||
|
content.append(>k_rs_thanks);
|
||||||
|
content.append(&dependencies);
|
||||||
|
|
||||||
|
let scroller = gtk::ScrolledWindow::builder()
|
||||||
|
.child(&content)
|
||||||
|
.hexpand(true)
|
||||||
|
.vexpand(true)
|
||||||
|
.hscrollbar_policy(gtk::PolicyType::Never)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
s.set_child(Some(&scroller));
|
||||||
|
|
||||||
|
s
|
||||||
|
}
|
||||||
|
}
|
|
@ -89,6 +89,7 @@ impl AppWindow {
|
||||||
let header_bar = adw::HeaderBar::new();
|
let header_bar = adw::HeaderBar::new();
|
||||||
|
|
||||||
let main_menu = gio::Menu::new();
|
let main_menu = gio::Menu::new();
|
||||||
|
main_menu.append(Some("About"), Some("app.about"));
|
||||||
main_menu.append(Some("Quit"), Some("app.quit"));
|
main_menu.append(Some("Quit"), Some("app.quit"));
|
||||||
let main_menu_button = gtk::MenuButton::builder()
|
let main_menu_button = gtk::MenuButton::builder()
|
||||||
.icon_name("open-menu")
|
.icon_name("open-menu")
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
Copyright 2023, Savanni D'Gerinel <savanni@luminescent-dreams.com>
|
Copyright 2023 - 2024, Savanni D'Gerinel <savanni@luminescent-dreams.com>
|
||||||
|
|
||||||
This file is part of FitnessTrax.
|
This file is part of FitnessTrax.
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License along with FitnessTrax. If not, see <https://www.gnu.org/licenses/>.
|
You should have received a copy of the GNU General Public License along with FitnessTrax. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
mod about;
|
||||||
mod app;
|
mod app;
|
||||||
mod app_window;
|
mod app_window;
|
||||||
mod components;
|
mod components;
|
||||||
|
@ -33,6 +34,15 @@ const APP_ID_PROD: &str = "com.luminescent-dreams.fitnesstrax";
|
||||||
|
|
||||||
const RESOURCE_BASE_PATH: &str = "/com/luminescent-dreams/fitnesstrax/";
|
const RESOURCE_BASE_PATH: &str = "/com/luminescent-dreams/fitnesstrax/";
|
||||||
|
|
||||||
|
fn setup_app_about_action(app: &adw::Application) {
|
||||||
|
let action = ActionEntry::builder("about")
|
||||||
|
.activate(|app: &adw::Application, _, _| {
|
||||||
|
let window = about::AboutWindow::default();
|
||||||
|
window.present();
|
||||||
|
}).build();
|
||||||
|
app.add_action_entries([action]);
|
||||||
|
}
|
||||||
|
|
||||||
/// Sets up an application-global action, `app.quit`, which will terminate the application.
|
/// Sets up an application-global action, `app.quit`, which will terminate the application.
|
||||||
fn setup_app_close_action(app: &adw::Application) {
|
fn setup_app_close_action(app: &adw::Application) {
|
||||||
let action = ActionEntry::builder("quit")
|
let action = ActionEntry::builder("quit")
|
||||||
|
@ -80,6 +90,7 @@ fn main() {
|
||||||
let icon_theme = gtk::IconTheme::for_display(&gdk::Display::default().unwrap());
|
let icon_theme = gtk::IconTheme::for_display(&gdk::Display::default().unwrap());
|
||||||
icon_theme.add_resource_path(&(RESOURCE_BASE_PATH.to_owned() + "/icons/scalable/actions"));
|
icon_theme.add_resource_path(&(RESOURCE_BASE_PATH.to_owned() + "/icons/scalable/actions"));
|
||||||
|
|
||||||
|
setup_app_about_action(adw_app);
|
||||||
setup_app_close_action(adw_app);
|
setup_app_close_action(adw_app);
|
||||||
|
|
||||||
AppWindow::new(app_id, RESOURCE_BASE_PATH, adw_app, ft_app.clone());
|
AppWindow::new(app_id, RESOURCE_BASE_PATH, adw_app, ft_app.clone());
|
||||||
|
|
Loading…
Reference in New Issue