comparison src/mainwindow.cpp @ 572:88ec0ae91dcc

Update search in history only if there are search terms; don't use spacer in toolbar on Mac
author Chris Cannam
date Tue, 06 Mar 2012 14:24:48 +0000
parents c2e212ab0068
children fa242885a233
comparison
equal deleted inserted replaced
570:e0d734fad735 572:88ec0ae91dcc
3059 m_workFolderToolBar->addAction(m_hgRemoveAct); 3059 m_workFolderToolBar->addAction(m_hgRemoveAct);
3060 m_workFolderToolBar->setMovable(false); 3060 m_workFolderToolBar->setMovable(false);
3061 3061
3062 m_repoToolBar = addToolBar(tr("Remote")); 3062 m_repoToolBar = addToolBar(tr("Remote"));
3063 m_repoToolBar->setIconSize(QSize(sz, sz)); 3063 m_repoToolBar->setIconSize(QSize(sz, sz));
3064 m_repoToolBar->addWidget(new QLabel(spacer)); 3064 if (spacingReqd) {
3065 m_repoToolBar->addWidget(new QLabel(spacer));
3066 }
3065 m_repoToolBar->addAction(m_openAct); 3067 m_repoToolBar->addAction(m_openAct);
3066 m_repoToolBar->addWidget(new QLabel(spacer)); 3068 if (spacingReqd) {
3069 m_repoToolBar->addWidget(new QLabel(spacer));
3070 }
3067 m_repoToolBar->addSeparator(); 3071 m_repoToolBar->addSeparator();
3068 m_repoToolBar->addAction(m_hgIncomingAct); 3072 m_repoToolBar->addAction(m_hgIncomingAct);
3069 m_repoToolBar->addAction(m_hgPullAct); 3073 m_repoToolBar->addAction(m_hgPullAct);
3070 m_repoToolBar->addAction(m_hgPushAct); 3074 m_repoToolBar->addAction(m_hgPushAct);
3071 m_repoToolBar->setMovable(false); 3075 m_repoToolBar->setMovable(false);