p
/
fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sort order changes update iteration order

This commit is contained in:
Přemysl Eric Janouch 2022-01-07 15:58:50 +01:00
parent 7160a915e2
commit 231b77e6c0
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fiv.c
View File

@ -395,15 +395,10 @@ load_directory_without_switching(const gchar *uri)
vadjustment, gtk_adjustment_get_lower(vadjustment)); vadjustment, gtk_adjustment_get_lower(vadjustment));
} }
g_ptr_array_set_size(g.files, 0);
g.files_index = -1;
GError *error = NULL; GError *error = NULL;
GFile *file = g_file_new_for_uri(g.directory); GFile *file = g_file_new_for_uri(g.directory);
if (fiv_io_model_open(g.model, file, &error)) { if (fiv_io_model_open(g.model, file, &error)) {
g_ptr_array_free(g.files, TRUE); // Handled by the signal callback.
g.files = fiv_io_model_get_files(g.model);
update_files_index();
} else if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED)) { } else if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED)) {
g_error_free(error); g_error_free(error);
} else { } else {
@ -411,11 +406,6 @@ load_directory_without_switching(const gchar *uri)
} }
g_object_unref(file); g_object_unref(file);
gtk_widget_set_sensitive(
g.toolbar[TOOLBAR_FILE_PREVIOUS], g.files->len > 1);
gtk_widget_set_sensitive(
g.toolbar[TOOLBAR_FILE_NEXT], g.files->len > 1);
} }
static void static void
@ -434,11 +424,26 @@ load_directory(const gchar *uri)
} }
} }
static void
on_model_files_changed(FivIoModel *model, G_GNUC_UNUSED gpointer user_data)
{
g_return_if_fail(model == g.model);
g_ptr_array_free(g.files, TRUE);
g.files = fiv_io_model_get_files(g.model);
update_files_index();
gtk_widget_set_sensitive(
g.toolbar[TOOLBAR_FILE_PREVIOUS], g.files->len > 1);
gtk_widget_set_sensitive(
g.toolbar[TOOLBAR_FILE_NEXT], g.files->len > 1);
}
static void static void
on_filtering_toggled(GtkToggleButton *button, G_GNUC_UNUSED gpointer user_data) on_filtering_toggled(GtkToggleButton *button, G_GNUC_UNUSED gpointer user_data)
{ {
g_object_set( gboolean active = gtk_toggle_button_get_active(button);
g.model, "filtering", gtk_toggle_button_get_active(button), NULL); g_object_set(g.model, "filtering", active, NULL);
} }
static void static void
@ -1386,6 +1391,8 @@ main(int argc, char *argv[])
} }
g.model = g_object_new(FIV_TYPE_IO_MODEL, NULL); g.model = g_object_new(FIV_TYPE_IO_MODEL, NULL);
g_signal_connect(g.model, "files-changed",
G_CALLBACK(on_model_files_changed), NULL);
gtk_window_set_default_icon_name(PROJECT_NAME); gtk_window_set_default_icon_name(PROJECT_NAME);
gtk_icon_theme_add_resource_path( gtk_icon_theme_add_resource_path(