From 50d4afaf1a30a3bfa60f6002f90b1aca03599953 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 6 Mar 2023 11:08:02 +0600 Subject: [PATCH] Makefile fixes --- Makefile | 25 +- source/ubl-settings-manager.c | 21 +- source/ubl-settings-manager.h | 5 +- ubconfig-gui.svg | 4957 ------------------------------- ubl-settings-manager.css | 3 + ubl-settings-manager.desktop | 2 +- ubl-settings-manager.svg | 5152 +++++++++++++++++++++++++++++++-- ublinux-logo.svg | 241 ++ 8 files changed, 5216 insertions(+), 5190 deletions(-) delete mode 100644 ubconfig-gui.svg create mode 100644 ublinux-logo.svg diff --git a/Makefile b/Makefile index d73c976..ddf681c 100644 --- a/Makefile +++ b/Makefile @@ -79,9 +79,15 @@ uninstall: @$(RM) "/usr/share/applications/${PKGNAME}.desktop" @$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.png" @$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.svg" - @$(RM) "/usr/share/icons/hicolor/scalable/apps/ubconfig-gui.svg" + @$(RM) "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.svg" + @$(RM) "/usr/share/${PKGNAME}/ui/ublinux-logo.svg" + @$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}.glade" + @$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css" + @$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}.png" + @$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css" + @$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css" + @$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css" @$(RM) "/etc/ubconfig-main.conf" - @$(RM) "~/ubconfig-main.conf" @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null @update-desktop-database --quiet 2>/dev/null @touch /usr/share/applications @@ -101,16 +107,21 @@ install: check uninstall install -dm755 /usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps; \ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data ${PKGNAME}.svg -o "/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/${PKGNAME}.svg"; \ done - @install -dm755 /usr/share/icons/hicolor/scalable/apps @install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ${PKGNAME}.svg - @install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ubconfig-gui.svg @install -Dm755 -t /usr/bin/ ${CMAKE_BUILD_DIR}/${PKGNAME} - @install -Dm644 -t /usr/share/applications/ ${PKGNAME}.desktop + @install -Dm644 -t /usr/share/applications/ ${PKGNAME}.desktop; \ + if [ ! -d "/usr/share/${PKGNAME}/ui" ]; then \ + mkdir /usr/share/${PKGNAME}/ui; \ + fi; \ + if [ ! -d "/usr/share/${PKGNAME}/css" ]; then \ + mkdir /usr/share/${PKGNAME}/css; \ + fi @install -Dm644 -t /usr/share/${PKGNAME}/ui/ ${PKGNAME}.glade @install -Dm644 -t /usr/share/${PKGNAME}/css/ ${PKGNAME}.css - @install -Dm644 -t /etc/ ubconfig-main.conf + @install -Dm644 -t /usr/share/${PKGNAME}/ui/ ublinux-logo.svg + @install -Dm644 -t /etc/ ubconfig-main.conf; \ chmod 766 /etc/ubconfig-main.conf - @install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ${PKGNAME}.png + @install -Dm644 -t /usr/share/${PKGNAME}/ui/ ${PKGNAME}.png @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null @update-desktop-database --quiet 2>/dev/null @touch /usr/share/applications diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index f08f4ef..735c9a4 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -45,8 +45,10 @@ void on_plug_added(GtkSocket* self, actionWidgets *builder){ gtk_widget_set_vexpand(GTK_WIDGET(builder->socketplace),1); gtk_widget_set_vexpand(GTK_WIDGET(self),1); gtk_widget_show(builder->socketplace); - if (main_config.WindowTheme==0) - gtk_widget_hide(builder->appSettings); + // if (main_config.WindowTheme==0) + + // else + // gtk_widget_show(builder->appSettings); if (builder->ButtonBackToMain!=NULL) gtk_widget_set_sensitive(builder->ButtonBackToMain,1); gtk_widget_show(GTK_WIDGET(self)); gtk_widget_show(builder->socketbuttonplace); @@ -56,6 +58,7 @@ void on_plug_added(GtkSocket* self, actionWidgets *builder){ } void on_plug_removed(GtkSocket* self, actionWidgets *widgets){ + gtk_widget_show(widgets->socketbuttonplace); gtk_widget_show(widgets->appSettings); gtk_widget_show(widgets->HideWhileLaunch); gtk_widget_set_vexpand(widgets->socketplace,0); @@ -71,6 +74,7 @@ void on_plug_removed(GtkSocket* self, actionWidgets *widgets){ void on_Item_activated(GtkIconView* self, GtkTreePath* path, actionWidgets *applist){ GtkTreeIter iter; char *name; + gtk_widget_hide(applist->appSettings); gtk_tree_model_get_iter(gtk_icon_view_get_model(self),&iter,path); gtk_tree_model_get(gtk_icon_view_get_model(self),&iter,1,&name,-1); @@ -84,6 +88,7 @@ void on_Item_activated(GtkIconView* self, GtkTreePath* path, actionWidgets *appl if (tempapp[0].Type==1){ if (tempapp->Pluggable==1) if (tempapp->DualPluggable==1){ + gtk_widget_hide(applist->appSettings); char *dualarg=malloc(strlen("--socket-id= --socket-ext-id= --socket-trd-id=")+30); sprintf(dualarg,"--socket-id=%d --socket-ext-id=%d --socket-trd-id=%d",gtk_socket_get_id(GTK_SOCKET(applist->socket)),gtk_socket_get_id(GTK_SOCKET(applist->socketbutton)),gtk_socket_get_id(GTK_SOCKET(applist->ThirdSocket))); launch_app_with_arguments(tempapp[0].Exec,dualarg); @@ -125,7 +130,7 @@ void on_gnome_Item_activated(GtkIconView* self, GtkTreePath* path, actionWidgets } } else { - on_about_system(NULL,applist); + on_about_system(NULL,applist); launch_app(tempapp[0].Exec); gtk_widget_destroy(applist->socketbutton); } @@ -670,7 +675,13 @@ void on_resized_done (GtkWidget *window, GdkEvent *event, dictionary *widgetsD){ void on_about_system(GtkWidget *button, actionWidgets *widgets){ char arg[100]; memset(arg,0,100); - sprintf(arg,"--socket-id=%d --socket-ext-id=%d",gtk_socket_get_id(GTK_SOCKET(widgets->socket)),gtk_socket_get_id(GTK_SOCKET(widgets->socketbutton))); + gtk_widget_show(widgets->socketbuttonplace); + if (button){ + gtk_widget_hide(widgets->appSettings); + sprintf(arg,"--socket-id=%d --socket-ext-id=%d",gtk_socket_get_id(GTK_SOCKET(widgets->socket)),gtk_socket_get_id(GTK_SOCKET(widgets->socketbutton))); + }else{ + sprintf(arg,"--socket-id=%d",gtk_socket_get_id(GTK_SOCKET(widgets->socket))); + } launch_app_with_arguments("ubl-settings-info",arg); } @@ -1634,7 +1645,7 @@ int main(int argc, char *argv[]){ banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"loaderBanner")); gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file(AppBannerPath,NULL)); banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"GnomeInfoLogo")); - gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file_at_scale(LogoPath,512,512,1,NULL)); + gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file_at_scale(ublinux_logo,512,512,1,NULL)); banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"settingsIcon")); gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file_at_scale(AppIconPath,*main_config.currentThemeIconSize,*main_config.currentThemeIconSize,1,NULL)); GtkCssProvider *css=gtk_css_provider_new(); diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h index b9ded15..bb1c409 100644 --- a/source/ubl-settings-manager.h +++ b/source/ubl-settings-manager.h @@ -9,11 +9,12 @@ #define CssPath "/usr/share/ubl-settings-manager/css/ubl-settings-manager.css" #define GlobalConfigPath "/etc/ubconfig-main.conf" #define UserConfigPath "/.config/ubl-settings-manager/ubconfig-main.conf" -#define AppIconPath "/usr/share/icons/hicolor/scalable/apps/ubconfig-gui.svg" -#define AppBannerPath "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.png" +#define AppIconPath "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.svg" +#define AppBannerPath "//usr/share/ubl-settings-manager/ui/ubl-settings-manager.png" #define DesktopPath "/usr/share/applications/" #define IconPicturesPath "/usr/share/icons/hicolor/scalable/apps/" #define ErrIconPicturePath "/usr/share/icons/Faenza/emblems/32/emblem-important.png" +#define ublinux_logo "/usr/share/ubl-settings-manager/ui/ublinux-logo.svg" #define PictureFormatMain ".svg" #define PictureFormatExtra ".png" #define LocalePath "/usr/share/locale" diff --git a/ubconfig-gui.svg b/ubconfig-gui.svg deleted file mode 100644 index f636c26..0000000 --- a/ubconfig-gui.svg +++ /dev/null @@ -1,4957 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ubl-settings-manager.css b/ubl-settings-manager.css index d1a2339..82d7eba 100644 --- a/ubl-settings-manager.css +++ b/ubl-settings-manager.css @@ -83,18 +83,21 @@ background-color: #404040; padding: 5px 10px 3px 5px; background:@theme_selected_bg_color; border-color:transparent; + border-radius: 2px; } .menuitemmiddle:hover* { margin:0 2px 0 2px; padding: 3px 10px 3px 5px; background:@theme_selected_bg_color; border-color:transparent; + border-radius: 2px; } .menuitembottom:hover* { margin:0 2px 2px 2px; padding: 3px 10px 5px 5px; background:@theme_selected_bg_color; border-color:transparent; + border-radius: 2px; } .menu { border:none; diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop index e2e7a3f..6c60fcf 100644 --- a/ubl-settings-manager.desktop +++ b/ubl-settings-manager.desktop @@ -8,7 +8,7 @@ Comment=ubl-settings-manager Comment[ru]=Приложение для управления настройками UBLinux Type=Application Exec=ubl-settings-manager -Icon=ubconfig-gui +Icon=ubl-settings-manager Terminal=false X-XfcePluggable=false Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings; diff --git a/ubl-settings-manager.svg b/ubl-settings-manager.svg index d44113c..f636c26 100644 --- a/ubl-settings-manager.svg +++ b/ubl-settings-manager.svg @@ -1,241 +1,4957 @@ + id="defs12"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + id="filter2594" + x="-0.076308397" + y="-0.23317344" + width="1.1526168" + height="1.4663469" + color-interpolation-filters="sRGB"> - - - - - + stdDeviation="0.43959997" + id="feGaussianBlur449" /> + + + + + + - - + stdDeviation="0.43959997" + id="feGaussianBlur2065" /> - - - diff --git a/ublinux-logo.svg b/ublinux-logo.svg new file mode 100644 index 0000000..d44113c --- /dev/null +++ b/ublinux-logo.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +