use text renderer for editor->hidden
authorVladimir Nadvornik <nadvornik@suse.cz>
Sat, 10 Oct 2009 10:15:23 +0000 (10:15 +0000)
committerVladimir Nadvornik <nadvornik@suse.cz>
Sat, 10 Oct 2009 10:15:23 +0000 (10:15 +0000)
The toggle was too confusing because it was not dirrectly editable.

src/desktop_file.c
src/editors.c

index 2b270e2..69be875 100644 (file)
@@ -383,6 +383,7 @@ static gint editor_list_window_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkT
                case DESKTOP_FILE_COLUMN_KEY:
                case DESKTOP_FILE_COLUMN_NAME:
                case DESKTOP_FILE_COLUMN_PATH:
+               case DESKTOP_FILE_COLUMN_HIDDEN:
                        {
                        gchar *s1, *s2;
 
@@ -404,22 +405,6 @@ static gint editor_list_window_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkT
                        }
                        break;
        
-               case DESKTOP_FILE_COLUMN_HIDDEN:
-                       {
-                       gint *v1, *v2;
-
-                       gtk_tree_model_get(model, a, n, &v1, -1);
-                       gtk_tree_model_get(model, b, n, &v2, -1);
-
-                       if (v1 == v2)
-                               ret = 0;
-                       else if (v1 < v2)
-                               ret = 1;
-                       else
-                               ret = -1;
-                       }
-                       break;
-
                default:
                                g_return_val_if_reached(0);
                }
@@ -510,13 +495,9 @@ static void editor_list_window_create(void)
        column = gtk_tree_view_column_new();
        gtk_tree_view_column_set_title(column, _("Hidden"));
        gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-       renderer = gtk_cell_renderer_toggle_new();
-       g_object_set(G_OBJECT(renderer),
-                    "activatable", FALSE,      // not clickable for now
-                    "xalign", 0.5,             // centered
-                    NULL);
-       gtk_tree_view_column_pack_start(column, renderer, TRUE); // TRUE needed for centering
-       gtk_tree_view_column_add_attribute(column, renderer, "active", DESKTOP_FILE_COLUMN_HIDDEN);
+       renderer = gtk_cell_renderer_text_new();
+       gtk_tree_view_column_pack_start(column, renderer, FALSE);
+       gtk_tree_view_column_add_attribute(column, renderer, "text", DESKTOP_FILE_COLUMN_HIDDEN);
        gtk_tree_view_append_column(GTK_TREE_VIEW(ewl->view), column);
        gtk_tree_view_column_set_sort_column_id(column, DESKTOP_FILE_COLUMN_HIDDEN);
        gtk_tree_view_column_set_alignment(column, 0.5); 
index 545f19b..0b2b946 100644 (file)
@@ -331,7 +331,7 @@ gboolean editor_read_desktop_file(const gchar *path)
        gtk_list_store_set(desktop_file_list, &iter, 
                           DESKTOP_FILE_COLUMN_KEY, key,
                           DESKTOP_FILE_COLUMN_NAME, editor->name,
-                          DESKTOP_FILE_COLUMN_HIDDEN, editor->hidden,
+                          DESKTOP_FILE_COLUMN_HIDDEN, editor->hidden ? _("yes") : _("no"),
                           DESKTOP_FILE_COLUMN_WRITABLE, access_file(path, W_OK),
                           DESKTOP_FILE_COLUMN_PATH, path, -1);
        
@@ -358,7 +358,7 @@ void editor_table_clear(void)
                }
        else 
                {
-               desktop_file_list = gtk_list_store_new(DESKTOP_FILE_COLUMN_COUNT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING);
+               desktop_file_list = gtk_list_store_new(DESKTOP_FILE_COLUMN_COUNT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING);
                }
        if (editors)
                {