forked from qt-creator/qt-creator
		
	Use "Browse..." label from PathChooser
Change-Id: Ie6f91ff1c9ad4cc5092763c2f2eba0da56ce41e6 Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
		@@ -1,6 +1,6 @@
 | 
			
		||||
/****************************************************************************
 | 
			
		||||
**
 | 
			
		||||
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 | 
			
		||||
** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
 | 
			
		||||
** Contact: http://www.qt-project.org/legal
 | 
			
		||||
**
 | 
			
		||||
** This file is part of Qt Creator.
 | 
			
		||||
@@ -271,7 +271,7 @@ AttachCoreDialog::AttachCoreDialog(QWidget *parent)
 | 
			
		||||
    d->forceLocalLabel->setBuddy(d->forceLocalCheckBox);
 | 
			
		||||
 | 
			
		||||
    d->remoteCoreFileName = new QLineEdit(this);
 | 
			
		||||
    d->selectRemoteCoreButton = new QPushButton(tr("Browse..."), this);
 | 
			
		||||
    d->selectRemoteCoreButton = new QPushButton(PathChooser::browseButtonLabel(), this);
 | 
			
		||||
 | 
			
		||||
    d->localCoreFileName = new PathChooser(this);
 | 
			
		||||
    d->localCoreFileName->setHistoryCompleter(QLatin1String("Debugger.CoreFile.History"));
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
/****************************************************************************
 | 
			
		||||
**
 | 
			
		||||
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 | 
			
		||||
** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
 | 
			
		||||
** Contact: http://www.qt-project.org/legal
 | 
			
		||||
**
 | 
			
		||||
** This file is part of Qt Creator.
 | 
			
		||||
@@ -34,6 +34,7 @@
 | 
			
		||||
#include <coreplugin/find/findplugin.h>
 | 
			
		||||
#include <utils/filesearch.h>
 | 
			
		||||
#include <utils/fileutils.h>
 | 
			
		||||
#include <utils/pathchooser.h>
 | 
			
		||||
#include <utils/qtcassert.h>
 | 
			
		||||
 | 
			
		||||
#include <QDebug>
 | 
			
		||||
@@ -129,7 +130,7 @@ QWidget *FindInFiles::createConfigWidget()
 | 
			
		||||
        syncComboWithSettings(m_directory, m_directorySetting.toUserOutput());
 | 
			
		||||
        dirLabel->setBuddy(m_directory);
 | 
			
		||||
        gridLayout->addWidget(m_directory, 0, 1);
 | 
			
		||||
        QPushButton *browseButton = new QPushButton(tr("&Browse..."));
 | 
			
		||||
        QPushButton *browseButton = new QPushButton(Utils::PathChooser::browseButtonLabel());
 | 
			
		||||
        gridLayout->addWidget(browseButton, 0, 2);
 | 
			
		||||
        connect(browseButton, SIGNAL(clicked()), this, SLOT(openFileBrowser()));
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user