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

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

Browse Source 
Reviewed-on: #98
master
Dmitry Razumov 2 months ago
parent a0aaf4fdb1 a62391c518
commit 9885cde6f2
19 changed files with 298 additions and 119 deletions
Show Stats Download Patch File Download Diff File

13
gresource.xml
Unescape View File

@ -41,11 +41,16 @@
<file>slide-10.png</file>
<file>slide-11.png</file>
<file>slide-12.png</file>
<file>near_install_disk.png</file>
<file>language.png</file>
<file>in_part_install_disk.png</file>
<file>clear_install_disk.png</file>
<file>manual_install_disk.png</file>
<file>install_type_custom_normal.png</file>
<file>install_type_data_only_normal.png</file>
<file>install_type_fast_normal.png</file>
<file>install_type_grub_install_normal.png</file>
<file>install_type_grub_update_normal.png</file>
<file>install_type_next_normal.png</file>
<file>install_type_part_normal.png</file>
<file>install_type_recovery_normal.png</file>
<file>install_type_system_only_normal.png</file>
</gresource>
<gresource prefix="/com/ublinux/csv">
<file>modules.csv</file>

BIN
icons-builtin/install_type_custom_normal.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
icons-builtin/install_type_data_only_normal.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
icons-builtin/install_type_fast_normal.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
icons-builtin/install_type_grub_install_normal.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
icons-builtin/install_type_grub_update_normal.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
icons-builtin/install_type_next_normal.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
icons-builtin/install_type_part_normal.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
icons-builtin/install_type_recovery_normal.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
icons-builtin/install_type_system_only_normal.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

13
source/CMakeLists.txt
Unescape View File

