fix some warnings

diff --git a/application/note/src/attachments_window.rs b/application/note/src/attachments_window.rs
index 58a1a4401994627adb4b1c67a51777f83f7c49e7..b53e46208c6349b6b38630fd6a3b63f01878861b 100644 (file)
--- a/application/note/src/attachments_window.rs
+++ b/application/note/src/attachments_window.rs
@@ -83,9 +83,9 @@ pub struct AttachmentsWindow {
     pub webview: UiWeb,
 }
 
-struct Attachment {
-    attachment: entity::attachment::Model,
-    content: Option<entity::attachmentcontent::Model>
+pub struct Attachment {
+    pub attachment: entity::attachment::Model,
+    pub content: Option<entity::attachmentcontent::Model>
 }
 
 impl Attachment {
@@ -119,7 +119,7 @@ impl AttachmentsWindow {
 
         let proxy = obj.obj_proxy();
         self.backend.get_note_attachments(self.note_id, move|result|{
-            proxy.call_mainthread(move |doc, wdata|{
+            proxy.call_mainthread(move |_doc, wdata|{
                 match result {
                     Ok(attachments) => {
                         println!("attachments loaded");
@@ -147,10 +147,12 @@ impl AttachmentsWindow {
     }
 
     pub fn show_attachment(&mut self, index: usize) {
-        let a = self.attachments.get(index);
         if let Some(attachment) = self.attachments.get(index) {
             if let Some(content) = &attachment.content {
-                self.image.image_load_data(&content.content);
+                let result = self.image.image_load_data(&content.content);
+                if result.is_err() {
+                    println!("Cannot load image");
+                }
             }
         }
     }
@@ -171,7 +173,7 @@ impl AttachmentsWindow {
             let proxy = obj.obj_proxy();
             let attachment_id = a?.attachment.attachment_id;
             self.backend.get_attachment_content(attachment_id, move|result|{
-                proxy.call_mainthread(move |doc, wdata|{
+                proxy.call_mainthread(move |_doc, wdata|{
                     match result {
                         Ok(content) => {
                             let a = wdata.attachments.get_mut(index);

diff --git a/application/note/src/window.rs b/application/note/src/window.rs
index 076595bad7fe4533b619dacfa7fa6e4335d8c28e..4ac0ca1b6c17f22b72fa95ace8538a1a1fd7c6bf 100644 (file)
--- a/application/note/src/window.rs
+++ b/application/note/src/window.rs
@@ -289,13 +289,13 @@ pub fn create_window(app: &App, ctx: &AppContext<MainWindow>) -> UiObject<MainWi
                         button!(obj, label = "Close", action = "note_title_close");
                     });
                     hbox!(obj, visibility_states = &[AppStates::NoteHasAttachments], margin = 10, spacing = 4, |obj|{
-                        let mut w = scrolledwindow!(obj, fill = true, |obj|{
+                        let w = scrolledwindow!(obj, fill = true, |obj|{
                             obj.itemlist::<Attachment>()
                                 .varname("note_attachments")
                                 .container(SubContainer::HBox)
-                                .createui(|obj, wdata, at, _i|{
-                                    let note_id = at.attachment.note_id;
-                                    let attachment_id = at.attachment.attachment_id;
+                                .createui(|obj, _wdata, attachment, _i|{
+                                    let note_id = attachment.attachment.note_id;
+                                    let attachment_id = attachment.attachment.attachment_id;
                                 
                                     let imgviewer = imageviewer!(obj,
                                             scrollview = false,
@@ -304,7 +304,7 @@ pub fn create_window(app: &App, ctx: &AppContext<MainWindow>) -> UiObject<MainWi
                                                 attachments_window_create(event.data.backend.clone(), note_id, Some(attachment_id));
                                             });
                                     imgviewer.set_size(100, 80);
-                                    if let Some(thumbnail) = &at.attachment.thumbnail {
+                                    if let Some(thumbnail) = &attachment.attachment.thumbnail {
                                         imgviewer.load_data(thumbnail);
                                     }
                                 })