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

Localisation fixes; Saving fixes; WIP advanced installation

Browse Source
pull/101/head
Ivan Dmitrievich Yartsev 2 months ago
parent ed30b86beb
commit cb2bd8bc30
No known key found for this signature in database
GPG Key ID: FF1D842BF4DDE92B
7 changed files with 61 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
locale/ubinstall-gtk_ru.po
Unescape View File

@ -522,7 +522,7 @@ msgstr "Режим конфигурации"
#: source/ubl-strings.h:140
msgid "Attention! Configuration mode was enabled!"
msgstr "Внимание! Включен режим конфигурации"
msgstr "Внимание! Включен режим конфигурации!"
#: source/ubl-strings.h:141
msgid "Configuration will be saved in configuration file"

4
source/ubinstall-gtk-installation.c
Unescape View File

@ -446,11 +446,9 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
default:return;
}
char *device = config(AUTOINSTALL_DEVICE);
char *part = config(part_parameter);
if (!yon_char_is_empty(device)){
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->DevicesList);
@ -685,7 +683,7 @@ void on_install_advanced_add_new(GtkWidget *, main_window *widgets){
gtk_box_pack_start(GTK_BOX(widgets->AdvancedPartitionAddBox),part->MainBox,0,0,0);
gtk_widget_show(part->MainBox);
yon_advanced_partition_setup(part,widgets);
on_advanced_parts_added(NULL,NULL,widgets);
on_advanced_parts_added(NULL,NULL,widgets);
}
void on_install_advanced_device_chosen(GtkCellRenderer *, gchar *path, main_window *widgets){

2
source/ubinstall-gtk-saving.c
Unescape View File

@ -717,7 +717,7 @@ int yon_config_save(main_window *widgets){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
return 0;
}
char *command = yon_debug_output("%s\n",ubconfig_set_command_full(main_config.config_save_path,"",yon_char_parsed_to_string(parameters,size," ")));
char *command = yon_debug_output("%s\n",ubconfig_set_command_full(main_config.config_save_path,"[autoinstall]",yon_char_parsed_to_string(parameters,size," ")));
if (system(command)){
return 0;
}

8
source/ubinstall-gtk.c
Unescape View File

@ -479,7 +479,10 @@ main_window *yon_main_window_complete(){
widgets->AdvancedSwapAutoSwitch = yon_gtk_builder_get_widget(builder,"AdvancedSwapAutoSwitch");
widgets->AdvancedSwapRamSwitch = yon_gtk_builder_get_widget(builder,"AdvancedSwapRamSwitch");
widgets->AdvancedSwapFixedSwitch = yon_gtk_builder_get_widget(builder,"AdvancedSwapFixedSwitch");
widgets->AdvancedSwapFixedSizeSwitch = yon_gtk_builder_get_widget(builder,"AdvancedSwapFixedSizeSwitch");
widgets->AdvancedSwapFixedSpin = yon_gtk_builder_get_widget(builder,"AdvancedSwapFixedSpin");
widgets->AdvancedSwapRevealer = yon_gtk_builder_get_widget(builder,"AdvancedSwapRevealer");
widgets->AdvancedLoadTypeRevealer = yon_gtk_builder_get_widget(builder,"AdvancedLoadTypeRevealer");
widgets->advanced_partition_order = g_sequence_new(NULL);
widgets->GrubInstallDevicesTree = yon_gtk_builder_get_widget(builder,"GrubInstallDevicesTree");
@ -727,6 +730,11 @@ main_window *yon_main_window_complete(){
g_signal_connect(G_OBJECT(widgets->HotnameEntry),"changed",G_CALLBACK(on_hostname_entry_changed),widgets);
g_signal_connect(G_OBJECT(widgets->NetworkConnectionsAddButton),"clicked",G_CALLBACK(on_connection_add),widgets);
g_signal_connect(G_OBJECT(widgets->NetworkNTPCombo),"changed",G_CALLBACK(on_ntp_sync),widgets);
yon_gtk_revealer_set_from_switch(GTK_REVEALER(widgets->AdvancedLoadTypeRevealer),GTK_SWITCH(widgets->AdvancedLoadTypeSwitch));
yon_gtk_revealer_set_from_switch(GTK_REVEALER(widgets->AdvancedSwapRevealer),GTK_SWITCH(widgets->AdvancedSwapSwitch));
g_signal_connect(G_OBJECT(widgets->AdvancedSwapFixedSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->AdvancedSwapFixedSpin);
g_signal_connect(G_OBJECT(widgets->AdvancedSwapFixedSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->AdvancedSwapFixedSizeSwitch);
g_signal_connect(G_OBJECT(widgets->AdvancedAddButton),"clicked",G_CALLBACK(on_install_advanced_add_new),widgets);
g_signal_connect(G_OBJECT(widgets->AdvancedDeviceChosenCell),"toggled",G_CALLBACK(on_install_advanced_device_chosen),widgets);

2
source/ubinstall-gtk.h
Unescape View File

@ -663,6 +663,8 @@ typedef struct {
GtkWidget *AdvancedSwapFixedSpin;
GtkWidget *AdvancedSwapFixedSwitch;
GtkWidget *AdvancedSwapFixedSizeSwitch;
GtkWidget *AdvancedSwapRevealer;
GtkWidget *AdvancedLoadTypeRevealer;
dictionary *advanced_sections;
GSequence *advanced_partition_order;

42
source/ubl-settings-advanced.c
Unescape View File

@ -0,0 +1,42 @@
#include "ubinstall-gtk.h"
typedef struct {
char *section;
int sys_section;
int user_section;
int format;
int size;
char size_letter;
char *part_label;
char *fs_type;
char *fs_label;
char *encryption;
char *encryption_password;
} advanced_section;
int sections_size=0;
advanced_section *sections[2] = {NULL};
advanced_section *yon_advanced_section_new(){
if (sections_size>=2) return NULL;
advanced_section *section = malloc(sizeof(advanced_section));
memset(section,0,sizeof(advanced_section));
sections[sections_size] = section;
return section;
}
// add section from tree view
void yon_advanced_add(main_window *widgets){
if (sections_size<2){
}
}
//new section from button
void yon_advanced_new(main_window *widgets){
}

12
ubinstall-gtk.glade
Unescape View File

@ -759,6 +759,7 @@ agreement</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="tab-pos">left</property>
<property name="show-tabs">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -4330,7 +4331,7 @@ and help you install UBLinux on your computer</property>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@ -7177,8 +7178,6 @@ separately into the selected partition.</property>
<object class="GtkRevealer" id="AdvancedLoadTypeRevealer">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="transition-type">none</property>
<property name="reveal-child">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -7307,6 +7306,7 @@ separately into the selected partition.</property>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">start</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
@ -7381,8 +7381,6 @@ separately into the selected partition.</property>
<object class="GtkRevealer" id="AdvancedSwapRevealer">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="transition-type">none</property>
<property name="reveal-child">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -7514,6 +7512,7 @@ separately into the selected partition.</property>
<child>
<object class="GtkSpinButton" id="AdvancedSwapFixedSpin">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
</object>
<packing>
@ -7547,8 +7546,9 @@ separately into the selected partition.</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="SwapFixedSizeSwitch">
<object class="GtkSwitch" id="AdvancedSwapFixedSizeSwitch">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
</object>
<packing>

Write Preview
Loading…
Cancel
Save