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/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/ubinstall-gtk.c b/source/ubinstall-gtk.c index 78ac3e8..be89091 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -311,7 +311,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 +345,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 +355,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: { 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..5a839da 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -5664,6 +5664,8 @@ separately into the selected partition. Cancel + True + False True True image7