diff --git a/Makefile b/Makefile
index b28a503..2792aeb 100644
--- a/Makefile
+++ b/Makefile
@@ -113,9 +113,9 @@ install: check uninstall
done
@for SIZE in 16 32 48; do \
install -dm755 "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
- rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}-gui.svg" -o "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}-gui.svg"; \
+ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
done
- @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}-gui.svg"
+ @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/csv" "locales.csv"
@for FILE_ICON in $(wildcard icons/*/*.svg); do \
SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \
diff --git a/com.ublinux.ubinstall-gtk-gui.svg b/com.ublinux.ubinstall-gtk.svg
similarity index 100%
rename from com.ublinux.ubinstall-gtk-gui.svg
rename to com.ublinux.ubinstall-gtk.svg
diff --git a/gresource.xml b/gresource.xml
index cfd08bd..359f308 100644
--- a/gresource.xml
+++ b/gresource.xml
@@ -4,6 +4,8 @@
ubinstall-gtk.glade
ubinstall-gtk-language.glade
ubinstall-gtk-keyboard.glade
+ ubinstall-gtk-about.glade
+ ubinstall-gtk-documentation.glade
ubinstall-gtk.css
diff --git a/icons/actions/com.ublinux.ubinstall.increase-symbolic.svg b/icons/actions/com.ublinux.ubinstall.increase-symbolic.svg
new file mode 100644
index 0000000..800b264
--- /dev/null
+++ b/icons/actions/com.ublinux.ubinstall.increase-symbolic.svg
@@ -0,0 +1,40 @@
+
+
diff --git a/icons/actions/com.ublinux.ubinstall.properties-symbolic.svg b/icons/actions/com.ublinux.ubinstall.properties-symbolic.svg
new file mode 100644
index 0000000..93afc13
--- /dev/null
+++ b/icons/actions/com.ublinux.ubinstall.properties-symbolic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icons/actions/com.ublinux.ubinstall.trash-symbolic.svg b/icons/actions/com.ublinux.ubinstall.trash-symbolic.svg
new file mode 100644
index 0000000..734827e
--- /dev/null
+++ b/icons/actions/com.ublinux.ubinstall.trash-symbolic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 4773d88..96f05bf 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -60,6 +60,8 @@ set(DEPENDFILES
../ubinstall-gtk.glade
../ubinstall-gtk-language.glade
../ubinstall-gtk-keyboard.glade
+ ../ubinstall-gtk-about.glade
+ ../ubinstall-gtk-documentation.glade
../gresource.xml
../ubinstall-gtk.css
../modules.csv
diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index 78ac3e8..301eea2 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -10,6 +10,59 @@ config main_config;
// }
// }
+void yon_open_browser(GtkWidget *, char *link);
+void yon_open_browser(GtkWidget *, char *link){
+ GtkWidget *window = yon_ubl_browser_window_open(link,TITLE_LABEL);
+ if (window)
+ gtk_window_set_icon_name(GTK_WINDOW(window),yon_char_append("com.ublinux.",LocaleName));
+}
+
+void on_open_documentation_confirmation(GtkWidget *self, char *link);
+void on_open_documentation_confirmation(GtkWidget *self, char *link){
+ if (main_config.always_open_documentation==0){
+ GtkBuilder *builder = gtk_builder_new_from_resource(ui_glade_path_documentation);
+ documentation_confirmation_window *window = malloc(sizeof(documentation_confirmation_window));
+ window->Window = yon_gtk_builder_get_widget(builder,"helpConfirmationWindow");
+ window->AcceptButton = yon_gtk_builder_get_widget(builder,"ReadHelpButton");
+ window->CloseButton = yon_gtk_builder_get_widget(builder,"CancelHelpButton");
+ window->HeaderLabel = yon_gtk_builder_get_widget(builder,"webHeaderNameLabel");
+ window->AlwaysOpenCheck = yon_gtk_builder_get_widget(builder,"AlwaysOpenDocumentationCheckbox");
+ gtk_label_set_text(GTK_LABEL(window->HeaderLabel),TITLE_LABEL);
+ gtk_widget_show_all(window->Window);
+ g_signal_connect(G_OBJECT(window->CloseButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
+ g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(yon_open_browser),yon_char_new(link));
+ g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
+
+
+ } else {
+ yon_open_browser(self,link);
+ }
+}
+
+void on_link(GtkWidget *self, char* uri);
+void on_link(GtkWidget *self, char* uri){
+ gtk_widget_destroy(self);
+ on_open_documentation_confirmation(self,uri);
+}
+
+void on_about(GtkWidget *);
+void on_about(GtkWidget *){
+ GtkBuilder *builder=gtk_builder_new_from_resource(ui_glade_path_about);
+ GtkWidget *window=yon_gtk_builder_get_widget(builder,"AboutWindow");
+ GtkWidget *title=yon_gtk_builder_get_widget(builder,"headerAboutTopic");
+ GtkWidget *hideButtonBox=yon_gtk_builder_get_widget(builder,"buttonBoxHide");
+ gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(window),version_application);
+ gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(window),TITLE_LABEL);
+ gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(window),yon_char_append("com.ublinux.",LocaleName));
+ gtk_window_set_icon_name(GTK_WINDOW(window),yon_char_append("com.ublinux.",LocaleName));
+ gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(window),LocaleName);
+ gtk_label_set_text(GTK_LABEL(title),TITLE_LABEL);
+ g_signal_connect(G_OBJECT(window),"activate-link",G_CALLBACK(on_link),WIKI_LINK);
+ gtk_widget_set_visible(hideButtonBox,0);
+ gtk_widget_destroy(hideButtonBox);
+ gtk_widget_show(window);
+}
+
double yon_size_long_convert_automatic(unsigned long bytes, char *size);
double yon_size_long_convert_automatic(unsigned long bytes, char *size){
int repeats;
@@ -311,7 +364,11 @@ gboolean yon_installation_progress_update(void *data){
double fraction = atof(percentage);
gtk_label_set_text(GTK_LABEL(widgets->InstallationLabel),current_copy);
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->InstallationProgress),fraction/100);
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(widgets->PackageInstallationProgress),0);
+ gtk_label_set_text(GTK_LABEL(widgets->PackageInstallationLabel),"");
} else {
+ gtk_widget_show(widgets->PackageInstallationProgress);
+ gtk_widget_show(widgets->PackageInstallationLabel);
int size;
config_str parsed = yon_char_parse(current_copy,&size," ");
double fraction = atof(parsed[3])/100;
@@ -341,7 +398,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
yon_switch_page_render(widgets,page>3?page-2:page);
switch(page){
case YON_PAGE_WELCOME: {
- gtk_widget_hide(widgets->CancelInstallButton);
+ gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
gtk_widget_set_sensitive(widgets->BackButton,0);
gtk_widget_set_sensitive(widgets->NextButton,1);
gtk_widget_set_sensitive(widgets->BackButton,0);
@@ -351,7 +408,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->CancelInstallButton))),"com.ublinux.ubinstall-gtk.circle-exit-symbolic",GTK_ICON_SIZE_BUTTON);
} break;
case YON_PAGE_LICENCE:{
- gtk_widget_show(widgets->CancelInstallButton);
+ gtk_widget_set_sensitive(widgets->CancelInstallButton,1);
gtk_widget_set_sensitive(widgets->BackButton,1);
} break;
case YON_PAGE_REGION: {
@@ -548,6 +605,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
char *file_system_type = (char*)gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(widgets->CommonInstallationFilesystemTypeCombo));
char *device_name = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->CommonInstallationSectionNameEntry));
char *device;
+ yon_config_remove_by_key(AUTOSTART_PARTS);
gtk_tree_model_get(model,&iter,0,&device,-1);
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"fast");
yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device);
@@ -581,7 +639,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
char *device_name = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->NextInstallationSectionNameEntry));
char *part;
gtk_tree_model_get(model,&iter,0,&part,-1);
- yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"next");
+ yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"part");
yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device);
yon_config_register(AUTOSTART_PARTS,AUTOSTART_PARTS_command,part);
yon_config_register(device_label_parameter,device_label_parameter_command,device_name);
@@ -619,7 +677,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
char *device_name = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->SameInstallationSectionNameEntry));
char *part;
gtk_tree_model_get(model,&iter,0,&part,-1);
- yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"part");
+ yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"next");
yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device);
yon_config_register(AUTOSTART_PARTS,AUTOSTART_PARTS_command,part);
yon_config_register(device_label_parameter,device_label_parameter_command,device_name);
@@ -1032,9 +1090,13 @@ main_window *yon_main_window_complete(){
widgets->CommonInstallationFilesystemTypeCombo = yon_gtk_builder_get_widget(builder,"CommonInstallationFilesystemTypeCombo");
widgets->CommonInstallationSectionNameEntry = yon_gtk_builder_get_widget(builder,"CommonInstallationSectionNameEntry");
+ widgets->GpartedCommonButton = yon_gtk_builder_get_widget(builder,"GpartedCommonButton");
widgets->GpartedNearButton = yon_gtk_builder_get_widget(builder,"GpartedNearButton");
widgets->GpartedSameButton = yon_gtk_builder_get_widget(builder,"GpartedSameButton");
+ widgets->DocumentationMenuItem = yon_gtk_builder_get_widget(builder,"DocumentationMenuItem");
+ widgets->AboutMenuItem = yon_gtk_builder_get_widget(builder,"AboutMenuItem");
+
widgets->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
widgets->AdditionalSoftwareCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"AdditionalSoftwareCell"));
@@ -1045,6 +1107,7 @@ main_window *yon_main_window_complete(){
widgets->AdditionalSoftwareList = GTK_LIST_STORE(gtk_builder_get_object(builder,"AdditionalSoftwareList"));
widgets->PartitionsList = GTK_LIST_STORE(gtk_builder_get_object(builder,"PartitionsList"));
+ g_signal_connect(G_OBJECT(widgets->GpartedCommonButton),"clicked",G_CALLBACK(on_gparted_open),NULL);
g_signal_connect(G_OBJECT(widgets->GpartedSameButton),"clicked",G_CALLBACK(on_gparted_open),NULL);
g_signal_connect(G_OBJECT(widgets->GpartedNearButton),"clicked",G_CALLBACK(on_gparted_open),NULL);
@@ -1068,6 +1131,9 @@ main_window *yon_main_window_complete(){
g_signal_connect(G_OBJECT(widgets->InstallationNearSysDevicesTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets);
g_signal_connect(G_OBJECT(widgets->SamePlaceDeviceTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets);
+ g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),widgets);
+ g_signal_connect(G_OBJECT(widgets->AboutMenuItem),"activate",G_CALLBACK(on_about),widgets);
+
g_signal_connect(G_OBJECT(widgets->SamePlacePartTree),"cursor-changed",G_CALLBACK(on_partition_changed),widgets);
g_signal_connect(G_OBJECT(widgets->InstallationNearSysSectionTree),"cursor-changed",G_CALLBACK(on_partition_changed),widgets);
gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(widgets->LayoutsFilter),3);
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index a567ad2..c79e2ce 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -16,13 +16,15 @@
#endif
#include "ubl-strings.h"
-#define WIKI_LINK "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubinstall-gtk-output"
+#define WIKI_LINK "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubinstall-gtk"
#define _(String) gettext(String)
#define glade_path "/com/ublinux/ui/ubinstall-gtk.glade"
#define glade_path_ubinstall_keyboard "/com/ublinux/ui/ubinstall-gtk-keyboard.glade"
#define glade_path_ubinstall_language "/com/ublinux/ui/ubinstall-gtk-language.glade"
+#define ui_glade_path_about "/com/ublinux/ui/ubinstall-gtk-about.glade"
+#define ui_glade_path_documentation "/com/ublinux/ui/ubinstall-gtk-documentation.glade"
#define CssPath "/com/ublinux/css/ubinstall-gtk.css"
#define config_path yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL)
@@ -110,7 +112,7 @@ NULL
#define part_type_parameter "AUTOINSTALL[part_fs_type]"
#define part_type_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[part_fs_type]"
-#define save_config_command(parameters) yon_char_unite("pkexec bash -c 'ubconfig set [autoinstall] ",parameters, "; nice ubinstall2 --test --config /etc/ublinux/autoinstall'", NULL)
+#define save_config_command(parameters) yon_char_unite("pkexec bash -c 'ubconfig --target source set [autoinstall] ",parameters, "; nice ubinstall2 autoinstall'", NULL)
#define set_user_config_command(parameters) yon_char_unite("pkexec bash -c 'ubconfig --target system set [autoinstall] ",parameters,";nice ubinstall2 autoconfig'",NULL)
@@ -260,9 +262,13 @@ typedef struct {
GtkWidget *PackageInstallationProgress;
GtkWidget *PackageInstallationLabel;
+ GtkWidget *GpartedCommonButton;
GtkWidget *GpartedNearButton;
GtkWidget *GpartedSameButton;
+ GtkWidget *AboutMenuItem;
+ GtkWidget *DocumentationMenuItem;
+
GtkCellRenderer *AdditionalSoftwareCell;
GtkWidget *CommonInstallationDevicesTree;
@@ -281,7 +287,7 @@ typedef struct {
typedef struct {
GtkWidget *Window;
-
+ GtkWidget *HeaderLabel;
GtkWidget *AlwaysOpenCheck;
GtkWidget *CloseButton;
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 58f18e5..ae86631 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -1,7 +1,7 @@
#define VERSION_LABEL yon_char_unite(_("Version:")," ",!yon_char_is_empty(version_application)?version_application:"","\n",NULL)
#define HELP_LABEL(rest) yon_char_unite(LocaleName,_(" version:")," ", !yon_char_is_empty(version_application)?version_application:"","\n",TITLE_LABEL,"\n",_("Usage:"), " ",LocaleName," ",_("[OPTIONS]"),"\n",_("Options:"),"\n\t--help, -h\t\t\t",_("Show this help"),"\n\t--version, -V\t\t\t",_("Show package version"),"\n\t--lock-help\t\t\t",_("Lock this help menu"),"\n\t--lock-save\t\t\t",_("Lock configuration saving"),"\n\t--lock-save-local\t\t",_("Lock local configration saving"),"\n\t--lock-save-global\t\t",_("Lock global configration saving"),"\n\t--lock-load-global\t\t",_("Lock global configration loading"),"\n\t--clear-config\t\t\t",_("Reset application settings"),"\n",!yon_char_is_empty(rest)?rest:NULL,NULL)
-#define TITLE_LABEL _("ubinstall")
+#define TITLE_LABEL _("UBLinux installation")
#define WELCOME_LABEL _("Welcome to UBLinux installation")
#define WELCOME_BOTTOM_LABEL _("This program will ask you few questions\nand help you install UBLinux on your computer")
@@ -105,4 +105,12 @@
#define DEFAULT_MODEL_LABEL _("Default (Regular 105-key)")
#define INSTALL_BEGIN_HEADER_LABEL _("Installation configuration has ended")
-#define INSTALL_BEGIN_LABEL _("UBLinux OS installation is about to begin")
\ No newline at end of file
+#define INSTALL_BEGIN_LABEL _("UBLinux OS installation is about to begin")
+
+#define DOCUMENTATION_LABEL _("Documentation")
+#define ABOUT_LABEL _("About")
+
+#define DOCUMENTATION_QUESTION_LABEL _("Would you like to read documentation in the Web?")
+#define DOCUMENTATION_HEAD_LABEL _("You will be redirected to documentation website where documentation is\ntranslated and supported by community.")
+#define DOCUMENTATION_CHECK_LABEL _("Always redirect to online documentation")
+#define OPEN_DOCUMENTATION_LABEL _("Open documentation")
\ No newline at end of file
diff --git a/ubinstall-gtk-about.glade b/ubinstall-gtk-about.glade
new file mode 100644
index 0000000..b2e2765
--- /dev/null
+++ b/ubinstall-gtk-about.glade
@@ -0,0 +1,64 @@
+
+
+
+
+
+
diff --git a/ubinstall-gtk-documentation.glade b/ubinstall-gtk-documentation.glade
new file mode 100644
index 0000000..30a6c77
--- /dev/null
+++ b/ubinstall-gtk-documentation.glade
@@ -0,0 +1,187 @@
+
+
+
+
+
+
+
+
diff --git a/ubinstall-gtk.css b/ubinstall-gtk.css
index 501ddbf..da5614d 100644
--- a/ubinstall-gtk.css
+++ b/ubinstall-gtk.css
@@ -169,7 +169,7 @@ treeview row:nth-child(even) { background-color: #ffffff; }
color:inherit;
}
-.toggletabs:checked:disabled {
+.toggletabs:checked:active {
background:@theme_base_color;
border-radius:0px;
color:inherit;
@@ -177,7 +177,7 @@ treeview row:nth-child(even) { background-color: #ffffff; }
padding-bottom:7px;
}
-.toggletabs:checked>*:disabled {
+.toggletabs:checked>*:active {
background:@theme_base_color;
border-color:inherit;
border-style:solid;
diff --git a/ubinstall-gtk.desktop b/ubinstall-gtk.desktop
index ed03562..9666a04 100644
--- a/ubinstall-gtk.desktop
+++ b/ubinstall-gtk.desktop
@@ -8,6 +8,6 @@ Comment[ru]=Установка UBLinux
Icon=com.ublinux.ubinstall-gtk
Terminal=false
Type=Application
-Exec=pkexec /bin/ubinstall-gtk
+Exec=pkexec ubinstall-gtk
Categories=Settings;System;
StartupNotify=true
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 4555779..217046e 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -111,6 +111,11 @@
False
com.ublinux.libublsettingsui-gtk3.properties-symbolic
+