Enlightenment CVS committal

Author  : lordchaos
Project : e17
Module  : proto

Dir     : e17/proto/entropy/src/plugins


Modified Files:
        etk_structure_viewer.c layout_etk_simple.c layout_ewl_simple.c 


Log Message:
* Key on filesystem type

===================================================================
RCS file: 
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_structure_viewer.c      2 Mar 2006 01:49:42 -0000       1.14
+++ etk_structure_viewer.c      2 Mar 2006 07:45:26 -0000       1.15
@@ -159,10 +159,10 @@
   
   if (!prow) {
          new_row = 
etk_tree_append_to_row((Etk_Tree_Row*)viewer->parent_visual, col, 
-                         etk_theme_icon_theme_get(), "places/user-home_16", 
_(file->filename), NULL);
+                         PACKAGE_DATA_DIR "/icons/folder.png", 
_(file->filename), NULL);
   } else {
          new_row = etk_tree_append_to_row(prow, col, 
-                         etk_theme_icon_theme_get(), "places/user-home_16", 
_(file->filename), NULL);
+                         PACKAGE_DATA_DIR "/icons/folder.png", 
_(file->filename), NULL);
   }
 
   ecore_hash_set(instance_map_hash, new_row, instance);
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- layout_etk_simple.c 1 Mar 2006 09:27:04 -0000       1.20
+++ layout_etk_simple.c 2 Mar 2006 07:45:27 -0000       1.21
@@ -150,15 +150,26 @@
   entropy_generic_file* file;
   Etk_Tree_Row* row;
   Etk_Tree_Col* col;
-  entropy_layout_gui* gui = instance->data; 
+  entropy_layout_gui* gui = instance->data;
+  char* icon_string = NULL;
 
+  col = etk_tree_nth_col_get(ETK_TREE(gui->tree), 0);
 
+  /*Parse the file from the URI*/
+   file = entropy_core_parse_uri (uri);
 
-  col = etk_tree_nth_col_get(ETK_TREE(gui->tree), 0);
+   /*This will be moved to a central function. TODO*/
+   if (!strcmp(file->uri_base, "file"))
+          icon_string = PACKAGE_DATA_DIR "/icons/local-system.jpg";
+  else if (!strcmp(file->uri_base, "smb"))
+         icon_string = PACKAGE_DATA_DIR "/icons/samba-system.jpg";
+   else if (!strcmp(file->uri_base,"sftp"))
+         icon_string = PACKAGE_DATA_DIR "/icons/sftp-system.jpg"; 
+                          
        
   etk_tree_freeze(ETK_TREE(gui->tree));
   row = etk_tree_append(ETK_TREE(gui->tree), col, 
-                         etk_theme_icon_theme_get(), "places/start-here_16", 
_(name), NULL);
+                         icon_string, _(name), NULL);
   etk_tree_thaw(ETK_TREE(gui->tree));
   
   
@@ -166,7 +177,6 @@
    structure_plugin_init =
       dlsym (structure->dl_ref, "entropy_plugin_init");
 
-   file = entropy_core_parse_uri (uri);
    /*We shouldn't really assume it's a folder - but it bootstraps us for
     * now- FIXME*/
    strcpy(file->mime_type, "file/folder");
@@ -280,7 +290,7 @@
   etk_paned_add1(ETK_PANED(gui->paned), gui->tree, ETK_FALSE);
   etk_tree_mode_set(ETK_TREE(gui->tree), ETK_TREE_MODE_TREE);
   col = etk_tree_col_new(ETK_TREE(gui->tree), _("Folders"), 
-                 etk_tree_model_icon_text_new(ETK_TREE(gui->tree), 
ETK_TREE_FROM_EDJE), 60);
+                 etk_tree_model_icon_text_new(ETK_TREE(gui->tree), 
ETK_TREE_FROM_FILE), 60);
   
   etk_tree_col_expand_set(col, ETK_TRUE);
   etk_tree_build(ETK_TREE(gui->tree));
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/layout_ewl_simple.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- layout_ewl_simple.c 2 Mar 2006 02:01:12 -0000       1.50
+++ layout_ewl_simple.c 2 Mar 2006 07:45:27 -0000       1.51
@@ -735,7 +735,6 @@
   Ewl_Widget *hbox;
   Ewl_Widget *contract_button;
   Ewl_Widget *expand_button;
-  Ewl_Widget *scrollpane;
   Ewl_Widget *menubar;
   Ewl_Widget *menu;
   Ewl_Widget *item;
@@ -808,15 +807,15 @@
   vbox = ewl_vbox_new ();
   hbox = ewl_hbox_new ();
 
-  scrollpane = ewl_scrollpane_new ();
   contract_button = ewl_button_new ();
   ewl_button_label_set (EWL_BUTTON (contract_button), "<");
   expand_button = ewl_button_new ();
   ewl_button_label_set (EWL_BUTTON (expand_button), ">");
 
   tree = ewl_scrollpane_new ();
-  ewl_box_spacing_set (EWL_BOX (EWL_SCROLLPANE (tree)->box), 5);
-  gui->tree = tree;
+  ewl_container_child_append(EWL_CONTAINER(tree), vbox);
+  //ewl_box_spacing_set (EWL_BOX (EWL_SCROLLPANE (tree)->box), 5);
+  gui->tree = vbox;
 
   gui->paned = ewl_hpaned_new ();
   gui->local_container = ewl_cell_new ();
@@ -979,7 +978,7 @@
   ewl_container_child_append (EWL_CONTAINER (box), menubar);
   ewl_container_child_append (EWL_CONTAINER (box), gui->paned);
 
-  ewl_container_child_append (EWL_CONTAINER (gui->paned), gui->tree);
+  ewl_container_child_append (EWL_CONTAINER (gui->paned), tree);
 
   ewl_container_child_append (EWL_CONTAINER (gui->paned),
                              gui->local_container);
@@ -1012,7 +1011,6 @@
   ewl_widget_show (hbox);
   ewl_widget_show (contract_button);
   ewl_widget_show (expand_button);
-  ewl_widget_show (scrollpane);
   ewl_widget_show (gui->paned);
   ewl_widget_show (gui->local_container);
   ewl_widget_show (tree);




-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to