Skip to content
Commits on Source (28)
Major changes in 42.1.1
=========================
* Revert wrongly introduced dependency on unstable gnome-desktop. (António Fernandes)
Major changes in 42.1
=========================
* Add HighContrast syle support (António Fernandes)
* Preload dragged external file info in list view (Sergio Costas)
* Override dark mode wallpaper when not using portal (Jeremy Bicha)
* Avoid truncated popover in Compress dialog under X11 (António Fernandes)
* Add checkerboard background to transparent thumbnails (Utkarsh Gandhi)
* Style and scroll pathbar propperly in RTL languages (António Fernandes)
* Translation updates (GNOME Translation Project contributors)
Major changes in 42.0
=========================
* Fix HiDPI thumbnails in list view (António Fernandes)
......
......@@ -98,7 +98,8 @@
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git"
"url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git",
"branch": "gnome-42"
}
]
},
......
......@@ -76,6 +76,7 @@ modules:
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gnome-desktop.git
branch: gnome-42
- name: gnome-autoar
buildsystem: meson
builddir: true
......
......@@ -27,7 +27,7 @@
<url type="translate">https://wiki.gnome.org/TranslationProject</url>
<launchable type="desktop-id">@appid@.desktop</launchable>
<releases>
<release version="42.0" date="2022-03-19" />
<release version="42.1.1" date="2022-04-22" />
</releases>
<project_group>GNOME</project_group>
<project_license>GPL-2.0+</project_license>
......
nautilus (1:42.1.1-0ubuntu1) jammy; urgency=medium
* New upstream release (LP: #1970788)
* Drop dark wallpaper patch: applied in new release
* Update Vcs fields for ubuntu/jammy branch
-- Jeremy Bicha <jbicha@ubuntu.com> Thu, 28 Apr 2022 15:14:44 -0400
nautilus (1:42.0-1ubuntu2) jammy; urgency=medium
* Cherry-pick patch to set the dark wallpaper when setting the
......
From: Jeremy Bicha <jeremy.bicha@canonical.com>
Date: Fri, 25 Mar 2022 13:24:15 +0000
Subject: files-view: Set dark wallpaper when setting wallpaper
This change only has an affect when nautilus is built without the libportal option
This matches the current behavior of xdg-desktop-portal-gnome
https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/commit/84f4f8619
(cherry picked from commit ca3702e9be91ce7e7c7f571ce5c757b0c737976b)
---
meson.build | 1 +
src/nautilus-files-view.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/meson.build b/meson.build
index 6ae2bca..348e5ba 100644
--- a/meson.build
+++ b/meson.build
@@ -119,6 +119,7 @@ glib = dependency('glib-2.0', version: glib_ver)
gmodule = dependency('gmodule-no-export-2.0', version: glib_ver)
gnome_autoar = dependency('gnome-autoar-0', version: '>= 0.4.0')
gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0')
+gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas', version: '>= 42')
gtk = dependency('gtk+-3.0', version: '>= 3.22.27')
libhandy = dependency('libhandy-1', version: '>= 1.5.0')
libportal = []
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index c859d9f..3304c9b 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -6589,6 +6589,7 @@ action_run_in_terminal (GSimpleAction *action,
#define BG_KEY_COLOR_TYPE "color-shading-type"
#define BG_KEY_PICTURE_PLACEMENT "picture-options"
#define BG_KEY_PICTURE_URI "picture-uri"
+#define BG_KEY_DARK_PICTURE_URI "picture-uri-dark"
static void
set_uri_as_wallpaper (const char *uri)
@@ -6605,6 +6606,7 @@ set_uri_as_wallpaper (const char *uri)
}
g_settings_set_string (settings, BG_KEY_PICTURE_URI, uri);
+ g_settings_set_string (settings, BG_KEY_DARK_PICTURE_URI, uri);
g_settings_set_string (settings, BG_KEY_PRIMARY_COLOR, "#000000");
g_settings_set_string (settings, BG_KEY_SECONDARY_COLOR, "#000000");
g_settings_set_enum (settings, BG_KEY_COLOR_TYPE, G_DESKTOP_BACKGROUND_SHADING_SOLID);
multiarch_fallback.patch
Revert-meson.build-Use-environment-to-make-warnings-fatal.patch
files-view-Set-dark-wallpaper-when-setting-wallpaper.patch
04_suppress_umount_in_ltsp.patch
12_unity_launcher_support.patch
18_unity_icon_color.patch
......
......@@ -4,7 +4,7 @@ project('nautilus', 'c',
# Do not forget when releasing:
# * Update version in data/org.gnome.Nautilus.appdata.xml.in.in
# * Update GTK-based codes over src/gtk/gtk-code-generator.sh
version: '42.0',
version: '42.1.1',
meson_version: '>= 0.49.0',
license: 'GPL3+'
......@@ -119,6 +119,7 @@ glib = dependency('glib-2.0', version: glib_ver)
gmodule = dependency('gmodule-no-export-2.0', version: glib_ver)
gnome_autoar = dependency('gnome-autoar-0', version: '>= 0.4.0')
gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0')
gsettings_desktop_schemas_dep = dependency('gsettings-desktop-schemas', version: '>= 42')
gtk = dependency('gtk+-3.0', version: '>= 3.22.27')
libhandy = dependency('libhandy-1', version: '>= 1.5.0')
libportal = []
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: nautilus trunk\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/nautilus/issues\n"
"POT-Creation-Date: 2022-02-12 07:55+0000\n"
"PO-Revision-Date: 2022-02-12 11:23+0300\n"
"POT-Creation-Date: 2022-04-14 20:28+0000\n"
"PO-Revision-Date: 2022-04-16 03:41+0300\n"
"Last-Translator: Aleksandr Melman <Alexmelman88@gmail.com>\n"
"Language-Team: Русский <gnome-cyr@gnome.org>\n"
"Language: ru\n"
......@@ -84,7 +84,7 @@ msgstr "Проект GNOME"
msgid "Tile View"
msgstr "В виде значков"
#: data/org.gnome.Nautilus.appdata.xml.in.in:42 src/nautilus-list-view.c:2376
#: data/org.gnome.Nautilus.appdata.xml.in.in:42 src/nautilus-list-view.c:2409
msgid "List View"
msgstr "В виде списка"
......@@ -99,7 +99,7 @@ msgstr "Поиск"
#: data/org.gnome.Nautilus.appdata.xml.in.in:50 src/nautilus-bookmark.c:109
#: src/nautilus-file.c:4479 src/nautilus-file-utilities.c:323
#: src/nautilus-pathbar.c:375
#: src/nautilus-pathbar.c:376
msgid "Other Locations"
msgstr "Другие места"
......@@ -1210,7 +1210,7 @@ msgid "001, 002, 003"
msgstr "001, 002, 003"
#: src/nautilus-bookmark.c:113 src/nautilus-file-utilities.c:304
#: src/nautilus-list-view.c:1883 src/nautilus-pathbar.c:370
#: src/nautilus-list-view.c:1916 src/nautilus-pathbar.c:371
#: src/nautilus-shell-search-provider.c:330 src/nautilus-window.c:173
msgid "Home"
msgstr "Домашняя папка"
......@@ -1223,7 +1223,7 @@ msgstr "Область выделения"
msgid "Icon View"
msgstr "В виде значков"
#: src/nautilus-column-utilities.c:59 src/nautilus-list-view.c:2245
#: src/nautilus-column-utilities.c:59 src/nautilus-list-view.c:2278
msgid "Name"
msgstr "Имя"
......@@ -1364,24 +1364,24 @@ msgstr "Релевантность"
msgid "Relevance rank for search"
msgstr "Оценка релевантности для поиска"
#: src/nautilus-compress-dialog-controller.c:78
#: src/nautilus-compress-dialog-controller.c:82
msgid "Archive names cannot contain “/”."
msgstr "Имена архивов не могут содержать символ «/»."
#: src/nautilus-compress-dialog-controller.c:83
#: src/nautilus-compress-dialog-controller.c:87
msgid "An archive cannot be called “.”."
msgstr "Архив не может быть назван как «.»."
#: src/nautilus-compress-dialog-controller.c:88
#: src/nautilus-compress-dialog-controller.c:92
msgid "An archive cannot be called “..”."
msgstr "Архив не может быть назван как «..»."
#: src/nautilus-compress-dialog-controller.c:93
#: src/nautilus-compress-dialog-controller.c:97
msgid "Archive name is too long."
msgstr "Имя архива слишком длинное."
#. We must warn about the side effect
#: src/nautilus-compress-dialog-controller.c:99
#: src/nautilus-compress-dialog-controller.c:103
msgid "Archives with “.” at the beginning of their name are hidden."
msgstr "Архивы с точкой «.» в начале их имени скрываются."
......@@ -1549,7 +1549,7 @@ msgid "File not found"
msgstr "Файл не найден"
#: src/nautilus-file.c:4483 src/nautilus-file-utilities.c:327
#: src/nautilus-pathbar.c:380
#: src/nautilus-pathbar.c:381
msgid "Starred"
msgstr "Избранные"
......@@ -2233,7 +2233,7 @@ msgid "Do _not Empty Trash"
msgstr "Не о_чищать корзину"
#. Translators: %s is a file name formatted for display
#: src/nautilus-file-operations.c:3176 src/nautilus-files-view.c:6797
#: src/nautilus-file-operations.c:3176 src/nautilus-files-view.c:6799
#, c-format
msgid "Unable to access “%s”"
msgstr "Не удалось получить доступ к «%s»"
......@@ -2883,34 +2883,34 @@ msgstr "_Выбрать"
msgid "Select Extract Destination"
msgstr "Выбрать место для распаковки"
#: src/nautilus-files-view.c:6727
#: src/nautilus-files-view.c:6729
msgid "Wallpapers"
msgstr "Обои"
#. Translators: %s is a file name formatted for display
#: src/nautilus-files-view.c:6827
#: src/nautilus-files-view.c:6829
#, c-format
msgid "Unable to remove “%s”"
msgstr "Не удалось удалить «%s»"
#. Translators: %s is a file name formatted for display
#: src/nautilus-files-view.c:6857
#: src/nautilus-files-view.c:6859
#, c-format
msgid "Unable to eject “%s”"
msgstr "Не удалось извлечь «%s»"
#: src/nautilus-files-view.c:6882
#: src/nautilus-files-view.c:6884
msgid "Unable to stop drive"
msgstr "Не удалось остановить привод"
#. Translators: %s is a file name formatted for display
#: src/nautilus-files-view.c:6995
#: src/nautilus-files-view.c:6997
#, c-format
msgid "Unable to start “%s”"
msgstr "Не удалось запустить «%s»"
# Может быть "создать папку из выделенных объектов"
#: src/nautilus-files-view.c:7969
#: src/nautilus-files-view.c:7971
#, c-format
msgid "New Folder with Selection (%'d Item)"
msgid_plural "New Folder with Selection (%'d Items)"
......@@ -2920,69 +2920,69 @@ msgstr[2] "Создать папку из выделенного (%'d объек
# "Открыть с помощью программы "%s" -- это слишком длинно и не помешается
# на боковую панель даже без распаковки `%s'.
#: src/nautilus-files-view.c:8027
#: src/nautilus-files-view.c:8029
#, c-format
msgid "Open With %s"
msgstr "Открыть в приложении %s"
#: src/nautilus-files-view.c:8039
#: src/nautilus-files-view.c:8041
msgid "Run"
msgstr "Запустить"
#: src/nautilus-files-view.c:8044
#: src/nautilus-files-view.c:8046
msgid "Extract Here"
msgstr "Распаковать здесь"
#: src/nautilus-files-view.c:8045
#: src/nautilus-files-view.c:8047
msgid "Extract to…"
msgstr "Распаковать в…"
#: src/nautilus-files-view.c:8049
#: src/nautilus-files-view.c:8051
msgid "Open"
msgstr "Открыть"
#: src/nautilus-files-view.c:8105
#: src/nautilus-files-view.c:8107
#: src/resources/ui/nautilus-files-view-context-menus.ui:108
msgid "_Start"
msgstr "_Запустить"
#: src/nautilus-files-view.c:8111 src/gtk/nautilusgtkplacesview.c:1759
#: src/nautilus-files-view.c:8113 src/gtk/nautilusgtkplacesview.c:1759
msgid "_Connect"
msgstr "_Подключиться"
#: src/nautilus-files-view.c:8117
#: src/nautilus-files-view.c:8119
msgid "_Start Multi-disk Drive"
msgstr "_Запустить мультидисковый привод"
#: src/nautilus-files-view.c:8123
#: src/nautilus-files-view.c:8125
msgid "U_nlock Drive"
msgstr "_Разблокировать привод"
#: src/nautilus-files-view.c:8141
#: src/nautilus-files-view.c:8143
msgid "Stop Drive"
msgstr "Остановить привод"
#: src/nautilus-files-view.c:8147
#: src/nautilus-files-view.c:8149
msgid "_Safely Remove Drive"
msgstr "_Безопасно удалить привод"
#: src/nautilus-files-view.c:8153 src/gtk/nautilusgtkplacesview.c:1749
#: src/nautilus-files-view.c:8155 src/gtk/nautilusgtkplacesview.c:1749
msgid "_Disconnect"
msgstr "_Отсоединить"
#: src/nautilus-files-view.c:8159
#: src/nautilus-files-view.c:8161
msgid "_Stop Multi-disk Drive"
msgstr "_Остановить мультидисковый привод"
#: src/nautilus-files-view.c:8165
#: src/nautilus-files-view.c:8167
msgid "_Lock Drive"
msgstr "Б_локировать привод"
#: src/nautilus-files-view.c:9841
#: src/nautilus-files-view.c:9843
msgid "Content View"
msgstr "Просмотр содержимого"
#: src/nautilus-files-view.c:9842
#: src/nautilus-files-view.c:9844
msgid "View of the current folder"
msgstr "Просмотр текущей папки"
......@@ -3570,7 +3570,7 @@ msgid "Use Default"
msgstr "Использовать по умолчанию"
# Заголовок диалогового окна.
#: src/nautilus-list-view.c:3362
#: src/nautilus-list-view.c:3395
#, c-format
msgid "%s Visible Columns"
msgstr "Видимые столбцы %s"
......@@ -3936,13 +3936,13 @@ msgstr "«%s» защищён паролем."
#. Translators: This is the label used in the pathbar when seeing
#. * the root directory (also known as /)
#: src/nautilus-pathbar.c:358 src/gtk/nautilusgtkplacesview.c:1121
#: src/nautilus-pathbar.c:359 src/gtk/nautilusgtkplacesview.c:1121
msgid "Computer"
msgstr "Компьютер"
#. Translators: This is the filesystem root directory (also known
#. * as /) when seen as administrator
#: src/nautilus-pathbar.c:365
#: src/nautilus-pathbar.c:366
msgid "Administrator Root"
msgstr "Корень системы"
......@@ -4364,7 +4364,7 @@ msgstr "_Очистить…"
msgid "Delete all items in the Trash"
msgstr "Удалить все объекты из корзины"
#: src/nautilus-ui-utilities.c:227
#: src/nautilus-ui-utilities.c:222
#, c-format
msgid "Since %d day ago"
msgid_plural "Since %d days ago"
......@@ -4372,7 +4372,7 @@ msgstr[0] "Начиная с %d дня назад"
msgstr[1] "Начиная с %d дней назад"
msgstr[2] "Начиная с %d дней назад"
#: src/nautilus-ui-utilities.c:228
#: src/nautilus-ui-utilities.c:223
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
......@@ -4380,7 +4380,7 @@ msgstr[0] "%d день назад"
msgstr[1] "%d дня назад"
msgstr[2] "%d дней назад"
#: src/nautilus-ui-utilities.c:234
#: src/nautilus-ui-utilities.c:229
#, c-format
msgid "Since last week"
msgid_plural "Since %d weeks ago"
......@@ -4388,7 +4388,7 @@ msgstr[0] "Начиная с %d недели назад"
msgstr[1] "Начиная с %d недель назад"
msgstr[2] "Начиная с %d недель назад"
#: src/nautilus-ui-utilities.c:235
#: src/nautilus-ui-utilities.c:230
#, c-format
msgid "Last week"
msgid_plural "%d weeks ago"
......@@ -4396,7 +4396,7 @@ msgstr[0] "%d недель назад"
msgstr[1] "%d недели назад"
msgstr[2] "%d неделю назад"
#: src/nautilus-ui-utilities.c:241
#: src/nautilus-ui-utilities.c:236
#, c-format
msgid "Since last month"
msgid_plural "Since %d months ago"
......@@ -4404,7 +4404,7 @@ msgstr[0] "Начиная с %d месяца назад"
msgstr[1] "Начиная с %d месяцев назад"
msgstr[2] "Начиная с %d месяцев назад"
#: src/nautilus-ui-utilities.c:242
#: src/nautilus-ui-utilities.c:237
#, c-format
msgid "Last month"
msgid_plural "%d months ago"
......@@ -4412,7 +4412,7 @@ msgstr[0] "%d месяц назад"
msgstr[1] "%d месяца назад"
msgstr[2] "%d месяцев назад"
#: src/nautilus-ui-utilities.c:247
#: src/nautilus-ui-utilities.c:242
#, c-format
msgid "Since last year"
msgid_plural "Since %d years ago"
......@@ -4420,7 +4420,7 @@ msgstr[0] "Начиная с %d года назад"
msgstr[1] "Начиная с %d лет назад"
msgstr[2] "Начиная с %d лет назад"
#: src/nautilus-ui-utilities.c:248
#: src/nautilus-ui-utilities.c:243
#, c-format
msgid "Last year"
msgid_plural "%d years ago"
......@@ -5541,7 +5541,7 @@ msgstr "Поиск только по имени файла"
#: src/resources/ui/nautilus-starred-is-empty.ui:33
msgid "Starred files will appear here"
msgstr "Здесь будут появляться добавленные в избранные файлы"
msgstr "Здесь появятся избранные файлы"
#. Translators: a menu item in a group of sorting options in a toolbar menu, with criterions such as "A-Z" or "Last Modified".
#: src/resources/ui/nautilus-toolbar.ui:24
......@@ -5797,4 +5797,3 @@ msgstr "Подключиться к _серверу"
#: src/gtk/nautilusgtkplacesview.ui:340
msgid "Enter server address…"
msgstr "Ввести адрес сервера…"
This diff is collapsed.
......@@ -1127,7 +1127,10 @@ theme_changed (GtkSettings *settings)
screen = gdk_screen_get_default ();
/* CSS that themes can override */
if (g_str_equal (theme, "Adwaita") || g_str_equal (theme, "Adwaita-dark"))
if (g_str_equal (theme, "Adwaita") ||
g_str_equal (theme, "Adwaita-dark") ||
g_str_equal (theme, "HighContrast") ||
g_str_equal (theme, "HighContrastInverse"))
{
if (provider == NULL)
{
......
......@@ -21,6 +21,10 @@
#include <gnome-autoar/gnome-autoar.h>
#include <libhandy-1/handy.h>
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
#include <eel/eel-vfs-extensions.h>
#include "nautilus-compress-dialog-controller.h"
......@@ -394,6 +398,17 @@ popover_on_show (GtkWidget *widget,
}
break;
}
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
{
int w, h;
/* Workaround for https://gitlab.gnome.org/GNOME/nautilus/-/issues/2018 */
gtk_window_get_default_size (GTK_WINDOW (self->compress_dialog), &w, &h);
gtk_window_resize (GTK_WINDOW (self->compress_dialog), w, h * 2);
}
#endif
}
NautilusCompressDialogController *
......
......@@ -6589,6 +6589,7 @@ action_run_in_terminal (GSimpleAction *action,
#define BG_KEY_COLOR_TYPE "color-shading-type"
#define BG_KEY_PICTURE_PLACEMENT "picture-options"
#define BG_KEY_PICTURE_URI "picture-uri"
#define BG_KEY_DARK_PICTURE_URI "picture-uri-dark"
static void
set_uri_as_wallpaper (const char *uri)
......@@ -6605,6 +6606,7 @@ set_uri_as_wallpaper (const char *uri)
}
g_settings_set_string (settings, BG_KEY_PICTURE_URI, uri);
g_settings_set_string (settings, BG_KEY_DARK_PICTURE_URI, uri);
g_settings_set_string (settings, BG_KEY_PRIMARY_COLOR, "#000000");
g_settings_set_string (settings, BG_KEY_SECONDARY_COLOR, "#000000");
g_settings_set_enum (settings, BG_KEY_COLOR_TYPE, G_DESKTOP_BACKGROUND_SHADING_SOLID);
......
This diff is collapsed.
This diff is collapsed.