From aba1831b30b8c8297ad80d4b096d6d2f0c0e8a8c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 22 Sep 2023 18:14:48 +0600 Subject: [PATCH 1/6] Various bugs fixes --- source/ubl-settings-repomanager.c | 21 ++++++++++++--------- ubl-settings-repomanager.glade | 3 +++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index 141e4fe..9bcb1f9 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -539,19 +539,15 @@ void on_repo_configure_done(GtkWidget *self, dictionary *dict){ void on_repo_load_local(GtkWidget *self, main_window *widgets){ GtkFileFilter *file_filter = gtk_file_filter_new(); - GtkWidget *chooser = gtk_file_chooser_dialog_new(LOAD_REPO_LABEL,NULL,GTK_FILE_CHOOSER_ACTION_OPEN,CANCEL_LABEL,GTK_RESPONSE_CANCEL,OPEN_LABEL,GTK_RESPONSE_ACCEPT,NULL); - 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); + GtkWidget *chooser = gtk_file_chooser_dialog_new(LOAD_REPO_LABEL,NULL,GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,CANCEL_LABEL,GTK_RESPONSE_CANCEL,OPEN_LABEL,GTK_RESPONSE_ACCEPT,NULL); + // 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){ char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser)); - while (1){ - char *ret = yon_char_divide_search(filename,"/",-1); - if (strcmp(ret,filename)==0) break; - } yon_repo_append(widgets,filename,YON_REPO_LINE_REPO_TYPE); } on_close_subwindow(chooser); @@ -647,11 +643,18 @@ void yon_repo_remove(main_window *widgets){ } else yon_ubl_status_box_render(NOTHING_CHOSEN_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); } +gboolean yon_check_file_pattern(GtkFileFilterInfo *info){ + if (!strstr(info->filename,".sig")&&strstr(info->filename,".pkg.tar.")) + return 1; + else return 0; +} + void yon_add_file(main_window *widgets){ GtkWidget *chooser = gtk_file_chooser_dialog_new(ADD_PACKAGE_REPO_LABEL,NULL,GTK_FILE_CHOOSER_ACTION_OPEN,CANCEL_LABEL,GTK_RESPONSE_CANCEL,OPEN_LABEL,GTK_RESPONSE_ACCEPT,NULL); GtkFileFilter *file_filter = gtk_file_filter_new(); file_filter = gtk_file_filter_new(); - gtk_file_filter_add_pattern(file_filter,"*.pkg.tar.*"); + // gtk_file_filter_add_pattern(file_filter,"*.pkg.tar.*"); + gtk_file_filter_add_custom(file_filter,GTK_FILE_FILTER_FILENAME,(GtkFileFilterFunc)yon_check_file_pattern,NULL,NULL); gtk_file_filter_set_name(file_filter,".pkg.tar.*"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser),file_filter); file_filter = gtk_file_filter_new(); diff --git a/ubl-settings-repomanager.glade b/ubl-settings-repomanager.glade index 31e4f0a..138f0d7 100644 --- a/ubl-settings-repomanager.glade +++ b/ubl-settings-repomanager.glade @@ -773,6 +773,7 @@ translated and supported by community. True + False True True Delete repository @@ -829,6 +830,7 @@ translated and supported by community. True + False True True Add package @@ -846,6 +848,7 @@ translated and supported by community. True + False True True Remove package From a9d84285684ed0579079bd8708f8481ebec75193 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 25 Sep 2023 09:47:28 +0600 Subject: [PATCH 2/6] Removed open button - it was repeating create button functions --- source/ubl-strings.h | 2 +- ubl-settings-repomanager.glade | 1 - ubl-settings-repomanager.pot | 2 +- ubl-settings-repomanager_ru.po | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 6d60768..0903905 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -46,7 +46,7 @@ #define SIGNATURE_LABEL _("Signature:") #define SIGN_LABEL _("Sign") -#define CREATE_REPO_LABEL _("Create repository") +#define CREATE_REPO_LABEL _("Open or create repository") #define OPEN_REPO_LABEL _("Open existing repository") #define CONFIGURE_REPO_LABEL _("Configure repository") #define DELETE_REPO_LABEL _("Delete repository") diff --git a/ubl-settings-repomanager.glade b/ubl-settings-repomanager.glade index 138f0d7..86db415 100644 --- a/ubl-settings-repomanager.glade +++ b/ubl-settings-repomanager.glade @@ -739,7 +739,6 @@ translated and supported by community. - True True True Open existing repository diff --git a/ubl-settings-repomanager.pot b/ubl-settings-repomanager.pot index 1aa4de1..84620c8 100644 --- a/ubl-settings-repomanager.pot +++ b/ubl-settings-repomanager.pot @@ -210,7 +210,7 @@ msgid "Sign" msgstr "" #: source/ubl-strings.h:49 -msgid "Create repository" +msgid "Open or create repository" msgstr "" #: source/ubl-strings.h:50 diff --git a/ubl-settings-repomanager_ru.po b/ubl-settings-repomanager_ru.po index 702bbf7..0a1bdfe 100644 --- a/ubl-settings-repomanager_ru.po +++ b/ubl-settings-repomanager_ru.po @@ -215,8 +215,8 @@ msgid "Sign" msgstr "Подписать" #: source/ubl-strings.h:49 -msgid "Create repository" -msgstr "Создать репозиторий" +msgid "Open or create repository" +msgstr "Открыть или создать репозиторий" #: source/ubl-strings.h:50 msgid "Open existing repository" From 06b559ecbe84c14cf2f6c7495ba02e8479c9b2b8 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 25 Sep 2023 10:19:30 +0600 Subject: [PATCH 3/6] Sign button is unsensitive when nothing chosen --- source/ubl-settings-repomanager.c | 3 +++ ubl-settings-repomanager.glade | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c index 9bcb1f9..7c72a56 100644 --- a/source/ubl-settings-repomanager.c +++ b/source/ubl-settings-repomanager.c @@ -363,6 +363,7 @@ void on_tree_selection_changed(GtkWidget *self,main_window *widgets){ gtk_widget_set_sensitive(widgets->DeleteButton,1); gtk_widget_set_sensitive(widgets->AddPackageButton,1); gtk_widget_set_sensitive(widgets->RemovePackageButton,0); + gtk_widget_set_sensitive(widgets->SignButton,1); gtk_widget_set_visible(widgets->NameBox,1); gtk_widget_set_visible(widgets->DependenceBox,0); gtk_widget_set_visible(widgets->VersionBox,0); @@ -375,6 +376,7 @@ void on_tree_selection_changed(GtkWidget *self,main_window *widgets){ gtk_widget_set_sensitive(widgets->DeleteButton,0); gtk_widget_set_sensitive(widgets->AddPackageButton,1); gtk_widget_set_sensitive(widgets->RemovePackageButton,1); + gtk_widget_set_sensitive(widgets->SignButton,1); gtk_widget_set_visible(widgets->NameBox,1); gtk_widget_set_visible(widgets->DependenceBox,1); gtk_widget_set_visible(widgets->VersionBox,1); @@ -388,6 +390,7 @@ void on_tree_selection_changed(GtkWidget *self,main_window *widgets){ gtk_widget_set_sensitive(widgets->DeleteButton,0); gtk_widget_set_sensitive(widgets->AddPackageButton,0); gtk_widget_set_sensitive(widgets->RemovePackageButton,0); + gtk_widget_set_sensitive(widgets->SignButton,0); gtk_widget_set_visible(widgets->NameBox,0); gtk_widget_set_visible(widgets->DependenceBox,0); gtk_widget_set_visible(widgets->VersionBox,0); diff --git a/ubl-settings-repomanager.glade b/ubl-settings-repomanager.glade index 86db415..b87000a 100644 --- a/ubl-settings-repomanager.glade +++ b/ubl-settings-repomanager.glade @@ -725,7 +725,7 @@ translated and supported by community. True True True - Create repository + Open or create repository image1