X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint2conf%2Fmain.c;h=0fcfe4c223cf6c36fab58fca500508e2cd188a1c;hb=d61621cf9c59bf88d79e91b4b12f562db097765b;hp=71570670b5f3e244a53762ebdebfebfd2d8d8064;hpb=e60185261b8062abd573220878a7b9ff9aabda4b;p=chaz%2Ftint2 diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c index 7157067..0fcfe4c 100644 --- a/src/tint2conf/main.c +++ b/src/tint2conf/main.c @@ -17,20 +17,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "../version.h" +#ifdef HAVE_VERSION_H + #include "version.h" +#endif +#include "main.h" #include "common.h" #include "theme_view.h" +#include "properties.h" #define SNAPSHOT_TICK 190 @@ -39,6 +32,7 @@ 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; @@ -102,8 +96,8 @@ static const char *global_ui = " " " " " " - " " " " + " " " " " " " " @@ -113,19 +107,19 @@ static const char *global_ui = // define menubar and toolbar action static GtkActionEntry entries[] = { - {"ThemeMenu", NULL, "Theme", NULL, NULL, NULL}, - {"ThemeAdd", GTK_STOCK_ADD, "_Add...", "N", "Add theme", G_CALLBACK (menuAdd)}, - {"ThemeSaveAs", GTK_STOCK_SAVE_AS, "_Save as...", NULL, "Save theme as", G_CALLBACK (menuSaveAs)}, - {"ThemeDelete", GTK_STOCK_DELETE, "_Delete", NULL, "Delete theme", G_CALLBACK (menuDelete)}, - {"ThemeProperties", GTK_STOCK_PROPERTIES, "_Properties...", NULL, "Show properties", G_CALLBACK (menuProperties)}, - {"ThemeQuit", GTK_STOCK_QUIT, "_Quit", "Q", "Quit", G_CALLBACK (menuQuit)}, + {"ThemeMenu", NULL, _("Theme"), NULL, NULL, NULL}, + {"ThemeAdd", GTK_STOCK_ADD, _("_Add..."), "N", _("Add theme"), G_CALLBACK (menuAdd)}, + {"ThemeSaveAs", GTK_STOCK_SAVE_AS, _("_Save as..."), NULL, _("Save theme as"), G_CALLBACK (menuSaveAs)}, + {"ThemeDelete", GTK_STOCK_DELETE, _("_Delete"), NULL, _("Delete theme"), G_CALLBACK (menuDelete)}, + {"ThemeProperties", GTK_STOCK_PROPERTIES, _("_Properties..."), NULL, _("Show properties"), G_CALLBACK (menuProperties)}, + {"ThemeQuit", GTK_STOCK_QUIT, _("_Quit"), "Q", _("Quit"), G_CALLBACK (menuQuit)}, {"EditMenu", NULL, "Edit", NULL, NULL, NULL}, - {"EditRefresh", GTK_STOCK_REFRESH, "Refresh", NULL, "Refresh", G_CALLBACK (menuRefresh)}, - {"EditRefreshAll", GTK_STOCK_REFRESH, "Refresh all", NULL, "Refresh all", G_CALLBACK (menuRefreshAll)}, + {"EditRefresh", GTK_STOCK_REFRESH, _("Refresh"), NULL, _("Refresh"), G_CALLBACK (menuRefresh)}, + {"EditRefreshAll", GTK_STOCK_REFRESH, _("Refresh all"), NULL, _("Refresh all"), G_CALLBACK (menuRefreshAll)}, // {"EditPreferences", GTK_STOCK_PREFERENCES, "Preferences", NULL, "Preferences", G_CALLBACK (menuPreferences)}, - {"ViewApply", GTK_STOCK_APPLY, "Apply", NULL, "Apply theme", G_CALLBACK (menuApply)}, - {"HelpMenu", NULL, "Help", NULL, NULL, NULL}, - {"HelpAbout", GTK_STOCK_ABOUT, "_About", "A", "About", G_CALLBACK (menuAbout)} + {"ViewApply", GTK_STOCK_APPLY, _("Apply"), NULL, _("Apply theme"), G_CALLBACK (menuApply)}, + {"HelpMenu", NULL, _("Help"), NULL, NULL, NULL}, + {"HelpAbout", GTK_STOCK_ABOUT, _("_About"), "A", _("About"), G_CALLBACK (menuAbout)} }; @@ -146,12 +140,12 @@ int main (int argc, char ** argv) g_signal_connect(G_OBJECT(g_window), "destroy", G_CALLBACK (menuQuit), NULL); g_signal_connect(g_window, "size-allocate", G_CALLBACK(windowSizeAllocated), NULL); vBox = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER(g_window), vBox); + gtk_container_add (GTK_CONTAINER(g_window), vBox); actionGroup = gtk_action_group_new ("menuActionGroup"); - gtk_action_group_add_actions (actionGroup, entries, G_N_ELEMENTS (entries), NULL); + gtk_action_group_add_actions (actionGroup, entries, G_N_ELEMENTS (entries), NULL); globalUIManager = gtk_ui_manager_new(); - gtk_ui_manager_insert_action_group (globalUIManager, actionGroup, 0); + gtk_ui_manager_insert_action_group (globalUIManager, actionGroup, 0); gtk_ui_manager_add_ui_from_string (globalUIManager, global_ui, -1, NULL ); g_signal_connect(globalUIManager, "add_widget", G_CALLBACK (menuAddWidget), vBox); gtk_ui_manager_ensure_update(globalUIManager); @@ -162,14 +156,18 @@ int main (int argc, char ** argv) // define theme view g_theme_view = create_view(); gtk_container_add(GTK_CONTAINER(scrollbar), g_theme_view); - gtk_widget_show(g_theme_view); + gtk_widget_show(g_theme_view); g_signal_connect(g_theme_view, "button-press-event", (GCallback)view_onButtonPressed, NULL); g_signal_connect(g_theme_view, "popup-menu", (GCallback)view_onPopupMenu, NULL); g_signal_connect(g_theme_view, "row-activated", G_CALLBACK(viewRowActivated), NULL); - // load themes + // load themes load_theme(g_theme_view); + /* temporaire !!!!!!!!!!!!!! + GtkWidget *prop = create_properties(); + gtk_window_present(GTK_WINDOW(prop)); + //*/ gtk_widget_show_all(g_window); gtk_main (); return 0; @@ -178,8 +176,8 @@ int main (int argc, char ** argv) static void menuAddWidget (GtkUIManager * p_uiManager, GtkWidget * p_widget, GtkContainer * p_box) { - gtk_box_pack_start(GTK_BOX(p_box), p_widget, FALSE, FALSE, 0); - gtk_widget_show(p_widget); + gtk_box_pack_start(GTK_BOX(p_box), p_widget, FALSE, FALSE, 0); + gtk_widget_show(p_widget); } @@ -187,7 +185,7 @@ static void menuAbout() { const char *authors[] = { "Thierry Lorthiois ", "Andreas Fink ", "Christian Ruppert (Build system)", "Euan Freeman (tintwizard)\n See http://code.google.com/p/tintwizard/", NULL }; - gtk_show_about_dialog(g_window, "name", g_get_application_name( ), + gtk_show_about_dialog(GTK_WINDOW(g_window), "name", g_get_application_name( ), "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"), @@ -206,7 +204,7 @@ static void menuAdd() GtkFileChooser *chooser; GtkFileFilter *filter; - dialog = gtk_file_chooser_dialog_new(_("Add a theme"), g_window, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, NULL); + dialog = gtk_file_chooser_dialog_new(_("Add a theme"), GTK_WINDOW(g_window), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, NULL); chooser = GTK_FILE_CHOOSER(dialog); gtk_file_chooser_set_current_folder(chooser, g_get_home_dir()); @@ -241,7 +239,7 @@ static void menuAdd() 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); + GtkWidget *w = gtk_message_dialog_new(GTK_WINDOW(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); @@ -277,7 +275,7 @@ static void menuSaveAs () sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view)); if (!gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) { - GtkWidget *w = gtk_message_dialog_new(g_window, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Select the theme to be saved."), NULL); + GtkWidget *w = gtk_message_dialog_new(GTK_WINDOW(g_window), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Select the theme to be saved.")); g_signal_connect_swapped(w, "response", G_CALLBACK(gtk_widget_destroy), w); gtk_widget_show(w); return; @@ -287,7 +285,7 @@ static void menuSaveAs () pt1 = strrchr (file, '/'); if (pt1) pt1++; - dialog = gtk_file_chooser_dialog_new(_("Save theme as"), g_window, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + dialog = gtk_file_chooser_dialog_new(_("Save theme as"), GTK_WINDOW(g_window), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); chooser = GTK_FILE_CHOOSER(dialog); gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE); @@ -336,12 +334,19 @@ static void menuProperties() 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); - - cmd = g_strdup_printf("gedit \'%s\' &", file); +/* + GtkWidget *prop; + prop = create_properties(); + gtk_window_present(GTK_WINDOW(prop)); + //printf("menuProperties : fin\n"); +//*/ + + cmd = g_strdup_printf("%s \'%s\' &", g_cmd_property, file); + printf("cmd %s\n", cmd); system(cmd); - g_free(cmd); g_free(file); + } } @@ -356,6 +361,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 (); } @@ -566,13 +573,16 @@ 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_strconcat( "/usr/bin/env python ", INSTALL_PREFIX, "/bin/tintwizard.py", (void*)0 ); + + // 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; @@ -582,7 +592,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) @@ -610,7 +624,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);