# HG changeset patch # User Chris Cannam # Date 1290619771 0 # Node ID a5a2d74a83a75ddbb5790d76239e43961ab83d5c # Parent 3e6c3281fb97ae8ea2061d7c1b1ad3070373314d * Minor text and layout changes; ensure path widgets are updated when repo changes diff -r 3e6c3281fb97 -r a5a2d74a83a7 filestatuswidget.cpp --- a/filestatuswidget.cpp Wed Nov 24 17:11:44 2010 +0000 +++ b/filestatuswidget.cpp Wed Nov 24 17:29:31 2010 +0000 @@ -49,6 +49,8 @@ layout->setColumnStretch(1, 20); + layout->addItem(new QSpacerItem(5, 8), ++row, 0); + QMap labels; labels[FileStates::Clean] = tr("Unmodified files:"); labels[FileStates::Modified] = tr("Modified files:"); @@ -64,6 +66,7 @@ QWidget *box = new QWidget; QGridLayout *boxlayout = new QGridLayout; + boxlayout->setMargin(0); box->setLayout(boxlayout); boxlayout->addWidget(new QLabel(labels[s]), 0, 0); diff -r 3e6c3281fb97 -r a5a2d74a83a7 mainwindow.cpp --- a/mainwindow.cpp Wed Nov 24 17:11:44 2010 +0000 +++ b/mainwindow.cpp Wed Nov 24 17:29:31 2010 +0000 @@ -1116,6 +1116,7 @@ } MultiChoiceDialog::addRecentArgument("local", workFolderPath); MultiChoiceDialog::addRecentArgument("remote", remoteRepoPath); + hgTabs->setWorkFolderAndRepoNames(workFolderPath, remoteRepoPath); enableDisableActions(); break; } @@ -1525,7 +1526,7 @@ hgFileDiffAct = new QAction(QIcon(":/images/diff.png"), tr("Diff"), this); hgFileDiffAct->setStatusTip(tr("Filediff: View differences between selected working folder file and local repository file")); - hgFolderDiffAct = new QAction(QIcon(":/images/folderdiff.png"), tr("View folderdiff"), this); + hgFolderDiffAct = new QAction(QIcon(":/images/folderdiff.png"), tr("Diff"), this); hgFolderDiffAct->setStatusTip(tr("Folderdiff: View all differences between working folder files and local repository files")); hgChgSetDiffAct = new QAction(QIcon(":/images/chgsetdiff.png"), tr("View changesetdiff"), this);