Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-04-12 08:28:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
Fabio Lenherr / DashieTM 2023-10-29 14:55:24 +01:00
parent 2b3527235e
commit a115ca1ad1
14 changed files with 124 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build.rs
View file

@ -4,4 +4,9 @@ fn main() {
"src/resources/resources.gresource.xml", "src/resources/resources.gresource.xml",
"src.templates.gresource", "src.templates.gresource",
); );
} glib_build_tools::compile_resources(
&["src/resources/icons"],
"src/resources/icons/resources.gresource.xml",
"src.icons.gresource",
);
}

2
src/components/audio/audioBox.rs
View file

@ -5,7 +5,7 @@ use crate::components::audio::AudioSourceEntry;
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/xetibo/reset/resetAudio.ui")] #[template(resource = "/org/Xetibo/ReSet/resetAudio.ui")]
pub struct AudioBox { pub struct AudioBox {
#[template_child] #[template_child]
pub resetOutputDevice: TemplateChild<DropDown>, pub resetOutputDevice: TemplateChild<DropDown>,

4
src/components/audio/audioSource.rs
View file

@ -3,7 +3,7 @@ use gtk::subclass::prelude::*;
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/xetibo/reset/resetAudioSourceEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetAudioSourceEntry.ui")]
pub struct AudioSourceEntry { pub struct AudioSourceEntry {
#[template_child] #[template_child]
pub resetSourceIcon: TemplateChild<Image>, pub resetSourceIcon: TemplateChild<Image>,
@ -38,4 +38,4 @@ impl BoxImpl for AudioSourceEntry {}
impl ObjectImpl for AudioSourceEntry {} impl ObjectImpl for AudioSourceEntry {}
impl WidgetImpl for AudioSourceEntry {} impl WidgetImpl for AudioSourceEntry {}

2
src/components/bluetooth/bluetoothBox.rs
View file

@ -5,7 +5,7 @@ use crate::components::bluetooth::BluetoothEntry;
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/xetibo/reset/resetBluetooth.ui")] #[template(resource = "/org/Xetibo/ReSet/resetBluetooth.ui")]
pub struct BluetoothBox { pub struct BluetoothBox {
#[template_child] #[template_child]
pub resetBluetoothSwitch: TemplateChild<Switch>, pub resetBluetoothSwitch: TemplateChild<Switch>,

2
src/components/bluetooth/bluetoothEntry.rs
View file

@ -3,7 +3,7 @@ use gtk::subclass::prelude::*;
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/xetibo/reset/resetBluetoothEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetBluetoothEntry.ui")]
pub struct BluetoothEntry { pub struct BluetoothEntry {
#[template_child] #[template_child]
pub resetBluetoothDeviceType: TemplateChild<Image>, pub resetBluetoothDeviceType: TemplateChild<Image>,

2
src/components/wifi/wifiBox.rs
View file

@ -6,7 +6,7 @@ use crate::components::wifi::WifiEntry;
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/xetibo/reset/resetWiFi.ui")] #[template(resource = "/org/Xetibo/ReSet/resetWiFi.ui")]
pub struct WifiBox { pub struct WifiBox {
#[template_child] #[template_child]
pub resetWifiList: TemplateChild<ListBox>, pub resetWifiList: TemplateChild<ListBox>,

2
src/components/wifi/wifiEntry.rs
View file

@ -3,7 +3,7 @@ use gtk::subclass::prelude::*;
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)] #[derive(Default, CompositeTemplate)]
#[template(resource = "/org/xetibo/reset/resetWifiEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetWifiEntry.ui")]
pub struct WifiEntry { pub struct WifiEntry {
#[template_child] #[template_child]
pub resetWifiStrength: TemplateChild<Image>, pub resetWifiStrength: TemplateChild<Image>,

33
src/components/window/mod.rs
View file

@ -191,21 +191,24 @@ impl Window {
fn setupPopoverButtons(&self) { fn setupPopoverButtons(&self) {
let selfImp = self.imp(); let selfImp = self.imp();
selfImp.resetAboutButton.connect_clicked(clone!(@ weak self as window => move |_| { selfImp
let dialog = adw::AboutWindow::builder() .resetAboutButton
.application_name("ReSet") .connect_clicked(clone!(@ weak self as window => move |_| {
// .application_icon("") let dialog = adw::AboutWindow::builder()
.developer_name("Xetibo") .application_name("ReSet")
.license_type(gtk::License::Gpl30) .application_icon("ReSet")
.website("https://github.com/Xetibo/ReSet") .developer_name("Xetibo")
.issue_url("https://github.com/Xetibo/ReSet/issues") .license("GPL-3.0")
.version("0.0.1") .license_type(gtk::License::Gpl30)
.transient_for(&window) .website("https://github.com/Xetibo/ReSet")
.modal(true) .issue_url("https://github.com/Xetibo/ReSet/issues")
.copyright("© 2022-2023 Xetibo") .version("0.0.1")
.developers(vec!["DashieTM".to_string(), "takatori".to_string()]) .transient_for(&window)
.designers(vec!["DashieTM".to_string(), "takatori".to_string()]) .modal(true)
.build(); .copyright("© 2022-2023 Xetibo")
.developers(vec!["DashieTM".to_string(), "Takatori".to_string()])
.designers(vec!["DashieTM".to_string(), "Takatori".to_string()])
.build();
dialog.present(); dialog.present();
})); }));

2
src/components/window/sidebarEntry.rs
View file

@ -16,7 +16,7 @@ pub enum Categories {
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[derive(CompositeTemplate, Default)] #[derive(CompositeTemplate, Default)]
#[template(resource = "/org/xetibo/reset/resetSidebarEntry.ui")] #[template(resource = "/org/Xetibo/ReSet/resetSidebarEntry.ui")]
pub struct SidebarEntry { pub struct SidebarEntry {
#[template_child] #[template_child]
pub resetSidebarLabel: TemplateChild<Label>, pub resetSidebarLabel: TemplateChild<Label>,

2
src/components/window/window.rs
View file

@ -11,7 +11,7 @@ use crate::components::window::SidebarEntry;
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[derive(CompositeTemplate, Default)] #[derive(CompositeTemplate, Default)]
#[template(resource = "/org/xetibo/reset/resetMainWindow.ui")] #[template(resource = "/org/Xetibo/ReSet/resetMainWindow.ui")]
pub struct Window { pub struct Window {
#[template_child] #[template_child]
pub resetMain: TemplateChild<FlowBox>, pub resetMain: TemplateChild<FlowBox>,

2
src/main.rs
View file

@ -10,6 +10,8 @@ const APP_ID: &str = "org.Xetibo.ReSet";
fn main() { fn main() {
gio::resources_register_include!("src.templates.gresource") gio::resources_register_include!("src.templates.gresource")
.expect("Failed to register resources."); .expect("Failed to register resources.");
gio::resources_register_include!("src.icons.gresource")
.expect("Failed to register resources.");
let app = Application::builder().application_id(APP_ID).build(); let app = Application::builder().application_id(APP_ID).build();

73
src/resources/icons/ReSet.svg Normal file
View file

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="#502100"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-settings"
version="1.1"
id="svg1"
sodipodi:docname="ReSet1.svg"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs1" />
<sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="38.541667"
inkscape:cx="12"
inkscape:cy="11.987027"
inkscape:window-width="3440"
inkscape:window-height="1440"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg1" />
<ellipse
cx="-12"
cy="-12.000001"
id="circle1"
transform="scale(-1)"
rx="2.25"
ry="2.2500007"
style="stroke-width:1.3;stroke-dasharray:none" />
<path
d="m 16.933331,14.000005 a 1.1000004,1.1000012 0 0 0 0.220001,1.213335 l 0.04,0.04 a 1.3333338,1.3333349 0 0 1 0,1.886671 1.3333338,1.3333349 0 0 1 -1.886668,0 l -0.04,-0.04 a 1.1000004,1.1000012 0 0 0 -1.213335,-0.219999 1.1000004,1.1000012 0 0 0 -0.666667,1.006667 v 0.113333 a 1.3333338,1.3333349 0 0 1 -1.333332,1.333326 1.3333338,1.3333349 0 0 1 -1.333334,-1.333336 v -0.06 a 1.1000004,1.1000012 0 0 0 -0.7200005,-1.006666 1.1000004,1.1000012 0 0 0 -1.213334,0.22 l -0.04,0.04 a 1.3333338,1.3333349 0 0 1 -1.8866673,0 1.3333338,1.3333349 0 0 1 0,-1.88667 l 0.04,-0.04001 A 1.1000004,1.1000012 0 0 0 7.1199943,14.053327 1.1000004,1.1000012 0 0 0 6.1133272,13.38666 H 5.9999939 A 1.3333338,1.3333349 0 0 1 4.66666,12.053336 1.3333338,1.3333349 0 0 1 5.9999939,10.720002 h 0.06 a 1.1000004,1.1000012 0 0 0 1.0066674,-0.7200024 1.1000004,1.1000012 0 0 0 -0.22,-1.2133349 l -0.04,-0.04 a 1.3333338,1.3333349 0 0 1 0,-1.8866689 1.3333338,1.3333349 0 0 1 1.8866674,0 l 0.04,0.040001 a 1.1000004,1.1000012 0 0 0 1.2133328,0.2199993 h 0.05333 A 1.1000004,1.1000012 0 0 0 10.666663,6.1133283 V 5.9999948 A 1.3333338,1.3333349 0 0 1 11.999996,4.66666 1.3333338,1.3333349 0 0 1 13.33333,5.9999948 v 0.06 a 1.1000004,1.1000012 0 0 0 0.666668,1.0066678 1.1000004,1.1000012 0 0 0 1.213333,-0.2200002 l 0.04,-0.04 a 1.3333338,1.3333349 0 0 1 1.886668,0 1.3333338,1.3333349 0 0 1 0,1.8866688 l -0.04,0.04 a 1.1000004,1.1000012 0 0 0 -0.220003,1.2133354 v 0.05333 a 1.1000004,1.1000012 0 0 0 1.006669,0.6666684 h 0.113334 A 1.3333338,1.3333349 0 0 1 19.333333,12 1.3333338,1.3333349 0 0 1 17.999999,13.333335 h -0.06 a 1.1000004,1.1000012 0 0 0 -1.006673,0.666667 z"
id="path1"
style="stroke-width:1.3;stroke-dasharray:none" />
<ellipse
style="fill:none;fill-opacity:1;stroke-width:1.3;stroke-dasharray:none"
id="path2"
cx="12.113708"
cy="12.113707"
rx="10.863708"
ry="10.863707" />
<rect
style="fill:none;fill-opacity:1;stroke-width:1.23083;stroke-dasharray:none"
id="rect2"
width="4.2691722"
height="0.06917306"
x="4.0028996"
y="4.8591166" />
<rect
style="fill:none;fill-opacity:1;stroke-width:1.23083;stroke-dasharray:none"
id="rect2-5"
width="0.069173172"
height="4.2691717"
x="3.849386"
y="0.64830494" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

6
src/resources/icons/resources.gresource.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/Xetibo/ReSet/icons/scalable/actions">
<file preprocess="xml-stripblanks">ReSet.svg</file>
</gresource>
</gresources>

20
src/resources/resources.gresource.xml
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<gresources> <gresources>
<gresource prefix="/org/xetibo/reset/"> <gresource prefix="/org/Xetibo/ReSet/">
<file compressed="true" preprocess="xml-stripblanks">resetMainWindow.ui</file> <file compressed="true" preprocess="xml-stripblanks">resetMainWindow.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetSidebarEntry.ui</file> <file compressed="true" preprocess="xml-stripblanks">resetSidebarEntry.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetWiFi.ui</file> <file compressed="true" preprocess="xml-stripblanks">resetWiFi.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetWifiEntry.ui</file> <file compressed="true" preprocess="xml-stripblanks">resetWifiEntry.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetBluetooth.ui</file> <file compressed="true" preprocess="xml-stripblanks">resetBluetooth.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetBluetoothEntry.ui</file> <file compressed="true" preprocess="xml-stripblanks">resetBluetoothEntry.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetAudio.ui</file> <file compressed="true" preprocess="xml-stripblanks">resetAudio.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetAudioSourceEntry.ui</file> <file compressed="true" preprocess="xml-stripblanks">resetAudioSourceEntry.ui</file>
</gresource> </gresource>
</gresources> </gresources>