Mercurial > hg > easyhg
changeset 211:290a95b5ceae
* Report error if hg incoming does authentically fail (e.g. because remote repo is unavailable or unrelated)
* Change target executable name from easyhg to EasyMercurial
* Some (probably invisible) layout tweaks
author | Chris Cannam |
---|---|
date | Wed, 05 Jan 2011 15:05:45 +0000 (2011-01-05) |
parents | c5fceb3fe5b4 |
children | 4c5993d860f3 43ecb0dcc44e |
files | easyhg.pro filestatuswidget.cpp mainwindow.cpp |
diffstat | 3 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/easyhg.pro Wed Jan 05 14:31:07 2011 +0000 +++ b/easyhg.pro Wed Jan 05 15:05:45 2011 +0000 @@ -2,7 +2,8 @@ CONFIG += debug TEMPLATE = app -TARGET = easyhg +TARGET = EasyMercurial + unix { DESTDIR = . }
--- a/filestatuswidget.cpp Wed Jan 05 14:31:07 2011 +0000 +++ b/filestatuswidget.cpp Wed Jan 05 15:05:45 2011 +0000 @@ -40,10 +40,12 @@ setLayout(layout); int row = 0; - + +#ifndef Q_OS_MAC layout->addItem(new QSpacerItem(1, 1), row, 0); + ++row; +#endif - ++row; layout->addWidget(new QLabel(tr("Local:")), row, 0); m_openButton = new ClickableLabel; @@ -120,7 +122,7 @@ boxlayout->setMargin(0); box->setLayout(boxlayout); - boxlayout->addItem(new QSpacerItem(5, 5), 0, 0); + boxlayout->addItem(new QSpacerItem(3, 3), 0, 0); boxlayout->addWidget(new QLabel(labelFor(s)), 1, 0); @@ -132,13 +134,15 @@ connect(w, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged())); + boxlayout->addItem(new QSpacerItem(2, 2), 3, 0); + layout->addWidget(box, ++row, 0, 1, 3); box->hide(); } layout->setRowStretch(++row, 20); - layout->addItem(new QSpacerItem(1, 1), ++row, 0); + layout->addItem(new QSpacerItem(8, 8), ++row, 0); m_showAllFiles = new QCheckBox(tr("Show all files"), this); layout->addWidget(m_showAllFiles, ++row, 0, 1, 3, Qt::AlignLeft);
--- a/mainwindow.cpp Wed Jan 05 14:31:07 2011 +0000 +++ b/mainwindow.cpp Wed Jan 05 15:05:45 2011 +0000 @@ -1549,10 +1549,13 @@ settings(); return; case ACT_INCOMING: - // returns non-zero code if the check was successful but there - // are no changes pending - if (output.trimmed() == "") showIncoming(""); - return; + // returns non-zero code and no output if the check was + // successful but there are no changes pending + if (output.trimmed() == "") { + showIncoming(""); + return; + } + break; case ACT_QUERY_HEADS: // fails if repo is empty; we don't care (if there's a genuine // problem, something else will fail too). Pretend it