@ -53,10 +53,6 @@ set(DEPENDFILES
../images/slide-11.png
../images/slide-12.png
../images/slide-12.png
../images/near_install_disk.png
../images/in_part_install_disk.png
../images/clear_install_disk.png
../images/manual_install_disk.png
../images/language.png
../ubinstall-gtk.glade
../ubinstall-gtk-language.glade
@ -84,6 +80,15 @@ set(DEPENDFILES
../kernel-list-addon.csv
../services-list.csv
../network-list.csv
../icons-builtin/install_type_custom_normal.png
../icons-builtin/install_type_data_only_normal.png
../icons-builtin/install_type_fast_normal.png
../icons-builtin/install_type_grub_install_normal.png
../icons-builtin/install_type_grub_update_normal.png
../icons-builtin/install_type_next_normal.png
../icons-builtin/install_type_part_normal.png
../icons-builtin/install_type_recovery_normal.png
../icons-builtin/install_type_system_only_normal.png
)
file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

131
source/ubinstall-gtk-decorations.c
Unescape View File

@ -0,0 +1,131 @@
#include "ubinstall-gtk.h"
void yon_resize_images_update(main_window *widgets){
enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook));
gtk_widget_hide(widgets->BootloaderImage);
gtk_widget_hide(widgets->RegionImage);
gtk_widget_hide(widgets->KeyboardImage);
gtk_widget_hide(widgets->UserImage);
gtk_widget_hide(widgets->StartupImage);
gtk_widget_hide(widgets->NetworkImage);
switch(page){
case YON_PAGE_BOOTLOADER:
gtk_widget_show(widgets->BootloaderImage);
break;
case YON_PAGE_REGION:
gtk_widget_show(widgets->RegionImage);
break;
case YON_PAGE_KEYBOARD:
gtk_widget_show(widgets->KeyboardImage);
break;
case YON_PAGE_USERS:
gtk_widget_show(widgets->UserImage);
break;
case YON_PAGE_STARTUP:
gtk_widget_show(widgets->StartupImage);
break;
case YON_PAGE_NETWORK:
gtk_widget_show(widgets->NetworkImage);
break;
case YON_PAGE_INSTALLATION:
gtk_widget_show(widgets->SlidesImage);
g_timeout_add(7000,on_image_slide,widgets);
break;
default:
break;
}
}
void on_region_resized(GtkWidget *,main_window *widgets){
enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook));
GtkImage *target = NULL;
GdkPixbuf *pixbuf = NULL;
switch (page){
case YON_PAGE_BOOTLOADER:
target = GTK_IMAGE(widgets->BootloaderImage);
pixbuf = widgets->bootloader_original;
break;
case YON_PAGE_REGION:
target = GTK_IMAGE(widgets->RegionImage);
pixbuf = widgets->region_original;
break;
case YON_PAGE_KEYBOARD:
target = GTK_IMAGE(widgets->KeyboardImage);
pixbuf = widgets->keyboard_original;
break;
case YON_PAGE_USERS:
target = GTK_IMAGE(widgets->UserImage);
pixbuf = widgets->user_original;
break;
case YON_PAGE_STARTUP:
target = GTK_IMAGE(widgets->StartupImage);
pixbuf = widgets->startup_original;
break;
case YON_PAGE_NETWORK:
target = GTK_IMAGE(widgets->NetworkImage);
pixbuf = widgets->network_original;
break;
case YON_PAGE_INSTALLATION:
target = GTK_IMAGE(widgets->SlidesImage);
pixbuf = g_list_nth_data(widgets->slides_original,main_config.cur_slide);
break;
default:
break;
}
if (target){
yon_image_resize_from_container(target,pixbuf);
}
}
int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled){
int width = gtk_widget_get_allocated_width((gtk_widget_get_parent(GTK_WIDGET(target))));
int height = gtk_widget_get_allocated_height((gtk_widget_get_parent(GTK_WIDGET(target))));
int newImgWidthDef = (width <= 217) ? width : width - 30;
int newImgHeightDef = (height <= 120) ? height : height - 80;
int originalWidth = gdk_pixbuf_get_width(pixbuf_unscaled);
int originalHeight = gdk_pixbuf_get_height(pixbuf_unscaled);
int newImgHeight = (int)(originalHeight / ((double) originalWidth / newImgWidthDef));
if (newImgHeight > newImgHeightDef) {
newImgHeight = newImgHeightDef;
newImgWidthDef = (int)(originalWidth / ((double) originalHeight / newImgHeight));
}
int newImageWidth = (int)(originalWidth / ((double) originalHeight / newImgHeight));
GdkPixbuf *scaledPixBuf = gdk_pixbuf_scale_simple(pixbuf_unscaled, newImageWidth, newImgHeight, GDK_INTERP_BILINEAR);
gtk_image_set_from_pixbuf(target, scaledPixBuf);
g_object_unref(scaledPixBuf);
return 1;
}
gboolean on_image_slide(void *data){
main_window *widgets = (main_window*)data;
int size;
config_str target = yon_char_parsed_new(&size,slide_repeat_path);
if (size)
yon_char_parsed_free(target,size);
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->SlidesImage),(GdkPixbuf*)g_list_nth_data(widgets->slides_original,main_config.cur_slide));
// gtk_widget_queue_draw(widgets->SlidesImage);
if ((int)main_config.cur_slide<size-1) main_config.cur_slide++; else main_config.cur_slide=1;
g_mutex_lock(&main_config.install_mutex);
if (!main_config.install_complete){
g_mutex_unlock(&main_config.install_mutex);
return 1;
} else{
g_mutex_unlock(&main_config.install_mutex);
return 0;
}
}

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

