master #34

Merged
asmeron merged 10 commits from YanTheKaller/ubinstall-gtk:master into master 2 years ago

@ -12,8 +12,54 @@ void on_autohostname_check(GtkWidget *, main_window *widgets){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->HostnameSensitiveCheck),1);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->AutoHostnameCheck))){
gtk_widget_set_sensitive(widgets->HotnameEntry,0);
gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->HotnameEntry),"auto");
}else{
gtk_widget_set_sensitive(widgets->HotnameEntry,1);
gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->HotnameEntry),"ublinux-install");
}
}
void yon_password_set_sensitive_from_toggle(GtkWidget *self, main_window *widgets);
void yon_password_set_sensitive_from_toggle(GtkWidget *self, main_window *widgets){
GtkWidget *combo = NULL;
GtkWidget *entry = NULL;
if (self == widgets->PasswordSensitiveCheck){
combo = widgets->PasswordCombo;
entry = widgets->PasswordEntry;
} else {
combo = widgets->AdminPasswordCombo;
entry = widgets->AdminPasswordEntry;
}
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self))){
gtk_widget_set_sensitive(combo,1);
if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo))){
gtk_widget_set_sensitive(entry,1);
} else {
gtk_widget_set_sensitive(entry,0);
}
} else {
gtk_widget_set_sensitive(combo,0);
gtk_widget_set_sensitive(entry,0);
}
}
void yon_password_combo_set_sensitive(GtkWidget *self, main_window *widgets);
void yon_password_combo_set_sensitive(GtkWidget *self, main_window *widgets){
GtkWidget *entry = NULL;
GtkWidget *toggle = NULL;
if (self == widgets->PasswordCombo){
entry = widgets->PasswordEntry;
toggle = widgets->PasswordSensitiveCheck;
} else if (self == widgets->AdminPasswordCombo){
entry = widgets->AdminPasswordEntry;
toggle = widgets->RootPasswordSensitiveCheck;
}
if (gtk_combo_box_get_active(GTK_COMBO_BOX(self))&&gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle))){
gtk_widget_set_sensitive(entry,1);
} else {
gtk_widget_set_sensitive(entry,0);
}
}
@ -321,22 +367,19 @@ void yon_interface_update(main_window *widgets){
if (!yon_char_is_empty(region)){
gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->RegionCombo),region);
} else {
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->RegionCombo),0);
gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->RegionCombo),"Europe");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RegionSensitiveCheck),0);
}
if (!yon_char_is_empty(zone)){
gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->ZoneCombo),zone);
} else {
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ZoneCombo),0);
gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->ZoneCombo),"Moscow");
}
char *language = config(lang_parameter);
if (!yon_char_is_empty(language)){
int feasf = gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->LanguageCombo),language);
if (feasf){
printf("fsa\n");
};
gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->LanguageCombo),language);
} else {
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LanguageCombo),0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->MainLanguageSensitiveCheck),0);
@ -375,8 +418,14 @@ void yon_interface_update(main_window *widgets){
}
} else {
for_iter(widgets->LayoutList,&iter){
char *id;
gtk_tree_model_get(GTK_TREE_MODEL(widgets->LayoutList),&iter,0,&id,-1);
if (!strcmp(id,"ru")||!strcmp(id,"us")){
gtk_tree_store_set(widgets->LayoutList,&iter,3,1,-1);
} else {
gtk_tree_store_set((widgets->LayoutList),&iter,3,0,-1);
}
}
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LayoutSensitiveCheck),0);
}
@ -700,7 +749,7 @@ void on_language_window_accept(GtkWidget *,dictionary *dict){
if (status)
yon_char_parsed_add_or_create_if_exists(parsed,&size,current);
}
char *final = yon_char_parsed_to_string(parsed,size,", ");
char *final = yon_char_parsed_to_string(parsed,size,"; ");
gtk_entry_set_text(GTK_ENTRY(widgets->AvailableLanguagesEntry),final);
free(final);
yon_char_parsed_free(parsed,size);
@ -778,31 +827,37 @@ void on_configuration_mode_switch(GtkWidget *self){
main_config.configure_mode = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(self));
}
int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled);
int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled){
int cur_slide=0;
int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled);
int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled) {
int width = gtk_widget_get_allocated_width(gtk_widget_get_parent(gtk_widget_get_parent(GTK_WIDGET(target))));
int height = gtk_widget_get_allocated_height(gtk_widget_get_parent(gtk_widget_get_parent(GTK_WIDGET(target))));
yon_debug_output("width: %s\n",yon_char_from_int(width));
yon_debug_output("height: %s\n\n",yon_char_from_int(height));
int newImgWidthDef = (width <= 217) ? width : width - 30;
int newImgHeightDef = (height <= 120) ? height : height - 217;
GdkPixbuf *pixBuf = pixbuf_unscaled;
int newImgHeight = (int)(gdk_pixbuf_get_height(pixBuf) / ((double) gdk_pixbuf_get_width(pixBuf) / newImgWidthDef));
int originalWidth = gdk_pixbuf_get_width(pixbuf_unscaled);
int originalHeight = gdk_pixbuf_get_height(pixbuf_unscaled);
int newImgHeight = (int)(originalHeight / ((double) originalWidth / newImgWidthDef));
if (newImgHeight > newImgHeightDef) {
newImgHeight = newImgHeightDef;
newImgWidthDef = newImgWidthDef;
newImgWidthDef = (int)(originalWidth / ((double) originalHeight / newImgHeight));
}
int newImageWidth = (int)(gdk_pixbuf_get_width(pixBuf) / ((double) gdk_pixbuf_get_height(pixBuf) / newImgHeight));
GdkPixbuf *scaledPixBuf = gdk_pixbuf_scale_simple(pixBuf, abs(newImageWidth), abs(newImgHeight), GDK_INTERP_BILINEAR);
int newImageWidth = (int)(originalWidth / ((double) originalHeight / newImgHeight));
GdkPixbuf *scaledPixBuf = gdk_pixbuf_scale_simple(pixbuf_unscaled, newImageWidth, newImgHeight, GDK_INTERP_BILINEAR);
gtk_image_set_from_pixbuf(target, scaledPixBuf);
g_object_unref(scaledPixBuf); // Освобождаем память, занятую скалированным изображением
return 1;
}
void on_region_resized(GtkWidget *,main_window *widgets);
void on_region_resized(GtkWidget *,main_window *widgets){
yon_image_resize_from_container(GTK_IMAGE(widgets->SlidesImage), widgets->slides_original);
yon_image_resize_from_container(GTK_IMAGE(widgets->SlidesImage), widgets->slides_original[cur_slide]);
yon_image_resize_from_container(GTK_IMAGE(widgets->RegionImage), widgets->regions_original);
yon_image_resize_from_container(GTK_IMAGE(widgets->KeyboardImage), widgets->keyboard_original);
}
@ -831,27 +886,19 @@ void yon_switch_page_render(main_window *widgets, int page){
}
}
g_list_free(list);
}
int cur_slide=0;
gboolean on_image_slide(void *data);
gboolean on_image_slide(void *data){
main_window *widgets = (main_window*)data;
int size;
config_str target = yon_char_parsed_new(&size,slide_repeat_path);
g_object_unref(widgets->slides_original);
widgets->slides_original = gdk_pixbuf_new_from_resource_at_scale(target[cur_slide],600,400,1,NULL);
if (size)
yon_char_parsed_free(target,size);
GtkWidget *parent = gtk_widget_get_parent(widgets->SlidesImage);
gtk_widget_destroy(widgets->SlidesImage);
widgets->SlidesImage = gtk_image_new();
gtk_container_add(GTK_CONTAINER(parent),widgets->SlidesImage);
gtk_widget_show(widgets->SlidesImage);
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->SlidesImage),widgets->slides_original);
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->SlidesImage),widgets->slides_original[cur_slide]);
gtk_widget_queue_draw(widgets->SlidesImage);
if (cur_slide<size-1) cur_slide++; else cur_slide=0;
if (cur_slide<size-1) cur_slide++; else cur_slide=1;
return 1;
}
@ -876,7 +923,6 @@ void *on_config_save(void *data){
yon_char_parsed_free(parameters,size);
if (system(command)){
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALL_ERROR);
// yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),INSTALLATION_ERROR,5,BACKGROUND_IMAGE_FAIL_TYPE);
};
free(command);
main_config.install_thread=NULL;
@ -888,51 +934,54 @@ void *on_config_save(void *data){
}
main_config.config_save_thread=NULL;
}
return NULL;
pthread_exit(NULL);
}
gboolean yon_installation_progress_update(void *data);
gboolean yon_installation_progress_update(void *data){
gboolean yon_installation_progress_update(void *data) {
main_window *widgets = (main_window*)data;
while (gtk_events_pending()) gtk_main_iteration();
int size;
while (main_config.log_progress_buzy){
while (gtk_events_pending()) gtk_main_iteration();};
main_config.log_progress_buzy=1;
config_str text = yon_file_open(progress_path,&size);
main_config.log_progress_buzy=0;
if (size){
if (!yon_char_is_empty(text[size-1])&&text[size-1][0]=='('){
char * current_copy = yon_char_new(text[size-1]);
char *percentage = yon_char_divide_search(current_copy,")",-1);
yon_char_parsed_free(text,size);
free(yon_char_divide(current_copy,0));
free(yon_char_divide(percentage,0));
if (strcmp(percentage,"#pb")){
while (main_config.log_progress_buzy) {
while (gtk_events_pending()) gtk_main_iteration();
}
main_config.log_progress_buzy = 1;
config_str text = yon_file_open(progress_path, &size);
main_config.log_progress_buzy = 0;
if (size) {
if (!yon_char_is_empty(text[size-1]) && text[size-1][0] == '(') {
char *current_copy = yon_char_new(text[size-1]);
char *percentage = yon_char_divide_search(current_copy, ")", -1);
yon_char_parsed_free(text, size);
if (strcmp(percentage, "#pb")) {
double fraction = atof(percentage);
gtk_label_set_text(GTK_LABEL(widgets->InstallationLabel),current_copy);
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->InstallationProgress),fraction/100);
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress),0);
gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel),"");
gtk_label_set_text(GTK_LABEL(widgets->InstallationLabel), current_copy);
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->InstallationProgress), fraction / 100);
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress), 0);
gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel), "");
} else {
gtk_widget_show(gtk_widget_get_parent(widgets->PackageInstallationProgress));
int size;
config_str parsed = yon_char_parse(current_copy,&size," ");
double fraction = atof(parsed[2])/100;
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress),fraction);
gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel),yon_char_parsed_to_string(parsed,size," "));
yon_char_parsed_free(parsed,size);
config_str parsed = yon_char_parse(current_copy, &size, " ");
if (size >= 3) {
double fraction = atof(parsed[2]) / 100;
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress), fraction);
gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel), yon_char_parsed_to_string(parsed, size, " "));
}
yon_char_parsed_free(parsed, size);
}
free(current_copy);
free(percentage);
}
}
if (main_config.install_thread){
if (main_config.install_thread) {
return 1;
} else {
gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel),"");
gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel), "");
return 0;
}
}
@ -2199,8 +2248,11 @@ main_window *yon_main_window_complete(){
g_signal_connect(G_OBJECT(widgets->HostnameSensitiveCheck),"toggled",G_CALLBACK(on_autohostname_sensitiveness_check),widgets);
g_signal_connect(G_OBJECT(widgets->AutoHostnameCheck),"toggled",G_CALLBACK(on_autohostname_check),widgets);
g_signal_connect(G_OBJECT(widgets->HotnameEntry),"changed",G_CALLBACK(on_hostname_entry_changed),widgets);
// g_signal_connect(G_OBJECT(widgets->InstallationToggle),"toggled",G_CALLBACK(on_toggle_block),widgets);
g_signal_connect(G_OBJECT(widgets->PasswordCombo),"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->PasswordSensitiveCheck),"toggled",G_CALLBACK(yon_password_set_sensitive_from_toggle),widgets);
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));
@ -2217,15 +2269,21 @@ main_window *yon_main_window_complete(){
yon_char_parsed_free(parsed,size);
}
config_str slides = yon_char_parsed_new(&size,slide_repeat_path);
widgets->regions_original = gdk_pixbuf_new_from_resource(regions_path,NULL);
widgets->keyboard_original = gdk_pixbuf_new_from_resource(keyboard_path,NULL);
widgets->slides_original = gdk_pixbuf_new_from_resource(slide_0_path,NULL);
widgets->slides_original = malloc(sizeof(GdkPixbuf*)*size);
widgets->slides_original[0] = gdk_pixbuf_new_from_resource(slide_0_path,NULL);
for (int i=1;i<size;i++){
widgets->slides_original[i] = gdk_pixbuf_new_from_resource(slides[i-1],NULL);
}
yon_char_parsed_free(slides,size);
int width = gdk_pixbuf_get_width(widgets->regions_original);
int height = gdk_pixbuf_get_height(widgets->regions_original);
widgets->region_height_mult = (float)height/width;
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->RegionImage),gdk_pixbuf_scale_simple(widgets->regions_original,600,400,GDK_INTERP_BILINEAR));
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->KeyboardImage),gdk_pixbuf_scale_simple(widgets->keyboard_original,600,400,GDK_INTERP_BILINEAR));
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->SlidesImage),gdk_pixbuf_scale_simple(widgets->slides_original,600,400,GDK_INTERP_BILINEAR));
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->SlidesImage),gdk_pixbuf_scale_simple(widgets->slides_original[0],600,400,GDK_INTERP_BILINEAR));
GtkTreeIter iter;
gtk_list_store_clear(widgets->LanguagesList);

