Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kio: do not use resource files for KACLEditWidget images

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-05-29 15:34:01 +03:00
parent b6af68c97d
commit 2bf6c7b236
3 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
kio/CMakeLists.txt
View file

@ -131,8 +131,6 @@ set(kfile_STAT_SRCS
kfile/kfilemetadataprovider.cpp
)
qt4_add_resources(kfile_STAT_SRCS kfile/kacleditwidget.qrc)
########### next target ###############
set(kio_LIB_SRCS
@ -290,3 +288,18 @@ install(
kio/accept-languages.codes
DESTINATION ${KDE4_CONFIG_INSTALL_DIR}
)
install(
FILES
kfile/images/yes.png
kfile/images/yespartial.png
kfile/images/user.png
kfile/images/user-grey.png
kfile/images/group.png
kfile/images/group-grey.png
kfile/images/others.png
kfile/images/others-grey.png
kfile/images/mask.png
DESTINATION ${KDE4_DATA_INSTALL_DIR}/kio/pics
)

11
kio/kfile/kacleditwidget.cpp
View file

@ -42,6 +42,7 @@
#include <kdebug.h>
#include <kdialog.h>
#include <khbox.h>
#include <kstandarddirs.h>
#ifdef HAVE_ACL_LIBACL_H
# include <acl/libacl.h>
@ -613,6 +614,10 @@ void EditACLEntryDialog::slotSelectionChanged( QAbstractButton *button )
}
}
static QString kfileIconPath(const char* const name)
{
return KStandardDirs::locate("data", QString::fromLatin1("kio/pics/%1.png").arg(name));
}
KACLListView::KACLListView( QWidget* parent )
: QTreeWidget( parent ),
@ -636,10 +641,10 @@ KACLListView::KACLListView( QWidget* parent )
// Load the avatars
for ( int i=0; i < LAST_IDX; ++i ) {
s_itemAttributes[i].pixmap = new QPixmap( QString::fromLatin1(":/images/%1").arg(s_itemAttributes[i].pixmapName) );
s_itemAttributes[i].pixmap = new QPixmap( kfileIconPath(s_itemAttributes[i].pixmapName) );
}
m_yesPixmap = new QPixmap( ":/images/yes.png" );
m_yesPartialPixmap = new QPixmap( ":/images/yespartial.png" );
m_yesPixmap = new QPixmap( kfileIconPath("yes") );
m_yesPartialPixmap = new QPixmap( kfileIconPath("yespartial") );
// fill the lists of all legal users and groups

15
kio/kfile/kacleditwidget.qrc
View file

@ -1,15 +0,0 @@
<RCC>
<qresource prefix="/" >
<file>images/yes.png</file>
<file>images/yespartial.png</file>
<file>images/user.png</file>
<file>images/user-grey.png</file>
<file>images/group.png</file>
<file>images/group-grey.png</file>
<file>images/others.png</file>
<file>images/others-grey.png</file>
<file>images/mask.png</file>
</qresource>
</RCC>