Enlightenment CVS committal

Author  : lordchaos
Project : e17
Module  : proto

Dir     : e17/proto/entropy/src/plugins


Modified Files:
        etk_list_viewer.c layout_etk_simple.c 


Log Message:
* WM Title/Class.  Proper sizes for pane and list view

===================================================================
RCS file: 
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_list_viewer.c   20 Feb 2006 08:35:35 -0000      1.4
+++ etk_list_viewer.c   20 Feb 2006 09:16:09 -0000      1.5
@@ -43,6 +43,15 @@
   Etk_Tree_Row *icon;
 };
 
+
+void
+gui_file_destroy (gui_file * file)
+{
+  entropy_free (file);
+
+}
+
+
 int
 entropy_plugin_type_get ()
 {
@@ -67,6 +76,46 @@
        return ENTROPY_TOOLKIT_ETK;
 }
 
+void
+gui_object_destroy_and_free (entropy_gui_component_instance * comp,
+                            Ecore_Hash * gui_hash)
+{
+
+  Ecore_List *list;
+  entropy_generic_file *obj;
+  gui_file *freeobj;
+  entropy_etk_file_list_viewer *view = comp->data;
+
+  /*Temporarily stop callbacks, we don't want to clobber an in-op process */
+  entropy_notify_lock_loop (comp->core->notify);
+
+  list = ecore_hash_keys (gui_hash);
+
+  ecore_list_goto_first (list);
+  while ((obj = ecore_list_next (list))) {
+
+
+    freeobj = ecore_hash_get (gui_hash, obj);
+    if (freeobj) {
+      /*De-Associate this icon with this file in the core, so DND works */
+      entropy_core_object_file_disassociate (freeobj->icon);
+
+      gui_file_destroy (freeobj);
+    }
+
+    /*Tell the core we no longer need this file - it might free it now */
+    entropy_core_file_cache_remove_reference (obj->md5);
+  }
+  ecore_hash_destroy (gui_hash);
+  view->gui_hash = ecore_hash_new(ecore_direct_hash, ecore_direct_compare);
+  
+  ecore_list_destroy (list);
+
+  entropy_notify_unlock_loop (comp->core->notify);
+
+
+}
+
 
 static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row 
*row, Etk_Event_Mouse_Up_Down *event, void *data)
 {
@@ -171,10 +220,11 @@
   switch (eevent->event_type) {
          case ENTROPY_NOTIFY_FILELIST_REQUEST_EXTERNAL:
          case ENTROPY_NOTIFY_FILELIST_REQUEST:{
-
-                                                 
              entropy_generic_file *file;
 
+             gui_object_destroy_and_free(comp, viewer->gui_hash);
+
+
              etk_tree_clear(ETK_TREE(viewer->tree));
 
                ecore_list_goto_first (el);
@@ -298,6 +348,8 @@
   
   etk_tree_build(ETK_TREE(viewer->tree));
 
+  etk_widget_size_request_set(viewer->tree, 600, 600);
+
   instance->data = viewer;
   instance->core = core;
   instance->gui_object = viewer->tree;
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- layout_etk_simple.c 20 Feb 2006 07:44:10 -0000      1.5
+++ layout_etk_simple.c 20 Feb 2006 09:16:09 -0000      1.6
@@ -228,7 +228,10 @@
   etk_signal_connect ("delete_event", ETK_OBJECT (window),
                      ETK_CALLBACK (_etk_window_deleted_cb), core);
 
-  etk_widget_size_request_set(ETK_WIDGET(window), 800,600);
+  etk_window_title_set(ETK_WINDOW(window), "Entropy");
+  etk_window_wmclass_set(ETK_WINDOW(window), "entropy", "Entropy");
+
+  //etk_widget_size_request_set(ETK_WIDGET(window), 800,600);
 
   /*Tree init*/
   gui->tree = etk_tree_new();
@@ -240,6 +243,8 @@
   etk_tree_col_expand_set(col, ETK_TRUE);
   etk_tree_build(ETK_TREE(gui->tree));
 
+  etk_widget_size_request_set(gui->tree, 180, 600);
+
   /*Add test row */
   etk_tree_freeze(ETK_TREE(gui->tree));
   row = etk_tree_append(ETK_TREE(gui->tree), col, 




-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to