comparison filestatuswidget.cpp @ 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
parents c5fceb3fe5b4
children 43ecb0dcc44e
comparison
equal deleted inserted replaced
210:c5fceb3fe5b4 211:290a95b5ceae
38 { 38 {
39 QGridLayout *layout = new QGridLayout; 39 QGridLayout *layout = new QGridLayout;
40 setLayout(layout); 40 setLayout(layout);
41 41
42 int row = 0; 42 int row = 0;
43 43
44 #ifndef Q_OS_MAC
44 layout->addItem(new QSpacerItem(1, 1), row, 0); 45 layout->addItem(new QSpacerItem(1, 1), row, 0);
45
46 ++row; 46 ++row;
47 #endif
48
47 layout->addWidget(new QLabel(tr("Local:")), row, 0); 49 layout->addWidget(new QLabel(tr("Local:")), row, 0);
48 50
49 m_openButton = new ClickableLabel; 51 m_openButton = new ClickableLabel;
50 QFont f(m_openButton->font()); 52 QFont f(m_openButton->font());
51 f.setBold(true); 53 f.setBold(true);
118 QWidget *box = new QWidget; 120 QWidget *box = new QWidget;
119 QGridLayout *boxlayout = new QGridLayout; 121 QGridLayout *boxlayout = new QGridLayout;
120 boxlayout->setMargin(0); 122 boxlayout->setMargin(0);
121 box->setLayout(boxlayout); 123 box->setLayout(boxlayout);
122 124
123 boxlayout->addItem(new QSpacerItem(5, 5), 0, 0); 125 boxlayout->addItem(new QSpacerItem(3, 3), 0, 0);
124 126
125 boxlayout->addWidget(new QLabel(labelFor(s)), 1, 0); 127 boxlayout->addWidget(new QLabel(labelFor(s)), 1, 0);
126 128
127 QListWidget *w = new QListWidget; 129 QListWidget *w = new QListWidget;
128 m_stateListMap[s] = w; 130 m_stateListMap[s] = w;
130 boxlayout->addWidget(w, 2, 0); 132 boxlayout->addWidget(w, 2, 0);
131 133
132 connect(w, SIGNAL(itemSelectionChanged()), 134 connect(w, SIGNAL(itemSelectionChanged()),
133 this, SLOT(itemSelectionChanged())); 135 this, SLOT(itemSelectionChanged()));
134 136
137 boxlayout->addItem(new QSpacerItem(2, 2), 3, 0);
138
135 layout->addWidget(box, ++row, 0, 1, 3); 139 layout->addWidget(box, ++row, 0, 1, 3);
136 box->hide(); 140 box->hide();
137 } 141 }
138 142
139 layout->setRowStretch(++row, 20); 143 layout->setRowStretch(++row, 20);
140 144
141 layout->addItem(new QSpacerItem(1, 1), ++row, 0); 145 layout->addItem(new QSpacerItem(8, 8), ++row, 0);
142 146
143 m_showAllFiles = new QCheckBox(tr("Show all files"), this); 147 m_showAllFiles = new QCheckBox(tr("Show all files"), this);
144 layout->addWidget(m_showAllFiles, ++row, 0, 1, 3, Qt::AlignLeft); 148 layout->addWidget(m_showAllFiles, ++row, 0, 1, 3, Qt::AlignLeft);
145 connect(m_showAllFiles, SIGNAL(toggled(bool)), 149 connect(m_showAllFiles, SIGNAL(toggled(bool)),
146 this, SIGNAL(showAllChanged(bool))); 150 this, SIGNAL(showAllChanged(bool)));