diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 6762a68..fa58715 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -25,7 +25,7 @@ jobs: override: true - name: Install Gtk - run: sudo apt install -y libgtk-3-dev libasound2-dev + run: sudo apt-get update; sudo apt install -y libgtk-3-dev libasound2-dev - name: Check the format run: cargo fmt --all -- --check diff --git a/czkawka_gui/czkawka.glade b/czkawka_gui/czkawka.glade index a6f04bc..b2298cc 100644 --- a/czkawka_gui/czkawka.glade +++ b/czkawka_gui/czkawka.glade @@ -2257,7 +2257,7 @@ This program is free to use and will always be. True False - settings-app-symbolic + applications-engineering diff --git a/czkawka_gui/src/connect_header_buttons.rs b/czkawka_gui/src/connect_header_buttons.rs index b142494..a33936b 100644 --- a/czkawka_gui/src/connect_header_buttons.rs +++ b/czkawka_gui/src/connect_header_buttons.rs @@ -7,8 +7,7 @@ pub fn connect_button_about(gui_data: &GuiData) { let about_dialog = gui_data.about.about_dialog.clone(); let button_app_info = gui_data.header.button_app_info.clone(); button_app_info.connect_clicked(move |_| { - about_dialog.set_position(WindowPosition::Center); // Not working - + about_dialog.set_position(WindowPosition::CenterAlways); about_dialog.show(); let response = about_dialog.run(); if response != ResponseType::None { diff --git a/czkawka_gui/src/connect_settings.rs b/czkawka_gui/src/connect_settings.rs index ce126eb..bac6f95 100644 --- a/czkawka_gui/src/connect_settings.rs +++ b/czkawka_gui/src/connect_settings.rs @@ -2,6 +2,7 @@ extern crate gtk; use crate::gui_data::GuiData; use crate::saving_loading::{load_configuration, reset_configuration, save_configuration}; use gtk::prelude::*; +use gtk::WindowPosition; pub fn connect_settings(gui_data: &GuiData) { // Connect button settings @@ -12,6 +13,7 @@ pub fn connect_settings(gui_data: &GuiData) { button_settings.connect_clicked(move |_| { window_main.set_sensitive(false); window_settings.show(); + window_settings.set_position(WindowPosition::CenterAlways); }); let window_main = gui_data.window_main.clone(); diff --git a/czkawka_gui/src/gui_about.rs b/czkawka_gui/src/gui_about.rs index fea9c9f..9160985 100644 --- a/czkawka_gui/src/gui_about.rs +++ b/czkawka_gui/src/gui_about.rs @@ -1,4 +1,5 @@ use gtk::prelude::*; +use gtk::WindowPosition; #[derive(Clone)] pub struct GuiAbout { @@ -12,6 +13,7 @@ pub struct GuiAbout { impl GuiAbout { pub fn create_from_builder(builder: >k::Builder) -> Self { let about_dialog: gtk::AboutDialog = builder.get_object("about_dialog").unwrap(); + about_dialog.set_position(WindowPosition::CenterAlways); let button_repository: gtk::Button = builder.get_object("button_repository").unwrap(); let button_donation: gtk::Button = builder.get_object("button_donation").unwrap(); diff --git a/czkawka_gui/src/gui_data.rs b/czkawka_gui/src/gui_data.rs index 5f10913..e1f2aab 100644 --- a/czkawka_gui/src/gui_data.rs +++ b/czkawka_gui/src/gui_data.rs @@ -21,7 +21,7 @@ use czkawka_core::similar_images::SimilarImages; use czkawka_core::temporary::Temporary; use czkawka_core::zeroed::ZeroedFiles; use gtk::prelude::*; -use gtk::Builder; +use gtk::{Builder, WindowPosition}; use std::cell::RefCell; use std::collections::HashMap; use std::rc::Rc; @@ -87,6 +87,7 @@ impl GuiData { let window_main: gtk::Window = builder.get_object("window_main").unwrap(); window_main.show_all(); window_main.set_title("Czkawka"); + window_main.set_position(WindowPosition::CenterAlways); let main_notebook = GuiMainNotebook::create_from_builder(&builder); let upper_notebook = GuiUpperNotebook::create_from_builder(&builder); diff --git a/czkawka_gui/src/gui_settings.rs b/czkawka_gui/src/gui_settings.rs index e6218b4..4b63236 100644 --- a/czkawka_gui/src/gui_settings.rs +++ b/czkawka_gui/src/gui_settings.rs @@ -1,4 +1,5 @@ use gtk::prelude::*; +use gtk::WindowPosition; #[derive(Clone)] pub struct GuiSettings { @@ -29,6 +30,7 @@ pub struct GuiSettings { impl GuiSettings { pub fn create_from_builder(builder: >k::Builder) -> Self { let window_settings: gtk::Window = builder.get_object("window_settings").unwrap(); + window_settings.set_position(WindowPosition::CenterAlways); // General let check_button_settings_save_at_exit: gtk::CheckButton = builder.get_object("check_button_settings_save_at_exit").unwrap();