Applications
/
ubinstall-gtk
10
0
Fork 1
Code Issues 17 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request 'fixed localisation' (#80) from YanTheKaller/ubinstall-gtk:master into master

Browse Source 
Reviewed-on: #80
master v1.22
Dmitry Razumov 1 year ago
parent 4177df413f 19c97f4cce
commit 6c2d0b6355
4 changed files with 67 additions and 32 deletions
Show Stats Download Patch File Download Diff File

36
source/ubinstall-gtk.c
Unescape View File

@ -854,8 +854,33 @@ void config_init(){
main_config.exit_accepted=0; main_config.exit_accepted=0;
} }
void on_configuration_mode_switch(GtkWidget *self); void on_root_get_root(char *argline);
void on_configuration_mode_switch(GtkWidget *self){ void on_root_get_root(char *argline){
yon_launch(argline);
}
void on_configuration_mode_switch(GtkWidget *self,main_window *widgets);
void on_configuration_mode_switch(GtkWidget *self,main_window *widgets){
if (getuid()) {
if (main_config.configure_mode==1){
char *argline = LocaleName;
for (int i=1;i<main_config.arg_size;i++){
if (!strcmp(main_config.arg_target[i],"socket-id")||!strcmp(main_config.arg_target[i],"socket-ext-id")||!strcmp(main_config.arg_target[i],"socket-trd-id")){ i++;
continue;
}
char *temp = yon_char_unite(argline," ", main_config.arg_target[i],NULL);
if(strcmp(argline,"")&&strcmp(argline,LocaleName))
free(argline);
argline=temp;
}
if (getuid()!=0){
argline = yon_char_unite("setsid /usr/bin/bash -c 'pkexec ",argline,"'; exit",NULL);
pthread_t thread_id;
pthread_create(&thread_id, NULL, (void *)on_root_get_root,argline);
gtk_widget_destroy(widgets->MainWindow);
}
}
}
main_config.configure_mode = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(self)); main_config.configure_mode = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(self));
} }
@ -2554,6 +2579,8 @@ main_window *yon_main_window_complete(){
g_signal_connect(G_OBJECT(widgets->AdminPasswordCombo),"changed",G_CALLBACK(yon_password_combo_set_sensitive),widgets); g_signal_connect(G_OBJECT(widgets->AdminPasswordCombo),"changed",G_CALLBACK(yon_password_combo_set_sensitive),widgets);
g_signal_connect(G_OBJECT(widgets->RootPasswordSensitiveCheck),"toggled",G_CALLBACK(yon_password_set_sensitive_from_toggle),widgets); g_signal_connect(G_OBJECT(widgets->RootPasswordSensitiveCheck),"toggled",G_CALLBACK(yon_password_set_sensitive_from_toggle),widgets);
g_signal_connect(G_OBJECT(widgets->PasswordSensitiveCheck),"toggled",G_CALLBACK(yon_password_set_sensitive_from_toggle),widgets); g_signal_connect(G_OBJECT(widgets->PasswordSensitiveCheck),"toggled",G_CALLBACK(yon_password_set_sensitive_from_toggle),widgets);
yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(widgets->PasswordEntry));
yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(widgets->AdminPasswordEntry));
if (main_config.lock_load_global == 1){ if (main_config.lock_load_global == 1){
gtk_widget_set_sensitive(widgets->LoadGlobalConfigurationMenuItem,0); gtk_widget_set_sensitive(widgets->LoadGlobalConfigurationMenuItem,0);
@ -2566,6 +2593,9 @@ main_window *yon_main_window_complete(){
gtk_widget_set_sensitive(widgets->SaveLocalConfigurationMenuItem,0); gtk_widget_set_sensitive(widgets->SaveLocalConfigurationMenuItem,0);
gtk_widget_set_sensitive(widgets->SaveGlobalLocalConfigurationMenuItem,0); gtk_widget_set_sensitive(widgets->SaveGlobalLocalConfigurationMenuItem,0);
} }
if (getuid()){
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widgets->ConfigurationModeMenuItem),1);
}
gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(widgets->LanguagesFilter),0); gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(widgets->LanguagesFilter),0);
gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(widgets->LanguagesFilter)); gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(widgets->LanguagesFilter));
@ -2792,6 +2822,8 @@ int main(int argc, char *argv[]){
exit(0); exit(0);
} }
} }
main_config.arg_size=argc;
main_config.arg_target=argv;
if (getuid()!=0){ if (getuid()!=0){
main_config.lock_load_global=1; main_config.lock_load_global=1;

15
source/ubinstall-gtk.h
Unescape View File

@ -35,9 +35,9 @@
#define LocalePath "/usr/share/locale" #define LocalePath "/usr/share/locale"
#define LocaleName "ubinstall-gtk" #define LocaleName "ubinstall-gtk"
#define clear_config_both_command "pkexec bash -c 'ubconfig remove TEMP_SECTION TEMP_PATAMETER '" #define clear_config_both_command "ubconfig remove TEMP_SECTION TEMP_PATAMETER"
#define clear_config_global_command "pkexec bash -c 'ubconfig --target global remove TEMP_SECTION TEMP_PATAMETER '" #define clear_config_global_command "ubconfig --target global remove TEMP_SECTION TEMP_PATAMETER"
#define clear_config_local_command "pkexec bash -c 'ubconfig --target system remove TEMP_SECTION TEMP_PATAMETER '" #define clear_config_local_command "ubconfig --target system remove TEMP_SECTION TEMP_PATAMETER"
#define regions_path "/com/ublinux/images/map-time-zone.png" #define regions_path "/com/ublinux/images/map-time-zone.png"
#define keyboard_path "/com/ublinux/images/keyboard.png" #define keyboard_path "/com/ublinux/images/keyboard.png"
@ -119,10 +119,10 @@ NULL
#define part_type_parameter "AUTOINSTALL[part_fs_type]" #define part_type_parameter "AUTOINSTALL[part_fs_type]"
#define part_type_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[part_fs_type]" #define part_type_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[part_fs_type]"
#define save_config_command(parameters) yon_char_unite("pkexec bash -c 'ubconfig --target system set [autoinstall] AUTOINSTALL[log]=yes ",parameters, "; nice ubinstall2 --debug autoinstall'", NULL) #define save_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] AUTOINSTALL[log]=yes ",parameters, "; nice ubinstall2 --debug autoinstall", NULL)
#define set_user_config_command(parameters) yon_char_unite("pkexec bash -c 'ubconfig --target system set [autoinstall] ",parameters,";nice ubinstall2 autoconfig'",NULL) #define set_user_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] ",parameters,";nice ubinstall2 autoconfig",NULL)
#define save_additional_config_command(parameters) yon_char_unite("pkexec bash -c 'ubconfig --target system set [autoinstall] ",parameters,"'",NULL) #define save_additional_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] ",parameters,NULL)
#define open_gparted_command "gparted" #define open_gparted_command "gparted"
@ -215,6 +215,9 @@ typedef struct {
int exit_accepted; int exit_accepted;
GMutex progress_mutex; GMutex progress_mutex;
GMutex install_mutex; GMutex install_mutex;
int arg_size;
config_str arg_target;
} config; } config;
typedef struct { typedef struct {

32
ubinstall-gtk.glade
Unescape View File

@ -2337,7 +2337,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Administrator name:</property> <property name="label" translatable="yes">Account name:</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
</child> </child>
@ -2385,7 +2385,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Administrator login:</property> <property name="label" translatable="yes">Login:</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
</child> </child>
@ -2432,7 +2432,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Administrator password:</property> <property name="label" translatable="yes">Password:</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
</child> </child>
@ -2543,7 +2543,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">User root password:</property> <property name="label" translatable="yes">Administrator password (root):</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
</child> </child>
@ -3090,14 +3090,14 @@ or continue working in the UBLinux Live environment.</property>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
@ -3497,14 +3497,14 @@ installed.</property>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
@ -3601,14 +3601,14 @@ installed.</property>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
@ -3683,7 +3683,7 @@ installed.</property>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
@ -4097,14 +4097,14 @@ installed.</property>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
@ -4201,21 +4201,21 @@ installed.</property>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>

16
ubinstall-gtk_ru.po
Unescape View File

@ -219,16 +219,16 @@ msgid "Define"
msgstr "Задать" msgstr "Задать"
#: source/ubl-strings.h:41 #: source/ubl-strings.h:41
msgid "Administrator name:" msgid "Account name:"
msgstr "Имя администратора:" msgstr "Имя Вашей учётной записи:"
#: source/ubl-strings.h:42 #: source/ubl-strings.h:42
msgid "Administrator login:" msgid "Login:"
msgstr "Логин администратора:" msgstr "Логин для входа в систему:"
#: source/ubl-strings.h:43 #: source/ubl-strings.h:43
msgid "Administrator password:" msgid "Password:"
msgstr "Пароль администратора:" msgstr "Пароль:"
#: source/ubl-strings.h:44 #: source/ubl-strings.h:44
msgid "Default" msgid "Default"
@ -247,8 +247,8 @@ msgid "Automatic login without password prompt"
msgstr "Автоматический вход в систему без запроса пароля" msgstr "Автоматический вход в систему без запроса пароля"
#: source/ubl-strings.h:48 #: source/ubl-strings.h:48
msgid "User root password:" msgid "Administrator password (root):"
msgstr "Пароль пользователя root:" msgstr "Пароль администратора (root):"
#: source/ubl-strings.h:49 #: source/ubl-strings.h:49
msgid "Host name:" msgid "Host name:"

Write Preview
Loading…
Cancel
Save