AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bridge no longer needs depends on the UI. All interaction occurs via the callback

Browse Source 
More cleanups

FossilOrigin-Name: 3d1e269fee5acd4b65025024f701319c3e993e97
This commit is contained in:
kostas
2015-04-27 19:54:01 +00:00
parent 46c5fba9d2
commit 2eb430b6e1
6 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/MainWindow.cpp
View File

@@ -190,7 +190,7 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
uiCallback.init(this);
// Need to be before applySettings which sets the last workspace
bridge.Init(this, &uiCallback, "", "");
bridge.Init(&uiCallback, "", "");
applySettings();
@@ -577,8 +577,8 @@ bool MainWindow::refresh()
setStatus("");
enableActions(true);
if(!getProjectName().isEmpty())
title += " - " + getProjectName();
if(!bridge.getProjectName().isEmpty())
title += " - " + bridge.getProjectName();
setWindowTitle(title);
return true;
@@ -635,7 +635,7 @@ void MainWindow::scanWorkspace()
QString fullpath = it->absoluteFilePath();
// Skip fossil files
if(filename == FOSSIL_CHECKOUT1 || filename == FOSSIL_CHECKOUT2 || (!getRepositoryFile().isEmpty() && QFileInfo(fullpath) == QFileInfo(getRepositoryFile())))
if(filename == FOSSIL_CHECKOUT1 || filename == FOSSIL_CHECKOUT2 || (!bridge.getRepositoryFile().isEmpty() && QFileInfo(fullpath) == QFileInfo(bridge.getRepositoryFile())))
continue;
RepoFile *rf = new RepoFile(*it, RepoFile::TYPE_UNKNOWN, wkdir);
@@ -777,7 +777,7 @@ void MainWindow::updateDirView()
header << tr("Folders");
repoDirModel.setHorizontalHeaderLabels(header);
QStandardItem *root = new QStandardItem(QIcon(":icons/icons/My Documents-01.png"), getProjectName());
QStandardItem *root = new QStandardItem(QIcon(":icons/icons/My Documents-01.png"), bridge.getProjectName());
root->setData(""); // Empty Path
root->setEditable(false);
@@ -2189,3 +2189,9 @@ void MainWindow::MainWinUICallback::endProcess()
mainWindow->ui->statusBar->clearMessage();
mainWindow->progressBar->setHidden(true);
}
//------------------------------------------------------------------------------
QMessageBox::StandardButton MainWindow::MainWinUICallback::Query(const QString &title, const QString &query, QMessageBox::StandardButtons buttons)
{
return DialogQuery(mainWindow, title, query, buttons);
}