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

Fixed configuration saving menu; Fixed Exit buitton exiting

Browse Source
pull/398/head
Ivan Dmitrievich Yartsev 1 week ago
parent 864b93157a
commit 94553eb48b
6 changed files with 142 additions and 125 deletions
Show Stats Download Patch File Download Diff File

2
locale/ubinstall-gtk.pot
Unescape View File

@ -615,7 +615,7 @@ msgid "Installer configuration has been finished"
msgstr "" msgstr ""
#: source/ubl-strings.h:163 #: source/ubl-strings.h:163
msgid "Choose a save option on the header bar" msgid "You can now proceed to saving the settings"
msgstr "" msgstr ""
#: source/ubl-strings.h:165 #: source/ubl-strings.h:165

4
locale/ubinstall-gtk_ru.po
Unescape View File

@ -634,8 +634,8 @@ msgid "Installer configuration has been finished"
msgstr "Настройка конфигурации завершена" msgstr "Настройка конфигурации завершена"
#: source/ubl-strings.h:163 #: source/ubl-strings.h:163
msgid "Choose a save option on the header bar" msgid "You can now proceed to saving the settings"
msgstr "Выберите опцию сохранения на верхней панели" msgstr "Можно приступить к сохранению настроек"
#: source/ubl-strings.h:165 #: source/ubl-strings.h:165
msgid "Configuration has been saved" msgid "Configuration has been saved"

11
source/ubinstall-gtk-page-switch.c
Unescape View File

