diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 6e65dd8..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "lldb", - "request": "launch", - "name": "Debug executable 'post_maker'", - "cargo": { - "args": [ - "build", - "--bin=post_maker", - "--package=post_maker" - ], - "filter": { - "name": "post_maker", - "kind": "bin" - } - }, - "args": [], - "cwd": "${workspaceFolder}" - }, - { - "type": "lldb", - "request": "launch", - "name": "Debug unit tests in executable 'post_maker'", - "cargo": { - "args": [ - "test", - "--no-run", - "--bin=post_maker", - "--package=post_maker" - ], - "filter": { - "name": "post_maker", - "kind": "bin" - } - }, - "args": [], - "cwd": "${workspaceFolder}" - } - ] -} \ No newline at end of file diff --git a/imgs/75e253532946877dea6aaa5a60ffd51a.conf b/imgs/75e253532946877dea6aaa5a60ffd51a.conf deleted file mode 100644 index 5dba742..0000000 --- a/imgs/75e253532946877dea6aaa5a60ffd51a.conf +++ /dev/null @@ -1 +0,0 @@ -{"path":"/home/piyush/Projects/post_maker/imgs/75e253532946877dea6aaa5a60ffd51a.jpg","dimension":[400.0,500.0],"original_dimension":[720.0,1280.0],"crop_position":[0.0,190.0],"quote":"wow!","tag":"@juzlilthings","quote_position":853.3333333333334,"tag_position":853.3333333333334,"rgba":[25,29,34,190],"is_saved":false} \ No newline at end of file diff --git a/imgs/75e253532946877dea6aaa5a60ffd51a.jpg b/imgs/75e253532946877dea6aaa5a60ffd51a.jpg deleted file mode 100644 index c3da35f..0000000 Binary files a/imgs/75e253532946877dea6aaa5a60ffd51a.jpg and /dev/null differ diff --git a/imgs/bearbrickjia-20211228-0002.conf b/imgs/bearbrickjia-20211228-0002.conf deleted file mode 100644 index a836b51..0000000 --- a/imgs/bearbrickjia-20211228-0002.conf +++ /dev/null @@ -1 +0,0 @@ -{"path":"/home/piyush/Projects/post_maker/bearbrickjia-20211228-0002.jpg","dimension":[400.0,500.0],"original_dimension":[1440.0,1124.0],"crop_position":[270.4,0.0],"quote":"hello","tag":"","quote_position":749.3333333333334,"tag_position":749.3333333333334,"rgba":[25,29,34,190],"is_saved":false} \ No newline at end of file diff --git a/imgs/bearbrickjia-20211228-0002.jpg b/imgs/bearbrickjia-20211228-0002.jpg deleted file mode 100644 index 552f2e1..0000000 Binary files a/imgs/bearbrickjia-20211228-0002.jpg and /dev/null differ diff --git a/imgs/eae7e510f03c7afc0d44863525df184f.jpg b/imgs/eae7e510f03c7afc0d44863525df184f.jpg deleted file mode 100644 index bead3c8..0000000 Binary files a/imgs/eae7e510f03c7afc0d44863525df184f.jpg and /dev/null differ diff --git a/imgs/export/75e253532946877dea6aaa5a60ffd51a.jpg b/imgs/export/75e253532946877dea6aaa5a60ffd51a.jpg deleted file mode 100644 index 1b06daa..0000000 Binary files a/imgs/export/75e253532946877dea6aaa5a60ffd51a.jpg and /dev/null differ diff --git a/src/crop_window.rs b/src/crop_window.rs index 4c3ae33..99a7a84 100644 --- a/src/crop_window.rs +++ b/src/crop_window.rs @@ -1,6 +1,10 @@ -use crate::utils::{self, Coord, ImageContainer, ImageProperties}; +use crate::{ + globals, + utils::{self, Coord, ImageContainer, ImageProperties}, +}; use fltk::{ - app, button::Button, draw, enums::Event, frame::Frame, group::Flex, prelude::*, window::Window, + app, button::Button, draw, enums::Event, frame::Frame, group::Flex, image::SvgImage, + prelude::*, window::Window, }; use image::GenericImageView; use std::{ @@ -29,6 +33,9 @@ pub(crate) struct Page { impl CropWindow { pub(crate) fn new() -> Self { let mut win = Window::new(0, 0, 500, 600, "Crop").center_screen(); + if let Ok(image) = SvgImage::from_data(&globals::ICON) { + win.set_icon(Some(image)); + } let mut main_flex = Flex::default().size_of_parent().column(); diff --git a/src/main_window.rs b/src/main_window.rs index db720e4..0c8dcce 100644 --- a/src/main_window.rs +++ b/src/main_window.rs @@ -1,7 +1,7 @@ -use crate::config_window::ConfigWindow; use crate::crop_window::CropWindow; use crate::draw_thread::*; use crate::utils::ImageProperties; +use crate::{config_window::ConfigWindow, globals}; use fltk::{ app, button::Button, @@ -10,6 +10,7 @@ use fltk::{ enums::Shortcut, frame::Frame, group::Flex, + image::SvgImage, input::{Input, MultilineInput}, menu, misc::Spinner, @@ -55,6 +56,9 @@ impl MainWindow { draw_buff: Arc>>, ) -> Self { let mut win = Window::new(0, 0, 1000, 600, "Post Maker").center_screen(); + if let Ok(image) = SvgImage::from_data(&globals::ICON) { + win.set_icon(Some(image)); + } let mut main_flex = Flex::default().size_of_parent().column(); let menubar = menu::SysMenuBar::default();