Deleted the FTDialog::BrowseDlg class.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@452 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/vncviewer/FTDialog.cxx b/vncviewer/FTDialog.cxx
index 3de1b6c8bd61e467b64ffc2dcc8cbbedcda34515..b5782d6e709b1ad5b024f810902a6a04b7d1d0dc 100644 (file)
--- a/vncviewer/FTDialog.cxx
+++ b/vncviewer/FTDialog.cxx
@@ -224,6 +224,12 @@ FTDialog::FTDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
       case IDC_FTCLOSE:
         _this->onClose();
         return FALSE;
+      case IDC_FTLOCALBROWSE:
+        _this->onLocalBrowse();
+        return FALSE;
+      case IDC_FTREMOTEBROWSE:
+        _this->onRemoteBrowse();
+        return FALSE;
       case IDC_FTLOCALUP:
         _this->setButtonsState();
         _this->onLocalOneUpFolder();
@@ -354,6 +360,18 @@ FTDialog::onRemoteItemActivate(LPNMITEMACTIVATE lpnmia)
   showRemoteLVItems();
 }
 
+void 
+FTDialog::onLocalBrowse()
+{
+
+}
+
+void 
+FTDialog::onRemoteBrowse()
+{
+ 
+}
+
 void 
 FTDialog::onLocalReload()
 {
@@ -856,6 +874,11 @@ FTDialog::setStatusText(LPCSTR format,...)
   }
 }
 
+void 
+FTDialog::addBrowseItems(FileInfo *pFI)
+{
+}
+
 void 
 FTDialog::processDlgMsgs()
 {
@@ -1026,31 +1049,3 @@ FTDialog::RenameDlg::initDialog()
   setItemString(IDC_FTFOLDERNAME, m_szFilename);
   SendDlgItemMessage(handle, IDC_FTFOLDERNAME, EM_SETSEL, (WPARAM) 0, (LPARAM) -1);
 }
-
-FTDialog::BrowseDlg::BrowseDlg(FTDialog *pFTDlg) : Dialog(GetModuleHandle(0))
-{
-
-}
-
-FTDialog::BrowseDlg::~BrowseDlg()
-{
-
-}
-
-bool 
-FTDialog::BrowseDlg::onOk()
-{
-  return false;
-}
-
-bool 
-FTDialog::BrowseDlg::create()
-{
-  return false;
-}
-
-void 
-FTDialog::BrowseDlg::initDialog()
-{
-
-}

diff --git a/vncviewer/FTDialog.h b/vncviewer/FTDialog.h
index b483794adf6eb9b2cffa0105c21b976e9c1ba6bf..6cb9d6e3a5889f550f27e103f96dc07b7edf192d 100644 (file)
--- a/vncviewer/FTDialog.h
+++ b/vncviewer/FTDialog.h
@@ -58,6 +58,8 @@ namespace rfb {
       void addRemoteLVItems(FileInfo *pFI);
       void reqFolderUnavailable();
 
+      void addBrowseItems(FileInfo *pFI);
+
       void setStatusText(LPCSTR format,...);
 
       HWND getWndHandle() { return m_hwndFTDialog; }
@@ -71,10 +73,9 @@ namespace rfb {
       char *getRemotePath() { return m_szRemotePath; }
 
       FTProgress *m_pProgress;
-      
-    private:
       FileTransfer *m_pFileTransfer;
       
+    private:
       HWND m_hwndFTDialog;
       HWND m_hwndLocalPath;
       HWND m_hwndRemotePath;
@@ -88,6 +89,9 @@ namespace rfb {
       void onLocalItemActivate(LPNMITEMACTIVATE lpnmia);
       void onRemoteItemActivate(LPNMITEMACTIVATE lpnmia);
 
+      void onLocalBrowse();
+      void onRemoteBrowse();
+
       void onLocalReload();
       void onRemoteReload();
 
@@ -223,24 +227,6 @@ namespace rfb {
 
     private:
         RenameDlg *m_pRenameDlg;
-
-    public:
-      class BrowseDlg : public Dialog
-      {
-      public:
-        BrowseDlg(FTDialog *pFTDlg);
-        ~BrowseDlg();
-
-        bool onOk();
-        bool create();
-        void initDialog();
-
-      private:
-        char m_szFilename[FT_FILENAME_SIZE];
-      };
-
-    private:
-        BrowseDlg *m_pBrowseDlg;
     };
   }
 }

diff --git a/vncviewer/FileTransfer.cxx b/vncviewer/FileTransfer.cxx
index b324901eedde6580f0e7fc763758a3e5881afddd..bf7454ec07144284d529290fe3b7aec3f1c7b685 100644 (file)
--- a/vncviewer/FileTransfer.cxx
+++ b/vncviewer/FileTransfer.cxx
@@ -529,6 +529,7 @@ FileTransfer::procFLRMain(FileInfo *pFI)
 bool 
 FileTransfer::procFLRBrowse(FileInfo *pFI)
 {
+  m_pFTDialog->addBrowseItems(pFI);
   return false;
 }
 

diff --git a/vncviewer/vncviewer.rc b/vncviewer/vncviewer.rc
index 8965abd364835b1737164dd77751b89b24d28d84..94e3f37759450af0d99274098d8d15e1e16d2d26 100644 (file)
--- a/vncviewer/vncviewer.rc
+++ b/vncviewer/vncviewer.rc
@@ -12,57 +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_FTBROWSE DIALOG DISCARDABLE  0, 0, 183, 196
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Browse Folders"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,38,175,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,95,175,50,14
-    EDITTEXT        IDC_FTBROWSEPATH,7,7,169,12,ES_AUTOHSCROLL | ES_READONLY | 
-                    NOT WS_TABSTOP
-    CONTROL         "Tree1",IDC_FTBROWSETREE,"SysTreeView32",TVS_HASBUTTONS | 
-                    TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | 
-                    TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,25,169,143
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_FTBROWSE, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 176
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 189
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
 /////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
 
@@ -423,6 +372,21 @@ BEGIN
     LTEXT           "New Folder Name",IDC_FTTEXT,7,7,179,8
 END
 
+IDD_FTBROWSE DIALOGEX 0, 0, 183, 196
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+CAPTION "Browse Folders"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,38,175,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,95,175,50,14
+    EDITTEXT        IDC_FTBROWSEPATH,7,7,169,12,ES_AUTOHSCROLL | ES_READONLY | 
+                    NOT WS_TABSTOP
+    CONTROL         "Tree1",IDC_FTBROWSETREE,"SysTreeView32",TVS_HASBUTTONS | 
+                    TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | 
+                    TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,25,169,143
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -600,6 +564,14 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 56
     END
+
+    IDD_FTBROWSE, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 176
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 189
+    END
 END
 #endif    // APSTUDIO_INVOKED