Tommy 碎碎念 : 讓 FileZilla3 rc1 記得之前的視窗大小與位置

Tommy Wu's blog

«	四月 2024	»
1	2	3	4	5	6	7
8	9	10	11	12	13	14
15	16	17	18	19	20	21
22	23	24	25	26	27	28
29	30

post by tommy @ 13 八月, 2007 22:53

前幾天 FileZilla 作者發表了 FileZilla 3.0 RC1 的版本. 終於進入 RC 的階段了. 對我來說, 我在 FileZilla 2.x 裡頭會用到的功能, 在這個版本中多數都已經存在了. 所以就想之後都改用 FileZilla 3 的版本. 不過.... 用了一下, 發現... 這個版本仍然不會記錄之前的 UI 大小與位置, 也就是每次執行時, 所出現的畫面並不是我熟悉的, 變成每次都要調整一次. 所以... 乾脆自己修改一下, 加上這個功能來使用.這個修正如下:

diff -Nur Filezilla3/src/interface/Mainfrm.cpp Filezilla3.patch/src/interface/Mainfrm.cpp
--- Filezilla3/src/interface/Mainfrm.cpp  Mon Aug 13 14:01:20 2007
+++ Filezilla3.patch/src/interface/Mainfrm.cpp  Mon Aug 13 17:19:00 2007
@@ -29,6 +29,7 @@
 #include "export.h"
 #include "import.h"
 #include "recursive_operation.h"
+#include <wx/tokenzr.h>
 
 #ifndef __WXMSW__
 #include "resources/filezilla.xpm"
@@ -198,7 +199,7 @@
   m_pStatusView = new CStatusView(m_pTopSplitter, -1);
   m_pQueuePane = new CQueue(m_pBottomSplitter, this, m_pAsyncRequestQueue);
   m_pQueueView = m_pQueuePane->GetQueueView();
-  
+
   m_pLocalTreeViewPanel = new CView(m_pLocalSplitter);
   m_pLocalListViewPanel = new CView(m_pLocalSplitter);
   m_pLocalTreeView = new CLocalTreeView(m_pLocalTreeViewPanel, -1, m_pState, m_pQueueView);
@@ -251,7 +252,7 @@
     m_pLocalListViewPanel->SetHeader(m_pLocalViewHeader);
     m_pLocalSplitter->Initialize(m_pLocalListViewPanel);
   }
