Applications
/
ubl-settings-repomanager
10
0
Fork 1
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Info render changes

Browse Source
pull/99/head
Ivan Dmitrievich Yartsev 5 months ago
parent 810cd8bdd3
commit 5e2c05b6ac
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File

24
source/ubl-settings-repomanager.c
Unescape View File

@ -721,7 +721,7 @@ void on_main_tree_selection_changed(GtkWidget *self, main_window *widgets){
char *repo_string = yon_char_parsed_to_string(repos,size,", ");
char *archs_string = yon_char_parsed_to_string(archs,arch_size,", ");
char *info = get_storage_info_label(target,repo_string,archs_string);
gtk_label_set_text(GTK_LABEL(widgets->InformationLabel),info);
gtk_label_set_markup(GTK_LABEL(widgets->InformationLabel),info);
int lvlsize;
config_str level = yon_tree_store_get_all_at_level(widgets->RepoList,&iter,&lvlsize,2,2);
for (int i=0;i<lvlsize;i++){
@ -742,7 +742,7 @@ void on_main_tree_selection_changed(GtkWidget *self, main_window *widgets){
char *archs_string = yon_char_parsed_to_string(archs,arch_size,", ");
char *sign = yon_signature_get(GTK_TREE_VIEW(widgets->ReposTree),&iter);
char *info = get_repo_info_label(name,archs_string,sign);
gtk_label_set_text(GTK_LABEL(widgets->InformationLabel),info);
gtk_label_set_markup(GTK_LABEL(widgets->InformationLabel),info);
int lvlsize;
config_str level = yon_tree_store_get_all_at_level(widgets->RepoList,&iter,&lvlsize,2,3);
for (int i=0;i<lvlsize;i++){
@ -761,7 +761,7 @@ void on_main_tree_selection_changed(GtkWidget *self, main_window *widgets){
char *trg;
gtk_tree_model_get(GTK_TREE_MODEL(widgets->RepoList),&itor,2,&trg,-1);
char *info = get_arch_info_label(trg,name);
gtk_label_set_text(GTK_LABEL(widgets->InformationLabel),info);
gtk_label_set_markup(GTK_LABEL(widgets->InformationLabel),info);
char *packages;
int size;
char *arch = yon_char_new(target);
@ -807,7 +807,7 @@ void on_main_tree_selection_changed(GtkWidget *self, main_window *widgets){
}
void on_package_selection_changed(GtkWidget *self, main_window *widgets){
gtk_label_set_text(GTK_LABEL(widgets->InformationLabel),"");
gtk_label_set_markup(GTK_LABEL(widgets->InformationLabel),"");
GtkTreeIter iter,itar;
GtkTreeModel *model, *model2;
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->RepoFileTree)),&model,&iter)){
@ -827,10 +827,22 @@ void on_package_selection_changed(GtkWidget *self, main_window *widgets){
char *command = get_package_info_command(yon_char_unite(path,"/",filename,NULL));
yon_debug_output("%s\n",command);
config_str parsed = yon_config_load(command,&size);
for (int i=0;i<size;i++){
if (!yon_char_is_empty(parsed[i])&&strcmp(parsed[i],"\n")&&strstr(parsed[i],":")){
char *title = yon_char_divide_search(parsed[i],":",-1);
char *temp = parsed[i];
if (strstr(temp,"@")) temp = g_markup_escape_text(temp,strlen(temp));
temp = yon_char_replace(temp,">","&gt;");
temp = yon_char_replace(temp,"<","&lt;");
parsed[i] = yon_char_unite("<b>",title,":</b>",temp,NULL);
if (!yon_char_is_empty(temp)) free(temp);
if (!yon_char_is_empty(title)) free(title);
}
}
char *full = yon_char_parsed_to_string(parsed,size,"");
gtk_label_set_text(GTK_LABEL(widgets->InformationLabel),full);
gtk_label_set_markup(GTK_LABEL(widgets->InformationLabel),full);
yon_char_parsed_free(parsed,size);
free(full);
if (!yon_char_is_empty(full)) free(full);
break;
}
}

8
source/ubl-settings-repomanager.h
Unescape View File

@ -90,13 +90,13 @@ typedef char* string;
#define yon_sign_package(storage,repo,arch,target,sign) yon_char_unite("repo-manager add -r ''",repo,"'' -a '",arch,"' -d '", storage,"' -s ",sign," ",target,NULL)
#define yon_sign_repo(storage,repo,sign) yon_char_unite("repo-manager add -f -r ''",repo,"'' -d '", storage,"' --sign-repo=",sign,NULL)
#define get_package_info_command(filename) yon_char_unite("pacman -Q --info --file ",filename," 2>/dev/null|sed -e 's/ */ /g' -e 's/ : /: /g' -e 's/\\n/ /g' -e 's/^ /\\t/g'",NULL)
#define get_package_info_command(filename) yon_char_unite("pacman -Q --info --file '",filename,"' 2>/dev/null|sed -e 's/ */ /g' -e 's/ : /: /g' -e 's/\\n/ /g' -e 's/^ /\\t/g'",NULL)
#define get_storage_info_label(path, repos, archs) yon_char_unite(STORAGE_PATH_LABEL,": ", path,"\n\n", REPOS_LABEL,": ",repos,"\n\n",ARCHS_LABEL,": ",archs,NULL)
#define get_storage_info_label(path, repos, archs) yon_char_unite("<b>",STORAGE_PATH_LABEL,":</b> ", path,"\n\n<b>", REPOS_LABEL,":</b> ",repos,"\n\n<b>",ARCHS_LABEL,":</b> ",archs,NULL)
#define get_repo_info_label(repos, archs,sign) yon_char_unite(REPO_NAME_LABEL,": ",repos,"\n\n",ARCHS_LABEL,": ",archs,"\n\n",sign,NULL)
#define get_repo_info_label(repos, archs,sign) yon_char_unite("<b>",REPO_NAME_LABEL,":</b> ",repos,"\n\n<b>",ARCHS_LABEL,":</b> ",archs,"\n\n",sign,NULL)
#define get_arch_info_label(repos, archs) yon_char_unite(REPO_NAME_LABEL,": ",repos,"\n\n",ARCHS_LABEL,": ",archs,NULL)
#define get_arch_info_label(repos, archs) yon_char_unite("<b>",REPO_NAME_LABEL,":</b> ",repos,"\n\n<b>",ARCHS_LABEL,":</b> ",archs,NULL)
#define yon_generate_key_command(type,name,email,strength,comment,expire,password) yon_char_unite("gpg --batch --gen-key <<EOF\n\
%echo Generating a basic OpenPGP key\n\

Write Preview
Loading…
Cancel
Save