X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint2conf%2Fmain.c;h=c22862d1468b510188505de55312e527de689bd4;hb=87acd48b92031b378887ea8b7ea9fa54aea8fa25;hp=f4a232d74c951e6d75d7214b060f7434ebe68b2c;hpb=0bcb780ab356a8ac3a9b23c054c6f702c8718b5b;p=chaz%2Ftint2 diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c index f4a232d..c22862d 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,191 +17,156 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **************************************************************************/ -#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 -// TODO -// ** add, saveas -// - liste de fichiers tint2rc* -// - menu contextuel dans liste -// - double clic dans liste -// - données globales -// - delete -// - rename -// - apply -// - sauvegarde et lecture taille de fenetre -// - activation des menus sur sélection dans la liste -// - dialogue propriétés ... - - -#define LONG_VERSION_STRING "0.7" - -enum { LIST_ITEM = 0, N_COLUMNS }; // default config file and directory -char *pathConfig = 0; -char *pathDir = 0; +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 *themeView; +GtkWidget *g_window; -static GtkUIManager *myUIManager = NULL; +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 menuDelete (void); -static void menuProperties (void); -static void menuRename (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 void viewRowActivated( GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data); - -// 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(char **defaultTheme); -void write_config(char *defaultTheme); -void check_theme(); - - -// define menubar and toolbar -static const char *fallback_ui_file = +static void menuAdd(); +static void menuSaveAs(); +static void menuDelete(); +static void menuProperties(); +static void menuQuit(); +static void menuRefresh(); +static void menuRefreshAll(); +static void menuApply(); +static void menuAbout(); + +static gboolean view_onPopupMenu (GtkWidget *treeview, gpointer userdata); +static gboolean view_onButtonPressed (GtkWidget *treeview, GdkEventButton *event, gpointer userdata); +static void windowSizeAllocated(); +static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data); + + +// 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(); + + +// define menubar, toolbar and popup +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)}, - {"ThemeRename", NULL, "_Rename...", NULL, "Rename theme", G_CALLBACK (menuRename)}, - {"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)}, - {"ViewRefreshAll", GTK_STOCK_REFRESH, "Refresh all", NULL, "Refresh all", G_CALLBACK (menuRefreshAll)}, - {"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)} + {"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)}, +// {"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)} }; int main (int argc, char ** argv) { - GtkWidget *window, *popup, *item; - GtkWidget *vBox = NULL; + GtkWidget *vBox = NULL, *scrollbar = NULL; GtkActionGroup *actionGroup; - GtkTreeViewColumn *col; - GtkTreeSelection *sel; gtk_init (&argc, &argv); g_thread_init( NULL ); - check_theme(); + read_config(); + initTheme(); + g_set_application_name (_("tint2conf")); + gtk_window_set_default_icon_name("taskbar"); // define main layout : container, menubar, toolbar - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title(GTK_WINDOW(window), _("Panel theming")); - gtk_window_set_default_size(GTK_WINDOW(window), 600, 350); - g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (menuQuit), NULL); + 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); + g_signal_connect(g_window, "size-allocate", G_CALLBACK(windowSizeAllocated), 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); - - // define tree view - 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)); - 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(sel, "changed", G_CALLBACK(on_changed), NULL); - //g_signal_connect(themeView, "button-press-event", G_CALLBACK(onViewButtonPressed), (void *)onViewButtonPressed); - //g_signal_connect(themeView, "button-release-event", G_CALLBACK(onViewButtonReleased), NULL); - - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - GtkListStore *store; - 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(themeView), column); - store = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING); - gtk_tree_view_set_model(GTK_TREE_VIEW(themeView), GTK_TREE_MODEL(store)); - g_object_unref(store); - - // 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); - - // load themes - loadTheme(themeView); - - // 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_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_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); + scrollbar = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollbar), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_box_pack_start(GTK_BOX(vBox), scrollbar, TRUE, TRUE, 0); + + // define theme view + g_theme_view = create_view(); + gtk_container_add(GTK_CONTAINER(scrollbar), 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_theme(g_theme_view); + + gtk_widget_show_all(g_window); gtk_main (); return 0; } @@ -209,43 +174,35 @@ 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); -} - - -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); - } + gtk_box_pack_start(GTK_BOX(p_box), p_widget, FALSE, FALSE, 0); + gtk_widget_show(p_widget); } -static void menuAbout(GtkWindow * parent) +static void menuAbout() { - const char *authors[] = { "Thierry Lorthiois", "Christian Ruppert (Build system)", NULL }; + 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( parent, "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", LONG_VERSION_STRING, - "copyright", _("Copyright 2009 tint2 team\nLicense GNU GPL version 2"), - "logo-icon-name", NULL, "authors", authors, + "version", VERSION_STRING, + "copyright", _("Copyright 2009 tint2 team\nTint2 License GNU GPL version 2\nTintwizard License GNU GPL version 3"), + "logo-icon-name", "taskbar", "authors", authors, /* Translators: translate "translator-credits" as your name to have it appear in the credits in the "About" dialog */ "translator-credits", _("translator-credits"), - NULL ); + NULL); } -static void menuAdd (GtkWindow *parent) +static void menuAdd() { GtkWidget *dialog; GtkFileChooser *chooser; GtkFileFilter *filter; - 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); + 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()); @@ -256,115 +213,207 @@ static void menuAdd (GtkWindow *parent) 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 = strndup(pt1, 65000); - 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(themeView, file); - g_free(file); - } - g_free(name); - } - } - //tr_core_torrents_added( core ); + 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(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); + 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); } -/* -static void menuSaveAs (GtkWindow *parent) + +static void menuSaveAs () { GtkWidget *dialog; GtkFileChooser *chooser; + GtkTreeSelection *sel; + GtkTreeIter iter; + GtkTreeModel *model; + gchar *file, *pt1; + + 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(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; + } + + gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file, -1); + pt1 = strrchr (file, '/'); + if (pt1) pt1++; - dialog = gtk_file_chooser_dialog_new (_("Save theme as"), parent, 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); - gtk_file_chooser_set_current_folder (chooser, g_get_home_dir()); - gtk_file_chooser_set_current_name (chooser, _("Untitled document")); + gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE); + gtk_file_chooser_set_current_folder(chooser, g_get_home_dir()); + gtk_file_chooser_set_current_name(chooser, pt1); - if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { char *filename = gtk_file_chooser_get_filename(chooser); - printf("fichier %s\n", filename); - //save_to_file (filename); + copy_file(file, filename); g_free (filename); } + g_free(file); gtk_widget_destroy (dialog); } -*/ -static void menuDelete (void) + +static void menuDelete() { - printf("menuDelete\n"); + GtkTreeSelection *sel; + GtkTreeIter iter; + GtkTreeModel *model; + 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, &filename, -1); + gtk_tree_selection_unselect_all(sel); + + // remove (gui and file) + gtk_list_store_remove(GTK_LIST_STORE(model), &iter); + GFile *file = g_file_new_for_path(filename); + g_file_trash(file, NULL, NULL); + g_object_unref(G_OBJECT(file)); + g_free(filename); + } } -static void menuProperties (void) +static void menuProperties() { - system("python /home/thil/Desktop/tintwizard/tintwizard.py"); + GtkTreeSelection *sel; + GtkTreeIter iter; + GtkTreeModel *model; + 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(); + 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); + + } } -static void menuRename (void) +static void menuQuit() { - printf("menuRename\n"); -} + write_config(); + if (g_path_config) + g_free(g_path_config); + if (g_path_dir) + g_free(g_path_dir); + if (g_default_theme) + g_free(g_default_theme); + if (g_cmd_property) + g_free(g_cmd_property); -static void menuQuit (void) -{ gtk_main_quit (); } -static void menuRefresh (void) +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 (void) +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); + } + + g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL); } -static void menuApply (void) +static void menuApply() { GtkTreeSelection *sel; GtkTreeIter iter; GtkTreeModel *model; - char *value, *name1, *name2; - sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(themeView)); + if (g_default_theme) { + g_free(g_default_theme); + g_default_theme = NULL; + } + 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, pathConfig); - write_config(value); - g_free(value); - g_free(name2); + gtk_tree_model_get(model, &iter, COL_THEME_FILE, &g_default_theme, -1); + // overwrite tint2rc + copy_file(g_default_theme, g_path_config); // restart panel system("killall -SIGUSR1 tint2"); @@ -372,53 +421,167 @@ static void menuApply (void) } -static void onPopupMenu(GtkWidget *self, GdkEventButton *event) +static void view_popup_menu(GtkWidget *treeview, GdkEventButton *event, gpointer userdata) { - //GtkWidget *menu = action_get_widget("/main-window-popup"); + GtkWidget *w = gtk_ui_manager_get_widget(globalUIManager, "/ThemePopup"); - //gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, (event ? event->button : 0), (event ? event->time : 0)); + gtk_menu_popup(GTK_MENU(w), NULL, NULL, NULL, NULL, (event != NULL) ? event->button : 0, gdk_event_get_time((GdkEvent*)event)); +} + + +static gboolean view_onButtonPressed (GtkWidget *treeview, GdkEventButton *event, gpointer userdata) +{ + // 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; +} + + +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 windowSizeAllocated() +{ + const gboolean isMaximized = g_window->window && (gdk_window_get_state(g_window->window) & GDK_WINDOW_STATE_MAXIMIZED); + + if(!isMaximized) + gtk_window_get_size(GTK_WINDOW(g_window), &g_width, &g_height); } -static void loadTheme(GtkWidget *list) +static void load_theme(GtkWidget *list) { GDir *dir; - gchar *file, *pt1, *name; + gchar *pt1, *name; + const gchar *file; + gboolean found_theme = FALSE; - dir = g_dir_open(pathDir, 0, NULL); + dir = g_dir_open(g_path_dir, 0, NULL); + if (dir == NULL) return; while ((file = g_dir_read_name(dir))) { pt1 = strstr(file, ".tint2rc"); if (pt1) { - name = strndup(file, pt1-file); - add_to_list(list, name); + found_theme = TRUE; + name = g_build_filename (g_path_dir, file, NULL); + custom_list_append(name); g_free(name); } } g_dir_close(dir); - // search default theme + if (!found_theme) { + // create default theme file + 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); + } + + 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; - name = NULL; - read_config(&name); - if (name) { - printf("defaultTheme %s\n", name); - //gtk_tree_selection_select_iter(GtkTreeSelection *selection, GtkTreeIter *iter); + + if (!name_theme) return; + + model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view)); + found_theme = searchTheme(name_theme, model, &iter); + + GtkTreePath *path = NULL; + if (found_theme) + path = gtk_tree_model_get_path(model, &iter); + else { + have_iter = gtk_tree_model_get_iter_first(model, &iter); + if (have_iter) + path = gtk_tree_model_get_path(model, &iter); + } + if (path) { + gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view)), &iter); + 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 **defaultTheme) +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; @@ -427,9 +590,16 @@ void read_config(char **defaultTheme) 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) { - *defaultTheme = strdup (value); + if (strcmp (key, "default_theme") == 0) + 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) + g_height = atoi(value); free (key); free (value); } @@ -441,7 +611,7 @@ void read_config(char **defaultTheme) } -void write_config(char *defaultTheme) +void write_config() { char *path; FILE *fp; @@ -451,48 +621,19 @@ void write_config(char *defaultTheme) if (fp != NULL) { fputs("#---------------------------------------------\n", fp); fputs("# TINT2CONF CONFIG FILE\n", fp); - fprintf(fp, "default_theme = %s\n\n", defaultTheme); + if (g_default_theme != NULL) { + fprintf(fp, "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); + fputs("\n", fp); fclose (fp); } g_free(path); } -void check_theme() -{ - pathDir = g_build_filename (g_get_user_config_dir(), "tint2", NULL); - if (!g_file_test (pathDir, G_FILE_TEST_IS_DIR)) - g_mkdir(pathDir, 0777); - - pathConfig = 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); - } - -} -