From: Dennis Syrovatsky Date: Wed, 26 Oct 2005 01:51:45 +0000 (+0000) Subject: Added icons for file transfers dialog. X-Git-Tag: v0.0.90~384^2~474 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e588d96f097cecf116b0088c0a7d326a92f4b8ce;p=tigervnc.git Added icons for file transfers dialog. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@361 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- diff --git a/vncviewer/ftdir.ico b/vncviewer/ftdir.ico new file mode 100644 index 00000000..7a7f7419 Binary files /dev/null and b/vncviewer/ftdir.ico differ diff --git a/vncviewer/ftfile.ico b/vncviewer/ftfile.ico new file mode 100644 index 00000000..a8084b88 Binary files /dev/null and b/vncviewer/ftfile.ico differ diff --git a/vncviewer/ftreload.ico b/vncviewer/ftreload.ico new file mode 100644 index 00000000..34383e90 Binary files /dev/null and b/vncviewer/ftreload.ico differ diff --git a/vncviewer/ftup.ico b/vncviewer/ftup.ico new file mode 100644 index 00000000..fc215ada Binary files /dev/null and b/vncviewer/ftup.ico differ diff --git a/vncviewer/resource.h b/vncviewer/resource.h index 93690a20..6d49c5a8 100644 --- a/vncviewer/resource.h +++ b/vncviewer/resource.h @@ -20,6 +20,10 @@ #define IDB_TOOLBAR 121 #define IDD_FTDIRNAME_DLG 123 #define IDD_FTCONFIRM_DLG 124 +#define IDI_FTUP 125 +#define IDI_FTDIR 126 +#define IDI_FTFILE 127 +#define IDI_FTRELOAD 128 #define IDC_PASSWORD 1000 #define IDC_CONNECTING_TEXT 1001 #define IDC_SERVER_EDIT 1002 @@ -106,7 +110,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 125 +#define _APS_NEXT_RESOURCE_VALUE 129 #define _APS_NEXT_COMMAND_VALUE 40006 #define _APS_NEXT_CONTROL_VALUE 1081 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/vncviewer/vncviewer.dsp b/vncviewer/vncviewer.dsp index 61a4caf8..63157732 100644 --- a/vncviewer/vncviewer.dsp +++ b/vncviewer/vncviewer.dsp @@ -218,6 +218,22 @@ SOURCE=.\cursor1.cur # End Source File # Begin Source File +SOURCE=.\ftdir.ico +# End Source File +# Begin Source File + +SOURCE=.\ftfile.ico +# End Source File +# Begin Source File + +SOURCE=.\ftreload.ico +# End Source File +# Begin Source File + +SOURCE=.\ftup.ico +# End Source File +# Begin Source File + SOURCE=.\toolbar.bmp # End Source File # Begin Source File diff --git a/vncviewer/vncviewer.rc b/vncviewer/vncviewer.rc index 77b37f6e..9b759ae9 100644 --- a/vncviewer/vncviewer.rc +++ b/vncviewer/vncviewer.rc @@ -12,72 +12,6 @@ ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// Russian resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) -#ifdef _WIN32 -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -#pragma code_page(1251) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_FTDIRNAME_DLG DIALOG DISCARDABLE 0, 0, 193, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Create a New Folder" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "OK",IDOK,80,42,50,14 - PUSHBUTTON "Cancel",IDCANCEL,136,42,50,14 - EDITTEXT IDC_EDIT1,7,19,179,14,ES_AUTOHSCROLL - LTEXT "New Folder Name",IDC_STATIC,7,7,93,8 -END - -IDD_FTCONFIRM_DLG DIALOG DISCARDABLE 0, 0, 188, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "Yes",IDOK,69,122,50,14 - PUSHBUTTON "No",IDCANCEL,131,122,50,14 - PUSHBUTTON "Yes to All",IDC_CONFIRM_YESTOALL,7,122,50,14 - LTEXT "Static",IDC_CONFIRM_TEXT,7,7,174,107 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_FTDIRNAME_DLG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 186 - TOPMARGIN, 7 - BOTTOMMARGIN, 56 - END - - IDD_FTCONFIRM_DLG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 181 - TOPMARGIN, 7 - BOTTOMMARGIN, 136 - END -END -#endif // APSTUDIO_INVOKED - -#endif // Russian resources -///////////////////////////////////////////////////////////////////////////// - - ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -136,6 +70,27 @@ BEGIN PUSHBUTTON "Close File Transfers",IDC_FTCLOSE,218,217,94,12 END +IDD_FTDIRNAME_DLG DIALOG DISCARDABLE 0, 0, 193, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Create a New Folder" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,80,42,50,14 + PUSHBUTTON "Cancel",IDCANCEL,136,42,50,14 + EDITTEXT IDC_EDIT1,7,19,179,14,ES_AUTOHSCROLL + LTEXT "New Folder Name",IDC_STATIC,7,7,93,8 +END + +IDD_FTCONFIRM_DLG DIALOG DISCARDABLE 0, 0, 188, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "Yes",IDOK,69,122,50,14 + PUSHBUTTON "No",IDCANCEL,131,122,50,14 + PUSHBUTTON "Yes to All",IDC_CONFIRM_YESTOALL,7,122,50,14 + LTEXT "Static",IDC_CONFIRM_TEXT,7,7,174,107 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -160,9 +115,37 @@ BEGIN HORZGUIDE, 47 HORZGUIDE, 249 END + + IDD_FTDIRNAME_DLG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 186 + TOPMARGIN, 7 + BOTTOMMARGIN, 56 + END + + IDD_FTCONFIRM_DLG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 181 + TOPMARGIN, 7 + BOTTOMMARGIN, 136 + END END #endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_FTUP ICON DISCARDABLE "ftup.ico" +IDI_FTDIR ICON DISCARDABLE "ftdir.ico" +IDI_FTFILE ICON DISCARDABLE "ftfile.ico" +IDI_FTRELOAD ICON DISCARDABLE "ftreload.ico" #endif // English (U.S.) resources /////////////////////////////////////////////////////////////////////////////