From b4f398e1734639d0186e0023bdaff3cbf65048e8 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Tue, 18 Apr 2000 16:43:51 +0000 Subject: [PATCH] r253: Middle-drag moves files. --- ROX-Filer/src/Docs/Manual.lyx | 90 +++++++++++++++++++++++++++++++++++-------- ROX-Filer/src/Makefile.in | 3 -- ROX-Filer/src/dnd.c | 8 +++- 3 files changed, 80 insertions(+), 21 deletions(-) diff --git a/ROX-Filer/src/Docs/Manual.lyx b/ROX-Filer/src/Docs/Manual.lyx index 3c35ffba..3dde55e6 100644 --- a/ROX-Filer/src/Docs/Manual.lyx +++ b/ROX-Filer/src/Docs/Manual.lyx @@ -1,4 +1,4 @@ -#This file was created by Tue Apr 18 12:24:48 2000 +#This file was created by Tue Apr 18 17:30:12 2000 #LyX 0.12 (C) 1995-1998 Matthias Ettrich and the LyX Team \lyxformat 2.15 \textclass article @@ -264,18 +264,19 @@ $ ROX-Filer/AppRun -o -b ~/Panel & Mouse button and key bindings \layout Standard -By default, the mouse button bindings are different to fit in better with - X conventions. +By default, the mouse button bindings are designed to fit in with X conventions. You can get the old RISC OS bindings by opening the Options window and clicking on a few toggle buttons. -\layout Standard - -By default, the mouse buttons and key bindings for filer windows are as + By default, the mouse buttons and key bindings for filer windows are as follows: +\latex latex + +\backslash +medskip \layout Standard \LyXTable multicol5 -21 2 0 0 -1 -1 -1 -1 +23 2 0 0 -1 -1 -1 -1 1 1 0 0 1 1 0 0 0 1 0 0 @@ -285,6 +286,8 @@ multicol5 0 1 1 0 0 1 0 0 0 1 1 0 +0 1 0 0 +0 1 1 0 0 1 1 0 0 1 0 0 0 1 1 0 @@ -297,21 +300,25 @@ multicol5 0 1 0 0 0 1 0 0 0 1 0 0 -8 1 0 "" "" -2 1 1 "10cm" "" -0 8 0 1 0 0 0 "" "" +2 1 0 "3.5cm" "" +2 1 1 "9.5cm" "" +0 2 0 1 0 0 0 "" "" 0 2 0 1 0 0 0 "" "" 0 8 0 1 0 0 0 "" "" 0 8 0 1 0 0 0 "" "" -0 8 0 1 0 0 0 "" "" +0 2 0 1 0 0 0 "" "" 0 8 0 1 0 0 0 "" "" 0 8 0 1 0 0 0 "" "" 0 8 0 1 1 0 0 "" "" 0 8 0 1 0 0 0 "" "" 0 8 0 1 0 0 0 "" "" +0 8 0 1 1 0 0 "" "" +0 8 0 1 1 0 0 "" "" 0 8 0 1 0 0 0 "" "" +0 2 0 1 0 0 0 "" "" 0 8 0 1 1 0 0 "" "" 0 8 0 1 0 0 0 "" "" +0 2 0 1 0 0 0 "" "" 0 8 0 1 0 0 0 "" "" 0 8 0 1 0 0 0 "" "" 0 8 0 1 1 0 0 "" "" @@ -365,12 +372,20 @@ the Selection submenu. \newline Drag an item \newline -Copy the file(s) to the destination (an application or another filer window) +Copy the file(s) to the destination (an application or another filer window). \newline - +(left mouse button) \newline Hold down Shift to move the file, or Ctrl+Shift to create a symbolic link. \newline +Drag an item +\newline +As above, but always moves rather than copying or symlinking. +\newline +(middle mouse button) +\newline + +\newline Drag (not over an item) \newline Select a group of items by dragging a box around them. @@ -429,6 +444,14 @@ Spacebar Toggles the item under the cursor between being selected and unselected. \layout Standard + +\latex latex + +\backslash +medskip +\backslash +noindent +\latex default You can simulate a click of the middle mouse button by clicking with Ctrl held down. Other keys can easily be defined by opening the menu, moving the pointer @@ -1953,6 +1976,17 @@ Save puts all your choices into effect, and also saves them into your Choices directory for next time ROX-Filer is loaded. ROX-Filer will never save any preferences to disk unless you click on the `Save' button in the options window. + Exactly where choices are loaded from and saved to is controlled by the + +\family typewriter +CHOICESPATH +\family default + environment variable --- see +\begin_inset LatexCommand \cite{Choices} + +\end_inset + + for details. \layout Description OK puts your choices into effect without writing anything to disk. @@ -2326,10 +2360,32 @@ This is a quick start guide for people who want to modify the source code. Compiling \layout Standard -The first time you compile the program you need to do `AppRun --compile', - but in future you only need to run `make' in the `src' directory when you - change the .c and .h files. - You might want to run `make depend' too. +The first time you compile the program you need to do ` +\family typewriter +AppRun --compile +\family default +', but in future you only need to run ` +\family typewriter +make +\family default +' in the ` +\family typewriter +src +\family default +' directory when you change the +\family typewriter +.c +\family default + and +\family typewriter +.h +\family default + files. + You might want to run ` +\family typewriter +make depend +\family default +' too. \layout Subsection Creating and applying patches diff --git a/ROX-Filer/src/Makefile.in b/ROX-Filer/src/Makefile.in index fc354a97..230852e9 100644 --- a/ROX-Filer/src/Makefile.in +++ b/ROX-Filer/src/Makefile.in @@ -43,9 +43,6 @@ depend: messages.pot: ${SRCS} xgettext --keyword=_ --keyword=N_ --output=$@ ${SRCS} -dist: - ./po/update-po - ############ Special case pixmaps.o: pixmaps.c diff --git a/ROX-Filer/src/dnd.c b/ROX-Filer/src/dnd.c index 48347e17..ec7fafcd 100644 --- a/ROX-Filer/src/dnd.c +++ b/ROX-Filer/src/dnd.c @@ -346,6 +346,7 @@ void drag_selection(Collection *collection, {"", 0, TARGET_RAW}, }; DirItem *item; + GdkDragAction actions; if (number_selected == 1) item = selected_item(collection); @@ -366,9 +367,14 @@ void drag_selection(Collection *collection, else target_list = gtk_target_list_new(target_table, 1); + if (event->state & GDK_BUTTON1_MASK) + actions = GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK; + else + actions = GDK_ACTION_MOVE; + context = gtk_drag_begin(widget, target_list, - GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK, + actions, (event->state & GDK_BUTTON1_MASK) ? 1 : 2, (GdkEvent *) event); g_dataset_set_data(context, "filer_window", filer_window); -- 2.11.4.GIT