Mercurial > hg > easyhg

changeset 58:8af90d057609

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Simplify tabs
author Chris Cannam
date Tue, 16 Nov 2010 14:32:51 +0000
parents f583e44d9d31
children 4557da8bdee6
files common.h hgexpwidget.cpp hgrunner.cpp
diffstat 3 files changed, 13 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/common.h	Tue Nov 16 13:57:30 2010 +0000
+++ b/common.h	Tue Nov 16 14:32:51 2010 +0000
@@ -30,8 +30,8 @@
 #define REQUIRED_CHGSET_DIFF_COUNT      2
 
 #define WORKTAB                         0
-#define HISTORYTAB                      1
-#define HEADSTAB                        2
+#define HISTORYTAB                      2
+#define HEADSTAB                        3
 
 #define HGSTAT_M_BIT    1U
 #define HGSTAT_A_BIT    2U
--- a/hgexpwidget.cpp	Tue Nov 16 13:57:30 2010 +0000
+++ b/hgexpwidget.cpp	Tue Nov 16 14:32:51 2010 +0000
@@ -103,7 +103,7 @@
     mainLayout -> addWidget(grpRemoteRepo, 1);
     mainLayout -> addWidget(grpLocalRepo, 8);
     mainLayout -> addWidget(grpWorkFolder, 12);
-    addTab(workPageWidget, tr("Work"));
+    addTab(workPageWidget, tr("My work"));
 
     // History graph page
     historyGraphPageWidget = new QWidget;
@@ -117,7 +117,7 @@
     panner->setMaximumWidth(80);
     panner->connectToPanned(panned);
     historyGraphPageWidget->setLayout(layout);
-    addTab(historyGraphPageWidget, tr("History (graph)"));
+    addTab(historyGraphPageWidget, tr("History"));
 
 
     //History page
@@ -130,7 +130,7 @@
 
     historyLayout = new QVBoxLayout(historyPageWidget);
     historyLayout->addWidget(localRepoHgLogList);
-    addTab(historyPageWidget, tr("History (log)"));
+//!!!    addTab(historyPageWidget, tr("History (log)"));
 
     //Heads page
     //Heads page
@@ -141,11 +141,11 @@
 
     headsLayout = new QVBoxLayout(headsPageWidget);
     headsLayout->addWidget(localRepoHeadsList);
-    addTab(headsPageWidget, tr("Heads"));
+//!!!    addTab(headsPageWidget, tr("Heads"));
 
     //Initially, only work page is active
-    setTabEnabled(HEADSTAB, false);
-    setTabEnabled(HISTORYTAB, false);
+//!!!    setTabEnabled(HEADSTAB, false);
+//!!!    setTabEnabled(HISTORYTAB, false);
 }
 
 void HgExpWidget::contextMenuEvent(QContextMenuEvent * event)
--- a/hgrunner.cpp	Tue Nov 16 13:57:30 2010 +0000
+++ b/hgrunner.cpp	Tue Nov 16 14:32:51 2010 +0000
@@ -64,7 +64,11 @@
     exitStatus = procExitStatus;
     stdOut = QString::fromUtf8(proc -> readAllStandardOutput());
     stdErr = QString::fromUtf8(proc -> readAllStandardError());
-    std::cerr << "stdout was " << stdOut.toStdString() << std::endl;
+
+    DEBUG << "setProcExitInfo: received " << stdOut.split("\n").size() << " lines of stdout";
+    DEBUG << "setProcExitInfo: received " << stdErr.split("\n").size() << " lines of stderr";
+
+//    std::cerr << "stdout was " << stdOut.toStdString() << std::endl;
 }
 
 void HgRunner::presentErrorToUser()