Fixed currentWorkspace

Refactored  projectName

FossilOrigin-Name: 1d1ec089cdb02738d99efcc66c1b32bb0e3208e0
This commit is contained in:
kostas
2015-04-26 11:33:07 +00:00
parent 17736bd719
commit e8c8f9e506
5 changed files with 31 additions and 20 deletions

View File

@@ -232,12 +232,13 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
viewMode = VIEWMODE_TREE;
applySettings();
#ifdef BRIDGE_ENABLED
// Need to be before applySettings which sets the last workspace
bridge.Init(this, &log, ui->textBrowser, "", "");
#endif
applySettings();
// Apply any explicit workspace path if available
if(workspacePath && !workspacePath->isEmpty())
openWorkspace(*workspacePath);
@@ -673,8 +674,9 @@ bool MainWindow::refresh()
enableActions(true);
QString title = "Fuel";
if(!projectName.isEmpty())
title += " - "+projectName;
if(!getProjectName().isEmpty())
title += " - " + getProjectName();
setWindowTitle(title);
return true;
@@ -903,7 +905,7 @@ void MainWindow::updateDirView()
header << tr("Folders");
repoDirModel.setHorizontalHeaderLabels(header);
QStandardItem *root = new QStandardItem(QIcon(":icons/icons/My Documents-01.png"), projectName);
QStandardItem *root = new QStandardItem(QIcon(":icons/icons/My Documents-01.png"), getProjectName());
root->setData(""); // Empty Path
root->setEditable(false);