diff -Nru peony-1.1.6~201904291422/debian/changelog peony-1.1.6~201907042017/debian/changelog --- peony-1.1.6~201904291422/debian/changelog 2019-04-24 07:48:18.000000000 +0000 +++ peony-1.1.6~201907042017/debian/changelog 2019-05-27 07:48:18.000000000 +0000 @@ -1,20 +1,25 @@ -peony (1.1.6~201904291422) disco; urgency=medium +peony (1.1.6~201907042017) disco; urgency=medium * Daily build. - -- ShuiLu Pi Wed, 24 Apr 2019 15:48:18 +0800 + -- handsome_feng Mon, 27 May 2019 15:48:18 +0800 peony (1.1.6-1) unstable; urgency=medium * Add file path to the address bar that can click. * Add drag directories to favorites and delete favorites directories function. * Add folder image and set location button size. - * Resolve computer,recent,trash is English in addressbar. * Add search entry delete function. * Modify sidebar, statusbar, locationbar style. - * Resolve trash restore files error. + * Display picture according to its own width and height. + * Update zh_TW.po and zh_CN.po. + * Fix trash restore files error. + * Fix that computer, recent and trash is English in addressbar. + * Fix the location bar error. + * Reload window after desktop-is-home-dir changed. (LP: #1831857) + * Fix the crash when using listview mode. (LP: #1827994) - -- handsome_feng Wed, 27 Mar 2019 08:53:59 +0800 + -- handsome_feng Thu, 04 Jul 2019 17:22:16 +0800 peony (1.1.5-1) unstable; urgency=medium diff -Nru peony-1.1.6~201904291422/po/zh_CN.po peony-1.1.6~201907042017/po/zh_CN.po --- peony-1.1.6~201904291422/po/zh_CN.po 2019-04-24 03:01:11.000000000 +0000 +++ peony-1.1.6~201907042017/po/zh_CN.po 2019-05-27 07:48:18.000000000 +0000 @@ -4279,9 +4279,8 @@ #. name, stock id #. label, accelerator #: ../src/file-manager/fm-directory-view.c:7638 -#, fuzzy msgid "Send to desktop _Shortcut" -msgstr "发送到桌面快捷方式(_K)" +msgstr "发送到桌面快捷方式(_S)" #. tooltip #: ../src/file-manager/fm-directory-view.c:7639 diff -Nru peony-1.1.6~201904291422/po/zh_TW.po peony-1.1.6~201907042017/po/zh_TW.po --- peony-1.1.6~201904291422/po/zh_TW.po 2019-04-24 03:01:11.000000000 +0000 +++ peony-1.1.6~201907042017/po/zh_TW.po 2019-05-27 07:48:18.000000000 +0000 @@ -1089,25 +1089,21 @@ #. * particular language. #. #: ../libpeony-private/peony-file-operations.c:429 -#, fuzzy, c-format msgid "%s %'dst link to" msgstr "第 %'d 個連至 %s 的鏈結" #. appended to new link file #: ../libpeony-private/peony-file-operations.c:433 -#, fuzzy, c-format msgid "%s %'dnd link to" msgstr "第 %'d 個連至 %s 的鏈結" #. appended to new link file #: ../libpeony-private/peony-file-operations.c:437 -#, fuzzy, c-format msgid "%s %'drd link to" msgstr "第 %'d 個連至 %s 的鏈結" #. appended to new link file #: ../libpeony-private/peony-file-operations.c:441 -#, fuzzy, c-format msgid "%s %'dth link to" msgstr "第 %'d 個連至 %s 的鏈結" @@ -1254,12 +1250,10 @@ msgstr[0] "確定要永久刪除 %'d 個已選項目？" #: ../libpeony-private/peony-file-operations.c:1465 -#, fuzzy msgid "Are you sure you want to trash \"%B\"?" msgstr "確定要將「%B」永久地刪除嗎？" #: ../libpeony-private/peony-file-operations.c:1468 -#, fuzzy, c-format msgid "Are you sure you want to trash the %'d selected item?" msgid_plural "Are you sure you want to trash the %'d selected items?" msgstr[0] "確定要永久刪除 %'d 個已選項目？" @@ -1269,7 +1263,6 @@ msgstr "" #: ../libpeony-private/peony-file-operations.c:1480 -#, fuzzy msgid "Move to _Trash" msgstr "丟進回收筒(_V)" @@ -2436,7 +2429,6 @@ #: ../libpeony-private/peony-query.c:140 #: ../src/file-manager/fm-directory-view.c:7622 #: ../src/file-manager/fm-directory-view.c:7623 -#, fuzzy, c-format msgid "Find duplicate file" msgstr "復原 %d 個項目的重製(_U)" @@ -2874,12 +2866,10 @@ msgstr "如設定為‘true’，Peony 會在您嘗試刪除檔案或清空回收筒時先進行確認。" #: ../libpeony-private/org.ukui.peony.gschema.xml.h:13 -#, fuzzy msgid "Whether to ask for confirmation when moving files to the Trash" msgstr "刪除檔案或清空回收筒時是否需要確認" #: ../libpeony-private/org.ukui.peony.gschema.xml.h:14 -#, fuzzy msgid "" "If set to true, then Peony will ask for confirmation when you attempt to " "move files to the Trash." @@ -3735,7 +3725,6 @@ #. tooltip #: ../src/file-manager/fm-desktop-icon-view.c:927 -#, fuzzy msgid "Show a window that lets you set the screen resolution" msgstr "顯示一個可設定桌面背景胚騰或顏色的視窗" @@ -4303,11 +4292,10 @@ #. label, accelerator #: ../src/file-manager/fm-directory-view.c:7638 msgid "Send to desktop _Shortcut" -msgstr "" +msgstr "建立桌面鏈結" #. tooltip #: ../src/file-manager/fm-directory-view.c:7639 -#, fuzzy msgid "Send to desktop shortcut for each selected item" msgstr "為所有選定的項目建立鏈結" @@ -4382,7 +4370,6 @@ #. tooltip #: ../src/file-manager/fm-directory-view.c:7672 -#, fuzzy msgid "E_mpty Recent use" msgstr "清空最近使用記錄" @@ -4395,7 +4382,6 @@ #. tooltip #: ../src/file-manager/fm-directory-view.c:7676 -#, fuzzy msgid "D_elete Recent use" msgstr "刪除使用記錄" @@ -5816,7 +5802,6 @@ msgstr "離開 Peony。" #: ../src/peony-application.c:2127 -#, fuzzy msgid "Display Attr." msgstr "顯示" @@ -6351,7 +6336,6 @@ msgstr "清理回收筒或刪除檔案前會先詢問(_E)" #: ../src/peony-file-management-properties.ui.h:67 -#, fuzzy msgid "Ask before moving files to the _Trash" msgstr "移動檔案至回收筒時發生錯誤。" @@ -6971,7 +6955,6 @@ msgstr "顯示備忘" #: ../src/peony-places-sidebar.c:534 -#, fuzzy msgid "Favorite" msgstr "寫入" @@ -6984,7 +6967,6 @@ msgstr "開啟回收筒" #: ../src/peony-places-sidebar.c:572 -#, fuzzy msgid "Recent" msgstr "清空最近使用記錄" @@ -6997,7 +6979,6 @@ msgstr "" #: ../src/peony-places-sidebar.c:661 -#, fuzzy msgid "My Computer" msgstr "電腦" @@ -7325,7 +7306,6 @@ msgstr "搜尋字串(_S):" #: ../src/peony-query-editor.c:1170 -#, fuzzy msgid "Find results" msgstr "搜尋結果" @@ -7506,7 +7486,6 @@ msgstr "Peony 讓您組織檔案和資料夾，不管是在您的電腦或是在網路上。" #: ../src/peony-window-menus.c:541 -#, fuzzy msgid "" "Copyright © 1999-2009 The Nautilus authors\n" "Copyright © 2011-2016 The Caja authors\n" diff -Nru peony-1.1.6~201904291422/src/file-manager/fm-directory-view.c peony-1.1.6~201907042017/src/file-manager/fm-directory-view.c --- peony-1.1.6~201904291422/src/file-manager/fm-directory-view.c 2019-04-24 03:01:11.000000000 +0000 +++ peony-1.1.6~201907042017/src/file-manager/fm-directory-view.c 2019-05-27 07:48:18.000000000 +0000 @@ -2518,35 +2518,6 @@ void fm_directory_view_send_selection_change (FMDirectoryView *view) { - //printf ("report_selection_changed\n"); - PeonyWindowInfo *window_info = PEONY_WINDOW_INFO(fm_directory_view_get_containing_window (view)); - GList *selection; - GList* l = fm_directory_view_get_selection(view); - - if(l){ - //printf("FMDirectory view: selection changed\n"); - PeonyFile *file; - file = l->data; - //char* uri = peony_file_get_uri(file); - char* filename = g_filename_from_uri(peony_file_get_uri(file),NULL,NULL); - - if(filename){ - //printf("%s\n",filename); - g_signal_emit_by_name (window_info, - "preview_file",(gpointer)filename); - free(filename); - } else { - filename = "null"; - g_signal_emit_by_name (window_info, - "preview_file",(gpointer)filename); - } - g_list_free(l); - } else { - char* filename = "null"; - g_signal_emit_by_name (window_info, - "preview_file",(gpointer)filename); - } - peony_window_info_report_selection_changed (view->details->window); view->details->send_selection_change_to_shell = FALSE; @@ -6753,6 +6724,14 @@ g_assert (FM_IS_DIRECTORY_VIEW (view)); selection = fm_directory_view_get_selection (view); + if (!selection) { + /* + * this judgement is intend to avoid Bug#1827994, which lead + * program crash. expand/close expand will not real start + * renaming a file. no selection and no file, so just return. + */ + return; + } if (fm_directory_view_can_rename_file(view, selection->data) && selection_not_empty_in_menu_callback (view, selection)) { file = PEONY_FILE (selection->data); diff -Nru peony-1.1.6~201904291422/src/peony-desktop-window.c peony-1.1.6~201907042017/src/peony-desktop-window.c --- peony-1.1.6~201904291422/src/peony-desktop-window.c 2019-04-24 03:01:11.000000000 +0000 +++ peony-1.1.6~201907042017/src/peony-desktop-window.c 2019-05-27 07:48:18.000000000 +0000 @@ -37,6 +37,8 @@ #include #include +#include + struct PeonyDesktopWindowDetails { gulong size_changed_id; @@ -48,6 +50,14 @@ PEONY_TYPE_SPATIAL_WINDOW); +static void peony_preferences_desktop_is_home_changed_cb +(PeonyWindow *window) +{ + g_return_if_fail (PEONY_IS_WINDOW (window)); + + peony_window_reload (window); +} + static void peony_desktop_window_init (PeonyDesktopWindow *window) { @@ -86,6 +96,9 @@ if (accessible) { atk_object_set_name (accessible, _("Desktop")); } + + peony_global_preferences_init (); + g_signal_connect_swapped (peony_preferences, "changed::desktop-is-home-dir", G_CALLBACK (peony_preferences_desktop_is_home_changed_cb), window); } static gint diff -Nru peony-1.1.6~201904291422/src/peony-location-bar.c peony-1.1.6~201907042017/src/peony-location-bar.c --- peony-1.1.6~201904291422/src/peony-location-bar.c 2019-04-24 03:01:11.000000000 +0000 +++ peony-1.1.6~201907042017/src/peony-location-bar.c 2019-05-27 07:48:18.000000000 +0000 @@ -1438,6 +1438,7 @@ peony_file_unref (peony_file); g_object_unref (icon_info); folder_image = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_MENU); + gtk_widget_set_size_request (GTK_WIDGET (folder_image), -1, 42); //folder_image = gtk_image_new_from_icon_name("folder",GTK_ICON_SIZE_MENU); context = gtk_widget_get_style_context(folder_image); diff -Nru peony-1.1.6~201904291422/src/peony-navigation-window.c peony-1.1.6~201907042017/src/peony-navigation-window.c --- peony-1.1.6~201904291422/src/peony-navigation-window.c 2019-04-24 03:01:11.000000000 +0000 +++ peony-1.1.6~201907042017/src/peony-navigation-window.c 2019-05-27 07:48:18.000000000 +0000 @@ -91,7 +91,7 @@ static void use_extra_mouse_buttons_changed (gpointer callback_data); static PeonyWindowSlot *create_extra_pane (PeonyNavigationWindow *window); -static void preview_file_changed_callback(PeonyWindowInfo *window_info, gpointer data); +static void preview_file_changed_callback(PeonyWindowInfo *window_info); static void office_format_trans_ready_callback(PeonyWindowInfo *window_info, gpointer data); static void show_pdf_file_callback(PeonyWindowInfo *window_info, gpointer data); static void real_image_search_callback (PeonyWindowInfo *window, gpointer data); @@ -770,8 +770,7 @@ static void peony_navigation_window_destroy (GtkWidget *object) { - char* filename; - g_signal_handlers_disconnect_by_func(PEONY_WINDOW_INFO (object), G_CALLBACK (preview_file_changed_callback), filename); + g_signal_handlers_disconnect_by_func(PEONY_WINDOW_INFO (object), G_CALLBACK (preview_file_changed_callback), NULL); g_signal_handlers_disconnect_by_func(PEONY_WINDOW_INFO (object), G_CALLBACK (office_format_trans_ready_callback), NULL); g_signal_handlers_disconnect_by_func(PEONY_WINDOW_INFO (object), G_CALLBACK (show_pdf_file_callback), NULL); @@ -1575,7 +1574,7 @@ } -static void preview_file_changed_callback(PeonyWindowInfo *window_info, gpointer data){ +static void preview_file_changed_callback(PeonyWindowInfo *window_info){ if (peony_window_info_get_window_type (window_info) != PEONY_WINDOW_NAVIGATION){ //printf ("is not navigation\n"); @@ -1588,7 +1587,21 @@ return; } - if((char*)data == "null"){ + char *data = NULL; + + printf ("preview file changed callback\n"); + GList *files = peony_window_info_get_selection (window_info); + if (files) { + GFile *file = files->data; + char* name = g_file_get_path (file); + if (name) { + printf ("selection: %s\n", name); + data = name; + } + g_list_free_full (files, g_object_unref); + } + + if(data == NULL){ //printf ("null\n\n\n"); gtk_label_set_label(window->details->hint_view, _("Select the file you want to preview")); gtk_widget_show_all(window->details->empty_window); @@ -1686,7 +1699,7 @@ gtk_widget_hide (window->details->test_widget); gtk_widget_hide (window->details->web_swindow); } - + g_free (data); } static gboolean do_not_show_right_click_menu_callback (WebKitWebView *web_view) { @@ -1753,12 +1766,10 @@ gtk_widget_hide (window->details->test_widget); gtk_widget_hide (window->details->pdf_swindow); gtk_widget_hide (window->details->web_swindow); - - char* preview_filename; g_signal_connect (PEONY_WINDOW_INFO(window), - "preview_file", - G_CALLBACK (preview_file_changed_callback), preview_filename + "selection_changed", + G_CALLBACK (preview_file_changed_callback), NULL ); g_signal_connect (PEONY_WINDOW_INFO(window), @@ -1772,14 +1783,15 @@ ); window->details->is_split_view_showing = TRUE; + + g_signal_emit_by_name (PEONY_WINDOW_INFO (window), "selection_changed"); } void peony_navigation_window_split_view_off (PeonyNavigationWindow *window) { gtk_widget_hide (window->details->preview_hbox); - char *data; - g_signal_handlers_disconnect_by_func(PEONY_WINDOW_INFO(window),G_CALLBACK(preview_file_changed_callback),data); + g_signal_handlers_disconnect_by_func(PEONY_WINDOW_INFO(window),G_CALLBACK(preview_file_changed_callback), NULL); g_signal_handlers_disconnect_by_func(PEONY_WINDOW_INFO(window),G_CALLBACK(office_format_trans_ready_callback),NULL); g_signal_handlers_disconnect_by_func(PEONY_WINDOW_INFO(window),G_CALLBACK(show_pdf_file_callback),NULL);