Applications
/
ubl-settings-usergroups
10
0
Fork 1
Code Issues 7 Pull Requests 1 Packages Projects Releases Wiki Activity

Template update

Browse Source
pull/4/head
Ivan Dmitrievich Yartsev 2 years ago
parent 245adec06f
commit 9be8b14c1f
11 changed files with 1483 additions and 134 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -1,5 +1,5 @@
.vscode/
ubl-settings-TEMPLATE
ubl-settings-usergroups
*~
build/
compile/

12
com.ublinux.ubl-settings-usergroups.policy
Unescape View File

@ -7,17 +7,17 @@
<vendor>UBLinux</vendor>
<vendor_url>https://ublinux.ru</vendor_url>
<action id="com.ublinux.ubl-ubl-settings-usergroups.run">
<description>Run ubl-ubl-settings-usergroups as root</description>
<description xml:lang="ru">Запуск утилиты ubl-ubl-settings-usergroups с правами root</description>
<message>Authentication is required to run ubl-ubl-settings-usergroups</message>
<message xml:lang="ru">Требуется авторизация для запуска утилиты ubl-ubl-settings-usergroups с правами root</message>
<action id="com.ublinux.ubl-settings-usergroups.run">
<description>Run ubl-settings-usergroups as root</description>
<description xml:lang="ru">Запуск утилиты ubl-settings-usergroups с правами root</description>
<message>Authentication is required to run ubl-settings-usergroups</message>
<message xml:lang="ru">Требуется авторизация для запуска утилиты ubl-settings-usergroups с правами root</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
<allow_active>auth_admin</allow_active>
</defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ubl-ubl-settings-usergroups</annotate>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ubl-settings-usergroups</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>

1125
com.ublinux.ubl-settings-usergroups.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 210 KiB

After

Width:  |  Height:  |  Size: 245 KiB

227
source/ubl-settings-usergroups.c
Unescape View File

