Added dialog for creating a new folder.
Added FTDialog::onLocalCreateFolder() and
FTDialog::onRemoteCreateFolder() methods.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@446 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/vncviewer/FTDialog.cxx b/vncviewer/FTDialog.cxx
index a4fd9a6..11f24a0 100644
--- a/vncviewer/FTDialog.cxx
+++ b/vncviewer/FTDialog.cxx
@@ -235,6 +235,7 @@
case IDM_FTRENAME:
case IDM_FTDELETE:
case IDM_FTCANCEL:
+ case IDM_FTCREATEFOLDER:
_this->onFTMenuCommand(LOWORD(wParam));
return FALSE;
}
@@ -471,6 +472,18 @@
}
void
+FTDialog::onLocalCreateFolder()
+{
+
+}
+
+void
+FTDialog::onRemoteCreateFolder()
+{
+
+}
+
+void
FTDialog::onFTCancel()
{
if (m_pCancelingDlg != NULL) return;
@@ -543,6 +556,16 @@
}
break;
case IDM_FTCANCEL: onFTCancel(); break;
+ case IDM_FTCREATEFOLDER:
+ {
+ switch (m_FTMenuSource)
+ {
+ case IDC_FTLOCALLIST: onLocalCreateFolder(); break;
+ case IDC_FTREMOTELIST: onRemoteCreateFolder(); break;
+ default: break;
+ }
+ }
+ break;
default:
break;
}
diff --git a/vncviewer/FTDialog.h b/vncviewer/FTDialog.h
index 928c93d..e3d1d37 100644
--- a/vncviewer/FTDialog.h
+++ b/vncviewer/FTDialog.h
@@ -92,6 +92,10 @@
void onLocalRButton();
void onRemoteRButton();
+
+ void onLocalCreateFolder();
+ void onRemoteCreateFolder();
+
void showFTMenu(bool copyBtnState, bool createFldBtnState,
bool renameBtnState, bool deleteBtnState,
bool cancelBtnState);
diff --git a/vncviewer/resource.h b/vncviewer/resource.h
index 8413d17..adff651 100644
--- a/vncviewer/resource.h
+++ b/vncviewer/resource.h
@@ -26,6 +26,7 @@
#define IDI_FTRELOAD 128
#define IDR_FTMENU 130
#define IDD_FTCANCELING 131
+#define IDD_FTCREATEFOLDER 132
#define IDC_PASSWORD 1000
#define IDC_CONNECTING_TEXT 1001
#define IDC_SERVER_EDIT 1002
@@ -109,6 +110,7 @@
#define IDC_CONFIRM_YESTOALL 1079
#define IDC_CONFIRM_TEXT 1080
#define IDC_EDIT2 1082
+#define IDC_FTFOLDERNAME 1083
#define ID_TOOLBAR 40002
#define ID_CLOSE 40003
#define ID_OPTIONS 40004
@@ -135,9 +137,9 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 132
+#define _APS_NEXT_RESOURCE_VALUE 133
#define _APS_NEXT_COMMAND_VALUE 40028
-#define _APS_NEXT_CONTROL_VALUE 1083
+#define _APS_NEXT_CONTROL_VALUE 1084
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
diff --git a/vncviewer/vncviewer.rc b/vncviewer/vncviewer.rc
index 531a78c..5335294 100644
--- a/vncviewer/vncviewer.rc
+++ b/vncviewer/vncviewer.rc
@@ -13,54 +13,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_FTCANCELING DIALOG DISCARDABLE 0, 0, 193, 63
-STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Canceling Active File Transfer"
-FONT 8, "MS Sans Serif"
-BEGIN
- DEFPUSHBUTTON "Yes",IDOK,40,42,50,14
- PUSHBUTTON "No",IDCANCEL,102,42,50,14
- LTEXT "FileTransfer is active.\nAre you sure you want to cancel transfer?",
- IDC_STATIC,42,14,133,19
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
- IDD_FTCANCELING, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 186
- TOPMARGIN, 7
- BOTTOMMARGIN, 56
- END
-END
-#endif // APSTUDIO_INVOKED
-
-#endif // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
@@ -398,6 +350,28 @@
90,117,15
END
+IDD_FTCANCELING DIALOG DISCARDABLE 0, 0, 193, 63
+STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Canceling Active File Transfer"
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "Yes",IDOK,40,42,50,14
+ PUSHBUTTON "No",IDCANCEL,102,42,50,14
+ LTEXT "FileTransfer is active.\nAre you sure you want to cancel transfer?",
+ IDC_STATIC,42,14,133,19
+END
+
+IDD_FTCREATEFOLDER 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
+ LTEXT "New Folder Name",IDC_STATIC,7,7,179,8
+ EDITTEXT IDC_FTFOLDERNAME,7,19,179,14,ES_AUTOHSCROLL
+END
+
/////////////////////////////////////////////////////////////////////////////
//
@@ -559,6 +533,22 @@
HORZGUIDE, 90
HORZGUIDE, 105
END
+
+ IDD_FTCANCELING, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 186
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 56
+ END
+
+ IDD_FTCREATEFOLDER, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 186
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 56
+ END
END
#endif // APSTUDIO_INVOKED