feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta

Browse Source
This commit is contained in:
hjk
2008-12-11 16:11:28 +01:00
parent 5ba9cbc565 c4b222695e
commit 0104dd4173
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/pathchooser.cpp
View File

@@ -46,11 +46,12 @@
#include <QtGui/QHBoxLayout> #include <QtGui/QHBoxLayout>
#include <QtGui/QLineEdit> #include <QtGui/QLineEdit>
#include <QtGui/QToolButton> #include <QtGui/QToolButton>
#include <QtGui/QPushButton>
namespace Core { namespace Core {
namespace Utils { namespace Utils {
#ifdef Q_OS_OSX #ifdef Q_OS_MAC
/*static*/ const char * const PathChooser::browseButtonLabel = "Choose..."; /*static*/ const char * const PathChooser::browseButtonLabel = "Choose...";
#else #else
/*static*/ const char * const PathChooser::browseButtonLabel = "Browse..."; /*static*/ const char * const PathChooser::browseButtonLabel = "Browse...";
@@ -112,7 +113,11 @@ PathChooser::PathChooser(QWidget *parent) :
hLayout->addWidget(m_d->m_lineEdit); hLayout->addWidget(m_d->m_lineEdit);
hLayout->setSizeConstraint(QLayout::SetMinimumSize); hLayout->setSizeConstraint(QLayout::SetMinimumSize);
#ifdef Q_OS_MAC
QPushButton *browseButton = new QPushButton;
#else
QToolButton *browseButton = new QToolButton; QToolButton *browseButton = new QToolButton;
#endif
browseButton->setText(tr(browseButtonLabel)); browseButton->setText(tr(browseButtonLabel));
connect(browseButton, SIGNAL(clicked()), this, SLOT(slotBrowse())); connect(browseButton, SIGNAL(clicked()), this, SLOT(slotBrowse()));

4
src/plugins/coreplugin/navigationwidget.cpp
View File

@@ -334,6 +334,10 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget)
m_navigationComboBox = new NavComboBox(this); m_navigationComboBox = new NavComboBox(this);
m_navigationWidget = 0; m_navigationWidget = 0;
#ifdef Q_OS_MAC
// this is to avoid ugly tool bar behavior
m_navigationComboBox->setMaximumWidth(130);
#endif
m_toolbar = new QToolBar(this); m_toolbar = new QToolBar(this);
m_toolbar->setContentsMargins(0, 0, 0, 0); m_toolbar->setContentsMargins(0, 0, 0, 0);