@ -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,6 +304,34 @@ 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(){
@ -160,6 +348,13 @@ void config_init(){
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(){
@ -200,6 +395,16 @@ main_window *setup_window(){
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){
gtk_widget_set_sensitive(widgets->LoadGlobalMenuItem,0);
@ -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);

77
source/ubl-settings-usergroups.h
Unescape View File

@ -8,7 +8,7 @@
#include <libintl.h>
#include <getopt.h>
#include <libintl.h>
#include "ubl-cmake.h"
#include "../compile/ubl-cmake.h"
#ifdef WEBKIT_FOUND
#include <webkit2/webkit2.h>
#endif
@ -30,7 +30,7 @@
#define LocalePath "/usr/share/locale"
#define LocaleName "ubl-settings-usergroups"
typedef char* string;
string version_application;
string version_application="";
char *local;
@ -49,6 +49,16 @@ typedef struct {
int lock_save_local;
int lock_save_global;
int lock_load_global;
// 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 {
@ -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();

12
source/ubl-utils.c
Unescape View File

@ -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");
user=getenv("SUDO_USER");
if (user&&strcmp(user,"")!=0){
return user;
}else {
FILE *file = popen("getent passwd $PKEXEC_UID | cut -d: -f1","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);
}

2
source/ubl-utils.h
Unescape View File

@ -13,7 +13,7 @@
#include <gtk/gtk.h>
#include <gtk/gtkx.h>
#include "ubl-cmake.h"
#include "../compile/ubl-cmake.h"
#ifdef WEBKIT_FOUND
#include <webkit2/webkit2.h>
#endif

BIN
ubl-settings-usergroups
View File

Binary file not shown.

29
ubl-settings-usergroups-group.glade
Unescape View File

@ -35,7 +35,7 @@
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsAdmGroupCheck">
<property name="label" translatable="yes">adm</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -49,7 +49,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsAudioGroupCheck">
<property name="label" translatable="yes">audio</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -63,7 +63,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsAutologinGroupCheck">
<property name="label" translatable="yes">autologin</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -77,7 +77,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsAvahiGroupCheck">
<property name="label" translatable="yes">avahi</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -91,7 +91,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsBinGroupCheck">
<property name="label" translatable="yes">bin</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -105,7 +105,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsBrlapiGroupCheck">
<property name="label" translatable="yes">brlapi</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -119,7 +119,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsBrittyGroupCheck">
<property name="label" translatable="yes">britty</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -133,7 +133,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsBumblbeeGroupCheck">
<property name="label" translatable="yes">bumblbee</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -147,7 +147,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsChronyGroupCheck">
<property name="label" translatable="yes">chrony</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -161,7 +161,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsClamavGroupCheck">
<property name="label" translatable="yes">clamav</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -175,7 +175,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsCockpitWsGroupCheck">
<property name="label" translatable="yes">cockpit-ws</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -189,7 +189,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsCockpitWsinstanceGroupCheck">
<property name="label" translatable="yes">cockpit-wsinstance</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -203,7 +203,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="groupsColordGroupCheck">
<property name="label" translatable="yes">colord</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -276,8 +276,9 @@
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="show-close-button">True</property>
<child type="title">
<object class="GtkLabel" id="webHeaderNameLabel1">
<object class="GtkLabel" id="groupsTitleLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Users and groups</property>

58
ubl-settings-usergroups-user.glade
Unescape View File

@ -55,16 +55,32 @@
</packing>
</child>
<child>
<object class="GtkEntry">
<object class="GtkCheckButton" id="userUIDAutoCheck">
<property name="label" translatable="yes">Automatically</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="userUIDEntry">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="placeholder-text" translatable="yes">1001</property>
<property name="input-purpose">number</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
@ -91,9 +107,10 @@
</packing>
</child>
<child>
<object class="GtkEntry">
<object class="GtkEntry" id="userUserNameEntry">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="placeholder-text" translatable="yes">username</property>
</object>
<packing>
<property name="expand">True</property>
@ -127,9 +144,10 @@
</packing>
</child>
<child>
<object class="GtkEntry">
<object class="GtkEntry" id="userLoginEntry">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="placeholder-text" translatable="yes">login</property>
</object>
<packing>
<property name="expand">True</property>
@ -163,7 +181,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="userPasswordDefaultCheck">
<property name="label" translatable="yes">Default</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -177,9 +195,15 @@
</packing>
</child>
<child>
<object class="GtkEntry">
<object class="GtkEntry" id="userPasswordEntry">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="visibility">False</property>
<property name="invisible-char">*</property>
<property name="secondary-icon-activatable">False</property>
<property name="secondary-icon-sensitive">False</property>
<property name="placeholder-text" translatable="yes">******</property>
<property name="input-purpose">password</property>
</object>
<packing>
<property name="expand">True</property>
@ -213,7 +237,7 @@
</packing>
</child>
<child>
<object class="GtkEntry">
<object class="GtkEntry" id="userGroupsEntry">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
@ -262,9 +286,10 @@
</packing>
</child>
<child>
<object class="GtkComboBoxText">
<object class="GtkComboBoxText" id="userPasswordHashAlgorithmCombo">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">sha256</item>
<item translatable="yes">AIX md5</item>
@ -286,7 +311,7 @@
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="userSyncSAMBACheck">
<property name="label" translatable="yes">Sync with SAMBA user</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -318,7 +343,7 @@
</packing>
</child>
<child>
<object class="GtkEntry">
<object class="GtkEntry" id="userExtraOptionsEntry">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
@ -396,8 +421,9 @@
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="show-close-button">True</property>
<child type="title">
<object class="GtkLabel" id="webHeaderNameLabel2">
<object class="GtkLabel" id="userTitleNameLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Users and groups</property>
@ -409,4 +435,14 @@
</object>
</child>
</object>
<object class="GtkSizeGroup">
<widgets>
<widget name="label1"/>
<widget name="label2"/>
<widget name="label3"/>
<widget name="label4"/>
<widget name="label5"/>
<widget name="label7"/>
</widgets>
</object>
</interface>

41
ubl-settings-usergroups.glade
Unescape View File

@ -200,13 +200,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</object>
<object class="GtkListStore" id="UserList">
<columns>
<!-- column-name gint1 -->
<!-- column-name uid -->
<column type="gint"/>
<!-- column-name gchararray1 -->
<!-- column-name uid_auto -->
<column type="gint"/>
<!-- column-name login -->
<column type="gchararray"/>
<!-- column-name password -->
<column type="gchararray"/>
<!-- column-name gchararray2 -->
<!-- column-name password_auto -->
<column type="gint"/>
<!-- column-name username -->
<column type="gchararray"/>
<!-- column-name gchararray3 -->
<!-- column-name groups -->
<column type="gchararray"/>
</columns>
</object>
@ -662,7 +668,7 @@ translated and supported by community.</property>
</packing>
</child>
<child>
<object class="GtkEntry">
<object class="GtkEntry" id="mainDefaultGroupsEntry">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
@ -712,7 +718,7 @@ translated and supported by community.</property>
</packing>
</child>
<child>
<object class="GtkEntry">
<object class="GtkEntry" id="mainDefaultUserNameEntry">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
@ -730,7 +736,7 @@ translated and supported by community.</property>
</packing>
</child>
<child>
<object class="GtkCheckButton">
<object class="GtkCheckButton" id="mainDefaultUserAdministratorCheck">
<property name="label" translatable="yes">User with ID 1000 is administrator</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -763,7 +769,7 @@ translated and supported by community.</property>
</packing>
</child>
<child>
<object class="GtkEntry">
<object class="GtkEntry" id="mainDefaultPasswordEntry">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="max-length">30</property>
@ -778,7 +784,7 @@ translated and supported by community.</property>
</packing>
</child>
<child>
<object class="GtkEntry">
<object class="GtkEntry" id="mainRootPasswordEntry">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="halign">end</property>
@ -834,9 +840,10 @@ translated and supported by community.</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText">
<object class="GtkComboBoxText" id="mainPasswordHashCombo">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
<item translatable="yes">sha256</item>
<item translatable="yes">AIX md5</item>
@ -876,7 +883,7 @@ translated and supported by community.</property>
<property name="hscrollbar-policy">external</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkTreeView">
<object class="GtkTreeView" id="mainUserTree">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="model">UserList</property>
@ -888,6 +895,9 @@ translated and supported by community.</property>
<property name="title" translatable="yes">UID</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
</child>
@ -896,6 +906,9 @@ translated and supported by community.</property>
<property name="title" translatable="yes">Login</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">2</attribute>
</attributes>
</child>
</object>
</child>
@ -904,6 +917,9 @@ translated and supported by community.</property>
<property name="title" translatable="yes">Password</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
@ -912,6 +928,9 @@ translated and supported by community.</property>
<property name="title" translatable="yes">User name</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">5</attribute>
</attributes>
</child>
</object>
</child>

Write Preview
Loading…
Cancel
Save