WIP Move window fix

pull/108/head
parent e96362e468
commit 7b42068aa6
No known key found for this signature in database
GPG Key ID: FF1D842BF4DDE92B

@ -1,34 +1,5 @@
#include "ubl-settings-repomanager.h" #include "ubl-settings-repomanager.h"
// gboolean yon_storage_filter_func(GtkTreeModel *model,GtkTreeIter *iter,gpointer data){
// GtkTreeIter parent;
// if (gtk_tree_model_iter_parent(model, &parent, iter))
// return 0;
// return 1;
// }
// config_str yon_tree_store_get_all_at_level(GtkTreeStore *target,GtkTreeIter *parent, int *size, int column, int level){
// (*size)=0;
// config_str final = NULL;
// GtkTreePath *path=NULL, *parent_path=NULL;
// GtkTreeIter iter;
// if (parent){
// parent_path = gtk_tree_model_get_path(GTK_TREE_MODEL(target),parent);
// }
// int valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(target),&iter,parent);
// for(;valid;valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(target),&iter)){
// path = gtk_tree_model_get_path(GTK_TREE_MODEL(target),&iter);
// if (path && gtk_tree_path_get_depth(path)==level&&(!parent_path||gtk_tree_path_is_descendant(path,parent_path))){
// char *append=NULL;
// gtk_tree_model_get(GTK_TREE_MODEL(target),&iter,column,&append,-1);
// yon_char_parsed_add_or_create_if_exists(final,size,append);
// }
// gtk_tree_path_free(path);
// }
// return final;
// }
void on_add_target_repo_selection_changed(GtkWidget *target,repo_add_window *window){ void on_add_target_repo_selection_changed(GtkWidget *target,repo_add_window *window){
gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(window->RepositoryCombo)); gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(window->RepositoryCombo));
char *path_str = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->StorageCombo)); char *path_str = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->StorageCombo));
@ -46,7 +17,7 @@ void on_add_target_arch_selection_changed(GtkWidget *target,repo_add_window *win
gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(window->ArchitectureCombo)); gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(window->ArchitectureCombo));
char *storage_str = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->StorageCombo)); char *storage_str = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->StorageCombo));
char *repo_str = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->RepositoryCombo)); char *repo_str = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->RepositoryCombo));
if (!yon_char_is_empty(storage_str)){ if (!yon_char_is_empty(repo_str)&&!yon_char_is_empty(storage_str)){
storage_struct *storage = g_hash_table_lookup(main_config.storages,storage_str); storage_struct *storage = g_hash_table_lookup(main_config.storages,storage_str);
repo_struct *repo = g_hash_table_lookup(storage->repos,repo_str); repo_struct *repo = g_hash_table_lookup(storage->repos,repo_str);
int size; int size;
@ -79,23 +50,6 @@ void on_add_target_package_selection_changed(GtkWidget *target,repo_add_window *
} }
} }
// void on_move_storage_changed(GtkWidget *self, repo_add_window *window){
// gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(window->MoveTargetRepoEntry));
// gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(window->MoveSourceRepoEntry));
// GtkTreeIter iter,itar;
// char *id = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(self));
// gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->MoveTargetStorageEntry),id);
// gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(window->tree_copy),&iter,id);
// int valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(window->tree_copy),&itar,&iter);
// for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(window->tree_copy),&itar)){
// char *target;
// gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&itar,2,&target,-1);
// char *child_id = gtk_tree_model_get_string_from_iter(GTK_TREE_MODEL(window->tree_copy),&itar);
// gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->MoveTargetRepoEntry),child_id,target);
// gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->MoveSourceRepoEntry),child_id,target);
// }
// }
void on_add_accept(GtkWidget *self, dictionary *dict){ void on_add_accept(GtkWidget *self, dictionary *dict){
repo_add_window *window = yon_dictionary_get_data(dict->first,repo_add_window*); repo_add_window *window = yon_dictionary_get_data(dict->first,repo_add_window*);
filechooser_window *dialog = yon_dictionary_get_data(dict->first->next,filechooser_window*); filechooser_window *dialog = yon_dictionary_get_data(dict->first->next,filechooser_window*);
@ -136,9 +90,6 @@ void on_add_package(GtkWidget *self, repo_add_window *window){
} }
gtk_widget_destroy(dialog->Window); gtk_widget_destroy(dialog->Window);
free(dialog); free(dialog);
// g_signal_connect(G_OBJECT(dialog->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
// g_signal_connect(G_OBJECT(dialog->SaveButton),"clicked",G_CALLBACK(on_add_accept),dict);
// g_signal_connect(G_OBJECT(dialog->MainFileChooser),"file-activated",G_CALLBACK(on_file_chooser_file_activate),dict);
} }
void on_remove_package(GtkWidget *self, repo_add_window *window){ void on_remove_package(GtkWidget *self, repo_add_window *window){
@ -210,61 +161,12 @@ void on_add_packages_accept(GtkWidget *self, dictionary *dict){
yon_interface_update(widgets); yon_interface_update(widgets);
free(window); free(window);
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(window->PackagesList),&iter)){
gtk_widget_set_sensitive(window->StorageCombo,0);
gtk_widget_set_sensitive(window->RepositoryCombo,0);
gtk_widget_set_sensitive(window->ArchitectureCombo,0);
}
// GtkTreeIter iter, itar;
// char *storage;
// if (yon_gtk_tree_iter_get_from_combo_box_id(GTK_COMBO_BOX(window->StorageCombo),GTK_TREE_MODEL(window->tree_copy),&itar)){
// gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&itar,3,&storage,-1);
// const char *repo = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->RepositoryCombo));
// const char *arch = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->ArchitectureCombo));
// GtkTreeModel *model = GTK_TREE_MODEL(window->PackagesList);
// int size=0;
// config_str packages=NULL;
// int valid = gtk_tree_model_get_iter_first(model,&iter);
// for (;valid;valid=gtk_tree_model_iter_next(model,&iter)){
// char *target;
// gtk_tree_model_get(model,&iter,2,&target,-1);
// yon_char_parsed_add_or_create_if_exists(packages,&size,target);
// free(target);
// }
// if (size>0){
// char *command = NULL;
// int repo_sign = gtk_combo_box_get_active(GTK_COMBO_BOX(window->RepoSignCombo));
// int pack_sign = gtk_combo_box_get_active(GTK_COMBO_BOX(window->PackageSignCombo));
// if (repo_sign&&pack_sign){
// command = add_packages_sign_command(storage,arch,repo,gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->RepoSignCombo)),gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->PackageSignCombo)),yon_char_parsed_to_string(packages,size," "));
// } else if (repo_sign){
// command = add_packages_repo_sign_command(storage,arch,repo,gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->RepoSignCombo)),yon_char_parsed_to_string(packages,size," "));
// } else if (pack_sign){
// command = add_packages_package_sign_command(storage,arch,repo,gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->PackageSignCombo)),yon_char_parsed_to_string(packages,size," "));
// } else {
// command = add_packages_command(storage,arch,repo,yon_char_parsed_to_string(packages,size," "));
// }
// yon_debug_output("%s\n",command);
// if (!system(command)){
// yon_window_config_add_instant_parameter(yon_char_unite(storage,"/",repo,"/",arch,NULL),"package_info",yon_char_parsed_to_string(packages,size,","),YON_TYPE_STRING);
// gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->ReposTree),NULL);
// gtk_tree_store_clear(widgets->RepoList);
// yon_gtk_tree_store_copy_full(window->tree_copy,widgets->RepoList);
// gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->ReposTree),GTK_TREE_MODEL(widgets->RepoList));
// const char *id = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->ArchitectureCombo));
// if (!yon_char_is_empty(id)){
// gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(widgets->RepoList),&iter,id);
// gtk_tree_view_expand_to_path(GTK_TREE_VIEW(widgets->ReposTree),gtk_tree_path_new_from_string(id));
// gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->ReposTree)),&iter);
// on_main_tree_selection_changed(NULL,widgets);
// }
// gtk_widget_destroy(window->MainWindow);
// yon_ubl_status_box_render(PACKAGES_ADD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
// yon_config_load_update(widgets);
// }
// } else {
// yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),NOTHING_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
// }
// } else {
// yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),NOTHING_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
// }
} }
// void on_repo_sign_load(GtkWidget *self, repo_add_window *window){ // void on_repo_sign_load(GtkWidget *self, repo_add_window *window){
@ -276,28 +178,6 @@ void on_add_packages_accept(GtkWidget *self, dictionary *dict){
// gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->RepoSignCombo),sign); // gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->RepoSignCombo),sign);
// } // }
// void on_rmb_move(GtkWidget *self, main_window *widgets){
// repo_add_window *window = on_move_clicked(NULL,widgets);
// GtkTreeModel *model;
// GtkTreeIter iter;
// char *path;
// gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->ReposTree)),&model,&iter);
// gtk_tree_model_get(model,&iter,3,&path,-1);
// GList *list = gtk_tree_selection_get_selected_rows(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->RepoFileTree)),&model);
// for (int i=0;i<g_list_length(list);i++){
// GtkTreeIter itar;
// char *filename, *name;
// gtk_tree_model_get_iter(model,&iter,g_list_nth_data(list,i));
// gtk_tree_model_get(model,&iter,1,&name,2,&filename,-1);
// char *full_path = yon_char_unite(path,"/",filename,NULL);
// gtk_list_store_append(window->PackagesList,&itar);
// gtk_list_store_set(window->PackagesList,&itar,1,name,2,full_path,-1);
// free(full_path);
// free(filename);
// free(name);
// }
// }
void yon_add_window_set_selected(main_window *widgets, repo_add_window *window){ void yon_add_window_set_selected(main_window *widgets, repo_add_window *window){
GtkTreeIter iter, itar, itor; GtkTreeIter iter, itar, itor;

@ -1,275 +1,313 @@
// #include "ubl-settings-repomanager.h" #include "ubl-settings-repomanager.h"
// void on_move_repo_changed(GtkWidget *self, repo_add_window *window){
// GtkWidget *ArchCombo = NULL; void on_move_storage_changed(GtkWidget *self, repo_add_window *window){
// ArchCombo = self==window->MoveSourceRepoEntry?window->MoveSourceArchEntry:window->MoveTargetArchEntry; gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(window->MoveTargetRepoEntry));
gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(window->MoveSourceRepoEntry));
// gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(ArchCombo)); char *path_str = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->MoveSourceStorageEntry));
// GtkTreeIter iter,itar; if (!yon_char_is_empty(path_str)){
// char *id = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(self)); gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->MoveTargetStorageEntry),path_str);
// gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(window->tree_copy),&iter,id); storage_struct *storage = g_hash_table_lookup(main_config.storages,path_str);
// int valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(window->tree_copy),&itar,&iter); int size;
// for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(window->tree_copy),&itar)){ config_str repos = (config_str)g_hash_table_get_keys_as_array(storage->repos,&size);
// char *target; for (int i=0;i<size;i++){
// gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&itar,2,&target,-1); gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->MoveSourceRepoEntry),repos[i],repos[i]);
// char *child_id = gtk_tree_model_get_string_from_iter(GTK_TREE_MODEL(window->tree_copy),&itar); gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->MoveTargetRepoEntry),repos[i],repos[i]);
// gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(ArchCombo),child_id,target); }
// } }
}
// }
void on_move_repo_changed(GtkWidget *self, repo_add_window *window){
// void on_move_arch_changed(GtkWidget *self, repo_add_window *window){ gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(window->MoveTargetArchEntry));
// GtkWidget *TargetArchCombo = self==window->MoveTargetArchEntry?window->MoveSourceArchEntry:window->MoveTargetArchEntry; gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(window->MoveSourceArchEntry));
// GtkWidget *TargetRepoCombo = self==window->MoveTargetArchEntry?window->MoveSourceRepoEntry:window->MoveTargetRepoEntry; GtkWidget *check_repo = NULL;
// if (gtk_combo_box_get_active(GTK_COMBO_BOX(self))>-1){ if (self == window->MoveSourceRepoEntry){
check_repo = window->MoveTargetRepoEntry;
// const char *current = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(self)); } else {
// const char *repo_id = gtk_combo_box_get_active_id(GTK_COMBO_BOX(TargetRepoCombo)); check_repo = window->MoveSourceRepoEntry;
}
// if (!yon_char_is_empty(current)&&!yon_char_is_empty(repo_id)){ const char *current_repo_selection = gtk_combo_box_get_active_id(GTK_COMBO_BOX(self));
const char *check_repo_selection = gtk_combo_box_get_active_id(GTK_COMBO_BOX(check_repo));
// GtkTreeIter iter, itar; if (!yon_char_is_empty(current_repo_selection)&&!yon_char_is_empty(check_repo_selection)&&!strcmp(current_repo_selection,check_repo_selection)){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),REPO_SAME_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
// g_signal_handlers_block_by_func(G_OBJECT(TargetArchCombo),on_move_arch_changed,window); return;
// if (yon_gtk_combo_box_text_find(TargetArchCombo,(char*)current)==-1){ }
// gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(window->tree_copy),&iter,repo_id); const char *storage_path = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->MoveSourceStorageEntry));
// gtk_tree_store_append(window->tree_copy,&itar,&iter); const char *repo_name = gtk_combo_box_get_active_id(GTK_COMBO_BOX(self));
// char *id = gtk_tree_model_get_string_from_iter(GTK_TREE_MODEL(window->tree_copy),&itar); if (yon_char_is_empty(storage_path)||yon_char_is_empty(repo_name)) return;
// yon_debug_output("%s\n","arch"); storage_struct *storage = g_hash_table_lookup(main_config.storages,storage_path);
// gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(TargetArchCombo),id,current); if (storage){
// } repo_struct *repo = g_hash_table_lookup(storage->repos,repo_name);
// g_signal_handlers_unblock_by_func(G_OBJECT(TargetArchCombo),on_move_arch_changed,window); if (repo){
// gtk_widget_set_sensitive(window->MoveTargetArchEntry,0); gtk_widget_set_sensitive(window->RepoSignCombo,1);
// gtk_widget_set_sensitive(window->AddPackageButton,1); int size;
// } config_str archs = (config_str)g_hash_table_get_keys_as_array(repo->archs,&size);
// } for (int i=0;i<size;i++){
// } gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->MoveSourceArchEntry),archs[i],archs[i]);
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->MoveTargetArchEntry),archs[i],archs[i]);
// void on_move_add_accept(GtkWidget *self, dictionary *dict){ }
// repo_add_window *window = yon_dictionary_get_data(dict->first,repo_add_window*); }
// file_chooser_window *dialog = yon_dictionary_get_data(dict->first->next,file_chooser_window*); }
// GSList *list = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog->FileChooserWidget));
// for (int i=0;i<g_slist_length(list);i++){ }
// char *path = (char*)g_slist_nth_data(list,i);
// if (yon_file_is_directory(path)){ void on_move_arch_changed(GtkWidget *self, repo_add_window *window){
// int size; GtkWidget *check_arch = NULL;
// config_str files = yon_file_ls(path,&size); if (self == window->MoveSourceArchEntry){
// for (int k=0;k<size;k++){ check_arch = window->MoveTargetArchEntry;
// if (strstr(files[k],".pkg.tar")&&!strstr(files[k],".sig")){ } else {
// GtkTreeIter iter; check_arch = window->MoveSourceArchEntry;
// int temp_size; }
// config_str name = yon_config_load(yon_get_package_name_from_filename(files[k]),&temp_size); const char *chosen = gtk_combo_box_get_active_id(GTK_COMBO_BOX(self));
// yon_char_remove_last_symbol(name[0],'\n'); if (!gtk_combo_box_set_active_id(GTK_COMBO_BOX(check_arch),chosen)){
// gtk_list_store_append(window->PackagesList,&iter); gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(check_arch),chosen,chosen);
// gtk_list_store_set(window->PackagesList,&iter,1,name[0],2,files[k],-1); while(gtk_events_pending())gtk_main_iteration();
// } gtk_combo_box_set_active_id(GTK_COMBO_BOX(check_arch),chosen);
// } }
// } else { gtk_widget_set_sensitive(window->MoveTargetArchEntry,0);
// GtkTreeIter iter; gtk_widget_set_sensitive(window->AddPackageButton,1);
// int temp_size; }
// config_str name = yon_config_load(yon_get_package_name_from_filename(path),&temp_size);
// if (temp_size<=0){ void on_move_add_accept(GtkWidget *self, dictionary *dict){
// yon_ubl_status_box_spawn(GTK_CONTAINER(dialog->StatusBox),PACKAGE_NAME_ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); repo_add_window *window = yon_dictionary_get_data(dict->first,repo_add_window*);
// return; filechooser_window *dialog = yon_dictionary_get_data(dict->first->next,filechooser_window*);
// }
// yon_char_remove_last_symbol(name[0],'\n'); int size;
// if (!yon_gtk_tree_model_check_exist(GTK_TREE_MODEL(window->PackagesList),&iter,name[0],1)){ config_str packages = yon_char_parse(dialog->last_success_selection,&size,",");
// gtk_list_store_append(window->PackagesList,&iter); for (int i=0;i<size;i++){
// gtk_list_store_set(window->PackagesList,&iter,1,name[0],2,path,-1); if (yon_file_is_directory(packages[i])){
// } else { int dir_size;
// yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),ALREADY_EXIST_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); config_str files = yon_file_ls(packages[i],&dir_size);
// } for (int k=0;k<dir_size;k++){
if (strstr(files[k],".pkg.tar")&&!strstr(files[k],".sig")){
// } GtkTreeIter iter;
// } int temp_size;
// gtk_widget_destroy(dialog->Window); config_str name = yon_config_load(yon_get_package_name_from_filename(files[k]),&temp_size);
// free(dialog); yon_char_remove_last_symbol(name[0],'\n');
// GtkTreeIter iter; char *full_path = yon_char_unite(packages[i],"/",files[k],NULL);
// if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(window->tree_copy),&iter)){ gtk_list_store_append(window->PackagesList,&iter);
// gtk_widget_set_sensitive(window->MoveSourceStorageEntry,0); gtk_list_store_set(window->PackagesList,&iter,1,name[0],2,full_path,-1);
// gtk_widget_set_sensitive(window->MoveSourceRepoEntry,0); free(full_path);
// gtk_widget_set_sensitive(window->MoveSourceArchEntry,0); }
}
// gtk_widget_set_sensitive(window->MoveTargetRepoEntry,0);
// gtk_widget_set_sensitive(window->MoveTargetArchEntry,0); } else {
GtkTreeIter iter;
// if (window->StorageCombo&&window->RepositoryCombo&&window->ArchitectureCombo){ int temp_size;
// gtk_widget_set_sensitive(window->StorageCombo,0); config_str name = yon_config_load(yon_get_package_name_from_filename(packages[i]),&temp_size);
// gtk_widget_set_sensitive(window->RepositoryCombo,0); if (temp_size<=0){
// gtk_widget_set_sensitive(window->ArchitectureCombo,0); yon_ubl_status_box_spawn(GTK_CONTAINER(dialog->StatusBox),PACKAGE_NAME_ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
// } return;
// } }
// } yon_char_remove_last_symbol(name[0],'\n');
if (!yon_gtk_tree_model_check_exist(GTK_TREE_MODEL(window->PackagesList),&iter,name[0],1)){
// void on_move_add_package(GtkWidget *self, repo_add_window *window){ gtk_list_store_append(window->PackagesList,&iter);
// if (gtk_combo_box_get_active(GTK_COMBO_BOX(window->MoveTargetArchEntry))>-1&&gtk_combo_box_get_active(GTK_COMBO_BOX(window->MoveSourceStorageEntry))>-1){ gtk_list_store_set(window->PackagesList,&iter,1,name[0],2,packages[i],-1);
// file_chooser_window *dialog = yon_file_chooser_new(); } else {
// yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->MainWindow),CHOSE_PACKAGES_TITLE_LABEL,icon_path,"ChooseMoveFileChooserWindow"); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),ALREADY_EXIST_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
// gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),CHOSE_PACKAGES_TITLE_LABEL); }
// GtkFileFilter *filter = gtk_file_filter_new();
// gtk_file_filter_add_pattern(filter,"*.pkg.tar*[^.sig]"); }
// gtk_file_filter_set_name(filter,"*.pkg.tar.*"); }
// gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog->FileChooserWidget),filter); yon_char_parsed_free(packages,size);
// GtkTreeIter iter,itar; gtk_widget_destroy(dialog->Window);
// yon_gtk_tree_iter_get_from_combo_box_id(GTK_COMBO_BOX(window->MoveSourceArchEntry),GTK_TREE_MODEL(window->tree_copy),&iter); free(dialog);
// char *target; GtkTreeIter iter;
// gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&iter,3,&target,3,&dialog->root_path,-1); if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(window->PackagesList),&iter)){
// gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog->FileChooserWidget),target); gtk_widget_set_sensitive(window->MoveSourceStorageEntry,0);
gtk_widget_set_sensitive(window->MoveSourceRepoEntry,0);
// dictionary *dict = NULL; gtk_widget_set_sensitive(window->MoveSourceArchEntry,0);
// yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
// yon_dictionary_add_or_create_if_exists_with_data(dict,"dialog",dialog); gtk_widget_set_sensitive(window->MoveTargetRepoEntry,0);
gtk_widget_set_sensitive(window->MoveTargetArchEntry,0);
// g_signal_connect(G_OBJECT(dialog->FileChooserWidget),"current-folder-changed",G_CALLBACK(on_folder_changed),dialog);
// g_signal_connect(G_OBJECT(dialog->ChooseButton),"clicked",G_CALLBACK(on_move_add_accept),dict); if (window->StorageCombo&&window->RepositoryCombo&&window->ArchitectureCombo){
// g_signal_connect(G_OBJECT(dialog->FileChooserWidget),"file-activated",G_CALLBACK(on_file_chooser_file_activate),dict); gtk_widget_set_sensitive(window->StorageCombo,0);
// gtk_widget_show(dialog->Window); gtk_widget_set_sensitive(window->RepositoryCombo,0);
// } gtk_widget_set_sensitive(window->ArchitectureCombo,0);
// } }
}
// void on_move_accept(GtkWidget *self, dictionary *dict){ }
// main_window *widgets = yon_dictionary_get_data(dict->first,main_window*);
// repo_add_window *window = yon_dictionary_get_data(dict->first->next,repo_add_window*); void on_move_add_package(GtkWidget *self, repo_add_window *window){
if (gtk_combo_box_get_active(GTK_COMBO_BOX(window->MoveTargetArchEntry))>-1&&gtk_combo_box_get_active(GTK_COMBO_BOX(window->MoveSourceStorageEntry))>-1){
// int size = 0; filechooser_window *dialog = yon_file_chooser_window_new(GTK_FILE_CHOOSER_ACTION_OPEN);
// config_str packages = NULL; yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->MainWindow),CHOSE_PACKAGES_TITLE_LABEL,icon_path,"ChooseMoveFileChooserWindow");
// GtkTreeIter iter,itar; gtk_label_set_text(GTK_LABEL(dialog->HeaderTopic),CHOSE_PACKAGES_TITLE_LABEL);
// for_iter(GTK_TREE_MODEL(window->PackagesList),&iter){ GtkFileFilter *filter = gtk_file_filter_new();
// char *target=NULL; gtk_file_filter_add_pattern(filter,"*.pkg.tar*[^.sig]");
// gtk_tree_model_get(GTK_TREE_MODEL(window->PackagesList),&iter,2,&target,-1); gtk_file_filter_set_name(filter,"*.pkg.tar.*");
// if (!yon_char_is_empty(target)){ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog->MainFileChooser),filter);
// free(yon_char_divide(target,yon_char_find_last(target,'/'))); GtkTreeIter iter,itar;
// yon_char_parsed_add_or_create_if_exists(packages,&size,target); char *target;
// free(target); const char* storage_path = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->MoveSourceStorageEntry));
// } storage_struct *storage = g_hash_table_lookup(main_config.storages,storage_path);
// } if (storage){
// if (size){ const char *repo_name = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->MoveSourceRepoEntry));
// char *arch = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->MoveSourceArchEntry)); repo_struct *repo = g_hash_table_lookup(storage->repos,repo_name);
// yon_gtk_tree_iter_get_from_combo_box_id(GTK_COMBO_BOX(window->MoveSourceRepoEntry),GTK_TREE_MODEL(window->tree_copy),&iter); if (repo){
// yon_gtk_tree_iter_get_from_combo_box_id(GTK_COMBO_BOX(window->MoveTargetRepoEntry),GTK_TREE_MODEL(window->tree_copy),&itar); target = repo->path;
// char *source_path, *source_repo, *target_path, *target_repo; }
// gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&iter,3,&source_repo,-1); gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog->MainFileChooser),1);
// gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&itar,3,&target_repo,-1); gtk_widget_show(dialog->ChooseFolderCheck);
// source_path = yon_char_divide(source_repo,yon_char_find_last(source_repo,'/'));
// target_path = yon_char_divide(target_repo,yon_char_find_last(target_repo,'/')); }
// char *command = yon_move_packages_command(source_path,arch,source_repo, target_repo, yon_char_parsed_to_string(packages,size," ")); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog->MainFileChooser),target);
// yon_debug_output("%s\n",command);
// if (!system(command)){ dictionary *dict = NULL;
// yon_ubl_status_box_render(PACKAGES_MOVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
// gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->ReposTree),NULL); yon_dictionary_add_or_create_if_exists_with_data(dict,"dialog",dialog);
// gtk_tree_store_clear(widgets->RepoList);
// yon_gtk_tree_store_copy_full(window->tree_copy,widgets->RepoList); g_signal_connect(G_OBJECT(dialog->MainFileChooser),"current-folder-changed",G_CALLBACK(on_folder_changed),dict);
// gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->ReposTree),GTK_TREE_MODEL(widgets->RepoList)); if (yon_file_chooser_start(dialog)==GTK_RESPONSE_ACCEPT){
on_move_add_accept(self,dict);
// const char *id = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->ArchitectureCombo)); }
// if (!yon_char_is_empty(id)){ }
// gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(widgets->RepoList),&iter,id); }
// gtk_tree_view_expand_to_path(GTK_TREE_VIEW(widgets->ReposTree),gtk_tree_path_new_from_string(id));
// gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->ReposTree)),&iter); void on_move_accept(GtkWidget *self, dictionary *dict){
// on_main_tree_selection_changed(NULL,widgets); main_window *widgets = yon_dictionary_get_data(dict->first,main_window*);
// } repo_add_window *window = yon_dictionary_get_data(dict->first->next,repo_add_window*);
// yon_config_load_update(widgets);
// on_subwindow_close(window->MainWindow);
// } const char *storage = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->MoveSourceStorageEntry));
// } else { const char *source_repo = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->MoveSourceRepoEntry));
// yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),NOTHING_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); const char *target_repo = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->MoveTargetRepoEntry));
// } const char *arch = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->MoveSourceArchEntry));
// }
const char *repo_sign = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->RepoSignCombo));
// void on_move_remove_package(GtkWidget *self, repo_add_window *window){ if (!yon_char_is_empty(storage)&&!yon_char_is_empty(source_repo)&&!yon_char_is_empty(target_repo)&&!yon_char_is_empty(arch)){
// GtkTreeIter iter;
// GtkTreeModel *model; GtkTreeIter iter;
// if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(window->PackagesTree)),&model,&iter)){ GtkTreeModel *model = GTK_TREE_MODEL(window->PackagesList);
// gtk_list_store_remove(window->PackagesList,&iter); int size;
// } config_str parsed = NULL;
// if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(window->PackagesList),&iter)){ for_iter(model,&iter){
char *path;
// gtk_widget_set_sensitive(window->MoveSourceStorageEntry,1); gtk_tree_model_get(model,&iter,2,&path,-1);
// gtk_widget_set_sensitive(window->MoveSourceRepoEntry,1); yon_char_parsed_add_or_create_if_exists(parsed, &size,path);
// gtk_widget_set_sensitive(window->MoveSourceArchEntry,1); }
// gtk_widget_set_sensitive(window->MoveTargetRepoEntry,1); if (!size) {
// if (window->StorageCombo&&window->RepositoryCombo&&window->ArchitectureCombo){ yon_ubl_status_box_render(NOTHING_CHOSEN_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
// gtk_widget_set_sensitive(window->StorageCombo,1); yon_ubl_status_highlight_incorrect(window->PackagesTree);
// gtk_widget_set_sensitive(window->RepositoryCombo,1); return;
// gtk_widget_set_sensitive(window->ArchitectureCombo,1); }
// } char *packages = yon_char_parsed_to_string(parsed,size," ");
// } char *command = NULL;
// } command = yon_move_packages_command(storage,arch,source_repo,target_repo,packages,repo_sign);
if (system(command)){
// repo_add_window *on_move_clicked(GtkWidget *self, main_window *widgets){ yon_ubl_status_box_render(PACKAGES_ADD_ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
// repo_add_window *window = yon_repo_add_window_new(); } else {
// yon_gtk_window_setup(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window),MOVE_PACKAGES_TITLE_LABEL,icon_path,"move-repo-window"); yon_ubl_status_box_render(PACKAGES_ADD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
// gtk_label_set_text(GTK_LABEL(window->HeadLabel),MOVE_PACKAGES_TITLE_LABEL); }
// gtk_button_set_label(GTK_BUTTON(window->AddButton),MOVE_LABEL); free(command);
// gtk_label_set_text(GTK_LABEL(window->PackagesToAddLabel),MOVE_PACKAGES_LABEL); }
// gtk_widget_show(window->MoveSourceFrame); gtk_widget_destroy(window->MainWindow);
// gtk_widget_show(window->MoveTargetFrame); free(window);
// gtk_widget_hide(gtk_widget_get_parent(window->PackageSignCombo)); }
// GtkTreeIter iter;
// for_iter (window->tree_copy,&iter){ void on_move_remove_package(GtkWidget *self, repo_add_window *window){
// char *current; GtkTreeIter iter;
// gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&iter,3,&current,-1); GtkTreeModel *model;
// if (!yon_char_is_empty(current)){ if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(window->PackagesTree)),&model,&iter)){
// char *path = gtk_tree_model_get_string_from_iter(GTK_TREE_MODEL(window->tree_copy),&iter); gtk_list_store_remove(window->PackagesList,&iter);
// gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->MoveSourceStorageEntry),path,current); }
// gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->MoveTargetStorageEntry),path,current); if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(window->PackagesList),&iter)){
// }
// } gtk_widget_set_sensitive(window->MoveSourceStorageEntry,1);
gtk_widget_set_sensitive(window->MoveSourceRepoEntry,1);
// yon_sign_list_update(); gtk_widget_set_sensitive(window->MoveSourceArchEntry,1);
// yon_combo_box_text_set_signs(GTK_COMBO_BOX_TEXT(window->RepoSignCombo));
// yon_combo_box_text_set_signs(GTK_COMBO_BOX_TEXT(window->PackageSignCombo)); gtk_widget_set_sensitive(window->MoveTargetRepoEntry,1);
// gtk_combo_box_set_active(GTK_COMBO_BOX(window->RepoSignCombo),0); if (window->StorageCombo&&window->RepositoryCombo&&window->ArchitectureCombo){
// gtk_combo_box_set_active(GTK_COMBO_BOX(window->PackageSignCombo),0); gtk_widget_set_sensitive(window->StorageCombo,1);
gtk_widget_set_sensitive(window->RepositoryCombo,1);
// gtk_widget_destroy(gtk_widget_get_parent(window->StorageCombo)); gtk_widget_set_sensitive(window->ArchitectureCombo,1);
// dictionary *dict = NULL; }
// yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets); }
// yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); }
// g_signal_connect(G_OBJECT(window->MoveSourceStorageEntry),"changed",G_CALLBACK(on_move_storage_changed),window);
// g_signal_connect(G_OBJECT(window->MoveSourceRepoEntry),"changed",G_CALLBACK(on_move_repo_changed),window);
// g_signal_connect(G_OBJECT(window->MoveSourceArchEntry),"changed",G_CALLBACK(on_move_arch_changed),window); void yon_move_window_set_selected(main_window *widgets, repo_add_window *window){
GtkTreeIter iter, itar, itor;
// g_signal_connect(G_OBJECT(window->MoveTargetRepoEntry),"changed",G_CALLBACK(on_move_repo_changed),window);
// g_signal_connect(G_OBJECT(window->MoveTargetArchEntry),"changed",G_CALLBACK(on_move_arch_changed),window); if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->ReposTree)),NULL,&iter)){
int depth = gtk_tree_store_iter_depth(widgets->RepoList,&iter);
// g_signal_connect(G_OBJECT(window->AddPackageButton),"clicked",G_CALLBACK(on_move_add_package),window); char *storage=NULL, *repo=NULL, *arch=NULL;
// g_signal_connect(G_OBJECT(window->RemoveButton),"clicked",G_CALLBACK(on_move_remove_package),window); switch (depth){
// g_signal_connect(G_OBJECT(window->AddButton),"clicked",G_CALLBACK(on_move_accept),dict); case 0: //storage
// g_signal_connect(G_OBJECT(window->MoveSourceRepoEntry),"changed",G_CALLBACK(on_repo_sign_load),window); {
// if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->ReposTree)),NULL,&iter)){ gtk_tree_model_get(GTK_TREE_MODEL(widgets->RepoList),&iter,3,&storage,-1);
}break;
// char *target = gtk_tree_model_get_string_from_iter(GTK_TREE_MODEL(widgets->RepoList),&iter); case 1: //repo
// int mod = yon_char_count(target,":")+1; gtk_tree_model_get(GTK_TREE_MODEL(widgets->RepoList),&iter,2,&repo,-1);
// char *arc=NULL; gtk_tree_model_iter_parent(GTK_TREE_MODEL(widgets->RepoList),&itar, &iter);
// char *repo=NULL; gtk_tree_model_get(GTK_TREE_MODEL(widgets->RepoList),&itar,3,&storage,-1);
// char *stor=NULL; break;
// if (mod ==3){ case 2: //arch
// arc = yon_char_new(target); gtk_tree_model_iter_parent(GTK_TREE_MODEL(widgets->RepoList),&itar, &iter);
// char *temp = yon_char_new(target); gtk_tree_model_get(GTK_TREE_MODEL(widgets->RepoList),&itar,2,&repo,-1);
// repo = yon_char_divide(temp,yon_char_find_last(temp,':')); gtk_tree_model_iter_parent(GTK_TREE_MODEL(widgets->RepoList),&itor, &itar);
// free(temp); gtk_tree_model_get(GTK_TREE_MODEL(widgets->RepoList),&itor,3,&storage,-1);
// temp = yon_char_new(repo); break;
// stor = yon_char_divide(temp,yon_char_find_last(temp,':')); }
// free(temp); if (!yon_char_is_empty(storage)) gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->MoveSourceStorageEntry),storage);
// } else if (mod>=2){ while(gtk_events_pending()) gtk_main_iteration();
// repo = yon_char_new(target); if (!yon_char_is_empty(repo)) gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->MoveSourceRepoEntry),repo);
// char *temp = yon_char_new(target); while(gtk_events_pending()) gtk_main_iteration();
// stor = yon_char_divide(temp,yon_char_find_last(temp,':')); if (!yon_char_is_empty(arch)) gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->MoveSourceArchEntry),arch);
// free(temp); }
// } else if (mod>=1){ }
// stor = yon_char_new(target);
// } repo_add_window *on_move_clicked(GtkWidget *self, main_window *widgets){
repo_add_window *window = yon_repo_add_window_new();
// if (stor) yon_gtk_window_setup(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window),MOVE_PACKAGES_TITLE_LABEL,icon_path,"move-repo-window");
// gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->MoveSourceStorageEntry),stor); gtk_label_set_text(GTK_LABEL(window->HeadLabel),MOVE_PACKAGES_TITLE_LABEL);
// if (repo) gtk_button_set_label(GTK_BUTTON(window->AddButton),MOVE_LABEL);
// gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->MoveSourceRepoEntry),repo); gtk_label_set_text(GTK_LABEL(window->PackagesToAddLabel),MOVE_PACKAGES_LABEL);
// if (arc) gtk_widget_show(window->MoveSourceFrame);
// gtk_combo_box_set_active_id(GTK_COMBO_BOX(window->MoveSourceArchEntry),arc); gtk_widget_show(window->MoveTargetFrame);
// } gtk_widget_hide(gtk_widget_get_parent(window->PackageSignCombo));
// gtk_widget_show(window->MainWindow);
// return window; int size;
// } config_str storages = (config_str)g_hash_table_get_keys_as_array(main_config.storages,&size);
for (int i=0;i<size;i++){
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->MoveSourceStorageEntry),storages[i],storages[i]);
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->MoveTargetStorageEntry),storages[i],storages[i]);
}
GtkTreeIter iter;
yon_sign_list_update();
yon_combo_box_text_set_signs(GTK_COMBO_BOX_TEXT(window->RepoSignCombo));
yon_combo_box_text_set_signs(GTK_COMBO_BOX_TEXT(window->PackageSignCombo));
gtk_combo_box_set_active(GTK_COMBO_BOX(window->RepoSignCombo),0);
gtk_combo_box_set_active(GTK_COMBO_BOX(window->PackageSignCombo),0);
gtk_widget_destroy(gtk_widget_get_parent(window->StorageCombo));
dictionary *dict = NULL;
yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
g_signal_connect(G_OBJECT(window->MoveSourceStorageEntry),"changed",G_CALLBACK(on_move_storage_changed),window);
g_signal_connect(G_OBJECT(window->MoveSourceRepoEntry),"changed",G_CALLBACK(on_move_repo_changed),window);
g_signal_connect(G_OBJECT(window->MoveSourceArchEntry),"changed",G_CALLBACK(on_move_arch_changed),window);
g_signal_connect(G_OBJECT(window->MoveTargetRepoEntry),"changed",G_CALLBACK(on_move_repo_changed),window);
g_signal_connect(G_OBJECT(window->MoveTargetArchEntry),"changed",G_CALLBACK(on_move_arch_changed),window);
g_signal_connect(G_OBJECT(window->AddPackageButton),"clicked",G_CALLBACK(on_move_add_package),window);
g_signal_connect(G_OBJECT(window->RemoveButton),"clicked",G_CALLBACK(on_move_remove_package),window);
yon_rmb_menu_setup(window->PackagesTree,(int(*)(void*))gtk_widget_is_sensitive,window->AddPackageButton,
ADD_PACKAGE_LABEL,add_icon_name,G_CALLBACK(on_move_add_package),window,
REMOVE_PACKAGE_LABEL,remove_icon,G_CALLBACK(on_move_remove_package),window,
NULL);
g_signal_connect(G_OBJECT(window->AddButton),"clicked",G_CALLBACK(on_move_accept),dict);
// g_signal_connect(G_OBJECT(window->MoveSourceRepoEntry),"changed",G_CALLBACK(on_repo_sign_load),window);
yon_move_window_set_selected(widgets,window);
gtk_widget_show(window->MainWindow);
return window;
}

