Changed indentation everywhere
This commit is contained in:
o9000
@@ -34,203 +34,216 @@ gint theme_name_compare(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpo
|
||||
|
||||
GtkWidget *create_view()
|
||||
{
|
||||
GtkTreeViewColumn *col;
|
||||
GtkCellRenderer *renderer;
|
||||
GtkTreeViewColumn *col;
|
||||
GtkCellRenderer *renderer;
|
||||
|
||||
theme_list_store =
|
||||
gtk_list_store_new(NB_COL, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_INT, G_TYPE_BOOLEAN);
|
||||
theme_list_store = gtk_list_store_new(NB_COL,
|
||||
G_TYPE_STRING,
|
||||
G_TYPE_STRING,
|
||||
GDK_TYPE_PIXBUF,
|
||||
G_TYPE_INT,
|
||||
G_TYPE_INT,
|
||||
G_TYPE_BOOLEAN);
|
||||
|
||||
GtkWidget *view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(theme_list_store));
|
||||
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE);
|
||||
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE);
|
||||
GtkWidget *view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(theme_list_store));
|
||||
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE);
|
||||
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE);
|
||||
|
||||
g_object_unref(theme_list_store); // destroy store automatically with view
|
||||
g_object_unref(theme_list_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_visible(col, FALSE);
|
||||
gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
|
||||
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_visible(col, FALSE);
|
||||
gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
|
||||
|
||||
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_NAME);
|
||||
gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
|
||||
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_NAME);
|
||||
gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
|
||||
|
||||
g_renderer = gtk_cell_renderer_pixbuf_new();
|
||||
g_object_set(g_renderer, "xalign", 0.0, NULL);
|
||||
gtk_cell_renderer_set_fixed_size(g_renderer, 200, 30);
|
||||
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_add_attribute(col, g_renderer, "width", COL_WIDTH);
|
||||
gtk_tree_view_column_add_attribute(col, g_renderer, "height", COL_HEIGHT);
|
||||
gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
|
||||
g_renderer = gtk_cell_renderer_pixbuf_new();
|
||||
g_object_set(g_renderer, "xalign", 0.0, NULL);
|
||||
gtk_cell_renderer_set_fixed_size(g_renderer, 200, 30);
|
||||
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_add_attribute(col, g_renderer, "width", COL_WIDTH);
|
||||
gtk_tree_view_column_add_attribute(col, g_renderer, "height", COL_HEIGHT);
|
||||
gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
|
||||
|
||||
GtkTreeSortable *sortable = GTK_TREE_SORTABLE(theme_list_store);
|
||||
gtk_tree_sortable_set_sort_column_id(sortable, COL_THEME_FILE, GTK_SORT_ASCENDING);
|
||||
gtk_tree_sortable_set_sort_func(sortable, COL_THEME_FILE, theme_name_compare, NULL, NULL);
|
||||
return view;
|
||||
GtkTreeSortable *sortable = GTK_TREE_SORTABLE(theme_list_store);
|
||||
gtk_tree_sortable_set_sort_column_id(sortable, COL_THEME_FILE, GTK_SORT_ASCENDING);
|
||||
gtk_tree_sortable_set_sort_func(sortable, COL_THEME_FILE, theme_name_compare, NULL, NULL);
|
||||
return view;
|
||||
}
|
||||
|
||||
gint theme_name_compare(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data)
|
||||
{
|
||||
gchar *path_a, *path_b;
|
||||
gtk_tree_model_get(model, a, COL_THEME_FILE, &path_a, -1);
|
||||
gtk_tree_model_get(model, b, COL_THEME_FILE, &path_b, -1);
|
||||
gchar *path_a, *path_b;
|
||||
gtk_tree_model_get(model, a, COL_THEME_FILE, &path_a, -1);
|
||||
gtk_tree_model_get(model, b, COL_THEME_FILE, &path_b, -1);
|
||||
|
||||
gboolean home_a = strstr(path_a, g_get_user_config_dir()) == path_a;
|
||||
gboolean home_b = strstr(path_b, g_get_user_config_dir()) == path_b;
|
||||
gboolean home_a = strstr(path_a, g_get_user_config_dir()) == path_a;
|
||||
gboolean home_b = strstr(path_b, g_get_user_config_dir()) == path_b;
|
||||
|
||||
if (home_a && !home_b)
|
||||
return -1;
|
||||
if (!home_a && home_b)
|
||||
return 1;
|
||||
if (home_a && !home_b)
|
||||
return -1;
|
||||
if (!home_a && home_b)
|
||||
return 1;
|
||||
|
||||
gchar *name_a = path_a;
|
||||
gchar *p;
|
||||
for (p = name_a; *p; p++) {
|
||||
if (*p == '/')
|
||||
name_a = p + 1;
|
||||
}
|
||||
gchar *name_b = path_b;
|
||||
for (p = name_b; *p; p++) {
|
||||
if (*p == '/')
|
||||
name_b = p + 1;
|
||||
}
|
||||
if (g_str_equal(name_a, name_b))
|
||||
return 0;
|
||||
if (g_str_equal(name_a, "tint2rc"))
|
||||
return -1;
|
||||
if (g_str_equal(name_b, "tint2rc"))
|
||||
return 1;
|
||||
gint result = strnatcasecmp(name_a, name_b);
|
||||
g_free(path_a);
|
||||
g_free(path_b);
|
||||
return result;
|
||||
gchar *name_a = path_a;
|
||||
gchar *p;
|
||||
for (p = name_a; *p; p++) {
|
||||
if (*p == '/')
|
||||
name_a = p + 1;
|
||||
}
|
||||
gchar *name_b = path_b;
|
||||
for (p = name_b; *p; p++) {
|
||||
if (*p == '/')
|
||||
name_b = p + 1;
|
||||
}
|
||||
if (g_str_equal(name_a, name_b))
|
||||
return 0;
|
||||
if (g_str_equal(name_a, "tint2rc"))
|
||||
return -1;
|
||||
if (g_str_equal(name_b, "tint2rc"))
|
||||
return 1;
|
||||
gint result = strnatcasecmp(name_a, name_b);
|
||||
g_free(path_a);
|
||||
g_free(path_b);
|
||||
return result;
|
||||
}
|
||||
|
||||
gboolean theme_list_contains(const char *given_path)
|
||||
{
|
||||
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
|
||||
GtkTreeIter iter;
|
||||
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
|
||||
GtkTreeIter iter;
|
||||
|
||||
gboolean have_iter = gtk_tree_model_get_iter_first(model, &iter);
|
||||
while (have_iter) {
|
||||
gchar *filepath;
|
||||
gtk_tree_model_get(model, &iter, COL_THEME_FILE, &filepath, -1);
|
||||
if (g_str_equal(filepath, given_path)) {
|
||||
gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1);
|
||||
g_free(filepath);
|
||||
return TRUE;
|
||||
}
|
||||
g_free(filepath);
|
||||
have_iter = gtk_tree_model_iter_next(model, &iter);
|
||||
}
|
||||
return FALSE;
|
||||
gboolean have_iter = gtk_tree_model_get_iter_first(model, &iter);
|
||||
while (have_iter) {
|
||||
gchar *filepath;
|
||||
gtk_tree_model_get(model, &iter, COL_THEME_FILE, &filepath, -1);
|
||||
if (g_str_equal(filepath, given_path)) {
|
||||
gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1);
|
||||
g_free(filepath);
|
||||
return TRUE;
|
||||
}
|
||||
g_free(filepath);
|
||||
have_iter = gtk_tree_model_iter_next(model, &iter);
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void theme_list_append(const gchar *path)
|
||||
{
|
||||
if (theme_list_contains(path))
|
||||
return;
|
||||
if (theme_list_contains(path))
|
||||
return;
|
||||
|
||||
GtkTreeIter iter;
|
||||
gtk_list_store_append(theme_list_store, &iter);
|
||||
GtkTreeIter iter;
|
||||
gtk_list_store_append(theme_list_store, &iter);
|
||||
|
||||
gchar *name = strrchr(path, '/') + 1;
|
||||
gchar *name = strrchr(path, '/') + 1;
|
||||
|
||||
gchar *dir = g_strdup(path);
|
||||
strrchr(dir, '/')[0] = 0;
|
||||
char *suffix = contract_tilde(dir);
|
||||
g_free(dir);
|
||||
gchar *dir = g_strdup(path);
|
||||
strrchr(dir, '/')[0] = 0;
|
||||
char *suffix = contract_tilde(dir);
|
||||
g_free(dir);
|
||||
|
||||
gchar *display_name = g_strdup_printf("%s\n(%s)", name, suffix);
|
||||
gtk_list_store_set(theme_list_store, &iter, COL_THEME_FILE, path, COL_THEME_NAME, display_name, COL_FORCE_REFRESH, FALSE, -1);
|
||||
g_free(display_name);
|
||||
g_free(suffix);
|
||||
gchar *display_name = g_strdup_printf("%s\n(%s)", name, suffix);
|
||||
gtk_list_store_set(theme_list_store,
|
||||
&iter,
|
||||
COL_THEME_FILE,
|
||||
path,
|
||||
COL_THEME_NAME,
|
||||
display_name,
|
||||
COL_FORCE_REFRESH,
|
||||
FALSE,
|
||||
-1);
|
||||
g_free(display_name);
|
||||
g_free(suffix);
|
||||
}
|
||||
|
||||
gboolean update_snapshot(gpointer ignored)
|
||||
{
|
||||
{
|
||||
gchar *tint2_cache_dir = g_build_filename(g_get_user_cache_dir(), "tint2", NULL);
|
||||
if (!g_file_test(tint2_cache_dir, G_FILE_TEST_IS_DIR))
|
||||
g_mkdir(tint2_cache_dir, 0700);
|
||||
g_free(tint2_cache_dir);
|
||||
}
|
||||
{
|
||||
gchar *tint2_cache_dir = g_build_filename(g_get_user_cache_dir(), "tint2", NULL);
|
||||
if (!g_file_test(tint2_cache_dir, G_FILE_TEST_IS_DIR))
|
||||
g_mkdir(tint2_cache_dir, 0700);
|
||||
g_free(tint2_cache_dir);
|
||||
}
|
||||
|
||||
const gint PADDING = 20;
|
||||
const gint PADDING = 20;
|
||||
|
||||
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
|
||||
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
|
||||
|
||||
GtkTreeIter iter;
|
||||
gboolean have_iter;
|
||||
GtkTreeIter iter;
|
||||
gboolean have_iter;
|
||||
|
||||
int num_updates = 0;
|
||||
gboolean need_pls_wait = FALSE;
|
||||
int num_updates = 0;
|
||||
gboolean need_pls_wait = FALSE;
|
||||
|
||||
have_iter = gtk_tree_model_get_iter_first(model, &iter);
|
||||
while (have_iter) {
|
||||
GdkPixbuf *pixbuf;
|
||||
gtk_tree_model_get(model, &iter, COL_SNAPSHOT, &pixbuf, -1);
|
||||
if (pixbuf) {
|
||||
g_object_unref(pixbuf);
|
||||
have_iter = gtk_tree_model_iter_next(model, &iter);
|
||||
continue;
|
||||
}
|
||||
have_iter = gtk_tree_model_get_iter_first(model, &iter);
|
||||
while (have_iter) {
|
||||
GdkPixbuf *pixbuf;
|
||||
gtk_tree_model_get(model, &iter, COL_SNAPSHOT, &pixbuf, -1);
|
||||
if (pixbuf) {
|
||||
g_object_unref(pixbuf);
|
||||
have_iter = gtk_tree_model_iter_next(model, &iter);
|
||||
continue;
|
||||
}
|
||||
|
||||
gchar *path;
|
||||
gboolean force_refresh;
|
||||
gtk_tree_model_get(model, &iter, COL_THEME_FILE, &path, COL_FORCE_REFRESH, &force_refresh, -1);
|
||||
gchar *path;
|
||||
gboolean force_refresh;
|
||||
gtk_tree_model_get(model, &iter, COL_THEME_FILE, &path, COL_FORCE_REFRESH, &force_refresh, -1);
|
||||
|
||||
char hash[MD4_HEX_SIZE + 4];
|
||||
md4hexf(path, hash);
|
||||
strcat(hash, ".png");
|
||||
char hash[MD4_HEX_SIZE + 4];
|
||||
md4hexf(path, hash);
|
||||
strcat(hash, ".png");
|
||||
|
||||
gchar *snap = g_build_filename(g_get_user_cache_dir(), "tint2", hash, NULL);
|
||||
pixbuf = force_refresh ? NULL : gdk_pixbuf_new_from_file(snap, NULL);
|
||||
if (!pixbuf) {
|
||||
gchar *cmd = g_strdup_printf("tint2 -c \'%s\' -s \'%s\' 1>/dev/null 2>/dev/null", path, snap);
|
||||
num_updates++;
|
||||
if (num_updates > 3 && !need_pls_wait) {
|
||||
need_pls_wait = TRUE;
|
||||
create_please_wait(GTK_WINDOW(g_window));
|
||||
}
|
||||
if (system(cmd) == 0) {
|
||||
// load
|
||||
pixbuf = gdk_pixbuf_new_from_file(snap, NULL);
|
||||
}
|
||||
g_free(cmd);
|
||||
}
|
||||
gchar *snap = g_build_filename(g_get_user_cache_dir(), "tint2", hash, NULL);
|
||||
pixbuf = force_refresh ? NULL : gdk_pixbuf_new_from_file(snap, NULL);
|
||||
if (!pixbuf) {
|
||||
gchar *cmd = g_strdup_printf("tint2 -c \'%s\' -s \'%s\' 1>/dev/null 2>/dev/null", path, snap);
|
||||
num_updates++;
|
||||
if (num_updates > 3 && !need_pls_wait) {
|
||||
need_pls_wait = TRUE;
|
||||
create_please_wait(GTK_WINDOW(g_window));
|
||||
}
|
||||
if (system(cmd) == 0) {
|
||||
// load
|
||||
pixbuf = gdk_pixbuf_new_from_file(snap, NULL);
|
||||
}
|
||||
g_free(cmd);
|
||||
}
|
||||
|
||||
g_free(snap);
|
||||
g_free(path);
|
||||
g_free(snap);
|
||||
g_free(path);
|
||||
|
||||
gtk_list_store_set(theme_list_store,
|
||||
&iter,
|
||||
COL_SNAPSHOT,
|
||||
pixbuf,
|
||||
COL_WIDTH,
|
||||
gdk_pixbuf_get_width(pixbuf) + PADDING,
|
||||
COL_HEIGHT,
|
||||
gdk_pixbuf_get_height(pixbuf) + PADDING,
|
||||
COL_FORCE_REFRESH,
|
||||
FALSE,
|
||||
-1);
|
||||
if (pixbuf)
|
||||
g_object_unref(pixbuf);
|
||||
gtk_list_store_set(theme_list_store,
|
||||
&iter,
|
||||
COL_SNAPSHOT,
|
||||
pixbuf,
|
||||
COL_WIDTH,
|
||||
gdk_pixbuf_get_width(pixbuf) + PADDING,
|
||||
COL_HEIGHT,
|
||||
gdk_pixbuf_get_height(pixbuf) + PADDING,
|
||||
COL_FORCE_REFRESH,
|
||||
FALSE,
|
||||
-1);
|
||||
if (pixbuf)
|
||||
g_object_unref(pixbuf);
|
||||
|
||||
if (need_pls_wait)
|
||||
process_events();
|
||||
if (need_pls_wait)
|
||||
process_events();
|
||||
|
||||
have_iter = gtk_tree_model_iter_next(model, &iter);
|
||||
}
|
||||
have_iter = gtk_tree_model_iter_next(model, &iter);
|
||||
}
|
||||
|
||||
if (need_pls_wait)
|
||||
destroy_please_wait();
|
||||
if (need_pls_wait)
|
||||
destroy_please_wait();
|
||||
|
||||
return FALSE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user