diff --git a/.gitignore b/.gitignore
index ed27715..3a308bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
.vscode/
-ubl-settings-TEMPLATE
+ubl-settings-usergroups
*~
build/
compile/
diff --git a/Makefile b/Makefile
index 07ba802..120e355 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,11 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH))
CMAKE_COMMAND = cmake
CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
-#CMAKE_SOURCE_DIR = ./source
-#CMAKE_BUILD_DIR = ./compile
DEPENDS = /bin/cmake
-PREFIX ?= /usr
+PREFIX ?= /usr/local
PKGNAME = $(MAKEFILE_DIR)
-#PKGNAME = ubl-settings-manager
-LATEST_TAG=
+FILE_VER = source/${PKGNAME}.h
+
default_target: all
.PHONY: all init depend debug prepare check build uninstall install clean help
@@ -24,11 +22,11 @@ all: init build
init:
@echo "Initialize ..."; \
if [ -d ".git" ]; then \
- LATEST_TAG=$$(git describe --tags | sed 's/^v//'|grep -oE "^[0-9]{1,}.[0-9]{1,}"); \
+ LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \
else \
- LATEST_TAG="0.0"; \
+ LATEST_TAG="Development"; \
fi; \
- sed -r "s/^(string version_application).*/\1=\"$${LATEST_TAG}\";/" -i source/${PKGNAME}.h; \
+ sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \
echo "-- Build path: ${CMAKE_BUILD_DIR}"
depend:
@@ -39,16 +37,14 @@ depend:
exit 1; \
fi; \
done; \
+ $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B${CMAKE_BUILD_DIR} --check-build-system CMakeFiles/Makefile.cmake 1 || exit 1; \
echo "Check depends: OK"
-# $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-debug: init build
- @echo "Debug ..."; \
+debug:
+ @echo "Debug ..."
if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
$(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
fi; \
- echo "${CMAKE_BUILD_DIR}/${PKGNAME}"; \
- cp ${CMAKE_BUILD_DIR}/${PKGNAME} ./; \
echo "Debug: OK"
prepare:
@@ -69,7 +65,8 @@ check:
build: depend prepare
@echo "Build ..."; \
- make --directory=${CMAKE_BUILD_DIR}; \
+ $(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \
+ sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \
echo "Build: OK"
uninstall:
@@ -92,9 +89,7 @@ uninstall:
@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
- @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.checked.svg"
- @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.warning.svg"
- @$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy"
+ @$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy"
@if [ -z ${DESTDIR} ]; then \
[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
update-desktop-database --quiet &>/dev/null || true; \
@@ -104,9 +99,6 @@ uninstall:
install: check uninstall
@echo "Install ..."
-#################################################### УДАЛИТЬ ПЕРЕД КОММИТОМ ################################################################################
- @gcc source/ubl-cmake.h compile/resources.c compile/ubl-cmake.h source/ubl-settings-usergroups.c source/ubl-settings-usergroups.h source/ubl-strings.h source/ubl-utils.c source/ubl-utils.h -o ubl-settings-usergroups `pkg-config --cflags --libs gtk+-3.0 vte-2.91 webkit2gtk-4.0 webkit2gtk-web-extension-4.0` -g
-#################################################### УДАЛИТЬ ПЕРЕД КОММИТОМ ################################################################################
@for FILE_PO in $(wildcard *.po); do \
LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \
@@ -119,23 +111,19 @@ install: check uninstall
install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
done
- @install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
- @install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions"
- @install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"
+ @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"
@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
- @install -dm755 "${DESTDIR}/etc/xdg"
- @install -dm755 "${DESTDIR}${PREFIX}/share/applications"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
+ @sed -e 's+/usr/bin+${PREFIX}/bin+g' -i ${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy
@if [ -z ${DESTDIR} ]; then \
[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
update-desktop-database --quiet &>/dev/null || true; \
[ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
fi
@echo "Install: OK"
- @sed -r "s/^(string version_application=\"*\").*/string version_application;/" -i source/${PKGNAME}.h; \
clean:
@echo "Clean ..."
@@ -146,14 +134,6 @@ clean:
echo "Clean: OK"; \
fi
-up_ver:
- @CURRENT=$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2); \
- MAJOR=$$(cut -d. -f1 <<< $${CURRENT}); \
- MINOR=$$(cut -d. -f2 <<< $${CURRENT}); \
- VER="$${MAJOR}.$$(($${MINOR}+1))"; \
- sed "s/VERSION *[[:digit:]]*.*/VERSION $${VER}/" -i ${FILE_VERSION}; \
- echo "Updated version to VERSION.md: $${CURRENT} to $${VER}"
-
help:
@echo "The following are some of the valid targets for this Makefile:"; \
echo "... all (the default if no target is provided)"; \
@@ -163,5 +143,4 @@ help:
echo "... compile"; \
echo "... install"; \
echo "... uninstall"; \
- echo "... clean"; \
- echo "... up_ver"
+ echo "... clean"
\ No newline at end of file
diff --git a/com.ublinux.ubl-settings-usergroups.policy b/com.ublinux.ubl-settings-usergroups.policy
index 087a6b3..2f5a741 100644
--- a/com.ublinux.ubl-settings-usergroups.policy
+++ b/com.ublinux.ubl-settings-usergroups.policy
@@ -7,17 +7,17 @@
UBLinux
https://ublinux.ru
-
- Run ubl-ubl-settings-usergroups as root
- Запуск утилиты ubl-ubl-settings-usergroups с правами root
- Authentication is required to run ubl-ubl-settings-usergroups
- Требуется авторизация для запуска утилиты ubl-ubl-settings-usergroups с правами root
+
+ Run ubl-settings-usergroups as root
+ Запуск утилиты ubl-settings-usergroups с правами root
+ Authentication is required to run ubl-settings-usergroups
+ Требуется авторизация для запуска утилиты ubl-settings-usergroups с правами root
auth_admin
auth_admin
auth_admin
- /usr/bin/ubl-ubl-settings-usergroups
+ /usr/bin/ubl-settings-usergroups
true
diff --git a/com.ublinux.ubl-settings-usergroups.svg b/com.ublinux.ubl-settings-usergroups.svg
index f636c26..963138d 100644
--- a/com.ublinux.ubl-settings-usergroups.svg
+++ b/com.ublinux.ubl-settings-usergroups.svg
@@ -1,14 +1,14 @@
diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index ee77d87..b149b9c 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -100,8 +100,88 @@ void on_about(){
gtk_widget_show(window);
}
+void on_toggle_button_switched(GtkToggleButton *self, GtkWidget *widget){
+ gtk_widget_set_sensitive(widget,!gtk_toggle_button_get_active(self));
+
+}
+
//functions
+void on_uid_changed(GtkWidget *self, dictionary *dict){
+ user_window *window = yon_dictionary_get_data(dict->first,user_window*);
+ user_config *user_cfg = yon_dictionary_get_data(dict->first->next,user_config*);
+ user_cfg->uid = atoi(gtk_entry_buffer_get_text(gtk_entry_get_buffer(GTK_ENTRY(window->UserUIDEntry))));
+}
+
+void on_username_changed(GtkWidget *self, dictionary *dict){
+ user_window *window = yon_dictionary_get_data(dict->first,user_window*);
+ user_config *user_cfg = yon_dictionary_get_data(dict->first->next,user_config*);
+ user_cfg->username = (char*)(gtk_entry_buffer_get_text(gtk_entry_get_buffer(GTK_ENTRY(window->userUserNameEntry))));
+}
+
+void on_login_changed(GtkWidget *self, dictionary *dict){
+ user_window *window = yon_dictionary_get_data(dict->first,user_window*);
+ user_config *user_cfg = yon_dictionary_get_data(dict->first->next,user_config*);
+ user_cfg->login = (char*)(gtk_entry_buffer_get_text(gtk_entry_get_buffer(GTK_ENTRY(window->userLoginEntry))));
+}
+
+void on_password_changed(GtkWidget *self, dictionary *dict){
+ user_window *window = yon_dictionary_get_data(dict->first,user_window*);
+ user_config *user_cfg = yon_dictionary_get_data(dict->first->next,user_config*);
+ user_cfg->password = (char*)(gtk_entry_buffer_get_text(gtk_entry_get_buffer(GTK_ENTRY(window->userPasswordEntry))));
+}
+
+void on_group_changed(GtkWidget *self, dictionary *dict){
+ user_window *window = yon_dictionary_get_data(dict->first,user_window*);
+ user_config *user_cfg = yon_dictionary_get_data(dict->first->next,user_config*);
+ user_cfg->main_group = (char*)(gtk_entry_buffer_get_text(gtk_entry_get_buffer(GTK_ENTRY(window->userGroupsEntry))));
+}
+
+void on_hash_changed(GtkWidget *self, dictionary *dict){
+ user_window *window = yon_dictionary_get_data(dict->first,user_window*);
+ user_config *user_cfg = yon_dictionary_get_data(dict->first->next,user_config*);
+ user_cfg->password_hash = gtk_combo_box_get_active(GTK_COMBO_BOX(window->userPasswordHashAlgorithmCombo));
+}
+
+void on_extra_changed(GtkWidget *self, dictionary *dict){
+ user_window *window = yon_dictionary_get_data(dict->first,user_window*);
+ user_config *user_cfg = yon_dictionary_get_data(dict->first->next,user_config*);
+ user_cfg->extra_options = (char*)(gtk_entry_buffer_get_text(gtk_entry_get_buffer(GTK_ENTRY(window->userExtraOptionsEntry))));
+}
+
+void on_user_def_password_changed(GtkWidget *self, dictionary *dict){
+ user_window *window = yon_dictionary_get_data(dict->first,user_window*);
+ user_config *user_cfg = yon_dictionary_get_data(dict->first->next,user_config*);
+ user_cfg->password=NULL;
+ user_cfg->password_default = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self));
+ on_toggle_button_switched(GTK_TOGGLE_BUTTON(self),window->userPasswordEntry);
+}
+
+void on_auto_uid_changed(GtkWidget *self, dictionary *dict){
+ user_window *window = yon_dictionary_get_data(dict->first,user_window*);
+ user_config *user_cfg = yon_dictionary_get_data(dict->first->next,user_config*);
+ user_cfg->uid=0;
+ user_cfg->uid_default = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self));
+ on_toggle_button_switched(GTK_TOGGLE_BUTTON(self),window->UserUIDEntry);
+}
+
+void on_SAMBA_changed(GtkWidget *self, dictionary *dict){
+ user_window *window = yon_dictionary_get_data(dict->first,user_window*);
+ user_config *user_cfg = yon_dictionary_get_data(dict->first->next,user_config*);
+ user_cfg->sync_SAMBA=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self));
+}
+
+void on_user_accept(GtkWidget *self, dictionary * dict){
+ user_window *window = yon_dictionary_get_data(dict->first,user_window*);
+ user_config *user_cfg = yon_dictionary_get_data(dict->first->next,user_config*);
+ main_window *widgets = yon_dictionary_get_data(dict->first->next->next,main_window*);
+ GtkTreeIter iter;
+ gtk_list_store_append(main_config.usersListStore,&iter);
+ gtk_list_store_set(main_config.usersListStore,&iter,(user_cfg->uid_default==0) ? 0 : 1,(user_cfg->uid_default==0) ? user_cfg->uid : 1,2,user_cfg->login, 3,(user_cfg->password_default==0) ? "*******" : _("Default"),5,user_cfg->username,-1);
+ // widgets->MainUserTree;
+ on_close_subwindow(self);
+}
+
void yon_load_proceed(char *command){
if (yon_config_load_register(command))
yon_ubl_status_box_render(LOCAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
@@ -110,19 +190,61 @@ void yon_load_proceed(char *command){
}
-void on_groups_open(){
+void on_def_groups_accept(GtkWidget *self, dictionary *windowes){
+ char *groups_string = "";
+ main_window *widgets = yon_dictionary_get_data(windowes->first->next,main_window*);
+ groups_window *window = yon_dictionary_get_data(windowes->first,groups_window*);
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsAdmCheck))==1) groups_string = yon_char_append(groups_string,"adm,");
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsAudioCheck))==1) groups_string = yon_char_append(groups_string,"audio,");
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsAutologinCheck))==1) groups_string = yon_char_append(groups_string,"autologin,");
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsAvahiCheck))==1) groups_string = yon_char_append(groups_string,"avahi,");
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsBinCheck))==1) groups_string = yon_char_append(groups_string,"bin,");
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsBrlapiCheck))==1) groups_string = yon_char_append(groups_string,"brlapi,");
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsBrittyCheck))==1) groups_string = yon_char_append(groups_string,"britty,");
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsBumblbeeCheck))==1) groups_string = yon_char_append(groups_string,"bumblbee,");
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsChronyCheck))==1) groups_string = yon_char_append(groups_string,"chrony,");
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsClamavCheck))==1) groups_string = yon_char_append(groups_string,"clamav,");
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsCockpitWsCheck))==1) groups_string = yon_char_append(groups_string,"cockpit-ws,");
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsCockpitWsinstanceCheck))==1) groups_string = yon_char_append(groups_string,"cockpit-wsinstance,");
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsColordCheck))==1) groups_string = yon_char_append(groups_string,"colord,");
+ if (strcmp(groups_string,"")!=0) groups_string[strlen(groups_string)-1]='\0';
+ gtk_entry_buffer_set_text(gtk_entry_get_buffer(GTK_ENTRY(widgets->MainDefaultGroupsEntry)),groups_string,strlen(groups_string));
+ on_close_subwindow(self);
+}
+
+void on_groups_open(GtkWidget *self, main_window *widgets){
+
+}
+
+void on_def_groups_open(GtkWidget *self, main_window *widgets){
GtkBuilder *builder = gtk_builder_new_from_resource(glade_groups_path);
groups_window *window = malloc(sizeof(groups_window));
window->Window = yon_gtk_builder_get_widget(builder,"GroupsWindow");
window->GroupsCancelButton = yon_gtk_builder_get_widget(builder,"GroupsCancelButton");
window->GroupsOkButton = yon_gtk_builder_get_widget(builder,"GroupsOkButton");
- g_signal_connect(G_OBJECT(window->GroupsCancelButton),"clicked",G_CALLBACK(on_close_subwindow),NULL);
- g_signal_connect(G_OBJECT(window->GroupsOkButton),"clicked",G_CALLBACK(on_close_subwindow),NULL);
+ window->GroupsAdmCheck = yon_gtk_builder_get_widget(builder,"groupsAdmGroupCheck");
+ window->GroupsAudioCheck = yon_gtk_builder_get_widget(builder,"groupsAudioGroupCheck");
+ window->GroupsAutologinCheck = yon_gtk_builder_get_widget(builder,"groupsAutologinGroupCheck");
+ window->GroupsAvahiCheck = yon_gtk_builder_get_widget(builder,"groupsAvahiGroupCheck");
+ window->GroupsBinCheck = yon_gtk_builder_get_widget(builder,"groupsBinGroupCheck");
+ window->GroupsBrlapiCheck = yon_gtk_builder_get_widget(builder,"groupsBrlapiGroupCheck");
+ window->GroupsBrittyCheck = yon_gtk_builder_get_widget(builder,"groupsBrittyGroupCheck");
+ window->GroupsBumblbeeCheck = yon_gtk_builder_get_widget(builder,"groupsBumblbeeGroupCheck");
+ window->GroupsChronyCheck = yon_gtk_builder_get_widget(builder,"groupsChronyGroupCheck");
+ window->GroupsClamavCheck = yon_gtk_builder_get_widget(builder,"groupsClamavGroupCheck");
+ window->GroupsCockpitWsCheck = yon_gtk_builder_get_widget(builder,"groupsCockpitWsGroupCheck");
+ window->GroupsCockpitWsinstanceCheck = yon_gtk_builder_get_widget(builder,"groupsCockpitWsinstanceGroupCheck");
+ window->GroupsColordCheck = yon_gtk_builder_get_widget(builder,"groupsColordGroupCheck");
+ dictionary *windgets=NULL;
+ yon_dictionary_add_or_create_if_exists_with_data(windgets,"window",window);
+ yon_dictionary_add_or_create_if_exists_with_data(windgets,"widgets",widgets);
+ g_signal_connect(G_OBJECT(window->GroupsCancelButton),"clicked",G_CALLBACK(on_close_subwindow),window);
+ g_signal_connect(G_OBJECT(window->GroupsOkButton),"clicked",G_CALLBACK(on_def_groups_accept),windgets);
gtk_widget_show(window->Window);
}
-void on_user_add(){
+void on_user_add(GtkWidget *self, main_window *widgets){
GtkBuilder *builder = gtk_builder_new_from_resource(glade_user_path);
user_window *window = malloc(sizeof(user_window));
window->Window = yon_gtk_builder_get_widget(builder,"CreateUserWindow");
@@ -130,9 +252,47 @@ void on_user_add(){
window->UserCancelButton = yon_gtk_builder_get_widget(builder,"UserCancelButton");
window->UserOkButton = yon_gtk_builder_get_widget(builder,"UserOkButton");
+ window->UserUIDAutoCheck = yon_gtk_builder_get_widget(builder,"userUIDAutoCheck");
+ window->UserUIDEntry = yon_gtk_builder_get_widget(builder,"userUIDEntry");
+ window->userUserNameEntry = yon_gtk_builder_get_widget(builder,"userUserNameEntry");
+ window->userLoginEntry = yon_gtk_builder_get_widget(builder,"userLoginEntry");
+ window->userPasswordDefaultCheck = yon_gtk_builder_get_widget(builder,"userPasswordDefaultCheck");
+ window->userPasswordEntry = yon_gtk_builder_get_widget(builder,"userPasswordEntry");
+ window->userGroupsEntry = yon_gtk_builder_get_widget(builder,"userGroupsEntry");
+ window->userPasswordHashAlgorithmCombo = yon_gtk_builder_get_widget(builder,"userPasswordHashAlgorithmCombo");
+ window->userSyncSAMBACheck = yon_gtk_builder_get_widget(builder,"userSyncSAMBACheck");
+ window->userExtraOptionsEntry = yon_gtk_builder_get_widget(builder,"userExtraOptionsEntry");
+ user_config *user_cfg=malloc(sizeof(user_config));
+ user_cfg->username=NULL;
+ user_cfg->login=NULL;
+ user_cfg->password=NULL;
+ user_cfg->main_group=NULL;
+ user_cfg->additional_groups=NULL;
+ user_cfg->extra_options=NULL;
+ user_cfg->uid=-1;
+ user_cfg->password_default=0;
+ user_cfg->password_hash=-1;
+ user_cfg->sync_SAMBA=0;
+ dictionary *dict = NULL;
+ yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window)
+ yon_dictionary_add_or_create_if_exists_with_data(dict,"config",user_cfg);
+ yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
g_signal_connect(G_OBJECT(window->UserCancelButton),"clicked",G_CALLBACK(on_close_subwindow),NULL);
- g_signal_connect(G_OBJECT(window->UserOkButton),"clicked",G_CALLBACK(on_close_subwindow),NULL);
+ g_signal_connect(G_OBJECT(window->UserOkButton),"clicked",G_CALLBACK(on_user_accept),dict);
+ // g_signal_connect(G_OBJECT(window->UserUIDAutoCheck),"clicked",G_CALLBACK(on_toggle_button_switched),window->UserUIDEntry);
+ // g_signal_connect(G_OBJECT(window->userPasswordDefaultCheck),"clicked",G_CALLBACK(on_toggle_button_switched),window->UserPasswordEntry);
g_signal_connect(G_OBJECT(window->UserAdditionalGroupsButton),"clicked",G_CALLBACK(on_groups_open),NULL);
+
+ g_signal_connect(G_OBJECT(window->UserUIDAutoCheck),"toggled",G_CALLBACK(on_auto_uid_changed),dict);
+ g_signal_connect(G_OBJECT(window->UserUIDEntry),"changed",G_CALLBACK(on_uid_changed),dict);
+ g_signal_connect(G_OBJECT(window->userUserNameEntry),"changed",G_CALLBACK(on_username_changed),dict);
+ g_signal_connect(G_OBJECT(window->userLoginEntry),"changed",G_CALLBACK(on_login_changed),dict);
+ g_signal_connect(G_OBJECT(window->userPasswordDefaultCheck),"toggled",G_CALLBACK(on_user_def_password_changed),dict);
+ g_signal_connect(G_OBJECT(window->userPasswordEntry),"changed",G_CALLBACK(on_password_changed),dict);
+ g_signal_connect(G_OBJECT(window->userGroupsEntry),"changed",G_CALLBACK(on_group_changed),dict);
+ g_signal_connect(G_OBJECT(window->userPasswordHashAlgorithmCombo),"changed",G_CALLBACK(on_hash_changed),dict);
+ g_signal_connect(G_OBJECT(window->userSyncSAMBACheck),"toggled",G_CALLBACK(on_SAMBA_changed),dict);
+ g_signal_connect(G_OBJECT(window->userExtraOptionsEntry),"changed",G_CALLBACK(on_extra_changed),dict);
gtk_widget_show(window->Window);
}
@@ -144,22 +304,57 @@ void on_user_delete(){
}
+void on_def_groups_edit(GtkCellEditable *self, main_window *widgets){
+ main_config.default_groups=(char*)gtk_entry_buffer_get_text(gtk_entry_get_buffer(GTK_ENTRY(widgets->MainDefaultGroupsEntry)));
+}
+
+void on_def_user_edit(GtkCellEditable *self, main_window *widgets){
+ main_config.default_user_name=(char*)gtk_entry_buffer_get_text(gtk_entry_get_buffer(GTK_ENTRY(widgets->MainDefaultUserNameEntry)));
+
+}
+
+void on_def_admin_edit(GtkWidget *self, main_window *widgets){
+ main_config.is_1000_administrator=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->MainDefaultUserAdministratorCheck));
+
+}
+
+void on_def_password_edit(GtkCellEditable *self, main_window *widgets){
+ main_config.default_password=(char*)gtk_entry_buffer_get_text(gtk_entry_get_buffer(GTK_ENTRY(widgets->MainDefaultPasswordEntry)));
+}
+
+void on_root_password_edit(GtkCellEditable *self, main_window *widgets){
+ main_config.root_password=(char*)gtk_entry_buffer_get_text(gtk_entry_get_buffer(GTK_ENTRY(widgets->MainRootPasswordEntry)));
+
+}
+
+void on_hash_edit(GtkWidget *self, main_window *widgets){
+ main_config.hash_alg=gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->MainPasswordHashCombo));
+
+}
+
// standard functions
void config_init(){
- main_config.always_open_documentation=0;
- main_config.win_height=0;
- main_config.win_width=0;
- main_config.win_pos_x=0;
- main_config.win_pos_y=0;
- main_config.socket_id=-1;
- main_config.save_socket_id=-1;
- main_config.load_socket_id=-1;
- main_config.lock_help=0;
- main_config.lock_help=0;
- main_config.lock_load_global=0;
- main_config.lock_save_global=0;
- main_config.lock_save_local=0;
+ main_config.always_open_documentation = 0;
+ main_config.win_height = 0;
+ main_config.win_width = 0;
+ main_config.win_pos_x = 0;
+ main_config.win_pos_y = 0;
+ main_config.socket_id = -1;
+ main_config.save_socket_id = -1;
+ main_config.load_socket_id = -1;
+ main_config.lock_help = 0;
+ main_config.lock_help = 0;
+ main_config.lock_load_global = 0;
+ main_config.lock_save_global = 0;
+ main_config.lock_save_local = 0;
+ main_config.default_groups = NULL;
+ main_config.default_groups_config = NULL;
+ main_config.default_password = NULL;
+ main_config.default_user_name = NULL;
+ main_config.is_1000_administrator=0;
+ main_config.hash_alg=0;
+ main_config.root_password=NULL;
}
main_window *setup_window(){
@@ -199,6 +394,16 @@ main_window *setup_window(){
widgets->MainDeleteUserButton = yon_gtk_builder_get_widget(builder,"MainDeleteUserButton");
widgets->MainEditGroupsButton = yon_gtk_builder_get_widget(builder,"MainEditGroupsButton");
+
+ widgets->MainDefaultGroupsEntry = yon_gtk_builder_get_widget(builder,"mainDefaultGroupsEntry");
+ widgets->MainDefaultUserNameEntry = yon_gtk_builder_get_widget(builder,"mainDefaultUserNameEntry");
+ widgets->MainDefaultUserAdministratorCheck = yon_gtk_builder_get_widget(builder,"mainDefaultUserAdministratorCheck");
+ widgets->MainDefaultPasswordEntry = yon_gtk_builder_get_widget(builder,"mainDefaultPasswordEntry");
+ widgets->MainRootPasswordEntry = yon_gtk_builder_get_widget(builder,"mainRootPasswordEntry");
+ widgets->MainUserTree = yon_gtk_builder_get_widget(builder,"mainUserTree");
+ widgets->MainPasswordHashCombo = yon_gtk_builder_get_widget(builder,"mainPasswordHashCombo");
+
+ main_config.usersListStore = GTK_LIST_STORE(gtk_builder_get_object(builder,"UserList"));
if (main_config.lock_load_global == 1){
@@ -217,10 +422,16 @@ main_window *setup_window(){
g_signal_connect(G_OBJECT(widgets->Window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),WIKI_LINK);
g_signal_connect(G_OBJECT(widgets->AboutMenuItem),"activate",G_CALLBACK(on_about),NULL);
- g_signal_connect(G_OBJECT(widgets->MainAddUserButton),"clicked",G_CALLBACK(on_user_add),NULL);
+ g_signal_connect(G_OBJECT(widgets->MainAddUserButton),"clicked",G_CALLBACK(on_user_add),widgets);
g_signal_connect(G_OBJECT(widgets->MainEditUserButton),"clicked",G_CALLBACK(on_user_edit),NULL);
g_signal_connect(G_OBJECT(widgets->MainDeleteUserButton),"clicked",G_CALLBACK(on_user_delete),NULL);
- g_signal_connect(G_OBJECT(widgets->MainEditGroupsButton),"clicked",G_CALLBACK(on_groups_open),NULL);
+ g_signal_connect(G_OBJECT(widgets->MainEditGroupsButton),"clicked",G_CALLBACK(on_def_groups_open),widgets);
+ g_signal_connect(G_OBJECT(widgets->MainDefaultGroupsEntry),"changed",G_CALLBACK(on_def_groups_edit),widgets);
+ g_signal_connect(G_OBJECT(widgets->MainDefaultUserNameEntry),"changed",G_CALLBACK(on_def_user_edit),widgets);
+ g_signal_connect(G_OBJECT(widgets->MainDefaultUserAdministratorCheck),"toggled",G_CALLBACK(on_def_admin_edit),widgets);
+ g_signal_connect(G_OBJECT(widgets->MainDefaultPasswordEntry),"changed",G_CALLBACK(on_def_password_edit),widgets);
+ g_signal_connect(G_OBJECT(widgets->MainRootPasswordEntry),"changed",G_CALLBACK(on_root_password_edit),widgets);
+ g_signal_connect(G_OBJECT(widgets->MainPasswordHashCombo),"changed",G_CALLBACK(on_hash_edit),widgets);
gtk_widget_show(widgets->Window);
@@ -311,7 +522,7 @@ int main(int argc, char *argv[]){
if (getuid()!=0)
yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
else
- yon_ubl_status_box_render(TITLE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
+ yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
yon_ubl_setup_sockets(widgets->PlugBox,widgets->LeftBox,widgets->RightBox,main_config.socket_id,main_config.load_socket_id,main_config.save_socket_id);
yon_window_config_setup(GTK_WINDOW(widgets->Window));
yon_window_config_load(config_path);
diff --git a/source/ubl-settings-usergroups.h b/source/ubl-settings-usergroups.h
index afd0497..c13f3c0 100644
--- a/source/ubl-settings-usergroups.h
+++ b/source/ubl-settings-usergroups.h
@@ -8,7 +8,7 @@
#include
#include
#include
-#include "ubl-cmake.h"
+#include "../compile/ubl-cmake.h"
#ifdef WEBKIT_FOUND
#include
#endif
@@ -49,7 +49,17 @@ typedef struct {
int lock_save_local;
int lock_save_global;
int lock_load_global;
-} config;
+
+ // Custom
+ char *default_groups;
+ char *default_user_name;
+ char *default_password;
+ char *root_password;
+ int hash_alg;
+ gboolean is_1000_administrator;
+ struct groups_config *default_groups_config;
+ GtkListStore *usersListStore;
+ } config;
typedef struct {
GtkWidget *Window;
@@ -79,17 +89,39 @@ typedef struct {
GtkWidget *DocumentationMenuItem;
GtkWidget *AboutMenuItem;
-
+ // Custom
GtkWidget *MainAddUserButton;
GtkWidget *MainEditUserButton;
GtkWidget *MainDeleteUserButton;
GtkWidget *MainEditGroupsButton;
+ GtkWidget *MainDefaultGroupsEntry;
+ GtkWidget *MainDefaultUserNameEntry;
+ GtkWidget *MainDefaultUserAdministratorCheck;
+ GtkWidget *MainDefaultPasswordEntry;
+ GtkWidget *MainRootPasswordEntry;
+ GtkWidget *MainPasswordHashCombo;
+ GtkWidget *MainUserTree;
} main_window;
+typedef struct {
+ gboolean adm;
+ gboolean audio;
+ gboolean autologin;
+ gboolean avahi;
+ gboolean bin;
+ gboolean brlapi;
+ gboolean britty;
+ gboolean bumblbee;
+ gboolean chrony;
+ gboolean clamav;
+ gboolean cockpit_ws;
+ gboolean cockpit_wsinstance;
+ gboolean colord;
+} groups_config;
typedef struct {
GtkWidget *Window;
@@ -107,13 +139,52 @@ typedef struct {
GtkWidget *Window;
GtkWidget *GroupsCancelButton;
GtkWidget *GroupsOkButton;
+
+ GtkWidget *GroupsAdmCheck;
+ GtkWidget *GroupsAudioCheck;
+ GtkWidget *GroupsAutologinCheck;
+ GtkWidget *GroupsAvahiCheck;
+ GtkWidget *GroupsBinCheck;
+ GtkWidget *GroupsBrlapiCheck;
+ GtkWidget *GroupsBrittyCheck;
+ GtkWidget *GroupsBumblbeeCheck;
+ GtkWidget *GroupsChronyCheck;
+ GtkWidget *GroupsClamavCheck;
+ GtkWidget *GroupsCockpitWsCheck;
+ GtkWidget *GroupsCockpitWsinstanceCheck;
+ GtkWidget *GroupsColordCheck;
} groups_window;
+typedef struct {
+ int uid;
+ gboolean uid_default;
+ char *username;
+ char *login;
+ char *password;
+ gboolean password_default;
+ char *main_group;
+ struct groups_config *additional_groups;
+ int password_hash;
+ gboolean sync_SAMBA;
+ char *extra_options;
+} user_config;
+
typedef struct {
GtkWidget *Window;
GtkWidget *UserAdditionalGroupsButton;
GtkWidget *UserCancelButton;
GtkWidget *UserOkButton;
+
+ GtkWidget *UserUIDAutoCheck;
+ GtkWidget *UserUIDEntry;
+ GtkWidget *userUserNameEntry;
+ GtkWidget *userLoginEntry;
+ GtkWidget *userPasswordDefaultCheck;
+ GtkWidget *userPasswordEntry;
+ GtkWidget *userGroupsEntry;
+ GtkWidget *userPasswordHashAlgorithmCombo;
+ GtkWidget *userSyncSAMBACheck;
+ GtkWidget *userExtraOptionsEntry;
} user_window;
main_window *setup_window();
\ No newline at end of file
diff --git a/source/ubl-utils.c b/source/ubl-utils.c
index 341e091..7358272 100644
--- a/source/ubl-utils.c
+++ b/source/ubl-utils.c
@@ -733,9 +733,18 @@ int yon_ubl_check_root(){
}
char *yon_ubl_root_user_get(){
+ char *user=NULL;
if (yon_ubl_check_root()){
- char *user=getenv("SUDO_USER");
- return user;
+ user=getenv("SUDO_USER");
+ if (user&&strcmp(user,"")!=0){
+ return user;
+ }else {
+ FILE *file = popen(get_pkexec_user_command,"r");
+ user=g_malloc0(4096);
+ fgets(user,4096,file);
+ user=yon_char_divide_search(user,"\n",-1);
+ if (user) return user;
+ }
}
return getlogin();
}
@@ -1352,7 +1361,6 @@ void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *end
int max=0;
max=gtk_window_is_maximized(__yon_window_config_target_window);
if(max==0){
- printf("resized\n");
gtk_window_get_size(__yon_window_config_target_window,&__yon_main_window_config.width,&__yon_main_window_config.height);
gtk_window_get_position(__yon_window_config_target_window,&__yon_main_window_config.x,&__yon_main_window_config.y);
}
diff --git a/source/ubl-utils.h b/source/ubl-utils.h
index 8bc463d..01281cd 100644
--- a/source/ubl-utils.h
+++ b/source/ubl-utils.h
@@ -13,7 +13,7 @@
#include
#include
-#include "ubl-cmake.h"
+#include "../compile/ubl-cmake.h"
#ifdef WEBKIT_FOUND
#include
#endif
@@ -24,6 +24,7 @@
#define new(type) malloc(sizeof(type))
#define new_arr(type,size) malloc(sizeof(type)*size)
+#define get_pkexec_user_command "getent passwd $PKEXEC_UID | cut -d: -f1"
typedef enum
{
diff --git a/ubl-settings-usergroups b/ubl-settings-usergroups
deleted file mode 100755
index 1e09c33..0000000
Binary files a/ubl-settings-usergroups and /dev/null differ
diff --git a/ubl-settings-usergroups-group.glade b/ubl-settings-usergroups-group.glade
index a9467bf..ac621cb 100644
--- a/ubl-settings-usergroups-group.glade
+++ b/ubl-settings-usergroups-group.glade
@@ -35,7 +35,7 @@
False
vertical
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -662,7 +668,7 @@ translated and supported by community.
-
-
-
-
-
-
@@ -904,6 +917,9 @@ translated and supported by community.
Password
+
+ 3
+
@@ -912,6 +928,9 @@ translated and supported by community.
User name
+
+ 5
+