X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint2conf%2Fmain.c;h=e8c385b1ac0d0bc2c67e276c72cb9531f96291b3;hb=e92c129cb3795408bcb0a305e4d52c03e39af56b;hp=874c7e6fecc72c1442544b2597f6c89070f0115b;hpb=68c07558c3d9d3bd73edd18fe789b58acbad4bf5;p=chaz%2Ftint2 diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c index 874c7e6..e8c385b 100644 --- a/src/tint2conf/main.c +++ b/src/tint2conf/main.c @@ -38,16 +38,26 @@ char *g_path_config = NULL; char *g_path_dir = NULL; char *g_default_theme = NULL; -int g_width; -int g_height; +int g_width, g_height; +int g_width_list, g_height_list; GtkWidget *g_window; GtkWidget *g_theme_view; GtkCellRenderer *g_renderer; +CustomList *customlist; + +// The data columns that we export via the tree model interface +GtkListStore *g_store; +enum { COL_THEME_FILE = 0, COL_SNAPSHOT, NB_COL, }; +static void custom_list_append(const gchar *name); +#define STEP 0.01 +static gboolean increasing = TRUE; +//gboolean increase_timeout(GtkCellRenderer *renderer); static GtkUIManager *globalUIManager = NULL; static void menuAddWidget (GtkUIManager *, GtkWidget *, GtkContainer *); +static GtkWidget *create_view(); // action on menus static void menuAdd (GtkWindow * parent); @@ -180,6 +190,129 @@ int main (int argc, char ** argv) } +GtkWidget *create_view() +{ + GtkTreeViewColumn *col; + GtkCellRenderer *renderer; + GtkWidget *view; + + g_store = gtk_list_store_new(NB_COL, G_TYPE_STRING, GDK_TYPE_PIXBUF); +// g_store = gtk_list_store_new(NB_COL, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_FLOAT); + + view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(g_store)); + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE); + //gtk_tree_view_set_fixed_height_mode(GTK_TREE_VIEW(view), TRUE); + + g_object_unref(g_store); // destroy store automatically with view + + renderer = gtk_cell_renderer_text_new(); + col = gtk_tree_view_column_new(); + gtk_tree_view_column_pack_start (col, renderer, TRUE); + gtk_tree_view_column_add_attribute (col, renderer, "text", COL_THEME_FILE); + gtk_tree_view_column_set_title (col, "Theme"); + gtk_tree_view_append_column(GTK_TREE_VIEW(view),col); + + g_width_list = 200; + g_height_list = 30; + g_renderer = gtk_cell_renderer_pixbuf_new(); + g_object_set(g_renderer, "xalign", 0.0, NULL); + gtk_cell_renderer_set_fixed_size(g_renderer, g_width_list, g_height_list); + col = gtk_tree_view_column_new(); + gtk_tree_view_column_pack_start(col, g_renderer, TRUE); + gtk_tree_view_column_add_attribute(col, g_renderer, "pixbuf", COL_SNAPSHOT); + gtk_tree_view_column_set_title(col, "Snapshot"); + gtk_tree_view_append_column(GTK_TREE_VIEW(view),col); +/* + renderer = custom_list_new(); + col = gtk_tree_view_column_new(); + gtk_tree_view_column_pack_start (col, renderer, TRUE); + gtk_tree_view_column_add_attribute (col, renderer, "snapshot", COL_SNAPSHOT); + gtk_tree_view_column_set_title (col, "Snapshot"); + gtk_tree_view_append_column(GTK_TREE_VIEW(view),col); +*/ + //g_timeout_add(50, (GSourceFunc) increase_timeout, NULL); + + return view; +} + + +/* +gboolean increase_timeout (GtkCellRenderer *renderer) +{ + GtkTreeIter iter; + gfloat perc = 0.0; + //gchar buf[20]; + + gtk_tree_model_get_iter_first(GTK_TREE_MODEL(g_store), &iter); + + gtk_tree_model_get (GTK_TREE_MODEL(g_store), &iter, COL_SNAPSHOT, &perc, -1); + + if ( perc > (1.0-STEP) || (perc < STEP && perc > 0.0) ) + { + increasing = (!increasing); + } + + if (increasing) + perc = perc + STEP; + else + perc = perc - STEP; + + //g_snprintf(buf, sizeof(buf), "%u %%", (guint)(perc*100)); + + gtk_list_store_set (g_store, &iter, COL_SNAPSHOT, perc, -1); + + return TRUE; +} +*/ +/***************************************************************************** + * + * custom_list_append_record: Empty lists are boring. This function can + * be used in your own code to add rows to the + * list. Note how we emit the "row-inserted" + * signal after we have appended the row + * internally, so the tree view and other + * interested objects know about the new row. + * + *****************************************************************************/ + +void custom_list_append(const gchar *name) +{ + GtkTreeIter iter; + gchar *snap, *cmd; + gint pixWidth, pixHeight; + gboolean changeSize = FALSE; + GdkPixbuf *icon; + + // build panel's snapshot + snap = g_build_filename (g_get_user_config_dir(), "tint2", "snap.jpg", NULL); + cmd = g_strdup_printf("tint2 -c %s -s %s", name, snap); + system(cmd); + g_free(cmd); + + // load + icon = gdk_pixbuf_new_from_file(snap, NULL); + g_free(snap); + if (!icon) + return; + + pixWidth = gdk_pixbuf_get_width(icon); + pixHeight = gdk_pixbuf_get_height(icon); + if (g_width_list < pixWidth) { + g_width_list = pixWidth; + changeSize = TRUE; + } + if (g_height_list < (pixHeight+6)) { + g_height_list = pixHeight+6; + changeSize = TRUE; + } + if (changeSize) + gtk_cell_renderer_set_fixed_size(g_renderer, g_width_list, g_height_list); + + gtk_list_store_append(g_store, &iter); + gtk_list_store_set(g_store, &iter, COL_THEME_FILE, name, COL_SNAPSHOT, icon, -1); +} + + 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); @@ -234,7 +367,7 @@ static void menuAdd (GtkWindow *parent) name = g_strdup(pt1); path = g_build_filename (g_get_user_config_dir(), "tint2", name, NULL); copy_file(file, path); - add_to_list(g_theme_view, path); + custom_list_append(path); g_free(path); g_free(name); } @@ -275,17 +408,17 @@ static void menuDelete (void) GtkTreeSelection *sel; GtkTreeIter iter; GtkTreeModel *model; - char *value; + 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_TEXT, &value, -1); + gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file, -1); gtk_tree_selection_unselect_all(sel); // remove (gui and disk) gtk_list_store_remove(GTK_LIST_STORE(model), &iter); - g_remove(value); - g_free(value); + g_remove(file); + g_free(file); } } @@ -295,17 +428,17 @@ static void menuProperties (void) GtkTreeSelection *sel; GtkTreeIter iter; GtkTreeModel *model; - char *value, *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, COL_TEXT, &value, -1); + gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file, -1); - cmd = g_strdup_printf("tintwizard.py \'%s\'", value); + cmd = g_strdup_printf("tintwizard.py \'%s\'", file); system(cmd); g_free(cmd); - g_free(value); + g_free(file); } } @@ -313,8 +446,6 @@ static void menuProperties (void) static void menuQuit (void) { write_config(); - - g_object_unref(g_store); gtk_main_quit (); } @@ -342,14 +473,15 @@ static void menuApply (void) GtkTreeSelection *sel; GtkTreeIter iter; GtkTreeModel *model; - char *value; + 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_TEXT, &value, -1); + gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file, -1); - copy_file(value, g_path_config); - g_free(value); + // overwrite tint2rc + copy_file(file, g_path_config); + g_free(file); // restart panel system("killall -SIGUSR1 tint2"); @@ -407,7 +539,7 @@ static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeV static void load_theme(GtkWidget *list) { GDir *dir; - gchar *file, *pt1, *name; + gchar *pt1, *name, *file; int found_theme = FALSE; dir = g_dir_open(g_path_dir, 0, NULL); @@ -417,7 +549,7 @@ static void load_theme(GtkWidget *list) if (pt1) { found_theme = TRUE; name = g_build_filename (g_path_dir, file, NULL); - add_to_list(list, name); + custom_list_append(name); g_free(name); } } @@ -425,10 +557,10 @@ static void load_theme(GtkWidget *list) if (!found_theme) { // create default theme file - file = g_build_filename (g_get_user_config_dir(), "tint2", "default.tint2rc", NULL); - copy_file(g_path_config, file); - add_to_list(list, file); - g_free(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