X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Ftint2conf%2Fmain.c;h=a4d0d926775d6235100f1b7039a9fd1b68e8147a;hb=30db8ea2ffb03b482043ce1f95c60470ea0b8597;hp=21bf898885f8b9a91dcfaa003e9a734734a3bbe4;hpb=0afd631fbce539753815491c949cbf12cd05b5d0;p=chaz%2Ftint2 diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c index 21bf898..a4d0d92 100644 --- a/src/tint2conf/main.c +++ b/src/tint2conf/main.c @@ -17,15 +17,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **************************************************************************/ +#include +#include #include #include +#include +#include #include #include #include #include +#include "common.h" + -// gcc -Wall -g main1.c -o tint2conf `pkg-config --cflags gtk+-2.0` `pkg-config --libs gtk+-2.0 --libs gthread-2.0` // TODO // ** add, saveas // - liste de fichiers tint2rc* @@ -38,48 +43,67 @@ // - sauvegarde et lecture taille de fenetre // - activation des menus sur sélection dans la liste // - dialogue propriétés ... -// tint2 -d directory, plutot que -c config ?? -// tint2 preview, comment gérer les barres verticales... #define LONG_VERSION_STRING "0.7" -static GtkUIManager *myUIManager = NULL; +enum { LIST_ITEM = 0, N_COLUMNS }; + +// default config file and directory +char *g_path_config = 0; +char *g_path_dir = 0; +char *g_default_theme = 0; +int g_width; +int g_height; + +GtkWidget *g_window; +GtkWidget *g_theme_view; +GtkListStore *g_store; + +static GtkUIManager *globalUIManager = NULL; static void menuAddWidget (GtkUIManager *, GtkWidget *, GtkContainer *); -static void viewPopup(GtkWidget *wid,GdkEventButton *event,GtkWidget *menu); // action on menus static void menuAdd (GtkWindow * parent); -static void menuSaveAs (GtkWindow *parent); +//static void menuSaveAs (GtkWindow *parent); +static void menuDelete (void); static void menuProperties (void); static void menuRename (void); -static void menuDelete (void); static void menuQuit (void); static void menuRefresh (void); static void menuRefreshAll (void); static void menuApply (void); static void menuAbout(GtkWindow * parent); -static void onPopupMenu(GtkWidget *self, GdkEventButton *event); +static gboolean view_onPopupMenu (GtkWidget *treeview, gpointer userdata); +static gboolean view_onButtonPressed (GtkWidget *treeview, GdkEventButton *event, gpointer userdata); static void viewRowActivated( GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data); -static void loadDir(); +// TreeView +static void loadTheme(); +static void init_list(GtkWidget *list); +static void add_to_list(GtkWidget *list, const gchar *str); +void on_changed(GtkWidget *widget, gpointer label); +void read_config(); +void write_config(); +void check_theme(); -// define menubar and toolbar -static const char *fallback_ui_file = + +// define menubar, toolbar and popup +static const char *global_ui = "" " " " " " " - " " +// " " + " " + " " " " " " " " " " - " " - " " " " " " " " @@ -96,16 +120,23 @@ static const char *fallback_ui_file = " " " " " " + " " + " " + " " + " " + " " + " " ""; + // 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)}, +// {"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)}, {"ThemeRename", NULL, "_Rename...", NULL, "Rename theme", G_CALLBACK (menuRename)}, - {"ThemeDelete", GTK_STOCK_DELETE, "_Delete", NULL, "Delete theme", G_CALLBACK (menuDelete)}, {"ThemeQuit", GTK_STOCK_QUIT, "_Quit", "Q", "Quit", G_CALLBACK (menuQuit)}, {"ViewMenu", NULL, "View", NULL, NULL, NULL}, {"ViewRefresh", GTK_STOCK_REFRESH, "Refresh", NULL, "Refresh", G_CALLBACK (menuRefresh)}, @@ -118,62 +149,62 @@ static GtkActionEntry entries[] = { int main (int argc, char ** argv) { - GtkWidget *window, *themeView, *popup, *item; GtkWidget *vBox = NULL; GtkActionGroup *actionGroup; - GtkTreeViewColumn *col; GtkTreeSelection *sel; gtk_init (&argc, &argv); g_thread_init( NULL ); - - // define main layout : container, menubar, toolbar, themeView - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title(GTK_WINDOW(window), _("Tint2 theme")); - gtk_window_set_default_size(GTK_WINDOW(window), 600, 350); - g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (menuQuit), NULL); + read_config(); + check_theme(); + + // define main layout : container, menubar, toolbar + g_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_title(GTK_WINDOW(g_window), _("Panel theming")); + gtk_window_resize(GTK_WINDOW(g_window), g_width, g_height); + g_signal_connect (G_OBJECT (g_window), "destroy", G_CALLBACK (menuQuit), NULL); vBox = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER(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); - myUIManager = gtk_ui_manager_new(); - gtk_ui_manager_insert_action_group (myUIManager, actionGroup, 0); - gtk_ui_manager_add_ui_from_string ( myUIManager, fallback_ui_file, -1, NULL ); - g_signal_connect(myUIManager, "add_widget", G_CALLBACK (menuAddWidget), vBox); - gtk_ui_manager_ensure_update(myUIManager); - - themeView = gtk_tree_view_new(); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(themeView), FALSE); - gtk_tree_view_set_fixed_height_mode(GTK_TREE_VIEW(themeView), TRUE); - col = GTK_TREE_VIEW_COLUMN (g_object_new (GTK_TYPE_TREE_VIEW_COLUMN, "title", _("Theme"), "resizable", TRUE, "sizing", GTK_TREE_VIEW_COLUMN_FIXED, NULL)); - sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(themeView)); + globalUIManager = gtk_ui_manager_new(); + 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); + + // define tree view + g_theme_view = gtk_tree_view_new(); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(g_theme_view), FALSE); + //gtk_widget_set_size_request(g_theme_view, g_width, g_height); + //gtk_tree_view_set_fixed_height_mode(GTK_TREE_VIEW(g_theme_view), TRUE); + //col = GTK_TREE_VIEW_COLUMN (g_object_new (GTK_TYPE_TREE_VIEW_COLUMN, "title", _("Theme"), "resizable", TRUE, "sizing", GTK_TREE_VIEW_COLUMN_FIXED, NULL)); + sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view)); gtk_tree_selection_set_mode(GTK_TREE_SELECTION(sel), GTK_SELECTION_SINGLE); - gtk_box_pack_start(GTK_BOX(vBox), themeView, TRUE, TRUE, 0); - gtk_widget_show(themeView); - g_signal_connect(themeView, "popup-menu", G_CALLBACK(onPopupMenu), NULL); - g_signal_connect(themeView, "row-activated", G_CALLBACK(viewRowActivated), NULL); - //g_signal_connect(themeView, "button-press-event", G_CALLBACK(onViewButtonPressed), (void *)onViewButtonPressed); - //g_signal_connect(themeView, "button-release-event", G_CALLBACK(onViewButtonReleased), NULL); - - // popup menu - // all you need to do is add the GDK_BUTTON_PRESS_MASK to the window's events - gtk_widget_add_events(window, GDK_BUTTON_PRESS_MASK); - popup = gtk_menu_new(); - item = gtk_menu_item_new_with_label("victory"); - gtk_menu_shell_append(GTK_MENU_SHELL(popup), item); - gtk_menu_attach_to_widget(GTK_MENU(popup), window, NULL); - gtk_widget_show_all(popup); - g_signal_connect(G_OBJECT(window),"button-press-event", G_CALLBACK(viewPopup), (gpointer)popup); + gtk_box_pack_start(GTK_BOX(vBox), g_theme_view, TRUE, TRUE, 0); + 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); + g_signal_connect(sel, "changed", G_CALLBACK(on_changed), NULL); + + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("List Items", renderer, "text", LIST_ITEM, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(g_theme_view), column); + g_store = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING); + gtk_tree_view_set_model(GTK_TREE_VIEW(g_theme_view), GTK_TREE_MODEL(g_store)); // load themes - loadDir(); + loadTheme(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(window); + gtk_widget_show_all(g_window); gtk_main (); return 0; } @@ -186,24 +217,15 @@ static void menuAddWidget (GtkUIManager * p_uiManager, GtkWidget * p_widget, Gtk } -static void viewPopup(GtkWidget *wid, GdkEventButton *event, GtkWidget *menu) -{ - if((event->button == 3) && (event->type == GDK_BUTTON_PRESS)) { - gtk_menu_popup(GTK_MENU(menu),NULL,NULL,NULL,NULL,event->button,event->time); - } -} - - static void menuAbout(GtkWindow * parent) { - const char *authors[] = { "Thierry Lorthiois", "Christian Ruppert (Build system)", NULL }; + const char *authors[] = { "Thierry Lorthiois", "Christian Ruppert (Build system)", "Euan Freeman (tintwizard)\nSee http://code.google.com/p/tintwizard/", NULL }; gtk_show_about_dialog( parent, "name", g_get_application_name( ), "comments", _("Theming tool for tint2 panel"), "version", LONG_VERSION_STRING, - "copyright", _("Copyright 2009 tint2 team\nLicense GNU GPL version 2"), - "logo-icon-name", NULL, - "authors", authors, + "copyright", _("Copyright 2009 tint2 team\nTint2 License GNU GPL version 2\nTintwizard License GNU GPL version 3"), + "logo-icon-name", NULL, "authors", authors, /* Translators: translate "translator-credits" as your name to have it appear in the credits in the "About" dialog */ @@ -221,7 +243,6 @@ static void menuAdd (GtkWindow *parent) dialog = gtk_file_chooser_dialog_new(_("Add a theme"), parent, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, NULL); chooser = GTK_FILE_CHOOSER(dialog); - //gtk_dialog_set_alternative_button_order(GTK_DIALOG(w), GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL, -1); gtk_file_chooser_set_current_folder(chooser, g_get_home_dir()); gtk_file_chooser_set_select_multiple(chooser, TRUE); @@ -233,15 +254,26 @@ static void menuAdd (GtkWindow *parent) if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { GSList *l, *list = gtk_file_chooser_get_filenames(chooser); - // TODO: remember this folder the next time we use this dialog - //char *folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog)); - //pref_string_set( PREF_KEY_OPEN_DIALOG_FOLDER, folder ); - //g_free( folder ); - + gchar *file, *pt1, *name, *path; for (l = list; l ; l = l->next) { - printf("fichier %s\n", (char *)l->data); - //add_filename(core, l->data, FALSE); - //tr_core_torrents_added( core ); + file = (char *)l->data; + pt1 = strrchr (file, '/'); + if (pt1) { + pt1++; + if (*pt1) { + name = strdup(pt1); + path = g_build_filename (g_get_user_config_dir(), "tint2", name, NULL); + copy_file(file, path); + g_free(path); + pt1 = strstr(name, ".tint2rc"); + if (pt1) { + file = strndup(name, pt1-name); + add_to_list(g_theme_view, file); + g_free(file); + } + g_free(name); + } + } } g_slist_foreach(list, (GFunc)g_free, NULL); @@ -250,7 +282,7 @@ static void menuAdd (GtkWindow *parent) gtk_widget_destroy (dialog); } - +/* static void menuSaveAs (GtkWindow *parent) { GtkWidget *dialog; @@ -271,28 +303,70 @@ static void menuSaveAs (GtkWindow *parent) } gtk_widget_destroy (dialog); } +*/ - -static void menuProperties (void) +static void menuDelete (void) { - printf("menuProperties\n"); + GtkTreeSelection *sel; + GtkTreeIter iter; + GtkTreeModel *model; + char *value, *name1, *name2; + + 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, LIST_ITEM, &value, -1); + gtk_tree_selection_unselect_all(sel); + // remove from the gui + gtk_list_store_remove(GTK_LIST_STORE(model), &iter); + + name1 = g_build_filename (g_get_user_config_dir(), "tint2", value, NULL); + name2 = g_strdup_printf("%s.tint2rc", name1); + g_remove(name2); + + g_free(name1); + g_free(name2); + g_free(value); + } } -static void menuRename (void) +static void menuProperties (void) { - printf("menuRename\n"); + GtkTreeSelection *sel; + GtkTreeIter iter; + GtkTreeModel *model; + char *value, *name1, *name2, *cmd; + + 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, LIST_ITEM, &value, -1); + + name1 = g_build_filename ("\'", g_get_user_config_dir(), "tint2", value, NULL); + name2 = g_strdup_printf("%s.tint2rc\'", name1); + + cmd = g_strdup_printf("tintwizard.py %s", name2); + system(cmd); + g_free(cmd); + + g_free(name1); + g_free(name2); + g_free(value); + } } -static void menuDelete (void) +static void menuRename (void) { - printf("menuDelete\n"); + printf("menuRename\n"); + // g_rename } static void menuQuit (void) { + write_config(); + + g_object_unref(g_store); gtk_main_quit (); } @@ -311,35 +385,213 @@ static void menuRefreshAll (void) static void menuApply (void) { - printf("menuApply\n"); + GtkTreeSelection *sel; + GtkTreeIter iter; + GtkTreeModel *model; + char *value, *name1, *name2; + + 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, LIST_ITEM, &value, -1); + name1 = g_build_filename (g_get_user_config_dir(), "tint2", value, NULL); + name2 = g_strdup_printf("%s.tint2rc", name1); + g_free(name1); + + copy_file(name2, g_path_config); + write_config(); + g_free(value); + g_free(name2); + + // restart panel + system("killall -SIGUSR1 tint2"); + } +} + + +static void view_popup_menu(GtkWidget *treeview, GdkEventButton *event, gpointer userdata) +{ + GtkWidget *w = gtk_ui_manager_get_widget(globalUIManager, "/ThemePopup"); + + gtk_menu_popup(GTK_MENU(w), NULL, NULL, NULL, NULL, (event != NULL) ? event->button : 0, gdk_event_get_time((GdkEvent*)event)); } -static void onPopupMenu(GtkWidget *self, GdkEventButton *event) +static gboolean view_onButtonPressed (GtkWidget *treeview, GdkEventButton *event, gpointer userdata) { - //GtkWidget *menu = action_get_widget("/main-window-popup"); + // single click with the right mouse button? + if (event->type == GDK_BUTTON_PRESS && event->button == 3) { + GtkTreeSelection *selection; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + + if (gtk_tree_selection_count_selected_rows(selection) <= 1) { + GtkTreePath *path; + + // Get tree path for row that was clicked + if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(treeview), (gint) event->x, (gint) event->y, &path, NULL, NULL, NULL)) { + gtk_tree_selection_unselect_all(selection); + gtk_tree_selection_select_path(selection, path); + gtk_tree_path_free(path); + } + } + + view_popup_menu(treeview, event, userdata); + return TRUE; + } + return FALSE; +} + - //gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, (event ? event->button : 0), (event ? event->time : 0)); +static gboolean view_onPopupMenu (GtkWidget *treeview, gpointer userdata) +{ + view_popup_menu(treeview, NULL, userdata); + return TRUE; } static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data) { - //action_activate("show-torrent-properties"); + menuApply(); } -static void loadDir() +static void loadTheme(GtkWidget *list) { - char *path = g_build_filename (g_get_user_config_dir(), "tint2", NULL); - if (!g_file_test (path, G_FILE_TEST_IS_DIR)) { - g_mkdir(path, 0777); + GDir *dir; + gchar *file, *pt1, *name; + + dir = g_dir_open(g_path_dir, 0, NULL); + while ((file = g_dir_read_name(dir))) { + pt1 = strstr(file, ".tint2rc"); + if (pt1) { + name = strndup(file, pt1-file); + add_to_list(list, name); + g_free(name); + } + } + g_dir_close(dir); + + // search default theme + GtkTreeIter iter; + GtkTreeModel *model; + if (g_default_theme) { + printf("defaultTheme %s\n", g_default_theme); + //gtk_tree_selection_select_iter(GtkTreeSelection *selection, GtkTreeIter *iter); + } +} + + +// theme file management +void read_config() +{ + char *path; + + if (g_default_theme) + g_free(g_default_theme); + + g_width = 600; + g_height = 350; + path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2confrc", NULL); + if (g_file_test (path, G_FILE_TEST_EXISTS)) { + FILE *fp; + char line[80]; + char *key, *value; + if ((fp = fopen(path, "r")) != NULL) { + while (fgets(line, sizeof(line), fp) != NULL) { + if (parse_line(line, &key, &value)) { + if (strcmp (key, "default_theme") == 0) + g_default_theme = strdup (value); + else if (strcmp (key, "width") == 0) + g_width = atoi(value); + else if (strcmp (key, "height") == 0) + g_height = atoi(value); + free (key); + free (value); + } + } + fclose (fp); + } } g_free(path); +} - GDir *dir; - dir = g_dir_open(path, 0, NULL); - g_dir_close(dir); +void write_config() +{ + char *path; + FILE *fp; + GtkRequisition req; + int x, y, width, height, depth; + int top, bottom, left, right; + GdkRectangle rect; + + gtk_window_get_size(GTK_WINDOW(g_window), &width, &height); + printf("write_config %d, %d\n", width, height); + + // GTK incapacity to return (width, height) of the window is really annoying + gdk_window_get_geometry(GTK_WIDGET(g_window)->window, &x, &y, &width, &height, &depth); + printf(" write_config %d, %d, %d, %d\n", x, y, width, height); + + //Window xid = GDK_WINDOW_XWINDOW(GTK_WIDGET(g_window)->window); + //gdk_window_get_frame_extentsGTK_WINDOW(g_window), &rect); + //printf(" write_config %d, %d\n", rec.width, rec.height); + +/* + path = gtk_tree_path_new_from_indices( playlist_pos, -1 ); + sel = gtk_tree_view_get_selection( (GtkTreeView*)list_view ); + gtk_tree_selection_select_path( sel, path ); + gtk_tree_path_free( path ); + */ + path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2confrc", NULL); + fp = fopen(path, "w"); + if (fp != NULL) { + fputs("#---------------------------------------------\n", fp); + fputs("# TINT2CONF CONFIG FILE\n", fp); + fprintf(fp, "default_theme = %s\n", g_default_theme); + fprintf(fp, "width = %d\n", g_width); + fprintf(fp, "height = %d\n", g_height); + fputs("\n", fp); + fclose (fp); + } + g_free(path); +} + + +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); + } + +static void add_to_list(GtkWidget *list, const gchar *str) +{ + GtkListStore *store; + GtkTreeIter iter; + + store = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(list))); + + gtk_list_store_append(store, &iter); + gtk_list_store_set(store, &iter, LIST_ITEM, str, -1); +} + + +void on_changed(GtkWidget *widget, gpointer label) +{ + GtkTreeIter iter; + GtkTreeModel *model; + char *value; + + if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(widget), &model, &iter)) { + gtk_tree_model_get(model, &iter, LIST_ITEM, &value, -1); + //gtk_label_set_text(GTK_LABEL(label), value); + g_free(value); + } + +} + +