import nautilus-3.28.1-10.el8

This commit is contained in:
CentOS Sources 2019-11-05 14:04:41 -05:00 committed by Andrew Lukoshko
parent 7583314264
commit 347ab56a2c
10 changed files with 1271 additions and 4 deletions

View File

@ -0,0 +1,90 @@
From bac4bd595c518983571b0fb41fcf5586f27544eb Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Mon, 19 Nov 2018 08:55:22 +0000
Subject: [PATCH] dbus: Implement rename file
So desktop icons extensions can use it.
(cherry picked from commit 42c5ce657e2b24ddf19932e9e3284a045d60ff51)
---
data/dbus-interfaces.xml | 4 ++++
src/nautilus-dbus-manager.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 298871bc4..1827f92ab 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -39,6 +39,10 @@
<method name='CreateFolder'>
<arg type='s' name='URI' direction='in'/>
</method>
+ <method name='RenameFile'>
+ <arg type='s' name='URI' direction='in'/>
+ <arg type='s' name='NewName' direction='in'/>
+ </method>
<method name='Undo'>
</method>
<method name='Redo'>
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 3257c4bd4..43f27e10a 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -27,6 +27,7 @@
#include "nautilus-file-operations.h"
#include "nautilus-file-undo-manager.h"
+#include "nautilus-file.h"
#define DEBUG_FLAG NAUTILUS_DEBUG_DBUS
#include "nautilus-debug.h"
@@ -230,6 +231,34 @@ handle_trash_files (NautilusDBusFileOperations *object,
return TRUE; /* invocation was handled */
}
+static void
+rename_file_on_finished (NautilusFile *file,
+ GFile *result_location,
+ GError *error,
+ gpointer callback_data)
+{
+ g_application_release (g_application_get_default ());
+}
+
+static gboolean
+handle_rename_file (NautilusDBusFileOperations *object,
+ GDBusMethodInvocation *invocation,
+ const gchar *uri,
+ const gchar *new_name)
+{
+ NautilusFile *file = NULL;
+
+ file = nautilus_file_get_by_uri (uri);
+
+ g_application_hold (g_application_get_default ());
+ nautilus_file_rename (file, new_name,
+ rename_file_on_finished, NULL);
+
+ nautilus_dbus_file_operations_complete_rename_file (object, invocation);
+
+ return TRUE; /* invocation was handled */
+}
+
static void
undo_manager_changed (NautilusDBusManager *self)
@@ -266,6 +295,10 @@ nautilus_dbus_manager_init (NautilusDBusManager *self)
"handle-create-folder",
G_CALLBACK (handle_create_folder),
self);
+ g_signal_connect (self->file_operations,
+ "handle-rename-file",
+ G_CALLBACK (handle_rename_file),
+ self);
g_signal_connect (self->file_operations,
"handle-undo",
G_CALLBACK (handle_undo),
--
2.18.1

View File

@ -0,0 +1,19 @@
diff --git a/data/org.gnome.Nautilus.appdata.xml.in.in b/data/org.gnome.Nautilus.appdata.xml.in.in
index 1e3986323..35e54cb14 100644
--- a/data/org.gnome.Nautilus.appdata.xml.in.in
+++ b/data/org.gnome.Nautilus.appdata.xml.in.in
@@ -2,11 +2,11 @@
<id>@appid@.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license>
- <name>Nautilus</name>
+ <name>Files</name>
<summary>Access and organize files</summary>
<description>
<p>
- Nautilus, also known as Files, is the default file manager of the GNOME desktop.
+ Files, also known as Nautilus, is the default file manager of the GNOME desktop.
It provides a simple and integrated way of managing your files and browsing your file system.
</p>
<p>

View File

@ -0,0 +1,44 @@
From 51b543cd5106a8b929b336bc6779eddd4d2ac780 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Thu, 11 Apr 2019 12:36:21 +0100
Subject: [PATCH] data: Fix caption capitalisation in appdata file
Make the capitalisation of the image captions match the translatable
titles of the dialogues in the images, so that translations can be
reused.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
data/org.gnome.Nautilus.appdata.xml.in.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/org.gnome.Nautilus.appdata.xml.in.in b/data/org.gnome.Nautilus.appdata.xml.in.in
index cb20fa05f..cfc27e533 100644
--- a/data/org.gnome.Nautilus.appdata.xml.in.in
+++ b/data/org.gnome.Nautilus.appdata.xml.in.in
@@ -28,11 +28,11 @@
<screenshots>
<screenshot type="default">
<image>https://static.gnome.org/appdata/nautilus/nautilus-201901141.png</image>
- <caption>Tile view</caption>
+ <caption>Tile View</caption>
</screenshot>
<screenshot>
<image>https://static.gnome.org/appdata/nautilus/nautilus-201901142.png</image>
- <caption>List view</caption>
+ <caption>List View</caption>
</screenshot>
<screenshot>
<image>https://static.gnome.org/appdata/nautilus/nautilus-201901143.png</image>
@@ -40,7 +40,7 @@
</screenshot>
<screenshot>
<image>https://static.gnome.org/appdata/nautilus/nautilus-201901144.png</image>
- <caption>Other locations</caption>
+ <caption>Other Locations</caption>
</screenshot>
</screenshots>
<categories>
--
2.21.0

View File

@ -0,0 +1,61 @@
From 6dd492663cbd3652ebc03d06898f74bacbf87683 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Wed, 3 Jul 2019 11:43:31 +0200
Subject: [PATCH] docs: Add nautilus-autorun-software man page
nautilus-autorun-software is the default "x-content/unix-software"
handler for GNOME desktop. So it is not just internal tool and thus
it should have a man page. Let's add a simple man page for it.
It resolves the following downstream bug:
https://bugzilla.redhat.com/show_bug.cgi?id=1725766
---
docs/meson.build | 1 +
docs/nautilus-autorun-software.1 | 26 ++++++++++++++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 docs/nautilus-autorun-software.1
diff --git a/docs/meson.build b/docs/meson.build
index b039cb631..a54574f3c 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,3 +1,4 @@
install_man('nautilus.1')
+install_man('nautilus-autorun-software.1')
subdir('reference')
diff --git a/docs/nautilus-autorun-software.1 b/docs/nautilus-autorun-software.1
new file mode 100644
index 000000000..9ecbd4adb
--- /dev/null
+++ b/docs/nautilus-autorun-software.1
@@ -0,0 +1,26 @@
+.TH nautilus-autorun-software 1 "3 July 2019"
+
+.SH NAME
+Run Software \- helper tool
+
+.SH SYNOPSIS
+.B nautilus-autorun-software
+.RI "" "mount-uri"
+.br
+
+.SH DESCRIPTION
+.B nautilus-autorun-software
+is a helper tool for the GNOME desktop to start software from media with
+Autostart files.
+.br
+
+It is the default "x-content/unix-software" handler for the GNOME desktop.
+.br
+
+.SH SEE ALSO
+Autostart files are described at
+https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html
+
+.SH BUGS
+Bug reports can be found and filed at
+https://gitlab.gnome.org/GNOME/nautilus/issues
--
2.21.0

View File

@ -0,0 +1,22 @@
diff --git a/src/gtk/nautilusgtkplacesview.c b/src/gtk/nautilusgtkplacesview.c
index de0610e52..b72085ba9 100644
--- a/src/gtk/nautilusgtkplacesview.c
+++ b/src/gtk/nautilusgtkplacesview.c
@@ -401,6 +401,9 @@ nautilus_gtk_places_view_destroy (GtkWidget *widget)
if (priv->network_monitor)
g_signal_handlers_disconnect_by_func (priv->network_monitor, update_places, widget);
+ if (priv->server_list_monitor)
+ g_signal_handlers_disconnect_by_func (priv->server_list_monitor, server_file_changed_cb, widget);
+
g_cancellable_cancel (priv->cancellable);
g_cancellable_cancel (priv->networks_fetching_cancellable);
@@ -1405,6 +1407,7 @@ pulse_entry_cb (gpointer user_data)
{
gtk_entry_set_progress_pulse_step (GTK_ENTRY (priv->address_entry), 0.0);
gtk_entry_set_progress_fraction (GTK_ENTRY (priv->address_entry), 0.0);
+ priv->entry_pulse_timeout_id = 0;
return G_SOURCE_REMOVE;
}

View File

@ -0,0 +1,29 @@
From 4190844d91f9d4f1bb2997d7769caa57dd5f9a4c Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano1618@gmail.com>
Date: Fri, 7 Sep 2018 08:05:18 +0000
Subject: [PATCH] man: Remove geometry option
We removed that some time ago.
---
docs/nautilus.1 | 5 -----
1 file changed, 5 deletions(-)
diff --git a/docs/nautilus.1 b/docs/nautilus.1
index 70304a1d2..a868c72cb 100644
--- a/docs/nautilus.1
+++ b/docs/nautilus.1
@@ -37,11 +37,6 @@ Perform a quick set of self-check tests.
.B \-\-version
Show the version of the program.
-.TP
-.BR \-g ", " \-\-geometry=\fIGEOMETRY\fR
-Create the initial window with the given geometry. \fBDeprecated\fR - the geometry
-is saved and loaded using GSettings.
-
.TP
.BR \-w ", " \-\-new-window
Always open a new window for browsing specified URIs.
--
2.21.0

View File

@ -0,0 +1,54 @@
From 2eed21b2dd3ec0cdd701f9c18e1e2582c69bdad8 Mon Sep 17 00:00:00 2001
From: Timothy OBrien <obrien.timothy.a@gmail.com>
Date: Mon, 14 Jan 2019 02:17:42 +1100
Subject: [PATCH] org.gnome.Nautilus.appdata.xml.in.in: No screenshots in
appdata
No screenshots were supplied by the appdata xml meaning that software install tools would not show them to the user.
This commit proposes a set of screenshots hosted via the static-web project: https://gitlab.gnome.org/Infrastructure/static-web
See static-web merge request https://gitlab.gnome.org/Infrastructure/static-web/merge_requests/2 for proposed screenshots.
Fixes #556
---
data/org.gnome.Nautilus.appdata.xml.in.in | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/data/org.gnome.Nautilus.appdata.xml.in.in b/data/org.gnome.Nautilus.appdata.xml.in.in
index 30648b3e6..cb20fa05f 100644
--- a/data/org.gnome.Nautilus.appdata.xml.in.in
+++ b/data/org.gnome.Nautilus.appdata.xml.in.in
@@ -25,6 +25,24 @@
<kudo>Notifications</kudo>
<kudo>SearchProvider</kudo>
</kudos>
+ <screenshots>
+ <screenshot type="default">
+ <image>https://static.gnome.org/appdata/nautilus/nautilus-201901141.png</image>
+ <caption>Tile view</caption>
+ </screenshot>
+ <screenshot>
+ <image>https://static.gnome.org/appdata/nautilus/nautilus-201901142.png</image>
+ <caption>List view</caption>
+ </screenshot>
+ <screenshot>
+ <image>https://static.gnome.org/appdata/nautilus/nautilus-201901143.png</image>
+ <caption>Search</caption>
+ </screenshot>
+ <screenshot>
+ <image>https://static.gnome.org/appdata/nautilus/nautilus-201901144.png</image>
+ <caption>Other locations</caption>
+ </screenshot>
+ </screenshots>
<categories>
<category>System</category>
</categories>
@@ -35,3 +53,4 @@
<url type="help">https://wiki.gnome.org/action/show/Apps/Nautilus</url>
<translation type="gettext">nautilus</translation>
</component>
+
--
2.21.0

View File

@ -0,0 +1,900 @@
From 93ecc7c079a438bb2baf34500fa77806a545910a Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@redhat.com>
Date: Tue, 23 Apr 2019 11:35:45 +0200
Subject: [PATCH] Remove nfs support strings
---
src/gtk/nautilusgtkplacesview.ui | 701 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
1 file changed, 388 insertions(+), 313 deletions(-)
diff --git a/src/gtk/nautilusgtkplacesview.ui b/src/gtk/nautilusgtkplacesview.ui
index c366fde..601fce2 100644
--- a/src/gtk/nautilusgtkplacesview.ui
+++ b/src/gtk/nautilusgtkplacesview.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface domain="gtk30">
<requires lib="gtk+" version="3.16"/>
<object class="GtkListStore" id="completion_store">
@@ -11,265 +12,52 @@
</object>
<object class="GtkEntryCompletion" id="address_entry_completion">
<property name="model">completion_store</property>
- <property name="text-column">1</property>
- <property name="inline-completion">1</property>
- <property name="popup-completion">0</property>
- </object>
- <object class="GtkPopover" id="server_adresses_popover">
- <property name="relative-to">address_entry</property>
- <child>
- <object class="GtkBox">
- <property name="visible">1</property>
- <property name="border-width">18</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <property name="label" translatable="yes">Server Addresses</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <property name="label" translatable="yes">Server addresses are made up of a protocol prefix and an address. Examples:</property>
- <property name="wrap">1</property>
- <property name="width-chars">40</property>
- <property name="max-width-chars">40</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <property name="label">smb://gnome.org, ssh://192.168.0.1, ftp://[2001:db8::1]</property>
- <property name="wrap">1</property>
- <property name="width-chars">40</property>
- <property name="max-width-chars">40</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid">
- <property name="visible">1</property>
- <property name="margin-top">12</property>
- <property name="hexpand">1</property>
- <property name="row-spacing">6</property>
- <property name="column-spacing">12</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <property name="label" translatable="yes">Available Protocols</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">AppleTalk</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">File Transfer Protocol</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">Network File System</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">Samba</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">SSH File Transfer Protocol</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">WebDAV</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">Prefix</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label">afp://</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes" comments="Translators: do not translate ftp:// and ftps://">ftp:// or ftps://</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label">nfs://</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes">smb://</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes" comments="Translators: do not translate sftp:// and ssh://">sftp:// or ssh://</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">1</property>
- <property name="label" translatable="yes" comments="Translators: do not translate dav:// and davs://">dav:// or davs://</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">6</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="text_column">1</property>
+ <property name="inline_completion">True</property>
+ <property name="popup_completion">False</property>
</object>
<object class="GtkPopover" id="recent_servers_popover">
+ <property name="can_focus">False</property>
<child>
<object class="GtkStack" id="recent_servers_stack">
- <property name="visible">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkBox">
- <property name="visible">1</property>
- <property name="vexpand">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkImage">
- <property name="visible">1</property>
- <property name="pixel-size">48</property>
- <property name="icon-name">network-server-symbolic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixel_size">48</property>
+ <property name="icon_name">network-server-symbolic</property>
<style>
<class name="dim-label"/>
</style>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel">
- <property name="visible">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Translators: Server as any successfully connected network address">No recent servers found</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -280,82 +68,98 @@
</child>
<child>
<object class="GtkBox">
- <property name="visible">1</property>
- <property name="border-width">12</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
- <property name="visible">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Recent Servers</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkScrolledWindow">
- <property name="visible">1</property>
- <property name="can-focus">1</property>
- <property name="vexpand">1</property>
- <property name="shadow-type">in</property>
- <property name="min-content-width">250</property>
- <property name="min-content-height">200</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <property name="min_content_width">250</property>
+ <property name="min_content_height">200</property>
<child>
<object class="GtkViewport">
- <property name="visible">1</property>
- <property name="shadow-type">none</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkListBox" id="recent_servers_listbox">
- <property name="visible">1</property>
- <property name="can-focus">1</property>
- <property name="selection-mode">none</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="selection_mode">none</property>
<signal name="row-activated" handler="on_recent_servers_listbox_row_activated" object="NautilusGtkPlacesView" swapped="yes"/>
</object>
</child>
</object>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="name">list</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<template class="NautilusGtkPlacesView" parent="GtkBox">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<signal name="key-press-event" handler="on_key_press_event" object="NautilusGtkPlacesView" swapped="no"/>
<child>
<object class="GtkStack" id="stack">
- <property name="visible">1</property>
- <property name="vhomogeneous">0</property>
- <property name="transition-type">crossfade</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vhomogeneous">False</property>
+ <property name="transition_type">crossfade</property>
<child>
<object class="GtkFrame">
- <property name="visible">1</property>
- <property name="shadow-type">none</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkScrolledWindow">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <property name="vexpand">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child>
<object class="GtkViewport">
- <property name="visible">1</property>
- <property name="shadow-type">none</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkListBox" id="listbox">
- <property name="visible">1</property>
- <property name="can-focus">1</property>
- <property name="selection-mode">none</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="selection_mode">none</property>
<signal name="row-activated" handler="on_listbox_row_activated" object="NautilusGtkPlacesView" swapped="yes"/>
</object>
</child>
@@ -370,51 +174,65 @@
</child>
<child>
<object class="GtkBox">
- <property name="visible">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="hexpand">1</property>
- <property name="vexpand">1</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage">
- <property name="visible">1</property>
- <property name="pixel-size">72</property>
- <property name="icon-name">edit-find-symbolic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixel_size">72</property>
+ <property name="icon_name">edit-find-symbolic</property>
<style>
<class name="dim-label"/>
</style>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkLabel">
- <property name="visible">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">No results found</property>
<attributes>
<attribute name="weight" value="bold"/>
- <attribute name="scale" value="1.44"/>
+ <attribute name="scale" value="1.4399999999999999"/>
</attributes>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel">
- <property name="visible">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Try a different search</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="name">empty-search</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -426,89 +244,346 @@
</child>
<child>
<object class="GtkActionBar" id="actionbar">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <style>
- <class name="background"/>
- </style>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkLabel">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
- <property name="xalign">0</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label" translatable="yes">Connect to _Server</property>
- <property name="mnemonic-widget">address_entry</property>
- <property name="use-underline">1</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">address_entry</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
- </child>
- <child>
- <object class="GtkButton" id="connect_button">
- <property name="label" translatable="yes">Con_nect</property>
- <property name="use-underline">1</property>
- <property name="visible">1</property>
- <property name="can-focus">1</property>
- <property name="sensitive">0</property>
- <property name="receives-default">1</property>
- <property name="valign">center</property>
- <signal name="clicked" handler="on_connect_button_clicked" object="NautilusGtkPlacesView" swapped="yes"/>
- </object>
<packing>
- <property name="pack-type">end</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
- <property name="visible">1</property>
- <property name="hexpand">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkEntry" id="address_entry">
- <property name="visible">1</property>
- <property name="can-focus">1</property>
- <property name="hexpand">1</property>
- <property name="width-chars">20</property>
- <property name="placeholder-text" translatable="yes">Enter server address…</property>
- <property name="secondary-icon-name">dialog-question-symbolic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="width_chars">20</property>
+ <property name="secondary_icon_name">dialog-question-symbolic</property>
+ <property name="placeholder_text" translatable="yes">Enter server address…</property>
<property name="completion">address_entry_completion</property>
- <signal name="notify::text" handler="on_address_entry_text_changed" object="NautilusGtkPlacesView" swapped="yes"/>
<signal name="activate" handler="on_connect_button_clicked" object="NautilusGtkPlacesView" swapped="yes"/>
<signal name="icon-press" handler="on_address_entry_show_help_pressed" object="NautilusGtkPlacesView" swapped="yes"/>
+ <signal name="notify::text" handler="on_address_entry_text_changed" object="NautilusGtkPlacesView" swapped="yes"/>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkMenuButton" id="server_list_button">
- <property name="visible">1</property>
- <property name="can-focus">1</property>
- <property name="receives-default">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="direction">up</property>
<property name="popover">recent_servers_popover</property>
- <style>
- <class name="server-list-button"/>
- </style>
<child>
<object class="GtkImage">
- <property name="visible">1</property>
- <property name="icon-name">pan-down-symbolic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">pan-down-symbolic</property>
</object>
</child>
+ <style>
+ <class name="server-list-button"/>
+ </style>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
<style>
<class name="linked"/>
</style>
</object>
<packing>
- <property name="pack-type">end</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="connect_button">
+ <property name="label" translatable="yes">Con_nect</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">center</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_connect_button_clicked" object="NautilusGtkPlacesView" swapped="yes"/>
+ </object>
+ <packing>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
+ <style>
+ <class name="background"/>
+ </style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</template>
+ <object class="GtkPopover" id="server_adresses_popover">
+ <property name="can_focus">False</property>
+ <property name="relative_to">address_entry</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">18</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Server Addresses</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Server addresses are made up of a protocol prefix and an address. Examples:</property>
+ <property name="wrap">True</property>
+ <property name="width_chars">40</property>
+ <property name="max_width_chars">40</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label">smb://gnome.org, ssh://192.168.0.1, ftp://[2001:db8::1]</property>
+ <property name="wrap">True</property>
+ <property name="width_chars">40</property>
+ <property name="max_width_chars">40</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">12</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Available Protocols</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">AppleTalk</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">File Transfer Protocol</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Samba</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">SSH File Transfer Protocol</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">WebDAV</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Prefix</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">afp://</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="Translators: do not translate ftp:// and ftps://">ftp:// or ftps://</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">smb://</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="Translators: do not translate sftp:// and ssh://">sftp:// or ssh://</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="Translators: do not translate dav:// and davs://">dav:// or davs://</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
</interface>
--
libgit2 0.26.0

View File

@ -0,0 +1,13 @@
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 89d492a76..5ea21b1d8 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -2864,6 +2864,7 @@ nautilus_window_show_about_dialog (NautilusWindow *window)
"program-name", program_name,
"version", VERSION,
"comments", _("Access and organize your files."),
+ "website", "https://wiki.gnome.org/action/show/Apps/Files",
"copyright", "Copyright © 19992018 The Files Authors",
"license-type", GTK_LICENSE_GPL_3_0,
"artists", artists,

View File

@ -8,7 +8,7 @@
Name: nautilus Name: nautilus
Version: 3.28.1 Version: 3.28.1
Release: 5%{?dist} Release: 10%{?dist}
Summary: File manager for GNOME Summary: File manager for GNOME
License: GPLv3+ License: GPLv3+
@ -29,6 +29,15 @@ Patch10: 0011-dbus-manager-Fix-not-holding-application.patch
Patch11: 0012-clipboard-Use-text-based-clipboard-only.patch Patch11: 0012-clipboard-Use-text-based-clipboard-only.patch
Patch12: 0013-dbus-manager-Provide-undo-status.patch Patch12: 0013-dbus-manager-Provide-undo-status.patch
Patch13: 0014-clipboard-Prevent-crash-when-selection-data-is-empty.patch Patch13: 0014-clipboard-Prevent-crash-when-selection-data-is-empty.patch
Patch14: add-desktop-icons-rename.patch
Patch15: remove-nfs-support-strings.patch
Patch16: fix-criticals-when-connecting-to-remote-locations.patch
Patch17: man-remove-geometry-option.patch
Patch18: org.gnome.Nautilus.appdata.xml.in.in-No-screenshots-.patch
Patch19: data-Fix-caption-capitalisation-in-appdata-file.patch
Patch20: window-Add-website-link-to-About-dialog.patch
Patch21: appdata-Use-Files-instead-of-Nautilus.patch
Patch22: docs-Add-nautilus-autorun-software-man-page.patch
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: meson BuildRequires: meson
@ -98,6 +107,7 @@ sed -i '/-Werror/d' meson.build
%install %install
%meson_install %meson_install
rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc
%find_lang %name %find_lang %name
@ -120,6 +130,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/org.gnome.Nautilus.png %{_datadir}/icons/hicolor/*/apps/org.gnome.Nautilus.png
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Nautilus-symbolic.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Nautilus-symbolic.svg
%{_mandir}/man1/nautilus.1* %{_mandir}/man1/nautilus.1*
%{_mandir}/man1/nautilus-autorun-software.1*
%{_datadir}/glib-2.0/schemas/org.gnome.nautilus.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.nautilus.gschema.xml
%{_datadir}/metainfo/org.gnome.Nautilus.appdata.xml %{_datadir}/metainfo/org.gnome.Nautilus.appdata.xml
%dir %{_libdir}/nautilus %dir %{_libdir}/nautilus
@ -138,11 +149,35 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
%{_libdir}/pkgconfig/* %{_libdir}/pkgconfig/*
%{_libdir}/*.so %{_libdir}/*.so
%{_datadir}/gir-1.0/*.gir %{_datadir}/gir-1.0/*.gir
%dir %{_datadir}/gtk-doc/
%dir %{_datadir}/gtk-doc/html/
%doc %{_datadir}/gtk-doc/html/libnautilus-extension/
%changelog %changelog
* Thu Jul 4 2019 Ondrej Holy <oholy@redhat.com> - 3.28.1-10
- Add screenshots for GNOME Software in Appdata file (rhbz#1725107)
- Add website link to About dialog (rhbz#1725101)
- Use Files instead of Nautilus in Appdata file (rhbz#1725120)
- Add nautilus-autorun-software man page (rhbz#1725766)
* Fri May 31 2019 Ondrej Holy <oholy@redhat.com> - 3.28.1-9
- Fix criticals when connecting to remote locations (rhbz#1643175)
- Remove geometry option from man page (rhbz#1612852)
* Tue Apr 30 2019 Carlos Soriano <csoriano@redhat.com> - 3.26.1-8
- Remove NFS support strings, since libnfs is not in RHEL
Resolves: RHBZ#1704704
* Mon Apr 29 2019 Carlos Soriano <csoriano@redhat.com> - 3.28.1-7
- Disable extension doc generation, since generated files differ and
rpmlint fails when checking that both architectures of the -devel
library generate the same files.
It's an issue in docbook, used by gtk-doc, and althought fixed upstream
they didn't have a new release yet.
https://github.com/docbook/xslt10-stylesheets/issues/54
Resolves: RHBZ#1667136
* Thu Apr 25 2019 Carlos Soriano <csoriano@redhat.com> - 3.28.1-6
- Implement support for desktop icons renaming
Resolves: RHBZ#1667136
* Mon Nov 26 2018 Carlos Soriano <csoriano@redhat.com> - 3.28.1-5 * Mon Nov 26 2018 Carlos Soriano <csoriano@redhat.com> - 3.28.1-5
- Fix crash with new clipboard handling - Fix crash with new clipboard handling
Resolves: RHBZ#1629002 Resolves: RHBZ#1629002