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

Added Installation finish action combobox

Browse Source
pull/207/head
Ivan Dmitrievich Yartsev 3 months ago
parent c5d85bb754
commit 8915dc2e67
7 changed files with 88 additions and 2 deletions
Show Stats Download Patch File Download Diff File

12
locale/ubinstall-gtk.pot
Unescape View File

@ -1808,6 +1808,18 @@ msgstr ""
msgid "Interactive Knowledge Base"
msgstr ""
#: source/ubl-strings.h:543
msgid "Reboot"
msgstr ""
#: source/ubl-strings.h:543
msgid "Shudown"
msgstr ""
#: source/ubl-strings.h:543
msgid "After successful installation:"
msgstr ""
#: source/ubl-strings.h:544
msgid ""
"Continuously evolving and clearly describes the installation and "

12
locale/ubinstall-gtk_ru.po
Unescape View File

@ -1813,6 +1813,18 @@ msgstr ""
"Графический пакетный менеджер позволяет быстро и интуитивно понятно "
"устанавливать дополнительное ПО, драйверы для оборудования"
#: source/ubl-strings.h:543
msgid "Reboot"
msgstr "Перезагрузить"
#: source/ubl-strings.h:543
msgid "Shudown"
msgstr "Выключить"
#: source/ubl-strings.h:543
msgid "After successful installation:"
msgstr "После успешной установки:"
#: source/ubl-strings.h:505
msgid "Corporate Services"
msgstr "Корпоративные сервисы"

22
source/ubinstall-gtk-config-hub.c
Unescape View File

@ -1,7 +1,12 @@
#include "ubinstall-gtk.h"
int yon_configuration_hub_save(main_window *){
int yon_configuration_hub_save(main_window *widgets){
char *finish_button = (char *)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->ConfigHubRebootCombo));
if (!yon_char_is_empty(finish_button)){
yon_config_register(finish_parameter,finish_parameter_command,finish_button);
} else {
yon_config_remove_by_key(finish_parameter);
}
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,modules_parameter,
@ -32,6 +37,7 @@ int yon_configuration_hub_save(main_window *){
GRUB_TIMEOUT_parameter,
GRUB_DEFAULT_parameter,
AUTOLOGINUSER_parameter,
finish_parameter,
NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
@ -170,6 +176,18 @@ void yon_flow_box_clear(GtkFlowBox *target){
}
void yon_configuration_hub_init(main_window *widgets){
gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo));
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),NULL,DEFAULT_LABEL);
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),"reboot",REBOOT_LABEL);
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),"shutdown",SHUTDOWN_LABEL);
char *finish_string = config(finish_parameter);
if (!yon_char_is_empty(finish_string)){
gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->ConfigHubRebootCombo),finish_string);
} else {
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConfigHubRebootCombo),0);
}
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConfigHubRebootCombo),0);
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPersonalListBox));
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubSystemListBox));
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPackagesListBox));

1
source/ubinstall-gtk.c
Unescape View File

@ -706,6 +706,7 @@ void yon_main_window_create(main_window *widgets){
widgets->PackagesChosenCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"PackagesChosenCell"));
widgets->PackagesList = GTK_TREE_STORE(gtk_builder_get_object(builder,"Packages"));
widgets->ConfigHubRebootCombo = yon_gtk_builder_get_widget(builder,"ConfigHubRebootCombo");
widgets->HubPersonalListBox = yon_gtk_builder_get_widget(builder,"HubPersonalListBox");
widgets->HubSystemListBox = yon_gtk_builder_get_widget(builder,"HubSystemListBox");
widgets->HubPackagesListBox = yon_gtk_builder_get_widget(builder,"HubPackagesListBox");

3
source/ubinstall-gtk.h
Unescape View File

@ -260,6 +260,8 @@ layout && /description:/ {\
#define installer_locale_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[installer_locale]"
#define source_parameter "AUTOINSTALL[source]"
#define source_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[source]"
#define finish_parameter "AUTOINSTALL[finish]"
#define finish_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[finish]"
#define SYSTEM_LANG_parameter "AUTOINSTALL['ubconfig set [locale] LANG']"
#define SYSTEM_LANG_parameter_command "ubconfig --source global get autoinstall AUTOINSTALL['ubconfig set [locale] LANG']"
@ -755,6 +757,7 @@ typedef struct
GtkWidget *PackagesTree;
// Configuration hub slide section
GtkWidget *ConfigHubRebootCombo;
GtkWidget *HubPersonalListBox;
GtkWidget *HubSystemListBox;
GtkWidget *HubPackagesListBox;

4
source/ubl-strings.h
Unescape View File

@ -284,6 +284,10 @@ NULL)
#define LOAD_GLOBAL_LABEL yon_char_get_localised_from_lib("Load global configuration")
#define LOAD_LABEL yon_char_get_localised_from_lib("Load")
#define REBOOT_LABEL _("Reboot")
#define SHUTDOWN_LABEL _("Shudown")
#define FINISH_ACTION_LABEL _("After successful installation:")
// #define _LABEL _("Select your language:")
// #define _LABEL _("Selecting additional system kernel components")
// #define _LABEL _("<i><b>Package:</b></i>")

36
ubinstall-gtk.glade
Unescape View File

@ -2142,6 +2142,7 @@ agreement</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -2245,6 +2246,41 @@ agreement</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="spacing">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">After successful installation:</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="ConfigHubRebootCombo">
<property name="visible">True</property>
<property name="can-focus">False</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">1</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>

Write Preview
Loading…
Cancel
Save