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

Merge pull request 'master' (#100) from YanTheKaller/ubinstall-gtk:master into master

Browse Source 
Reviewed-on: #100
master
Dmitry Razumov 2 months ago
parent 5619d4c5e0 ed30b86beb
commit b89ca89d25
7 changed files with 43 additions and 58 deletions
Show Stats Download Patch File Download Diff File

10
filesystems-format-list.csv
Unescape View File

@ -0,0 +1,10 @@
STATUS;NAME
1;ext4
1;ext3
1;exfat
1;fat32
1;fat16
1;riserfs
0;udf
0;xfs
1;zfs
1 STATUS NAME
2 1 ext4
3 1 ext3
4 1 exfat
5 1 fat32
6 1 fat16
7 1 riserfs
8 0 udf
9 0 xfs
10 1 zfs

1
gresource.xml
Unescape View File

@ -56,5 +56,6 @@
<file>kernel-list-addon.csv</file>
<file>services-list.csv</file>
<file>network-list.csv</file>
<file>filesystems-format-list.csv</file>
</gresource>
</gresources>

1
source/CMakeLists.txt
Unescape View File

@ -78,6 +78,7 @@ set(DEPENDFILES
../kernel-list-addon.csv
../services-list.csv
../network-list.csv
../filesystems-format-list.csv
../icons-builtin/install_type_custom_normal.png
../icons-builtin/install_type_data_only_normal.png
../icons-builtin/install_type_fast_normal.png

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

@ -487,6 +487,18 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
}
}
if (fs_type_combo){
gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(fs_type_combo));
int size;
config_str fs_types = yon_resource_open_file(fs_types_path,&size);
for (int i=0;i<size;i++){
int parsed_size;
config_str parsed = yon_char_parse(fs_types[i],&parsed_size,";");
if (atoi(parsed[0])){
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(fs_type_combo),parsed[1],parsed[1]);
}
yon_char_parsed_free(parsed,parsed_size);
}
yon_char_parsed_free(fs_types,size);
char *parameter = config(part_fs_type_parameter);
if (!yon_char_is_empty(parameter)){
gtk_combo_box_set_active_id(GTK_COMBO_BOX(fs_type_combo),parameter);

12
source/ubinstall-gtk.c
Unescape View File

@ -3,6 +3,13 @@
config main_config;
// //functions
void on_vnc_toggled(GtkWidget *self, main_window *){
if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(self))){
yon_launch(enable_vnc_command);
} else {
yon_launch(disable_vnc_command);
}
}
void on_pacman_software_all_toggled(GtkWidget *, char *path, main_window *widgets){
GtkTreeIter iter;
@ -381,6 +388,7 @@ main_window *yon_main_window_complete(){
widgets->Notebook = yon_gtk_builder_get_widget(builder,"Notebook");
widgets->MainSpinner=yon_gtk_builder_get_widget(builder,"MainSpinner");
widgets->EnableVNCMenuItem = yon_gtk_builder_get_widget(builder,"EnableVNCMenuItem");
widgets->DocumentationMenuItem = yon_ubl_menu_item_documentation_new(DOCUMENTATION_LABEL);
widgets->AboutMenuItem = yon_ubl_menu_item_about_new(ABOUT_LABEL);
@ -630,11 +638,13 @@ main_window *yon_main_window_complete(){
gtk_style_context_remove_class(gtk_widget_get_style_context(widgets->DocumentationMenuItem),"menuitemtop");
gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->DocumentationMenuItem);
gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->AboutMenuItem);
g_signal_connect(G_OBJECT(widgets->LoadGlobalConfigurationMenuItem),"activate",G_CALLBACK(on_config_global_load),widgets);
g_signal_connect(G_OBJECT(widgets->LoadLocalConfigurationMenuItem),"activate",G_CALLBACK(on_config_local_load),widgets);
g_signal_connect(G_OBJECT(widgets->LoadExternalConfigurationMenuItem),"activate",G_CALLBACK(on_config_custom_load),widgets);
g_signal_connect(G_OBJECT(widgets->EnableVNCMenuItem),"activate",G_CALLBACK(on_vnc_toggled),widgets);
// g_signal_connect(G_OBJECT(widgets->SaveGlobalLocalConfigurationMenuItem),"activate",G_CALLBACK(on_config_global_local_save),widgets);
// g_signal_connect(G_OBJECT(widgets->SaveGlobalConfigurationMenuItem),"activate",G_CALLBACK(on_config_global_save),widgets);
// g_signal_connect(G_OBJECT(widgets->SaveLocalConfigurationMenuItem),"activate",G_CALLBACK(on_config_local_save),widgets);

9
source/ubinstall-gtk.h
Unescape View File

@ -69,6 +69,7 @@
#define kernel_list_addon_path "resource:///com/ublinux/csv/kernel-list-addon.csv"
#define services_list_path "resource:///com/ublinux/csv/services-list.csv"
#define network_path "resource:///com/ublinux/csv/network-list.csv"
#define fs_types_path "resource:///com/ublinux/csv/filesystems-format-list.csv"
#define slide_0_path "/com/ublinux/images/slide-0.png"
@ -122,6 +123,10 @@ layout && /description:/ {\
}\
\" | sort -u\
"
#define enable_vnc_command "ubconfig --target system set [desktop] X11VNC=ublinux"
#define disable_vnc_command "ubconfig --target system remove [desktop] X11VNC=ublinux"
#define get_layouts_local_command(layout) yon_char_unite("xkbcli list --load-exotic | awk -v layout=\"",layout,"\" \"BEGIN {layout_pattern = sprintf(\\\"^ *- *layout: *'%s'\\\",layout);matched=0} matched && /variant:/ {match(\\$0, /: *'([^']+)'/, matches);variant = matches[1]} matched && /description:/ {match(\\$0, /: *(.+)/, matches);description = matches[1]} matched && /^ *-/{matched=0; if (variant) printf \\\"%s|%s\\n\\\",variant,description} \\$0 ~ layout_pattern {matched=1;variant=\\\"\\\";description=\\\"\\\";next}\" | sort -u",NULL)
#define get_devices_command "lsblk --noheadings --nodeps -Jo PATH,SIZE,MODEL,VENDOR,SERIAL --exclude 7"
#define get_parts_and_devices_command "lsblk --noheadings --bytes -o TYPE,PATH,SIZE,FSTYPE,LABEL,PARTLABEL,MOUNTPOINT,FSUSED,FSUSE% --exclude 7 |awk '{print ($1\";\"$2\";\"$3\";\"$4\";\"$5\";\"$6\";\"$7\";\"$8\";\"$9)}'"
@ -514,6 +519,7 @@ typedef struct {
GtkWidget *ConfigurationModeMenuItem;
GtkWidget *EnableVNCMenuItem;
GtkWidget *AboutMenuItem;
GtkWidget *DocumentationMenuItem;
@ -1112,4 +1118,5 @@ void yon_source_update(source_window *window);
void yon_source_element_add(char *key,void*,source_window *window);
source_element *yon_source_element_new();
void on_system_setup_pass(GtkWidget *, main_window *widgets);
void yon_resize_images_update(main_window *widgets);
void yon_resize_images_update(main_window *widgets);
void on_vnc_toggled(GtkWidget *self, main_window *widgets);

56
ubinstall-gtk.glade
Unescape View File

@ -759,7 +759,6 @@ 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>
@ -5240,17 +5239,6 @@ or continue working in the UBLinux Live environment.</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="active">1</property>
<items>
<item id="ext3" translatable="yes">ext3</item>
<item id="ext4" translatable="yes">ext4</item>
<item id="fat16" translatable="yes">fat16</item>
<item id="fat32" translatable="yes">fat32</item>
<item id="exfat" translatable="yes">exfat</item>
<item id="riserfs" translatable="yes">riserfs</item>
<item id="udf" translatable="yes">udf</item>
<item id="xfs" translatable="yes">xfs</item>
<item id="zfs" translatable="yes">zfs</item>
</items>
</object>
<packing>
<property name="expand">True</property>
@ -5917,17 +5905,6 @@ or continue working in the UBLinux Live environment.</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="active">1</property>
<items>
<item id="ext3" translatable="yes">ext3</item>
<item id="ext4" translatable="yes">ext4</item>
<item id="fat16" translatable="yes">fat16</item>
<item id="fat32" translatable="yes">fat32</item>
<item id="exfat" translatable="yes">exfat</item>
<item id="riserfs" translatable="yes">riserfs</item>
<item id="udf" translatable="yes">udf</item>
<item id="xfs" translatable="yes">xfs</item>
<item id="zfs" translatable="yes">zfs</item>
</items>
</object>
<packing>
<property name="expand">True</property>
@ -6553,17 +6530,6 @@ or continue working in the UBLinux Live environment.</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="active">1</property>
<items>
<item id="ext3" translatable="yes">ext3</item>
<item id="ext4" translatable="yes">ext4</item>
<item id="fat16" translatable="yes">fat16</item>
<item id="fat32" translatable="yes">fat32</item>
<item id="exfat" translatable="yes">exfat</item>
<item id="riserfs" translatable="yes">riserfs</item>
<item id="udf" translatable="yes">udf</item>
<item id="xfs" translatable="yes">xfs</item>
<item id="zfs" translatable="yes">zfs</item>
</items>
</object>
<packing>
<property name="expand">True</property>
@ -9437,17 +9403,6 @@ separately into the selected partition.</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="active">1</property>
<items>
<item id="ext3" translatable="yes">ext3</item>
<item id="ext4" translatable="yes">ext4</item>
<item id="fat16" translatable="yes">fat16</item>
<item id="fat32" translatable="yes">fat32</item>
<item id="exfat" translatable="yes">exfat</item>
<item id="riserfs" translatable="yes">riserfs</item>
<item id="udf" translatable="yes">udf</item>
<item id="xfs" translatable="yes">xfs</item>
<item id="zfs" translatable="yes">zfs</item>
</items>
</object>
<packing>
<property name="expand">True</property>
@ -10167,17 +10122,6 @@ separately into the selected partition.</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="active">1</property>
<items>
<item id="ext3" translatable="yes">ext3</item>
<item id="ext4" translatable="yes">ext4</item>
<item id="fat16" translatable="yes">fat16</item>
<item id="fat32" translatable="yes">fat32</item>
<item id="exfat" translatable="yes">exfat</item>
<item id="riserfs" translatable="yes">riserfs</item>
<item id="udf" translatable="yes">udf</item>
<item id="xfs" translatable="yes">xfs</item>
<item id="zfs" translatable="yes">zfs</item>
</items>
</object>
<packing>
<property name="expand">True</property>

Write Preview
Loading…
Cancel
Save