From 60760d779f964ca540d56e611157bf357add2d37 Mon Sep 17 00:00:00 2001 From: takotori Date: Tue, 7 Nov 2023 15:42:32 +0100 Subject: [PATCH] Fix typo Export cambalache to ui --- src/components/temp/settingBoxImpl.rs | 3 +- src/components/window/handleSidebarClick.rs | 4 - src/resources/resetAudio.ui | 94 ++++----- src/resources/resetAudioSourceEntry.ui | 104 +++++----- src/resources/resetBluetooth.ui | 202 ++++++++++---------- src/resources/resetBluetoothEntry.ui | 54 +++--- src/resources/resetMainWindow.ui | 6 +- src/resources/resetMicSourceEntry.ui | 62 ++++++ src/resources/resetMicrophone.ui | 61 ++++++ src/resources/resetSettingBox.ui | 14 +- src/resources/resetSidebarEntry.ui | 32 ++-- src/resources/resetUI.cmb | 4 +- 12 files changed, 379 insertions(+), 261 deletions(-) create mode 100644 src/resources/resetMicSourceEntry.ui create mode 100644 src/resources/resetMicrophone.ui diff --git a/src/components/temp/settingBoxImpl.rs b/src/components/temp/settingBoxImpl.rs index 115fd31..aee042e 100644 --- a/src/components/temp/settingBoxImpl.rs +++ b/src/components/temp/settingBoxImpl.rs @@ -1,4 +1,3 @@ -use adw::NavigationView; use gtk::{CompositeTemplate, glib}; use gtk::prelude::*; use gtk::subclass::prelude::*; @@ -6,7 +5,7 @@ use crate::components::temp::settingBox; #[allow(non_snake_case)] #[derive(Default, CompositeTemplate)] -#[template(resource = "/org/Xetibo/ReSet/resetSetting.ui")] +#[template(resource = "/org/Xetibo/ReSet/resetSettingBox.ui")] pub struct SettingBox {} #[glib::object_subclass] diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs index 85f6ac8..2df58fd 100644 --- a/src/components/window/handleSidebarClick.rs +++ b/src/components/window/handleSidebarClick.rs @@ -8,8 +8,6 @@ use crate::components::wifi::wifiBox::WifiBox; pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) = |resetMain: FlowBox| { let wifiBox = SettingBox::new(&WifiBox::new()); let bluetoothBox = SettingBox::new(&BluetoothBox::new()); - wifiBox.set_width_request(500); // todo why not working from ui file - bluetoothBox.set_width_request(500); // todo why not working from ui file resetMain.remove_all(); resetMain.insert(&wifiBox, -1); resetMain.insert(&bluetoothBox, -1); @@ -18,7 +16,6 @@ pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) = |resetMain: FlowBox| { pub const HANDLE_WIFI_CLICK: fn(FlowBox) = |resetMain: FlowBox| { let wifiBox = SettingBox::new(&WifiBox::new()); - wifiBox.set_width_request(500); // todo why not working from ui file resetMain.remove_all(); resetMain.insert(&wifiBox, -1); resetMain.set_max_children_per_line(1); @@ -26,7 +23,6 @@ pub const HANDLE_WIFI_CLICK: fn(FlowBox) = |resetMain: FlowBox| { pub const HANDLE_BLUETOOTH_CLICK: fn(FlowBox) = |resetMain: FlowBox| { let bluetoothBox = SettingBox::new(&BluetoothBox::new()); - bluetoothBox.set_width_request(500); // todo why not working from ui file resetMain.remove_all(); resetMain.insert(&bluetoothBox, -1); resetMain.set_max_children_per_line(1); diff --git a/src/resources/resetAudio.ui b/src/resources/resetAudio.ui index cd7808d..9caf71a 100644 --- a/src/resources/resetAudio.ui +++ b/src/resources/resetAudio.ui @@ -1,57 +1,57 @@ - - diff --git a/src/resources/resetAudioSourceEntry.ui b/src/resources/resetAudioSourceEntry.ui index ddea1c5..b9ecaac 100644 --- a/src/resources/resetAudioSourceEntry.ui +++ b/src/resources/resetAudioSourceEntry.ui @@ -1,62 +1,62 @@ - - diff --git a/src/resources/resetBluetooth.ui b/src/resources/resetBluetooth.ui index 1652aa9..aadaeda 100644 --- a/src/resources/resetBluetooth.ui +++ b/src/resources/resetBluetooth.ui @@ -1,119 +1,117 @@ - - diff --git a/src/resources/resetBluetoothEntry.ui b/src/resources/resetBluetoothEntry.ui index 61e02c1..08232d5 100644 --- a/src/resources/resetBluetoothEntry.ui +++ b/src/resources/resetBluetoothEntry.ui @@ -1,31 +1,31 @@ - - + + diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui index 6917b87..b78ed90 100644 --- a/src/resources/resetMainWindow.ui +++ b/src/resources/resetMainWindow.ui @@ -135,14 +135,14 @@ 25 + center True True + True 5 25 none start - center - True @@ -196,7 +196,7 @@ - + diff --git a/src/resources/resetMicSourceEntry.ui b/src/resources/resetMicSourceEntry.ui new file mode 100644 index 0000000..88bf752 --- /dev/null +++ b/src/resources/resetMicSourceEntry.ui @@ -0,0 +1,62 @@ + + + + + + diff --git a/src/resources/resetMicrophone.ui b/src/resources/resetMicrophone.ui new file mode 100644 index 0000000..cb862d2 --- /dev/null +++ b/src/resources/resetMicrophone.ui @@ -0,0 +1,61 @@ + + + + + + diff --git a/src/resources/resetSettingBox.ui b/src/resources/resetSettingBox.ui index 765885a..1c51a92 100644 --- a/src/resources/resetSettingBox.ui +++ b/src/resources/resetSettingBox.ui @@ -1,11 +1,11 @@ - - + + diff --git a/src/resources/resetSidebarEntry.ui b/src/resources/resetSidebarEntry.ui index b4ed050..6c4cd41 100644 --- a/src/resources/resetSidebarEntry.ui +++ b/src/resources/resetSidebarEntry.ui @@ -1,22 +1,22 @@ - - diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb index 8c8c8c5..84047fb 100644 --- a/src/resources/resetUI.cmb +++ b/src/resources/resetUI.cmb @@ -202,8 +202,10 @@ (3,42,"GtkWidget","width-request","150",None,None,None,None,None,None,None,None,None), (3,43,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None), (3,45,"GtkFlowBox","column-spacing","25",None,None,None,None,None,None,None,None,None), + (3,45,"GtkFlowBox","homogeneous","True",None,None,None,None,None,None,None,None,None), (3,45,"GtkFlowBox","row-spacing","25",None,None,None,None,None,None,None,None,None), (3,45,"GtkFlowBox","selection-mode","none",None,None,None,None,None,None,None,None,None), + (3,45,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None), (3,45,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), (3,45,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None), (3,45,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None), @@ -325,7 +327,7 @@ (7,12,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None), (7,12,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None), (8,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None), - (8,1,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None), + (8,1,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None), (8,1,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None), (8,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None), (8,1,"GtkWidget","width-request","400",None,None,None,None,None,None,None,None,None),