Mercurial > hg > easyhg

changeset 99:a5a2d74a83a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Minor text and layout changes; ensure path widgets are updated when repo changes
author Chris Cannam
date Wed, 24 Nov 2010 17:29:31 +0000
parents 3e6c3281fb97
children 0dc7305acbc8
files filestatuswidget.cpp mainwindow.cpp
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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<FileStates::State, QString> 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);
--- 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);