-  
+
   m_pRemoteViewHeader = new CRemoteViewHeader(m_pRemoteSplitter, m_pState);
   if (COptions::Get()->GetOptionVal(OPTION_SHOW_TREE_REMOTE))
   {
@@ -275,6 +276,38 @@
 
   Layout();
 
+    // is_maximized win_x win_y win_width win_height top_pos bottom_height view_pos view_height local_pos remote_pos
+  wxString posString = COptions::Get()->GetOption(OPTION_WINDOW_POSITION);
+    wxStringTokenizer tokens(posString, _T(" "));
+    int count = tokens.CountTokens();
+    unsigned long * aPosValues = new unsigned long[count];
+    for (int i = 0; i < count; i++) {
+        wxString token = tokens.GetNextToken();
+        token.ToULong(aPosValues + i);
+    }
+    if (count == 11) {
+        if (aPosValues[0])
+            Maximize();
+        else {
+            Move(aPosValues[1], PosaValues[2]);
+            SetClientSize(aPosValues[3], aPosValues[4]);
+        }
+        m_pTopSplitter->SetSashPosition(aPosValues[5]);
+
+        int x, y;
+        m_pBottomSplitter->GetClientSize(&x, &y);
+        y -= aPosValues[6];
+        if (y < 100) y = 100;
+        m_pBottomSplitter->SetSashPosition(y);
+
+        m_ViewSplitterSashPos = (float)aPosValues[7]/aPosValues[8];
+        m_pViewSplitter->SetSashPosition(aPosValues[7]);
+
+        m_pLocalSplitter->SetSashPosition(aPosValues[9]);
+        m_pRemoteSplitter->SetSashPosition(aPosValues[10]);
+    }
+    delete [] aValues;
+
   wxString localDir = COptions::Get()->GetOption(OPTION_LASTLOCALDIR);
   if (!m_pState->SetLocalDir(localDir))
     m_pState->SetLocalDir(_T("/"));
@@ -750,6 +783,35 @@
 
 void CMainFrame::OnClose(wxCloseEvent &event)
 {
+  wxString posString;
+    // is_maximized
+    locations += wxString::Format(_T("%d "), IsMaximized() ? 1 : 0);
+    int x, y;
+    // pos_x pos_y
+    GetPosition(&x, &y);
+    posString += wxString::Format(_T("%d %d "), x, y);
+    // pos_width pos_height
+    GetClientSize(&x, &y);
+    posString += wxString::Format(_T("%d %d "), x, y);
+    // top_pos
+    posString += wxString::Format(_T("%d "), m_pTopSplitter->GetSashPosition());
+    // bottom_height
+  m_pBottomSplitter->GetClientSize(&x, &y);
+    posString += wxString::Format(_T("%d "), y - m_pBottomSplitter->GetSashPosition());
+    // view_pos
+    posString += wxString::Format(_T("%d "), m_pViewSplitter->GetSashPosition());
+    // view_height
+  m_pViewSplitter->GetClientSize(&x, &y);
+  if (COptions::Get()->GetOptionVal(OPTION_FILEPANE_LAYOUT) != 1)
+        posString += wxString::Format(_T("%d "), x);
+  else
+        posString += wxString::Format(_T("%d "), y);
+    // local_pos
+    posString += wxString::Format(_T("%d "), m_pLocalSplitter->GetSashPosition());
+    // remote_pos
+    posString += wxString::Format(_T("%d "), m_pRemoteSplitter->GetSashPosition());
+  COptions::Get()->SetOption(OPTION_WINDOW_POSITION, posString);
+
   Show(false);
   m_bQuit = true;
   delete m_pSendLed;
diff -Nur Filezilla3/src/interface/Options.cpp Filezilla3.patch/src/interface/Options.cpp
--- Filezilla3/src/interface/Options.cpp  Mon Aug 13 14:01:21 2007
+++ Filezilla3.patch/src/interface/Options.cpp  Mon Aug 13 16:59:12 2007
@@ -81,7 +81,8 @@
   { "Queue successful autoclear", number, _T("0") },
   { "Queue column widths", string, _T("") },
   { "Local filelist colwidths", string, _T("") },
-  { "Remote filelist colwidths", string, _T("") }
+  { "Remote filelist colwidths", string, _T("") },
+  { "Window position and size", string, _T("") }
 };
 
 COptions::COptions()
@@ -195,7 +196,7 @@
 {
   if (!SetOptionNoSave(nID, value))
     return false;
-  
+
   if (m_pXmlFile)
     m_pXmlFile->Save();
 
@@ -416,7 +417,7 @@
     return;
 
   TiXmlElement *element = m_pXmlFile->GetElement();
-  
+
   while (path != _T(""))
   {
     wxString sub;
diff -Nur Filezilla3/src/interface/Options.h Filezilla3.patch/src/interface/Options.h
--- Filezilla3/src/interface/Options.h  Mon Aug 13 14:01:21 2007
+++ Filezilla3.patch/src/interface/Options.h  Mon Aug 13 16:58:26 2007
@@ -35,6 +35,7 @@
   OPTION_QUEUE_COLUMN_WIDTHS,
   OPTION_LOCALFILELIST_COLUMN_WIDTHS,
   OPTION_REMOTEFILELIST_COLUMN_WIDTHS,
+  OPTION_WINDOW_POSITION,
 
   // Has to be last element
   OPTIONS_NUM
@@ -57,7 +58,7 @@
 
   virtual bool SetOption(unsigned int nID, int value);
   virtual bool SetOption(unsigned int nID, wxString value);
-  
+
   bool SetOptionNoSave(unsigned int nID, int value);
   bool SetOptionNoSave(unsigned int nID, wxString value);
 
@@ -72,7 +73,7 @@
 
   void SaveColumnWidths(const wxListCtrl* const pListCtrl, unsigned int optionId);
   bool ReadColumnWidths(unsigned int optionId, unsigned int count, unsigned long* widths);
-  
+
 protected:
   COptions();
   virtual ~COptions();