arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-07-12 13:25:51 +00:00
Code Issues Projects Releases Wiki Activity

add test support of several active profiles to gui, library and helper

Browse Source
This commit is contained in:
arcan1s
2014-08-16 21:47:22 +04:00
parent f238ba3a6a
commit 87376f1a5c
11 changed files with 156 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/helper/src/CMakeLists.txt
View File

@ -54,7 +54,9 @@ endif()
add_executable (${SUBPROJECT} ${SOURCES} ${HEADERS} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS})
target_link_libraries (${SUBPROJECT} ${PROJECT_LIBRARY} ${QT_NEEDED_LIBS})
add_executable (${SUBPROJECT}-suid ${SOURCES} ${HEADERS} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS})
target_link_libraries (${SUBPROJECT}-suid ${PROJECT_LIBRARY} ${QT_NEEDED_LIBS})
# install properties
install (TARGETS ${SUBPROJECT} DESTINATION bin)
install (TARGETS ${SUBPROJECT} DESTINATION bin RENAME ${SUBPROJECT}-suid
install (TARGETS ${SUBPROJECT}-suid DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)

11
sources/helper/src/netctladaptor.cpp
View File

@ -42,7 +42,7 @@ QString NetctlAdaptor::ActiveProfile()
if (isNetctlAutoActive())
return netctlCommand->autoGetActiveProfile();
else
return netctlCommand->getActiveProfile();
return netctlCommand->getActiveProfile().join(QChar('|'));
}
@ -50,8 +50,13 @@ QString NetctlAdaptor::ActiveProfileStatus()
{
if (isNetctlAutoActive())
return QString("netctl-auto");
else
return netctlCommand->getProfileStatus(ActiveProfile());
else {
QStringList status;
QStringList profiles = ActiveProfile().split(QChar('|'));
for (int i=0; i<profiles.count(); i++)
status.append(netctlCommand->getProfileStatus(profiles[i]));
return status.join(QChar('|'));
}
}