@ -35,10 +35,21 @@ config main_config;
// // main window // // main window
void on_folder_changed(GtkFileChooser *self, file_chooser_window *dialog){ void on_folder_changed(GtkFileChooser *self, dictionary *dict){
repo_add_window *window = yon_dictionary_get_data(dict->first,repo_add_window*);
filechooser_window *dialog = yon_dictionary_get_data(dict->first->next,filechooser_window*);
const char *current = gtk_file_chooser_get_current_folder(self); const char *current = gtk_file_chooser_get_current_folder(self);
if (!strstr(current,dialog->root_path)){
gtk_file_chooser_set_current_folder(self,dialog->root_path); const char* storage_path = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->MoveSourceStorageEntry));
storage_struct *storage = g_hash_table_lookup(main_config.storages,storage_path);
if (storage){
const char *repo_name = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->MoveSourceRepoEntry));
repo_struct *repo = g_hash_table_lookup(storage->repos,repo_name);
if (repo){
if (!strstr(current,repo->path)){
gtk_file_chooser_set_current_folder(self,repo->path);
}
}
} }
} }
@ -655,7 +666,7 @@ main_window *yon_main_window_complete(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->DBConfigurationButton),"clicked",G_CALLBACK(on_storage_configure_clicked),widgets); g_signal_connect(G_OBJECT(widgets->DBConfigurationButton),"clicked",G_CALLBACK(on_storage_configure_clicked),widgets);
g_signal_connect(G_OBJECT(widgets->AddButton),"clicked",G_CALLBACK(on_add_clicked),widgets); g_signal_connect(G_OBJECT(widgets->AddButton),"clicked",G_CALLBACK(on_add_clicked),widgets);
// g_signal_connect(G_OBJECT(widgets->MoveButton),"clicked",G_CALLBACK(on_move_clicked),widgets); g_signal_connect(G_OBJECT(widgets->MoveButton),"clicked",G_CALLBACK(on_move_clicked),widgets);
// g_signal_connect(G_OBJECT(widgets->RemoveButton),"clicked",G_CALLBACK(on_remove_clicked),widgets); // g_signal_connect(G_OBJECT(widgets->RemoveButton),"clicked",G_CALLBACK(on_remove_clicked),widgets);
g_signal_connect(G_OBJECT(widgets->ReposTree),"cursor-changed",G_CALLBACK(on_main_tree_selection_changed),widgets); g_signal_connect(G_OBJECT(widgets->ReposTree),"cursor-changed",G_CALLBACK(on_main_tree_selection_changed),widgets);
g_signal_connect(G_OBJECT(widgets->CloudButton),"clicked",G_CALLBACK(on_ubl_settings_update_launch),widgets); g_signal_connect(G_OBJECT(widgets->CloudButton),"clicked",G_CALLBACK(on_ubl_settings_update_launch),widgets);

