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

Fixes, icon adds

Browse Source
pull/8/head
Ivan Dmitrievich Yartsev 1 year ago
parent 718524ea85
commit 85f3d48ede
8 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File

4
Makefile
Unescape View File

@ -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%/*}; \

0
com.ublinux.ubinstall-gtk-gui.svg → com.ublinux.ubinstall-gtk.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 194 KiB

After

Width:  |  Height:  |  Size: 194 KiB

40
icons/actions/com.ublinux.ubinstall.increase-symbolic.svg
Unescape View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="16"
height="16"
version="1.1"
id="svg1162"
sodipodi:docname="com.ublinux.ubl-settings-logging.increase-symbolic.svg"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs1166" />
<sodipodi:namedview
id="namedview1164"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="45.4375"
inkscape:cx="7.9889959"
inkscape:cy="7.9889959"
inkscape:window-width="1920"
inkscape:window-height="1023"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg1162" />
<path
style="marker:none"
d="M7 3v4H3v2h4v4h2V9h4V7H9V3z"
color="#bebebe"
overflow="visible"
fill="#2e3436"
id="path1160" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

1
icons/actions/com.ublinux.ubinstall.properties-symbolic.svg
Unescape View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc. --><path d="M64 80c-8.8 0-16 7.2-16 16V416c0 8.8 7.2 16 16 16H512c8.8 0 16-7.2 16-16V96c0-8.8-7.2-16-16-16H64zM0 96C0 60.7 28.7 32 64 32H512c35.3 0 64 28.7 64 64V416c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V96zm96 64a32 32 0 1 1 64 0 32 32 0 1 1 -64 0zm104 0c0-13.3 10.7-24 24-24H448c13.3 0 24 10.7 24 24s-10.7 24-24 24H224c-13.3 0-24-10.7-24-24zm0 96c0-13.3 10.7-24 24-24H448c13.3 0 24 10.7 24 24s-10.7 24-24 24H224c-13.3 0-24-10.7-24-24zm0 96c0-13.3 10.7-24 24-24H448c13.3 0 24 10.7 24 24s-10.7 24-24 24H224c-13.3 0-24-10.7-24-24zm-72-64a32 32 0 1 1 0-64 32 32 0 1 1 0 64zM96 352a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 901 B

1
icons/actions/com.ublinux.ubinstall.trash-symbolic.svg
Unescape View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M13 5v9H4V5H2v9c0 2 2 2 2 2h9c2 0 2-2 2-2V5zM9 6H8v6h1zM7 6H6v6h1zm4 0h-1v6h1zm1-6c2 0 2 2 2 2h2v2H1V2h2c0-2 2-2 2-2zm0 1H5v1h7z" fill="#474747"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 224 B

8
source/ubinstall-gtk.c
Unescape View File

@ -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: {

2
ubinstall-gtk.desktop
Unescape View File

@ -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

2
ubinstall-gtk.glade
Unescape View File

@ -5664,6 +5664,8 @@ separately into the selected partition.</property>
<child>
<object class="GtkButton" id="CancelInstallButton">
<property name="label" translatable="yes">Cancel</property>
<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">image7</property>

Write Preview
Loading…
Cancel
Save