*** src/data_win.cpp Thu Mar 20 12:56:48 1997 --- src/data_win.cpp.orig Thu Mar 20 09:42:35 1997 *************** *** 253,329 **** tree_top->compose_directory(); selected_node->set_target(FALSE); } - /*---------------------------------------------------------------------------*/ - void DirTreeWidget::change_dir(FileTreeNode *selected_node) - { - - FileTreeNode *parent= selected_node->get_parent(); - - if(!selected_node || !parent) - return; - - has_focus=TRUE; - emit remove_focus (); - - if(selected_node->has_access() == TRUE) - { - if(!tree_top) - return; - - compose_directory (parent); - - if ( - (parent->get_tree_top() == NULL) && - (parent->is_expanded() == FALSE) - ) - { - parent->set_target(TRUE); - - tree_top->compose_directory(); - io_class->read_directory (parent, - compose_dir); - - parent->set_target(FALSE); - setCursor(arrowCursor); - - } - - compose_directory (selected_node); - selected_node->set_target(TRUE); - - tree_top->compose_directory(); - io_class->read_directory (selected_node, - compose_dir); - - selected_node->set_target(FALSE); - setCursor(arrowCursor); - - parent->set_expanded(TRUE); - selected_node->set_expanded(TRUE); - } - - - emit set_dir_info (compose_dir); - - deselect(); - selected_node->select_node(FALSE); - - update(); - - emit set_dir_info (compose_dir); - - emit update_root_node (selected_node->get_tree_top()); - - has_focus=TRUE; - emit remove_focus (); - selected_node->select_node(TRUE); - - select_active=2; - repaint (0); - } - - /*---------------------------------------------------------------------------*/ void DirTreeWidget::paintEvent(QPaintEvent * e) { int y_diff; --- 253,259 ---- *************** *** 896,975 **** void FileListWidget::mouseReleaseEvent(QMouseEvent * e) { FileTreeNode *selected_node=NULL; ! static FileTreeNode *last_node=0; QPoint new_coors = mapToGlobal(e->pos()); if ((e->button() == LeftButton) && (tree_top!=NULL)) { - - if(e->state() & ShiftButton) - { - - emit dragging_and_dropping (FALSE); - - selected_node = tree_top->find_selected_node_list (e->pos().x(), - e->pos().y()); - - if(!selected_node) - return; - - deselect(); - - FileTreeNode *p; - int action=0; - - if(!last_node) - { - select_active=1; - repaint (0); - - selected_node->select_node(TRUE); - - select_active=2; - repaint (0); - last_node = selected_node; - return; - - } - - // select all nodes between last and this node..- - - p = tree_top; - - select_active=1; - repaint (0); - - deselect(); - - select_active=2; - repaint (0); - - for(; p != 0; p = p->get_next()) - { - if(p == last_node || p == selected_node) - { - if(action) - { - if(p) p->select_node(TRUE); - break; - } - action=1; - } - if(action && p) - { - // fprintf(stderr,"select %s\n",p->get_node_name()); - p->select_node(TRUE); - } - } - - selected_node->select_node(TRUE); - - update(); - return; - - } - - x_offset =X_BORDER; y_offset =Y_BORDER; tree_top->recalc_list (); --- 826,836 ---- void FileListWidget::mouseReleaseEvent(QMouseEvent * e) { FileTreeNode *selected_node=NULL; ! QPoint new_coors = mapToGlobal(e->pos()); if ((e->button() == LeftButton) && (tree_top!=NULL)) { x_offset =X_BORDER; y_offset =Y_BORDER; tree_top->recalc_list (); *************** *** 995,1001 **** select_active=2; repaint (0); } - last_node = selected_node; } } else --- 856,861 ---- *************** *** 1082,1112 **** //>-------- or entering a directory if the node represents a directory - FileTreeNode *selected_node=NULL; - - if((e->button() == LeftButton) && (tree_top!=NULL)) - { - x_offset =X_BORDER; - y_offset =Y_BORDER; - tree_top->recalc_list (); - - selected_node = tree_top->find_selected_node_list (e->pos().x(), - e->pos().y()); - - if (!selected_node) - return; - - if(selected_node->get_file_type() == NODE_ISDIR) - { - deselect(); // current files - multiple_select=FALSE; - - emit change_dir(selected_node); - - // skipRelease =1; // skip release call.. - } - } - } /*---------------------------------------------------------------------------*/ --- 942,947 ---- *** src/ewidgets.cpp Thu Mar 20 09:48:23 1997 --- src/ewidgets.cpp.orig Thu Mar 20 09:52:10 1997 *************** *** 311,318 **** connect (dirview->get_child (),SIGNAL (update_root_node (FileTreeNode *)), fileview->get_child (),SLOT (reset_root_node (FileTreeNode *))); - connect (fileview->get_child (),SIGNAL (change_dir (FileTreeNode *)) , - dirview->get_child (),SLOT (change_dir (FileTreeNode *))); //>------ connect the widgets to info labels --- 311,316 ---- *** src/data_tree.cpp Thu Mar 20 09:54:49 1997 --- src/data_tree.cpp.orig Thu Mar 20 09:56:31 1997 *************** *** 301,312 **** { return (tree_top); } - - FileTreeNode *FileTreeNode::get_parent(void) - { - return (parent); - } - /*---------------------------------------------------------------------------*/ void FileTreeNode::select_node(char selection) { --- 301,306 ---- *** src/dialogs.cpp Thu Mar 20 10:01:26 1997 --- src/dialogs.cpp.orig Thu Mar 20 09:59:50 1997 *************** *** 594,601 **** void OptionsPopup::assign_node (FileTreeNode *use_node, char *temp_path) { ! node_used = use_node; ! path_to_node = new char [strlen (temp_path)+1]; strcpy (path_to_node,temp_path); } /*---------------------------------------------------------------------------*/ --- 594,601 ---- void OptionsPopup::assign_node (FileTreeNode *use_node, char *temp_path) { ! node_used = use_node; ! path_to_node = new char (strlen (temp_path)+1); strcpy (path_to_node,temp_path); } /*---------------------------------------------------------------------------*/ *** include/data_tree.h Thu Mar 20 09:53:37 1997 --- include/data_tree.h.orig Thu Mar 20 09:53:51 1997 *************** *** 177,184 **** FileTreeNode *get_current (void); FileTreeNode *get_next (void); FileTreeNode *get_tree_top (void); ! FileTreeNode *get_parent(void); ! //>---------- elaborate functions void set_file_info(const char *, unsigned long, off_t, char, char); --- 177,183 ---- FileTreeNode *get_current (void); FileTreeNode *get_next (void); FileTreeNode *get_tree_top (void); ! //>---------- elaborate functions void set_file_info(const char *, unsigned long, off_t, char, char); *** include/data_win.h Thu Mar 20 09:47:25 1997 --- include/data_win.h.orig Thu Mar 20 09:46:06 1997 *************** *** 157,165 **** void focus_removed (); void drag_and_drop (bool); ! ! void change_dir(FileTreeNode *); ! signals: void update_widgets (); --- 157,163 ---- void focus_removed (); void drag_and_drop (bool); ! signals: void update_widgets (); *************** *** 249,256 **** void remove_focus (); void dragging_and_dropping (bool); - - void change_dir(FileTreeNode *); }; --- 247,252 ----