arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-04-24 15:37:23 +00:00
Code Issues Projects Releases Wiki Activity

unify configuration names

Browse Source
This commit is contained in:
arcan1s 2014-08-25 10:54:18 +04:00
parent d287f52ba5
commit 6e6c547460
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/gui/netctl-gui.1
View File

@ -64,7 +64,7 @@ Configuration file
.RE .RE
.SH SEE ALSO .SH SEE ALSO
.BR netctlgui-helper (1) .BR netctlgui-helper (1)
.BR netctlgui-helper.conf (5) .BR netctl-gui.conf (5)
.SH STANDARDS .SH STANDARDS
See See
.B @CMAKE_INSTALL_PREFIX@/share/doc/netctl-gui/netctl-gui-dbus-api.html .B @CMAKE_INSTALL_PREFIX@/share/doc/netctl-gui/netctl-gui-dbus-api.html

2
sources/helper/CMakeLists.txt
View File

@ -24,7 +24,7 @@ configure_file (${SUBPROJECT_MAN_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MA
configure_file (${SUBPROJECT_MAN5_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN5}) configure_file (${SUBPROJECT_MAN5_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN5})
install (FILES org.netctlgui.helper.conf DESTINATION ${DBUS_SYSTEMCONF_PATH}) install (FILES org.netctlgui.helper.conf DESTINATION ${DBUS_SYSTEMCONF_PATH})
install (FILES netctlgui-helper.conf DESTINATION /etc) install (FILES netctl-gui.conf DESTINATION /etc)
install (FILES netctlgui-helper.service DESTINATION ${SYSTEMD_SERVICE_PATH}) install (FILES netctlgui-helper.service DESTINATION ${SYSTEMD_SERVICE_PATH})
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN} DESTINATION share/man/man1/) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN} DESTINATION share/man/man1/)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN5} DESTINATION share/man/man5/) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN5} DESTINATION share/man/man5/)

2
sources/helper/netctlgui-helper.conf → sources/helper/netctl-gui.conf
View File

@ -1,5 +1,5 @@
# Configuration file for Netctl GUI project # Configuration file for Netctl GUI project
# /etc/netctlgui-helper.conf - system-wide configuration # /etc/netctl-gui.conf - system-wide configuration
# $HOME/.config/netctl-gui.conf - user configuration # $HOME/.config/netctl-gui.conf - user configuration
# close helper after GUI application quit. # close helper after GUI application quit.

4
sources/helper/netctlgui-helper.conf.5 → sources/helper/netctl-gui.conf.5
View File

@ -1,8 +1,8 @@
.TH netctlgui-helper.conf 5 "@CURRENT_DATE@" "version @PROJECT_VERSION@" "File Formats Manual" .TH netctl-gui.conf 5 "@CURRENT_DATE@" "version @PROJECT_VERSION@" "File Formats Manual"
.SH NAME .SH NAME
netctlgui-helper.conf is a configuration file of Netctl GUI project netctlgui-helper.conf is a configuration file of Netctl GUI project
.SH SYNOPSIS .SH SYNOPSIS
.B /etc/netctlgui-helper.conf .B /etc/netctl-gui.conf
for system-wide configuration or for system-wide configuration or
.B $HOME/.config/netctl-gui.conf .B $HOME/.config/netctl-gui.conf
for user one for user one

2
sources/helper/netctlgui-helper.1
View File

@ -64,7 +64,7 @@ By the way it is highly recommended to copy source service file before to
and edit copied file to avoid upgrade problems. and edit copied file to avoid upgrade problems.
.SH SEE ALSO .SH SEE ALSO
.BR netctl-gui (1) .BR netctl-gui (1)
.BR netctlgui-helper.conf (5) .BR netctl-gui.conf (5)
.SH STANDARDS .SH STANDARDS
See See
.B @CMAKE_INSTALL_PREFIX@/share/doc/netctl-gui/netctl-gui-dbus-api.html .B @CMAKE_INSTALL_PREFIX@/share/doc/netctl-gui/netctl-gui-dbus-api.html

2
sources/helper/src/netctlhelper.cpp
View File

@ -173,7 +173,7 @@ void NetctlHelper::updateConfiguration()
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
deleteInterface(); deleteInterface();
configuration = getSettings(QString("/etc/netctlgui-helper.conf")); configuration = getSettings(QString("/etc/netctl-gui.conf"));
if (!system) if (!system)
configuration = getSettings(configPath, configuration); configuration = getSettings(configPath, configuration);
createInterface(); createInterface();