@ -54,9 +54,10 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){
case YON_PAGE_RECOVERY_BEGIN: main_config.save_configured = 1; return YON_PAGE_RECOVERY_PROCESS; break; case YON_PAGE_RECOVERY_BEGIN: main_config.save_configured = 1; return YON_PAGE_RECOVERY_PROCESS; break;
case YON_PAGE_RECOVERY_PROCESS: return YON_PAGE_RECOVERY_COMPLETION; break; case YON_PAGE_RECOVERY_PROCESS: return YON_PAGE_RECOVERY_COMPLETION; break;
case YON_PAGE_INSTALLATION: return YON_PAGE_COMPLETION; break; case YON_PAGE_INSTALLATION: return YON_PAGE_COMPLETION; break;
case YON_PAGE_CONFIGURE_SAVE:
break;
case YON_PAGE_CONFIGURE_END: case YON_PAGE_CONFIGURE_END:
return YON_PAGE_CONFIGURE_SAVE;
break;
case YON_PAGE_CONFIGURE_SAVE:
gtk_main_quit(); gtk_main_quit();
exit(0); exit(0);
break; break;
@ -152,7 +153,7 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
// yon_load_proceed(YON_CONFIG_LOCAL); // yon_load_proceed(YON_CONFIG_LOCAL);
gtk_widget_hide(widgets->BackButton); gtk_widget_hide(widgets->BackButton);
gtk_widget_set_sensitive(widgets->NextButton,1); gtk_widget_set_sensitive(widgets->NextButton,1);
gtk_widget_set_sensitive(widgets->CancelInstallButton,0); // gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
gtk_widget_set_sensitive(widgets->LoadLocalConfigurationMenuItem,1); gtk_widget_set_sensitive(widgets->LoadLocalConfigurationMenuItem,1);
gtk_widget_set_sensitive(widgets->LoadExternalConfigurationMenuItem,1); gtk_widget_set_sensitive(widgets->LoadExternalConfigurationMenuItem,1);
gtk_widget_hide(widgets->BackButton); gtk_widget_hide(widgets->BackButton);
@ -186,7 +187,7 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
gtk_widget_set_sensitive(widgets->CancelInstallButton,1); gtk_widget_set_sensitive(widgets->CancelInstallButton,1);
break; break;
case YON_PAGE_CONFIGURE_END: case YON_PAGE_CONFIGURE_END:
gtk_button_set_label(GTK_BUTTON(widgets->NextButton),SAVE_AND_EXIT_LABEL); gtk_button_set_label(GTK_BUTTON(widgets->NextButton),SAVE_LABEL);
gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL); gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL);
break; break;
@ -646,6 +647,8 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){
gtk_main_quit(); gtk_main_quit();
break; break;
case YON_PAGE_SECTIONS: case YON_PAGE_SECTIONS:
case YON_PAGE_WELCOME:
case YON_PAGE_LICENCE:
on_yon_exit(NULL,NULL,widgets); on_yon_exit(NULL,NULL,widgets);
break; break;
default: { default: {

2
source/ubl-strings.h
Unescape View File

@ -146,7 +146,7 @@ NULL)
#define CONFIGURATION_TITLE_LABEL _("Configuration") #define CONFIGURATION_TITLE_LABEL _("Configuration")
#define CONFIGURATION_FINISH_HEAD_LABEL _("Installer configuration has been finished") #define CONFIGURATION_FINISH_HEAD_LABEL _("Installer configuration has been finished")
#define CONFIGURATION_FINISH_LABEL _("Choose a save option on the header bar") #define CONFIGURATION_FINISH_LABEL _("You can now proceed to saving the settings")
#define CONFIGURATION_SAVE_HEAD_LABEL _("Configuration has been saved") #define CONFIGURATION_SAVE_HEAD_LABEL _("Configuration has been saved")
#define CONFIGURATION_SAVE_LABEL _("You can safely exit configurator or return and create new configuration file.") #define CONFIGURATION_SAVE_LABEL _("You can safely exit configurator or return and create new configuration file.")

246
ubinstall-gtk.glade
Unescape View File

@ -6538,41 +6538,6 @@ Select a different installation sources.</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkSwitch" id="BootloadNoPasswordSwitch">
<property name="visible">True</property>
<property name="can-focus">True</property>
</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">Authentication in the bootloader menu</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child> <child>
<object class="GtkFrame"> <object class="GtkFrame">
<property name="visible">True</property> <property name="visible">True</property>
@ -6590,62 +6555,40 @@ Select a different installation sources.</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkScrolledWindow"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">False</property>
<property name="shadow-type">in</property> <property name="spacing">5</property>
<property name="min-content-height">128</property>
<property name="max-content-height">256</property>
<child> <child>
<object class="GtkTreeView" id="BootloadUserTree"> <object class="GtkSwitch" id="BootloadNoPasswordSwitch">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="model">BootloadUsersList</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Administrator</property>
<child>
<object class="GtkCellRendererToggle" id="BootloadAdminCheckCell"/>
<attributes>
<attribute name="active">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Username</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Password</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
</object> </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">Authentication in the bootloader menu</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
@ -6653,36 +6596,124 @@ Select a different installation sources.</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkButton" id="BootloadUserAddButton"> <object class="GtkScrolledWindow">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="shadow-type">in</property>
<property name="image">image17</property> <property name="min-content-height">128</property>
<style> <property name="max-content-height">256</property>
<class name="thin"/> <child>
</style> <object class="GtkTreeView" id="BootloadUserTree">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="model">BootloadUsersList</property>
<property name="search-column">0</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Administrator</property>
<child>
<object class="GtkCellRendererToggle" id="BootloadAdminCheckCell"/>
<attributes>
<attribute name="active">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Username</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Password</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
</object>
</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>
</child> </child>
<child> <child>
<object class="GtkButton" id="BootloadUserEditButton"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property> <property name="can-focus">False</property>
<property name="can-focus">True</property> <property name="orientation">vertical</property>
<property name="receives-default">True</property> <property name="spacing">5</property>
<property name="tooltip-text" translatable="yes">Edit user</property> <child>
<property name="image">image43</property> <object class="GtkButton" id="BootloadUserAddButton">
<style> <property name="visible">True</property>
<class name="thin"/> <property name="can-focus">True</property>
</style> <property name="receives-default">True</property>
<property name="image">image17</property>
<style>
<class name="thin"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="BootloadUserEditButton">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Edit user</property>
<property name="image">image43</property>
<style>
<class name="thin"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="BootloadUserRemoveButton">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">image18</property>
<style>
<class name="thin"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -6690,26 +6721,9 @@ Select a different installation sources.</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkButton" id="BootloadUserRemoveButton">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">image18</property>
<style>
<class name="thin"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</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>
@ -8092,7 +8106,7 @@ or continue working in the system Live environment.</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">Choose a save option on the header bar</property> <property name="label" translatable="yes">You can now proceed to saving the settings</property>
<property name="justify">center</property> <property name="justify">center</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="yalign">0</property> <property name="yalign">0</property>

2
ubinstall-gtk_ru.po
Unescape View File

@ -613,7 +613,7 @@ msgstr "Загрузить"
msgid "Installer configuration has been finished" msgid "Installer configuration has been finished"
msgstr "Настройка конфигурации завершена" msgstr "Настройка конфигурации завершена"
msgid "Choose a save option on the header bar" msgid "You can now proceed to saving the settings"
msgstr "Выберите опцию сохранения на верхней панели" msgstr "Выберите опцию сохранения на верхней панели"
#, fuzzy #, fuzzy

Write Preview
Loading…
Cancel
Save