master #50

Merged
asmeron merged 6 commits from YanTheKaller/ubinstall-gtk:master into master 1 year ago

@ -7,6 +7,7 @@
<file>ubinstall-gtk-about.glade</file>
<file>ubinstall-gtk-documentation.glade</file>
<file>ubinstall-gtk-log-view.glade</file>
<file>ubinstall-gtk-warning.glade</file>
</gresource>
<gresource prefix="/com/ublinux/css">
<file>ubinstall-gtk.css</file>

@ -64,6 +64,7 @@ set(DEPENDFILES
../ubinstall-gtk-about.glade
../ubinstall-gtk-documentation.glade
../ubinstall-gtk-log-view.glade
../ubinstall-gtk-warning.glade
../gresource.xml
../ubinstall-gtk.css
../modules.csv

@ -812,7 +812,7 @@ void config_init(){
main_config.debug_mode=0;
main_config.slider_thread=0;
main_config.config_save_thread=NULL;
main_config.install_thread=NULL;
main_config.install_thread=0;
main_config.progress_thread=0;
main_config.install_complete=0;
main_config.save_done=0;
@ -820,6 +820,7 @@ void config_init(){
main_config.load_mode=-1;
main_config.log_progress_buzy=0;
main_config.log_end=0;
main_config.exit_accepted=0;
}
void on_configuration_mode_switch(GtkWidget *self);
@ -912,10 +913,10 @@ char* yon_debug_output(char *pattern,char*text){
void *on_config_save(void *data);
void *on_config_save(void *data){
main_window *widgets = (main_window*)data;
if (!main_config.install_complete){
int size=0;
config_str parameters = yon_config_get_all(&size);
main_config.install_thread=(GThread*)0x1;
// main_config.install_thread=(GThread*)0x1;
FILE *file = fopen(progress_path,"w");
if (file)
fclose(file);
@ -925,7 +926,7 @@ void *on_config_save(void *data){
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALL_ERROR);
};
free(command);
main_config.install_thread=NULL;
main_config.install_thread=0;
main_config.install_complete=1;
yon_debug_output("Install set to: %s\n",yon_char_from_int(main_config.install_complete));
yon_debug_output("Save state: %s\n",yon_char_from_int(main_config.save_done));
@ -933,7 +934,6 @@ void *on_config_save(void *data){
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
}
main_config.config_save_thread=NULL;
}
pthread_exit(NULL);
}
@ -1047,7 +1047,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
break;
case YON_PAGE_INSTALL_ERROR:{
on_summary_log_view((GtkWidget*)NULL);
on_summary_log_view((GtkWidget*)NULL,widgets);
yon_switch_page_render(widgets,7);
gtk_widget_set_sensitive(widgets->BackButton,0);
@ -1150,8 +1150,14 @@ void *on_setup_system_configuration(void * data){
return NULL;
}
void on_log_closed(GtkWidget *, log_window *window);
void on_log_closed(GtkWidget *, log_window *window){
void on_log_closed(GtkWidget *, dictionary *dict);
void on_log_closed(GtkWidget *, dictionary *dict){
main_window *widgets = yon_dictionary_get_data(dict->first,main_window*);
log_window *window = yon_dictionary_get_data(dict->first->next,log_window*);
gtk_widget_set_sensitive(widgets->ReadFullLogButton,1);
gtk_widget_set_sensitive(widgets->ReadShortLogButton,1);
free(window->command);
window->Window=NULL;
}
@ -1197,7 +1203,6 @@ log_window *yon_log_window_new(){
window->LogLabel = yon_gtk_builder_get_widget(builder,"LogLabel");
window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
window->ScrollToEndCheck = yon_gtk_builder_get_widget(builder,"ScrollToEndCheck");
g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),window);
gtk_widget_show(window->Window);
return window;
}
@ -1225,16 +1230,28 @@ if (window->Window){
return 0;
}
void on_process_log_view(GtkWidget *);
void on_process_log_view(GtkWidget *){
void on_process_log_view(GtkWidget *,main_window *widgets);
void on_process_log_view(GtkWidget *,main_window *widgets){
log_window *window = yon_log_window_new();
dictionary *dict=NULL;
yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),dict);
gtk_widget_set_sensitive(widgets->ReadFullLogButton,0);
gtk_widget_set_sensitive(widgets->ReadShortLogButton,0);
yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,LOG_VIEW_LABEL,icon_path,"log_viewer");
window->command = yon_char_new(short_log_path);
gdk_threads_add_timeout(500,(GSourceFunc)yon_read_log,window);
}
void on_summary_log_view(GtkWidget *){
void on_summary_log_view(GtkWidget *,main_window *widgets){
log_window *window = yon_log_window_new();
dictionary *dict=NULL;
yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),dict);
gtk_widget_set_sensitive(widgets->ReadFullLogButton,0);
gtk_widget_set_sensitive(widgets->ReadShortLogButton,0);
yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,LOG_VIEW_LABEL,icon_path,"log_viewer");
window->command = yon_char_new(full_log_path);
gdk_threads_add_timeout(500,(GSourceFunc)yon_read_log,window);
@ -1677,8 +1694,14 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
}break;
case YON_PAGE_INSTALLATION_BEGIN:{
pthread_t tid;
pthread_create(&tid,NULL,on_config_save,widgets);
if (!main_config.install_thread){
pthread_attr_t attr;
pthread_attr_init(&attr);
pthread_t tid;
pthread_create(&tid,&attr,on_config_save,widgets);
memcpy(&main_config.install_thread,&tid,sizeof(pthread_t));
}
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
} break;
@ -2070,6 +2093,37 @@ void on_gparted_open(){
yon_launch_app_with_arguments(open_gparted_command,NULL);
}
// gboolean on_yon_exit(GtkWidget *,GdkEvent*, main_window *widgets);
// void on_exit_accepted(GtkWidget *,main_window *widgets);
// void on_exit_accepted(GtkWidget *,main_window *widgets){
// if (main_config.install_thread){
// pthread_cancel((pthread_t)main_config.install_thread);
// }
// main_config.exit_accepted=1;
// g_signal_emit_by_name(G_OBJECT(widgets->MainWindow),"destroy",widgets->MainWindow,NULL);
// }
// gboolean on_yon_exit(GtkWidget *,GdkEvent*, main_window *widgets){
// if (!main_config.exit_accepted){
// if (widgets){};
// confirmation_window *window = malloc(sizeof(confirmation_window));
// GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_confirmation);
// window->Window = yon_gtk_builder_get_widget(builder,"MainWindow");
// window->AcceptButton = yon_gtk_builder_get_widget(builder,"AcceptButton");
// window->CancelButton = yon_gtk_builder_get_widget(builder,"CancelButton");
// g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_exit_accepted),widgets);
// g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
// gtk_window_set_transient_for(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->MainWindow));
// gtk_window_set_title(GTK_WINDOW(window->Window),TITLE_LABEL);
// gtk_window_set_icon_name(GTK_WINDOW(window->Window),icon_path);
// gtk_widget_show(window->Window);
// return 1;
// }
// return 0;
// }
/**yon_main_window_complete(main_window *widgets)
* [EN]
*
@ -2243,6 +2297,7 @@ main_window *yon_main_window_complete(){
widgets->SameFSTypeSensitiveCheck = yon_gtk_builder_get_widget(builder,"SameFSTypeSensitiveCheck");
widgets->SameLabelSensitiveCheck = yon_gtk_builder_get_widget(builder,"SameLabelSensitiveCheck");
// g_signal_connect(G_OBJECT(widgets->MainWindow),"delete-event",G_CALLBACK(on_yon_exit),widgets);
GtkWidget *menu = yon_gtk_builder_get_widget(builder,"menu2");
gtk_style_context_add_class(gtk_widget_get_style_context(widgets->DocumentationMenuItem),"menuitemmiddle");
gtk_style_context_remove_class(gtk_widget_get_style_context(widgets->DocumentationMenuItem),"menuitemtop");
@ -2526,7 +2581,7 @@ int main(int argc, char *argv[]){
}
gtk_init(&argc,&argv);
main_window *widgets = NULL;
widgets = yon_main_window_complete((main_window*)widgets);
widgets = yon_main_window_complete();
yon_window_config_setup(GTK_WINDOW(widgets->MainWindow));
yon_window_config_load(config_path);

@ -26,6 +26,7 @@
#define glade_path_log_view "/com/ublinux/ui/ubinstall-gtk-log-view.glade"
#define ui_glade_path_about "/com/ublinux/ui/ubinstall-gtk-about.glade"
#define ui_glade_path_documentation "/com/ublinux/ui/ubinstall-gtk-documentation.glade"
#define glade_path_confirmation "/com/ublinux/ui/ubinstall-gtk-warning.glade"
#define CssPath "/com/ublinux/css/ubinstall-gtk.css"
#define config_path yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL)
@ -200,13 +201,14 @@ typedef struct {
guint slider_thread;
int install_mode;
GThread *config_save_thread;
GThread *install_thread;
unsigned long install_thread;
guint progress_thread;
int configure_mode;
int log_progress_buzy;
int autologin_default;
int format_default;
int log_end;
int exit_accepted;
} config;
typedef struct {
@ -434,6 +436,12 @@ typedef struct {
char *command;
} log_window;
typedef struct {
GtkWidget *Window;
GtkWidget *AcceptButton;
GtkWidget *CancelButton;
} confirmation_window;
void config_init();
main_window *yon_main_window_complete();
ubinstall_language_window *yon_ubinstall_language_new();
@ -448,7 +456,7 @@ char* yon_debug_output(char *pattern,char*text);
char *yon_save_command_prepare(char *command, char *target);
void yon_interface_update(main_window *widgets);
void on_summary_log_view(GtkWidget *);
void on_summary_log_view(GtkWidget *,main_window *widgets);
void on_near_installation_device_changed(GtkWidget *self, main_window *widgets);
void on_toggle_button_switch_on(GtkWidget *, GtkToggleButton *toggle);

@ -166,3 +166,11 @@
#define SCROLL_TO_END_LABEL _("Scroll to the end")
#define ADMINISTRATOR_LABEL _("Administrator")
#define DEFAULT_LOCALES_LABEL _("English, U.S.A.; Russian, Russia")
#define READ_INSTALL_LOG_LABEL _("Read installation log")
#define READ_PROGRESS_LOG_LABEL _("Read progress log")
#define ACCEPT_LABEL _("Accept")
#define GPARTED_LABEL _("Start GParted")
#define EXIT_WARNING_LABEL _("Are you sure want to exit and interrupt installation process?")

@ -69,6 +69,7 @@
<object class="GtkLabel" id="LogLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object>

@ -0,0 +1,146 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.24"/>
<object class="GtkApplicationWindow" id="MainWindow">
<property name="width-request">450</property>
<property name="height-request">250</property>
<property name="can-focus">False</property>
<property name="resizable">False</property>
<property name="default-width">450</property>
<property name="icon-name">dialog-question-symbolic</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">center</property>
<property name="xpad">20</property>
<property name="ypad">20</property>
<property name="icon-name">dialog-question-symbolic</property>
<property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">center</property>
<property name="label" translatable="yes">Are you sure want to exit and
interrupt installation process?</property>
<style>
<class name="fgnb"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="fgnb"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="fgnb"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar" id="SettingsBar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child type="title">
<object class="GtkLabel" id="webHeaderNameLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Warning</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
<child>
<object class="GtkButton" id="CancelButton">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">image8</property>
<style>
<class name="button"/>
<class name="marginright"/>
</style>
</object>
</child>
<child>
<object class="GtkButton" id="AcceptButton">
<property name="label" translatable="yes">Accept</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">image9</property>
<style>
<class name="button"/>
<class name="marginright"/>
</style>
</object>
<packing>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.cancel-symbolic</property>
</object>
<object class="GtkImage" id="image9">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.accept-symbolic</property>
</object>
</interface>

@ -583,6 +583,7 @@ agreement</property>
<property name="halign">center</property>
<property name="label" translatable="yes">This program will ask you few questions
and help you install UBLinux on your computer</property>
<property name="justify">center</property>
<property name="wrap">True</property>
<attributes>
<attribute name="weight" value="semibold"/>
@ -1588,7 +1589,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="label" translatable="yes">Region:</property>
</object>
</child>
@ -1614,7 +1615,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBoxText" id="RegionCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -1651,7 +1652,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBoxText" id="ZoneCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -1699,7 +1700,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="LanguagesSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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="AvailableLanguagesButton" swapped="no"/>
@ -1764,7 +1765,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="MainLanguageSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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"/>
@ -1786,7 +1787,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBox" id="LanguagesCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="model">LanguagesFilter</property>
<property name="id-column">2</property>
<signal name="changed" handler="on_toggle_button_switch_on" object="MainLanguageSensitiveCheck" swapped="no"/>
@ -1893,7 +1894,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="KeyboardModelSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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"/>
@ -1915,7 +1916,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBoxText" id="KeyboardModelCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">0</property>
<items>
<item id="pc105" translatable="yes">Default (Regular 105-key)</item>
@ -1943,7 +1944,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="OptionsSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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"/>
@ -1965,7 +1966,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBoxText" id="LayoutBindingCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">0</property>
<items>
<item id="grp:lalt_lshift_toggle,grp_led:scroll,compose:rwin" translatable="yes">Default (L_Alt + L_Shift)</item>
@ -2025,7 +2026,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="LayoutSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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="AddButton" swapped="no"/>
@ -2290,7 +2291,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="UsernameSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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"/>
@ -2338,7 +2339,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="LoginSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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"/>
@ -2386,7 +2387,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="PasswordSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<child>
@ -2408,7 +2409,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBoxText" id="PasswordCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
@ -2453,7 +2454,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="AutologinSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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="AutologinCheck" swapped="no"/>
@ -2497,7 +2498,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="RootPasswordSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<child>
@ -2519,7 +2520,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBoxText" id="AdminPasswordCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
@ -2575,7 +2576,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="HostnameSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<child>
@ -2854,6 +2855,8 @@ or continue working in the UBLinux Live environment.</property>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-end">10</property>
<property name="margin-bottom">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -2955,6 +2958,7 @@ or continue working in the UBLinux Live environment.</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Start GParted</property>
<property name="image">image5</property>
<style>
<class name="thin"/>
@ -3068,7 +3072,7 @@ or continue working in the UBLinux Live environment.</property>
<child>
<object class="GtkCheckButton" id="CommonFilesystemSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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"/>
@ -3090,7 +3094,7 @@ or continue working in the UBLinux Live environment.</property>
<object class="GtkComboBoxText" id="CommonInstallationFilesystemTypeCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">1</property>
<items>
<item translatable="yes">ext3</item>
@ -3126,7 +3130,7 @@ or continue working in the UBLinux Live environment.</property>
<child>
<object class="GtkCheckButton" id="CommonSectionSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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"/>
@ -3222,6 +3226,8 @@ or continue working in the UBLinux Live environment.</property>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-end">10</property>
<property name="margin-bottom">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -3358,6 +3364,7 @@ installed.</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Start GParted</property>
<property name="image">image36</property>
<style>
<class name="thin"/>
@ -3575,7 +3582,7 @@ installed.</property>
<child>
<object class="GtkCheckButton" id="NextSizeSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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="InstallationNearSizeSpin" swapped="no"/>
@ -3614,7 +3621,7 @@ installed.</property>
<object class="GtkComboBoxText" id="InstallationNearSizeTypeSpin">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">1</property>
<items>
<item id="M" translatable="yes">Mb</item>
@ -3651,14 +3658,14 @@ installed.</property>
<child>
<object class="GtkCheckButton" id="NextFSTypeSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="label" translatable="yes">Choose file system type for the section:</property>
</object>
</child>
@ -3673,7 +3680,7 @@ installed.</property>
<object class="GtkComboBoxText" id="NextInstallationFilesystemTypeCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">1</property>
<items>
<item id="ext3" translatable="yes">ext3</item>
@ -3724,7 +3731,7 @@ installed.</property>
<child>
<object class="GtkCheckButton" id="NextLabelSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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"/>
@ -3820,6 +3827,8 @@ installed.</property>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-end">10</property>
<property name="margin-bottom">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -3955,6 +3964,7 @@ installed.</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Start GParted</property>
<property name="image">image1</property>
<style>
<class name="thin"/>
@ -4168,7 +4178,7 @@ installed.</property>
<child>
<object class="GtkCheckButton" id="SameFSTypeSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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"/>
@ -4190,7 +4200,7 @@ installed.</property>
<object class="GtkComboBoxText" id="SameInstallationFilesystemTypeCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">1</property>
<items>
<item translatable="yes">ext3</item>
@ -4242,7 +4252,7 @@ installed.</property>
<child>
<object class="GtkCheckButton" id="SameLabelSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</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"/>
@ -7242,6 +7252,7 @@ separately into the selected partition.</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Read installation log</property>
<property name="image">image16</property>
<style>
<class name="thin"/>
@ -7305,6 +7316,7 @@ separately into the selected partition.</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Read progress log</property>
<property name="image">image15</property>
<style>
<class name="thin"/>

@ -553,6 +553,18 @@ msgstr ""
msgid "Log exploration"
msgstr ""
#: source/ubl-strings.h:140
msgid "Read installation log"
msgstr ""
#: source/ubl-strings.h:140
msgid "Read progress log"
msgstr ""
#: source/ubl-strings.h:140
msgid "Start GParted"
msgstr ""
msgid "Load global configuration"
msgstr ""

@ -629,6 +629,18 @@ msgstr "Настройки"
msgid "Administrator"
msgstr "Администратор"
#: source/ubl-strings.h:140
msgid "Read installation log"
msgstr "Открыть лог установки"
#: source/ubl-strings.h:140
msgid "Read progress log"
msgstr "Открыть лог прогресса"
#: source/ubl-strings.h:140
msgid "Start GParted"
msgstr "Запустить GParted"
msgid "English, U.S.A.; Russian, Russia"
msgstr "Английский, США; Русский, Россия"

Loading…
Cancel
Save