Sync winfile and write to wine HEAD.

svn path=/trunk/; revision=36745
This commit is contained in:
Daniel Reimer 2008-10-14 13:44:12 +00:00
parent 4182d4759d
commit f4bb1d0429
3 changed files with 89 additions and 79 deletions

View file

@ -21,155 +21,158 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
/* Menu */ /* Menu */
IDM_WINEFILE MENU FIXED IMPURE IDM_WINEFILE MENU FIXED IMPURE
{ {
POPUP "ファイル(&F)" { POPUP "ファイル(&F)" {
MENUITEM "開く(&O)\tEnter", ID_ACTIVATE MENUITEM "開く(&O)\tEnter", ID_ACTIVATE
MENUITEM "移動(&M)...\tF7", ID_FILE_MOVE MENUITEM "移動(&M)...\tF7", ID_FILE_MOVE
MENUITEM "コピー(&C)...\tF8", ID_FILE_COPY MENUITEM "コピー(&C)...\tF8", ID_FILE_COPY
MENUITEM "&In Clipboard...\tF9", 118 MENUITEM "&In Clipboard...\tF9", 118
MENUITEM "削除(&D)\tDel", ID_FILE_DELETE MENUITEM "削除(&D)\tDel", ID_FILE_DELETE
MENUITEM "名前の変更(&N)...", 109 MENUITEM "名前の変更(&N)...", 109
MENUITEM "プロパティ(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM "プロパティ(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "圧縮(&O)...", 119 MENUITEM "圧縮(&O)...", 119
MENUITEM "解凍(&O)...", 120 MENUITEM "解凍(&O)...", 120
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "実行(&R)...", ID_EXECUTE MENUITEM "実行(&R)...", ID_EXECUTE
MENUITEM "印刷(&P)...", 102 MENUITEM "印刷(&P)...", 102
MENUITEM "関連付け...", 103 MENUITEM "関連付け...", 103
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "ディレクトリを作成(&E)...", 111 MENUITEM "ディレクトリを作成(&E)...", 111
MENUITEM "検索(&H)...", 104 MENUITEM "検索(&H)...", 104
MENUITEM "ファイルを選択(&S)...", 116 MENUITEM "ファイルを選択(&S)...", 116
MENUITEM SEPARATOR MENUITEM SEPARATOR
#ifndef _NO_EXTENSIONS #ifndef _NO_EXTENSIONS
MENUITEM "終了(&X)\tAlt+X", ID_FILE_EXIT MENUITEM "終了(&X)\tAlt+X", ID_FILE_EXIT
#else #else
MENUITEM "終了(&X)", ID_FILE_EXIT MENUITEM "終了(&X)", ID_FILE_EXIT
#endif #endif
} }
POPUP "ディスク(&D)" { POPUP "ディスク(&D)" {
MENUITEM "ディスクをコピー(&C)...", 201 MENUITEM "ディスクをコピー(&C)...", 201
MENUITEM "&Label Disk...", 202 MENUITEM "&Label Disk...", 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "ディスクをフォーマット(&F)...", ID_FORMAT_DISK MENUITEM "ディスクをフォーマット(&F)...", ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "&Make System Disk...", -1 /*TODO*/ MENUITEM "&Make System Disk...", -1 /*TODO*/
#endif #endif
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "ネットワークドライブに接続(&N)", ID_CONNECT_NETWORK_DRIVE MENUITEM "ネットワークドライブに接続(&N)", ID_CONNECT_NETWORK_DRIVE
MENUITEM "ネットワークドライブを切断(&D)", ID_DISCONNECT_NETWORK_DRIVE MENUITEM "ネットワークドライブを切断(&D)", ID_DISCONNECT_NETWORK_DRIVE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Share as...", 254 MENUITEM "Share as...", 254
MENUITEM "&Remove Share...", 255 MENUITEM "&Remove Share...", 255
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "ドライブを選択(&S)...", 251 MENUITEM "ドライブを選択(&S)...", 251
} }
POPUP "ディレクトリ(&R)" { POPUP "ディレクトリ(&R)" {
MENUITEM "&Next Level\t+", 301 MENUITEM "&Next Level\t+", 301
MENUITEM "ツリーを展開(&T)\t*", 302 MENUITEM "ツリーを展開(&T)\t*", 302
MENUITEM "すべてを展開(&A)\tStrg+*", 303 MENUITEM "すべてを展開(&A)\tStrg+*", 303
MENUITEM "ツリーを折り畳む(&T)\t-", 304 MENUITEM "ツリーを折り畳む(&T)\t-", 304
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Mark Children", 505 MENUITEM "&Mark Children", 505
} }
POPUP "表\示(&V)" { POPUP "表示(&V)" {
MENUITEM "ツリーとディレクトリ(&R)", 413 MENUITEM "ツリーとディレクトリ(&R)", 413
MENUITEM "ツリーのみ(&E)", 411 MENUITEM "ツリーのみ(&E)", 411
MENUITEM "ディレクトリのみ(&O)", 412 MENUITEM "ディレクトリのみ(&O)", 412
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "分割(&L)", ID_VIEW_SPLIT MENUITEM "分割(&L)", ID_VIEW_SPLIT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "名前(&N)", ID_VIEW_NAME MENUITEM "名前(&N)", ID_VIEW_NAME
MENUITEM "すべてのファイル詳細(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "すべてのファイル詳細(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED
MENUITEM "部分詳細(&P)...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM "部分詳細(&P)...", ID_VIEW_SELECTED_ATTRIBUTES
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "名前で並べ替え(&S)", ID_VIEW_SORT_NAME MENUITEM "名前で並べ替え(&S)", ID_VIEW_SORT_NAME
MENUITEM "種類で並べ替え(&B)", ID_VIEW_SORT_TYPE MENUITEM "種類で並べ替え(&B)", ID_VIEW_SORT_TYPE
MENUITEM "サイズで並べ替え(&Z)", ID_VIEW_SORT_SIZE MENUITEM "サイズで並べ替え(&Z)", ID_VIEW_SORT_SIZE
MENUITEM "日付で並べ替え(&D)", ID_VIEW_SORT_DATE MENUITEM "日付で並べ替え(&D)", ID_VIEW_SORT_DATE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Filter by &...", ID_VIEW_FILTER MENUITEM "Filter by &...", ID_VIEW_FILTER
} }
POPUP "オプション(&O)" { POPUP "オプション(&O)" {
MENUITEM "確認(&C)...", 501 MENUITEM "確認(&C)...", 501
MENUITEM "フォント(&F)...", ID_SELECT_FONT MENUITEM "フォント(&F)...", ID_SELECT_FONT
MENUITEM "ツールバーをカスタマイズ(&B)...", 512 MENUITEM "ツールバーをカスタマイズ(&B)...", 512
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "ツールバー(&T)", ID_VIEW_TOOL_BAR, CHECKED MENUITEM "ツールバー(&T)", ID_VIEW_TOOL_BAR, CHECKED
MENUITEM "ドライブバー(&D)", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "ドライブバー(&D)", ID_VIEW_DRIVE_BAR, CHECKED
MENUITEM "ステータスバー(&S)", ID_VIEW_STATUSBAR, CHECKED MENUITEM "ステータスバー(&S)", ID_VIEW_STATUSBAR, CHECKED
#ifndef _NO_EXTENSIONS #ifndef _NO_EXTENSIONS
MENUITEM "全画面表\示(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "全画面表示(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN
#endif #endif
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Minimize on run", 504 MENUITEM "&Minimize on run", 504
MENUITEM "終了時に設定を保存(&S)", ID_VIEW_SAVESETTINGS MENUITEM "終了時に設定を保存(&S)", ID_VIEW_SAVESETTINGS
} }
POPUP "セキュリティ(&S)" { POPUP "セキュリティ(&S)" {
MENUITEM "&Access...", 605 MENUITEM "&Access...", 605
MENUITEM "&Logging...", 606 MENUITEM "&Logging...", 606
MENUITEM "&Owner...", 607 MENUITEM "&Owner...", 607
} }
POPUP "ウィンドウ(&W)" { POPUP "ウィンドウ(&W)" {
MENUITEM "新規ウィンドウ(&W)", ID_WINDOW_NEW MENUITEM "新規ウィンドウ(&W)", ID_WINDOW_NEW
MENUITEM "重ねて表\示\tCtrl+F5", ID_WINDOW_CASCADE MENUITEM "重ねて表示\tCtrl+F5", ID_WINDOW_CASCADE
MENUITEM "上下に並べて表\示(&H)", ID_WINDOW_TILE_HORZ MENUITEM "上下に並べて表示(&H)", ID_WINDOW_TILE_HORZ
MENUITEM "左右に並べて表\示(&V)\tCtrl+F4", ID_WINDOW_TILE_VERT MENUITEM "左右に並べて表示(&V)\tCtrl+F4", ID_WINDOW_TILE_VERT
#ifndef _NO_EXTENSIONS #ifndef _NO_EXTENSIONS
MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT
#endif #endif
MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE
MENUITEM "更新(&R)\tF5", ID_REFRESH MENUITEM "更新(&R)\tF5", ID_REFRESH
} }
POPUP "ヘルプ(&H)" { POPUP "ヘルプ(&H)" {
MENUITEM "ヘルプ トピック(&H)\tF1", ID_HELP MENUITEM "ヘルプ トピック(&H)\tF1", ID_HELP
MENUITEM "ヘルプの検索(&S)...\tF1", ID_HELP MENUITEM "ヘルプの検索(&S)...\tF1", ID_HELP
MENUITEM "ヘルプを使う(&U)\tF1", ID_HELP_USING MENUITEM "ヘルプを使う(&U)\tF1", ID_HELP_USING
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Winefile について(&A)...", ID_ABOUT MENUITEM "Winefile について(&A)...", ID_ABOUT
} }
} }
IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "実行" CAPTION "実行"
FONT 9, "MS Shell Dlg" FONT 9, "MS Shell Dlg"
{ {
CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10
CONTROL "コマンド(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 CONTROL "コマンド(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10
EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL
CONTROL "As &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 CONTROL "As &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12
DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14
PUSHBUTTON "キャンセル", 2, 158, 23, 47, 14 PUSHBUTTON "キャンセル", 2, 158, 23, 47, 14
PUSHBUTTON "ヘルプ(&H)", 254, 158, 43, 47, 14 PUSHBUTTON "ヘルプ(&H)", 254, 158, 43, 47, 14
} }
IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "移動先を選択" CAPTION "移動先を選択"
FONT 9, "MS Shell Dlg" FONT 9, "MS Shell Dlg"
{ {
CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10
CONTROL "パス(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 CONTROL "パス(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10
EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL
DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14
PUSHBUTTON "キャンセル", 2, 158, 23, 47, 14 PUSHBUTTON "キャンセル", 2, 158, 23, 47, 14
PUSHBUTTON "参照(&B)", 254, 158, 43, 47, 14 PUSHBUTTON "参照(&B)", 254, 158, 43, 47, 14
} }
IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97
@ -233,28 +236,30 @@ STRINGTABLE
STRINGTABLE STRINGTABLE
{ {
IDS_WINEFILE "Wine ファイルマネージャ" IDS_WINEFILE "Wine ファイルマネージャ"
IDS_ERROR "Error" IDS_ERROR "Error"
IDS_ROOT_FS "root fs" IDS_ROOT_FS "root fs"
IDS_UNIXFS "unixfs" IDS_UNIXFS "unixfs"
IDS_DESKTOP "Desktop" IDS_DESKTOP "Desktop"
IDS_SHELL "シェル" IDS_SHELL "シェル"
IDS_TITLEFMT "%s - %s" IDS_TITLEFMT "%s - %s"
IDS_NO_IMPL "未実装" IDS_NO_IMPL "未実装"
IDS_WINE_FILE "Wine File" IDS_WINE_FILE "Wine File"
} }
STRINGTABLE STRINGTABLE
{ {
IDS_COL_NAME "名前" IDS_COL_NAME "名前"
IDS_COL_SIZE "サイズ" IDS_COL_SIZE "サイズ"
IDS_COL_CDATE "CDate" IDS_COL_CDATE "CDate"
IDS_COL_ADATE "ADate" IDS_COL_ADATE "ADate"
IDS_COL_MDATE "MDate" IDS_COL_MDATE "MDate"
IDS_COL_IDX "Index/Inode" IDS_COL_IDX "Index/Inode"
IDS_COL_LINKS "リンク" IDS_COL_LINKS "リンク"
IDS_COL_ATTR "属性" IDS_COL_ATTR "属性"
IDS_COL_SEC "セキュリティ" IDS_COL_SEC "セキュリティ"
IDS_FREE_SPACE_FMT "%s of %s free" IDS_FREE_SPACE_FMT "%s of %s free"
} }
#pragma code_page(default)

View file

@ -964,7 +964,7 @@ static Entry* read_tree_shell(Root* root, LPITEMIDLIST pidl, SORT_ORDER sortOrde
((LPITEMIDLIST)((LPBYTE)next_pidl+pidl->mkid.cb))->mkid.cb = 0; ((LPITEMIDLIST)((LPBYTE)next_pidl+pidl->mkid.cb))->mkid.cb = 0;
hr = IShellFolder_BindToObject(folder, next_pidl, 0, &IID_IShellFolder, (void**)&child); hr = IShellFolder_BindToObject(folder, next_pidl, 0, &IID_IShellFolder, (void**)&child);
if (!SUCCEEDED(hr)) if (FAILED(hr))
break; break;
read_directory(entry, NULL, sortOrder, hwnd); read_directory(entry, NULL, sortOrder, hwnd);
@ -1070,7 +1070,7 @@ static void read_directory_shell(Entry* dir, HWND hwnd)
memset(pidls, 0, sizeof(pidls)); memset(pidls, 0, sizeof(pidls));
hr = IEnumIDList_Next(idlist, FETCH_ITEM_COUNT, pidls, &cnt); hr = IEnumIDList_Next(idlist, FETCH_ITEM_COUNT, pidls, &cnt);
if (!SUCCEEDED(hr)) if (FAILED(hr))
break; break;
if (hr == S_FALSE) if (hr == S_FALSE)

View file

@ -18,9 +18,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
/* UTF-8 */
#pragma code_page(65001)
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
STRINGTABLE STRINGTABLE
{ {
IDS_FAILED, "Wordpad の起動に失敗しました" IDS_FAILED, "Wordpad の起動に失敗しました"
} }
#pragma code_page(default)