# HG changeset patch
# User Chris Cannam
# Date 1341317460 -3600
# Node ID c1451b35609752eb79395ddfbdd9dc879e7fb6f0
# Parent 6f90bb52eee6bd02a89a250895b21d8e556050cc
Wording and menu grouping adjustments to try to make the default push/pull location function look less like it will open a new remote for you (mitigates #461)
diff -r 6f90bb52eee6 -r c1451b356097 src/mainwindow.cpp
--- a/src/mainwindow.cpp Tue Jul 03 12:12:42 2012 +0100
+++ b/src/mainwindow.cpp Tue Jul 03 13:11:00 2012 +0100
@@ -1496,9 +1496,9 @@
QString explanation;
if (initial) {
- explanation = tr("Provide a URL to use for push and pull actions from the current local repository.
This will be the default for subsequent pushes and pulls.
You can change it using “Set Remote Location” on the File menu.");
+ explanation = tr("Provide a remote URL to use when pushing from, or pulling to, the local
repository %1
.
This will be the default for subsequent pushes and pulls.
You can change it using “Set Remote Location” on the File menu.").arg(m_workFolderPath);
} else {
- explanation = tr("Provide a new URL to use for push and pull actions from the current local repository.");
+ explanation = tr("Provide a new remote URL to use when pushing from, or pulling to, the local
repository %1
.").arg(m_workFolderPath);
}
d->addChoice("remote",
@@ -2902,11 +2902,11 @@
{
//File actions
m_openAct = new QAction(QIcon(":/images/fileopen.png"), tr("&Open..."), this);
- m_openAct->setStatusTip(tr("Open an existing repository or working folder"));
+ m_openAct->setStatusTip(tr("Open a remote repository or an existing local folder"));
m_openAct->setShortcut(tr("Ctrl+O"));
- m_changeRemoteRepoAct = new QAction(tr("Set Remote &Location..."), this);
- m_changeRemoteRepoAct->setStatusTip(tr("Set or change the default remote repository for pull and push actions"));
+ m_changeRemoteRepoAct = new QAction(tr("Set Push and Pull &Location..."), this);
+ m_changeRemoteRepoAct->setStatusTip(tr("Set or change the default URL for pull and push actions from this repository"));
m_settingsAct = new QAction(QIcon(":/images/settings.png"), tr("&Settings..."), this);
m_settingsAct->setStatusTip(tr("View and change application settings"));
@@ -3026,10 +3026,9 @@
QMenu *remoteMenu;
remoteMenu = menuBar()->addMenu(tr("&Remote"));
- remoteMenu->addAction(m_changeRemoteRepoAct);
- remoteMenu->addSeparator();
remoteMenu->addAction(m_hgIncomingAct);
remoteMenu->addSeparator();
+ remoteMenu->addAction(m_changeRemoteRepoAct);
remoteMenu->addAction(m_hgPullAct);
remoteMenu->addAction(m_hgPushAct);