From a74f763a3e31ae5d12a65bf12ef735db0947c672 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 9 Aug 2023 16:24:56 +0600 Subject: [PATCH 01/17] gitignore update --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index db6e033..199a2c2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,8 @@ ubl-settings-TEMPLATE *~ build/ compile/ -terminal-commands/ \ No newline at end of file +terminal-commands/ +.BUILD.md +.install.sh +ubl-settings-repomanager +.updatebuild.sh \ No newline at end of file From 932cf08e6185f928eafc82b4f46c543c41d83ce9 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 9 Aug 2023 16:26:33 +0600 Subject: [PATCH 02/17] Makefile revert --- Makefile | 58 +++++++++++++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index d715cd8..9c63112 100644 --- a/Makefile +++ b/Makefile @@ -8,23 +8,25 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH)) CMAKE_COMMAND = cmake CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile -#CMAKE_SOURCE_DIR = ./source -#CMAKE_BUILD_DIR = ./compile -FILE_VERSION = VERSION.md DEPENDS = /bin/cmake -PREFIX ?= /usr +PREFIX ?= /usr/local PKGNAME = $(MAKEFILE_DIR) -#PKGNAME = ubl-settings-manager +FILE_VER = source/${PKGNAME}.h default_target: all -.PHONY: all init depend debug prepare check build uninstall install clean up_ver help +.PHONY: all init depend debug prepare check build uninstall install clean help all: init build init: @echo "Initialize ..."; \ - sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-repomanager.h; \ + if [ -d ".git" ]; then \ + LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \ + else \ + LATEST_TAG="Development"; \ + fi; \ + sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -35,8 +37,8 @@ depend: exit 1; \ fi; \ done; \ + $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B${CMAKE_BUILD_DIR} --check-build-system CMakeFiles/Makefile.cmake 1 || exit 1; \ echo "Check depends: OK" -# $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 debug: @echo "Debug ..." @@ -63,7 +65,8 @@ check: build: depend prepare @echo "Build ..."; \ - make --directory=${CMAKE_BUILD_DIR}; \ + $(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \ + sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \ echo "Build: OK" uninstall: @@ -86,11 +89,7 @@ uninstall: @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" - @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.checked.svg" - @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.warning.svg" - @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/${PKGNAME}-banner.png" - @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}" - @$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy" + @$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ @@ -112,21 +111,21 @@ install: check uninstall install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done - @install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" - @install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" + @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy" @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" - @install -dm755 "${DESTDIR}/etc/xdg" - @install -dm755 "${DESTDIR}${PREFIX}/share/applications" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" - @install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images} - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css" - @install -dm755 -d "${DESTDIR}${PREFIX}/share/${PKGNAME}/images" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "${PKGNAME}-banner.png" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.document-symbolic.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.document-green-symbolic.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.document-red-symbolic.svg" + + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.folder-symbolic.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.folder-green-symbolic.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.folder-red-symbolic.svg" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ @@ -143,14 +142,6 @@ clean: echo "Clean: OK"; \ fi -up_ver: - @CURRENT=$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2); \ - MAJOR=$$(cut -d. -f1 <<< $${CURRENT}); \ - MINOR=$$(cut -d. -f2 <<< $${CURRENT}); \ - VER="$${MAJOR}.$$(($${MINOR}+1))"; \ - sed "s/VERSION *[[:digit:]]*.*/VERSION $${VER}/" -i ${FILE_VERSION}; \ - echo "Updated version to VERSION.md: $${CURRENT} to $${VER}" - help: @echo "The following are some of the valid targets for this Makefile:"; \ echo "... all (the default if no target is provided)"; \ @@ -160,5 +151,4 @@ help: echo "... compile"; \ echo "... install"; \ echo "... uninstall"; \ - echo "... clean"; \ - echo "... up_ver" + echo "... clean" \ No newline at end of file From 079f451c60e0e263b8a7d68d5cdcc147fb7a78c2 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 9 Aug 2023 17:34:40 +0600 Subject: [PATCH 03/17] Fixed button positions in settings manager --- source/ubl-settings-repomanager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index c6bf903..a034ed1 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -836,11 +836,11 @@ int main(int argc, char *argv[]){ break; case 'e': if(optarg) - main_config.load_socket_id=atoi(optarg); + main_config.save_socket_id=atoi(optarg); break; case 't': if(optarg) - main_config.save_socket_id=atoi(optarg); + main_config.load_socket_id=atoi(optarg); break; case 1: main_config.lock_help=1; From 05e1d9f6701d2c4cc57df04309bb4675d29aef63 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 16 Aug 2023 17:35:29 +0600 Subject: [PATCH 04/17] Fixed crash --- source/ubl-settings-repomanager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index a034ed1..9dd02a3 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -235,7 +235,7 @@ void on_save(){ } if (pack_status==1){ add_packages = yon_char_unite(add_packages ? yon_char_append(add_packages,",") : "",pack_path,NULL); - pack_path = yon_char_unite(origin_flagged,"/pool/overlay/",yon_char_divide(pack_path,yon_char_find_last(pack_path,'/'))); + pack_path = yon_char_unite(origin_flagged,"/pool/overlay/",yon_char_divide(pack_path,yon_char_find_last(pack_path,'/')),NULL); gtk_tree_store_set(main_config.tree_store,&childIter,2,pack_path,-1); } else if (pack_status==-1){ remove_packages = yon_char_unite(remove_packages ? yon_char_append(remove_packages,",") : "",pack_code_name,NULL); From 63dc9203569f60e4b4b80a9d75ab537962e497c5 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 17 Aug 2023 09:58:47 +0600 Subject: [PATCH 05/17] Repository information are no longer shown after deleting last repository --- source/ubl-settings-repomanager.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index 9dd02a3..b5b7e4f 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -181,7 +181,6 @@ void on_save(){ gtk_tree_model_get(GTK_TREE_MODEL(main_config.tree_store),&iter,1,&name_flagged,2,&origin_flagged,3,&repostatus,4,&old_name,5,&renamed,13,&repo_sign_flagged,-1); yon_char_divide_search(repo_sign_flagged,"<",-1); repo_sign_flagged=yon_char_divide_search(repo_sign_flagged,">",-1); - if (repostatus == 1) gtk_tree_store_set(main_config.tree_store,&iter,0,folder_no_edits,3,0,-1); else if (repostatus == -1){ system(yon_char_unite("rm -rfd ",origin_flagged,NULL)); @@ -291,7 +290,6 @@ void on_save(){ } char *sign_check = repo_sign_flagged ? yon_char_new(repo_sign_flagged) : NULL; repo_sign_flagged=NULL; char *sign_command = yon_char_unite(command, " add -f -d ",origin_flagged," -r ",name_flagged," --sign-pkg ", dct->key," -p $(find ",origin_flagged,"/pool/overlay -name ", signed_packs,")",NULL); - printf("%s\n",sign_command); system(sign_command); } @@ -363,6 +361,18 @@ void on_tree_selection_changed(GtkWidget *self,main_window *widgets){ gtk_widget_set_visible(widgets->ArchitectureBox,1); gtk_widget_set_visible(widgets->SignatureBox,1); } + } else { + gtk_widget_set_sensitive(widgets->CreateButton,0); + gtk_widget_set_sensitive(widgets->LoadFromLocalButton,0); + gtk_widget_set_sensitive(widgets->ConfigureButton,0); + gtk_widget_set_sensitive(widgets->DeleteButton,0); + gtk_widget_set_sensitive(widgets->AddPackageButton,0); + gtk_widget_set_sensitive(widgets->RemovePackageButton,0); + gtk_widget_set_visible(widgets->NameBox,0); + gtk_widget_set_visible(widgets->DependenceBox,0); + gtk_widget_set_visible(widgets->VersionBox,0); + gtk_widget_set_visible(widgets->ArchitectureBox,0); + gtk_widget_set_visible(widgets->SignatureBox,0); } } From 6f731ec9964ca1d98fd6cf270c73ef1ef6c248e3 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 17 Aug 2023 11:03:09 +0600 Subject: [PATCH 06/17] Fixed missing repo name --- source/ubl-settings-repomanager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index b5b7e4f..a3208d4 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -571,7 +571,7 @@ GtkTreeIter *yon_repo_append(main_window *widgets, char *name, YON_REPO_LINE_TYP } else if (type==YON_REPO_LINE_REPO_TYPE){ gtk_tree_store_append(main_config.tree_store,&iter,NULL); - gtk_tree_store_set(main_config.tree_store,&iter,0, folder_no_edits, 1, name_short,2,name,3,1,4,fls,-1); + gtk_tree_store_set(main_config.tree_store,&iter,0, folder_no_edits, 1, name_short,2,name,3,1,4,fls,9,name_short,-1); retIter = gtk_tree_iter_copy(&iter); gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->RepoTree)),&iter); } else { From 9e36a08b39f620150cab2f08760a2e7577720e33 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 17 Aug 2023 12:30:59 +0600 Subject: [PATCH 07/17] Package signs are now saving properly --- source/ubl-settings-repomanager.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index a3208d4..9a5bb72 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -100,7 +100,9 @@ void on_about(){ void on_load(){ gsize size=0; + gsize sigsize=0; config_str repos = yon_window_config_get_section("repos",&size); + config_str signatures = yon_window_config_get_section("signatures",&sigsize); gtk_tree_store_clear(main_config.tree_store); for (int i=0;i",-1); if (!pack_groups||!(yon_dictionary_get(&pack_groups,pack_sign))){ @@ -362,8 +371,8 @@ void on_tree_selection_changed(GtkWidget *self,main_window *widgets){ gtk_widget_set_visible(widgets->SignatureBox,1); } } else { - gtk_widget_set_sensitive(widgets->CreateButton,0); - gtk_widget_set_sensitive(widgets->LoadFromLocalButton,0); + gtk_widget_set_sensitive(widgets->CreateButton,1); + gtk_widget_set_sensitive(widgets->LoadFromLocalButton,1); gtk_widget_set_sensitive(widgets->ConfigureButton,0); gtk_widget_set_sensitive(widgets->DeleteButton,0); gtk_widget_set_sensitive(widgets->AddPackageButton,0); From da717427a20c6bcfa97992519565e7c992273369 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 17 Aug 2023 12:32:10 +0600 Subject: [PATCH 08/17] Fixed specific window icon --- ubl-settings-repomanager.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubl-settings-repomanager.glade b/ubl-settings-repomanager.glade index 97bde26..31e4f0a 100644 --- a/ubl-settings-repomanager.glade +++ b/ubl-settings-repomanager.glade @@ -283,7 +283,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False False 450 - dialog-question-symbolic + com.ublinux.ubl-settings-repomanager True From 80875a0dd3a170aa7a2ac07894a20f36933844c7 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 17 Aug 2023 12:49:30 +0600 Subject: [PATCH 09/17] Debug uotputs to find out bug reasong --- source/ubl-settings-repomanager.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index 9a5bb72..d15f3a2 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -227,7 +227,9 @@ void on_save(){ packnames = yon_char_unite(packnames ? yon_char_append(packnames," "):"",pack_sign_paths,NULL); if (pack_sign&&pack_signed==1){ char *package_full_name = yon_char_new(pack_path); + printf("%s\n",package_full_name); yon_char_divide(package_full_name,yon_char_find_last(package_full_name,'/')); + printf("%s\n",package_full_name); yon_window_config_add_custom_parameter(package_full_name,"signatures",yon_char_new(pack_sign),YON_TYPE_STRING); yon_char_divide_search(pack_sign,"<",-1); pack_sign=yon_char_divide_search(pack_sign,">",-1); From 23bfb87e46dc145fe23c3a25a4bd9da47d027e71 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 21 Aug 2023 09:28:31 +0600 Subject: [PATCH 10/17] Fixed wrong path creation for signing --- source/ubl-settings-repomanager.c | 5 +++-- source/ubl-strings.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index d15f3a2..d802c92 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -244,8 +244,9 @@ void on_save(){ } } if (pack_status==1){ - add_packages = yon_char_unite(add_packages ? yon_char_append(add_packages,",") : "",pack_path,NULL); - pack_path = yon_char_unite(origin_flagged,"/pool/overlay/",yon_char_divide(pack_path,yon_char_find_last(pack_path,'/')),NULL); + add_packages = yon_char_unite(add_packages ? yon_char_append(add_packages,",") : "",pack_path,NULL); + yon_char_divide(pack_path,yon_char_find_last(pack_path,'/')); + pack_path = yon_char_unite(origin_flagged,"/pool/overlay/",pack_path,NULL); gtk_tree_store_set(main_config.tree_store,&childIter,2,pack_path,-1); } else if (pack_status==-1){ remove_packages = yon_char_unite(remove_packages ? yon_char_append(remove_packages,",") : "",pack_code_name,NULL); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index b7cd232..6d60768 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -30,7 +30,7 @@ #define LOAD_SUCCESS_LABEL _("Repository data has been loaded successfully") -#define SAVE_SUCCESS_LABEL _("Saving has succseeded") +#define SAVE_SUCCESS_LABEL _("Saving has succeeded") #define GENERAL_TAB_LABEL _("General") #define PUBLICATION_TAB_LABEL _("Publication") From 2fb687a21d73f206807d318546062ace84e313d2 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 21 Aug 2023 09:29:21 +0600 Subject: [PATCH 11/17] Fixed text mistakes --- ubl-settings-repomanager.pot | 2 +- ubl-settings-repomanager_ru.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ubl-settings-repomanager.pot b/ubl-settings-repomanager.pot index 059b661..1aa4de1 100644 --- a/ubl-settings-repomanager.pot +++ b/ubl-settings-repomanager.pot @@ -154,7 +154,7 @@ msgid "Repository data has been loaded successfully" msgstr "" #: source/ubl-strings.h:33 -msgid "Saving has succseeded" +msgid "Saving has succeeded" msgstr "" #: source/ubl-strings.h:35 diff --git a/ubl-settings-repomanager_ru.po b/ubl-settings-repomanager_ru.po index 3ef037e..702bbf7 100644 --- a/ubl-settings-repomanager_ru.po +++ b/ubl-settings-repomanager_ru.po @@ -159,7 +159,7 @@ msgstr "Информация о пакетах успешно загружена #: source/ubl-strings.h:33 #, fuzzy -msgid "Saving has succseeded" +msgid "Saving has succeeded" msgstr "Успешно сохранено" #: source/ubl-strings.h:35 From dbd2e724b146ea011971b3413e8fc18af38a1b2c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 21 Aug 2023 10:06:00 +0600 Subject: [PATCH 12/17] Fixed packages were not saving if repo wasn't updated --- source/ubl-settings-repomanager.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index d802c92..fb7da9c 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -248,6 +248,7 @@ void on_save(){ yon_char_divide(pack_path,yon_char_find_last(pack_path,'/')); pack_path = yon_char_unite(origin_flagged,"/pool/overlay/",pack_path,NULL); gtk_tree_store_set(main_config.tree_store,&childIter,2,pack_path,-1); + repostatus=1; } else if (pack_status==-1){ remove_packages = yon_char_unite(remove_packages ? yon_char_append(remove_packages,",") : "",pack_code_name,NULL); } From b4552beab99270aa51ebe226d6d58adbb76fd406 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 21 Aug 2023 11:01:32 +0600 Subject: [PATCH 13/17] Repo signing is now saving --- source/ubl-settings-repomanager.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index fb7da9c..bc84955 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -107,10 +107,12 @@ void on_load(){ for (int i=0;i",-1); if (repostatus == 1) gtk_tree_store_set(main_config.tree_store,&iter,0,folder_no_edits,3,0,-1); @@ -307,6 +311,11 @@ void on_save(){ } } + if (repo_sign_flagged){ + char *repo_sign_command = yon_char_unite(command, " add -f -d ",origin_flagged, " -r ", name_flagged, " --sign-repo ", repo_sign_flagged ,NULL); + yon_window_config_add_custom_parameter(yon_char_unite(origin_flagged,NULL),"signatures",repo_sign_flagged_full,YON_TYPE_STRING); + system(repo_sign_command); + } } } } From fd1094ff7269125d28f5a0090ffe76f7f04d3525 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 21 Aug 2023 12:25:13 +0600 Subject: [PATCH 14/17] Output for repo sign --- source/ubl-settings-repomanager.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index bc84955..e30ee8d 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -231,9 +231,7 @@ void on_save(){ packnames = yon_char_unite(packnames ? yon_char_append(packnames," "):"",pack_sign_paths,NULL); if (pack_sign&&pack_signed==1){ char *package_full_name = yon_char_new(pack_path); - printf("%s\n",package_full_name); yon_char_divide(package_full_name,yon_char_find_last(package_full_name,'/')); - printf("%s\n",package_full_name); yon_window_config_add_custom_parameter(package_full_name,"signatures",yon_char_new(pack_sign),YON_TYPE_STRING); yon_char_divide_search(pack_sign,"<",-1); pack_sign=yon_char_divide_search(pack_sign,">",-1); @@ -291,11 +289,11 @@ void on_save(){ } if (!add_packages&&!signed_packages&&!remove_packages&&repostatus==1) add_command = yon_char_unite(command, " add -d \"",origin_flagged,"\" -r \"",name_flagged,sign_flagged ? yon_char_append("\" --sign-repo ",sign_flagged):"\"" ,NULL); - if (add_signed_command){/*printf("%s\n",add_signed_command);*/ system(add_signed_command); + if (add_signed_command){ system(add_signed_command); yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);} - if (add_command) {/*printf("%s\n",add_command);*/system(add_command); + if (add_command) { system(add_command); yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);} - if (remove_command) {/*printf("%s\n",remove_command);*/system(remove_command); + if (remove_command) { system(remove_command); yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);} if (pack_groups){ dictionary *dct; @@ -311,6 +309,7 @@ void on_save(){ } } + printf("%s\n",repo_sign_flagged ? repo_sign_flagged:"Null"); if (repo_sign_flagged){ char *repo_sign_command = yon_char_unite(command, " add -f -d ",origin_flagged, " -r ", name_flagged, " --sign-repo ", repo_sign_flagged ,NULL); yon_window_config_add_custom_parameter(yon_char_unite(origin_flagged,NULL),"signatures",repo_sign_flagged_full,YON_TYPE_STRING); From b30b6393d09dab48d577f860ebe9ddb2657fd0b9 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 21 Aug 2023 14:04:38 +0600 Subject: [PATCH 15/17] fixed repository sign saving --- source/ubl-settings-repomanager.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index e30ee8d..891b412 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -276,12 +276,10 @@ void on_save(){ if (origin_flagged&&name_flagged){ if (add_packages){ char *sign_check = repo_sign_flagged ? yon_char_new(repo_sign_flagged) : NULL; - repo_sign_flagged=NULL; add_command = yon_char_unite(command, " add -d \"",origin_flagged,"\" -r \"",name_flagged, sign_flagged ? yon_char_append("\" --sign-repo ",sign_flagged):"\"" ," -p ", add_packages,NULL); } if (remove_packages){ char *sign_check = repo_sign_flagged ? yon_char_new(repo_sign_flagged) : NULL; - repo_sign_flagged=NULL; remove_command = yon_char_unite(command, " remove -d \"",origin_flagged,"\" -r \"",name_flagged, sign_flagged ? yon_char_append("\" --sign-repo ",sign_flagged):"\"" , " -p ", remove_packages,NULL); } if (repostatus == 1){ @@ -302,14 +300,12 @@ void on_save(){ dictionary *pck; for_dictionaries(pck,yon_dictionary_get_data(dct,dictionary*)){ signed_packs=yon_char_unite(signed_packs ? yon_char_append(signed_packs,","): "" ,pck->key,NULL); - } char *sign_check = repo_sign_flagged ? yon_char_new(repo_sign_flagged) : NULL; - repo_sign_flagged=NULL; + } char *sign_command = yon_char_unite(command, " add -f -d ",origin_flagged," -r ",name_flagged," --sign-pkg ", dct->key," -p $(find ",origin_flagged,"/pool/overlay -name ", signed_packs,")",NULL); system(sign_command); } } - printf("%s\n",repo_sign_flagged ? repo_sign_flagged:"Null"); if (repo_sign_flagged){ char *repo_sign_command = yon_char_unite(command, " add -f -d ",origin_flagged, " -r ", name_flagged, " --sign-repo ", repo_sign_flagged ,NULL); yon_window_config_add_custom_parameter(yon_char_unite(origin_flagged,NULL),"signatures",repo_sign_flagged_full,YON_TYPE_STRING); From 2cfa12226a451aecfb0ec1cc2164e1c4a5e60eac Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 21 Aug 2023 14:11:59 +0600 Subject: [PATCH 16/17] Added saving status message --- source/ubl-settings-repomanager.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index 891b412..d33a0d2 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -313,6 +313,7 @@ void on_save(){ } } } + yon_ubl_status_box_render(SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); } void on_search(GtkCellEditable *self, main_window *widgets){ @@ -844,10 +845,11 @@ int main(int argc, char *argv[]){ {"socket-ext-id", 1,0, 'e'}, {"socket-trd-id", 1,0, 't'}, {"debug", 0,0, 'd'}, + {"clean-config", 0,0, 'c'}, { NULL, 0, NULL, 0 } }; for (int i=0;i Date: Mon, 21 Aug 2023 14:52:15 +0600 Subject: [PATCH 17/17] Added app icon for dialog windows --- source/ubl-settings-repomanager.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index d33a0d2..0992a84 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -469,6 +469,7 @@ void on_repo_sign(GtkWidget *self, main_window *widgets){ window->CloseButton = yon_gtk_builder_get_widget(builder,"repoSignCancelButton"); GtkTreeModel *model = GTK_TREE_MODEL(main_config.tree_store); GtkTreeIter iter; + gtk_window_set_title(GTK_WINDOW(window->Window),TITLE_LABEL); if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->RepoTree)),&model,&iter)){ if (gtk_tree_store_iter_depth(main_config.tree_store,&iter)==1) gtk_label_set_text(GTK_LABEL( window->HeaderLabel),yon_char_unite(DIGITAL_SIGNATURE_LABEL," - ",PACKAGE_LABEL,NULL)); @@ -540,6 +541,7 @@ void on_repo_load_local(GtkWidget *self, main_window *widgets){ gtk_file_filter_add_pattern(file_filter,"*db.tar.gz"); gtk_file_filter_set_name(file_filter, "*db.tar.gz"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser),file_filter); + gtk_window_set_icon_name(GTK_WINDOW(chooser),"com.ublinux.ubl-settings-repomanager"); int res = gtk_dialog_run(GTK_DIALOG(chooser)); if (res==GTK_RESPONSE_ACCEPT){ @@ -654,6 +656,7 @@ void yon_add_file(main_window *widgets){ gtk_file_filter_add_pattern(file_filter,"*"); gtk_file_filter_set_name(file_filter,"All"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser),file_filter); + gtk_window_set_icon_name(GTK_WINDOW(chooser),"com.ublinux.ubl-settings-repomanager"); int res = gtk_dialog_run(GTK_DIALOG(chooser)); if (res==GTK_RESPONSE_ACCEPT){ char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));