X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftint2conf%2Fmain.c;h=cf27bb9c79a1729c6909c500e83678a4b387f0df;hb=56820c4fd6d54b2f6a5ff4bf391461792ce42834;hp=cf43dcd8ca63639ef1cf1d3cff17033753e40c58;hpb=f910ba9b269e757dd8d0437ff63fcc8b023b069f;p=chaz%2Ftint2

diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c
index cf43dcd..cf27bb9 100644
--- a/src/tint2conf/main.c
+++ b/src/tint2conf/main.c
@@ -32,16 +32,17 @@
 #include "common.h"
 #include "theme_view.h"
 
+#define SNAPSHOT_TICK 190
 
 
 // default config file and directory
 char *g_path_config = NULL;
 char *g_path_dir = NULL;
 char *g_default_theme = NULL;
+char *g_cmd_property = NULL;
 int g_width, g_height;
 
 GtkWidget *g_window;
-GtkWidget *g_theme_view;
 
 static GtkUIManager *globalUIManager = NULL;
 
@@ -55,7 +56,6 @@ static void menuProperties();
 static void menuQuit();
 static void menuRefresh();
 static void menuRefreshAll();
-static void menuPreferences();
 static void menuApply();
 static void menuAbout();
 
@@ -66,10 +66,12 @@ static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeV
 
 
 // theme files
+static void selectTheme(const gchar *name);
+static gboolean searchTheme(const gchar *name_theme, GtkTreeModel *model, GtkTreeIter *iter);
 static void load_theme();
+static void initTheme();
 static void read_config();
 static void write_config();
-static void check_theme();
 
 
 // define menubar, toolbar and popup
@@ -136,7 +138,7 @@ int main (int argc, char ** argv)
 	gtk_init (&argc, &argv);
 	g_thread_init( NULL );
 	read_config();
-	check_theme();
+	initTheme();
 
 	// define main layout : container, menubar, toolbar
 	g_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -169,10 +171,6 @@ int main (int argc, char ** argv)
    // load themes
 	load_theme(g_theme_view);
 
-	// rig up idle/thread routines
-	//Glib::Thread::create(sigc::mem_fun(window.view, &Thumbview::load_cache_images), true);
-	//Glib::Thread::create(sigc::mem_fun(window.view, &Thumbview::create_cache_images), true);
-
 	gtk_widget_show_all(g_window);
 	gtk_main ();
 	return 0;
@@ -220,30 +218,52 @@ static void menuAdd()
 	gtk_file_filter_add_pattern(filter, "*.tint2rc");
 	gtk_file_chooser_add_filter(chooser, filter);
 
-	if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-		GSList *l, *list = gtk_file_chooser_get_filenames(chooser);
-
-		gchar *file, *pt1, *name, *path;
-		for (l = list; l ; l = l->next) {
-			file = (char *)l->data;
-			pt1 = strrchr (file, '/');
-			if (pt1) {
-				pt1++;
-				if (*pt1) {
-					name = g_strdup(pt1);
-					path = g_build_filename (g_get_user_config_dir(), "tint2", name, NULL);
-					copy_file(file, path);
-			      custom_list_append(path);
-					g_free(path);
-					g_free(name);
-				}
-			}
+	if (gtk_dialog_run (GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) {
+		gtk_widget_destroy(dialog);
+		return;
+	}
+
+	GtkTreeIter iter;
+	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
+	GSList *l, *list = gtk_file_chooser_get_filenames(chooser);
+	gchar *file, *pt1, *name, *path, *name_first=NULL;
+	for (l = list; l ; l = l->next) {
+		file = (char *)l->data;
+		pt1 = strrchr(file, '/');
+		if (pt1 == NULL) 	continue;
+		pt1++;
+		if (*pt1 == 0)	continue;
+
+		name = g_strdup(pt1);
+		path = g_build_filename (g_get_user_config_dir(), "tint2", name, NULL);
+
+		// check existing
+		if (searchTheme(path, model, &iter)) {
+			gchar *message;
+			message = g_strdup_printf(_("Couldn't add duplicate theme\n\'%s\'."), pt1);
+
+			GtkWidget *w = gtk_message_dialog_new(g_window, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, message, NULL);
+			g_signal_connect_swapped(w, "response", G_CALLBACK(gtk_widget_destroy), w);
+			gtk_widget_show(w);
+			g_free(message);
+			continue;
 		}
 
-		g_slist_foreach(list, (GFunc)g_free, NULL);
-		g_slist_free(list);
+		// append theme
+		copy_file(file, path);
+		custom_list_append(path);
+		if (name_first == NULL)
+			name_first = g_strdup(path);
+		g_free(path);
+		g_free(name);
 	}
-	gtk_widget_destroy (dialog);
+	g_slist_foreach(list, (GFunc)g_free, NULL);
+	g_slist_free(list);
+	gtk_widget_destroy(dialog);
+
+	selectTheme(name_first);
+	g_free(name_first);
+	g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
 }
 
 
@@ -290,17 +310,19 @@ static void menuDelete()
 	GtkTreeSelection *sel;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
-	gchar *file;
+	gchar *filename;
 
 	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view));
 	if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) {
-		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file, -1);
+		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &filename, -1);
 		gtk_tree_selection_unselect_all(sel);
 
