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

Find: Change a few accelerators

Browse Source 
Since the find widget is no longer a dialog, a few accelerators
"conflict" with others from the main menu and global Creator's.
This doesn't really stop them from working, but it would be better
to have different ones. The new values are not the most obvious
ones, but there's not too many options.

Task-number: QTCREATORBUG-6114
Change-Id: Idbc885abad9b78dad7685568a9524066dc075694
Reviewed-on: http://codereview.qt-project.org/5147
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Leandro Melo
2011-09-19 14:39:30 +02:00
committed by Eike Ziller
parent 71512addb7
commit 6ef01600f3
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/find/finddialog.ui
View File

@@ -32,7 +32,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Sc&amp;ope:</string> <string>Sco&amp;pe:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -80,7 +80,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Search &amp;for:</string> <string>Sear&amp;ch for:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -102,21 +102,21 @@
<item> <item>
<widget class="QCheckBox" name="matchCase"> <widget class="QCheckBox" name="matchCase">
<property name="text"> <property name="text">
<string>&amp;Case sensitive</string> <string>Case sensiti&amp;ve</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="wholeWords"> <widget class="QCheckBox" name="wholeWords">
<property name="text"> <property name="text">
<string>&amp;Whole words only</string> <string>Whole words o&amp;nly</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="regExp"> <widget class="QCheckBox" name="regExp">
<property name="text"> <property name="text">
<string>Use regular e&amp;xpressions</string> <string>Use re&amp;gular expressions</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -174,7 +174,7 @@
<item> <item>
<widget class="QPushButton" name="replaceButton"> <widget class="QPushButton" name="replaceButton">
<property name="text"> <property name="text">
<string>Search &amp;&amp; Replace</string> <string>Search &amp;&amp; &amp;Replace</string>
</property> </property>
</widget> </widget>
</item> </item>

4
src/plugins/texteditor/findinfiles.cpp
View File

@@ -94,7 +94,7 @@ QWidget *FindInFiles::createConfigWidget()
gridLayout->setMargin(0); gridLayout->setMargin(0);
m_configWidget->setLayout(gridLayout); m_configWidget->setLayout(gridLayout);
QLabel *dirLabel = new QLabel(tr("&Directory:")); QLabel *dirLabel = new QLabel(tr("Director&y:"));
gridLayout->addWidget(dirLabel, 0, 0, Qt::AlignRight); gridLayout->addWidget(dirLabel, 0, 0, Qt::AlignRight);
m_directory = new QComboBox; m_directory = new QComboBox;
m_directory->setEditable(true); m_directory->setEditable(true);
@@ -111,7 +111,7 @@ QWidget *FindInFiles::createConfigWidget()
gridLayout->addWidget(browseButton, 0, 2); gridLayout->addWidget(browseButton, 0, 2);
connect(browseButton, SIGNAL(clicked()), this, SLOT(openFileBrowser())); connect(browseButton, SIGNAL(clicked()), this, SLOT(openFileBrowser()));
QLabel * const filePatternLabel = new QLabel(tr("File &pattern:")); QLabel * const filePatternLabel = new QLabel(tr("Fi&le pattern:"));
filePatternLabel->setMinimumWidth(80); filePatternLabel->setMinimumWidth(80);
filePatternLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); filePatternLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
filePatternLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); filePatternLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);