mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 17:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Gives full path to file to open in file manager.

Browse source 
- The path to the file wa being stored in the wrong activity property.
It was in the action link when it should be in the file.
- Minor: comments out the display of issues and protocol widget.

Signed-off-by: Camila San <hello@camila.codes>
This commit is contained in:
Camila San 2018-07-05 17:55:37 +02:00 committed by Roeland Jago Douma
parent f402b1d9e4
commit ab3c6da5d7
No known key found for this signature in database
GPG key ID: F941078878347C0C
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gui/activitywidget.cpp
View file

@ -137,10 +137,8 @@ void ActivityWidget::slotItemCompleted(const QString &folder, const SyncFileItem
activity._file = item->_file;
ActivityLink al;
QFileInfo file(item->_file);
al._label = tr("Open Folder");
al._link = QString("%1/%2").arg(folderInstance->cleanPath(), file.path());
qDebug() << "FULLPATH:" << al._link;
al._link = QString("%1/%2").arg(folderInstance->cleanPath(), item->_file);
al._verb = "";
al._isPrimary = true;
activity._links.append(al);
@ -569,13 +567,13 @@ ActivitySettings::ActivitySettings(AccountState *accountState, QWidget *parent)
connect(_activityWidget, &ActivityWidget::rowsInserted, _progressIndicator, &QProgressIndicator::stopAnimation);
connect(_activityWidget, &ActivityWidget::rowsInserted, this, &ActivitySettings::slotDisplayActivities);
_protocolWidget = new ProtocolWidget(this);
_vbox->addWidget(_protocolWidget);
//_protocolWidget = new ProtocolWidget(this);
//_vbox->addWidget(_protocolWidget);
// _protocolTabId = _tab->addTab(_protocolWidget, Theme::instance()->syncStateIcon(SyncResult::Success), tr("Sync Protocol"));
// connect(_protocolWidget, &ProtocolWidget::copyToClipboard, this, &ActivitySettings::slotCopyToClipboard);
_issuesWidget = new IssuesWidget(this);
_vbox->addWidget(_issuesWidget);
// _issuesWidget = new IssuesWidget(this);
// _vbox->addWidget(_issuesWidget);
// _syncIssueTabId = _tab->addTab(_issuesWidget, Theme::instance()->syncStateIcon(SyncResult::Problem), QString());
// slotShowIssueItemCount(0); // to display the label.
// connect(_issuesWidget, &IssuesWidget::issueCountUpdated,

13
src/gui/settingsdialog.cpp
View file

@ -194,14 +194,6 @@ void SettingsDialog::showActivityPage()
}
}
//void SettingsDialog::showIssuesList(const QString &folderAlias)
//{
// if (!_activityAction)
// return;
// _activityAction->trigger();
// _activitySettings->slotShowIssuesTab(folderAlias);
//}
void SettingsDialog::activityAdded(AccountState *s){
_ui->stack->addWidget(_activitySettings[s]);
connect(_activitySettings[s], &ActivitySettings::guiLog, _gui,
@ -257,12 +249,11 @@ void SettingsDialog::accountAdded(AccountState *s)
connect(accountSettings, &AccountSettings::folderChanged, _gui, &ownCloudGui::slotFoldersChanged);
connect(accountSettings, &AccountSettings::openFolderAlias,
_gui, &ownCloudGui::slotFolderOpenAction);
//connect(accountSettings, &AccountSettings::showIssuesList, this, &SettingsDialog::showIssuesList);
connect(s->account().data(), &Account::accountChangedAvatar, this, &SettingsDialog::slotAccountAvatarChanged);
connect(s->account().data(), &Account::accountChangedDisplayName, this, &SettingsDialog::slotAccountDisplayNameChanged);
// Refresh immediatly when getting online
//connect(s, &AccountState::isConnectedChanged, this, &SettingsDialog::slotRefreshActivityAccountStateSender);
// Refresh immediatly when getting online (?)
connect(s, &AccountState::isConnectedChanged, this, &SettingsDialog::slotRefreshActivityAccountStateSender);
//slotRefreshActivity(s);