-		// remove (gui and disk)
+		// remove (gui and file)
 		gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
-		g_remove(file);
-		g_free(file);
+		GFile *file = g_file_new_for_path(filename);
+		g_file_trash(file, NULL, NULL);
+		g_object_unref(G_OBJECT(file));
+		g_free(filename);
 	}
 }
 
@@ -316,7 +338,8 @@ static void menuProperties()
 	if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) {
 		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file,  -1);
 
-		cmd = g_strdup_printf("gedit \'%s\' &", file);
+		cmd = g_strdup_printf("%s \'%s\' &", g_cmd_property, file);
+		printf("cmd %s\n", cmd);
 		system(cmd);
 
 		g_free(cmd);
@@ -335,6 +358,8 @@ static void menuQuit()
 		g_free(g_path_dir);
 	if (g_default_theme)
 		g_free(g_default_theme);
+	if (g_cmd_property)
+		g_free(g_cmd_property);
 
    gtk_main_quit ();
 }
@@ -342,19 +367,33 @@ static void menuQuit()
 
 static void menuRefresh()
 {
-	printf("menuRefresh\n");
+	GtkTreeSelection *sel;
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+
+	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view));
+	if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) {
+		gtk_list_store_set(g_store, &iter, COL_SNAPSHOT, NULL, -1);
+	}
+
+	g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
 }
 
 
 static void menuRefreshAll()
 {
-	printf("menuRefreshAll\n");
-}
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+	gboolean have_iter;
 
+	model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
+	have_iter = gtk_tree_model_get_iter_first(model, &iter);
+	while (have_iter) {
+		gtk_list_store_set(g_store, &iter, COL_SNAPSHOT, NULL, -1);
+		have_iter = gtk_tree_model_iter_next(model, &iter);
+	}
 
-static void menuPreferences()
-{
-	printf("menuPreferences\n");
+	g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
 }
 
 
@@ -439,10 +478,9 @@ static void windowSizeAllocated()
 static void load_theme(GtkWidget *list)
 {
 	GDir *dir;
-	gchar *pt1, *name, *file;
-	gboolean have_iter, found_theme = FALSE;
-	GtkTreeIter iter;
-	GtkTreeModel *model;
+	gchar *pt1, *name;
+	const gchar *file;
+	gboolean found_theme = FALSE;
 
 	dir = g_dir_open(g_path_dir, 0, NULL);
 	if (dir == NULL) return;
@@ -459,26 +497,31 @@ static void load_theme(GtkWidget *list)
 
 	if (!found_theme) {
 		// create default theme file
-		name = g_build_filename (g_get_user_config_dir(), "tint2", "default.tint2rc", NULL);
+		name = g_build_filename(g_get_user_config_dir(), "tint2", "default.tint2rc", NULL);
 		copy_file(g_path_config, name);
 		custom_list_append(name);
+		if (g_default_theme) g_free(g_default_theme);
+		g_default_theme = strdup(name);
 		g_free(name);
 	}
 
-	// search default theme
-	found_theme = FALSE;
+	selectTheme(g_default_theme);
+
+	g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+}
+
+
+void selectTheme(const gchar *name_theme)
+{
+	gboolean have_iter, found_theme;
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+
+	if (!name_theme) return;
+
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
-	have_iter = gtk_tree_model_get_iter_first(model, &iter);
-	while (have_iter) {
-		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &name,  -1);
-		found_theme = (strcmp(name, g_default_theme) == 0);
-		g_free(name);
-		if (found_theme)
-			break;
-		have_iter = gtk_tree_model_iter_next(model, &iter);
-	}
+	found_theme = searchTheme(name_theme, model, &iter);
 
