Skip to content

Commit 533a29d

Browse files
committed
fix: context menu.
Signed-off-by: Camila Ayres <[email protected]>
1 parent 330facf commit 533a29d

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/gui/socketapi/socketapi.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,9 +1154,9 @@ void SocketApi::command_GET_STRINGS(const QString &argument, SocketListener *lis
11541154
{
11551155
static std::array<std::pair<const char *, QString>, 7> strings { {
11561156
{ "SHARE_MENU_TITLE", tr("Share options") },
1157+
{ "FILE_ACTIONS_MENU_TITLE", tr("File actions") },
11571158
{ "FILE_ACTIVITY_MENU_TITLE", tr("Activity") },
11581159
{ "CONTEXT_MENU_TITLE", Theme::instance()->appNameGUI() },
1159-
{ "FILE_ACTIONS_MENU_TITLE", tr("File actions") },
11601160
{ "COPY_PRIVATE_LINK_MENU_TITLE", tr("Copy private link to clipboard") },
11611161
{ "EMAIL_PRIVATE_LINK_MENU_TITLE", tr("Send private link by email …") },
11621162
{ "CONTEXT_MENU_ICON", APPLICATION_ICON_NAME },
@@ -1203,6 +1203,14 @@ void SocketApi::sendSharingContextMenuOptions(const FileData &fileData, SocketLi
12031203
//listener->sendMessage(QLatin1String("MENU_ITEM:EMAIL_PRIVATE_LINK") + flagString + tr("Send private link by email …"));
12041204
}
12051205

1206+
void SocketApi::sendFileActionsContextMenuOptions(const FileData &fileData, SocketListener *listener)
1207+
{
1208+
const auto record = fileData.journalRecord();
1209+
const auto isOnTheServer = record.isValid();
1210+
const auto flagString = isOnTheServer ? QLatin1String("::") : QLatin1String(":d:");
1211+
listener->sendMessage(QLatin1String("MENU_ITEM:FILE_ACTIONS") + flagString + tr("File actions"));
1212+
}
1213+
12061214
void SocketApi::sendEncryptFolderCommandMenuEntries(const QFileInfo &fileInfo,
12071215
const FileData &fileData,
12081216
const bool isE2eEncryptedPath,
@@ -1387,6 +1395,7 @@ void SocketApi::command_GET_MENU_ITEMS(const QString &argument, OCC::SocketListe
13871395
const auto itemEncryptionFlag = isE2eEncryptedPath ? SharingContextItemEncryptedFlag::EncryptedItem : SharingContextItemEncryptedFlag::NotEncryptedItem;
13881396
const auto rootE2eeFolderFlag = isE2eEncryptedRootFolder ? SharingContextItemRootEncryptedFolderFlag::RootEncryptedFolder : SharingContextItemRootEncryptedFolderFlag::NonRootEncryptedFolder;
13891397
sendSharingContextMenuOptions(fileData, listener, itemEncryptionFlag, rootE2eeFolderFlag);
1398+
sendFileActionsContextMenuOptions(fileData, listener);
13901399

13911400
// Conflict files get conflict resolution actions
13921401
bool isConflict = Utility::isConflictFile(fileData.folderRelativePath);

src/gui/socketapi/socketapi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private slots:
159159

160160
// Sends the context menu options relating to sharing to listener
161161
void sendSharingContextMenuOptions(const FileData &fileData, SocketListener *listener, SharingContextItemEncryptedFlag itemEncryptionFlag, SharingContextItemRootEncryptedFolderFlag rootE2eeFolderFlag);
162-
162+
void sendFileActionsContextMenuOptions(const FileData &fileData, SocketListener *listener);
163163
void sendEncryptFolderCommandMenuEntries(const QFileInfo &fileInfo,
164164
const FileData &fileData,
165165
const bool isE2eEncryptedPath,

0 commit comments

Comments
 (0)