diff --git a/Makefile b/Makefile index 676a016..b869cb7 100644 --- a/Makefile +++ b/Makefile @@ -122,6 +122,7 @@ install: check uninstall @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}.document-sign-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" diff --git a/com.ublinux.ubl-settings-repomanager.document-sign-symbolic.svg b/com.ublinux.ubl-settings-repomanager.document-sign-symbolic.svg new file mode 100644 index 0000000..a11cbf1 --- /dev/null +++ b/com.ublinux.ubl-settings-repomanager.document-sign-symbolic.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + diff --git a/gresource.xml b/gresource.xml index 7b4904a..58afa6e 100644 --- a/gresource.xml +++ b/gresource.xml @@ -3,6 +3,7 @@ ubl-settings-repomanager.glade ubl-settings-repomanager-windows.glade + ubl-settings-repomanager-sign.glade ubl-settings-repomanager.css diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index d62565a..4eb002d 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -32,6 +32,7 @@ add_custom_target(GLADE ubl-settings-repomanager.glade) set(DEPENDFILES ../ubl-settings-repomanager.glade ../ubl-settings-repomanager-windows.glade + ../ubl-settings-repomanager-sign.glade ../gresource.xml ../ubl-settings-repomanager-banner.png ../ubl-settings-repomanager.css diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index cc8c7e0..a0984f0 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -104,10 +104,11 @@ void on_load(){ gtk_tree_store_clear(main_config.tree_store); 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); + else if (repostatus == -1){ + system(yon_char_unite("rm -rfd ",origin_flagged,NULL)); + yon_window_config_erase_custom_parameter(origin_flagged,"repos"); + GtkTreeIter *deleteIter = gtk_tree_iter_copy(&iter); + if (!gtk_tree_model_iter_previous(GTK_TREE_MODEL(main_config.tree_store),deleteIter)){ + gtk_tree_iter_free(deleteIter); + deleteIter = gtk_tree_iter_copy(&iter); + if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(main_config.tree_store),deleteIter)){ + gtk_tree_iter_free(deleteIter); + deleteIter = gtk_tree_iter_copy(&iter); + gtk_tree_store_remove(main_config.tree_store,deleteIter); + break; + } else { + gtk_tree_store_remove(main_config.tree_store,&iter); + } + } else { + gtk_tree_store_remove(main_config.tree_store,&iter); + + } + continue; + } gboolean valid_child=gtk_tree_model_iter_children(GTK_TREE_MODEL(main_config.tree_store),&childIter,&iter); for (;valid_child;valid_child=gtk_tree_model_iter_next(GTK_TREE_MODEL(main_config.tree_store),&childIter)){ - int status = 0,deleted = 0; - char *path=NULL; - char *name=NULL; - gtk_tree_model_get(GTK_TREE_MODEL(main_config.tree_store),&childIter,11,&name,3,&path,4,&status,5,&deleted,-1); - if (name) - packnames = yon_char_unite(packnames, strcmp(packnames,"")!=0 ? " " : "", name, NULL); - gtk_tree_store_set(main_config.tree_store,&childIter,4,0,5,0,-1); - if (status==-1) { - remove_flagged = yon_char_unite(remove_flagged ? yon_char_append(remove_flagged,",") : " -p ",name,NULL); - - deleteIter = gtk_tree_iter_copy(&childIter); - if (gtk_tree_model_iter_previous(GTK_TREE_MODEL(main_config.tree_store),&childIter)) - gtk_tree_store_remove(main_config.tree_store,deleteIter); - else { - childIter = *gtk_tree_iter_copy(deleteIter); - if (gtk_tree_model_iter_next(GTK_TREE_MODEL(main_config.tree_store),&childIter)) - gtk_tree_store_remove(main_config.tree_store,deleteIter); - else { + char *pack_name, *pack_path; + char *pack_old_repo, *pack_new_repo; + char *pack_code_name, *pack_version, *pack_arch, *pack_depends; + int pack_status=0; + gboolean moved=0; + char *pack_sign; + + gtk_tree_model_get(GTK_TREE_MODEL(main_config.tree_store),&childIter,1,&pack_name,2,&pack_path,3,&pack_status,4,&pack_old_repo,5,&pack_new_repo,6,&moved,9,&pack_code_name,10,&pack_version,11,&pack_arch,12,&pack_depends,13,&pack_sign,-1); + if (!pack_path) continue; + if (pack_status==1) + packnames = yon_char_unite(packnames ? yon_char_append(packnames," "):"",pack_code_name,NULL); + + if (pack_sign&&pack_status==1){ + yon_char_divide_search(pack_sign,"<",-1); + pack_sign=yon_char_divide_search(pack_sign,">",-1); + if (!pack_groups||!(yon_dictionary_get(&pack_groups,pack_sign))){ + dictionary *dict = yon_dictionary_new(); + dict->key = pack_path; + yon_dictionary_add_or_create_if_exists_with_data(pack_groups,yon_char_new(pack_sign),dict); + } else { + dictionary *dict = yon_dictionary_new(); + dict->key=pack_path; + yon_dictionary_add_or_create_if_exists_with_data(pack_groups->data,yon_char_new(pack_sign),dict); + } + } else if (pack_status==1){ + add_packages = yon_char_unite(add_packages ? yon_char_append(add_packages,",") : "",pack_path,NULL); + } else if (pack_status==-1){ + remove_packages = yon_char_unite(remove_packages ? yon_char_append(remove_packages,",") : "",pack_path,NULL); + } + if (pack_status==1) gtk_tree_store_set(main_config.tree_store,&childIter,0,document_no_edits,3,0,-1); + if (pack_status == -1){ + GtkTreeIter *deleteIter = gtk_tree_iter_copy(&childIter); + if (!gtk_tree_model_iter_previous(GTK_TREE_MODEL(main_config.tree_store),deleteIter)){ + gtk_tree_iter_free(deleteIter); + deleteIter = gtk_tree_iter_copy(&childIter); + if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(main_config.tree_store),deleteIter)){ + gtk_tree_iter_free(deleteIter); + deleteIter = gtk_tree_iter_copy(&childIter); gtk_tree_store_remove(main_config.tree_store,deleteIter); break; + } else { + gtk_tree_store_remove(main_config.tree_store,&childIter); } + } else { + gtk_tree_store_remove(main_config.tree_store,&childIter); } - - } - else if (status == 1&&deleted==0) { add_flagged = yon_char_unite(add_flagged ? yon_char_append(add_flagged,",") : " -p ",path,NULL);gtk_tree_store_set(main_config.tree_store,&childIter,0,"com.ublinux.ubl-settings-repomanager.document-symbolic",-1); } - - } - if (repostatus==1){ - mkdir((origin_flagged = yon_char_unite(origin_flagged,"/",name_flagged,NULL)),0766); - yon_window_config_add_custom_parameter(yon_char_unite(origin_flagged,"/",name_flagged,NULL),"repos",packnames,YON_TYPE_STRING); - gtk_tree_store_set(main_config.tree_store,&iter,0,folder_no_edits,4,0,-1); + } } - if (origin_flagged) - remove_command = remove_flagged ? yon_char_unite(remove_command,remove_flagged,NULL) : NULL; - add_command = add_flagged ? yon_char_unite(add_command, add_flagged,NULL) : NULL; - printf("%s\n%s\n",remove_command,add_command); - if (remove_command) system(remove_command); - if (add_command) system(add_command); - if (repostatus==-1) { - yon_window_config_erase_custom_parameter(yon_char_unite(origin_flagged,"/",name_flagged,NULL),"repos"); - remove_command = yon_char_unite("rm -rdf ",origin_flagged,"/",name_flagged,"/*",NULL); - system (remove_command); - deleteIter = gtk_tree_iter_copy(&iter); - if (gtk_tree_model_iter_previous(GTK_TREE_MODEL(main_config.tree_store),&iter)) - gtk_tree_store_remove(main_config.tree_store,deleteIter); - else { - iter = *gtk_tree_iter_copy(deleteIter); - if (gtk_tree_model_iter_next(GTK_TREE_MODEL(main_config.tree_store),&iter)) - gtk_tree_store_remove(main_config.tree_store,deleteIter); - else { - gtk_tree_store_remove(main_config.tree_store,deleteIter); - break; + if (origin_flagged&&name_flagged){ + if (pack_groups){ + dictionary *dct; + for_dictionaries(dct,pack_groups){ + char *signed_packs=NULL; + 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 -d \"",origin_flagged,"\" -r \"",name_flagged, sign_flagged ? yon_char_append("\" --sign-repo ",sign_flagged):"\"" , " --sign-package ", dct->key, " -p ", signed_packs,NULL); + printf("%s\n",sign_command); + system(sign_command); } + + } + 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); } - continue; } + if (repostatus == 1){ + yon_window_config_add_custom_parameter(yon_char_unite(origin_flagged,NULL),"repos",packnames,YON_TYPE_STRING); + } + 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_command) {/*printf("%s\n",add_command);*/system(add_command);} + if (remove_command) {/*printf("%s\n",remove_command);*/system(remove_command);} + } } } @@ -261,12 +321,14 @@ void on_tree_selection_changed(GtkWidget *self,main_window *widgets){ GtkTreeModel *model = GTK_TREE_MODEL(main_config.tree_store); GtkTreeIter iter; if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->RepoTree)),&model,&iter)){ - char *codeName=NULL,*version=NULL,*architecture=NULL; + char *codeName=NULL,*version=NULL,*architecture=NULL, *dependeces=NULL, *signature=NULL; int serverType=0,trusted=0,published=0; - gtk_tree_model_get(model,&iter,11,&codeName,12,&version,13,&architecture,-1); + gtk_tree_model_get(model,&iter,9,&codeName,10,&version,11,&architecture,12,&dependeces,13,&signature,-1); gtk_label_set_text(GTK_LABEL(widgets->CodeNameInfoLabel),codeName ? codeName : ""); gtk_label_set_text(GTK_LABEL(widgets->VersionInfoLabel),version ? version : ""); gtk_label_set_text(GTK_LABEL(widgets->ArchitectureInfoLabel),architecture ? architecture : ""); + gtk_label_set_text(GTK_LABEL(widgets->DependencesInfoLabel),dependeces ? dependeces : ""); + gtk_label_set_text(GTK_LABEL(widgets->SignatureInfoLabel),signature ? signature : ""); int depth = gtk_tree_store_iter_depth(main_config.tree_store,&iter); if (depth == 0){ gtk_widget_set_sensitive(widgets->CreateButton,1); @@ -295,10 +357,10 @@ void on_repo_add_new(GtkWidget *self, dictionary *dict){ char *name=NULL; name = window->path; - window->path = yon_char_divide(yon_char_new(name),yon_char_find_last(window->path, '/')); + // window->path = yon_char_divide(yon_char_new(name),yon_char_find_last(window->path, '/')); if (!name||strcmp(name,"")!=0){ GtkTreeIter *iter = yon_repo_append(widgets, name, YON_REPO_LINE_REPO_TYPE); - gtk_tree_store_set(main_config.tree_store,iter,0,folder_added,2,window->BranchesListStore,3,window->path,-1); + gtk_tree_store_set(main_config.tree_store,iter,0,folder_added,2,window->path,3,1,-1); yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); } else { yon_ubl_status_box_render(EMPTY_NAME_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); @@ -352,6 +414,42 @@ void on_repo_remove(GtkWidget *self, main_window *widgets){ yon_repo_remove(widgets); } +void on_sign_save(GtkWidget *self, dictionary *dict){ + GtkTreeIter iter; + main_window *widgets = yon_dictionary_get_data(dict->first,main_window*); + repo_sign_window *window = yon_dictionary_get_data(dict->first->next,repo_sign_window*); + GtkTreeModel *model = GTK_TREE_MODEL(main_config.tree_store); + if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->RepoTree)),&model,&iter)){ + gtk_tree_store_set(main_config.tree_store,&iter,0,gtk_tree_store_iter_depth(main_config.tree_store,&iter)==0 ? folder_added : document_added,3,1,13,(char*)gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->KeysCombo)),-1); + } + on_tree_selection_changed(self,widgets); + on_close_subwindow(self); +} + +void on_repo_sign(GtkWidget *self, main_window *widgets){ + repo_sign_window *window = g_malloc(sizeof(repo_sign_window)); + GtkBuilder *builder = gtk_builder_new_from_resource(glade_sign_path); + window->Window = yon_gtk_builder_get_widget(builder,"repoSignWindow"); + window->HeaderLabel = yon_gtk_builder_get_widget(builder,"signHeaderNameLabel"); + window->KeysCombo = yon_gtk_builder_get_widget(builder,"repoSignKeysCombo"); + + window->SaveButton = yon_gtk_builder_get_widget(builder,"repoSignSaveButton"); + window->CloseButton = yon_gtk_builder_get_widget(builder,"repoSignCancelButton"); + + int size=0; + config_str ret = yon_config_load(get_gpg_keys_command,&size); + for (int i=0;iKeysCombo),ret[i]); + } + dictionary *dict = yon_dictionary_new_with_data("",widgets); + dict = yon_dictionary_append_with_data(dict,"",window); + g_signal_connect(G_OBJECT(window->SaveButton),"clicked", G_CALLBACK(on_sign_save),dict); + g_signal_connect(G_OBJECT(window->CloseButton),"clicked", G_CALLBACK(on_close_subwindow),NULL); + + gtk_widget_show(window->Window); +} + void on_repo_configure(GtkWidget *self, main_window *widgets){ GtkTreeModel *model = GTK_TREE_MODEL(main_config.tree_store); GtkTreeIter iter; @@ -384,9 +482,9 @@ void on_repo_configure_done(GtkWidget *self, dictionary *dict){ char *oldname=NULL; int status=0; char *name = (char*)gtk_entry_get_text(GTK_ENTRY(window->NameEntry)); - gtk_tree_model_get(model,&iter,1,&oldname,4,&status,-1); + gtk_tree_model_get(model,&iter,1,&oldname,3,&status,-1); if (status==0) - gtk_tree_store_set(main_config.tree_store,&iter,1,name,6,oldname,7,1,-1); + gtk_tree_store_set(main_config.tree_store,&iter,1,name,4,oldname,6,1,-1); else if (status==1) gtk_tree_store_set(main_config.tree_store,&iter,1,name,-1); } @@ -426,7 +524,7 @@ GtkTreeIter *yon_repo_append(main_window *widgets, char *name, YON_REPO_LINE_TYP if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->RepoTree)),&model,&parentIter)){ 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,3,name,4,1,5,fls,-1); + gtk_tree_store_set(main_config.tree_store,&iter,0, folder_no_edits, 1, name_short,2,name,3,1,4,fls,-1); retIter = gtk_tree_iter_copy(&iter); } else if (type==YON_REPO_LINE_FILE_TYPE){ @@ -434,12 +532,12 @@ GtkTreeIter *yon_repo_append(main_window *widgets, char *name, YON_REPO_LINE_TYP if (gtk_tree_model_iter_parent(model,&branch,&parentIter)){ GtkTreeIter repo; gtk_tree_store_append(main_config.tree_store,&iter,&branch); - gtk_tree_store_set(main_config.tree_store,&iter,0, document_no_edits, 1, name_short,3,name,4,1,5,fls,-1); + gtk_tree_store_set(main_config.tree_store,&iter,0, document_no_edits, 1, name_short,2,name,3,1,4,fls,-1); retIter = gtk_tree_iter_copy(&iter); } else { gtk_tree_store_append(main_config.tree_store,&iter,&parentIter); - gtk_tree_store_set(main_config.tree_store,&iter,0, document_no_edits, 1, name_short,3,name,4,1,5,fls,-1); + gtk_tree_store_set(main_config.tree_store,&iter,0, document_no_edits, 1, name_short,2,name,3,1,4,fls,-1); retIter = gtk_tree_iter_copy(&iter); } yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); @@ -448,7 +546,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,3,name,4,1,5,fls,-1); + gtk_tree_store_set(main_config.tree_store,&iter,0, folder_no_edits, 1, name_short,2,name,3,1,4,fls,-1); retIter = gtk_tree_iter_copy(&iter); gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->RepoTree)),&iter); } else { @@ -465,9 +563,9 @@ void yon_repo_remove_package(main_window *widgets){ if (gtk_tree_model_iter_parent(model,&iterparent,&iter)){ // gtk_tree_store_remove(main_config.tree_store,&iter); int status = 0; - gtk_tree_model_get(GTK_TREE_MODEL(main_config.tree_store),&iter,4,&status,-1); + gtk_tree_model_get(GTK_TREE_MODEL(main_config.tree_store),&iter,3,&status,-1); if (status != 1){ - gtk_tree_store_set(main_config.tree_store,&iter,4,-1,-1); + gtk_tree_store_set(main_config.tree_store,&iter,3,-1,-1); gtk_tree_store_set(main_config.tree_store,&iter,0,document_deleted,-1); } else gtk_tree_store_remove(main_config.tree_store,&iter); yon_ubl_status_box_render(OPERATION_DONE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); @@ -481,19 +579,19 @@ void yon_repo_remove(main_window *widgets){ 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)==0){ int repostatus=0; - gtk_tree_model_get(GTK_TREE_MODEL(main_config.tree_store),&iter,4,&repostatus,-1); + gtk_tree_model_get(GTK_TREE_MODEL(main_config.tree_store),&iter,3,&repostatus,-1); if (repostatus ==0){ - gtk_tree_store_set(main_config.tree_store,&iter,4,-1,0,folder_deleted,-1); + gtk_tree_store_set(main_config.tree_store,&iter,3,-1,0,folder_deleted,-1); int valid=gtk_tree_model_iter_children(model,&childIter,&iter); for (;valid;valid=gtk_tree_model_iter_next(model,&childIter)){ - int status=0; - gtk_tree_model_get(model,&childIter,4,&status,-1); + int status=5; + gtk_tree_model_get(model,&childIter,3,&status,-1); if (status==1){ deletecopy = gtk_tree_iter_copy(&childIter); gtk_tree_model_iter_previous(model,&childIter); gtk_tree_store_remove(main_config.tree_store,deletecopy); } else if (status == 0){ - gtk_tree_store_set(main_config.tree_store,&childIter, 0,document_deleted,4,-1,5,1,-1); + gtk_tree_store_set(main_config.tree_store,&childIter, 0,document_deleted,3,-1,-1); } } } else if (repostatus == 1) { @@ -519,19 +617,22 @@ void yon_add_file(main_window *widgets){ char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser)); FILE *file = popen(get_package_info_command(filename),"r"); char *cur_string=g_malloc0(sizeof(char)*4096); - char *packname=NULL, *packver=NULL, *packarch=NULL; + char *packname=NULL, *packver=NULL, *packarch=NULL, *packdepends=NULL; while (fgets(cur_string,4096,file)){ - cur_string = yon_char_divide_search(cur_string,"\n",-1); - char *p = yon_char_divide_search(cur_string,":",-1); - if (strstr(p,"Name")) packname = yon_char_new(cur_string); - else if (strstr(p,"Version")) packver = yon_char_new(cur_string); - else if (strstr(p,"Architecture")) packarch = yon_char_new(cur_string); + printf("%s\n",cur_string); + char *stringe = yon_char_divide_search(cur_string,"\n",-1); + char *p = yon_char_divide_search(stringe,":",-1); + if (strstr(p,"Name")) packname = yon_char_new(stringe); + else if (strstr(p,"Version")) packver = yon_char_new(stringe); + else if (strstr(p,"Architecture")) packarch = yon_char_new(stringe); + else if (strstr(p,"Depends On")) packdepends = yon_char_new(stringe); } GtkTreeIter *iter = yon_repo_append(widgets,filename,YON_REPO_LINE_FILE_TYPE); gtk_tree_view_expand_to_path(GTK_TREE_VIEW(widgets->RepoTree),gtk_tree_model_get_path(GTK_TREE_MODEL(main_config.tree_store),iter)); - gtk_tree_store_set(main_config.tree_store,iter,0,document_added,11,packname,12,packver,13,packarch,-1); + gtk_tree_store_set(main_config.tree_store,iter,0,document_added,9,packname,10,packver,11,packarch,12,packdepends,-1); } + on_tree_selection_changed(NULL,widgets); on_close_subwindow(chooser); @@ -621,7 +722,7 @@ main_window *setup_window(){ widgets->ArchitectureLabel = yon_gtk_builder_get_widget(builder,"ArchitectureLabel"); widgets->ArchitectureInfoLabel = yon_gtk_builder_get_widget(builder,"ArchitectureInfoLabel"); widgets->ComponentsLabel = yon_gtk_builder_get_widget(builder,"ComponentsLabel"); - widgets->ComponentsInfoLabel = yon_gtk_builder_get_widget(builder,"ComponentsInfoLabel"); + widgets->DependencesInfoLabel = yon_gtk_builder_get_widget(builder,"DependencesInfoLabel"); widgets->SignatureLabel = yon_gtk_builder_get_widget(builder,"SignatureLabel"); widgets->SignatureInfoLabel = yon_gtk_builder_get_widget(builder,"SignatureInfoLabel"); widgets->Finder = yon_gtk_builder_get_widget(builder,"RepoFinder"); @@ -667,6 +768,7 @@ main_window *setup_window(){ g_signal_connect(G_OBJECT(widgets->DeleteButton),"clicked",G_CALLBACK(on_repo_remove),widgets); g_signal_connect(G_OBJECT(widgets->LoadFromLocalButton),"clicked",G_CALLBACK(on_repo_load_local),widgets); g_signal_connect(G_OBJECT(widgets->ConfigureButton),"clicked",G_CALLBACK(on_repo_configure),widgets); + g_signal_connect(G_OBJECT(widgets->SignButton),"clicked",G_CALLBACK(on_repo_sign),widgets); g_signal_connect(G_OBJECT(widgets->SaveButton),"clicked",G_CALLBACK(on_save),widgets); g_signal_connect(G_OBJECT(widgets->RepoTree),"cursor-changed",G_CALLBACK(on_tree_selection_changed),widgets); g_signal_connect(G_OBJECT(widgets->Finder),"changed",G_CALLBACK(on_search),widgets); diff --git a/source/ubl-settings-repomanager.h b/source/ubl-settings-repomanager.h index ec12e78..5fc7d9d 100644 --- a/source/ubl-settings-repomanager.h +++ b/source/ubl-settings-repomanager.h @@ -22,6 +22,7 @@ #define glade_path "/com/ublinux/ui/ubl-settings-repomanager.glade" #define glade_repo_path "/com/ublinux/ui/ubl-settings-repomanager-windows.glade" +#define glade_sign_path "/com/ublinux/ui/ubl-settings-repomanager-sign.glade" #define banner_path "/com/ublinux/images/ubl-settings-repomanager-banner.png" #define CssPath "/com/ublinux/css/ubl-settings-repomanager.css" #define config_path yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL) @@ -38,8 +39,10 @@ #define LocaleName "ubl-settings-repomanager" typedef char* string; -#define get_package_info_command(filename) yon_char_unite("LC_ALL=EN pacman -Q --info --file ",filename," |grep -E \"Name|Version|Architecture\" |sed -e 's/ *//g'",NULL) -#define get_saved_package_info_command(path,filename) yon_char_unite("LC_ALL=EN pacman -Q --info --file $(find \"",path,"\" -name \"",filename,"\") 2>/dev/null|grep -E \"Name|Version|Architecture\" |sed -e 's/ *//g'",NULL) +#define get_package_info_command(filename) yon_char_unite("LC_ALL=EN pacman -Q --info --file ",filename," |sed -e 's/ */ /g' -e 's/ : /:/g' -e 's/:/:/;s/\\n//g' -e 's/ *//g'",NULL) +#define get_saved_package_info_command(path,filename) yon_char_unite("LC_ALL=EN pacman -Q --info --file $(find \"",path,"\" -name \"*",filename,"*\")|sed -e 's/ *//g' -e 's/ : /:/g' -e 's/ -e 's/^ y;y/\t/g' *//g'",NULL) + +#define get_gpg_keys_command "gpg --list-signatures | grep '^sig 3' | cut -d' ' -f10,11,13- | sort -u |sed -e 's/[0-9]*-[0-9]*-[0-9]* //g'" string version_application; @@ -126,7 +129,7 @@ typedef struct { GtkWidget *ArchitectureLabel; GtkWidget *ArchitectureInfoLabel; GtkWidget *ComponentsLabel; - GtkWidget *ComponentsInfoLabel; + GtkWidget *DependencesInfoLabel; GtkWidget *SignatureLabel; GtkWidget *SignatureInfoLabel; GtkWidget *Finder; @@ -147,6 +150,15 @@ typedef struct { char *path; } repo_create_window; +typedef struct { + GtkWidget *Window; + GtkWidget *HeaderLabel; + GtkWidget *KeysCombo; + + GtkWidget *CloseButton; + GtkWidget *SaveButton; +} repo_sign_window; + typedef struct { GtkWidget *Window; diff --git a/ubl-settings-repomanager-sign.glade b/ubl-settings-repomanager-sign.glade new file mode 100644 index 0000000..491c267 --- /dev/null +++ b/ubl-settings-repomanager-sign.glade @@ -0,0 +1,132 @@ + + + + + + True + False + process-stop-symbolic + + + True + False + emblem-ok-symbolic + + + 450 + False + True + com.ublinux.ubl-settings-repomanager + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + vertical + 10 + + + True + False + vertical + 5 + + + True + False + + + False + True + 0 + + + + + True + True + 0 + + + + + True + False + end + 5 + True + + + Cancel + True + True + True + image16 + + + + True + True + 0 + + + + + Save + True + True + True + image17 + + + + True + True + 1 + + + + + False + True + 1 + + + + + + + True + False + True + + + True + False + Repository manager + + + + + + + + True + False + 32 + com.ublinux.ubl-settings-repomanager + + + + + + diff --git a/ubl-settings-repomanager.css b/ubl-settings-repomanager.css index 547dcda..7f91a20 100644 --- a/ubl-settings-repomanager.css +++ b/ubl-settings-repomanager.css @@ -117,4 +117,21 @@ background:transparent; .boxInfoMessOK{ background-color: #f3f0ac; +} +.invisprogress { + background-color:transparent; + color:transparent; + +} +.invisprogress.osd { + background:transparent; + color:transparent; +} +.invisprogress.trough * { + background:transparent; + color:transparent; +} +.invisprogress.trough.empty { + background:transparent; + color:transparent; } \ No newline at end of file diff --git a/ubl-settings-repomanager.glade b/ubl-settings-repomanager.glade index 520d3db..cc16b06 100644 --- a/ubl-settings-repomanager.glade +++ b/ubl-settings-repomanager.glade @@ -196,14 +196,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - - @@ -220,6 +216,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + + + @@ -262,6 +262,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False user-trash-symbolic + + True + False + com.ublinux.ubl-settings-repomanager.document-sign-symbolic + True False @@ -749,7 +754,6 @@ translated and supported by community. - True True True Configure repository @@ -792,6 +796,23 @@ translated and supported by community. 5 + + + True + True + True + Sign + image5 + + + + False + True + 6 + + True @@ -947,11 +968,12 @@ translated and supported by community. True False - 20 + 5 True False + start Code name: 0 @@ -968,6 +990,8 @@ translated and supported by community. True False + True + 0 False @@ -985,11 +1009,12 @@ translated and supported by community. False - 20 + 5 True False + start Branch: 0 @@ -1006,6 +1031,8 @@ translated and supported by community. True False + True + 0 False @@ -1024,11 +1051,12 @@ translated and supported by community. True False - 20 + 5 True False + start Version: 0 @@ -1045,6 +1073,8 @@ translated and supported by community. True False + True + 0 False @@ -1063,11 +1093,12 @@ translated and supported by community. True False - 20 + 5 True False + start Architecture: 0 @@ -1084,6 +1115,8 @@ translated and supported by community. True False + True + 0 False @@ -1100,13 +1133,15 @@ translated and supported by community. + True False - 20 + 5 True False - Components: + start + Dependences: 0 @@ -1119,9 +1154,11 @@ translated and supported by community. - + True False + True + 0 False @@ -1138,12 +1175,14 @@ translated and supported by community. + True False - 20 + 5 True False + start Signature: 0 @@ -1160,6 +1199,8 @@ translated and supported by community. True False + True + 0 False @@ -1633,4 +1674,14 @@ translated and supported by community. + + + + + + + + + +