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

Fixes, added new slide for installation warning beginning

Browse Source
pull/1/head
Ivan Dmitrievich Yartsev 2 years ago
parent 74ffa3892b
commit 4d01f61c9f
6 changed files with 125 additions and 48 deletions
Show Stats Download Patch File Download Diff File

36
source/ubinstall-gtk.c
Unescape View File

@ -260,10 +260,12 @@ void *on_config_save(char *command){
return NULL;
}
void *yon_installation_start();
void *yon_installation_start(){
if (system(start_fast_install_command)){};
void *yon_installation_start(main_window *widgets);
void *yon_installation_start(main_window *widgets){
int code = system(start_fast_install_command);
main_config.install_thread=NULL;
if (!code)
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
g_thread_exit(NULL);
return NULL;
@ -320,7 +322,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
gtk_widget_set_sensitive(widgets->BackButton,0);
g_thread_join(main_config.config_save_thread);
if (!main_config.install_thread)
main_config.install_thread = g_thread_new("InstallThread",(GThreadFunc)yon_installation_start,NULL);
main_config.install_thread = g_thread_new("InstallThread",(GThreadFunc)yon_installation_start,widgets);
if (!main_config.install_thread)
main_config.progress_thread = g_thread_new("ProgressThread",(GThreadFunc)yon_installation_progress_update,widgets);
@ -472,10 +474,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
yon_config_register(device_label_parameter,device_label_parameter_command,device_name);
yon_config_register(part_type_parameter,part_type_parameter_command,file_system_type);
int size=0;
config_str parameters = yon_config_get_all(&size);
main_config.config_save_thread = g_thread_new("savethread",(GThreadFunc)on_config_save,save_config_command(yon_char_parsed_to_string(parameters,size," ")));
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION_BEGIN);
}break;
case YON_PAGE_INSTALL_SEPARATE:
{
@ -511,10 +510,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextInstallationFormatCheck)))
yon_config_register(device_format_parameter,device_format_parameter_command,"no");
int size=0;
config_str parameters = yon_config_get_all(&size);
main_config.config_save_thread = g_thread_new("savethread",(GThreadFunc)on_config_save,save_config_command(yon_char_parsed_to_string(parameters,size," ")));
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION_BEGIN);
}
break;
case YON_PAGE_INSTALL_SAME_PARTITION:
@ -551,10 +547,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextInstallationFormatCheck)))
yon_config_register(device_format_parameter,device_format_parameter_command,"no");
int size=0;
config_str parameters = yon_config_get_all(&size);
main_config.config_save_thread = g_thread_new("savethread",(GThreadFunc)on_config_save,save_config_command(yon_char_parsed_to_string(parameters,size," ")));
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION_BEGIN);
}break;
case YON_PAGE_USERS:{ //users
if (yon_char_is_empty(gtk_entry_get_text(GTK_ENTRY(widgets->UserNameEntry)))){
@ -595,8 +588,17 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
yon_config_register(autologin_parameter,autologin_parameter_command,autologin);
yon_config_register(xkbmodel_parameter,xkbmodel_parameter_command,hostname);
yon_config_register(hostname_parameter,hostname_parameter_command,root_password);
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
gtk_widget_set_sensitive(widgets->NextButton,0);
gtk_widget_set_sensitive(widgets->BackButton,0);
}break;
case YON_PAGE_INSTALLATION_BEGIN:{
int size=0;
config_str parameters = yon_config_get_all(&size);
main_config.config_save_thread = g_thread_new("savethread",(GThreadFunc)on_config_save,save_config_command(yon_char_parsed_to_string(parameters,size," ")));
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
} break;
case YON_PAGE_COMPLETION:
if (!system("reboot"))
return;

1
source/ubinstall-gtk.h
Unescape View File

@ -133,6 +133,7 @@ enum YON_PAGES {
YON_PAGE_SECTIONS,
YON_PAGE_OS_COMPONENTS,
YON_PAGE_SOFTWARE,
YON_PAGE_INSTALLATION_BEGIN,
YON_PAGE_INSTALLATION,
YON_PAGE_REGION,
YON_PAGE_KEYBOARD,

3
source/ubl-strings.h
Unescape View File

@ -102,3 +102,6 @@
#define FS_LABEL _("File system")
#define DEFAULTSWITCHING_LABEL _("Default (L_Alt + L_Shift)")
#define DEFAULT_MODEL_LABEL _("Default (Regular 105-key)")
#define INSTALL_BEGIN_HEADER_LABEL _("Installation configuration has ended")
#define INSTALL_BEGIN_LABEL _("UBLinux OS installation is about to begin")

115
ubinstall-gtk.glade
Unescape View File

@ -1212,6 +1212,61 @@ and help you install UBLinux on your computer</property>
<property name="tab-fill">False</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">end</property>
<property name="label" translatable="yes">Installation configuration has ended</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="size" value="14336"/>
</attributes>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">start</property>
<property name="label" translatable="yes">UBLinux OS installation is about to begin</property>
<attributes>
<attribute name="size" value="12288"/>
</attributes>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="position">5</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">page 6</property>
</object>
<packing>
<property name="position">5</property>
<property name="tab-fill">False</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -1231,7 +1286,7 @@ and help you install UBLinux on your computer</property>
</child>
</object>
<packing>
<property name="position">5</property>
<property name="position">6</property>
</packing>
</child>
<child type="tab">
@ -1241,7 +1296,7 @@ and help you install UBLinux on your computer</property>
<property name="label" translatable="yes">Installation</property>
</object>
<packing>
<property name="position">5</property>
<property name="position">6</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -1494,7 +1549,7 @@ and help you install UBLinux on your computer</property>
</child>
</object>
<packing>
<property name="position">6</property>
<property name="position">7</property>
</packing>
</child>
<child type="tab">
@ -1504,7 +1559,7 @@ and help you install UBLinux on your computer</property>
<property name="label" translatable="yes">Region</property>
</object>
<packing>
<property name="position">6</property>
<property name="position">7</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -1812,7 +1867,7 @@ and help you install UBLinux on your computer</property>
</child>
</object>
<packing>
<property name="position">7</property>
<property name="position">8</property>
</packing>
</child>
<child type="tab">
@ -1822,7 +1877,7 @@ and help you install UBLinux on your computer</property>
<property name="label" translatable="yes">Keyboard</property>
</object>
<packing>
<property name="position">7</property>
<property name="position">8</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -2136,7 +2191,7 @@ and help you install UBLinux on your computer</property>
</child>
</object>
<packing>
<property name="position">8</property>
<property name="position">9</property>
</packing>
</child>
<child type="tab">
@ -2146,7 +2201,7 @@ and help you install UBLinux on your computer</property>
<property name="label" translatable="yes">Users</property>
</object>
<packing>
<property name="position">8</property>
<property name="position">9</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -2223,7 +2278,7 @@ or continue working in the UBLinux Live environment.</property>
</child>
</object>
<packing>
<property name="position">9</property>
<property name="position">10</property>
</packing>
</child>
<child type="tab">
@ -2233,7 +2288,7 @@ or continue working in the UBLinux Live environment.</property>
<property name="label" translatable="yes">Completion</property>
</object>
<packing>
<property name="position">9</property>
<property name="position">10</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -2273,7 +2328,7 @@ or continue working in the UBLinux Live environment.</property>
</child>
</object>
<packing>
<property name="position">10</property>
<property name="position">11</property>
</packing>
</child>
<child type="tab">
@ -2283,7 +2338,7 @@ or continue working in the UBLinux Live environment.</property>
<property name="label" translatable="yes">Completed</property>
</object>
<packing>
<property name="position">10</property>
<property name="position">11</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -2565,7 +2620,7 @@ or continue working in the UBLinux Live environment.</property>
</child>
</object>
<packing>
<property name="position">11</property>
<property name="position">12</property>
</packing>
</child>
<child type="tab">
@ -2575,7 +2630,7 @@ or continue working in the UBLinux Live environment.</property>
<property name="label" translatable="yes">Common Installation</property>
</object>
<packing>
<property name="position">11</property>
<property name="position">12</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -3099,7 +3154,7 @@ installed.</property>
</child>
</object>
<packing>
<property name="position">12</property>
<property name="position">13</property>
</packing>
</child>
<child type="tab">
@ -3109,7 +3164,7 @@ installed.</property>
<property name="label" translatable="yes">Installation next to system</property>
</object>
<packing>
<property name="position">12</property>
<property name="position">13</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -3621,7 +3676,7 @@ installed.</property>
</child>
</object>
<packing>
<property name="position">13</property>
<property name="position">14</property>
</packing>
</child>
<child type="tab">
@ -3631,7 +3686,7 @@ installed.</property>
<property name="label" translatable="yes">Installation with Linux</property>
</object>
<packing>
<property name="position">13</property>
<property name="position">14</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -4011,7 +4066,7 @@ installed.</property>
</child>
</object>
<packing>
<property name="position">14</property>
<property name="position">15</property>
</packing>
</child>
<child type="tab">
@ -4021,7 +4076,7 @@ installed.</property>
<property name="label" translatable="yes">Installation with Windows</property>
</object>
<packing>
<property name="position">14</property>
<property name="position">15</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -4536,7 +4591,7 @@ separately into the selected partition.</property>
</child>
</object>
<packing>
<property name="position">15</property>
<property name="position">16</property>
</packing>
</child>
<child type="tab">
@ -4546,7 +4601,7 @@ separately into the selected partition.</property>
<property name="label" translatable="yes">Install with more options</property>
</object>
<packing>
<property name="position">15</property>
<property name="position">16</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -4726,7 +4781,7 @@ separately into the selected partition.</property>
</child>
</object>
<packing>
<property name="position">16</property>
<property name="position">17</property>
</packing>
</child>
<child type="tab">
@ -4736,7 +4791,7 @@ separately into the selected partition.</property>
<property name="label" translatable="yes">GRUB install</property>
</object>
<packing>
<property name="position">16</property>
<property name="position">17</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -4916,7 +4971,7 @@ separately into the selected partition.</property>
</child>
</object>
<packing>
<property name="position">17</property>
<property name="position">18</property>
</packing>
</child>
<child type="tab">
@ -4926,7 +4981,7 @@ separately into the selected partition.</property>
<property name="label" translatable="yes">GRUB update</property>
</object>
<packing>
<property name="position">17</property>
<property name="position">18</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -5256,7 +5311,7 @@ separately into the selected partition.</property>
</child>
</object>
<packing>
<property name="position">18</property>
<property name="position">19</property>
</packing>
</child>
<child type="tab">
@ -5266,7 +5321,7 @@ separately into the selected partition.</property>
<property name="label" translatable="yes">Separate installation</property>
</object>
<packing>
<property name="position">18</property>
<property name="position">19</property>
<property name="tab-fill">False</property>
</packing>
</child>
@ -5596,7 +5651,7 @@ separately into the selected partition.</property>
</child>
</object>
<packing>
<property name="position">19</property>
<property name="position">20</property>
</packing>
</child>
<child type="tab">
@ -5606,7 +5661,7 @@ separately into the selected partition.</property>
<property name="label" translatable="yes">OS only</property>
</object>
<packing>
<property name="position">19</property>
<property name="position">20</property>
<property name="tab-fill">False</property>
</packing>
</child>

8
ubinstall-gtk.pot
Unescape View File

@ -426,6 +426,14 @@ msgstr ""
msgid "Default (Regular 105-key)"
msgstr ""
#: source/ubl-strings.h:102
msgid "Installation configuration has ended"
msgstr ""
#: source/ubl-strings.h:102
msgid "UBLinux OS installation is about to begin"
msgstr ""
msgid "Afrikaans"
msgstr ""

8
ubinstall-gtk_ru.po
Unescape View File

@ -443,6 +443,14 @@ msgstr "По умолчанию ((L_Alt + L_Shift))"
msgid "Default (Regular 105-key)"
msgstr "По умолчанию ((Regular 105-key))"
#: source/ubl-strings.h:102
msgid "Installation configuration has ended"
msgstr "Настройка установщика завершена"
#: source/ubl-strings.h:102
msgid "UBLinux OS installation is about to begin"
msgstr "Начало установки ОС UBLinux"
msgid "Afrikaans"
msgstr "Африканский"

Write Preview
Loading…
Cancel
Save