mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-25 22:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Shell integration: Make nautilus work with multiselections

Browse source 
Previously no menu would ever be shown if more than one file is
selected. Now the GET_MENU_ITEMS command is sent with all selected files
as an argument - similar to what is done for the dolphin integration.
This commit is contained in:
Christian Kamm 2018-01-22 10:22:51 +01:00 committed by Olivier Goffart
parent 3c2622d2de
commit ebfac84c69
1 changed files with 35 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
shell_integration/nautilus/syncstate.py
View file

@ -199,36 +199,38 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
def get_file_items(self, window, files): def get_file_items(self, window, files):
# Show the menu extension to share a file or folder # Show the menu extension to share a file or folder
#
# Show if file is OK.
# Ignore top level folders.
# Also show extension for folders
# if there is a OK or SYNC underneath.
# This is only
if len(files) != 1: # Get usable file paths from the uris
return all_internal_files = True
file = files[0] for i, file_uri in enumerate(files):
filename = get_local_path(file_uri.get_uri())
filename = get_local_path(file.get_uri()) # Check if its a folder (ends with an /), if yes add a "/"
# Check if its a folder (ends with an /), if yes add a "/" # otherwise it will not find the entry in the table
# otherwise it will not find the entry in the table isDir = os.path.isdir(filename + os.sep)
isDir = os.path.isdir(filename + os.sep) if isDir:
if isDir: filename += os.sep
filename += os.sep
# Check if toplevel folder, we need to ignore those as they cannot be shared # Check if toplevel folder, we need to ignore those as they cannot be shared
topLevelFolder, internalFile = self.check_registered_paths(filename) topLevelFolder, internalFile = self.check_registered_paths(filename)
if topLevelFolder or not internalFile: if not internalFile:
all_internal_files = False
files[i] = filename
# Don't show a context menu if some selected files aren't in a sync folder
if not all_internal_files:
return [] return []
if socketConnect.protocolVersion >= '1.1': # lexicographic! if socketConnect.protocolVersion >= '1.1': # lexicographic!
return self.ask_for_menu_items(filename) return self.ask_for_menu_items(files)
else: else:
return self.legacy_menu_items(filename) return self.legacy_menu_items(files)
def ask_for_menu_items(self, filename): def ask_for_menu_items(self, files):
socketConnect.sendCommand('GET_MENU_ITEMS:{}\n'.format(filename)) record_separator = '\x1e'
filesstring = record_separator.join(files)
socketConnect.sendCommand('GET_MENU_ITEMS:{}\n'.format(filesstring))
done = False done = False
start = time.time() start = time.time()
@ -255,7 +257,10 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
menu_items.append([args[1], 'd' not in args[2], ':'.join(args[3:])]) menu_items.append([args[1], 'd' not in args[2], ':'.join(args[3:])])
if not done: if not done:
return self.legacy_menu_items(filename) return self.legacy_menu_items(files)
if len(menu_items) == 0:
return []
# Set up the 'ownCloud...' submenu # Set up the 'ownCloud...' submenu
item_owncloud = Nautilus.MenuItem( item_owncloud = Nautilus.MenuItem(
@ -265,13 +270,18 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
for action, enabled, label in menu_items: for action, enabled, label in menu_items:
item = Nautilus.MenuItem(name=action, label=label, sensitive=enabled) item = Nautilus.MenuItem(name=action, label=label, sensitive=enabled)
item.connect("activate", self.context_menu_action, action, filename) item.connect("activate", self.context_menu_action, action, filesstring)
menu.append_item(item) menu.append_item(item)
return [item_owncloud] return [item_owncloud]
def legacy_menu_items(self, filename): def legacy_menu_items(self, files):
# No legacy menu for a selection of several files
if len(files) != 1:
return []
filename = files[0]
entry = socketConnect.nautilusVFSFile_table.get(filename) entry = socketConnect.nautilusVFSFile_table.get(filename)
if not entry: if not entry:
return [] return []