Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package thunar for openSUSE:Factory checked in at 2023-01-23 18:33:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/thunar (Old) and /work/SRC/openSUSE:Factory/.thunar.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "thunar" Mon Jan 23 18:33:45 2023 rev:97 rq:1060420 version:4.18.3 Changes: -------- --- /work/SRC/openSUSE:Factory/thunar/thunar.changes 2023-01-21 19:13:24.977934599 +0100 +++ /work/SRC/openSUSE:Factory/.thunar.new.32243/thunar.changes 2023-01-23 18:33:45.984808720 +0100 @@ -1,0 +2,8 @@ +Mon Jan 23 12:54:38 UTC 2023 - Marcel Kuehlhorn <tu...@opensuse.org> + +- Add switch_pane_shortcut.patch + Backport upstream fix for gxo#xfce/thunar#1005 +- Add differentiate_zoom_levels_between_view_modes.patch + Backport upstream fix for gxo#xfce/thunar#832 + +------------------------------------------------------------------- New: ---- differentiate_zoom_levels_between_view_modes.patch switch_pane_shortcut.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thunar.spec ++++++ --- /var/tmp/diff_new_pack.aiJNw3/_old 2023-01-23 18:33:46.592812928 +0100 +++ /var/tmp/diff_new_pack.aiJNw3/_new 2023-01-23 18:33:46.596812955 +0100 @@ -27,6 +27,10 @@ URL: https://docs.xfce.org/xfce/thunar/start Source: https://archive.xfce.org/src/xfce/thunar/4.18/%{name}-%{version}.tar.bz2 Source100: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM: Add a shortcut for switching panes in split view mode +Patch0: switch_pane_shortcut.patch +# PATCH-FIX-UPSTREAM: Differentiate between list and icon view in terms of zooming +Patch1: differentiate_zoom_levels_between_view_modes.patch BuildRequires: appstream-glib BuildRequires: fdupes BuildRequires: intltool @@ -105,7 +109,7 @@ %lang_package %prep -%autosetup +%autosetup -p1 %build %if %{with git} ++++++ differentiate_zoom_levels_between_view_modes.patch ++++++ >From 9d0b2fc475de9bb0911a39ba623efe104eb675b8 Mon Sep 17 00:00:00 2001 From: Alexander Schwinn <alexxc...@xfce.org> Date: Sat, 21 Jan 2023 23:27:24 +0100 Subject: [PATCH] Directory specific settings - zoom improvm. (#832) When directory specific settings are enabled, zoom level now is stored per view-type --- thunar/thunar-file.c | 15 +++++++++++++++ thunar/thunar-standard-view.c | 13 ++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c index 6961fbf50..ca2a951e2 100644 --- a/thunar/thunar-file.c +++ b/thunar/thunar-file.c @@ -4978,6 +4978,9 @@ thunar_file_clear_directory_specific_settings (ThunarFile *file) g_file_info_remove_attribute (file->info, "metadata::thunar-sort-column"); g_file_info_remove_attribute (file->info, "metadata::thunar-sort-order"); g_file_info_remove_attribute (file->info, "metadata::thunar-zoom-level"); + g_file_info_remove_attribute (file->info, "metadata::thunar-zoom-level-ThunarDetailsView"); + g_file_info_remove_attribute (file->info, "metadata::thunar-zoom-level-ThunarIconView"); + g_file_info_remove_attribute (file->info, "metadata::thunar-zoom-level-ThunarCompactView"); g_file_set_attribute (file->gfile, "metadata::thunar-view-type", G_FILE_ATTRIBUTE_TYPE_INVALID, NULL, G_FILE_QUERY_INFO_NONE, NULL, NULL); @@ -4987,6 +4990,12 @@ thunar_file_clear_directory_specific_settings (ThunarFile *file) NULL, G_FILE_QUERY_INFO_NONE, NULL, NULL); g_file_set_attribute (file->gfile, "metadata::thunar-zoom-level", G_FILE_ATTRIBUTE_TYPE_INVALID, NULL, G_FILE_QUERY_INFO_NONE, NULL, NULL); + g_file_set_attribute (file->gfile, "metadata::thunar-zoom-level-ThunarDetailsView", G_FILE_ATTRIBUTE_TYPE_INVALID, + NULL, G_FILE_QUERY_INFO_NONE, NULL, NULL); + g_file_set_attribute (file->gfile, "metadata::thunar-zoom-level-ThunarIconView", G_FILE_ATTRIBUTE_TYPE_INVALID, + NULL, G_FILE_QUERY_INFO_NONE, NULL, NULL); + g_file_set_attribute (file->gfile, "metadata::thunar-zoom-level-ThunarCompactView", G_FILE_ATTRIBUTE_TYPE_INVALID, + NULL, G_FILE_QUERY_INFO_NONE, NULL, NULL); thunar_file_changed (file); } @@ -5017,6 +5026,12 @@ thunar_file_has_directory_specific_settings (ThunarFile *file) return TRUE; if (g_file_info_has_attribute (file->info, "metadata::thunar-zoom-level")) return TRUE; + if (g_file_info_has_attribute (file->info, "metadata::thunar-zoom-level-ThunarDetailsView")) + return TRUE; + if (g_file_info_has_attribute (file->info, "metadata::thunar-zoom-level-ThunarIconView")) + return TRUE; + if (g_file_info_has_attribute (file->info, "metadata::thunar-zoom-level-ThunarCompactView")) + return TRUE; return FALSE; } diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c index 0ad6b9c4e..3476fc546 100644 --- a/thunar/thunar-standard-view.c +++ b/thunar/thunar-standard-view.c @@ -1840,7 +1840,8 @@ thunar_standard_view_set_zoom_level (ThunarView *view, ThunarZoomLevel zoom_level) { ThunarStandardView *standard_view = THUNAR_STANDARD_VIEW (view); - gboolean newThumbnailSize = FALSE; + gboolean newThumbnailSize = FALSE; + gchar *zoom_level_attribute_name; /* check if we have a new zoom-level here */ if (G_LIKELY (standard_view->priv->zoom_level != zoom_level)) @@ -1854,7 +1855,9 @@ thunar_standard_view_set_zoom_level (ThunarView *view, if (zoom_level_name != NULL) { /* do not set it asynchronously to ensure the correct operation of thumbnails (check the commit message for more) */ - thunar_file_set_metadata_setting (standard_view->priv->current_directory, "zoom-level", zoom_level_name, FALSE); + zoom_level_attribute_name = g_strdup_printf ("zoom-level-%s", G_OBJECT_TYPE_NAME (standard_view)); + thunar_file_set_metadata_setting (standard_view->priv->current_directory, zoom_level_attribute_name, zoom_level_name, FALSE); + g_free (zoom_level_attribute_name); } } @@ -1901,6 +1904,7 @@ thunar_standard_view_apply_directory_specific_settings (ThunarStandardView *stan ThunarColumn sort_column; GtkSortType sort_order; gint zoom_level; + gchar *zoom_level_attribute_name; /* get the default sort column and sort order */ g_object_get (G_OBJECT (standard_view->preferences), "last-sort-column", &sort_column, "last-sort-order", &sort_order, NULL); @@ -1908,7 +1912,10 @@ thunar_standard_view_apply_directory_specific_settings (ThunarStandardView *stan /* get the stored directory specific settings (if any) */ sort_column_name = thunar_file_get_metadata_setting (directory, "sort-column"); sort_order_name = thunar_file_get_metadata_setting (directory, "sort-order"); - zoom_level_name = thunar_file_get_metadata_setting (directory, "zoom-level"); + + zoom_level_attribute_name = g_strdup_printf ("zoom-level-%s", G_OBJECT_TYPE_NAME (standard_view)); + zoom_level_name = thunar_file_get_metadata_setting (directory, zoom_level_attribute_name); + g_free (zoom_level_attribute_name); /* convert the sort column name to a value */ if (sort_column_name != NULL) -- GitLab >From 99ba6602cb2848be3235abb049a8b8cd65dcd751 Mon Sep 17 00:00:00 2001 From: Alexander Schwinn <alexxc...@xfce.org> Date: Sat, 21 Jan 2023 23:37:07 +0100 Subject: [PATCH] Add fallback to shared zoom-level (#832) --- thunar/thunar-standard-view.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c index 3476fc546..4ae94be3b 100644 --- a/thunar/thunar-standard-view.c +++ b/thunar/thunar-standard-view.c @@ -1917,6 +1917,10 @@ thunar_standard_view_apply_directory_specific_settings (ThunarStandardView *stan zoom_level_name = thunar_file_get_metadata_setting (directory, zoom_level_attribute_name); g_free (zoom_level_attribute_name); + /* View specific zoom level was added later on .. fall back to shared zoom-level if not found */ + if (zoom_level_name == NULL) + zoom_level_name = thunar_file_get_metadata_setting (directory, "zoom-level"); + /* convert the sort column name to a value */ if (sort_column_name != NULL) thunar_column_value_from_string (sort_column_name, &sort_column); -- GitLab ++++++ switch_pane_shortcut.patch ++++++ >From 25cb31022036663cb60dee9e2199f9c821d20ed6 Mon Sep 17 00:00:00 2001 From: Alexander Schwinn <alexxc...@xfce.org> Date: Mon, 23 Jan 2023 13:10:56 +0100 Subject: [PATCH] Add Shortcut to switch split-view panes (#1005) --- thunar/thunar-window.c | 5 ++++- thunar/thunar-window.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c index 5f0ea5a88..7f91077c9 100644 --- a/thunar/thunar-window.c +++ b/thunar/thunar-window.c @@ -503,6 +503,7 @@ static XfceGtkActionEntry thunar_window_action_entries[] = { THUNAR_WINDOW_ACTION_RELOAD, "<Actions>/ThunarWindow/reload", "<Primary>r", XFCE_GTK_IMAGE_MENU_ITEM, N_ ("_Reload"), N_ ("Reload the current folder"), "view-refresh-symbolic", G_CALLBACK (thunar_window_action_reload), }, { THUNAR_WINDOW_ACTION_RELOAD_ALT, "<Actions>/ThunarWindow/reload-alt", "F5", XFCE_GTK_IMAGE_MENU_ITEM, NULL, NULL, NULL, G_CALLBACK (thunar_window_action_reload), }, { THUNAR_WINDOW_ACTION_VIEW_SPLIT, "<Actions>/ThunarWindow/toggle-split-view", "F3", XFCE_GTK_CHECK_MENU_ITEM, N_ ("Spl_it View"), N_ ("Open/Close Split View"), "view-dual-symbolic", G_CALLBACK (thunar_window_action_toggle_split_view), }, + { THUNAR_WINDOW_ACTION_SWITCH_FOCUSED_SPLIT_VIEW_PANE, "<Actions>/ThunarWindow/switch-focused-split-view-pane", "", XFCE_GTK_MENU_ITEM, N_ ("Switch Focused Split View Pane"), NULL, NULL, G_CALLBACK (thunar_window_paned_notebooks_switch), }, { THUNAR_WINDOW_ACTION_VIEW_LOCATION_SELECTOR_MENU, "<Actions>/ThunarWindow/view-location-selector-menu", "", XFCE_GTK_MENU_ITEM, N_ ("_Location Selector"), NULL, NULL, NULL, }, { THUNAR_WINDOW_ACTION_VIEW_LOCATION_SELECTOR_ENTRY, "<Actions>/ThunarWindow/view-location-selector-entry", "", XFCE_GTK_CHECK_MENU_ITEM, N_ ("_Entry Style"), N_ ("Traditional entry showing the current path"), NULL, G_CALLBACK (thunar_window_action_locationbar_entry), }, { THUNAR_WINDOW_ACTION_VIEW_LOCATION_SELECTOR_BUTTONS, "<Actions>/ThunarWindow/view-location-selector-buttons", "", XFCE_GTK_CHECK_MENU_ITEM, N_ ("_Buttons Style"), N_ ("Modern approach with buttons that correspond to folders"), NULL, G_CALLBACK (thunar_window_action_locationbar_buttons),}, @@ -2709,7 +2710,9 @@ thunar_window_paned_notebooks_switch (ThunarWindow *window) GtkWidget *new_curr_notebook = NULL; _thunar_return_if_fail (THUNAR_IS_WINDOW (window)); - _thunar_return_if_fail (thunar_window_split_view_is_active (window)); + + if (!thunar_window_split_view_is_active (window)) + return; if (window->notebook_selected == window->notebook_left) new_curr_notebook = window->notebook_right; diff --git a/thunar/thunar-window.h b/thunar/thunar-window.h index bce7463d5..588f0e0a9 100644 --- a/thunar/thunar-window.h +++ b/thunar/thunar-window.h @@ -56,6 +56,7 @@ typedef enum THUNAR_WINDOW_ACTION_RELOAD, THUNAR_WINDOW_ACTION_RELOAD_ALT, THUNAR_WINDOW_ACTION_VIEW_SPLIT, + THUNAR_WINDOW_ACTION_SWITCH_FOCUSED_SPLIT_VIEW_PANE, THUNAR_WINDOW_ACTION_VIEW_LOCATION_SELECTOR_MENU, THUNAR_WINDOW_ACTION_VIEW_LOCATION_SELECTOR_ENTRY, THUNAR_WINDOW_ACTION_VIEW_LOCATION_SELECTOR_BUTTONS, -- GitLab