@ -352,7 +352,7 @@ typedef struct {
GdkPixbuf *regions_original;
GdkPixbuf *keyboard_original;
GdkPixbuf *slides_original;
GdkPixbuf **slides_original;
float region_height_mult;
GtkWidget *RegionSensitiveCheck;

@ -41,15 +41,16 @@
#define LAYOUT_CHANGING_LABEL _("Layout changing:")
#define DEFAUL_LAYOUT_LABEL _("Default layout (ru)")
#define DEFINE_LABEL _("Define")
#define ACCOUNT_NAME_LABEL _("Your account name:")
#define LOGIN__LABEL _("Login:")
#define PASSWORD__LABEL _("Password")
#define SETTINGS_LABEL _("Settings")
#define ACCOUNT_NAME_LABEL _("Administrator name:")
#define LOGIN__LABEL _("Administrator login:")
#define PASSWORD__LABEL _("Administrator password:")
#define DEFAULT_LABEL _("Default")
#define SET_PASSWORD_LABEL _("Set a password")
#define DO_NOT_SET_PASSWORD_LABEL _("Do no set a password")
#define AUTOMATIC_LOGIN_LABEL _("Automatic login without password prompt")
#define ADMIN_PASSWORD_LABEL _("Administrator password (root):")
#define COMPUTER_NAME_LABEL _("Computer name:")
#define ADMIN_PASSWORD_LABEL _("User root password:")
#define COMPUTER_NAME_LABEL _("Host name:")
#define AUTOMATICALLY_LABEL _("Automatically")
#define USER_LABEL _("User")
#define COMPLETION_LABEL _("Completion")
@ -163,3 +164,5 @@
#define CONFIGURATION_SAVE_LABEL _("You can safely exit configurator or return and create new configuration file.")
#define SCROLL_TO_END_LABEL _("Scroll to the end")
#define ADMINISTRATOR_LABEL _("Administrator")
#define DEFAULT_LOCALES_LABEL _("English, U.S.A.; Russian, Russia")

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<interface>
<interface domain="ubinstall-gtk">
<requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubinstall-gtk.css -->
<object class="GtkWindow" id="MainWindow">
<property name="width-request">200</property>
<property name="height-request">400</property>

@ -123,7 +123,7 @@
<object class="GtkLabel" id="headerTopic">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Available languages in the system</property>
<property name="label" translatable="yes">Available languages in the system</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>

@ -1601,7 +1601,11 @@ and help you install UBLinux on your computer</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="RegionCombo" swapped="no"/>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="ZoneCombo" swapped="no"/>
<child>
<placeholder/>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Region:</property>
</object>
</child>
</object>
<packing>
@ -1621,24 +1625,11 @@ and help you install UBLinux on your computer</property>
<property name="can-focus">False</property>
<property name="margin-end">15</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Region:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="RegionCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<signal name="changed" handler="on_toggle_button_switch_on" object="RegionSensitiveCheck" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -1676,7 +1667,6 @@ and help you install UBLinux on your computer</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<signal name="changed" handler="on_toggle_button_switch_on" object="RegionSensitiveCheck" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -1729,26 +1719,18 @@ and help you install UBLinux on your computer</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="AvailableLanguagesButton" swapped="no"/>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="AvailableLanguagesEntry" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Available languages in the system:</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -1756,6 +1738,7 @@ and help you install UBLinux on your computer</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="placeholder-text" translatable="yes">English, U.S.A.; Russian, Russia</property>
<signal name="changed" handler="on_toggle_button_switch_on" object="LanguagesSensitiveCheck" swapped="no"/>
</object>
<packing>
@ -1800,26 +1783,18 @@ and help you install UBLinux on your computer</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="LanguagesCombo" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Language:</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -1937,26 +1912,18 @@ and help you install UBLinux on your computer</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="KeyboardModelCombo" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Keyboard model:</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -1995,26 +1962,18 @@ and help you install UBLinux on your computer</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="LayoutBindingCombo" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Layout changing:</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -2296,7 +2255,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">User</property>
<property name="label" translatable="yes">Settings</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="scale" value="1"/>
@ -2350,27 +2309,19 @@ and help you install UBLinux on your computer</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="UserNameEntry" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Your account name:</property>
<property name="label" translatable="yes">Administrator name:</property>
<property name="xalign">0</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -2378,7 +2329,7 @@ and help you install UBLinux on your computer</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="placeholder-text" translatable="yes">Super Admin</property>
<property name="placeholder-text" translatable="yes">Administrator</property>
<signal name="changed" handler="on_toggle_button_switch_on" object="UsernameSensitiveCheck" swapped="no"/>
</object>
<packing>
@ -2406,27 +2357,19 @@ and help you install UBLinux on your computer</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="LoginEntry" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Login:</property>
<property name="label" translatable="yes">Administrator login:</property>
<property name="xalign">0</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -2461,28 +2404,19 @@ and help you install UBLinux on your computer</property>
<property name="can-focus">False</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="PasswordCombo" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Password</property>
<property name="label" translatable="yes">Administrator password:</property>
<property name="xalign">0</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -2582,28 +2516,19 @@ and help you install UBLinux on your computer</property>
<property name="can-focus">False</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="AdminPasswordCombo" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Administrator password (root):</property>
<property name="label" translatable="yes">User root password:</property>
<property name="xalign">0</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -2669,27 +2594,19 @@ and help you install UBLinux on your computer</property>
<property name="can-focus">False</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Computer name:</property>
<property name="label" translatable="yes">Host name:</property>
<property name="xalign">0</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -2697,7 +2614,7 @@ and help you install UBLinux on your computer</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="placeholder-text" translatable="yes">ubstation</property>
<property name="placeholder-text" translatable="yes">ublinux-install </property>
</object>
<packing>
<property name="expand">True</property>
@ -3078,7 +2995,7 @@ or continue working in the UBLinux Live environment.</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="shadow-type">in</property>
<property name="min-content-height">128</property>
<property name="min-content-height">105</property>
<child>
<object class="GtkTreeView" id="CommonInstallationDevicesTree">
<property name="visible">True</property>
@ -3171,26 +3088,18 @@ or continue working in the UBLinux Live environment.</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="CommonInstallationFilesystemTypeCombo" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Choose file system type for the section:</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -3237,26 +3146,18 @@ or continue working in the UBLinux Live environment.</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="CommonInstallationSectionNameEntry" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Section name:</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -3497,7 +3398,7 @@ installed.</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="shadow-type">in</property>
<property name="min-content-height">128</property>
<property name="min-content-height">105</property>
<child>
<object class="GtkTreeView" id="InstallationNearSysDevicesTree">
<property name="visible">True</property>
@ -3695,26 +3596,18 @@ installed.</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="InstallationNearSizeSpin" swapped="no"/>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="InstallationNearSizeTypeSpin" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Specify the size of the new partition for UBLinux OS:</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -3778,26 +3671,18 @@ installed.</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="NextInstallationFormatCheck" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Choose file system type for the section:</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -3860,26 +3745,18 @@ installed.</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="NextInstallationSectionNameEntry" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Section name:</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -4119,7 +3996,7 @@ installed.</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="shadow-type">in</property>
<property name="min-content-height">128</property>
<property name="min-content-height">105</property>
<child>
<object class="GtkTreeView" id="SamePlaceDeviceTree">
<property name="visible">True</property>
@ -4312,26 +4189,18 @@ installed.</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="SameInstallationFormatCheck" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Choose file system type for the section:</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -4394,26 +4263,18 @@ installed.</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="SameInstallationSectionNameEntry" swapped="no"/>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Section name:</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>

@ -208,15 +208,15 @@ msgid "Define"
msgstr ""
#: source/ubl-strings.h:41
msgid "Your account name:"
msgid "Administrator name:"
msgstr ""
#: source/ubl-strings.h:42
msgid "Login:"
msgid "Administrator login:"
msgstr ""
#: source/ubl-strings.h:43
msgid "Password"
msgid "Administrator password:"
msgstr ""
#: source/ubl-strings.h:44
@ -236,11 +236,11 @@ msgid "Automatic login without password prompt"
msgstr ""
#: source/ubl-strings.h:48
msgid "Administrator password (root):"
msgid "User root password:"
msgstr ""
#: source/ubl-strings.h:49
msgid "Computer name:"
msgid "Host name:"
msgstr ""
#: source/ubl-strings.h:50
@ -595,6 +595,18 @@ msgstr ""
msgid "You can safely exit configurator or return and create new configuration file."
msgstr ""
msgid "Scroll to the end"
msgstr ""
msgid "Settings"
msgstr ""
msgid "Administrator"
msgstr ""
msgid "English, U.S.A.; Russian, Russia"
msgstr ""
msgid "Afrikaans"
msgstr ""

@ -219,16 +219,16 @@ msgid "Define"
msgstr "Задать"
#: source/ubl-strings.h:41
msgid "Your account name:"
msgstr "Имя аккаунта:"
msgid "Administrator name:"
msgstr "Имя администратора:"
#: source/ubl-strings.h:42
msgid "Login:"
msgstr "Логин:"
msgid "Administrator login:"
msgstr "Логин администратора:"
#: source/ubl-strings.h:43
msgid "Password"
msgstr "Пароль"
msgid "Administrator password:"
msgstr "Пароль администратора:"
#: source/ubl-strings.h:44
msgid "Default"
@ -247,8 +247,8 @@ msgid "Automatic login without password prompt"
msgstr "Автоматический вход в систему без запроса пароля"
#: source/ubl-strings.h:48
msgid "Administrator password (root):"
msgstr "Пароль администратора (root):"
msgid "User root password:"
msgstr "Пароль пользователя root:"
#: source/ubl-strings.h:49
msgid "Computer name:"
@ -620,6 +620,18 @@ msgid ""
"You can safely exit configurator or return and create new configuration file."
msgstr "Вы можете выйти из настройки конфигурации или настроить другой файл конфигурации."
msgid "Scroll to the end"
msgstr "Прокрутить до конца"
msgid "Settings"
msgstr "Настройки"
msgid "Administrator"
msgstr "Администратор"
msgid "English, U.S.A.; Russian, Russia"
msgstr "Английский, США; Русский, Россия"
msgid "Afrikaans"
msgstr "Африканский"

Loading…
Cancel
Save