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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
|
Version: 11.3
Date: 2020-11-01
Author: bgstack15@gmail.com
Message: restore a traditional view to FreeFileSync
diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.3-1/FreeFileSync/Source/ui/file_grid.cpp
--- 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 2020-11-01 17:14:27.531500950 -0500
+++ 11.3-1/FreeFileSync/Source/ui/file_grid.cpp 2020-11-01 22:52:14.590746142 -0500
@@ -493,8 +493,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);
@@ -654,6 +656,27 @@
else //=> BaseFolderPair
groupParentFolder = AFS::getDisplayPath(pdi.fsObj->base().getAbstractPath<side>());
break;
+
+ case ItemPathFormat::traditional:
+ if (auto groupFolder = dynamic_cast<const FolderPair*>(pdi.folderGroupObj))
+ {
+ groupName = utfTo<std::wstring>(groupFolder->template getItemName<side>());
+ groupParentFolder = AFS::getDisplayPath(groupFolder->parent().template getAbstractPath<side>()) + \
+ FILE_NAME_SEPARATOR + utfTo<std::wstring>(groupFolder->template getItemName<side>());
+ }
+ 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;
+
}
//path components should follow the app layout direction and are NOT a single piece of text!
@@ -684,6 +707,31 @@
int groupItemsWidth = groupSepWidth + (drawFileIcons ? gapSize_ + iconSize : 0) + gapSize_ + groupItemNamesWidth;
const int groupItemsMinWidth = groupSepWidth + (drawFileIcons ? gapSize_ + iconSize : 0) + gapSize_ + ellipsisWidth;
+ // start trad patch
+
+ // rearrange this one section
+ //add slashes for better readability + a wide gap for disambiguation
+ assert(!contains(groupParentFolder, L'/') || !contains(groupParentFolder, L'\\'));
+ const wchar_t groupParentSep = contains(groupParentFolder, L'/') ? L'/' : (contains(groupParentFolder, L'\\') ? L'\\' : FILE_NAME_SEPARATOR);
+
+ switch (itemPathFormat_)
+ {
+ case ItemPathFormat::traditional:
+ case ItemPathFormat::tradrel:
+ groupParentWidth -= groupNameWidth - 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
+ // but preserve the original tabbing, to make the patch easier.
+ // but with the "add slashes" paragraph 1 moved to above this switch statement!
+
//not enough space? => collapse
if (int excessWidth = groupParentWidth + groupNameWidth + groupItemsWidth - maxWidth;
excessWidth > 0)
@@ -693,10 +741,6 @@
//1. render group components on two rows
stackedGroupRender = true;
- //add slashes for better readability + a wide gap for disambiguation
- 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;
@@ -755,6 +799,11 @@
}
}
}
+
+ // end of original section, and back to the trad patch!
+ break;
+ }
+ // and end the addition for trad patch
return
{
@@ -873,6 +922,9 @@
rectGroup = rectGroupParent = rectGroupName = rectTmp;
rectGroupParent.width = groupParentWidth;
+ // re-add back the width of groupname so that the directory name is clickable
+ if (itemPathFormat_ == ItemPathFormat::traditional || itemPathFormat_ == ItemPathFormat::tradrel)
+ rectGroupParent.width += groupNameWidth;
rectGroupName .width = groupNameWidth;
if (stackedGroupRender)
@@ -922,6 +974,7 @@
rectNav.width = fastFromDIP(20);
if (row == pdi.groupLastRow - 1 /*last group item*/) //preserve the group separation line!
+ if (itemPathFormat_ != ItemPathFormat::traditional && itemPathFormat_ != ItemPathFormat::tradrel)
rectNav.height -= fastFromDIP(1);
wxColor backCol = *wxWHITE;
@@ -930,7 +983,7 @@
dc.GradientFillLinear(rectNav, getColorSelectionGradientFrom(), backCol, wxEAST);
}
- if (!groupName.empty() && row == groupFirstRow)
+ if (!(itemPathFormat_ == ItemPathFormat::traditional || itemPathFormat_ == ItemPathFormat::tradrel) && !groupName.empty() && row == groupFirstRow)
{
wxRect rectGroupNameBack = rectGroupName;
rectGroupNameBack.width += 2 * gapSize_; //include gap left of vline
@@ -972,10 +1025,10 @@
drawCellText(dc, rectGroupName, groupName, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &getTextExtentBuffered(dc, groupName));
}
- if (!groupParentFolder.empty() &&
+ if (itemPathFormat_ == ItemPathFormat::traditional || itemPathFormat_ == ItemPathFormat::tradrel || (!groupParentFolder.empty() &&
(( stackedGroupRender && row == groupFirstRow + 1) ||
(!stackedGroupRender && row == groupFirstRow)) &&
- (groupName.empty() || !pdi.folderGroupObj->isEmpty<side>()))
+ (groupName.empty() || !pdi.folderGroupObj->isEmpty<side>())))
{
wxRect rectGroupParentText = rectGroupParent;
rectGroupParentText.x += gapSize_;
@@ -1166,6 +1219,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 -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 -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*' -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 +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*' -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:
+ case ItemPathFormat::traditional:
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_));
|
