Merge remote branch 'origin/2.1'

[qt-creator-jp/qt-creator-jp.git] / src / plugins / find / findwidget.ui

diff --git a/src/plugins/find/findwidget.ui b/src/plugins/find/findwidget.ui
index 08abeb8..2457dbc 100644 (file)
--- a/src/plugins/find/findwidget.ui
+++ b/src/plugins/find/findwidget.ui
@@ -40,7 +40,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="Core::Utils::FancyLineEdit" name="findEdit"/>
+    <widget class="Utils::FilterLineEdit" name="findEdit"/>
    </item>
    <item row="0" column="2">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -100,7 +100,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="QLineEdit" name="replaceEdit"/>
+    <widget class="Utils::FilterLineEdit" name="replaceEdit"/>
    </item>
    <item row="1" column="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -108,10 +108,16 @@
       <number>3</number>
      </property>
      <item>
-      <widget class="QToolButton" name="replacePreviousButton">
+      <widget class="QToolButton" name="replaceButton">
        <property name="focusPolicy">
         <enum>Qt::NoFocus</enum>
        </property>
+       <property name="text">
+        <string>Replace</string>
+       </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextOnly</enum>
+       </property>
        <property name="arrowType">
         <enum>Qt::LeftArrow</enum>
        </property>
@@ -125,6 +131,12 @@
        <property name="focusPolicy">
         <enum>Qt::NoFocus</enum>
        </property>
+       <property name="text">
+        <string>Replace &amp;&amp; Find</string>
+       </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextOnly</enum>
+       </property>
        <property name="arrowType">
         <enum>Qt::RightArrow</enum>
        </property>
@@ -136,7 +148,7 @@
         <font/>
        </property>
        <property name="text">
-        <string>All</string>
+        <string>Replace All</string>
        </property>
        <property name="toolButtonStyle">
         <enum>Qt::ToolButtonTextOnly</enum>
@@ -156,15 +168,25 @@
        </property>
       </spacer>
      </item>
+     <item>
+      <widget class="QToolButton" name="advancedButton">
+       <property name="text">
+        <string>Advanced...</string>
+       </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextOnly</enum>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Core::Utils::FancyLineEdit</class>
+   <class>Utils::FilterLineEdit</class>
    <extends>QLineEdit</extends>
-   <header location="global">utils/fancylineedit.h</header>
+   <header location="global">utils/filterlineedit.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>