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

Fixed advanced installation page virtual device description style

Browse Source
pull/239/head
Ivan Dmitrievich Yartsev 2 months ago
parent 7bd5240483
commit 7b8a4810dd
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File

8
source/ubinstall-gtk-advanced.c
Unescape View File

@ -254,6 +254,7 @@ void on_advanced_partition_add(GtkWidget *, char *path, main_window *widgets){
} }
void yon_install_advanced_init(main_window *widgets){ void yon_install_advanced_init(main_window *widgets){
g_signal_handlers_block_by_func(G_OBJECT(widgets->AdvancedVirtualDeviceCombo),G_CALLBACK(on_advanced_virtual_device_changed),widgets);
gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->AdvancedVirtualDeviceCombo)); gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->AdvancedVirtualDeviceCombo));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->AdvancedVirtualDeviceCombo),NO_LABEL); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->AdvancedVirtualDeviceCombo),NO_LABEL);
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->AdvancedVirtualDeviceCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->AdvancedVirtualDeviceCombo),0);
@ -266,6 +267,7 @@ void yon_install_advanced_init(main_window *widgets){
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
} }
yon_char_parsed_free(vmf_file,size); yon_char_parsed_free(vmf_file,size);
g_signal_handlers_unblock_by_func(G_OBJECT(widgets->AdvancedVirtualDeviceCombo),G_CALLBACK(on_advanced_virtual_device_changed),widgets);
} }
void on_install_advanced_partition_chosen(GtkCellRenderer*, gchar *path, main_window *widgets){ void on_install_advanced_partition_chosen(GtkCellRenderer*, gchar *path, main_window *widgets){
@ -868,9 +870,13 @@ void on_advanced_virtual_device_changed(GtkWidget *, main_window *widgets){
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
int parsed_size; int parsed_size;
config_str parsed = yon_char_parse(vfs_file[i],&parsed_size,";"); config_str parsed = yon_char_parse(vfs_file[i],&parsed_size,";");
if (!yon_char_is_empty(device)&&!yon_char_is_empty(parsed[2])&!strcmp(parsed[2],device)){ if (!yon_char_is_empty(device)&&!yon_char_is_empty(parsed[2])&&!strcmp(parsed[2],device)){
gtk_label_set_text(GTK_LABEL(widgets->AdvancedVirtualDeviceLabel),parsed[1]); gtk_label_set_text(GTK_LABEL(widgets->AdvancedVirtualDeviceLabel),parsed[1]);
gtk_widget_show(gtk_widget_get_parent(widgets->AdvancedVirtualDeviceLabel));
yon_char_parsed_free(parsed,parsed_size);
break;
} else { } else {
gtk_widget_hide(gtk_widget_get_parent(widgets->AdvancedVirtualDeviceLabel));
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
} }
} }

28
ubinstall-gtk.glade
Unescape View File

@ -9758,24 +9758,40 @@ separately into the selected partition.</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</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="can-focus">False</property>
<property name="orientation">vertical</property>
<child> <child>
<object class="GtkLabel" id="AdvancedVirtualDeviceLabel"> <object class="GtkLabel" id="AdvancedVirtualDeviceLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="wrap-mode">word-char</property> <property name="wrap-mode">word-char</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<style>
<class name="bggrey"/>
<class name="boxInfoMessOK"/>
</style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -9947,7 +9963,7 @@ separately into the selected partition.</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -10096,7 +10112,7 @@ separately into the selected partition.</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -10141,7 +10157,7 @@ separately into the selected partition.</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -10657,7 +10673,7 @@ separately into the selected partition.</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">4</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
</object> </object>

Write Preview
Loading…
Cancel
Save