From 26d244ba2ac3aeea4bc58df0cab505933ac2cc05 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pekka=20Geh=C3=B6r?= Date: Wed, 12 Nov 2008 10:38:44 +0200 Subject: [PATCH] added theme_creator_dlg to call buttons (New and Edit) and Makefile.am has modified. --- irreco/src/core/Makefile.am | 2 ++ irreco/src/core/irreco_theme_manager_dlg.c | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/irreco/src/core/Makefile.am b/irreco/src/core/Makefile.am index 02463b79..75e15068 100644 --- a/irreco/src/core/Makefile.am +++ b/irreco/src/core/Makefile.am @@ -84,6 +84,8 @@ irreco_SOURCES = \ irreco_theme_bg.h \ irreco_theme_button.c \ irreco_theme_button.h \ + irreco_theme_creator_dlg.c \ + irreco_theme_creator_dlg.h \ irreco_theme_manager.c \ irreco_theme_manager.h \ irreco_theme_manager_dlg.c \ diff --git a/irreco/src/core/irreco_theme_manager_dlg.c b/irreco/src/core/irreco_theme_manager_dlg.c index a2c72628..b781b6ae 100644 --- a/irreco/src/core/irreco_theme_manager_dlg.c +++ b/irreco/src/core/irreco_theme_manager_dlg.c @@ -505,7 +505,7 @@ static void irreco_theme_manager_dlg_init(IrrecoThemeManagerDlg *self) "clicked", G_CALLBACK(irreco_theme_manager_dlg_download_theme), self); - g_signal_connect(G_OBJECT(self->new_button), + g_signal_connect(G_OBJECT(self->edit_button), "clicked", G_CALLBACK(irreco_theme_manager_dlg_new_theme), self); @@ -887,8 +887,9 @@ static void irreco_theme_manager_dlg_new_theme(GtkButton *button, IrrecoThemeManagerDlg *self){ IRRECO_ENTER - irreco_theme_creator_dlg_run(GTK_WINDOW(self), - self->irreco_data, self->theme); +/* irreco_theme_creator_dlg_run(GTK_WINDOW(self), + self->irreco_data, self->theme);*/ + irreco_theme_creator_dlg_run(self->irreco_data, GTK_WINDOW(self)); IRRECO_RETURN } @@ -1876,6 +1877,7 @@ irreco_show_theme_manager_dlg_row_expanded_event(GtkTreeView *tree_view, irreco_theme_manager_dlg_clean_details(self); gtk_label_set_text(GTK_LABEL(self->select_label), "Select \ntheme"); + if (self->loader_func_id != 0) { gtk_tree_view_collapse_row(tree_view, path); @@ -1949,6 +1951,7 @@ irreco_show_theme_manager_dlg_row_selected_event(GtkTreeSelection *sel, gtk_widget_hide(self->download_button); gtk_widget_hide(self->clear_button); gtk_widget_hide(self->new_button); + gtk_widget_hide(self->edit_button); irreco_theme_manager_dlg_display_theme_detail(self, @@ -1972,7 +1975,8 @@ irreco_show_theme_manager_dlg_row_selected_event(GtkTreeSelection *sel, gtk_widget_show(self->upload_button); gtk_widget_show(self->clear_button); gtk_widget_hide(self->download_button); - gtk_widget_show(self->new_button); + gtk_widget_show(self->edit_button); + gtk_widget_hide(self->new_button); irreco_theme_manager_dlg_display_theme_detail(self, &iter); @@ -1985,6 +1989,7 @@ irreco_show_theme_manager_dlg_row_selected_event(GtkTreeSelection *sel, gtk_widget_hide(self->upload_button); gtk_widget_hide(self->download_button); gtk_widget_hide(self->new_button); + gtk_widget_hide(self->edit_button); gtk_widget_hide(self->select_label); @@ -2013,6 +2018,7 @@ irreco_show_theme_manager_dlg_row_selected_event(GtkTreeSelection *sel, gtk_widget_hide(self->upload_button); gtk_widget_show(self->download_button); gtk_widget_hide(self->new_button); + gtk_widget_hide(self->edit_button); gtk_widget_show(self->combobox); -- 2.11.4.GIT