Mercurial > hg > easyhg

changeset 297:e4284fab6962 status_outside_tabs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor layout updates
author Chris Cannam
date Tue, 22 Feb 2011 13:12:16 +0000
parents d40294e164da
children 3bb6b63420ad
files filestatuswidget.cpp workstatuswidget.cpp
diffstat 2 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/filestatuswidget.cpp	Tue Feb 22 13:03:03 2011 +0000
+++ b/filestatuswidget.cpp	Tue Feb 22 13:12:16 2011 +0000
@@ -44,7 +44,7 @@
 
     m_noModificationsLabel = new QLabel;
     setNoModificationsLabelText();
-    layout->addWidget(m_noModificationsLabel, row, 1, 1, 2);
+    layout->addWidget(m_noModificationsLabel, row, 0);
     m_noModificationsLabel->hide();
 
     m_simpleLabels[FileStates::Clean] = tr("Unmodified:");
@@ -75,7 +75,7 @@
                                 "have appeared since your most recent commit or update.");
 
     m_boxesParent = new QWidget(this);
-    layout->addWidget(m_boxesParent, ++row, 0, 1, 3);
+    layout->addWidget(m_boxesParent, ++row, 0);
 
     QGridLayout *boxesLayout = new QGridLayout;
     boxesLayout->setMargin(0);
@@ -120,7 +120,7 @@
     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);
+    layout->addWidget(m_showAllFiles, ++row, 0, Qt::AlignLeft);
     connect(m_showAllFiles, SIGNAL(toggled(bool)),
             this, SIGNAL(showAllChanged(bool)));
 }
--- a/workstatuswidget.cpp	Tue Feb 22 13:03:03 2011 +0000
+++ b/workstatuswidget.cpp	Tue Feb 22 13:12:16 2011 +0000
@@ -29,7 +29,8 @@
     QWidget(parent)
 {
     QGridLayout *layout = new QGridLayout;
-    layout->setMargin(10);
+    layout->setMargin(6);
+    layout->setSpacing(6);
     setLayout(layout);
 
     int row = 0;
@@ -39,7 +40,7 @@
     ++row;
 #endif
 
-    layout->addWidget(new QLabel(tr("Local:")), row, 0);
+    layout->addWidget(new QLabel(tr("Local:")), row, 1);
 
     m_openButton = new ClickableLabel;
     QFont f(m_openButton->font());
@@ -47,19 +48,19 @@
     m_openButton->setFont(f);
     m_openButton->setMouseUnderline(true);
     connect(m_openButton, SIGNAL(clicked()), this, SLOT(openButtonClicked()));
-    layout->addWidget(m_openButton, row, 1, 1, 2, Qt::AlignLeft);
+    layout->addWidget(m_openButton, row, 2, 1, 2, Qt::AlignLeft);
 
     ++row;
-    layout->addWidget(new QLabel(tr("Remote:")), row, 0);
+    layout->addWidget(new QLabel(tr("Remote:")), row, 1);
     m_remoteURLLabel = new QLabel;
-    layout->addWidget(m_remoteURLLabel, row, 1, 1, 2);
+    layout->addWidget(m_remoteURLLabel, row, 2, 1, 2);
 
     ++row;
-    layout->addWidget(new QLabel(tr("State:")), row, 0);
+    layout->addWidget(new QLabel(tr("State:")), row, 1);
     m_stateLabel = new QLabel;
-    layout->addWidget(m_stateLabel, row, 1, 1, 2);
+    layout->addWidget(m_stateLabel, row, 2, 1, 2);
 
-    layout->setColumnStretch(1, 20);
+    layout->setColumnStretch(2, 20);
 
 
 }