ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 19:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fixed for FOR _NO_EXTENSIONS mode

Browse Source 
- implement ID_VIEW_SPLIT command

svn path=/trunk/; revision=15460
This commit is contained in:
Martin Fuchs
2005-05-21 16:45:50 +00:00
parent fb4635393e
commit a62f884b0b
17 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/subsys/system/winefile/Sv.rc
+1 -1
View File
@@ -87,7 +87,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "Bara tr&äd", 411
MENUITEM "Bara &mapp", 412
MENUITEM SEPARATOR
MENUITEM "De&la", 414
MENUITEM "De&la", ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "&Namn", ID_VIEW_NAME
MENUITEM "&Alla Fildetaljer" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/cs.rc
+1 -1
View File
@@ -86,7 +86,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Jen strom" , 411
MENUITEM "Jen &adresáøe" , 412
MENUITEM SEPARATOR
MENUITEM "&Rozdìlit" , 414
MENUITEM "&Rozdìlit" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "&Jméno" , ID_VIEW_NAME
MENUITEM "&Detaily všech souborù" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/de.rc
+1 -1
View File
@@ -85,7 +85,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "Nur St&ruktur" , 411
MENUITEM "Nur &Verzeichnis" , 412
MENUITEM SEPARATOR
MENUITEM "&Teilen" , 414
MENUITEM "&Teilen" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "&Name" , ID_VIEW_NAME
MENUITEM "A&lle Dateiangaben" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/en.rc
+1 -1
View File
@@ -88,7 +88,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "Tr&ee Only" , 411
MENUITEM "Directory &Only" , 412
MENUITEM SEPARATOR
MENUITEM "Sp&lit" , 414
MENUITEM "Sp&lit" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "&Name" , ID_VIEW_NAME
MENUITEM "&All File Details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/es.rc
+1 -1
View File
@@ -84,7 +84,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "Árbol &sólo" , 411
MENUITEM "&Directorio sólo" , 412
MENUITEM SEPARATOR
MENUITEM "Di&vidir" , 414
MENUITEM "Di&vidir" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "No&mbre" , ID_VIEW_NAME
MENUITEM "T&odos los detalles" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/fr.rc
+1 -1
View File
@@ -87,7 +87,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Arbre seulement" , 411
MENUITEM "&Répertoire seulement" , 412
MENUITEM SEPARATOR
MENUITEM "&Séparer" , 414
MENUITEM "&Séparer" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "&Nom" , ID_VIEW_NAME
MENUITEM "Tous &les Détails" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/hu.rc
+1 -1
View File
@@ -87,7 +87,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Könyvtárfa" , 411
MENUITEM "&Csak mappák" , 412
MENUITEM SEPARATOR
MENUITEM "&Felosztás" , 414
MENUITEM "&Felosztás" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "&Név" , ID_VIEW_NAME
MENUITEM "&Minden részlet" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/it.rc
+1 -1
View File
@@ -87,7 +87,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "So&lo Albero" , 411
MENUITEM "&Solo Directory" , 412
MENUITEM SEPARATOR
MENUITEM "Di&vidi" , 414
MENUITEM "Di&vidi" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "&Nome" , ID_VIEW_NAME
MENUITEM "&Mostra tutti i dettagli sui file" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/nl.rc
+1 -1
View File
@@ -83,7 +83,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Alleen hierarchie" , 411
MENUITEM "Alleen &mapinhoud" , 412
MENUITEM SEPARATOR
MENUITEM "Sp&litsen" , 414
MENUITEM "Sp&litsen" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "&Naam" , ID_VIEW_NAME
MENUITEM "&Alle details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/pl.rc
+1 -1
View File
@@ -87,7 +87,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "D&rzewo" , 411
MENUITEM "&Katalogi" , 412
MENUITEM SEPARATOR
MENUITEM "&Po³¹cz" , 414
MENUITEM "&Po³¹cz" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "&Nazwa" , ID_VIEW_NAME
MENUITEM "&Wszystkie atrybuty pliku" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/pt.rc
+2 -2
View File
@@ -86,7 +86,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "S&omente árvore" , 411
MENUITEM "So&mente pasta" , 412
MENUITEM SEPARATOR
MENUITEM "&Dividir" , 414
MENUITEM "&Dividir" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "&Nome" , ID_VIEW_NAME
MENUITEM "&Todos os delalhes" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
@@ -214,7 +214,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "S&omente árvore" , 411
MENUITEM "So&mente pasta" , 412
MENUITEM SEPARATOR
MENUITEM "&Dividir" , 414
MENUITEM "&Dividir" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "&Nome" , ID_VIEW_NAME
MENUITEM "&Todos os delalhes" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/resource.h
+1
View File
@@ -53,6 +53,7 @@
#define ID_VIEW_SORT_TYPE 405
#define ID_VIEW_SORT_SIZE 406
#define ID_VIEW_SORT_DATE 407
#define ID_VIEW_SPLIT 414
#define ID_SELECT_FONT 510
#define ID_VIEW_TOOL_BAR 508
#define ID_VIEW_DRIVE_BAR 507
reactos/subsys/system/winefile/ru.rc
+1 -1
View File
@@ -83,7 +83,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "Òîëüêî &äåðåâî" , 411
MENUITEM "Òîëüêî &ïàïêà" , 412
MENUITEM SEPARATOR
MENUITEM "Ðàç&áèòü" , 414
MENUITEM "Ðàç&áèòü" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "È&ìÿ" , ID_VIEW_NAME
MENUITEM "Â&ñå ïîäðîáíîñòè î ôàéëå" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/si.rc
+1 -1
View File
@@ -84,7 +84,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "Tr&ee Only" , 411
MENUITEM "Directory &Only" , 412
MENUITEM SEPARATOR
MENUITEM "Sp&lit" , 414
MENUITEM "Sp&lit" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "&Name" , ID_VIEW_NAME
MENUITEM "&All File Details" , ID_VIEW_ALL_ATTRIBUTES, CHECKED
reactos/subsys/system/winefile/winefile.c
+29 -17
View File
@@ -211,6 +211,8 @@ LRESULT CALLBACK TreeWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)
/* globals */
WINEFILE_GLOBALS Globals;
static int last_split;
/* some common string constants */
const static TCHAR sEmpty[] = {'\0'};
@@ -346,6 +348,15 @@ static void read_directory_win(Entry* dir, LPCTSTR path)
if (hFind != INVALID_HANDLE_VALUE) {
do {
#ifdef _NO_EXTENSIONS
/* hide directory entry "." */
if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
LPCTSTR name = w32fd.cFileName;
if (name[0]=='.' && name[1]=='\0')
continue;
}
#endif
entry = alloc_entry();
if (!first_entry)
@@ -361,15 +372,7 @@ static void read_directory_win(Entry* dir, LPCTSTR path)
entry->scanned = FALSE;
entry->level = level;
#ifdef _NO_EXTENSIONS
/* hide directory entry "." */
if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
LPCTSTR name = entry->data.cFileName;
if (name[0]=='.' && name[1]=='\0')
continue;
}
#else
#ifndef _NO_EXTENSIONS
entry->etype = ET_WINDOWS;
entry->bhfi_valid = FALSE;
@@ -387,9 +390,10 @@ static void read_directory_win(Entry* dir, LPCTSTR path)
#endif
last = entry;
} while(FindNextFile(hFind, &entry->data));
} while(FindNextFile(hFind, &w32fd));
last->next = NULL;
if (last)
last->next = NULL;
FindClose(hFind);
}
@@ -568,7 +572,8 @@ static void read_directory_unix(Entry* dir, LPCTSTR path)
last = entry;
}
last->next = NULL;
if (last)
last->next = NULL;
call_closedir(pdir);
}
@@ -1219,7 +1224,7 @@ static void SortDirectory(Entry* dir, SORT_ORDER sortOrder)
len++;
if (len) {
array = (Entry**) HeapAlloc(GetProcessHeap(), 0, len*sizeof(Entry*));
array = HeapAlloc(GetProcessHeap(), 0, len*sizeof(Entry*));
p = array;
for(entry=dir->down; entry; entry=entry->next)
@@ -1321,10 +1326,10 @@ static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND
static Entry* read_tree(Root* root, LPCTSTR path, LPITEMIDLIST pidl, LPTSTR drv, SORT_ORDER sortOrder, HWND hwnd)
{
const static TCHAR sBackslash[] = {'\\', '\0'};
#if !defined(_NO_EXTENSIONS) && defined(__WINE__)
const static TCHAR sSlash[] = {'/', '\0'};
#endif
const static TCHAR sBackslash[] = {'\\', '\0'};
#ifdef _SHELL_FOLDERS
if (pidl)
@@ -3397,7 +3402,9 @@ static void refresh_child(ChildWnd* child)
static void create_drive_bar()
{
TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0};
#ifndef _NO_EXTENSIONS
TCHAR b1[BUFFER_LEN];
#endif
int btn = 1;
PTSTR p;
@@ -3755,8 +3762,6 @@ static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParen
LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)
{
static int last_split;
ChildWnd* child = (ChildWnd*) GetWindowLong(hwnd, GWL_USERDATA);
ASSERT(child);
@@ -3995,6 +4000,14 @@ LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam
set_sort_order(child, SORT_DATE);
break;
case ID_VIEW_SPLIT: {
last_split = child->split_pos;
#ifdef _NO_EXTENSIONS
draw_splitbar(hwnd, last_split);
#endif
SetCapture(hwnd);
break;}
default:
return pane_command(pane, LOWORD(wparam));
}
@@ -4244,7 +4257,6 @@ void show_frame(HWND hwndParent, int cmdshow)
TCHAR path[MAX_PATH], b1[BUFFER_LEN];
ChildWnd* child;
HMENU hMenuFrame, hMenuWindow;
TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0};
CLIENTCREATESTRUCT ccs;
reactos/subsys/system/winefile/winefile.h
+3 -4
View File
@@ -50,12 +50,11 @@
#include <malloc.h> /* for alloca() */
#endif
#include <shellapi.h> /* for ShellExecute() */
#include <shlobj.h> /* for SHFormatDrive() */
#ifndef _NO_EXTENSIONS
#define _SHELL_FOLDERS
#include <objbase.h>
#include <shellapi.h>
#include <shlobj.h>
#endif /* _NO_EXTENSIONS */
#ifndef FILE_ATTRIBUTE_NOT_CONTENT_INDEXED
reactos/subsys/system/winefile/zh.rc
+1 -1
View File
@@ -84,7 +84,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "仅显示目录树（&E）" , 411
MENUITEM "仅显示目录内容（&O）" , 412
MENUITEM SEPARATOR
MENUITEM "分割（&L）" , 414
MENUITEM "分割（&L）" , ID_VIEW_SPLIT
MENUITEM SEPARATOR
MENUITEM "文件名名（&N）" , ID_VIEW_NAME
MENUITEM "文件详悉列表（&A）" , ID_VIEW_ALL_ATTRIBUTES, CHECKED