X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint2conf%2Fmain.c;h=bf0eed1aa3abdc0eec80ee3f9fd047764d974096;hb=4ece29328efb5aa3111ccbea82b4b53c5d13fa72;hp=617eed940c08f5e7ea446024f4f7f7e2bdb859ad;hpb=7c0dfec2441c4a7da72150978425b6594a2b91a5;p=chaz%2Ftint2 diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c index 617eed9..bf0eed1 100644 --- a/src/tint2conf/main.c +++ b/src/tint2conf/main.c @@ -2,7 +2,7 @@ * * Tint2conf * -* Copyright (C) 2009 Thierry lorthiois (lorthiois@bbsoft.fr) +* Copyright (C) 2009 Thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -17,22 +17,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #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 @@ -101,12 +92,12 @@ static const char *global_ui = " " " " " " - " " +// " " " " " " " " +// " " " " - " " " " " " " " @@ -116,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)} }; @@ -141,6 +132,8 @@ 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"); // define main layout : container, menubar, toolbar g_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -149,12 +142,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); @@ -165,12 +158,12 @@ 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); gtk_widget_show_all(g_window); @@ -181,8 +174,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); } @@ -194,7 +187,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 */ @@ -334,18 +327,25 @@ 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); - - cmd = g_strdup_printf("%s \'%s\' &", g_cmd_property, file); +//* + GtkWidget *prop; + prop = create_properties(); + gtk_window_present(GTK_WINDOW(prop)); + //printf("menuProperties : fin\n"); +//*/ +/* + char *cmd = g_strdup_printf("%s \'%s\' &", g_cmd_property, file); printf("cmd %s\n", cmd); system(cmd); - g_free(cmd); + //*/ g_free(file); + } } @@ -579,7 +579,7 @@ void read_config() } g_width = 500; g_height = 350; - g_cmd_property = g_strconcat( "python ", INSTALL_PREFIX, "/bin/tintwizard.py", (void*)0 ); + 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);