@ -75,6 +75,8 @@ enum YON_PAGES yon_page_get_current(GtkNotebook *target){
void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
enum YON_PAGES page = yon_page_get_current(GTK_NOTEBOOK(widgets->Notebook));
gtk_widget_hide(widgets->SourceButton);
gtk_widget_hide(widgets->StartScenarioButton);
switch(page){
case YON_PAGE_WELCOME:
yon_load_proceed(YON_CONFIG_LOCAL);
@ -100,6 +102,7 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
case YON_PAGE_INSTALLATION:
gtk_widget_set_sensitive(widgets->NextButton,0);
gtk_widget_set_sensitive(widgets->BackButton,0);
gtk_widget_hide(widgets->SkipInstallationButton);
break;
case YON_PAGE_KERNEL:
gtk_widget_set_sensitive(widgets->BackButton,0);
@ -116,12 +119,31 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
gtk_button_set_label(GTK_BUTTON(widgets->NextButton),RESTART_LABEL);
gtk_widget_set_sensitive(widgets->BackButton,0);
break;
case YON_PAGE_SECTIONS:
gtk_widget_show(widgets->SourceButton);
break;
default:
gtk_widget_set_sensitive(widgets->BackButton,1);
gtk_widget_set_sensitive(widgets->NextButton,1);
gtk_widget_set_sensitive(widgets->CancelInstallButton,1);
break;
}
switch(page){
case YON_PAGE_KERNEL:
case YON_PAGE_KERNEL_ADDON:
case YON_PAGE_PACMAN_SOFTWARE:
case YON_PAGE_REGION:
case YON_PAGE_KEYBOARD:
case YON_PAGE_USERS:
case YON_PAGE_STARTUP:
case YON_PAGE_BOOTLOADER:
case YON_PAGE_NETWORK:
gtk_widget_show(widgets->SkipInstallationButton);
break;
default:
gtk_widget_hide(widgets->SkipInstallationButton);
}
}
int yon_page_save(main_window *widgets, enum YON_PAGES page){
@ -276,6 +298,7 @@ void yon_configuration_mode_check(main_window *widgets){
}
void yon_page_update(main_window *widgets){
yon_resize_images_update(widgets);
yon_navigation_buttons_set_sensetiveness(widgets);
yon_switch_page_render(widgets);
yon_configuration_mode_check(widgets);
@ -403,4 +426,13 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){
gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,1);
yon_page_update(widgets);
}
void on_system_setup_pass(GtkWidget *, main_window *widgets){
if (main_config.configure_mode){
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_CONFIGURE_END);
} else {
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
}
yon_page_update(widgets);
}

6
source/ubinstall-gtk-region.c
Unescape View File

@ -1,11 +1,5 @@
#include "ubinstall-gtk.h"
// void on_region_resized(GtkWidget *,main_window *widgets){
// yon_image_resize_from_container(GTK_IMAGE(widgets->SlidesImage), (GdkPixbuf*)g_list_nth_data(widgets->slides_original,cur_slide));
// yon_image_resize_from_container(GTK_IMAGE(widgets->RegionImage), widgets->regions_original);
// yon_image_resize_from_container(GTK_IMAGE(widgets->KeyboardImage), widgets->keyboard_original);
// }
int yon_region_save(main_window *widgets){
if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->RegionCombo))==-1){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),REGION_EMPTY_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);

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

@ -789,16 +789,19 @@ int yon_config_save(main_window *widgets){
}
char *parameter_string = yon_char_parsed_to_string(all_parameters,size," ");
char *command = ubconfig_set_command_full(main_config.config_save_path,"",parameter_string);
if (!system(command)){
return 1;
if (!yon_char_is_empty(parameter_string)){
char *command = ubconfig_set_command_full(main_config.config_save_path,"",parameter_string);
if (!system(command)){
return 1;
} else return 0;
}
}
return 0;
return 1;
}
void yon_config_restore(main_window *widgets){
on_config_global_load(NULL,widgets);
system("ubconfig --source system remove [autoinstall] /");
system("ubconfig --source system remove [autoinstall]");
yon_config_save_simple(YON_CONFIG_LOCAL,"system");
}

75
source/ubinstall-gtk.c
Unescape View File

