diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/detailsmodesettings.kcfg | 1 | ||||
| -rw-r--r-- | src/dolphincontextmenu.cpp | 4 | ||||
| -rw-r--r-- | src/iconsmodesettings.kcfg | 1 | ||||
| -rw-r--r-- | src/iconsviewsettingspage.cpp | 14 |
4 files changed, 12 insertions, 8 deletions
diff --git a/src/detailsmodesettings.kcfg b/src/detailsmodesettings.kcfg index c7ab10d15..ce4a53325 100644 --- a/src/detailsmodesettings.kcfg +++ b/src/detailsmodesettings.kcfg @@ -3,6 +3,7 @@ <kcfg> <kcfgfile name="dolphinrc"/> <include>kiconloader.h</include> + <include>kglobalsettings.h</include> <group name="DetailsMode"> <entry name="FontFamily" type="String"> <label>Font family</label> diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 7cf7f6b09..14ec8dcd4 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -297,8 +297,8 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup, // will be skipped here. const QString appName((*it)->name()); if (!containsEntry(openWithMenu, appName)) { - QAction *action = openWithMenu->addAction((*it)->pixmap(K3Icon::Small), - appName); + const KIcon icon((*it)->icon()); + QAction *action = openWithMenu->addAction(icon, appName); openWithVector.append(*it); openWithActions << action; } diff --git a/src/iconsmodesettings.kcfg b/src/iconsmodesettings.kcfg index 0d024d8a2..23ee5ec93 100644 --- a/src/iconsmodesettings.kcfg +++ b/src/iconsmodesettings.kcfg @@ -3,6 +3,7 @@ <kcfg> <kcfgfile name="dolphinrc"/> <include>kiconloader.h</include> + <include>kglobalsettings.h</include> <group name="IconsMode"> <entry name="Arrangement" type="String"> <label>Arrangement</label> diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index ab2befd93..7e63cf0f5 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.cpp @@ -19,23 +19,25 @@ ***************************************************************************/ #include "iconsviewsettingspage.h" +#include "iconsmodesettings.h" +#include "dolphinsettings.h" +#include "pixmapviewer.h" + +#include <assert.h> #include <qlabel.h> #include <qslider.h> #include <q3buttongroup.h> #include <qradiobutton.h> #include <qspinbox.h> -#include <kiconloader.h> #include <qfontcombobox.h> + +#include <kiconloader.h> #include <kdialog.h> +#include <kglobalsettings.h> #include <klocale.h> -#include <assert.h> #include <kvbox.h> -#include "iconsmodesettings.h" -#include "dolphinsettings.h" -#include "pixmapviewer.h" - #define GRID_SPACING_BASE 8 #define GRID_SPACING_INC 12 |