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

Sharedialog: fix changes due to rebase

Browse source
This commit is contained in:
Roeland Jago Douma 2015-01-14 13:51:02 +01:00
parent e420a689dc
commit 0bd6eb1792
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/application.cpp
View file

@ -147,8 +147,8 @@ Application::Application(int &argc, char **argv) :
slotAccountStateAdded(ai); slotAccountStateAdded(ai);
} }
connect(FolderMan::instance()->socketApi(), SIGNAL(shareCommandReceived(QString)), connect(FolderMan::instance()->socketApi(), SIGNAL(shareCommandReceived(QString, bool)),
_gui, SLOT(slotShowShareDialog(QString))); _gui, SLOT(slotShowShareDialog(QString, bool)));
// startup procedure. // startup procedure.
connect(&_checkConnectionTimer, SIGNAL(timeout()), this, SLOT(slotCheckConnection())); connect(&_checkConnectionTimer, SIGNAL(timeout()), this, SLOT(slotCheckConnection()));

6
src/gui/owncloudgui.cpp
View file

@ -636,12 +636,12 @@ void ownCloudGui::raiseDialog( QWidget *raiseWidget )
} }
void ownCloudGui::slotShowShareDialog(const QString &path) void ownCloudGui::slotShowShareDialog(const QString &path, const bool &isDir)
{ {
qDebug() << Q_FUNC_INFO << "Opening share dialog"; qDebug() << Q_FUNC_INFO << "Opening share dialog";
ShareDialog *w = new ShareDialog; ShareDialog *w = new ShareDialog(path, isDir);
w->getShares();
w->setAttribute( Qt::WA_DeleteOnClose, true ); w->setAttribute( Qt::WA_DeleteOnClose, true );
w->setPath(path);
w->show(); w->show();
} }

2
src/gui/owncloudgui.h
View file

@ -70,7 +70,7 @@ public slots:
void slotHelp(); void slotHelp();
void slotOpenPath(const QString& path); void slotOpenPath(const QString& path);
void slotAccountStateChanged(); void slotAccountStateChanged();
void slotShowShareDialog(const QString &path); void slotShowShareDialog(const QString &path, const bool &isDir);
private slots: private slots:
void slotDisplayIdle(); void slotDisplayIdle();