@ -2,8 +2,6 @@
config main_config;
int cur_slide=0;
// //functions
void on_pacman_software_all_toggled(GtkWidget *, char *path, main_window *widgets){
@ -147,7 +145,7 @@ void on_source_choose(GtkWidget *self){
GtkWidget *target_mode = g_object_get_data(G_OBJECT(self),"combo");
switch (gtk_combo_box_get_active(GTK_COMBO_BOX(target_mode))){
case 0: {
} break;
case 1:{
filechooser_window *dialog = yon_file_chooser_window_new(GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
@ -214,6 +212,7 @@ source_window *yon_source_window_new(){
g_signal_connect(G_OBJECT(window->AddButton),"clicked",G_CALLBACK(on_source_add),window);
g_signal_connect(G_OBJECT(window->PathButton),"clicked",G_CALLBACK(on_source_choose),window);
g_signal_connect(G_OBJECT(window->AutoSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->AddBox);
g_signal_connect(G_OBJECT(window->AutoSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->TypeCombo);
g_signal_connect(G_OBJECT(window->AutoSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->AddButton);
g_signal_connect(G_OBJECT(window->AutoSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->PathButton);
g_signal_connect(G_OBJECT(window->AutoSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->PathEntry);
@ -284,56 +283,13 @@ void config_init(){
main_config.config_save_path = NULL;
yon_packages_init();
main_config.network_types = g_hash_table_new(g_str_hash,g_str_equal);
main_config.cur_slide=0;
}
// void on_root_get_root(char *argline){
// yon_launch(argline);
// }
// int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled){
// int width = gtk_widget_get_allocated_width((gtk_widget_get_parent(GTK_WIDGET(target))));
// int height = gtk_widget_get_allocated_height((gtk_widget_get_parent(GTK_WIDGET(target))));
//
// int newImgWidthDef = (width <= 217) ? width : width - 30;
// int newImgHeightDef = (height <= 120) ? height : height - 80;
//
// int originalWidth = gdk_pixbuf_get_width(pixbuf_unscaled);
// int originalHeight = gdk_pixbuf_get_height(pixbuf_unscaled);
// int newImgHeight = (int)(originalHeight / ((double) originalWidth / newImgWidthDef));
//
// if (newImgHeight > newImgHeightDef) {
// newImgHeight = newImgHeightDef;
// newImgWidthDef = (int)(originalWidth / ((double) originalHeight / newImgHeight));
// }
// int newImageWidth = (int)(originalWidth / ((double) originalHeight / newImgHeight));
//
// GdkPixbuf *scaledPixBuf = gdk_pixbuf_scale_simple(pixbuf_unscaled, newImageWidth, newImgHeight, GDK_INTERP_BILINEAR);
// gtk_image_set_from_pixbuf(target, scaledPixBuf);
//
// g_object_unref(scaledPixBuf);
//
// return 1;
// }
// gboolean on_image_slide(void *data){
// main_window *widgets = (main_window*)data;
// int size;
// config_str target = yon_char_parsed_new(&size,slide_repeat_path);
// if (size)
// yon_char_parsed_free(target,size);
// gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->SlidesImage),(GdkPixbuf*)g_list_nth_data(widgets->slides_original,cur_slide));
// // gtk_widget_queue_draw(widgets->SlidesImage);
// if (cur_slide<size-1) cur_slide++; else cur_slide=1;
// g_mutex_lock(&main_config.install_mutex);
// if (!main_config.install_complete){
// g_mutex_unlock(&main_config.install_mutex);
// return 1;
// } else{
// g_mutex_unlock(&main_config.install_mutex);
// return 0;
// }
// }
// void *on_setup_system_configuration(void *data);
// void on_locale_changed(GtkWidget *,main_window *){
@ -566,6 +522,7 @@ main_window *yon_main_window_complete(){
widgets->RemoveButton=yon_gtk_builder_get_widget(builder,"RemoveButton");
widgets->RegionSensitiveSwitch = yon_gtk_builder_get_widget(builder,"RegionSensitiveSwitch");
widgets->UserImage=yon_gtk_builder_get_widget(builder,"UserImage");
widgets->UserRootNameEntry=yon_gtk_builder_get_widget(builder,"UserRootNameEntry");
widgets->UserRootLoginEntry=yon_gtk_builder_get_widget(builder,"UserRootLoginEntry");
widgets->UserRootPasswordCombo=yon_gtk_builder_get_widget(builder,"UserRootPasswordCombo");
@ -631,6 +588,7 @@ main_window *yon_main_window_complete(){
widgets->PacmanSoftwareChosenList = GTK_LIST_STORE(gtk_builder_get_object(builder,"PacmanSoftwareChosenList"));
widgets->PacmanSoftwareChosenCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"PacmanSoftwareChosenCell"));
widgets->StartupImage = yon_gtk_builder_get_widget(builder,"StartupImage");
widgets->StartupServicesTree = yon_gtk_builder_get_widget(builder,"StartupServicesTree");
widgets->StartupServicesAddButton = yon_gtk_builder_get_widget(builder,"StartupServicesAddButton");
widgets->StartupServicesEditButton = yon_gtk_builder_get_widget(builder,"StartupServicesEditButton");
@ -638,6 +596,7 @@ main_window *yon_main_window_complete(){
widgets->StartupChosenCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"StartupChosenCell"));
widgets->StartupList = GTK_LIST_STORE(gtk_builder_get_object(builder,"StartupList"));
widgets->BootloaderImage = yon_gtk_builder_get_widget(builder,"BootloaderImage");
widgets->BootloadTimerSwitch = yon_gtk_builder_get_widget(builder,"BootloadTimerSwitch");
widgets->BootloadTimerSpin = yon_gtk_builder_get_widget(builder,"BootloadTimerSpin");
widgets->BootloadDefaultOSEntry = yon_gtk_builder_get_widget(builder,"BootloadDefaultOSEntry");
@ -648,6 +607,7 @@ main_window *yon_main_window_complete(){
widgets->BootloadUserRemoveButton = yon_gtk_builder_get_widget(builder,"BootloadUserRemoveButton");
widgets->BootloadUsersList = GTK_LIST_STORE(gtk_builder_get_object(builder,"BootloadUsersList"));
widgets->NetworkImage = yon_gtk_builder_get_widget(builder,"NetworkImage");
widgets->NetworkDomainSwitch = yon_gtk_builder_get_widget(builder,"NetworkDomainSwitch");
widgets->NetworkDomainNameEntry = yon_gtk_builder_get_widget(builder,"NetworkDomainNameEntry");
widgets->NetworkDomainAdminEntry = yon_gtk_builder_get_widget(builder,"NetworkDomainAdminEntry");
@ -687,7 +647,7 @@ main_window *yon_main_window_complete(){
g_signal_connect(G_OBJECT(widgets->GpartedSameButton),"clicked",G_CALLBACK(on_gparted_open),NULL);
g_signal_connect(G_OBJECT(widgets->GpartedNextInstallationButton),"clicked",G_CALLBACK(on_gparted_open),NULL);
// g_signal_connect(G_OBJECT(widgets->MainWindow),"check-resize",G_CALLBACK(on_region_resized),widgets);
g_signal_connect(G_OBJECT(widgets->MainWindow),"check-resize",G_CALLBACK(on_region_resized),widgets);
g_signal_connect(G_OBJECT(widgets->NextButton),"clicked",G_CALLBACK(on_page_next_clicked),widgets);
g_signal_connect(G_OBJECT(widgets->BackButton),"clicked",G_CALLBACK(on_page_prev_clicked),widgets);
g_signal_connect(G_OBJECT(widgets->CancelInstallButton),"clicked",G_CALLBACK(on_page_cancel_clicked),widgets);
@ -766,6 +726,7 @@ main_window *yon_main_window_complete(){
// g_signal_connect(G_OBJECT(widgets->AdvancedPartitionAddBox),"remove",G_CALLBACK(on_advanced_parts_removed),widgets);
g_signal_connect(G_OBJECT(widgets->StartScenarioButton),"clicked",G_CALLBACK(yon_quick_install),widgets);
g_signal_connect(G_OBJECT(widgets->SourceButton),"clicked",G_CALLBACK(on_source_clicked),widgets);
g_signal_connect(G_OBJECT(widgets->SkipInstallationButton),"clicked",G_CALLBACK(on_system_setup_pass),widgets);
{
@ -802,8 +763,12 @@ main_window *yon_main_window_complete(){
{
int size;
config_str slides = yon_char_parsed_new(&size,slide_repeat_path);
widgets->regions_original = gdk_pixbuf_new_from_resource(regions_path,NULL);
widgets->region_original = gdk_pixbuf_new_from_resource(regions_path,NULL);
widgets->keyboard_original = gdk_pixbuf_new_from_resource(keyboard_path,NULL);
widgets->user_original = gdk_pixbuf_new_from_resource(users_path,NULL);
widgets->startup_original = gdk_pixbuf_new_from_resource(startup_path,NULL);
widgets->bootloader_original = gdk_pixbuf_new_from_resource(bootloader_path,NULL);
widgets->network_original = gdk_pixbuf_new_from_resource(network_icon_path,NULL);
widgets->slides_original = NULL;
widgets->slides_original = g_list_prepend(widgets->slides_original,gdk_pixbuf_new_from_resource(slide_0_path,NULL));
for (int i=1;i<size;i++){
@ -811,18 +776,6 @@ main_window *yon_main_window_complete(){
}
widgets->slides_original = g_list_reverse(widgets->slides_original);
yon_char_parsed_free(slides,size);
int width = gdk_pixbuf_get_width(widgets->regions_original);
int height = gdk_pixbuf_get_height(widgets->regions_original);
widgets->region_height_mult = (float)height/width;
GdkPixbuf *pix = gdk_pixbuf_scale_simple(widgets->regions_original,600,400,GDK_INTERP_BILINEAR);
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->RegionImage),pix);
g_object_unref(pix);
pix = gdk_pixbuf_scale_simple(widgets->keyboard_original,600,400,GDK_INTERP_BILINEAR);
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->KeyboardImage),pix);
g_object_unref(pix);
pix = gdk_pixbuf_scale_simple((GdkPixbuf*)g_list_nth_data(widgets->slides_original,0),600,400,GDK_INTERP_BILINEAR);
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->SlidesImage),pix);
g_object_unref(pix);
}
gtk_builder_connect_signals(builder,NULL);
// yon_load_proceed(YON_CONFIG_LOCAL);

21
source/ubinstall-gtk.h
Unescape View File

@ -51,6 +51,10 @@
#define regions_path "/com/ublinux/images/map-time-zone.png"
#define keyboard_path "/com/ublinux/images/keyboard.png"
#define users_path "/com/ublinux/images/map-time-zone.png"
#define startup_path "/com/ublinux/images/keyboard.png"
#define bootloader_path "/com/ublinux/images/map-time-zone.png"
#define network_icon_path "/com/ublinux/images/keyboard.png"
#define licence_path "/usr/share/ublinux/agreement/EULA.txt"
@ -320,8 +324,6 @@ layout && /description:/ {\
typedef char* string;
__attribute__((unused)) static \
string version_application;
extern int cur_slide;
enum YON_PAGES {
YON_PAGE_WELCOME = 0,
@ -387,6 +389,7 @@ typedef struct {
char *config_load_path;
char *config_save_path;
unsigned int cur_slide;
} config;
extern config main_config;
@ -454,6 +457,7 @@ typedef struct {
GtkWidget *InstallationWindowsRadio;
GtkWidget *InstallationOptionsRadio;
GtkWidget *UserImage;
GtkWidget *UserRootNameEntry;
GtkWidget *UserRootLoginEntry;
GtkWidget *UserRootPasswordCombo;
@ -564,8 +568,12 @@ typedef struct {
GtkTreeModel *LanguagesFilter;
GtkTreeModel *LayoutsFilter;
GdkPixbuf *regions_original;
GdkPixbuf *region_original;
GdkPixbuf *keyboard_original;
GdkPixbuf *user_original;
GdkPixbuf *startup_original;
GdkPixbuf *bootloader_original;
GdkPixbuf *network_original;
GList *slides_original;
float region_height_mult;
@ -608,6 +616,7 @@ typedef struct {
GtkListStore *PacmanSoftwareChosenList;
GtkCellRenderer *PacmanSoftwareChosenCell;
GtkWidget *StartupImage;
GtkWidget *StartupServicesTree;
GtkWidget *StartupServicesAddButton;
GtkWidget *StartupServicesEditButton;
@ -615,6 +624,7 @@ typedef struct {
GtkCellRenderer *StartupChosenCell;
GtkListStore *StartupList;
GtkWidget *BootloaderImage;
GtkWidget *BootloadTimerSwitch;
GtkWidget *BootloadTimerSpin;
GtkWidget *BootloadDefaultOSEntry;
@ -625,6 +635,7 @@ typedef struct {
GtkWidget *BootloadUserTree;
GtkListStore *BootloadUsersList;
GtkWidget *NetworkImage;
GtkWidget *NetworkDomainSwitch;
GtkWidget *NetworkDomainNameEntry;
GtkWidget *NetworkDomainAdminEntry;
@ -1104,4 +1115,6 @@ void on_source_remove(GtkWidget *,source_element *element);
void on_source_add(GtkWidget *,source_window *window);
void yon_source_update(source_window *window);
void yon_source_element_add(char *key,void*,source_window *window);
source_element *yon_source_element_new();
source_element *yon_source_element_new();
void on_system_setup_pass(GtkWidget *, main_window *widgets);
void yon_resize_images_update(main_window *widgets);

7
ubinstall-gtk-source.glade
Unescape View File

@ -92,6 +92,7 @@
<object class="GtkSwitch" id="AutoSwitch">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="active">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -122,6 +123,7 @@
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hscrollbar-policy">never</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
@ -140,6 +142,7 @@
<child>
<object class="GtkComboBoxText" id="TypeCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="active">0</property>
<items>
@ -157,6 +160,7 @@
<child>
<object class="GtkEntry" id="PathEntry">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
</object>
<packing>
@ -168,6 +172,7 @@
<child>
<object class="GtkButton" id="PathButton">
<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">image1</property>
@ -184,6 +189,7 @@
<child>
<object class="GtkButton" id="AddButton">
<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">image2</property>
@ -207,6 +213,7 @@
<child>
<object class="GtkBox" id="AddBox">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>

106
ubinstall-gtk.glade
Unescape View File

@ -371,6 +371,17 @@
</style>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="EnableVNCMenuItem">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Enable VNC server</property>
<property name="use-underline">True</property>
<style>
<class name="menuitemmiddle"/>
</style>
</object>
</child>
</object>
<object class="GtkMenu" id="menu3">
<property name="visible">True</property>
@ -748,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>
@ -977,7 +989,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/clear_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_fast_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -1054,7 +1066,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/near_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_next_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -1131,7 +1143,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/in_part_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_part_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -1208,7 +1220,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/manual_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_custom_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -1285,6 +1297,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/install_type_recovery_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -2521,6 +2534,8 @@ and help you install UBLinux on your computer</property>
<property name="shadow-type">none</property>
<child>
<object class="GtkImage" id="RegionImage">
<property name="width-request">1</property>
<property name="height-request">1</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
@ -2813,6 +2828,8 @@ and help you install UBLinux on your computer</property>
<property name="shadow-type">none</property>
<child>
<object class="GtkImage" id="KeyboardImage">
<property name="width-request">1</property>
<property name="height-request">1</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
@ -3104,7 +3121,9 @@ and help you install UBLinux on your computer</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<object class="GtkImage">
<object class="GtkImage" id="UserImage">
<property name="width-request">1</property>
<property name="height-request">1</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
@ -3114,7 +3133,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">1</property>
</packing>
@ -3158,6 +3177,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="min-content-height">290</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
@ -3405,7 +3425,7 @@ and help you install UBLinux on your computer</property>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
@ -3457,7 +3477,9 @@ and help you install UBLinux on your computer</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<object class="GtkImage">
<object class="GtkImage" id="StartupImage">
<property name="width-request">1</property>
<property name="height-request">1</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
@ -3467,7 +3489,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">1</property>
</packing>
@ -3536,6 +3558,7 @@ and help you install UBLinux on your computer</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="shadow-type">in</property>
<property name="min-content-height">290</property>
<child>
<object class="GtkTreeView" id="StartupServicesTree">
<property name="visible">True</property>
@ -3596,7 +3619,7 @@ and help you install UBLinux on your computer</property>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
@ -3648,7 +3671,9 @@ and help you install UBLinux on your computer</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<object class="GtkImage">
<object class="GtkImage" id="BootloaderImage">
<property name="width-request">1</property>
<property name="height-request">1</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
@ -3658,7 +3683,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">1</property>
</packing>
@ -4008,7 +4033,7 @@ and help you install UBLinux on your computer</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<object class="GtkImage">
<object class="GtkImage" id="NetworkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
@ -4018,13 +4043,14 @@ 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">1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="height-request">350</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
@ -4282,13 +4308,26 @@ and help you install UBLinux on your computer</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkBox" id="NetworkConnectionsBox">
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<property name="can-focus">True</property>
<property name="shadow-type">in</property>
<child>
<placeholder/>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox" id="NetworkConnectionsBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
@ -4886,7 +4925,7 @@ or continue working in the UBLinux Live environment.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/clear_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_fast_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -5340,7 +5379,7 @@ or continue working in the UBLinux Live environment.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/near_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_next_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -6023,7 +6062,7 @@ installed.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/in_part_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_part_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -6640,7 +6679,7 @@ installed.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/manual_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_custom_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -7683,7 +7722,7 @@ separately into the selected partition.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/manual_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_recovery_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -7783,7 +7822,7 @@ separately into the selected partition.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property>
<property name="resource">/com/ublinux/images/install_type_grub_install_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -7860,7 +7899,7 @@ separately into the selected partition.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property>
<property name="resource">/com/ublinux/images/install_type_grub_update_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -7937,7 +7976,7 @@ separately into the selected partition.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property>
<property name="resource">/com/ublinux/images/install_type_system_only_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -8014,7 +8053,7 @@ separately into the selected partition.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property>
<property name="resource">/com/ublinux/images/install_type_data_only_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -8166,7 +8205,7 @@ separately into the selected partition.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/clear_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_grub_install_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -8541,7 +8580,7 @@ separately into the selected partition.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/clear_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_grub_update_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -8909,7 +8948,7 @@ separately into the selected partition.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/clear_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_system_only_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -9636,7 +9675,7 @@ separately into the selected partition.</property>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="resource">/com/ublinux/images/clear_install_disk.png</property>
<property name="resource">/com/ublinux/images/install_type_data_only_normal.png</property>
</object>
<packing>
<property name="expand">False</property>
@ -10532,7 +10571,6 @@ separately into the selected partition.</property>
<child>
<object class="GtkButton" id="StartScenarioButton">
<property name="label" translatable="yes">Start installation scenario</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
</object>
@ -10545,7 +10583,6 @@ separately into the selected partition.</property>
<child>
<object class="GtkButton" id="SourceButton">
<property name="label" translatable="yes">Source</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
</object>
@ -10558,7 +10595,6 @@ separately into the selected partition.</property>
<child>
<object class="GtkButton" id="SkipInstallationButton">
<property name="label" translatable="yes">Skip installation</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
</object>

Write Preview
Loading…
Cancel
Save