Git commit c8169ac78564cdf4fe89375fc567eaef86173483 by Pino Toscano. Committed on 23/04/2013 at 21:42. Pushed by pino into branch 'master'.
convert some icon names to freedesktop names M +1 -1 doc/useraction-xml.docbook M +1 -1 krusader/Dialogs/packguibase.cpp M +2 -2 krusader/Panel/listpanelactions.cpp M +1 -1 krusader/kractions.cpp M +2 -2 krusader/useraction_examples.xml http://commits.kde.org/krusader/c8169ac78564cdf4fe89375fc567eaef86173483 diff --git a/doc/useraction-xml.docbook b/doc/useraction-xml.docbook index 71b0bfc..b6d4440 100644 --- a/doc/useraction-xml.docbook +++ b/doc/useraction-xml.docbook @@ -135,7 +135,7 @@ <action name="backup current" > <title>Backup in Current Directory</title> <tooltip>Backup in current directory</tooltip> - <icon>filesaveas</icon> + <icon>document-save-as</icon> <category>System</category> <description same_as="tooltip" /> <command>%_Copy("%aCurrent%", "%_Ask("new name", "%aCurrent%.bak")%")%</command> diff --git a/krusader/Dialogs/packguibase.cpp b/krusader/Dialogs/packguibase.cpp index 4b1feeb..7dd63a0 100644 --- a/krusader/Dialogs/packguibase.cpp +++ b/krusader/Dialogs/packguibase.cpp @@ -119,7 +119,7 @@ PackGUIBase::PackGUIBase(QWidget* parent) hbox_3->setContentsMargins(0, 0, 0, 0); PixmapLabel1 = new QLabel(this); - PixmapLabel1->setPixmap(krLoader->loadIcon("package", KIconLoader::Desktop, 32)); + PixmapLabel1->setPixmap(krLoader->loadIcon("package-x-generic", KIconLoader::Desktop, 32)); PixmapLabel1->setScaledContents(true); PixmapLabel1->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); hbox_3->addWidget(PixmapLabel1); diff --git a/krusader/Panel/listpanelactions.cpp b/krusader/Panel/listpanelactions.cpp index 5a13876..e4eaf4e 100644 --- a/krusader/Panel/listpanelactions.cpp +++ b/krusader/Panel/listpanelactions.cpp @@ -77,7 +77,7 @@ ListPanelActions::ListPanelActions(QObject *parent, FileManagerWindow *mainWindo actPaste = stdAction(KStandardAction::Paste, _func, SLOT(pasteFromClipboard())); // Fn keys - actF2 = action(i18n("Start Terminal Here"), "terminal", Qt::Key_F2, _func, SLOT(terminal()) , "F2_Terminal"); + actF2 = action(i18n("Start Terminal Here"), "utilities-terminal", Qt::Key_F2, _func, SLOT(terminal()) , "F2_Terminal"); actF3 = action(i18n("View File"), 0, Qt::Key_F3, _func, SLOT(view()), "F3_View"); actF4 = action(i18n("Edit File"), 0, Qt::Key_F4, _func, SLOT(edit()) , "F4_Edit"); actF5 = action(i18n("Copy to other panel"), 0, Qt::Key_F5, _func, SLOT(copyFiles()) , "F5_Copy"); @@ -94,7 +94,7 @@ ListPanelActions::ListPanelActions(QObject *parent, FileManagerWindow *mainWindo action(i18n("Right-click Menu"), 0, Qt::Key_Menu, _gui, SLOT(rightclickMenu()), "rightclick menu"); actProperties = action(i18n("&Properties..."), 0, Qt::ALT + Qt::Key_Return, _func, SLOT(properties()), "properties"); actCompDirs = action(i18n("&Compare Directories"), "view_left_right", Qt::ALT + Qt::SHIFT + Qt::Key_C, _gui, SLOT(compareDirs()), "compare dirs"); - actCalculate = action(i18n("Calculate &Occupied Space"), "kcalc", 0, _func, SLOT(calcSpace()), "calculate"); + actCalculate = action(i18n("Calculate &Occupied Space"), "accessories-calculator", 0, _func, SLOT(calcSpace()), "calculate"); actPack = action(i18n("Pac&k..."), "archive-insert", Qt::ALT + Qt::SHIFT + Qt::Key_P, _func, SLOT(pack()), "pack"); actUnpack = action(i18n("&Unpack..."), "archive-extract", Qt::ALT + Qt::SHIFT + Qt::Key_U, _func, SLOT(unpack()), "unpack"); actCreateChecksum = action(i18n("Create Checksum..."), "binary", 0, _func, SLOT(createChecksum()), "create checksum"); diff --git a/krusader/kractions.cpp b/krusader/kractions.cpp index a74af4b..d9b3d13 100644 --- a/krusader/kractions.cpp +++ b/krusader/kractions.cpp @@ -245,7 +245,7 @@ void KrActions::setupActions(Krusader *krusaderApp) (*execTypeArray[ cmdExecMode ])->setChecked(true); - NEW_KACTION(actHomeTerminal, i18n("Start &Terminal"), "terminal", 0, SLOTS, SLOT(homeTerminal()), "terminal at home"); + NEW_KACTION(actHomeTerminal, i18n("Start &Terminal"), "utilities-terminal", 0, SLOTS, SLOT(homeTerminal()), "terminal at home"); actMountMan = krMtMan.action(); actMountMan->setShortcut(Qt::ALT + Qt::Key_Slash); diff --git a/krusader/useraction_examples.xml b/krusader/useraction_examples.xml index 3a755c3..878d1c7 100644 --- a/krusader/useraction_examples.xml +++ b/krusader/useraction_examples.xml @@ -37,7 +37,7 @@ </action> <action name="filename_to_clipboard" > <title>Copy current item to clipboard</title> - <icon>editpaste</icon> + <icon>edit-paste</icon> <category>Samples</category> <command>%_Clipboard("%aCurrent%")%</command> <defaultshortcut>Alt+Ctrl+C</defaultshortcut> @@ -81,7 +81,7 @@ <action name="backup_current" > <title>Backup current</title> <tooltip>Backup current file in current directory</tooltip> - <icon>filesaveas</icon> + <icon>document-save-as</icon> <category>System</category> <description>Backups current file in current directory and asks the user for a new filename. By default ".old" is appended to the original filename.</description> <command>%_Copy("%aCurrent%", "%_Ask("New filename", "%aCurrent%.old")%")%</command>
