Commit 82f95e6b authored by Christoph Cullmann's avatar Christoph Cullmann

less SmallIcon, less HighDPI problems

parent 200495e1
......@@ -33,7 +33,6 @@
#include <KActionCollection>
#include <KLocalizedString>
#include <KConfigGroup>
#include <KIconLoader>
#include <KXMLGUIFactory>
#include <KXmlGuiWindow>
#include <KToolBar>
......@@ -132,7 +131,7 @@ KateFileTreePluginView::KateFileTreePluginView(KTextEditor::MainWindow *mainWind
KXMLGUIClient::setComponentName(QLatin1String("katefiletree"), i18n("Kate File Tree"));
setXMLFile(QLatin1String("ui.rc"));
m_toolView = mainWindow->createToolView(plug, QLatin1String("kate_private_plugin_katefiletreeplugin"), KTextEditor::MainWindow::Left, SmallIcon(QLatin1String("document-open")), i18n("Documents"));
m_toolView = mainWindow->createToolView(plug, QLatin1String("kate_private_plugin_katefiletreeplugin"), KTextEditor::MainWindow::Left, QIcon::fromTheme(QLatin1String("document-open")), i18n("Documents"));
Q_ASSERT(m_toolView->layout());
m_toolView->layout()->setMargin(0);
......
......@@ -92,7 +92,7 @@ KateKonsolePluginView::KateKonsolePluginView (KateKonsolePlugin* plugin, KTextEd
: QObject(mainWindow),m_plugin(plugin)
{
// init console
QWidget *toolview = mainWindow->createToolView (plugin, QStringLiteral("kate_private_plugin_katekonsoleplugin"), KTextEditor::MainWindow::Bottom, SmallIcon(QStringLiteral("utilities-terminal")), i18n("Terminal"));
QWidget *toolview = mainWindow->createToolView (plugin, QStringLiteral("kate_private_plugin_katekonsoleplugin"), KTextEditor::MainWindow::Bottom, QIcon::fromTheme(QStringLiteral("utilities-terminal")), i18n("Terminal"));
m_console = new KateConsole(m_plugin, mainWindow, toolview);
// register this view
......
......@@ -40,7 +40,6 @@
#include <kurlcompletion.h>
#include <klineedit.h>
#include <kcolorscheme.h>
#include <kiconloader.h>
#include <KXMLGUIFactory>
#include <KConfigGroup>
......@@ -231,7 +230,7 @@ m_mainWindow (mainWin)
m_toolView = mainWin->createToolView (plugin, QStringLiteral("kate_plugin_katesearch"),
KTextEditor::MainWindow::Bottom,
SmallIcon(QStringLiteral("edit-find")),
QIcon::fromTheme(QStringLiteral("edit-find")),
i18n("Search and Replace"));
ContainerWidget *container = new ContainerWidget(m_toolView);
......@@ -260,14 +259,14 @@ m_mainWindow (mainWin)
m_ui.resultTabWidget->tabBar()->setSelectionBehaviorOnRemove(QTabBar::SelectLeftTab);
KAcceleratorManager::setNoAccel(m_ui.resultTabWidget);
m_ui.displayOptions->setIcon(SmallIcon(QStringLiteral("arrow-down-double")));
m_ui.searchButton->setIcon(SmallIcon(QStringLiteral("edit-find")));
m_ui.stopButton->setIcon(SmallIcon(QStringLiteral("process-stop")));
m_ui.searchPlaceCombo->setItemIcon(0, SmallIcon(QStringLiteral("text-plain")));
m_ui.searchPlaceCombo->setItemIcon(1, SmallIcon(QStringLiteral("folder")));
m_ui.folderUpButton->setIcon(SmallIcon(QStringLiteral("go-up")));
m_ui.currentFolderButton->setIcon(SmallIcon(QStringLiteral("view-refresh")));
m_ui.newTabButton->setIcon(SmallIcon(QStringLiteral("tab-new")));
m_ui.displayOptions->setIcon(QIcon::fromTheme(QStringLiteral("arrow-down-double")));
m_ui.searchButton->setIcon(QIcon::fromTheme(QStringLiteral("edit-find")));
m_ui.stopButton->setIcon(QIcon::fromTheme(QStringLiteral("process-stop")));
m_ui.searchPlaceCombo->setItemIcon(0, QIcon::fromTheme(QStringLiteral("text-plain")));
m_ui.searchPlaceCombo->setItemIcon(1, QIcon::fromTheme(QStringLiteral("folder")));
m_ui.folderUpButton->setIcon(QIcon::fromTheme(QStringLiteral("go-up")));
m_ui.currentFolderButton->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));
m_ui.newTabButton->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));
m_ui.filterCombo->setToolTip(i18n("Comma separated list of file types to search in. Example: \"*.cpp,*.h\"\n"));
m_ui.excludeCombo->setToolTip(i18n("Comma separated list of files and directories to exclude from the search. Example: \"build*\""));
......@@ -1690,7 +1689,7 @@ void KatePluginSearchView::searchContextMenu(const QPoint& pos)
QMenu* menu = contextMenu->addMenu(i18n("Add..."));
if (!menu) return;
menu->setIcon(SmallIcon(QStringLiteral("list-add")));
menu->setIcon(QIcon::fromTheme(QStringLiteral("list-add")));
actionPointers << menuEntry(menu, QStringLiteral("^"), QStringLiteral(""), i18n("Beginning of line"));
actionPointers << menuEntry(menu, QStringLiteral("$"), QStringLiteral(""), i18n("End of line"));
......@@ -1767,7 +1766,7 @@ void KatePluginSearchView::slotProjectFileNameChanged ()
if (!projectFileName.isEmpty()) {
if (m_ui.searchPlaceCombo->count() < 3) {
// add "in Project"
m_ui.searchPlaceCombo->addItem (SmallIcon(QStringLiteral("project-open")), i18n("Current Project"));
m_ui.searchPlaceCombo->addItem (QIcon::fromTheme(QStringLiteral("project-open")), i18n("Current Project"));
if (m_switchToProjectModeWhenAvailable) {
// switch to search "in Project"
m_switchToProjectModeWhenAvailable = false;
......@@ -1775,7 +1774,7 @@ void KatePluginSearchView::slotProjectFileNameChanged ()
}
// add "in Open Projects"
m_ui.searchPlaceCombo->addItem(SmallIcon(QStringLiteral("project-open")), i18n("All Open Projects"));
m_ui.searchPlaceCombo->addItem(QIcon::fromTheme(QStringLiteral("project-open")), i18n("All Open Projects"));
}
}
......
......@@ -28,7 +28,6 @@
#include <KActionCollection>
#include <KXMLGUIFactory>
#include <KIconLoader>
#include <KToolBar>
#include <KLocalizedString>
#include <KPluginFactory>
......@@ -62,7 +61,7 @@ KateSnippetsPluginView::KateSnippetsPluginView(KateSnippetsPlugin *plugin, KText
// Toolview for snippets
m_toolView.reset(mainWindow->createToolView(0, QLatin1String("kate_private_plugin_katesnippetsplugin"),
KTextEditor::MainWindow::Right,
SmallIcon(QLatin1String("document-new")),
QIcon::fromTheme(QLatin1String("document-new")),
i18n("Snippets")));
m_toolView->setLayout(new QHBoxLayout());
......
......@@ -77,7 +77,7 @@ Kate::PluginView *PluginKateXMLCheck::createView(Kate::MainWindow *mainWindow)
PluginKateXMLCheckView::PluginKateXMLCheckView(Kate::MainWindow *mainwin)
: Kate::PluginView (mainwin), Kate::XMLGUIClient(PluginKateXMLCheckFactory::componentData()),win(mainwin)
{
dock = win->createToolView("kate_plugin_xmlcheck_ouputview", Kate::MainWindow::Bottom, SmallIcon("misc"), i18n("XML Checker Output"));
dock = win->createToolView("kate_plugin_xmlcheck_ouputview", Kate::MainWindow::Bottom, QIcon::fromTheme("misc"), i18n("XML Checker Output"));
listview = new QTreeWidget( dock );
m_tmp_file=0;
m_proc=0;
......
......@@ -27,7 +27,6 @@
#include <KActionCollection>
#include <KActionMenu>
#include <KConfigGroup>
#include <KIconLoader>
#include <KMessageBox>
#include <KXMLGUIFactory>
#include <KLocalizedString>
......@@ -488,12 +487,12 @@ bool Sidebar::eventFilter(QObject *obj, QEvent *ev)
}
}
menu->addSection(SmallIcon(QStringLiteral("view_remove")), i18n("Behavior"));
menu->addSection(QIcon::fromTheme(QStringLiteral("view_remove")), i18n("Behavior"));
menu->addAction(w->persistent ? QIcon::fromTheme(QStringLiteral("view-restore")) : QIcon::fromTheme(QStringLiteral("view-fullscreen")),
w->persistent ? i18n("Make Non-Persistent") : i18n("Make Persistent")) -> setData(10);
menu->addSection(SmallIcon(QStringLiteral("move")), i18n("Move To"));
menu->addSection(QIcon::fromTheme(QStringLiteral("move")), i18n("Move To"));
if (position() != 0) {
menu->addAction(QIcon::fromTheme(QStringLiteral("go-previous")), i18n("Left Sidebar"))->setData(0);
......
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