diff options
Diffstat (limited to 'freefilesync/debian/patches/ffs_traditional_view.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_traditional_view.patch | 308 |
1 files changed, 134 insertions, 174 deletions
diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch index e602033..173842f 100644 --- a/freefilesync/debian/patches/ffs_traditional_view.patch +++ b/freefilesync/debian/patches/ffs_traditional_view.patch @@ -1,16 +1,28 @@ -diff --git a/FreeFileSync/Source/ui/file_grid.cpp b/FreeFileSync/Source/ui/file_grid.cpp -index 4ee72b97..d9b9a4c7 100644 ---- a/FreeFileSync/Source/ui/file_grid.cpp -+++ b/FreeFileSync/Source/ui/file_grid.cpp -@@ -437,6 +437,7 @@ private: +diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/file_grid.cpp 11.2-1-trad3/FreeFileSync/Source/ui/file_grid.cpp +--- 11.2-1/FreeFileSync/Source/ui/file_grid.cpp 2020-10-02 14:39:05.289463269 -0400 ++++ 11.2-1-trad3/FreeFileSync/Source/ui/file_grid.cpp 2020-10-02 20:48:25.047194116 -0400 +@@ -446,8 +446,10 @@ + case ItemPathFormat::name: + return utfTo<std::wstring>(fsObj->getItemName<side>()); case ItemPathFormat::relative: ++ case ItemPathFormat::tradrel: return utfTo<std::wstring>(fsObj->getRelativePath<side>()); case ItemPathFormat::full: + case ItemPathFormat::traditional: return AFS::getDisplayPath(fsObj->getAbstractPath<side>()); } assert(false); -@@ -615,6 +616,16 @@ private: +@@ -529,7 +531,8 @@ + //---------------------------------------------------------------------------------- + wxDCPenChanger dummy(dc, wxPen(row == pdi.groupLastRow - 1 /*last group item*/ ? + getColorGridLine() : getDefaultBackgroundColorAlternating(pdi.groupIdx % 2 != 0), fastFromDIP(1))); +- dc.DrawLine(rect.GetBottomLeft(), rect.GetBottomRight() + wxPoint(1, 0)); ++ if (itemPathFormat_ != ItemPathFormat::traditional && itemPathFormat_ != ItemPathFormat::tradrel) ++ dc.DrawLine(rect.GetBottomLeft(), rect.GetBottomRight() + wxPoint(1, 0)); + } + + +@@ -628,6 +631,24 @@ else //=> BaseFolderPair groupParentFolder = AFS::getDisplayPath(pdi.fsObj->base().getAbstractPath<side>()); break; @@ -24,248 +36,195 @@ index 4ee72b97..d9b9a4c7 100644 + else //=> BaseFolderPair + groupParentFolder = AFS::getDisplayPath(pdi.fsObj->base().getAbstractPath<side>()); + break; ++ case ItemPathFormat::tradrel: ++ if (pdi.folderGroupObj) ++ { ++ groupName = utfTo<std::wstring>(pdi.folderGroupObj ->template getItemName <side>()); ++ groupParentFolder = utfTo<std::wstring>(pdi.folderGroupObj->parent().template getRelativePath<side>()) + \ ++ utfTo<std::wstring>(pdi.folderGroupObj ->template getItemName<side>()); ++ } ++ break; } - //add slashes for better readability - assert(!contains(groupParentFolder, L'/') || !contains(groupParentFolder, L'\\')); -@@ -650,72 +661,84 @@ private: - int widthGroupName = groupName .empty() ? 0 : ((iconMgr ? iconSize + gridGap_ : 0) + getTextExtentBuffered(dc, groupName).x + (iconMgr ? gridGap_ : 0)); - int widthGroupItems = (iconMgr ? iconSize + gridGap_ : 0) + groupItemNamesWidth; -- //not enough space? => collapse -- if (int excessWidth = gridGap_ + widthGroupParent + widthGroupName + widthGroupItems - maxWidth; -- excessWidth > 0) + //path components should follow the app layout direction and are NOT a single piece of text! +@@ -655,6 +676,31 @@ + int widthGroupName = groupName .empty() ? 0 : (iconSize + gridGap_ + getTextExtentBuffered(dc, groupName).x + 2 * gridGap_); + int widthGroupItems = widthGroupSep + (drawFileIcons ? iconSize + gridGap_ : 0) + groupItemNamesWidth; + ++ // start trad patch ++ ++ //add slashes for better readability ++ assert(!contains(groupParentFolder, L'/') || !contains(groupParentFolder, L'\\')); ++ const wchar_t groupParentSep = contains(groupParentFolder, L'/') ? L'/' : (contains(groupParentFolder, L'\\') ? L'\\' : FILE_NAME_SEPARATOR); ++ + switch (itemPathFormat_) - { -- if (multiItemGroup && !groupParentFolder.empty() && !groupName.empty()) -- { -- //1. render group components on two rows -- stackedGroupRender = true; -- -- if (!endsWith(groupParentFolder, L'/' ) && -- !endsWith(groupParentFolder, L'\\')) -- groupParentFolder += groupParentSep; -- groupParentFolder += ELLIPSIS; -- -- widthGroupParent = getTextExtentBuffered(dc, groupParentFolder).x + gridGap_; -- -- int widthGroupStack = std::max(widthGroupParent, widthGroupName); -- excessWidth = gridGap_ + widthGroupStack + widthGroupItems - maxWidth; -- -- if (excessWidth > 0) -- { -- //2. shrink group stack (group parent only) -- if (widthGroupParent > widthGroupName) -- { -- widthGroupStack = widthGroupParent = std::max(widthGroupParent - excessWidth, widthGroupName); -- excessWidth = gridGap_ + widthGroupStack + widthGroupItems - maxWidth; -- } -- if (excessWidth > 0) -- { -- //3. shrink item rendering -- widthGroupItems = std::max(widthGroupItems - excessWidth, (iconMgr ? iconSize + gridGap_ : 0) + ellipsisWidth); -- excessWidth = gridGap_ + widthGroupStack + widthGroupItems - maxWidth; -- -- if (excessWidth > 0) -- { -- //4. shrink group stack -- widthGroupStack = std::max(widthGroupStack - excessWidth, (iconMgr ? iconSize + gridGap_ : 0) + ellipsisWidth + (iconMgr ? gridGap_ : 0)); -- -- widthGroupParent = std::min(widthGroupParent, widthGroupStack); -- widthGroupName = std::min(widthGroupName, widthGroupStack); -- } -- } -- } -- } -- else //group details on single row -- { -- //1. shrink group parent -- if (!groupParentFolder.empty()) -- { -- widthGroupParent = std::max(widthGroupParent - excessWidth, ellipsisWidth + (iconMgr ? gridGap_ : 0)); -- excessWidth = gridGap_ + widthGroupParent + widthGroupName + widthGroupItems - maxWidth; -- } -- if (excessWidth > 0) -- { -- //2. shrink item rendering -- widthGroupItems = std::max(widthGroupItems - excessWidth, (iconMgr ? iconSize + gridGap_ : 0) + ellipsisWidth); -- excessWidth = gridGap_ + widthGroupParent + widthGroupName + widthGroupItems - maxWidth; -- -- if (excessWidth > 0) -- //3. shrink group name -- if (!groupName.empty()) -- widthGroupName = std::max(widthGroupName - excessWidth, (iconMgr ? iconSize + gridGap_ : 0) + ellipsisWidth + (iconMgr ? gridGap_ : 0)); -- } -- } ++ { + case ItemPathFormat::traditional: -+ //widthGroupName = 0; -+ widthGroupParent -= widthGroupName ; ++ case ItemPathFormat::tradrel: ++ widthGroupParent -= widthGroupName - getTextExtentBuffered(dc, utfTo<std::wstring>(FILE_NAME_SEPARATOR)).x; ++ ++ if (!endsWith(groupParentFolder, L'/' ) && //e.g. ftp://server/ ++ !endsWith(groupParentFolder, L'\\') && /*e.g. C:\ */ ++ groupParentFolder.size() > 0 ) ++ groupParentFolder += groupParentSep; + break; + case ItemPathFormat::name: + case ItemPathFormat::relative: + case ItemPathFormat::full: + default: -+ // the insane logic of the new views -+ //not enough space? => collapse -+ if (int excessWidth = gridGap_ + widthGroupParent + widthGroupName + widthGroupItems - maxWidth; -+ excessWidth > 0) -+ { -+ if (multiItemGroup && !groupParentFolder.empty() && !groupName.empty()) -+ { -+ //1. render group components on two rows -+ stackedGroupRender = true; ++ // the insane logic of the new views ++ // but preserve the original tabbing, to make the patch easier. ++ // but with the "add slashes" paragraph 1 moved to above this switch statement! + -+ if (!endsWith(groupParentFolder, L'/' ) && -+ !endsWith(groupParentFolder, L'\\')) -+ groupParentFolder += groupParentSep; -+ groupParentFolder += ELLIPSIS; -+ -+ widthGroupParent = getTextExtentBuffered(dc, groupParentFolder).x + gridGap_; -+ -+ int widthGroupStack = std::max(widthGroupParent, widthGroupName); -+ excessWidth = gridGap_ + widthGroupStack + widthGroupItems - maxWidth; -+ -+ if (excessWidth > 0) -+ { -+ //2. shrink group stack (group parent only) -+ if (widthGroupParent > widthGroupName) -+ { -+ widthGroupStack = widthGroupParent = std::max(widthGroupParent - excessWidth, widthGroupName); -+ excessWidth = gridGap_ + widthGroupStack + widthGroupItems - maxWidth; -+ } -+ if (excessWidth > 0) -+ { -+ //3. shrink item rendering -+ widthGroupItems = std::max(widthGroupItems - excessWidth, (iconMgr ? iconSize + gridGap_ : 0) + ellipsisWidth); -+ excessWidth = gridGap_ + widthGroupStack + widthGroupItems - maxWidth; -+ -+ if (excessWidth > 0) -+ { -+ //4. shrink group stack -+ widthGroupStack = std::max(widthGroupStack - excessWidth, (iconMgr ? iconSize + gridGap_ : 0) + ellipsisWidth + (iconMgr ? gridGap_ : 0)); -+ -+ widthGroupParent = std::min(widthGroupParent, widthGroupStack); -+ widthGroupName = std::min(widthGroupName, widthGroupStack); -+ } -+ } -+ } -+ } -+ else //group details on single row -+ { -+ //1. shrink group parent -+ if (!groupParentFolder.empty()) -+ { -+ widthGroupParent = std::max(widthGroupParent - excessWidth, ellipsisWidth + (iconMgr ? gridGap_ : 0)); -+ excessWidth = gridGap_ + widthGroupParent + widthGroupName + widthGroupItems - maxWidth; -+ } -+ if (excessWidth > 0) -+ { -+ //2. shrink item rendering -+ widthGroupItems = std::max(widthGroupItems - excessWidth, (iconMgr ? iconSize + gridGap_ : 0) + ellipsisWidth); -+ excessWidth = gridGap_ + widthGroupParent + widthGroupName + widthGroupItems - maxWidth; -+ -+ if (excessWidth > 0) -+ //3. shrink group name -+ if (!groupName.empty()) -+ widthGroupName = std::max(widthGroupName - excessWidth, (iconMgr ? iconSize + gridGap_ : 0) + ellipsisWidth + (iconMgr ? gridGap_ : 0)); -+ } -+ } -+ } -+ break; - } + //not enough space? => collapse + if (int excessWidth = gridGap_ + widthGroupParent + widthGroupName + widthGroupItems - maxWidth; + excessWidth > 0) +@@ -664,10 +710,6 @@ + //1. render group components on two rows + stackedGroupRender = true; + +- //add slashes for better readability +- assert(!contains(groupParentFolder, L'/') || !contains(groupParentFolder, L'\\')); +- const wchar_t groupParentSep = contains(groupParentFolder, L'/') ? L'/' : (contains(groupParentFolder, L'\\') ? L'\\' : FILE_NAME_SEPARATOR); - + if (!endsWith(groupParentFolder, L'/' ) && //e.g. ftp://server/ + !endsWith(groupParentFolder, L'\\')) /*e.g. C:\ */ + groupParentFolder += groupParentSep; +@@ -725,6 +767,11 @@ + } + } + ++ // end of original section, and back to the trad patch! ++ break; ++ } ++ // and end the addition for trad patch ++ return { itemName, -@@ -786,6 +809,9 @@ private: +@@ -793,6 +840,9 @@ rectGroup = rectGroupParent = rectGroupName = rectTmp; rectGroupParent.width = widthGroupParent; + // re-add back the width of groupname so that the directory name is clickable -+ if (itemPathFormat_ == ItemPathFormat::traditional) ++ if (itemPathFormat_ == ItemPathFormat::traditional || itemPathFormat_ == ItemPathFormat::tradrel) + rectGroupParent.width += widthGroupName; rectGroupName .width = widthGroupName; if (stackedGroupRender) -@@ -837,7 +863,7 @@ private: +@@ -829,7 +879,8 @@ + if (row == pdi.groupLastRow - 1 /*last group item*/) //restore the group separation line we just cleared + { + wxDCPenChanger dummy(dc, wxPen(getColorGridLine(), fastFromDIP(1))); +- dc.DrawLine(rectGroup.GetBottomLeft(), rectGroup.GetBottomRight() + wxPoint(1, 0)); ++ if (itemPathFormat_ != ItemPathFormat::traditional && itemPathFormat_ != ItemPathFormat::tradrel) ++ dc.DrawLine(rectGroup.GetBottomLeft(), rectGroup.GetBottomRight() + wxPoint(1, 0)); + } + } + +@@ -844,7 +895,7 @@ dc.GradientFillLinear(rectNav, getColorSelectionGradientFrom(), backCol, wxEAST); } -- if (!groupName.empty() && row == groupBeginRow) -+ if (!(itemPathFormat_ == ItemPathFormat::traditional) && !groupName.empty() && row == groupBeginRow) +- if (!groupName.empty() && row == groupFirstRow) ++ if (!(itemPathFormat_ == ItemPathFormat::traditional || itemPathFormat_ == ItemPathFormat::tradrel) && !groupName.empty() && row == groupFirstRow) { wxDCTextColourChanger textColorGroupName(dc); if (static_cast<HoverAreaGroup>(rowHover) == HoverAreaGroup::groupName) -@@ -855,9 +881,9 @@ private: +@@ -865,9 +916,9 @@ drawCellText(dc, rectGroupName, groupName, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &getTextExtentBuffered(dc, groupName)); } - if (!groupParentFolder.empty() && -+ if (itemPathFormat_ == ItemPathFormat::traditional || (!groupParentFolder.empty() && - ((stackedGroupRender && row == groupBeginRow + 1) || -- (!stackedGroupRender && row == groupBeginRow))) -+ (!stackedGroupRender && row == groupBeginRow)))) ++ if (itemPathFormat_ == ItemPathFormat::traditional || itemPathFormat_ == ItemPathFormat::tradrel || (!groupParentFolder.empty() && + (( stackedGroupRender && row == groupFirstRow + 1) || +- (!stackedGroupRender && row == groupFirstRow))) ++ (!stackedGroupRender && row == groupFirstRow)))) { drawCellText(dc, rectGroupParent, groupParentFolder, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &getTextExtentBuffered(dc, groupParentFolder)); } -@@ -1020,6 +1046,8 @@ private: +@@ -876,7 +927,8 @@ + if (!groupParentFolder.empty() || !groupName.empty()) + { + wxDCPenChanger dummy(dc, wxPen(getColorGridLine(), fastFromDIP(1))); +- dc.DrawLine(rectGroupItems.GetTopLeft(), rectGroupItems.GetBottomLeft() + wxPoint(0, 1)); //draws half-open range! ++ if (itemPathFormat_ != ItemPathFormat::traditional && itemPathFormat_ != ItemPathFormat::tradrel) ++ dc.DrawLine(rectGroupItems.GetTopLeft(), rectGroupItems.GetBottomLeft() + wxPoint(0, 1)); //draws half-open range! + rectGroupItems.x += fastFromDIP(1) + gridGap_; + rectGroupItems.width -= fastFromDIP(1) + gridGap_; + } +@@ -1040,6 +1092,10 @@ return _("Relative path"); case ItemPathFormat::full: return _("Full path"); + case ItemPathFormat::traditional: + return _("Traditional"); ++ case ItemPathFormat::tradrel: ++ return _("Trad. relative"); } assert(false); break; -diff --git a/FreeFileSync/Source/ui/file_grid_attr.h b/FreeFileSync/Source/ui/file_grid_attr.h -index 324619c1..7511a1ab 100644 ---- a/FreeFileSync/Source/ui/file_grid_attr.h -+++ b/FreeFileSync/Source/ui/file_grid_attr.h -@@ -79,6 +79,7 @@ enum class ItemPathFormat +diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/file_grid_attr.h 11.2-1-trad3/FreeFileSync/Source/ui/file_grid_attr.h +--- 11.2-1/FreeFileSync/Source/ui/file_grid_attr.h 2020-10-02 14:39:05.313463564 -0400 ++++ 11.2-1-trad3/FreeFileSync/Source/ui/file_grid_attr.h 2020-10-02 20:21:48.863111642 -0400 +@@ -79,6 +79,8 @@ name, relative, full, + traditional, ++ tradrel, }; const ItemPathFormat defaultItemPathFormatLeftGrid = ItemPathFormat::relative; -diff --git a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp -index 491b7321..2d5c20c3 100644 ---- a/FreeFileSync/Source/ui/main_dlg.cpp -+++ b/FreeFileSync/Source/ui/main_dlg.cpp -@@ -2716,6 +2716,7 @@ void MainDialog::onGridLabelContextRim(bool leftSide) +diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/main_dlg.cpp 11.2-1-trad3/FreeFileSync/Source/ui/main_dlg.cpp +--- 11.2-1/FreeFileSync/Source/ui/main_dlg.cpp 2020-10-02 20:49:11.487782099 -0400 ++++ 11.2-1-trad3/FreeFileSync/Source/ui/main_dlg.cpp 2020-10-02 20:22:02.191278722 -0400 +@@ -2710,6 +2710,8 @@ addFormatEntry(_("Item name" ), ItemPathFormat::name); addFormatEntry(_("Relative path"), ItemPathFormat::relative); addFormatEntry(_("Full path" ), ItemPathFormat::full); + addFormatEntry(_("Traditional" ), ItemPathFormat::traditional); ++ addFormatEntry(_("Trad. relative"),ItemPathFormat::tradrel); //---------------------------------------------------------------------------------------------- menu.addSeparator(); -diff -x .git -Naur 11.1-1/FreeFileSync/Source/config.cpp 11.1-2/FreeFileSync/Source/config.cpp ---- 11.1-1/FreeFileSync/Source/config.cpp 2020-09-01 19:07:43.715122167 -0400 -+++ 11.1-2/FreeFileSync/Source/config.cpp 2020-09-10 09:38:14.539542699 -0400 -@@ -528,6 +528,9 @@ +diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/config.cpp 11.2-1-trad3/FreeFileSync/Source/config.cpp +--- 11.2-1/FreeFileSync/Source/config.cpp 2020-10-02 14:39:05.233462578 -0400 ++++ 11.2-1-trad3/FreeFileSync/Source/config.cpp 2020-10-02 20:22:24.275555557 -0400 +@@ -528,6 +528,12 @@ case ItemPathFormat::full: output = "Full"; break; + case ItemPathFormat::traditional: + output = "Traditional"; + break; ++ case ItemPathFormat::tradrel: ++ output = "Trad. relative"; ++ break; } } -@@ -541,6 +545,8 @@ +@@ -541,6 +547,10 @@ value = ItemPathFormat::relative; else if (tmp == "Full") value = ItemPathFormat::full; + else if (tmp == "Traditional") + value = ItemPathFormat::traditional; ++ else if (tmp == "Trad. relative") ++ value = ItemPathFormat::tradrel; else return false; return true; -diff -x .git -Naur 11.1-1/FreeFileSync/Source/ui/file_view.cpp 11.1-2/FreeFileSync/Source/ui/file_view.cpp ---- 11.1-1/FreeFileSync/Source/ui/file_view.cpp 2020-09-01 19:07:43.719122215 -0400 -+++ 11.1-2/FreeFileSync/Source/ui/file_view.cpp 2020-09-10 09:40:11.609044834 -0400 -@@ -798,6 +798,7 @@ +diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/file_view.cpp 11.2-1-trad3/FreeFileSync/Source/ui/file_view.cpp +--- 11.2-1/FreeFileSync/Source/ui/file_view.cpp 2020-10-02 14:39:05.305463465 -0400 ++++ 11.2-1-trad3/FreeFileSync/Source/ui/file_view.cpp 2020-10-02 20:22:38.439733112 -0400 +@@ -798,11 +798,13 @@ + break; + + case ItemPathFormat::relative: ++ case ItemPathFormat::tradrel: + if ( ascending) std::sort(sortedRef_.begin(), sortedRef_.end(), LessRelativeFolder<true >(folderPairs_)); + else if (!ascending) std::sort(sortedRef_.begin(), sortedRef_.end(), LessRelativeFolder<false>(folderPairs_)); break; case ItemPathFormat::full: @@ -273,3 +232,4 @@ diff -x .git -Naur 11.1-1/FreeFileSync/Source/ui/file_view.cpp 11.1-2/FreeFileSy if ( ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath<true, LEFT_SIDE>(folderPairs_)); else if ( ascending && !onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath<true, RIGHT_SIDE>(folderPairs_)); else if (!ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath<false, LEFT_SIDE>(folderPairs_)); + |