From 11b097141a84ac88045715d4ac926431a9536f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Fri, 12 Jun 2015 13:11:29 +0100 Subject: [PATCH] Move createFileSystemColor back to GUI. --- src/config/generalpagewidget.cpp | 2 +- src/gui/newdialog.cpp | 1 + src/gui/partitionmanagerwidget.cpp | 1 + src/gui/partpropsdialog.cpp | 1 + src/util/guihelpers.cpp | 15 +++++++++++++++ src/util/guihelpers.h | 5 +++++ 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/config/generalpagewidget.cpp b/src/config/generalpagewidget.cpp index fdbf223..5d2964a 100644 --- a/src/config/generalpagewidget.cpp +++ b/src/config/generalpagewidget.cpp @@ -18,10 +18,10 @@ #include "config/generalpagewidget.h" #include - #include #include +#include "util/guihelpers.h" #include diff --git a/src/gui/newdialog.cpp b/src/gui/newdialog.cpp index 84078fb..f38ec13 100644 --- a/src/gui/newdialog.cpp +++ b/src/gui/newdialog.cpp @@ -26,6 +26,7 @@ #include #include +#include "util/guihelpers.h" #include #include diff --git a/src/gui/partitionmanagerwidget.cpp b/src/gui/partitionmanagerwidget.cpp index d058c67..51f1017 100644 --- a/src/gui/partitionmanagerwidget.cpp +++ b/src/gui/partitionmanagerwidget.cpp @@ -46,6 +46,7 @@ #include #include #include +#include "util/guihelpers.h" #include #include diff --git a/src/gui/partpropsdialog.cpp b/src/gui/partpropsdialog.cpp index 4a59717..1de69bd 100644 --- a/src/gui/partpropsdialog.cpp +++ b/src/gui/partpropsdialog.cpp @@ -25,6 +25,7 @@ #include #include +#include "util/guihelpers.h" #include #include diff --git a/src/util/guihelpers.cpp b/src/util/guihelpers.cpp index e961730..2ad2fa6 100644 --- a/src/util/guihelpers.cpp +++ b/src/util/guihelpers.cpp @@ -21,6 +21,9 @@ #include #include +#include +#include +#include #include #include #include @@ -33,6 +36,18 @@ #include +QIcon createFileSystemColor(FileSystem::Type type, quint32 size) +{ + QPixmap pixmap(size, size); + QPainter painter(&pixmap); + painter.setPen(QColor(0, 0, 0)); + painter.setBrush(Config::fileSystemColorCode(type)); + painter.drawRect(QRect(0, 0, pixmap.width() - 1, pixmap.height() - 1)); + painter.end(); + + return QIcon(pixmap); +} + bool checkPermissions() { if (geteuid() != 0) diff --git a/src/util/guihelpers.h b/src/util/guihelpers.h index f63f7c3..4d405b6 100644 --- a/src/util/guihelpers.h +++ b/src/util/guihelpers.h @@ -21,10 +21,15 @@ #include "util/libpartitionmanagerguiexport.h" +#include + class QString; +class QIcon; LIBKPMGUI_EXPORT bool checkPermissions(); LIBKPMGUI_EXPORT bool loadBackend(); +LIBKPMGUI_EXPORT QIcon createFileSystemColor(FileSystem::Type type, quint32 size); + QString suCommand(); #endif