-	// select theme
 	GtkTreePath *path = NULL;
 	if (found_theme)
 		path = gtk_tree_model_get_path(model, &iter);
@@ -492,22 +535,51 @@ static void load_theme(GtkWidget *list)
 		gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(g_theme_view), path, NULL, FALSE, 0, 0);
 		gtk_tree_path_free(path);
 	}
+}
 
+
+gboolean searchTheme(const gchar *name_theme, GtkTreeModel *model, GtkTreeIter *iter)
+{
+	gchar *name;
+	gboolean have_iter, found = FALSE;
+
+	have_iter = gtk_tree_model_get_iter_first(model, iter);
+	while (have_iter) {
+		gtk_tree_model_get(model, iter, COL_THEME_FILE, &name,  -1);
+		found = (strcmp(name, name_theme) == 0);
+		g_free(name);
+		if (found)
+			break;
+		have_iter = gtk_tree_model_iter_next(model, iter);
+	}
+	return found;
+}
+
+
+void initTheme()
+{
+	g_path_dir = g_build_filename (g_get_user_config_dir(), "tint2", NULL);
+	if (!g_file_test (g_path_dir, G_FILE_TEST_IS_DIR))
+		g_mkdir(g_path_dir, 0777);
+
+	g_path_config = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL);
 }
 
 
-// theme file management
 void read_config()
 {
 	char *path;
 
+	// default values
 	if (g_default_theme != NULL) {
 		g_free(g_default_theme);
 		g_default_theme = NULL;
 	}
-
 	g_width = 500;
 	g_height = 350;
+	g_cmd_property = g_strdup("python /usr/bin/tintwizard.py");
+
+	// load config
 	path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2confrc", NULL);
 	if (g_file_test (path, G_FILE_TEST_EXISTS)) {
 		FILE *fp;
@@ -517,7 +589,11 @@ void read_config()
 			while (fgets(line, sizeof(line), fp) != NULL) {
 				if (parse_line(line, &key, &value)) {
 					if (strcmp (key, "default_theme") == 0)
-						g_default_theme = strdup (value);
+						g_default_theme = strdup(value);
+					else if (strcmp (key, "cmd_property") == 0) {
+						g_free(g_cmd_property);
+						g_cmd_property = strdup(value);
+					}
 					else if (strcmp (key, "width") == 0)
 						g_width = atoi(value);
 					else if (strcmp (key, "height") == 0)
@@ -545,7 +621,9 @@ void write_config()
 		fputs("# TINT2CONF CONFIG FILE\n", fp);
 		if (g_default_theme != NULL) {
 			fprintf(fp, "default_theme = %s\n", g_default_theme);
-			printf("default_theme %s\n", g_default_theme);
+		}
+		if (g_cmd_property != NULL) {
+			fprintf(fp, "cmd_property = %s\n", g_cmd_property);
 		}
 		fprintf(fp, "width = %d\n", g_width);
 		fprintf(fp, "height = %d\n", g_height);
@@ -556,15 +634,4 @@ void write_config()
 }
 
 
-void check_theme()
-{
-	g_path_dir = g_build_filename (g_get_user_config_dir(), "tint2", NULL);
-	if (!g_file_test (g_path_dir, G_FILE_TEST_IS_DIR))
-		g_mkdir(g_path_dir, 0777);
-
-	g_path_config = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL);
-
-}
-
-