summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUILD/Changelog.txt6
-rw-r--r--BUILD/Languages/chinese_traditional.lng22
-rw-r--r--BUILD/Resources.datbin294348 -> 294245 bytes
-rw-r--r--RealtimeSync/main_dlg.cpp2
-rw-r--r--RealtimeSync/watcher.cpp4
-rw-r--r--library/process_xml.cpp4
-rw-r--r--shared/custom_tooltip.cpp4
-rw-r--r--ui/gui_generated.cpp44
-rw-r--r--version/version.h2
-rw-r--r--version/version.rc4
10 files changed, 49 insertions, 43 deletions
diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt
index 97e98126..5cc1db55 100644
--- a/BUILD/Changelog.txt
+++ b/BUILD/Changelog.txt
@@ -2,6 +2,12 @@
|FreeFileSync|
--------------
+Changelog v3.11
+---------------
+Fixed migration issue: reasonable default value for number of folder pairs
+Better message box background color
+
+
Changelog v3.10
---------------
Automatically solve daylight saving time and time zone shift issues on FAT/FAT32 (finally)
diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index 6e36eb07..d8a23a7a 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -273,9 +273,9 @@ Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administ
Copy to clipboard\tCTRL+C
複製到剪貼簿\tCTRL+C
Copying new Symbolic Link %x to %y
-
+複製符號連結 %x 到 %y
Copying new file %x to %y
-
+複製新檔案 %x 到 %y
Could not determine volume name for file:
無法判斷此檔案的卷標名稱：
Could not initialize directory monitoring:
@@ -360,6 +360,8 @@ Elements remaining:
剩餘要素：
Email
信箱
+Encode extended time information: %x
+
Endless loop when traversing directory:
當遍歷目錄時無限循環：
Error
@@ -403,7 +405,7 @@ Error reading from synchronization database:
Error resolving symbolic link:
解决符號連結錯誤：
Error setting directory lock:
-
+設定目錄鎖錯誤：
Error setting privilege:
設定權限錯誤：
Error starting Volume Shadow Copy Service!
@@ -493,7 +495,7 @@ Free disk space available:
FreeFileSync Batch Job
FreeFileSync 批次處理作業
FreeFileSync at Sourceforge
-FreeFileSync at Sourceforge
+FreeFileSync 在 Sourceforge
FreeFileSync batch file
FreeFileSync 批次檔
FreeFileSync configuration
@@ -555,7 +557,7 @@ Homepage
Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically.
對兩邊使用同一個資料庫的識別和傳送更改。自動檢測刪除和衝突部份。
Idle time between detection of last change and execution of command line in seconds
-
+上次更改的檢測和執行命令列之間以秒為單位的閒置時間
If you like FFS
如果你喜歡 FFS
Ignore
@@ -603,7 +605,7 @@ Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit v
Match case
區分大小寫
Minimum Idle Time
-
+最小閒置時間
Mirror ->>
鏡像 ->>
Mirror backup of left folder: Right folder will be overwritten and exactly match left folder after synchronization.
@@ -659,9 +661,9 @@ Operation:
Overview
摘要
Overwriting Symbolic Link %x in %y
-
+覆蓋符號連結 %x 在 %y
Overwriting file %x in %y
-
+覆蓋檔案 %x 在 %y
Pause
暫停
Paused
@@ -802,8 +804,6 @@ Synchronization completed with errors!
同步完成但有錯誤！
Synchronization settings
同步設定
-Synchronization status
-同步狀態
Synchronize all .doc, .zip and .exe files except everything in subfolder \"temp\".
同步所有 .doc, .zip 和 .exe 檔案，除了\"temp\"中的一切。
Synchronize...
@@ -865,7 +865,7 @@ Volume name %x not part of filename %y!
Waiting for all directories to become available...
等待所有目錄變為可用...
Waiting while directory is locked (%x)...
-
+等待目錄被鎖定(%x)...
Warning
警告
Warning: Synchronization failed for %x item(s):
diff --git a/BUILD/Resources.dat b/BUILD/Resources.dat
index be5fa75e..e4594b68 100644
--- a/BUILD/Resources.dat
+++ b/BUILD/Resources.dat
Binary files differ
diff --git a/RealtimeSync/main_dlg.cpp b/RealtimeSync/main_dlg.cpp
index 447f1f01..3f22dcc3 100644
--- a/RealtimeSync/main_dlg.cpp
+++ b/RealtimeSync/main_dlg.cpp
@@ -339,7 +339,7 @@ void MainDialog::OnRemoveTopFolder(wxCommandEvent& event)
{
if (dirNamesExtra.size() > 0)
{
- const wxString topDir = (*dirNamesExtra.begin())->getName().c_str();
+ const wxString topDir = zToWx((*dirNamesExtra.begin())->getName());
dirNameFirst->setName(wxToZ(topDir));
diff --git a/RealtimeSync/watcher.cpp b/RealtimeSync/watcher.cpp
index cf2791ad..e9793545 100644
--- a/RealtimeSync/watcher.cpp
+++ b/RealtimeSync/watcher.cpp
@@ -64,7 +64,7 @@ public:
virtual ReturnValDir onDir(const Zchar* shortName, const Zstring& fullName)
{
m_dirs.push_back(fullName.c_str());
- return ReturnValDir(Loki::Int2Type<ReturnValDir::TRAVERSING_DIR_CONTINUE>(), this);
+ return ReturnValDir(Loki::Int2Type<ReturnValDir::TRAVERSING_DIR_CONTINUE>(), *this);
}
virtual void onError(const wxString& errorText)
{
@@ -247,7 +247,7 @@ rts::WaitResult rts::waitForChanges(const std::vector<Zstring>& dirNames, WaitCa
try //get all subdirectories
{
DirsOnlyTraverser traverser(fullDirList);
- ffs3::traverseFolder(formattedDir, false, &traverser); //don't traverse into symlinks (analog to windows build)
+ ffs3::traverseFolder(formattedDir, false, traverser); //don't traverse into symlinks (analog to windows build)
}
catch (const ffs3::FileError&)
{
diff --git a/library/process_xml.cpp b/library/process_xml.cpp
index c7597247..bccd8e3a 100644
--- a/library/process_xml.cpp
+++ b/library/process_xml.cpp
@@ -464,8 +464,8 @@ void FfsXmlParser::readXmlGlobalSettings(xmlAccess::XmlGlobalSettings& outputCfg
size_t folderPairMax = 0;
readXmlElementLogging("FolderPairsMax", mainWindow, folderPairMax);
- outputCfg.gui.addFolderPairCountMax = std::max(static_cast<size_t>(2), folderPairMax) - 1; //map folderPairMax to additionalFolderPairMax
-
+ if (folderPairMax != 0) //if reading fails, leave at default
+ outputCfg.gui.addFolderPairCountMax = std::max(static_cast<size_t>(2), folderPairMax) - 1; //map folderPairMax to additionalFolderPairMax
//###########################################################
//read column attributes
diff --git a/shared/custom_tooltip.cpp b/shared/custom_tooltip.cpp
index b915b226..be2d11b5 100644
--- a/shared/custom_tooltip.cpp
+++ b/shared/custom_tooltip.cpp
@@ -8,7 +8,7 @@
#include <wx/stattext.h>
#include <wx/sizer.h>
#include <wx/statbmp.h>
-
+#include <wx/settings.h>
class CustomTooltip::PopupFrameGenerated : public wxFrame
{
@@ -34,7 +34,7 @@ CustomTooltip::PopupFrameGenerated::PopupFrameGenerated(
long style ) : wxFrame(parent, id, title, pos, size, style)
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
- this->SetBackgroundColour( wxColour( 255, 255, 255 ) );
+ this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
wxBoxSizer* bSizer158;
bSizer158 = new wxBoxSizer( wxHORIZONTAL );
diff --git a/ui/gui_generated.cpp b/ui/gui_generated.cpp
index 659a40f3..e39d8705 100644
--- a/ui/gui_generated.cpp
+++ b/ui/gui_generated.cpp
@@ -570,7 +570,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const
m_textCtrlCreate = new wxTextCtrl( m_panelSyncPreview, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
m_textCtrlCreate->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
- m_textCtrlCreate->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+ m_textCtrlCreate->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_textCtrlCreate->SetToolTip( _("Number of files and directories that will be created") );
fgSizer5->Add( m_textCtrlCreate, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -582,7 +582,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const
m_textCtrlDelete = new wxTextCtrl( m_panelSyncPreview, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
m_textCtrlDelete->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
- m_textCtrlDelete->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+ m_textCtrlDelete->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_textCtrlDelete->SetToolTip( _("Number of files and directories that will be deleted") );
fgSizer5->Add( m_textCtrlDelete, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -601,7 +601,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const
m_textCtrlUpdate = new wxTextCtrl( m_panelSyncPreview, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
m_textCtrlUpdate->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
- m_textCtrlUpdate->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+ m_textCtrlUpdate->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_textCtrlUpdate->SetToolTip( _("Number of files that will be overwritten") );
fgSizer6->Add( m_textCtrlUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -613,7 +613,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const
m_textCtrlData = new wxTextCtrl( m_panelSyncPreview, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
- m_textCtrlData->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+ m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
fgSizer6->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -1576,7 +1576,7 @@ CompareStatusGenerated::CompareStatusGenerated( wxWindow* parent, wxWindowID id,
bSizer48->Add( m_staticText30, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
m_textCtrlStatus = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
- m_textCtrlStatus->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+ m_textCtrlStatus->SetBackgroundColour( wxColour( 208, 208, 208 ) );
bSizer48->Add( m_textCtrlStatus, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
@@ -2207,7 +2207,7 @@ SyncStatusDlgGenerated::SyncStatusDlgGenerated( wxWindow* parent, wxWindowID id,
bSizer27->Add( bSizer31, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
- m_textCtrlInfo->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+ m_textCtrlInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
bSizer27->Add( m_textCtrlInfo, 3, wxEXPAND|wxALL, 5 );
@@ -2367,7 +2367,7 @@ HelpDlgGenerated::HelpDlgGenerated( wxWindow* parent, wxWindowID id, const wxStr
bSizer70->Add( m_staticText61, 0, wxALL, 5 );
m_treeCtrl1 = new wxTreeCtrl( m_scrolledWindow1, wxID_ANY, wxDefaultPosition, wxSize( -1,175 ), wxTR_DEFAULT_STYLE );
- m_treeCtrl1->SetBackgroundColour( wxColour( 237, 236, 235 ) );
+ m_treeCtrl1->SetBackgroundColour( wxColour( 208, 208, 208 ) );
bSizer70->Add( m_treeCtrl1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
@@ -2421,7 +2421,7 @@ HelpDlgGenerated::HelpDlgGenerated( wxWindow* parent, wxWindowID id, const wxStr
bSizer74->Add( m_staticText66, 0, wxALL, 5 );
m_treeCtrl2 = new wxTreeCtrl( m_scrolledWindow5, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE );
- m_treeCtrl2->SetBackgroundColour( wxColour( 237, 236, 235 ) );
+ m_treeCtrl2->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_treeCtrl2->SetMinSize( wxSize( -1,130 ) );
bSizer74->Add( m_treeCtrl2, 0, wxALL|wxEXPAND, 5 );
@@ -2513,7 +2513,7 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
m_scrolledWindowCodeInfo = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
m_scrolledWindowCodeInfo->SetScrollRate( 5, 5 );
- m_scrolledWindowCodeInfo->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+ m_scrolledWindowCodeInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_scrolledWindowCodeInfo->SetMinSize( wxSize( -1,120 ) );
bSizerCodeInfo = new wxBoxSizer( wxVERTICAL );
@@ -2530,7 +2530,7 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
m_hyperlink21 = new wxHyperlinkCtrl( m_scrolledWindowCodeInfo, wxID_ANY, _("- ZenJu -"), wxT("mailto:zhnmju123@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
m_hyperlink21->SetFont( wxFont( 10, 74, 93, 92, false, wxT("Segoe Print") ) );
- m_hyperlink21->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+ m_hyperlink21->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_hyperlink21->SetToolTip( _("zhnmju123@gmx.de") );
bSizerCodeInfo->Add( m_hyperlink21, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
@@ -2542,7 +2542,7 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
m_scrolledWindowTranslators = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
m_scrolledWindowTranslators->SetScrollRate( 5, 5 );
- m_scrolledWindowTranslators->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+ m_scrolledWindowTranslators->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_scrolledWindowTranslators->SetMinSize( wxSize( -1,140 ) );
m_scrolledWindowTranslators->SetMaxSize( wxSize( -1,145 ) );
@@ -2704,7 +2704,7 @@ ErrorDlgGenerated::ErrorDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
- m_textCtrl8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+ m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
@@ -2779,7 +2779,7 @@ WarningDlgGenerated::WarningDlgGenerated( wxWindow* parent, wxWindowID id, const
bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
- m_textCtrl8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+ m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
@@ -2852,7 +2852,7 @@ QuestionDlgGenerated::QuestionDlgGenerated( wxWindow* parent, wxWindowID id, con
bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
- m_textCtrl8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+ m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
@@ -2956,7 +2956,7 @@ DeleteDlgGenerated::DeleteDlgGenerated( wxWindow* parent, wxWindowID id, const w
bSizer24->Add( bSizer99, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
m_textCtrlMessage = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
- m_textCtrlMessage->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+ m_textCtrlMessage->SetBackgroundColour( wxColour( 208, 208, 208 ) );
bSizer24->Add( m_textCtrlMessage, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
@@ -3542,7 +3542,7 @@ SyncPreviewDlgGenerated::SyncPreviewDlgGenerated( wxWindow* parent, wxWindowID i
m_textCtrlCreateL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
m_textCtrlCreateL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
- m_textCtrlCreateL->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+ m_textCtrlCreateL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_textCtrlCreateL->SetToolTip( _("Number of files and directories that will be created") );
fgSizer5->Add( m_textCtrlCreateL, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -3554,7 +3554,7 @@ SyncPreviewDlgGenerated::SyncPreviewDlgGenerated( wxWindow* parent, wxWindowID i
m_textCtrlUpdateL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
m_textCtrlUpdateL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
- m_textCtrlUpdateL->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+ m_textCtrlUpdateL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_textCtrlUpdateL->SetToolTip( _("Number of files that will be overwritten") );
fgSizer5->Add( m_textCtrlUpdateL, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -3566,7 +3566,7 @@ SyncPreviewDlgGenerated::SyncPreviewDlgGenerated( wxWindow* parent, wxWindowID i
m_textCtrlDeleteL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
m_textCtrlDeleteL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
- m_textCtrlDeleteL->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+ m_textCtrlDeleteL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_textCtrlDeleteL->SetToolTip( _("Number of files and directories that will be deleted") );
fgSizer5->Add( m_textCtrlDeleteL, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -3586,21 +3586,21 @@ SyncPreviewDlgGenerated::SyncPreviewDlgGenerated( wxWindow* parent, wxWindowID i
m_textCtrlCreateR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
m_textCtrlCreateR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
- m_textCtrlCreateR->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+ m_textCtrlCreateR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_textCtrlCreateR->SetToolTip( _("Number of files and directories that will be created") );
fgSizer51->Add( m_textCtrlCreateR, 0, wxALIGN_CENTER_VERTICAL, 5 );
m_textCtrlUpdateR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
m_textCtrlUpdateR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
- m_textCtrlUpdateR->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+ m_textCtrlUpdateR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_textCtrlUpdateR->SetToolTip( _("Number of files that will be overwritten") );
fgSizer51->Add( m_textCtrlUpdateR, 0, wxALIGN_CENTER_VERTICAL, 5 );
m_textCtrlDeleteR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
m_textCtrlDeleteR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
- m_textCtrlDeleteR->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+ m_textCtrlDeleteR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_textCtrlDeleteR->SetToolTip( _("Number of files and directories that will be deleted") );
fgSizer51->Add( m_textCtrlDeleteR, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -3625,7 +3625,7 @@ SyncPreviewDlgGenerated::SyncPreviewDlgGenerated( wxWindow* parent, wxWindowID i
m_textCtrlData = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
- m_textCtrlData->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+ m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
bSizer156->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
diff --git a/version/version.h b/version/version.h
index 5094bf93..0fae15a7 100644
--- a/version/version.h
+++ b/version/version.h
@@ -2,5 +2,5 @@
namespace ffs3
{
- const wxString currentVersion = wxT("3.10"); //internal linkage!
+ const wxString currentVersion = wxT("3.11"); //internal linkage!
}
diff --git a/version/version.rc b/version/version.rc
index 5f56af8c..f0065a5c 100644
--- a/version/version.rc
+++ b/version/version.rc
@@ -1,2 +1,2 @@
-#define VER_FREEFILESYNC 3,10,0,0
-#define VER_FREEFILESYNC_STR "3.10\0"
+#define VER_FREEFILESYNC 3,11,0,0
+#define VER_FREEFILESYNC_STR "3.11\0"
bgstack15