apply new style
This commit is contained in:
1 parent
b1902b35cb
commit
1847d4f44f
15 files changed
+147
-92
No files matched your search
+11
-6
@@ -9,9 +9,9 @@ use crate::navigation::{NavigatedPage, Page, RootMessage};
|
||||
use crate::notification::NotificationData::{CompressError, OpenFileError};
|
||||
use crate::notification::{MaybeError, NotificationData};
|
||||
use crate::pages::import::ImportMessage::*;
|
||||
use crate::push_error;
|
||||
use crate::styling::*;
|
||||
use crate::{jl_button, push_error_task};
|
||||
use crate::{jl_text_input, push_error};
|
||||
use iced::widget::button::danger;
|
||||
use iced::widget::container::success;
|
||||
use iced::widget::{
|
||||
@@ -269,7 +269,7 @@ impl ImportState {
|
||||
self.available_properties(),
|
||||
button("Добавить напрямую").on_press(SetupDirect),
|
||||
row![
|
||||
text_input("Пользовательское поле", &self.custom_property_name)
|
||||
jl_text_input!("Пользовательское поле", &self.custom_property_name)
|
||||
.on_input(EditCustomProperty),
|
||||
button("Установить привязку").on_press(SetupCustomProperty)
|
||||
]
|
||||
@@ -297,7 +297,7 @@ impl ImportState {
|
||||
.on_toggle(SwitchSkipEmpty),
|
||||
column![
|
||||
text!("Разделитель при множественном объединении"),
|
||||
text_input("", &self.separator).on_input(EditSeparator)
|
||||
jl_text_input!("", &self.separator).on_input(EditSeparator)
|
||||
]
|
||||
]
|
||||
.spacing(DEFAULT_SPACING)
|
||||
@@ -582,7 +582,11 @@ impl ImportState {
|
||||
.iter()
|
||||
.map(|field| field.identifier.clone())
|
||||
.collect();
|
||||
current_fields.append(&mut vec!["key".to_string(), "value".to_string(), "tags".to_string()]);
|
||||
current_fields.append(&mut vec![
|
||||
"key".to_string(),
|
||||
"value".to_string(),
|
||||
"tags".to_string(),
|
||||
]);
|
||||
for (field, _) in import_group {
|
||||
if current_fields.contains(field) {
|
||||
continue;
|
||||
@@ -600,5 +604,6 @@ impl ImportState {
|
||||
}
|
||||
|
||||
pub enum AnkiSchema {
|
||||
Old, Beta
|
||||
}
|
||||
Old,
|
||||
Beta,
|
||||
}
|
||||
Reference in new issue
Block a user