|
@@ -40,7 +40,6 @@ struct _IridiumWindow
|
|
|
GSettings *window_state;
|
|
GSettings *window_state;
|
|
|
|
|
|
|
|
GtkHeaderBar *header_bar;
|
|
GtkHeaderBar *header_bar;
|
|
|
- GtkListBox *tag_list;
|
|
|
|
|
GtkListBox *note_list;
|
|
GtkListBox *note_list;
|
|
|
GtkWidget *title_entry;
|
|
GtkWidget *title_entry;
|
|
|
GtkWidget *source_view;
|
|
GtkWidget *source_view;
|
|
@@ -179,23 +178,10 @@ preview_toggled (GSimpleAction *action,
|
|
|
static gboolean
|
|
static gboolean
|
|
|
note_visible (IridiumNoteRow *row, IridiumWindow *window)
|
|
note_visible (IridiumNoteRow *row, IridiumWindow *window)
|
|
|
{
|
|
{
|
|
|
- IridiumNote *note;
|
|
|
|
|
- IridiumTagRow *tag_row;
|
|
|
|
|
-
|
|
|
|
|
- tag_row = IRIDIUM_TAG_ROW (gtk_list_box_get_selected_row (window->tag_list));
|
|
|
|
|
-
|
|
|
|
|
- if (tag_row == NULL)
|
|
|
|
|
- return TRUE;
|
|
|
|
|
-
|
|
|
|
|
- note = iridium_note_row_get_note (row);
|
|
|
|
|
-
|
|
|
|
|
- if (!iridium_note_has_tag (note, iridium_tag_row_get_tag (tag_row))) {
|
|
|
|
|
- return FALSE;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
if (gtk_search_bar_get_search_mode (window->search_bar) &&
|
|
if (gtk_search_bar_get_search_mode (window->search_bar) &&
|
|
|
gtk_entry_get_text_length (GTK_ENTRY (window->search_entry)) > 0) {
|
|
gtk_entry_get_text_length (GTK_ENTRY (window->search_entry)) > 0) {
|
|
|
- return iridium_note_matches_fuzzy (note, gtk_entry_get_text (GTK_ENTRY (window->search_entry)));
|
|
|
|
|
|
|
+ return iridium_note_matches_fuzzy (iridium_note_row_get_note (row),
|
|
|
|
|
+ gtk_entry_get_text (GTK_ENTRY (window->search_entry)));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
return TRUE;
|
|
@@ -257,11 +243,8 @@ on_load_finished (GObject *object,
|
|
|
gtk_list_box_insert (self->note_list, iridium_note_row_new (note), -1);
|
|
gtk_list_box_insert (self->note_list, iridium_note_row_new (note), -1);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- gtk_list_box_insert (self->tag_list, iridium_tag_row_new (tag_all), -1);
|
|
|
|
|
g_list_free (notes);
|
|
g_list_free (notes);
|
|
|
-
|
|
|
|
|
gtk_widget_show_all (GTK_WIDGET (self->note_list));
|
|
gtk_widget_show_all (GTK_WIDGET (self->note_list));
|
|
|
- gtk_widget_show_all (GTK_WIDGET (self->tag_list));
|
|
|
|
|
}
|
|
}
|
|
|
else if (error != NULL) {
|
|
else if (error != NULL) {
|
|
|
show_error_dialog (self, error);
|
|
show_error_dialog (self, error);
|
|
@@ -347,7 +330,6 @@ on_show (IridiumWindow *self, gpointer user_data)
|
|
|
g_free (server);
|
|
g_free (server);
|
|
|
g_free (email);
|
|
g_free (email);
|
|
|
|
|
|
|
|
- gtk_widget_show_all (GTK_WIDGET (self->tag_list));
|
|
|
|
|
gtk_widget_show_all (GTK_WIDGET (self->note_list));
|
|
gtk_widget_show_all (GTK_WIDGET (self->note_list));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -454,7 +436,6 @@ iridium_window_class_init (IridiumWindowClass *klass)
|
|
|
|
|
|
|
|
gtk_widget_class_set_template_from_resource (widget_class, "/net/bloerg/Iridium/iridium-window.ui");
|
|
gtk_widget_class_set_template_from_resource (widget_class, "/net/bloerg/Iridium/iridium-window.ui");
|
|
|
gtk_widget_class_bind_template_child (widget_class, IridiumWindow, header_bar);
|
|
gtk_widget_class_bind_template_child (widget_class, IridiumWindow, header_bar);
|
|
|
- gtk_widget_class_bind_template_child (widget_class, IridiumWindow, tag_list);
|
|
|
|
|
gtk_widget_class_bind_template_child (widget_class, IridiumWindow, note_list);
|
|
gtk_widget_class_bind_template_child (widget_class, IridiumWindow, note_list);
|
|
|
gtk_widget_class_bind_template_child (widget_class, IridiumWindow, source_view);
|
|
gtk_widget_class_bind_template_child (widget_class, IridiumWindow, source_view);
|
|
|
gtk_widget_class_bind_template_child (widget_class, IridiumWindow, title_entry);
|
|
gtk_widget_class_bind_template_child (widget_class, IridiumWindow, title_entry);
|