mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8735 from nextcloud/bugfix/openMainDialogLibCloudProviders

Browse Source 
fix(cloudprovider): add open main dialog action
This commit is contained in:
Matthieu Gallien 2025-09-17 11:52:15 +02:00 committed by GitHub
commit 1df195245e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/cloudproviders/cloudproviderwrapper.cpp
View File

@ -95,7 +95,7 @@ void CloudProviderWrapper::slotUpdateProgress(const QString &folder, const Progr
// Build recently changed files list
if (!progress._lastCompletedItem.isEmpty() && shouldShowInRecentsMenu(progress._lastCompletedItem)) {
QFontMetrics fm = QApplication::fontMetrics();
const auto fm = QFontMetricsF{QApplication::font()};
QString kindStr = Progress::asResultString(progress._lastCompletedItem);
QString elidedKindStr = fm.elidedText(kindStr, Qt::ElideRight, preferredTextWidth);
QString timeStr = QTime::currentTime().toString("hh:mm");
@ -168,6 +168,10 @@ void CloudProviderWrapper::slotUpdateProgress(const QString &folder, const Progr
void CloudProviderWrapper::updateStatusText(QString statusText)
{
if (!_folder) {
return;
}
QString status = QStringLiteral("%1 - %2").arg(_folder->accountState()->stateString(_folder->accountState()->state()), statusText);
cloud_providers_account_exporter_set_status_details(_cloudProviderAccount, status.toUtf8().data());
}
@ -207,7 +211,7 @@ void CloudProviderWrapper::slotSyncFinished(const SyncResult &result)
static GMenuItem* addMenuItem(const QString text, const gchar *action)
{
QFontMetrics fm = QApplication::fontMetrics();
const auto fm = QFontMetricsF{QApplication::font()};
CloudProviderWrapper::preferredTextWidth = MAX (CloudProviderWrapper::preferredTextWidth, (fm.boundingRect (text)).width ());
return menu_item_new (text, action);
}
@ -216,12 +220,18 @@ GMenuModel* CloudProviderWrapper::getMenuModel() {
GMenu* section = nullptr;
GMenuItem* item = nullptr;
QString item_label;
_mainMenu = g_menu_new();
section = g_menu_new();
item = addMenuItem(tr("Open website"), "cloudprovider.openwebsite");
item = addMenuItem(tr("Open %1 Desktop", "Open Nextcloud main window. Placeholer will be the application name. Please keep it.").arg(APPLICATION_NAME), "cloudprovider.openmaindialog");
g_menu_append_item(section, item);
g_clear_object (&item);
g_menu_append_section(_mainMenu, nullptr, G_MENU_MODEL(section));
g_clear_object (&section);
section = g_menu_new();
item = addMenuItem(tr("Open in browser"), "cloudprovider.openwebsite");
g_menu_append_item(section, item);
g_clear_object (&item);
g_menu_append_section(_mainMenu, nullptr, G_MENU_MODEL(section));
@ -281,6 +291,10 @@ activate_action_open (GSimpleAction *action, GVariant *parameter, gpointer user_
gui->slotShowSettings();
}
if(g_str_equal(name, "openmaindialog")) {
gui->slotOpenMainDialog();
}
if(g_str_equal(name, "openwebsite")) {
QDesktopServices::openUrl(self->folder()->accountState()->account()->url());
}
@ -330,6 +344,7 @@ activate_action_pause (GSimpleAction *action,
}
static GActionEntry actions[] = {
{ "openmaindialog", activate_action_open, nullptr, nullptr, nullptr, {0,0,0}},
{ "openwebsite", activate_action_open, nullptr, nullptr, nullptr, {0,0,0}},
{ "quit", activate_action_open, nullptr, nullptr, nullptr, {0,0,0}},
{ "logout", activate_action_open, nullptr, nullptr, nullptr, {0,0,0}},

2
src/gui/systray.cpp
View File

@ -176,7 +176,7 @@ void Systray::setupContextMenu()
if (AccountManager::instance()->accounts().isEmpty()) {
_contextMenu->addAction(tr("Add account"), this, &Systray::openAccountWizard);
} else {
_contextMenu->addAction(tr("Open main dialog"), this, [this]{ showWindow(); });
_contextMenu->addAction(tr("Open %1 Desktop", "Open Nextcloud main window. Placeholer will be the application name. Please keep it.").arg(APPLICATION_NAME), this, [this]{ showWindow(); });
}
auto pauseAction = _contextMenu->addAction(tr("Pause sync"), this, &Systray::slotPauseAllFolders);