@ -69,7 +69,7 @@ typedef char* string;
#define repo_sign_command(storage_path, repo, sign) yon_char_unite("repo-manager add -f -r '",repo,"' -d '", storage_path, "' -S ", sign,NULL) #define repo_sign_command(storage_path, repo, sign) yon_char_unite("repo-manager add -f -r '",repo,"' -d '", storage_path, "' -S ", sign,NULL)
#define yon_move_packages_command(storage,arch, source_repo, target_repo, packages) yon_char_unite("repo-manager move -d '",storage,"' -a '",arch,"' -R '",source_repo,"' -r '",target_repo,"' ", packages,NULL) #define yon_move_packages_command(storage,arch, source_repo, target_repo, packages,sign) yon_char_unite("repo-manager move -d '",storage,"' -a '",arch,"' -R '",source_repo,"' -r '",target_repo,"' ",sign?"-S ":"",sign?sign:"",sign?" ":"", packages,NULL)
#define yon_delete_packages_command(storage,arch, target_repo, packages) yon_char_unite("repo-manager remove -d '",storage,"' -a '",arch,"' -r '",target_repo,"' ", packages,NULL) #define yon_delete_packages_command(storage,arch, target_repo, packages) yon_char_unite("repo-manager remove -d '",storage,"' -a '",arch,"' -r '",target_repo,"' ", packages,NULL)
#define yon_delete_packages_sign_command(storage,arch, target_repo,sign, packages) yon_char_unite("repo-manager remove -d '",storage,"' -a '",arch,"' -r '",target_repo,"' -S '",sign,"' ", packages,NULL) #define yon_delete_packages_sign_command(storage,arch, target_repo,sign, packages) yon_char_unite("repo-manager remove -d '",storage,"' -a '",arch,"' -r '",target_repo,"' -S '",sign,"' ", packages,NULL)
@ -244,17 +244,6 @@ typedef struct {
config_str delete_storages; config_str delete_storages;
} storage_config_window; } storage_config_window;
typedef struct {
GtkWidget *Window;
GtkWidget *StatusBox;
GtkWidget *HeadLabel;
GtkWidget *CancelButton;
GtkWidget *ChooseButton;
GtkWidget *NameEntry;
GtkWidget *FileChooserWidget;
char *root_path;
} file_chooser_window;
typedef struct { typedef struct {
GtkWidget *Window; GtkWidget *Window;
GtkWidget *StatusBox; GtkWidget *StatusBox;
@ -374,7 +363,6 @@ void on_add_target_repo_selection_changed(GtkWidget *target,repo_add_window *win
config_str yon_tree_store_get_all_at_level(GtkTreeStore *target,GtkTreeIter *parent, int *size, int column, int level); config_str yon_tree_store_get_all_at_level(GtkTreeStore *target,GtkTreeIter *parent, int *size, int column, int level);
gboolean yon_storage_filter_func(GtkTreeModel *model,GtkTreeIter *iter,gpointer data); gboolean yon_storage_filter_func(GtkTreeModel *model,GtkTreeIter *iter,gpointer data);
void on_file_chooser_file_activate(GtkWidget *self, dictionary *dict); void on_file_chooser_file_activate(GtkWidget *self, dictionary *dict);
file_chooser_window *yon_file_chooser_new();
gboolean yon_storage_filter_func(GtkTreeModel *model,GtkTreeIter *iter,gpointer data); gboolean yon_storage_filter_func(GtkTreeModel *model,GtkTreeIter *iter,gpointer data);
void on_storage_configure_clicked(GtkWidget *self, main_window *widgets); void on_storage_configure_clicked(GtkWidget *self, main_window *widgets);
storage_config_window *yon_storage_config_window_new(); storage_config_window *yon_storage_config_window_new();
@ -392,7 +380,7 @@ void on_add_clicked(GtkWidget *self, main_window *widgets);
void on_rmb_move(GtkWidget *self, main_window *widgets); void on_rmb_move(GtkWidget *self, main_window *widgets);
repo_add_window *on_move_clicked(GtkWidget *self, main_window *widgets); repo_add_window *on_move_clicked(GtkWidget *self, main_window *widgets);
repo_add_window *on_remove_clicked(GtkWidget *self, main_window *widgets); repo_add_window *on_remove_clicked(GtkWidget *self, main_window *widgets);
void on_folder_changed(GtkFileChooser *self, file_chooser_window *dialog); void on_folder_changed(GtkFileChooser *self, dictionary *dict);
void on_move_remove_package(GtkWidget *self, repo_add_window *window); void on_move_remove_package(GtkWidget *self, repo_add_window *window);
void on_move_add_accept(GtkWidget *self, dictionary *dict); void on_move_add_accept(GtkWidget *self, dictionary *dict);
void on_ubl_settings_update_launch(); void on_ubl_settings_update_launch();
@ -422,3 +410,4 @@ void yon_storage_struct_add_repo(storage_struct *storage,repo_struct *repo);
void yon_repo_struct_sign(storage_struct *storage, repo_struct *repo,const char *sign); void yon_repo_struct_sign(storage_struct *storage, repo_struct *repo,const char *sign);
void yon_storage_remove(char *key, storage_struct *storage,void*); void yon_storage_remove(char *key, storage_struct *storage,void*);
config_str yon_arch_struct_get_packages(arch_struct *arch, int *size); config_str yon_arch_struct_get_packages(arch_struct *arch, int *size);
void yon_move_window_set_selected(main_window *widgets, repo_add_window *window);

@ -168,3 +168,5 @@
#define FILES_EXIST_LABEL _("Folder must not be empty") #define FILES_EXIST_LABEL _("Folder must not be empty")
#define NAME_SHORT_LABEL _("Name must be 5 or more symbols") #define NAME_SHORT_LABEL _("Name must be 5 or more symbols")
#define REPO_SAME_CHOSEN_LABEL _("Same repository was chosen for source and target")
Loading…
Cancel
Save