X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint2conf%2Fmain.c;h=e77911b490a767175ce03263dd5291ba2b29f1b1;hb=3e76cf71c869892ece9a04550b26dbfc96392f0d;hp=a7140291baf37b9e7fdc45f182abd55d7d731fd0;hpb=a3eabee391c4c2b575ec021bde4e66bd84191f75;p=chaz%2Ftint2 diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c index a714029..e77911b 100644 --- a/src/tint2conf/main.c +++ b/src/tint2conf/main.c @@ -28,37 +28,20 @@ #include #include +#include "../version.h" #include "common.h" +#include "theme_view.h" -// 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 *g_path_config = 0; -char *g_path_dir = 0; -char *g_default_theme = 0; -int g_width; -int g_height; +char *g_path_config = NULL; +char *g_path_dir = NULL; +char *g_default_theme = NULL; +int g_width, g_height; GtkWidget *g_window; GtkWidget *g_theme_view; -GtkListStore *g_store; static GtkUIManager *globalUIManager = NULL; @@ -66,13 +49,13 @@ static void menuAddWidget (GtkUIManager *, GtkWidget *, GtkContainer *); // 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 menuQuit (void); static void menuRefresh (void); static void menuRefreshAll (void); +static void menuPreferences (void); static void menuApply (void); static void menuAbout(GtkWindow * parent); @@ -80,15 +63,12 @@ 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); -// 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(); +// theme files +static void load_theme(); +static void read_config(); +static void write_config(); +static void check_theme(); // define menubar, toolbar and popup @@ -97,32 +77,31 @@ static const char *global_ui = " " " " " " -// " " + " " " " " " " " " " - " " " " " " " " - " " - " " - " " + " " + " " + " " +// " " +// " " " " " " " " " " " " " " - " " - " " - " " " " + " " " " " " + " " " " - " " " " " " " " @@ -133,14 +112,14 @@ static const char *global_ui = 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)}, {"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)}, + {"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)} @@ -149,14 +128,15 @@ static GtkActionEntry entries[] = { int main (int argc, char ** argv) { - GtkWidget *vBox = NULL; + GtkWidget *vBox = NULL, *scrollbar = NULL; GtkActionGroup *actionGroup; - GtkTreeSelection *sel; gtk_init (&argc, &argv); g_thread_init( NULL ); read_config(); check_theme(); + g_width = 300; + g_height = 400; // define main layout : container, menubar, toolbar g_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -173,32 +153,20 @@ int main (int argc, char ** argv) 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 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), g_theme_view, 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); - 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 - loadTheme(g_theme_view); + load_theme(g_theme_view); // rig up idle/thread routines //Glib::Thread::create(sigc::mem_fun(window.view, &Thumbview::load_cache_images), true); @@ -223,7 +191,7 @@ static void menuAbout(GtkWindow * parent) gtk_show_about_dialog( parent, "name", g_get_application_name( ), "comments", _("Theming tool for tint2 panel"), - "version", LONG_VERSION_STRING, + "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, /* Translators: translate "translator-credits" as @@ -261,16 +229,11 @@ static void menuAdd (GtkWindow *parent) if (pt1) { pt1++; if (*pt1) { - name = strdup(pt1); + name = g_strdup(pt1); path = g_build_filename (g_get_user_config_dir(), "tint2", name, NULL); copy_file(file, path); + custom_list_append(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); } } @@ -282,7 +245,7 @@ static void menuAdd (GtkWindow *parent) gtk_widget_destroy (dialog); } -/* + static void menuSaveAs (GtkWindow *parent) { GtkWidget *dialog; @@ -303,29 +266,24 @@ static void menuSaveAs (GtkWindow *parent) } gtk_widget_destroy (dialog); } -*/ + static void menuDelete (void) { GtkTreeSelection *sel; GtkTreeIter iter; GtkTreeModel *model; - char *value, *name1, *name2; + 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, LIST_ITEM, &value, -1); + gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file, -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); + // remove (gui and disk) + gtk_list_store_remove(GTK_LIST_STORE(model), &iter); + g_remove(file); + g_free(file); } } @@ -335,38 +293,32 @@ static void menuProperties (void) GtkTreeSelection *sel; GtkTreeIter iter; GtkTreeModel *model; - char *value, *name1, *name2, *cmd; + char *file, *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); + gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file, -1); - cmd = g_strdup_printf("tintwizard.py %s", name2); + cmd = g_strdup_printf("gedit \'%s\' &", file); system(cmd); - g_free(cmd); - g_free(name1); - g_free(name2); - g_free(value); + g_free(cmd); + g_free(file); } } -static void menuRename (void) -{ - printf("menuRename\n"); - // g_rename -} - - static void menuQuit (void) { write_config(); - g_object_unref(g_store); + 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); + gtk_main_quit (); } @@ -383,24 +335,27 @@ static void menuRefreshAll (void) } +static void menuPreferences (void) +{ + printf("menuPreferences\n"); +} + + static void menuApply (void) { GtkTreeSelection *sel; GtkTreeIter iter; GtkTreeModel *model; - char *value, *name1, *name2; + 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, g_path_config); - write_config(); - 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"); @@ -455,29 +410,63 @@ static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeV } -static void loadTheme(GtkWidget *list) +static void load_theme(GtkWidget *list) { GDir *dir; - gchar *file, *pt1, *name; + gchar *pt1, *name, *file; + gboolean have_iter, found_theme = FALSE; + GtkTreeIter iter; + GtkTreeModel *model; 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); + 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); + g_free(name); + } + // 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); + found_theme = FALSE; + 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_tree_model_get(model, &iter, COL_THEME_FILE, &name, -1); + found_theme = (strcmp(name, g_default_theme) == 0); + g_free(name); + if (found_theme) + break; + have_iter = gtk_tree_model_iter_next(model, &iter); + } + + // select theme + 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); } + } @@ -486,8 +475,10 @@ void read_config() { char *path; - if (g_default_theme) + if (g_default_theme != NULL) { g_free(g_default_theme); + g_default_theme = NULL; + } g_width = 600; g_height = 350; @@ -547,7 +538,10 @@ void write_config() if (fp != NULL) { fputs("#---------------------------------------------\n", fp); fputs("# TINT2CONF CONFIG FILE\n", fp); - fprintf(fp, "default_theme = %s\n", g_default_theme); + if (g_default_theme != NULL) { + fprintf(fp, "default_theme = %s\n", g_default_theme); + printf("default_theme %s\n", g_default_theme); + } fprintf(fp, "width = %d\n", g_width); fprintf(fp, "height = %d\n", g_height); fputs("\n", fp); @@ -568,30 +562,4 @@ void check_theme() } -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); - } - -} -