X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint2conf%2Fmain.c;h=ee5fa71ac0a6dc07c1969a4983eb2cab43d2a0a0;hb=b0daed8dd52ebaa40fa993e5b9f23c823937c120;hp=66ac917f37bd88bf26d0199f775ebe1d5d126149;hpb=1c1cfea95e549170ede1eaf05240b935aa2186a9;p=chaz%2Ftint2

diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c
index 66ac917..ee5fa71 100644
--- a/src/tint2conf/main.c
+++ b/src/tint2conf/main.c
@@ -24,6 +24,7 @@
 #include "common.h"
 #include "theme_view.h"
 #include "properties.h"
+#include "properties_rw.h"
 
 #define SNAPSHOT_TICK 190
 
@@ -77,15 +78,15 @@ static const char *global_ui =
 	"      <separator/>"
 	"      <menuitem action='ThemeDelete'/>"
 	"      <separator/>"
-//	"      <menuitem action='ThemeProperties'/>"
-//	"      <separator/>"
+	"      <menuitem action='ThemeProperties'/>"
+	"      <separator/>"
 	"      <menuitem action='ThemeQuit'/>"
 	"    </menu>"
 	"    <menu action='EditMenu'>"
 	"      <menuitem action='EditRefresh'/>"
 	"      <menuitem action='EditRefreshAll'/>"
-//	"      <separator/>"
-//	"      <menuitem action='EditPreferences'/>"
+	"      <separator/>"
+	"      <menuitem action='EditPreferences'/>"
 	"    </menu>"
 	"    <menu action='HelpMenu'>"
 	"      <menuitem action='HelpAbout'/>"
@@ -132,6 +133,11 @@ int main (int argc, char ** argv)
 	g_thread_init( NULL );
 	read_config();
 	initTheme();
+	g_set_application_name (_("tint2conf"));
+	gtk_window_set_default_icon_name("taskbar");
+	
+	// config file use '.' as decimal separator
+	setlocale(LC_NUMERIC, "POSIX");
 
 	// define main layout : container, menubar, toolbar
 	g_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -185,7 +191,7 @@ static void menuAbout()
 								"comments", _("Theming tool for tint2 panel"),
 								"version", VERSION_STRING,
 								"copyright", _("Copyright 2009 tint2 team\nTint2 License GNU GPL version 2\nTintwizard License GNU GPL version 3"),
-								"logo-icon-name", NULL, "authors", authors,
+								"logo-icon-name", "taskbar", "authors", authors,
 								/* Translators: translate "translator-credits" as
 									your name to have it appear in the credits in the "About"
 									dialog */
@@ -325,19 +331,20 @@ static void menuProperties()
 	GtkTreeSelection *sel;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
-	char *file, *cmd;
+	char *file;
 
 	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);
-/*
+//*
 		GtkWidget *prop;
 		prop = create_properties();
+		config_read_file(file);
 		gtk_window_present(GTK_WINDOW(prop));
 		//printf("menuProperties : fin\n");
 //*/
-//*
-		cmd = g_strdup_printf("%s \'%s\' &", g_cmd_property, file);
+/*
+		char *cmd = g_strdup_printf("%s \'%s\' &", g_cmd_property, file);
 		printf("cmd %s\n", cmd);
 		system(cmd);
 		g_free(cmd);