From 9319f9aa4c91ccee8960f302dfbab94ed9b77e53 Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Fri, 13 Oct 2023 12:08:35 +0500 Subject: [PATCH] Update --- .env_debug | 4 +++ Cargo.toml | 4 +-- assets/icons/Melawy.png | Bin 0 -> 2943 bytes assets/icons/Melawy.svg | 53 ++++++++++++++++++++++++++++++++++++++++ src/main.rs | 21 +++++++++++++--- 5 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 .env_debug create mode 100644 assets/icons/Melawy.png create mode 100644 assets/icons/Melawy.svg diff --git a/.env_debug b/.env_debug new file mode 100644 index 0000000..135fe79 --- /dev/null +++ b/.env_debug @@ -0,0 +1,4 @@ +# RUN="sudo" +# PARAM="/usr/bin/pacman -Syu --needed --noconfirm" +RUN="find" +PARAM=".git" diff --git a/Cargo.toml b/Cargo.toml index 2c0a0ca..426cdf1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] futures = "^0.3" fltk = { version = "^1.4", features = ["fltk-bundled"] } -# fltk-theme = "^0.7" -tokio = { version = "1.28.1", features = ["full"] } +fltk-theme = "^0.7" +tokio = { version = "^1.33", features = ["full"] } # bytes = "^1.4" dotenv = "^0.15" diff --git a/assets/icons/Melawy.png b/assets/icons/Melawy.png new file mode 100644 index 0000000000000000000000000000000000000000..4c8418683133556e72ae9572dfa087db047a95fe GIT binary patch literal 2943 zcmeH}>rdKe6vq$DdTqTfPMwz~ns!;%F4PWnBGyJzO$XYou~?}^sS+jyFI3o6?3~$j zP}^;(ZlR!Ax48t{PDxiM3RV+nhL>)1)n6^5V&`H(1S^QYfx|yxZ}7$X;>mgP4dn ziZ(@2lFwV;(d4c8j>x{g@T|W=*8^S+3W#i`v<^#riiHiBv||6d=I`$oP{IqsaM#~p zCRt5VKKE+AAYbuV;3yI{w_$d(U)PXK^_I6!C;!2Vo- zW7hyK@5caSdFE<<+3>&L!$YKZ!KGI$8?8oN5h_cMZC4nrznhW+?X%`v)q=UUS;t)c zfTG?}V~-x$IC2QoehL4SiLBR|Xk~Fnmk6g!K}D^8#;Q$|DY0<6Sm|^{bn(YxXOMLJdg-#bTE!7)Ts^~i^_vjNvKI?!POMM+n%is{4 zMbl2FMPuc2HuTdaiWD`Uw{Z@nUmV;W*L2GfzqRqRPu ze;}3+Fy43YWJLn38Dcb7ZIR&6%1e2O9jxZOFnz!F(kOvwYE;Kk|k ze9G6mu)c?g>6PPxWW4x1X~wlg>EMuN8k<=7O!3d@>i&j$Q8n+kx(9COa%M`$v*)sq z^XDX2Cn`1&oO-Me8A_w4GK!Q()%;7NHZ8g=Menc3w6KV>GLlkx%Q4DS^Mj16S%cRqmKo^bmPH`s$3fICn5zrN* z?RPUi78%-cb7$)xMR@;H{+ngT5a>NUAsVB`@*c&lYa#JF$o8I|uCB)H(f%ObK6km$vMG$pzKGyqbK|(5?W6i~CZR + + + + + + + + + diff --git a/src/main.rs b/src/main.rs index 30b877c..26b1ee2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,7 +2,8 @@ extern crate dotenv; -use fltk::{prelude::*, app, text::SimpleTerminal, frame::Frame, window::Window}; +use fltk::{prelude::*, app, text::SimpleTerminal, enums::Color, frame, window, /*button,*/ image}; +use fltk_theme::{/*ColorTheme, color_themes, widget_themes, */WidgetTheme, ThemeType, /*WidgetScheme, SchemeType*/}; use tokio::io::{self, BufReader, AsyncBufReadExt}; use tokio::process::Command; @@ -14,6 +15,7 @@ use std::path::Path; async fn run_process() -> tokio::process::Child { let env_path = Path::new("/etc/arch-linux-updater/.env"); + // let env_path = Path::new(".env_debug"); dotenv::from_path(env_path).unwrap(); @@ -73,18 +75,29 @@ async fn gui() -> io::Result<()> { let height = 700; let app = app::App::default(); - let mut wind: fltk::window::DoubleWindow = Window::default() + // let app = app::App::default().with_scheme(app::Scheme::Gtk); // Base, Gleam, Gtk, Oxy, Plastic + + let widget_theme = WidgetTheme::new(ThemeType::Dark); + widget_theme.apply(); + + let mut wind: fltk::window::DoubleWindow = window::Window::default() .with_size(width, height) .center_screen() .with_label("Arch Linux Updater"); - let frame = Frame::default_fill() + let image = image::PngImage::load("assets/icons/Melawy.png").unwrap(); + // let image = image::PngImage::load(&std::path::Path::new("assets/icons/Melawy.png")).unwrap(); + wind.set_icon(Some(image)); + + let frame = frame::Frame::default_fill() .with_size(width, height) .center_of(&wind); let mut terminal: SimpleTerminal = SimpleTerminal::default_fill() .with_size(width, height) .center_of(&frame); + terminal.set_color(Color::Background2); + terminal.set_text_color(Color::Light2); wind.make_resizable(true); wind.end(); @@ -94,6 +107,8 @@ async fn gui() -> io::Result<()> { let mut lines: io::Lines> = get_lines().await; + + // app.run().unwrap(); while app.wait() { if let Some(line) = get_line(&mut lines).await? { terminal.append(format!("{}\n", line).as_str());