gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-09-29 20:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

placessidebar: Reuse NautilusOpenFlags

Browse source 
This enum serves the same purpose. Translating between them is useless.

This prepares to drop the ::open-location signal.
This commit is contained in:
António Fernandes 2024-06-09 22:26:04 +01:00
parent 402ae03e0b
commit a1e5c2b494
3 changed files with 47 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/gtk/nautilusgtkplacessidebar.c
View file

@ -149,7 +149,7 @@ struct _NautilusGtkPlacesSidebar {
GtkListBoxRow *hover_row;
/* volume mounting - delayed open process */
NautilusGtkPlacesOpenFlags go_to_after_mount_open_flags;
NautilusOpenFlags go_to_after_mount_open_flags;
GCancellable *cancellable;
GtkWidget *popover;
@ -159,7 +159,7 @@ struct _NautilusGtkPlacesSidebar {
GCancellable *hostnamed_cancellable;
char *hostname;
NautilusGtkPlacesOpenFlags open_flags;
NautilusOpenFlags open_flags;
guint mounting : 1;
guint show_desktop : 1;
@ -170,7 +170,7 @@ struct _NautilusGtkPlacesSidebarClass {
void (* open_location) (NautilusGtkPlacesSidebar *sidebar,
GFile *location,
NautilusGtkPlacesOpenFlags open_flags);
NautilusOpenFlags open_flags);
GdkDragAction (* drag_action_requested) (NautilusGtkPlacesSidebar *sidebar,
GFile *dest_file,
GSList *source_file_list);
@ -252,10 +252,10 @@ G_DEFINE_TYPE (NautilusGtkPlacesSidebar, nautilus_gtk_places_sidebar, GTK_TYPE_W
static void
emit_open_location (NautilusGtkPlacesSidebar *sidebar,
GFile *location,
NautilusGtkPlacesOpenFlags open_flags)
NautilusOpenFlags open_flags)
{
if ((open_flags & sidebar->open_flags) == 0)
open_flags = NAUTILUS_GTK_PLACES_OPEN_NORMAL;
open_flags = NAUTILUS_OPEN_FLAG_NORMAL;
g_signal_emit (sidebar, places_sidebar_signals[OPEN_LOCATION], 0,
location, open_flags);
@ -1728,7 +1728,7 @@ mount_volume (NautilusGtkSidebarRow *row,
static void
open_drive (NautilusGtkSidebarRow *row,
GDrive *drive,
NautilusGtkPlacesOpenFlags open_flags)
NautilusOpenFlags open_flags)
{
NautilusGtkPlacesSidebar *sidebar;
@ -1749,7 +1749,7 @@ open_drive (NautilusGtkSidebarRow *row,
static void
open_volume (NautilusGtkSidebarRow *row,
GVolume *volume,
NautilusGtkPlacesOpenFlags open_flags)
NautilusOpenFlags open_flags)
{
NautilusGtkPlacesSidebar *sidebar;
@ -1767,7 +1767,7 @@ open_volume (NautilusGtkSidebarRow *row,
static void
open_uri (NautilusGtkPlacesSidebar *sidebar,
const char *uri,
NautilusGtkPlacesOpenFlags open_flags)
NautilusOpenFlags open_flags)
{
GFile *location;
@ -1778,7 +1778,7 @@ open_uri (NautilusGtkPlacesSidebar *sidebar,
static void
open_row (NautilusGtkSidebarRow *row,
NautilusGtkPlacesOpenFlags open_flags)
NautilusOpenFlags open_flags)
{
char *uri;
GDrive *drive;
@ -1822,9 +1822,9 @@ open_shortcut_cb (GSimpleAction *action,
gpointer data)
{
NautilusGtkPlacesSidebar *sidebar = data;
NautilusGtkPlacesOpenFlags flags;
NautilusOpenFlags flags;
flags = (NautilusGtkPlacesOpenFlags)g_variant_get_int32 (parameter);
flags = (NautilusOpenFlags)g_variant_get_int32 (parameter);
open_row (sidebar->context_row, flags);
}
@ -2588,12 +2588,12 @@ on_key_pressed (GtkEventControllerKey *controller,
keyval == GDK_KEY_ISO_Enter ||
keyval == GDK_KEY_space)
{
NautilusGtkPlacesOpenFlags open_flags = NAUTILUS_GTK_PLACES_OPEN_NORMAL;
NautilusOpenFlags open_flags = NAUTILUS_OPEN_FLAG_NORMAL;
if ((state & modifiers) == GDK_SHIFT_MASK)
open_flags = NAUTILUS_GTK_PLACES_OPEN_NEW_TAB;
open_flags = NAUTILUS_OPEN_FLAG_NEW_TAB;
else if ((state & modifiers) == GDK_CONTROL_MASK)
open_flags = NAUTILUS_GTK_PLACES_OPEN_NEW_WINDOW;
open_flags = NAUTILUS_OPEN_FLAG_NEW_WINDOW;
open_row (NAUTILUS_GTK_SIDEBAR_ROW (row), open_flags);
@ -2724,21 +2724,21 @@ build_popup_menu_using_gmenu (NautilusGtkSidebarRow *row)
GMenuItem *item;
item = g_menu_item_new (_("_Open"), "row.open");
g_menu_item_set_action_and_target_value (item, "row.open",
g_variant_new_int32 (NAUTILUS_GTK_PLACES_OPEN_NORMAL));
g_variant_new_int32 (NAUTILUS_OPEN_FLAG_NORMAL));
g_menu_append_item (menu, item);
g_object_unref (item);
if (sidebar->open_flags & NAUTILUS_GTK_PLACES_OPEN_NEW_TAB)
if (sidebar->open_flags & NAUTILUS_OPEN_FLAG_NEW_TAB)
{
item = g_menu_item_new (_("Open in New _Tab"), "row.open-other");
g_menu_item_set_action_and_target_value (item, "row.open-other", g_variant_new_int32(NAUTILUS_GTK_PLACES_OPEN_NEW_TAB));
g_menu_item_set_action_and_target_value (item, "row.open-other", g_variant_new_int32(NAUTILUS_OPEN_FLAG_NEW_TAB));
g_menu_append_item (menu, item);
g_object_unref (item);
}
if (sidebar->open_flags & NAUTILUS_GTK_PLACES_OPEN_NEW_WINDOW)
if (sidebar->open_flags & NAUTILUS_OPEN_FLAG_NEW_WINDOW)
{
item = g_menu_item_new (_("Open in New _Window"), "row.open-other");
g_menu_item_set_action_and_target_value (item, "row.open-other", g_variant_new_int32(NAUTILUS_GTK_PLACES_OPEN_NEW_WINDOW));
g_menu_item_set_action_and_target_value (item, "row.open-other", g_variant_new_int32(NAUTILUS_OPEN_FLAG_NEW_WINDOW));
g_menu_append_item (menu, item);
g_object_unref (item);
}
@ -2840,24 +2840,24 @@ create_row_popover (NautilusGtkPlacesSidebar *sidebar,
item = g_menu_item_new (_("_Open"), "row.open");
g_menu_item_set_action_and_target_value (item, "row.open",
g_variant_new_int32 (NAUTILUS_GTK_PLACES_OPEN_NORMAL));
g_variant_new_int32 (NAUTILUS_OPEN_FLAG_NORMAL));
g_menu_append_item (section, item);
g_object_unref (item);
if (sidebar->open_flags & NAUTILUS_GTK_PLACES_OPEN_NEW_TAB)
if (sidebar->open_flags & NAUTILUS_OPEN_FLAG_NEW_TAB)
{
item = g_menu_item_new (_("Open in New _Tab"), "row.open-other");
g_menu_item_set_action_and_target_value (item, "row.open-other",
g_variant_new_int32 (NAUTILUS_GTK_PLACES_OPEN_NEW_TAB));
g_variant_new_int32 (NAUTILUS_OPEN_FLAG_NEW_TAB));
g_menu_append_item (section, item);
g_object_unref (item);
}
if (sidebar->open_flags & NAUTILUS_GTK_PLACES_OPEN_NEW_WINDOW)
if (sidebar->open_flags & NAUTILUS_OPEN_FLAG_NEW_WINDOW)
{
item = g_menu_item_new (_("Open in New _Window"), "row.open-other");
g_menu_item_set_action_and_target_value (item, "row.open-other",
g_variant_new_int32 (NAUTILUS_GTK_PLACES_OPEN_NEW_WINDOW));
g_variant_new_int32 (NAUTILUS_OPEN_FLAG_NEW_WINDOW));
g_menu_append_item (section, item);
g_object_unref (item);
}
@ -3087,11 +3087,11 @@ on_row_released (GtkGestureClick *gesture,
{
if (button == 2)
{
NautilusGtkPlacesOpenFlags open_flags = NAUTILUS_GTK_PLACES_OPEN_NORMAL;
NautilusOpenFlags open_flags = NAUTILUS_OPEN_FLAG_NORMAL;
open_flags = (state & GDK_CONTROL_MASK) ?
NAUTILUS_GTK_PLACES_OPEN_NEW_WINDOW :
NAUTILUS_GTK_PLACES_OPEN_NEW_TAB;
NAUTILUS_OPEN_FLAG_NEW_WINDOW :
NAUTILUS_OPEN_FLAG_NEW_TAB;
open_row (NAUTILUS_GTK_SIDEBAR_ROW (row), open_flags);
gtk_gesture_set_state (GTK_GESTURE (gesture),
@ -3409,7 +3409,7 @@ nautilus_gtk_places_sidebar_init (NautilusGtkPlacesSidebar *sidebar)
G_CALLBACK (update_location), sidebar,
G_CONNECT_SWAPPED);
sidebar->open_flags = NAUTILUS_GTK_PLACES_OPEN_NORMAL;
sidebar->open_flags = NAUTILUS_OPEN_FLAG_NORMAL;
NautilusApplication *app = NAUTILUS_APPLICATION (g_application_get_default ());
sidebar->bookmark_list = nautilus_application_get_bookmarks (app);
@ -3725,7 +3725,7 @@ nautilus_gtk_places_sidebar_class_init (NautilusGtkPlacesSidebarClass *class)
* NautilusGtkPlacesSidebar::open-location:
* @sidebar: the object which received the signal.
* @location: (type Gio.File): GFile to which the caller should switch.
* @open_flags: a single value from NautilusGtkPlacesOpenFlags specifying how the @location should be opened.
* @open_flags: a single value from NautilusOpenFlags specifying how the @location should be opened.
*
* The places sidebar emits this signal when the user selects a location
* in it. The calling application should display the contents of that
@ -3875,7 +3875,7 @@ nautilus_gtk_places_sidebar_class_init (NautilusGtkPlacesSidebarClass *class)
"Open Flags",
"Modes in which the calling app can open locations selected in the sidebar",
NAUTILUS_TYPE_OPEN_FLAGS,
NAUTILUS_GTK_PLACES_OPEN_NORMAL,
NAUTILUS_OPEN_FLAG_NORMAL,
G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB);
properties[PROP_WINDOW_SLOT] =
g_param_spec_object ("window-slot", NULL, NULL,
@ -3923,12 +3923,12 @@ nautilus_gtk_places_sidebar_new (void)
* argument will be set to one of the @flags that was passed in
* nautilus_gtk_places_sidebar_set_open_flags().
*
* Passing 0 for @flags will cause NAUTILUS_GTK_PLACES_OPEN_NORMAL to always be sent
* Passing 0 for @flags will cause NAUTILUS_OPEN_FLAG_NORMAL to always be sent
* to callbacks for the “open-location” signal.
*/
void
nautilus_gtk_places_sidebar_set_open_flags (NautilusGtkPlacesSidebar *sidebar,
NautilusGtkPlacesOpenFlags flags)
NautilusOpenFlags flags)
{
g_return_if_fail (NAUTILUS_IS_GTK_PLACES_SIDEBAR (sidebar));
@ -3945,9 +3945,9 @@ nautilus_gtk_places_sidebar_set_open_flags (NautilusGtkPlacesSidebar *sidebar,
*
* Gets the open flags.
*
* Returns: the NautilusGtkPlacesOpenFlags of @sidebar
* Returns: the NautilusOpenFlags of @sidebar
*/
NautilusGtkPlacesOpenFlags
NautilusOpenFlags
nautilus_gtk_places_sidebar_get_open_flags (NautilusGtkPlacesSidebar *sidebar)
{
g_return_val_if_fail (NAUTILUS_IS_GTK_PLACES_SIDEBAR (sidebar), 0);

39
src/gtk/nautilusgtkplacessidebarprivate.h
View file

@ -24,6 +24,8 @@
#include <glib.h>
#include <gtk/gtk.h>
#include "nautilus-enums.h"
G_BEGIN_DECLS
#define NAUTILUS_TYPE_GTK_PLACES_SIDEBAR (nautilus_gtk_places_sidebar_get_type ())
@ -36,45 +38,12 @@ G_BEGIN_DECLS
typedef struct _NautilusGtkPlacesSidebar NautilusGtkPlacesSidebar;
typedef struct _NautilusGtkPlacesSidebarClass NautilusGtkPlacesSidebarClass;
/*
* NautilusGtkPlacesOpenFlags:
* @NAUTILUS_GTK_PLACES_OPEN_NORMAL: This is the default mode that NautilusGtkPlacesSidebar uses if no other flags
* are specified. It indicates that the calling application should open the selected location
* in the normal way, for example, in the folder view beside the sidebar.
* @NAUTILUS_GTK_PLACES_OPEN_NEW_TAB: When passed to nautilus_gtk_places_sidebar_set_open_flags(), this indicates
* that the application can open folders selected from the sidebar in new tabs. This value
* will be passed to the NautilusGtkPlacesSidebar::open-location signal when the user selects
* that a location be opened in a new tab instead of in the standard fashion.
* @NAUTILUS_GTK_PLACES_OPEN_NEW_WINDOW: Similar to @NAUTILUS_GTK_PLACES_OPEN_NEW_TAB, but indicates that the application
* can open folders in new windows.
*
* These flags serve two purposes. First, the application can call nautilus_gtk_places_sidebar_set_open_flags()
* using these flags as a bitmask. This tells the sidebar that the application is able to open
* folders selected from the sidebar in various ways, for example, in new tabs or in new windows in
* addition to the normal mode.
*
* Second, when one of these values gets passed back to the application in the
* NautilusGtkPlacesSidebar::open-location signal, it means that the application should
* open the selected location in the normal way, in a new tab, or in a new
* window. The sidebar takes care of determining the desired way to open the location,
* based on the modifier keys that the user is pressing at the time the selection is made.
*
* If the application never calls nautilus_gtk_places_sidebar_set_open_flags(), then the sidebar will only
* use NAUTILUS_GTK_PLACES_OPEN_NORMAL in the NautilusGtkPlacesSidebar::open-location signal. This is the
* default mode of operation.
*/
typedef enum {
NAUTILUS_GTK_PLACES_OPEN_NORMAL = 1 << 0,
NAUTILUS_GTK_PLACES_OPEN_NEW_TAB = 1 << 1,
NAUTILUS_GTK_PLACES_OPEN_NEW_WINDOW = 1 << 2
} NautilusGtkPlacesOpenFlags;
GType nautilus_gtk_places_sidebar_get_type (void) G_GNUC_CONST;
GtkWidget * nautilus_gtk_places_sidebar_new (void);
NautilusGtkPlacesOpenFlags nautilus_gtk_places_sidebar_get_open_flags (NautilusGtkPlacesSidebar *sidebar);
NautilusOpenFlags nautilus_gtk_places_sidebar_get_open_flags (NautilusGtkPlacesSidebar *sidebar);
void nautilus_gtk_places_sidebar_set_open_flags (NautilusGtkPlacesSidebar *sidebar,
NautilusGtkPlacesOpenFlags flags);
NautilusOpenFlags flags);
GFile * nautilus_gtk_places_sidebar_get_location (NautilusGtkPlacesSidebar *sidebar);
void nautilus_gtk_places_sidebar_set_location (NautilusGtkPlacesSidebar *sidebar,

37
src/nautilus-window.c
View file

@ -669,35 +669,16 @@ update_cursor (NautilusWindow *window)
/* Callback used when the places sidebar changes location; we need to change the displayed folder */
static void
open_location_cb (NautilusWindow *window,
GFile *location,
NautilusGtkPlacesOpenFlags open_flags)
open_location_cb (NautilusWindow *window,
GFile *location,
NautilusOpenFlags flags)
{
NautilusOpenFlags flags;
NautilusApplication *application;
AdwOverlaySplitView *split_view = ADW_OVERLAY_SPLIT_VIEW (window->split_view);
switch (open_flags)
if (flags == NAUTILUS_OPEN_FLAG_NEW_TAB)
{
case NAUTILUS_GTK_PLACES_OPEN_NEW_TAB:
{
flags = NAUTILUS_OPEN_FLAG_NEW_TAB |
NAUTILUS_OPEN_FLAG_DONT_MAKE_ACTIVE;
}
break;
case NAUTILUS_GTK_PLACES_OPEN_NEW_WINDOW:
{
flags = NAUTILUS_OPEN_FLAG_NEW_WINDOW;
}
break;
case NAUTILUS_GTK_PLACES_OPEN_NORMAL: /* fall-through */
default:
{
flags = 0;
}
break;
flags |= NAUTILUS_OPEN_FLAG_DONT_MAKE_ACTIVE;
}
application = NAUTILUS_APPLICATION (g_application_get_default ());
@ -708,7 +689,7 @@ open_location_cb (NautilusWindow *window,
NULL, window, NULL);
if (adw_overlay_split_view_get_collapsed (split_view) &&
open_flags == NAUTILUS_GTK_PLACES_OPEN_NORMAL)
flags == NAUTILUS_OPEN_FLAG_NORMAL)
{
adw_overlay_split_view_set_show_sidebar (split_view, FALSE);
}
@ -818,9 +799,9 @@ static void
nautilus_window_set_up_sidebar (NautilusWindow *window)
{
nautilus_gtk_places_sidebar_set_open_flags (NAUTILUS_GTK_PLACES_SIDEBAR (window->places_sidebar),
(NAUTILUS_GTK_PLACES_OPEN_NORMAL
| NAUTILUS_GTK_PLACES_OPEN_NEW_TAB
| NAUTILUS_GTK_PLACES_OPEN_NEW_WINDOW));
(NAUTILUS_OPEN_FLAG_NORMAL
| NAUTILUS_OPEN_FLAG_NEW_TAB
| NAUTILUS_OPEN_FLAG_NEW_WINDOW));
g_signal_connect_swapped (window->places_sidebar, "open-location",
G_CALLBACK (open_location_cb), window);