Commit ad570848 authored by Christoph Cullmann's avatar Christoph Cullmann

move settings icon to the right

parent 322fdaa9
......@@ -59,7 +59,7 @@ static QUrl localFileDirUp (const QUrl &url)
{
if (!url.isLocalFile())
return url;
// else go up
return QUrl::fromLocalFile (QFileInfo (url.toLocalFile()).dir().absolutePath());
}
......@@ -227,7 +227,7 @@ m_mainWindow (mainWin)
{
KXMLGUIClient::setComponentName (QStringLiteral("katesearch"), i18n ("Kate Search & Replace"));
setXMLFile( QStringLiteral("ui.rc") );
m_toolView = mainWin->createToolView (plugin, QStringLiteral("kate_plugin_katesearch"),
KTextEditor::MainWindow::Bottom,
QIcon::fromTheme(QStringLiteral("edit-find")),
......@@ -259,7 +259,7 @@ m_mainWindow (mainWin)
m_ui.resultTabWidget->tabBar()->setSelectionBehaviorOnRemove(QTabBar::SelectLeftTab);
KAcceleratorManager::setNoAccel(m_ui.resultTabWidget);
m_ui.displayOptions->setIcon(QIcon::fromTheme(QStringLiteral("arrow-down-double")));
m_ui.displayOptions->setIcon(QIcon::fromTheme(QStringLiteral("games-config-options")));
m_ui.searchButton->setIcon(QIcon::fromTheme(QStringLiteral("edit-find")));
m_ui.stopButton->setIcon(QIcon::fromTheme(QStringLiteral("process-stop")));
m_ui.searchPlaceCombo->setItemIcon(CurrentFile, QIcon::fromTheme(QStringLiteral("text-plain")));
......@@ -1855,19 +1855,19 @@ bool KateSearchCommand::exec (KTextEditor::View* /*view*/, const QString& cmd, Q
if (command == QStringLiteral("newGrep"))
emit newTab();
}
else if (command == QStringLiteral("search") || command == QStringLiteral("newSearch")) {
emit setSearchPlace(KatePluginSearchView::OpenFiles);
if (command == QStringLiteral("newSearch"))
emit newTab();
}
else if (command == QStringLiteral("pgrep") || command == QStringLiteral("newPGrep")) {
emit setSearchPlace(KatePluginSearchView::Project);
if (command == QStringLiteral("newPGrep"))
emit newTab();
}
emit setSearchString(searchText);
emit startSearch();
......@@ -1889,14 +1889,14 @@ bool KateSearchCommand::help (KTextEditor::View */*view*/, const QString &cmd, Q
else if (cmd.startsWith(QStringLiteral("newSearch"))) {
msg = i18n("Usage: search [pattern to search for in open files]");
}
else if (cmd.startsWith(QStringLiteral("pgrep"))) {
msg = i18n("Usage: pgrep [pattern to search for in current project]");
}
else if (cmd.startsWith(QStringLiteral("newPGrep"))) {
msg = i18n("Usage: newPGrep [pattern to search for in current project]");
}
return true;
}
......
......@@ -6,11 +6,11 @@
<rect>
<x>0</x>
<y>0</y>
<width>557</width>
<height>222</height>
<width>570</width>
<height>224</height>
</rect>
</property>
<layout class="QGridLayout" name="topLayout" rowstretch="0,0,0,1" columnstretch="0,0,1,0,0,0">
<layout class="QGridLayout" name="topLayout" rowstretch="0,0,0,1" columnstretch="0,0,1,0,0,0,0">
<property name="leftMargin">
<number>0</number>
</property>
......@@ -23,64 +23,7 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item row="1" column="0">
<widget class="QToolButton" name="displayOptions">
<property name="text">
<string>...</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QPushButton" name="replaceButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Replace</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QPushButton" name="searchButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Search</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QToolButton" name="newTabButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="1" alignment="Qt::AlignRight">
<widget class="QLabel" name="findLabel">
<property name="text">
<string>Fi&amp;nd:</string>
</property>
<property name="buddy">
<cstring>searchCombo</cstring>
</property>
</widget>
</item>
<item row="1" column="1" alignment="Qt::AlignRight">
<widget class="QLabel" name="replaceLabel">
<property name="text">
<string>Re&amp;place:</string>
</property>
<property name="buddy">
<cstring>replaceCombo</cstring>
</property>
</widget>
</item>
<item row="3" column="0" colspan="6">
<item row="3" column="0" colspan="7">
<widget class="QStackedWidget" name="stackedWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
......@@ -375,6 +318,53 @@
</widget>
</widget>
</item>
<item row="1" column="4">
<widget class="QPushButton" name="replaceButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Replace</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QPushButton" name="searchButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Search</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QToolButton" name="newTabButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="1" alignment="Qt::AlignRight">
<widget class="QLabel" name="findLabel">
<property name="text">
<string>Fi&amp;nd:</string>
</property>
<property name="buddy">
<cstring>searchCombo</cstring>
</property>
</widget>
</item>
<item row="1" column="1" alignment="Qt::AlignRight">
<widget class="QLabel" name="replaceLabel">
<property name="text">
<string>Re&amp;place:</string>
</property>
<property name="buddy">
<cstring>replaceCombo</cstring>
</property>
</widget>
</item>
<item row="0" column="5">
<widget class="QStackedWidget" name="nextAndStop">
<property name="sizePolicy">
......@@ -479,6 +469,16 @@
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QToolButton" name="displayOptions">
<property name="text">
<string>...</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
......@@ -510,7 +510,6 @@
<tabstop>folderRequester</tabstop>
<tabstop>folderUpButton</tabstop>
<tabstop>currentFolderButton</tabstop>
<tabstop>displayOptions</tabstop>
<tabstop>resultTabWidget</tabstop>
</tabstops>
<resources/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment