mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 05:45:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Settings dialog: remove the code that was updating the account icon

Browse source 
I just wanted to fix the warning:
 QObject::connect: No such slot OCC::SettingsDialog::slotUpdateAccountIcon(QIcon) in settingsdialog.cpp:108

It turns out we don't need anymore the signal or any of the code that
was updating the account icon in the settings dialog since it we now have a fixed icon
This commit is contained in:
Olivier Goffart 2014-12-16 11:36:52 +01:00
parent 3ee14164db
commit 414838cae8
3 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gui/accountsettings.cpp
View file

@ -115,12 +115,9 @@ AccountSettings::AccountSettings(QWidget *parent) :
slotAccountChanged(AccountManager::instance()->account(), 0);
FolderMan *folderMan = FolderMan::instance();
connect(folderMan, SIGNAL(folderSyncStateChange(QString)),
this, SLOT(slotSyncStateChange(QString)));
connect(folderMan, SIGNAL(folderListLoaded(Folder::Map)),
this, SLOT(setFolderList(Folder::Map)));
setFolderList(FolderMan::instance()->map());
slotSyncStateChange();
}
void AccountSettings::slotAccountChanged(Account *newAccount, Account *oldAccount)
@ -790,7 +787,6 @@ void AccountSettings::slotAccountStateChanged(int state)
foreach (Folder *folder, folderMan->map().values()) {
slotUpdateFolderState(folder);
}
slotSyncStateChange();
if (state == Account::Connected) {
QString user;
if (AbstractCredentials *cred = _account->credentials()) {
@ -816,21 +812,6 @@ void AccountSettings::slotAccountStateChanged(int state)
}
}
void AccountSettings::slotSyncStateChange(const QString& alias)
{
Q_UNUSED(alias);
QIcon icon;
if (_account && _account->state() == Account::Connected) {
FolderMan *folderMan = FolderMan::instance();
SyncResult state = folderMan->accountStatus(folderMan->map().values());
icon = Theme::instance()->syncStateIcon(state.status());
} else {
icon = Theme::instance()->folderOfflineIcon();
}
emit accountIconChanged(icon);
}
AccountSettings::~AccountSettings()
{
delete ui;

2
src/gui/accountsettings.h
View file

@ -54,7 +54,6 @@ signals:
void openProtocol();
void openFolderAlias( const QString& );
void infoFolderAlias( const QString& );
void accountIconChanged( const QIcon& );
public slots:
void slotFolderActivated( const QModelIndex& );
@ -63,7 +62,6 @@ public slots:
void slotDoubleClicked( const QModelIndex& );
void slotSetProgress(const QString& folder, const Progress::Info& progress);
void slotButtonsSetEnabled();
void slotSyncStateChange(const QString& alias = QString());
void slotUpdateQuota( qint64,qint64 );
void slotIgnoreFilesEditor();

1
src/gui/settingsdialog.cpp
View file

@ -105,7 +105,6 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) :
connect(group, SIGNAL(triggered(QAction*)), SLOT(slotSwitchPage(QAction*)));
connect( _accountSettings, SIGNAL(folderChanged()), gui, SLOT(slotFoldersChanged()));
connect( _accountSettings, SIGNAL(accountIconChanged(QIcon)), SLOT(slotUpdateAccountIcon(QIcon)));
connect( _accountSettings, SIGNAL(openFolderAlias(const QString&)),
gui, SLOT(slotFolderOpenAction(QString)));