From 6ef01600f33a1c728bd8254f6ee65e0015936b66 Mon Sep 17 00:00:00 2001
From: Leandro Melo <leandro.melo@nokia.com>
Date: Mon, 19 Sep 2011 14:39:30 +0200
Subject: [PATCH] Find: Change a few accelerators

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>
---
 src/plugins/find/finddialog.ui         | 12 ++++++------
 src/plugins/texteditor/findinfiles.cpp |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/find/finddialog.ui b/src/plugins/find/finddialog.ui
index d52c99439d5..4a57a70787f 100644
--- a/src/plugins/find/finddialog.ui
+++ b/src/plugins/find/finddialog.ui
@@ -32,7 +32,7 @@
       </size>
      </property>
      <property name="text">
-      <string>Sc&amp;ope:</string>
+      <string>Sco&amp;pe:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -80,7 +80,7 @@
    <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Search &amp;for:</string>
+      <string>Sear&amp;ch for:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -102,21 +102,21 @@
       <item>
        <widget class="QCheckBox" name="matchCase">
         <property name="text">
-         <string>&amp;Case sensitive</string>
+         <string>Case sensiti&amp;ve</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="wholeWords">
         <property name="text">
-         <string>&amp;Whole words only</string>
+         <string>Whole words o&amp;nly</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="regExp">
         <property name="text">
-         <string>Use regular e&amp;xpressions</string>
+         <string>Use re&amp;gular expressions</string>
         </property>
        </widget>
       </item>
@@ -174,7 +174,7 @@
      <item>
       <widget class="QPushButton" name="replaceButton">
        <property name="text">
-        <string>Search &amp;&amp; Replace</string>
+        <string>Search &amp;&amp; &amp;Replace</string>
        </property>
       </widget>
      </item>
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index ff1f9c980cb..baf0e6ca8df 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -94,7 +94,7 @@ QWidget *FindInFiles::createConfigWidget()
         gridLayout->setMargin(0);
         m_configWidget->setLayout(gridLayout);
 
-        QLabel *dirLabel = new QLabel(tr("&Directory:"));
+        QLabel *dirLabel = new QLabel(tr("Director&y:"));
         gridLayout->addWidget(dirLabel, 0, 0, Qt::AlignRight);
         m_directory = new QComboBox;
         m_directory->setEditable(true);
@@ -111,7 +111,7 @@ QWidget *FindInFiles::createConfigWidget()
         gridLayout->addWidget(browseButton, 0, 2);
         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->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
         filePatternLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);