|
From: <ki...@us...> - 2008-02-07 15:35:39
|
Revision: 5004
http://winmerge.svn.sourceforge.net/winmerge/?rev=5004&view=rev
Author: kimmov
Date: 2008-02-07 07:35:33 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
BUG: [ 1875116 ] File/Open Project menuitem misses mnemonic
Modified Paths:
--------------
trunk/Src/Languages/English.pot
trunk/Src/Merge.rc
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-02-07 14:29:47 UTC (rev 5003)
+++ trunk/Src/Languages/English.pot 2008-02-07 15:35:33 UTC (rev 5004)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-02-07 16:25+0000\n"
+"POT-Creation-Date: 2008-02-07 17:34+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -138,8 +138,10 @@
msgstr ""
#: Merge.rc:116
+#: Merge.rc:196
+#: Merge.rc:312
#, c-format
-msgid "Open Project...\tCtrl+J"
+msgid "Open Pro&ject...\tCtrl+J"
msgstr ""
#: Merge.rc:117
@@ -442,12 +444,6 @@
msgid "&About WinMerge..."
msgstr ""
-#: Merge.rc:196
-#: Merge.rc:312
-#, c-format
-msgid "Open Pro&ject...\tCtrl+J"
-msgstr ""
-
#: Merge.rc:199
#: Merge.rc:331
#, c-format
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2008-02-07 14:29:47 UTC (rev 5003)
+++ trunk/Src/Merge.rc 2008-02-07 15:35:33 UTC (rev 5004)
@@ -113,7 +113,7 @@
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN
MENUITEM "Op&en Conflict File...", ID_FILE_OPENCONFLICT
MENUITEM SEPARATOR
- MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT
+ MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT
MENUITEM SEPARATOR
MENUITEM "Recent Projects", ID_FILE_MRU_FILE1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-07 16:00:00
|
Revision: 5005
http://winmerge.svn.sourceforge.net/winmerge/?rev=5005&view=rev
Author: kimmov
Date: 2008-02-07 07:59:47 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
PATCH: [ 1868989 ] Language idiomatics in the *.po-files in the Trunk
Submitted by Hans Eriksson
Fix type blacks to blocks
Modified Paths:
--------------
trunk/Src/Languages/English.pot
trunk/Src/Merge.rc
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-02-07 15:35:33 UTC (rev 5004)
+++ trunk/Src/Languages/English.pot 2008-02-07 15:59:47 UTC (rev 5005)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-02-07 17:34+0000\n"
+"POT-Creation-Date: 2008-02-07 17:57+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -5250,7 +5250,7 @@
#: Merge.rc:2717
#, c-format
-msgid "Display all moved blacks"
+msgid "Display all moved blocks"
msgstr ""
#: Merge.rc:2718
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2008-02-07 15:35:33 UTC (rev 5004)
+++ trunk/Src/Merge.rc 2008-02-07 15:59:47 UTC (rev 5005)
@@ -2714,7 +2714,7 @@
STRINGTABLE
BEGIN
ID_DISPLAY_MOVED_NONE "Do not display moved blocks"
- ID_DISPLAY_MOVED_ALL "Display all moved blacks"
+ ID_DISPLAY_MOVED_ALL "Display all moved blocks"
ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
ID_LOCBAR_GOTODIFF "Go to diff under cursor"
ID_LOCBAR_GOTODIFF_FMT "G&oto Diff %1 of %2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-02-07 21:24:06
|
Revision: 5013
http://winmerge.svn.sourceforge.net/winmerge/?rev=5013&view=rev
Author: gerundt
Date: 2008-02-07 13:23:59 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
PATCH: [ 1887268 ] Delete unused "binary" string resources
Modified Paths:
--------------
trunk/Src/Languages/English.pot
trunk/Src/Merge.rc
trunk/Src/resource.h
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-02-07 21:08:37 UTC (rev 5012)
+++ trunk/Src/Languages/English.pot 2008-02-07 21:23:59 UTC (rev 5013)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-02-07 17:57+0000\n"
+"POT-Creation-Date: 2008-02-07 22:20+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -68,7 +68,7 @@
#: Merge.rc:81
#: Merge.rc:103
-#: Merge.rc:502
+#: Merge.rc:496
#, c-format
msgid "&Copy"
msgstr ""
@@ -80,7 +80,7 @@
msgstr ""
#: Merge.rc:84
-#: Merge.rc:583
+#: Merge.rc:577
#, c-format
msgid "&Goto..."
msgstr ""
@@ -91,43 +91,43 @@
msgstr ""
#: Merge.rc:88
+#: Merge.rc:519
#: Merge.rc:525
-#: Merge.rc:531
#, c-format
msgid "with &Registered Application"
msgstr ""
#: Merge.rc:89
+#: Merge.rc:520
#: Merge.rc:526
-#: Merge.rc:532
#, c-format
msgid "with &External Editor"
msgstr ""
#: Merge.rc:90
+#: Merge.rc:521
#: Merge.rc:527
-#: Merge.rc:533
#, c-format
msgid "&with..."
msgstr ""
#: Merge.rc:110
-#: Merge.rc:191
-#: Merge.rc:307
+#: Merge.rc:189
+#: Merge.rc:303
#, c-format
msgid "&File"
msgstr ""
#: Merge.rc:112
-#: Merge.rc:193
-#: Merge.rc:309
+#: Merge.rc:191
+#: Merge.rc:305
#, c-format
msgid "&New\tCtrl+N"
msgstr ""
#: Merge.rc:113
-#: Merge.rc:194
-#: Merge.rc:310
+#: Merge.rc:192
+#: Merge.rc:306
#, c-format
msgid "&Open...\tCtrl+O"
msgstr ""
@@ -138,15 +138,15 @@
msgstr ""
#: Merge.rc:116
-#: Merge.rc:196
-#: Merge.rc:312
+#: Merge.rc:194
+#: Merge.rc:308
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr ""
#: Merge.rc:117
-#: Merge.rc:197
-#: Merge.rc:313
+#: Merge.rc:195
+#: Merge.rc:309
#, c-format
msgid "Sa&ve Project..."
msgstr ""
@@ -157,2531 +157,2523 @@
msgstr ""
#: Merge.rc:121
-#: Merge.rc:204
-#: Merge.rc:345
+#: Merge.rc:202
+#: Merge.rc:341
#, c-format
msgid "E&xit"
msgstr ""
#: Merge.rc:123
-#: Merge.rc:206
-#: Merge.rc:347
+#: Merge.rc:204
+#: Merge.rc:343
#, c-format
msgid "&Edit"
msgstr ""
#: Merge.rc:125
-#: Merge.rc:210
-#: Merge.rc:381
+#: Merge.rc:208
+#: Merge.rc:377
#, c-format
msgid "&Options..."
msgstr ""
#: Merge.rc:127
-#: Merge.rc:212
-#: Merge.rc:383
+#: Merge.rc:210
+#: Merge.rc:379
#, c-format
msgid "&View"
msgstr ""
#: Merge.rc:129
-#: Merge.rc:223
-#: Merge.rc:385
+#: Merge.rc:221
+#: Merge.rc:381
#, c-format
msgid "Select &Font..."
msgstr ""
#: Merge.rc:130
-#: Merge.rc:224
-#: Merge.rc:386
+#: Merge.rc:222
+#: Merge.rc:382
#, c-format
msgid "Use Default F&ont"
msgstr ""
#: Merge.rc:132
-#: Merge.rc:226
-#: Merge.rc:407
+#: Merge.rc:224
+#: Merge.rc:403
#, c-format
msgid "&Toolbar"
msgstr ""
#: Merge.rc:134
-#: Merge.rc:228
-#: Merge.rc:409
+#: Merge.rc:226
+#: Merge.rc:405
#, c-format
msgid "&None"
msgstr ""
#: Merge.rc:135
-#: Merge.rc:229
-#: Merge.rc:410
+#: Merge.rc:227
+#: Merge.rc:406
#, c-format
msgid "&Small"
msgstr ""
#: Merge.rc:136
-#: Merge.rc:230
-#: Merge.rc:411
+#: Merge.rc:228
+#: Merge.rc:407
#, c-format
msgid "&Big"
msgstr ""
#: Merge.rc:138
-#: Merge.rc:232
-#: Merge.rc:413
+#: Merge.rc:230
+#: Merge.rc:409
#, c-format
msgid "&Status Bar"
msgstr ""
#: Merge.rc:139
-#: Merge.rc:233
-#: Merge.rc:414
+#: Merge.rc:231
+#: Merge.rc:410
#, c-format
msgid "Ta&b Bar"
msgstr ""
#: Merge.rc:141
-#: Merge.rc:236
-#: Merge.rc:418
+#: Merge.rc:234
+#: Merge.rc:414
#, c-format
msgid "&Language..."
msgstr ""
#: Merge.rc:143
-#: Merge.rc:257
-#: Merge.rc:440
+#: Merge.rc:255
+#: Merge.rc:436
#, c-format
msgid "&Tools"
msgstr ""
#: Merge.rc:145
-#: Merge.rc:260
-#: Merge.rc:442
+#: Merge.rc:258
+#: Merge.rc:438
#, c-format
msgid "&Filters..."
msgstr ""
#: Merge.rc:146
-#: Merge.rc:261
-#: Merge.rc:443
+#: Merge.rc:259
+#: Merge.rc:439
#, c-format
msgid "&Generate Patch..."
msgstr ""
#: Merge.rc:148
-#: Merge.rc:264
-#: Merge.rc:446
+#: Merge.rc:262
+#: Merge.rc:442
#, c-format
msgid "&Plugins"
msgstr ""
#: Merge.rc:150
-#: Merge.rc:266
-#: Merge.rc:448
+#: Merge.rc:264
+#: Merge.rc:444
#, c-format
msgid "&Manual Unpacking"
msgstr ""
#: Merge.rc:151
-#: Merge.rc:267
-#: Merge.rc:449
+#: Merge.rc:265
+#: Merge.rc:445
#, c-format
msgid "&Automatic Unpacking"
msgstr ""
#: Merge.rc:153
-#: Merge.rc:269
-#: Merge.rc:451
+#: Merge.rc:267
+#: Merge.rc:447
#, c-format
msgid "&Edit with Unpacker"
msgstr ""
#: Merge.rc:155
-#: Merge.rc:271
-#: Merge.rc:458
+#: Merge.rc:269
+#: Merge.rc:454
#, c-format
msgid "&Reload plugins"
msgstr ""
#: Merge.rc:157
-#: Merge.rc:273
-#: Merge.rc:460
+#: Merge.rc:271
+#: Merge.rc:456
#, c-format
msgid "&Debug"
msgstr ""
#: Merge.rc:159
-#: Merge.rc:275
-#: Merge.rc:462
+#: Merge.rc:273
+#: Merge.rc:458
#, c-format
msgid "&Load Config..."
msgstr ""
#: Merge.rc:160
-#: Merge.rc:276
-#: Merge.rc:463
+#: Merge.rc:274
+#: Merge.rc:459
#, c-format
msgid "&Reset Options"
msgstr ""
#: Merge.rc:162
-#: Merge.rc:278
-#: Merge.rc:465
+#: Merge.rc:276
+#: Merge.rc:461
#, c-format
msgid "&Window"
msgstr ""
#: Merge.rc:164
-#: Merge.rc:280
-#: Merge.rc:467
+#: Merge.rc:278
+#: Merge.rc:463
#, c-format
msgid "Cl&ose"
msgstr ""
#: Merge.rc:165
-#: Merge.rc:281
-#: Merge.rc:468
+#: Merge.rc:279
+#: Merge.rc:464
#, c-format
msgid "Clo&se All"
msgstr ""
#: Merge.rc:167
-#: Merge.rc:283
-#: Merge.rc:470
+#: Merge.rc:281
+#: Merge.rc:466
#, c-format
msgid "Change &Pane\tF6"
msgstr ""
#: Merge.rc:169
-#: Merge.rc:285
-#: Merge.rc:472
+#: Merge.rc:283
+#: Merge.rc:468
#, c-format
msgid "Tile &Horizontally"
msgstr ""
#: Merge.rc:170
-#: Merge.rc:286
-#: Merge.rc:473
+#: Merge.rc:284
+#: Merge.rc:469
#, c-format
msgid "Tile &Vertically"
msgstr ""
#: Merge.rc:171
-#: Merge.rc:287
-#: Merge.rc:474
+#: Merge.rc:285
+#: Merge.rc:470
#, c-format
msgid "&Cascade"
msgstr ""
#: Merge.rc:173
-#: Merge.rc:289
-#: Merge.rc:476
-#: Merge.rc:1889
+#: Merge.rc:287
+#: Merge.rc:472
+#: Merge.rc:1883
#, c-format
msgid "&Help"
msgstr ""
#: Merge.rc:175
-#: Merge.rc:291
-#: Merge.rc:478
+#: Merge.rc:289
+#: Merge.rc:474
#, c-format
-msgid "&Contents...\tF1"
+msgid "&WinMerge Help\tF1"
msgstr ""
-#: Merge.rc:176
-#: Merge.rc:292
-#: Merge.rc:479
-#, c-format
-msgid "&Index..."
-msgstr ""
-
#: Merge.rc:177
-#: Merge.rc:293
-#: Merge.rc:480
+#: Merge.rc:291
+#: Merge.rc:476
#, c-format
-msgid "&Search..."
-msgstr ""
-
-#: Merge.rc:179
-#: Merge.rc:295
-#: Merge.rc:482
-#, c-format
msgid "R&elease Notes"
msgstr ""
-#: Merge.rc:180
-#: Merge.rc:296
-#: Merge.rc:483
+#: Merge.rc:178
+#: Merge.rc:292
+#: Merge.rc:477
#, c-format
msgid "&Translations"
msgstr ""
-#: Merge.rc:181
-#: Merge.rc:297
-#: Merge.rc:484
+#: Merge.rc:179
+#: Merge.rc:293
+#: Merge.rc:478
#, c-format
msgid "C&onfiguration..."
msgstr ""
-#: Merge.rc:182
-#: Merge.rc:298
-#: Merge.rc:485
+#: Merge.rc:180
+#: Merge.rc:294
+#: Merge.rc:479
#, c-format
msgid "A&rchive Support disabled..."
msgstr ""
-#: Merge.rc:184
-#: Merge.rc:300
-#: Merge.rc:487
+#: Merge.rc:182
+#: Merge.rc:296
+#: Merge.rc:481
#, c-format
msgid "&GNU Public License..."
msgstr ""
-#: Merge.rc:185
-#: Merge.rc:301
-#: Merge.rc:488
+#: Merge.rc:183
+#: Merge.rc:297
+#: Merge.rc:482
#, c-format
msgid "&About WinMerge..."
msgstr ""
-#: Merge.rc:199
-#: Merge.rc:331
+#: Merge.rc:197
+#: Merge.rc:327
#, c-format
msgid "L&eft Read-only"
msgstr ""
-#: Merge.rc:200
-#: Merge.rc:332
+#: Merge.rc:198
+#: Merge.rc:328
#, c-format
msgid "Ri&ght Read-only"
msgstr ""
-#: Merge.rc:202
+#: Merge.rc:200
#, c-format
msgid "File En&coding"
msgstr ""
-#: Merge.rc:208
-#: Merge.rc:357
+#: Merge.rc:206
+#: Merge.rc:353
#, c-format
msgid "Select &All\tCtrl+A"
msgstr ""
-#: Merge.rc:214
+#: Merge.rc:212
#, c-format
msgid "Show &Identical Items"
msgstr ""
-#: Merge.rc:215
+#: Merge.rc:213
#, c-format
msgid "Show &Different Items"
msgstr ""
-#: Merge.rc:216
+#: Merge.rc:214
#, c-format
msgid "Show L&eft Unique Items"
msgstr ""
-#: Merge.rc:217
+#: Merge.rc:215
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr ""
-#: Merge.rc:218
+#: Merge.rc:216
#, c-format
msgid "Show S&kipped Items"
msgstr ""
-#: Merge.rc:219
+#: Merge.rc:217
#, c-format
msgid "S&how Binary Files"
msgstr ""
-#: Merge.rc:221
+#: Merge.rc:219
#, c-format
msgid "Show Hidd&en Items"
msgstr ""
-#: Merge.rc:234
+#: Merge.rc:232
#, c-format
msgid "Compa&re Statistics"
msgstr ""
-#: Merge.rc:238
-#: Merge.rc:420
+#: Merge.rc:236
+#: Merge.rc:416
#, c-format
msgid "Refre&sh\tF5"
msgstr ""
-#: Merge.rc:239
+#: Merge.rc:237
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr ""
-#: Merge.rc:241
-#: Merge.rc:422
+#: Merge.rc:239
+#: Merge.rc:418
#, c-format
msgid "&Merge"
msgstr ""
-#: Merge.rc:243
+#: Merge.rc:241
#, c-format
msgid "Co&mpare\tEnter"
msgstr ""
-#: Merge.rc:245
-#: Merge.rc:424
+#: Merge.rc:243
+#: Merge.rc:420
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr ""
-#: Merge.rc:246
-#: Merge.rc:425
+#: Merge.rc:244
+#: Merge.rc:421
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr ""
-#: Merge.rc:248
-#: Merge.rc:427
+#: Merge.rc:246
+#: Merge.rc:423
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr ""
-#: Merge.rc:249
-#: Merge.rc:428
+#: Merge.rc:247
+#: Merge.rc:424
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr ""
-#: Merge.rc:250
-#: Merge.rc:429
+#: Merge.rc:248
+#: Merge.rc:425
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr ""
-#: Merge.rc:252
-#: Merge.rc:431
+#: Merge.rc:250
+#: Merge.rc:427
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr ""
-#: Merge.rc:253
-#: Merge.rc:432
+#: Merge.rc:251
+#: Merge.rc:428
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr ""
-#: Merge.rc:255
+#: Merge.rc:253
#, c-format
msgid "&Delete\tDel"
msgstr ""
-#: Merge.rc:259
-#: Merge.rc:556
+#: Merge.rc:257
+#: Merge.rc:550
#, c-format
msgid "&Customize Columns..."
msgstr ""
-#: Merge.rc:262
-#: Merge.rc:444
+#: Merge.rc:260
+#: Merge.rc:440
#, c-format
msgid "Generate &Report..."
msgstr ""
-#: Merge.rc:315
+#: Merge.rc:311
#, c-format
msgid "&Save\tCtrl+S"
msgstr ""
-#: Merge.rc:316
+#: Merge.rc:312
#, c-format
msgid "Save &Left"
msgstr ""
-#: Merge.rc:318
-#: Merge.rc:323
+#: Merge.rc:314
+#: Merge.rc:319
#, c-format
msgid "&Save"
msgstr ""
-#: Merge.rc:319
-#: Merge.rc:324
+#: Merge.rc:315
+#: Merge.rc:320
#, c-format
msgid "Save &As..."
msgstr ""
-#: Merge.rc:321
+#: Merge.rc:317
#, c-format
msgid "Save &Right"
msgstr ""
-#: Merge.rc:327
+#: Merge.rc:323
#, c-format
msgid "&Print..."
msgstr ""
-#: Merge.rc:328
+#: Merge.rc:324
#, c-format
msgid "Page Se&tup"
msgstr ""
-#: Merge.rc:329
+#: Merge.rc:325
#, c-format
msgid "Print Previe&w"
msgstr ""
-#: Merge.rc:334
+#: Merge.rc:330
#, c-format
msgid "&Convert Line Endings to"
msgstr ""
-#: Merge.rc:336
+#: Merge.rc:332
#, c-format
msgid "&DOS (CRLF)"
msgstr ""
-#: Merge.rc:337
+#: Merge.rc:333
#, c-format
msgid "&UNIX (LF)"
msgstr ""
-#: Merge.rc:338
+#: Merge.rc:334
#, c-format
msgid "&MAC (CR)"
msgstr ""
-#: Merge.rc:341
+#: Merge.rc:337
#, c-format
msgid "&Merge Mode\tF9"
msgstr ""
-#: Merge.rc:343
+#: Merge.rc:339
#, c-format
msgid "&File Encoding..."
msgstr ""
-#: Merge.rc:349
+#: Merge.rc:345
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr ""
-#: Merge.rc:350
+#: Merge.rc:346
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr ""
-#: Merge.rc:352
+#: Merge.rc:348
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr ""
-#: Merge.rc:353
+#: Merge.rc:349
#, c-format
msgid "&Copy\tCtrl+C"
msgstr ""
-#: Merge.rc:354
+#: Merge.rc:350
#, c-format
msgid "&Paste\tCtrl+V"
msgstr ""
-#: Merge.rc:356
+#: Merge.rc:352
#, c-format
msgid "Select Line &Difference\tF4"
msgstr ""
-#: Merge.rc:359
+#: Merge.rc:355
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr ""
-#: Merge.rc:360
+#: Merge.rc:356
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr ""
-#: Merge.rc:362
+#: Merge.rc:358
#, c-format
msgid "&Scripts"
msgstr ""
-#: Merge.rc:364
-#: Merge.rc:2699
+#: Merge.rc:360
+#: Merge.rc:2686
#, c-format
msgid "< Empty >"
msgstr ""
-#: Merge.rc:367
+#: Merge.rc:363
#, c-format
msgid "Advanced"
msgstr ""
-#: Merge.rc:369
+#: Merge.rc:365
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr ""
-#: Merge.rc:372
+#: Merge.rc:368
#, c-format
msgid "&Bookmarks"
msgstr ""
-#: Merge.rc:374
+#: Merge.rc:370
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr ""
-#: Merge.rc:375
+#: Merge.rc:371
#, c-format
msgid "&Next Bookmark\tF2"
msgstr ""
-#: Merge.rc:376
+#: Merge.rc:372
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr ""
-#: Merge.rc:377
+#: Merge.rc:373
#, c-format
msgid "&Clear All Bookmarks"
msgstr ""
-#: Merge.rc:379
+#: Merge.rc:375
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr ""
-#: Merge.rc:387
+#: Merge.rc:383
#, c-format
msgid "&Zoom"
msgstr ""
-#: Merge.rc:389
+#: Merge.rc:385
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr ""
-#: Merge.rc:390
+#: Merge.rc:386
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr ""
#. Zoom to normal
-#: Merge.rc:391
+#: Merge.rc:387
#, c-format
msgid "&Normal\tCtrl+*"
msgstr ""
-#: Merge.rc:393
+#: Merge.rc:389
#, c-format
msgid "Syntax Highlight"
msgstr ""
-#: Merge.rc:398
+#: Merge.rc:394
#, c-format
msgid "&Lock Panes"
msgstr ""
-#: Merge.rc:399
+#: Merge.rc:395
#, c-format
msgid "&View Whitespace"
msgstr ""
-#: Merge.rc:400
+#: Merge.rc:396
#, c-format
msgid "Vie&w Line Differences"
msgstr ""
-#: Merge.rc:401
+#: Merge.rc:397
#, c-format
msgid "View Line &Numbers"
msgstr ""
-#: Merge.rc:402
+#: Merge.rc:398
#, c-format
msgid "View &Margins"
msgstr ""
-#: Merge.rc:403
+#: Merge.rc:399
#, c-format
msgid "W&rap Lines"
msgstr ""
-#: Merge.rc:405
+#: Merge.rc:401
#, c-format
msgid "Sw&ap Panes"
msgstr ""
-#: Merge.rc:415
+#: Merge.rc:411
#, c-format
msgid "Diff &Pane"
msgstr ""
-#: Merge.rc:416
+#: Merge.rc:412
#, c-format
msgid "Lo&cation Pane"
msgstr ""
-#: Merge.rc:434
+#: Merge.rc:430
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr ""
-#: Merge.rc:435
+#: Merge.rc:431
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr ""
-#: Merge.rc:437
+#: Merge.rc:433
#, c-format
msgid "Copy &All to Right"
msgstr ""
-#: Merge.rc:438
+#: Merge.rc:434
#, c-format
msgid "Cop&y All to Left"
msgstr ""
-#: Merge.rc:453
+#: Merge.rc:449
#, c-format
msgid "&Prediffer"
msgstr ""
-#: Merge.rc:496
+#: Merge.rc:490
#, c-format
msgid "Comp&are"
msgstr ""
-#: Merge.rc:497
+#: Merge.rc:491
#, c-format
msgid "Co&mpare Special"
msgstr ""
-#: Merge.rc:499
+#: Merge.rc:493
#, c-format
msgid "&XML"
msgstr ""
-#: Merge.rc:504
+#: Merge.rc:498
#, c-format
msgid "&Left to Right"
msgstr ""
-#: Merge.rc:505
+#: Merge.rc:499
#, c-format
msgid "L&eft to..."
msgstr ""
-#: Merge.rc:506
+#: Merge.rc:500
#, c-format
msgid "&Right to Left"
msgstr ""
-#: Merge.rc:507
+#: Merge.rc:501
#, c-format
msgid "R&ight to..."
msgstr ""
-#: Merge.rc:509
+#: Merge.rc:503
#, c-format
msgid "&Move"
msgstr ""
-#: Merge.rc:511
+#: Merge.rc:505
#, c-format
msgid "&Left to..."
msgstr ""
-#: Merge.rc:512
+#: Merge.rc:506
#, c-format
msgid "&Right to..."
msgstr ""
-#: Merge.rc:514
+#: Merge.rc:508
#, c-format
msgid "&Delete"
msgstr ""
-#: Merge.rc:516
-#: Merge.rc:1129
-#: Merge.rc:1508
+#: Merge.rc:510
+#: Merge.rc:1123
+#: Merge.rc:1502
#, c-format
msgid "&Left"
msgstr ""
-#: Merge.rc:517
-#: Merge.rc:1131
-#: Merge.rc:1511
+#: Merge.rc:511
+#: Merge.rc:1125
+#: Merge.rc:1505
#, c-format
msgid "&Right"
msgstr ""
-#: Merge.rc:518
+#: Merge.rc:512
#, c-format
msgid "&Both"
msgstr ""
-#: Merge.rc:520
+#: Merge.rc:514
#, c-format
msgid "Re&name"
msgstr ""
-#: Merge.rc:521
+#: Merge.rc:515
#, c-format
msgid "&Hide Items"
msgstr ""
-#: Merge.rc:523
+#: Merge.rc:517
#, c-format
msgid "&Open Left"
msgstr ""
-#: Merge.rc:529
+#: Merge.rc:523
#, c-format
msgid "O&pen Right"
msgstr ""
-#: Merge.rc:536
+#: Merge.rc:530
#, c-format
msgid "Cop&y Pathnames"
msgstr ""
-#: Merge.rc:538
+#: Merge.rc:532
#, c-format
msgid "&Left (%1 of %2)"
msgstr ""
-#: Merge.rc:539
+#: Merge.rc:533
#, c-format
msgid "&Right (%1 of %2)"
msgstr ""
-#: Merge.rc:540
+#: Merge.rc:534
#, c-format
msgid "&Both (%1 of %2)"
msgstr ""
-#: Merge.rc:542
+#: Merge.rc:536
#, c-format
msgid "Copy &Filenames"
msgstr ""
-#: Merge.rc:544
+#: Merge.rc:538
#, c-format
msgid "&Zip"
msgstr ""
-#: Merge.rc:546
+#: Merge.rc:540
#, c-format
msgid "&Left... (%1 of %2)"
msgstr ""
-#: Merge.rc:547
+#: Merge.rc:541
#, c-format
msgid "&Right... (%1 of %2)"
msgstr ""
-#: Merge.rc:548
+#: Merge.rc:542
#, c-format
msgid "&Both... (%1 of %2)"
msgstr ""
-#: Merge.rc:549
+#: Merge.rc:543
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr ""
-#: Merge.rc:552
+#: Merge.rc:546
#, c-format
msgid "&Refresh"
msgstr ""
-#: Merge.rc:564
+#: Merge.rc:558
#, c-format
msgid "&Copy Full Path"
msgstr ""
-#: Merge.rc:565
+#: Merge.rc:559
#, c-format
msgid "Copy &Filename"
msgstr ""
-#: Merge.rc:571
+#: Merge.rc:565
#, c-format
msgid "Prediffer Settings"
msgstr ""
-#: Merge.rc:573
+#: Merge.rc:567
#, c-format
msgid "&No prediffer"
msgstr ""
-#: Merge.rc:574
+#: Merge.rc:568
#, c-format
msgid "Auto prediffer"
msgstr ""
-#: Merge.rc:582
+#: Merge.rc:576
#, c-format
msgid "G&oto Diff"
msgstr ""
-#: Merge.rc:585
+#: Merge.rc:579
#, c-format
msgid "&No Moved Blocks"
msgstr ""
-#: Merge.rc:586
+#: Merge.rc:580
#, c-format
msgid "&All Moved Blocks"
msgstr ""
-#: Merge.rc:587
+#: Merge.rc:581
#, c-format
msgid "Moved Block for &Current Diff"
msgstr ""
-#: Merge.rc:656
+#: Merge.rc:650
#, c-format
msgid "About WinMerge"
msgstr ""
-#: Merge.rc:662
+#: Merge.rc:656
#, c-format
msgid "(Private Build)"
msgstr ""
-#: Merge.rc:663
+#: Merge.rc:657
#, c-format
msgid "All rights reserved."
msgstr ""
-#: Merge.rc:664
+#: Merge.rc:658
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr ""
-#: Merge.rc:667
-#: Merge.rc:698
-#: Merge.rc:788
-#: Merge.rc:974
-#: Merge.rc:1048
-#: Merge.rc:1077
-#: Merge.rc:1087
-#: Merge.rc:1250
-#: Merge.rc:1314
-#: Merge.rc:1327
-#: Merge.rc:1419
-#: Merge.rc:1434
+#: Merge.rc:661
+#: Merge.rc:692
+#: Merge.rc:782
+#: Merge.rc:968
+#: Merge.rc:1042
+#: Merge.rc:1071
+#: Merge.rc:1081
+#: Merge.rc:1244
+#: Merge.rc:1308
+#: Merge.rc:1321
+#: Merge.rc:1413
+#: Merge.rc:1428
#, c-format
msgid "OK"
msgstr ""
-#: Merge.rc:668
+#: Merge.rc:662
#, c-format
msgid "Contributors"
msgstr ""
-#: Merge.rc:674
+#: Merge.rc:668
#, c-format
msgid "Select Files or Folders"
msgstr ""
-#: Merge.rc:677
-#: Merge.rc:1585
+#: Merge.rc:671
+#: Merge.rc:1579
#, c-format
msgid "&Left:"
msgstr ""
-#: Merge.rc:681
-#: Merge.rc:742
-#: Merge.rc:998
-#: Merge.rc:1013
+#: Merge.rc:675
+#: Merge.rc:736
+#: Merge.rc:992
+#: Merge.rc:1007
#, c-format
msgid "&Browse..."
msgstr ""
-#: Merge.rc:682
-#: Merge.rc:1589
+#: Merge.rc:676
+#: Merge.rc:1583
#, c-format
msgid "&Right:"
msgstr ""
-#: Merge.rc:686
-#: Merge.rc:1024
+#: Merge.rc:680
+#: Merge.rc:1018
#, c-format
msgid "Bro&wse..."
msgstr ""
-#: Merge.rc:687
-#: Merge.rc:1593
+#: Merge.rc:681
+#: Merge.rc:1587
#, c-format
msgid "&Filter:"
msgstr ""
-#: Merge.rc:690
-#: Merge.rc:1595
+#: Merge.rc:684
+#: Merge.rc:1589
#, c-format
msgid "Select..."
msgstr ""
-#: Merge.rc:691
+#: Merge.rc:685
#, c-format
msgid "&Unpacker:"
msgstr ""
-#: Merge.rc:694
+#: Merge.rc:688
#, c-format
msgid "&Select..."
msgstr ""
-#: Merge.rc:695
-#: Merge.rc:1596
+#: Merge.rc:689
+#: Merge.rc:1590
#, c-format
msgid "&Include Subfolders"
msgstr ""
-#: Merge.rc:697
+#: Merge.rc:691
#, c-format
msgid "Status:"
msgstr ""
-#: Merge.rc:699
-#: Merge.rc:729
-#: Merge.rc:789
-#: Merge.rc:819
-#: Merge.rc:851
-#: Merge.rc:861
-#: Merge.rc:1049
-#: Merge.rc:1078
-#: Merge.rc:1088
-#: Merge.rc:1139
-#: Merge.rc:1251
-#: Merge.rc:1328
-#: Merge.rc:1420
-#: Merge.rc:1435
+#: Merge.rc:693
+#: Merge.rc:723
+#: Merge.rc:783
+#: Merge.rc:813
+#: Merge.rc:845
+#: Merge.rc:855
+#: Merge.rc:1043
+#: Merge.rc:1072
+#: Merge.rc:1082
+#: Merge.rc:1133
+#: Merge.rc:1245
+#: Merge.rc:1322
+#: Merge.rc:1414
+#: Merge.rc:1429
#, c-format
msgid "Cancel"
msgstr ""
-#: Merge.rc:700
-#: Merge.rc:1329
+#: Merge.rc:694
+#: Merge.rc:1323
#, c-format
msgid "Help"
msgstr ""
-#: Merge.rc:701
+#: Merge.rc:695
#, c-format
msgid "Files or Folders to Compare"
msgstr ""
-#: Merge.rc:708
+#: Merge.rc:702
#, c-format
msgid "Visual SourceSafe"
msgstr ""
-#: Merge.rc:713
+#: Merge.rc:707
#, c-format
msgid "Database:"
msgstr ""
-#: Merge.rc:716
+#: Merge.rc:710
#, c-format
msgid "Project:"
msgstr ""
-#: Merge.rc:719
+#: Merge.rc:713
#, c-format
msgid "User:"
msgstr ""
-#: Merge.rc:721
+#: Merge.rc:715
#, c-format
msgid "Password:"
msgstr ""
-#: Merge.rc:723
+#: Merge.rc:717
#, c-format
msgid "Link to Destination VSS project"
msgstr ""
-#: Merge.rc:725
-#: Merge.rc:866
+#: Merge.rc:719
+#: Merge.rc:860
#, c-format
msgid "Apply to all items"
msgstr ""
-#: Merge.rc:727
+#: Merge.rc:721
#, c-format
msgid "Check Out"
msgstr ""
-#: Merge.rc:728
-#: Merge.rc:862
+#: Merge.rc:722
+#: Merge.rc:856
#, c-format
msgid "Save As..."
msgstr ""
-#: Merge.rc:734
+#: Merge.rc:728
#, c-format
msgid "Versioning System"
msgstr ""
-#: Merge.rc:737
+#: Merge.rc:731
#, c-format
msgid "&Versioning System:"
msgstr ""
-#: Merge.rc:740
+#: Merge.rc:734
#, c-format
msgid "&Path to cleartool.exe:"
msgstr ""
-#: Merge.rc:747
-#: Merge.rc:1897
+#: Merge.rc:741
+#: Merge.rc:1891
#, c-format
msgid "General"
msgstr ""
-#: Merge.rc:750
+#: Merge.rc:744
#, c-format
msgid "Automatically &scroll to first difference"
msgstr ""
-#: Merge.rc:753
+#: Merge.rc:747
#, c-format
msgid "&Disable Splash Screen"
msgstr ""
-#: Merge.rc:755
+#: Merge.rc:749
#, c-format
msgid "Cl&ose windows with ESC"
msgstr ""
-#: Merge.rc:757
+#: Merge.rc:751
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr ""
-#: Merge.rc:760
+#: Merge.rc:754
#, c-format
msgid "All&ow only one instance to run"
msgstr ""
-#: Merge.rc:762
+#: Merge.rc:756
#, c-format
msgid "As&k when closing multiple windows"
msgstr ""
-#: Merge.rc:764
+#: Merge.rc:758
#, c-format
msgid "&Preserve file time in file compare"
msgstr ""
-#: Merge.rc:767
+#: Merge.rc:761
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr ""
-#: Merge.rc:770
+#: Merge.rc:764
#, c-format
msgid "Enable multiple compare windows for"
msgstr ""
-#: Merge.rc:772
-#: Merge.rc:1608
+#: Merge.rc:766
+#: Merge.rc:1602
#, c-format
msgid "&Folder compare"
msgstr ""
-#: Merge.rc:774
-#: Merge.rc:1610
+#: Merge.rc:768
+#: Merge.rc:1604
#, c-format
msgid "Fil&e compare"
msgstr ""
-#: Merge.rc:776
+#: Merge.rc:770
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
-#: Merge.rc:778
+#: Merge.rc:772
#, c-format
msgid "Reset"
msgstr ""
-#: Merge.rc:785
+#: Merge.rc:779
#, c-format
msgid "Language"
msgstr ""
-#: Merge.rc:792
+#: Merge.rc:786
#, c-format
msgid "Available languages:"
msgstr ""
-#: Merge.rc:798
+#: Merge.rc:792
#, c-format
msgid "Find"
msgstr ""
-#: Merge.rc:801
-#: Merge.rc:828
+#: Merge.rc:795
+#: Merge.rc:822
#, c-format
msgid "Fi&nd what:"
msgstr ""
-#: Merge.rc:804
-#: Merge.rc:834
+#: Merge.rc:798
+#: Merge.rc:828
#, c-format
msgid "Match &whole word only"
msgstr ""
-#: Merge.rc:806
-#: Merge.rc:836
+#: Merge.rc:800
+#: Merge.rc:830
#, c-format
msgid "Match &case"
msgstr ""
-#: Merge.rc:808
-#: Merge.rc:838
+#: Merge.rc:802
+#: Merge.rc:832
#, c-format
msgid "Regular &expression"
msgstr ""
-#: Merge.rc:810
+#: Merge.rc:804
#, c-format
msgid "D&on't wrap end of file"
msgstr ""
-#: Merge.rc:813
+#: Merge.rc:807
#, c-format
msgid "Direction"
msgstr ""
-#: Merge.rc:814
+#: Merge.rc:808
#, c-format
msgid "&Up"
msgstr ""
-#: Merge.rc:816
+#: Merge.rc:810
#, c-format
msgid "&Down"
msgstr ""
-#: Merge.rc:818
-#: Merge.rc:848
+#: Merge.rc:812
+#: Merge.rc:842
#, c-format
msgid "&Find Next"
msgstr ""
-#: Merge.rc:825
+#: Merge.rc:819
#, c-format
msgid "Replace"
msgstr ""
-#: Merge.rc:831
+#: Merge.rc:825
#, c-format
msgid "Re&place with:"
msgstr ""
-#: Merge.rc:840
+#: Merge.rc:834
#, c-format
msgid "&Don't wrap end of file"
msgstr ""
-#: Merge.rc:843
+#: Merge.rc:837
#, c-format
msgid "Replace in"
msgstr ""
-#: Merge.rc:844
+#: Merge.rc:838
#, c-format
msgid "&Selection"
msgstr ""
-#: Merge.rc:846
+#: Merge.rc:840
#, c-format
msgid "Wh&ole file"
msgstr ""
-#: Merge.rc:849
+#: Merge.rc:843
#, c-format
msgid "&Replace"
msgstr ""
-#: Merge.rc:850
+#: Merge.rc:844
#, c-format
msgid "Replace &All"
msgstr ""
-#: Merge.rc:857
-#: Merge.rc:2126
+#: Merge.rc:851
+#: Merge.rc:2117
#, c-format
msgid "Rational ClearCase"
msgstr ""
-#: Merge.rc:860
+#: Merge.rc:854
#, c-format
msgid "CheckOut"
msgstr ""
-#: Merge.rc:865
-#: Merge.rc:1170
+#: Merge.rc:859
+#: Merge.rc:1164
#, c-format
msgid "Comments"
msgstr ""
-#: Merge.rc:868
+#: Merge.rc:862
#, c-format
msgid "CheckIn after checkout"
msgstr ""
-#: Merge.rc:874
+#: Merge.rc:868
#, c-format
msgid "Linefilters"
msgstr ""
-#: Merge.rc:877
+#: Merge.rc:871
#, c-format
msgid "Enable Line Filters"
msgstr ""
-#: Merge.rc:880
+#: Merge.rc:874
#, c-format
msgid "Regular Expressions (one per line):"
msgstr ""
-#: Merge.rc:887
+#: Merge.rc:881
#, c-format
msgid "Save"
msgstr ""
-#: Merge.rc:888
+#: Merge.rc:882
#, c-format
msgid "New"
msgstr ""
-#: Merge.rc:889
+#: Merge.rc:883
#, c-format
msgid "Edit"
msgstr ""
-#: Merge.rc:890
+#: Merge.rc:884
#, c-format
msgid "Remove"
msgstr ""
-#: Merge.rc:895
-#: Merge.rc:1900
+#: Merge.rc:889
+#: Merge.rc:1894
#, c-format
msgid "Colors"
msgstr ""
-#: Merge.rc:898
+#: Merge.rc:892
#, c-format
msgid "Difference:"
msgstr ""
-#: Merge.rc:902
+#: Merge.rc:896
#, c-format
msgid "Selected Difference:"
msgstr ""
-#: Merge.rc:906
-#: Merge.rc:1560
+#: Merge.rc:900
+#: Merge.rc:1554
#, c-format
msgid "Background"
msgstr ""
-#: Merge.rc:907
+#: Merge.rc:901
#, c-format
msgid "Deleted"
msgstr ""
-#: Merge.rc:920
-#: Merge.rc:1355
-#: Merge.rc:1561
+#: Merge.rc:914
+#: Merge.rc:1349
+#: Merge.rc:1555
#, c-format
msgid "Text"
msgstr ""
-#: Merge.rc:924
+#: Merge.rc:918
#, c-format
msgid "Ignored Difference:"
msgstr ""
-#: Merge.rc:934
+#: Merge.rc:928
#, c-format
msgid "Moved:"
msgstr ""
-#: Merge.rc:944
+#: Merge.rc:938
#, c-format
msgid "Selected Moved:"
msgstr ""
-#: Merge.rc:951
+#: Merge.rc:945
#, c-format
msgid "Word Difference:"
msgstr ""
-#: Merge.rc:958
+#: Merge.rc:952
#, c-format
msgid "Selected Word Diff:"
msgstr ""
-#: Merge.rc:965
-#: Merge.rc:1047
-#: Merge.rc:1076
-#: Merge.rc:1173
-#: Merge.rc:1401
+#: Merge.rc:959
+#: Merge.rc:1041
+#: Merge.rc:1070
+#: Merge.rc:1167
+#: Merge.rc:1395
#, c-format
msgid "Defaults"
msgstr ""
-#: Merge.rc:971
-#: Merge.rc:1343
-#: Merge.rc:1549
+#: Merge.rc:965
+#: Merge.rc:1337
+#: Merge.rc:1543
#, c-format
msgid "Dialog"
msgstr ""
-#: Merge.rc:981
-#: Merge.rc:1903
+#: Merge.rc:975
+#: Merge.rc:1897
#, c-format
msgid "System"
msgstr ""
-#: Merge.rc:984
+#: Merge.rc:978
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr ""
-#: Merge.rc:986
+#: Merge.rc:980
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr ""
-#: Merge.rc:989
+#: Merge.rc:983
#, c-format
msgid "Integration"
msgstr ""
-#: Merge.rc:990
+#: Merge.rc:984
#, c-format
msgid "&Add to explorer context menu"
msgstr ""
-#: Merge.rc:992
+#: Merge.rc:986
#, c-format
msgid "E&nable advanced menu"
msgstr ""
-#: Merge.rc:994
+#: Merge.rc:988
#, c-format
msgid "In&clude subfolders by default"
msgstr ""
-#: Merge.rc:996
+#: Merge.rc:990
#, c-format
msgid "&External editor:"
msgstr ""
-#: Merge.rc:999
+#: Merge.rc:993
#, c-format
msgid "&Filter folder:"
msgstr ""
-#: Merge.rc:1001
-#: Merge.rc:1413
-#: Merge.rc:1587
-#: Merge.rc:1591
-#: Merge.rc:1618
+#: Merge.rc:995
+#: Merge.rc:1407
+#: Merge.rc:1581
+#: Merge.rc:1585
+#: Merge.rc:1612
#, c-format
msgid "Browse..."
msgstr ""
-#: Merge.rc:1007
+#: Merge.rc:1001
#, c-format
msgid "Patch Generator"
msgstr ""
-#: Merge.rc:1010
+#: Merge.rc:1004
#, c-format
msgid "File&1:"
msgstr ""
-#: Merge.rc:1014
+#: Merge.rc:1008
#, c-format
msgid "File&2:"
msgstr ""
-#: Merge.rc:1017
+#: Merge.rc:1011
#, c-format
msgid "Br&owse..."
msgstr ""
-#: Merge.rc:1018
+#: Merge.rc:1012
#, c-format
msgid "&Swap"
msgstr ""
-#: Merge.rc:1019
+#: Merge.rc:1013
#, c-format
msgid "&Append to existing file"
msgstr ""
-#: Merge.rc:1021
+#: Merge.rc:1015
#, c-format
msgid "&Result:"
msgstr ""
-#: Merge.rc:1025
+#: Merge.rc:1019
#, c-format
msgid "&Format"
msgstr ""
-#: Merge.rc:1026
+#: Merge.rc:1020
#, c-format
msgid "St&yle:"
msgstr ""
-#: Merge.rc:1029
+#: Merge.rc:1023
#, c-format
msgid "&Context:"
msgstr ""
-#: Merge.rc:1032
+#: Merge.rc:1026
#, c-format
msgid "W&hitespaces"
msgstr ""
-#: Merge.rc:1033
+#: Merge.rc:1027
#, c-format
msgid "Com&pare"
msgstr ""
-#: Merge.rc:1035
+#: Merge.rc:1029
#, c-format
msgid "I&gnore changes"
msgstr ""
-#: Merge.rc:1037
+#: Merge.rc:1031
#, c-format
msgid "Ig&nore all"
msgstr ""
-#: Merge.rc:1039
+#: Merge.rc:1033
#, c-format
msgid "Ignor&e blank lines"
msgstr ""
-#: Merge.rc:1041
+#: Merge.rc:1035
#, c-format
msgid "Case sensi&tive"
msgstr ""
-#: Merge.rc:1043
+#: Merge.rc:1037
#, c-format
msgid "Inclu&de command line"
msgstr ""
-#: Merge.rc:1045
+#: Merge.rc:1039
#, c-format
msgid "Open to e&xternal editor"
msgstr ""
-#: Merge.rc:1067
+#: Merge.rc:1061
#, c-format
msgid "Display Columns"
msgstr ""
-#: Merge.rc:1073
+#: Merge.rc:1067
#, c-format
msgid "Move &Up"
msgstr ""
-#: Merge.rc:1074
+#: Merge.rc:1068
#, c-format
msgid "Move &Down"
msgstr ""
-#: Merge.rc:1084
+#: Merge.rc:1078
#, c-format
msgid "Select Unpacker"
msgstr ""
-#: Merge.rc:1089
+#: Merge.rc:1083
#, c-format
msgid "File unpacker:"
msgstr ""
-#: Merge.rc:1092
+#: Merge.rc:1086
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr ""
-#: Merge.rc:1095
+#: Merge.rc:1089
#, c-format
msgid "Extensions list:"
msgstr ""
-#: Merge.rc:1096
+#: Merge.rc:1090
#, c-format
msgid "Description:"
msgstr ""
-#: Merge.rc:1107
+#: Merge.rc:1101
#, c-format
msgid " Folder Compare Progress"
msgstr ""
-#: Merge.rc:1110
-#: Merge.rc:1850
+#: Merge.rc:1104
+#: Merge.rc:1844
#, c-format
msgid "Stop"
msgstr ""
-#: Merge.rc:1115
+#: Merge.rc:1109
#, c-format
msgid "Comparing items..."
msgstr ""
-#: Merge.rc:1116
+#: Merge.rc:1110
#, c-format
msgid "Items compared:"
msgstr ""
-#: Merge.rc:1117
+#: Merge.rc:1111
#, c-format
msgid "Items total:"
msgstr ""
-#: Merge.rc:1123
+#: Merge.rc:1117
#, c-format
msgid "Go To"
msgstr ""
-#: Merge.rc:1126
+#: Merge.rc:1120
#, c-format
msgid "G&oto:"
msgstr ""
-#: Merge.rc:1128
+#: Merge.rc:1122
#, c-format
msgid "File"
msgstr ""
-#: Merge.rc:1133
+#: Merge.rc:1127
#, c-format
msgid "Goto what"
msgstr ""
-#: Merge.rc:1134
+#: Merge.rc:1128
#, c-format
msgid "Li&ne"
msgstr ""
-#: Merge.rc:1136
+#: Merge.rc:1130
#, c-format
msgid "&Difference"
msgstr ""
-#: Merge.rc:1138
+#: Merge.rc:1132
#, c-format
msgid "&Go To"
msgstr ""
-#: Merge.rc:1144
-#: Merge.rc:1898
+#: Merge.rc:1138
+#: Merge.rc:1892
#, c-format
msgid "Compare"
msgstr ""
-#: Merge.rc:1147
+#: Merge.rc:1141
#, c-format
msgid "Whitespace"
msgstr ""
-#: Merge.rc:1148
+#: Merge.rc:1142
#, c-format
msgid "&Compare"
msgstr ""
-#: Merge.rc:1150
+#: Merge.rc:1144
#, c-format
msgid "&Ignore change"
msgstr ""
-#: Merge.rc:1152
+#: Merge.rc:1146
#, c-format
msgid "I&gnore all"
msgstr ""
-#: Merge.rc:1154
+#: Merge.rc:1148
#, c-format
msgid "Ignore blan&k lines"
msgstr ""
-#: Merge.rc:1156
+#: Merge.rc:1150
#, c-format
msgid "Ignore &case"
msgstr ""
-#: Merge.rc:1158
+#: Merge.rc:1152
#, c-format
msgid "Igno&re carriage return differences (DOS/UNIX/MAC)"
msgstr ""
-#: Merge.rc:1161
+#: Merge.rc:1155
#, c-format
msgid "E&nable moved block detection"
msgstr ""
-#: Merge.rc:1163
+#: Merge.rc:1157
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1165
+#: Merge.rc:1159
#, c-format
msgid "&File Compare method:"
msgstr ""
-#: Merge.rc:1168
+#: Merge.rc:1162
#, c-format
msgid "S&top after first difference"
msgstr ""
-#: Merge.rc:1171
+#: Merge.rc:1165
#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1178
-#: Merge.rc:1899
+#: Merge.rc:1172
+#: Merge.rc:1893
#, c-format
msgid "Editor"
msgstr ""
-#: Merge.rc:1181
+#: Merge.rc:1175
#, c-format
msgid "&Highlight syntax"
msgstr ""
-#: Merge.rc:1183
+#: Merge.rc:1177
#, c-format
msgid "&Automatic rescan"
msgstr ""
-#: Merge.rc:1185
+#: Merge.rc:1179
#, c-format
msgid "&Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1187
+#: Merge.rc:1181
#, c-format
msgid "Tabs"
msgstr ""
-#: Merge.rc:1188
+#: Merge.rc:1182
#, c-format
msgid "&Tab size:"
msgstr ""
-#: Merge.rc:1191
+#: Merge.rc:1185
#, c-format
msgid "&Insert Tabs"
msgstr ""
-#: Merge.rc:1193
+#: Merge.rc:1187
#, c-format
msgid "Insert &Spaces"
msgstr ""
-#: Merge.rc:1195
+#: Merge.rc:1189
#, c-format
msgid "Line Difference Coloring"
msgstr ""
-#: Merge.rc:1197
+#: Merge.rc:1191
#, c-format
msgid "View line differences"
msgstr ""
-#: Merge.rc:1199
+#: Merge.rc:1193
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1201
+#: Merge.rc:1195
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1216
+#: Merge.rc:1210
#, c-format
msgid "Filefilters"
msgstr ""
-#: Merge.rc:1222
+#: Merge.rc:1216
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1223
+#: Merge.rc:1217
#, c-format
msgid "Install..."
msgstr ""
-#: Merge.rc:1224
+#: Merge.rc:1218
#, c-format
msgid "New..."
msgstr ""
-#: Merge.rc:1225
+#: Merge.rc:1219
#, c-format
msgid "Edit..."
msgstr ""
-#: Merge.rc:1226
+#: Merge.rc:1220
#, c-format
msgid "Delete..."
msgstr ""
-#: Merge.rc:1232
+#: Merge.rc:1226
#, c-format
msgid "Save modified files?"
msgstr ""
-#: Merge.rc:1235
+#: Merge.rc:1229
#, c-format
msgid "Left side file"
msgstr ""
-#: Merge.rc:1238
+#: Merge.rc:1232
#, c-format
msgid "&Save changes"
msgstr ""
-#: Merge.rc:1240
+#: Merge.rc:1234
#, c-format
msgid "&Discard changes"
msgstr ""
-#: Merge.rc:1242
+#: Merge.rc:1236
#, c-format
msgid "Right side file"
msgstr ""
-#: Merge.rc:1245
+#: Merge.rc:1239
#, c-format
msgid "S&ave changes"
msgstr ""
-#: Merge.rc:1247
+#: Merge.rc:1241
#, c-format
msgid "Dis&card changes"
msgstr ""
-#: Merge.rc:1249
+#: Merge.rc:1243
#, c-format
msgid "Discard All"
msgstr ""
-#: Merge.rc:1256
-#: Merge.rc:1504
-#: Merge.rc:1905
+#: Merge.rc:1250
+#: Merge.rc:1498
+#: Merge.rc:1899
#, c-format
msgid "Codepage"
msgstr ""
-#: Merge.rc:1259
+#: Merge.rc:1253
#, c-format
msgid "Default Codepage"
msgstr ""
-#: Merge.rc:1260
+#: Merge.rc:1254
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-#: Merge.rc:1262
+#: Merge.rc:1256
#, c-format
msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session"
msgstr ""
-#: Merge.rc:1265
+#: Merge.rc:1259
#, c-format
msgid "System codepage"
msgstr ""
-#: Merge.rc:1267
+#: Merge.rc:1261
#, c-format
msgid "According to WinMerge User Interface"
msgstr ""
-#: Merge.rc:1269
+#: Merge.rc:1263
#, c-format
msgid "Custom codepage :"
msgstr ""
-#: Merge.rc:1277
+#: Merge.rc:1271
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr ""
-#: Merge.rc:1280
+#: Merge.rc:1274
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr ""
-#: Merge.rc:1283
+#: Merge.rc:1277
#, c-format
msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation."
msgstr ""
-#: Merge.rc:1285
+#: Merge.rc:1279
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr ""
-#: Merge.rc:1287
+#: Merge.rc:1281
#, c-format
msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
msgstr ""
-#: Merge.rc:1289
+#: Merge.rc:1283
#, c-format
msgid "Version"
msgstr ""
-#: Merge.rc:1291
+#: Merge.rc:1285
#, c-format
msgid "Plugin required\n(dllbuild %04u)"
msgstr ""
-#: Merge.rc:1293
+#: Merge.rc:1287
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr ""
-#: Merge.rc:1296
-#: Merge.rc:1299
+#: Merge.rc:1290
+#: Merge.rc:1293
#, c-format
msgid "present"
msgstr ""
-#: Merge.rc:1297
+#: Merge.rc:1291
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1300
+#: Merge.rc:1294
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr ""
-#: Merge.rc:1302
-#: Merge.rc:1307
+#: Merge.rc:1296
+#: Merge.rc:1301
#, c-format
msgid "none"
msgstr ""
-#: Merge.rc:1304
+#: Merge.rc:1298
#, c-format
msgid "missing"
msgstr ""
-#: Merge.rc:1305
+#: Merge.rc:1299
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr ""
-#: Merge.rc:1309
+#: Merge.rc:1303
#, c-format
msgid "outdated"
msgstr ""
-#: Merge.rc:1310
+#: Merge.rc:1304
#, c-format
msgid "Plugins on path:"
msgstr ""
-#: Merge.rc:1311
+#: Merge.rc:1305
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from help menu.)"
msgstr ""
-#: Merge.rc:1315
+#: Merge.rc:1309
#, c-format
msgid "Plugin Download"
msgstr ""
-#: Merge.rc:1324
+#: Merge.rc:1318
#, c-format
msgid "Options"
msgstr ""
-#: Merge.rc:1335
+#: Merge.rc:1329
#, c-format
msgid " Categories"
msgstr ""
-#: Merge.rc:1337
+#: Merge.rc:1331
#, c-format
msgid "Import..."
msgstr ""
-#: Merge.rc:1338
+#: Merge.rc:1332
#, c-format
msgid "Export..."
msgstr ""
-#: Merge.rc:1346
+#: Merge.rc:1340
#, c-format
msgid "Keywords:"
msgstr ""
-#: Merge.rc:1347
+#: Merge.rc:1341
#, c-format
msgid "Function names:"
msgstr ""
-#: Merge.rc:1348
+#: Merge.rc:1342
#, c-format
msgid "Comments:"
msgstr ""
-#: Merge.rc:1349
+#: Merge.rc:1343
#, c-format
msgid "Numbers:"
msgstr ""
-#: Merge.rc:1350
+#: Merge.rc:1344
#, c-format
msgid "Operators:"
msgstr ""
-#: Merge.rc:1351
+#: Merge.rc:1345
#, c-format
msgid "Strings:"
msgstr ""
-#: Merge.rc:1352
+#: Merge.rc:1346
#, c-format
msgid "Preprocessor:"
msgstr ""
-#: Merge.rc:1353
+#: Merge.rc:1347
#, c-format
msgid "User 1:"
msgstr ""
-#: Merge.rc:1354
+#: Merge.rc:1348
#, c-format
msgid "User 2:"
msgstr ""
-#: Merge.rc:1359
-#: Merge.rc:1364
-#: Merge.rc:1369
-#: Merge.rc:1374
-#: Merge.rc:1379
-#: Merge.rc:1384
-#: Merge.rc:1389
-#: Merge.rc:1394
-#: Merge.rc:1399
+#: Merge.rc:1353
+#: Merge.rc:1358
+#: Merge.rc:1363
+#: Merge.rc:1368
+#: Merge.rc:1373
+#: Merge.rc:1378
+#: Merge.rc:1383
+#: Merge.rc:1388
+#: Merge.rc:1393
#, c-format
msgid "Bold"
msgstr ""
-#: Merge.rc:1407
+#: Merge.rc:1401
#, c-format
msgid "Folder Compare Report"
msgstr ""
-#: Merge.rc:1410
+#: Merge.rc:1404
#, c-format
msgid "Report &File:"
msgstr ""
-#: Merge.rc:1414
+#: Merge.rc:1408
#, c-format
msgid "&Style:"
msgstr ""
-#: Merge.rc:1417
+#: Merge.rc:1411
#, c-format
msgid "&Copy to Clipboard"
msgstr ""
-#: Merge.rc:1425
+#: Merge.rc:1419
#, c-format
msgid "Shared or Private Filter"
msgstr ""
-#: Merge.rc:1428
+#: Merge.rc:1422
#, c-format
msgid "Which type of filter do you want to create?"
msgstr ""
-#: Merge.rc:1430
+#: Merge.rc:1424
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr ""
-#: Merge.rc:1432
+#: Merge.rc:1426
#, c-format
msgid "Private Filter (only for current user)"
msgstr ""
-#: Merge.rc:1440
-#: Merge.rc:1906
+#: Merge.rc:1434
+#: Merge.rc:1900
#, c-format
msgid "Archive Support"
msgstr ""
-#: Merge.rc:1443
+#: Merge.rc:1437
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr ""
-#: Merge.rc:1445
+#: Merge.rc:1439
#, c-format
msgid "Download 7-zip Plugin"
msgstr ""
-#: Merge.rc:1446
+#: Merge.rc:1440
#, c-format
msgid "&Enable archive file support"
msgstr ""
-#: Merge.rc:1448
+#: Merge.rc:1442
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr ""
-#: Merge.rc:1451
+#: Merge.rc:1445
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr ""
-#: Merge.rc:1453
+#: Merge.rc:1447
#, c-format
msgid "&Detect archive type from file signature"
msgstr ""
-#: Merge.rc:1461
+#: Merge.rc:1455
#, c-format
msgid "Compare Statistics"
msgstr ""
-#: Merge.rc:1464
+#: Merge.rc:1458
#, c-format
msgid "Folders:"
msgstr ""
-#: Merge.rc:1465
+#: Merge.rc:1459
#, c-format
msgid "Files:"
msgstr ""
-#: Merge.rc:1466
-#: Merge.rc:2268
+#: Merge.rc:1460
+#: Merge.rc:2259
#, c-format
msgid "Different"
msgstr ""
-#: Merge.rc:1467
+#: Merge.rc:1461
#, c-format
msgid "Text:"
msgstr ""
-#: Merge.rc:1470
-#: Merge.rc:1489
+#: Merge.rc:1464
+#: Merge.rc:1483
#, c-format
msgid "Binary:"
msgstr ""
-#: Merge.rc:1473
+#: Merge.rc:1467
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1474
+#: Merge.rc:1468
#, c-format
msgid "Left:"
msgstr ""
-#: Merge.rc:1479
+#: Merge.rc:1473
#, c-format
msgid "Right:"
msgstr ""
-#: Merge.rc:1484
-#: Merge.rc:2263
+#: Merge.rc:1478
+#: Merge.rc:2254
#, c-format
msgid "Identical"
msgstr ""
-#: Merge.rc:1493
+#: Merge.rc:1487
#, c-format
msgid "Total:"
msgstr ""
-#: Merge.rc:1498
+#: Merge.rc:1492
#, c-format
msgid "Close"
msgstr ""
-#: Merge.rc:1507
+#: Merge.rc:1501
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1510
-#: Merge.rc:1513
+#: Merge.rc:1504
+#: Merge.rc:1507
#, c-format
msgid "(Affects)"
msgstr ""
-#: Merge.rc:1514
+#: Merge.rc:1508
#, c-format
msgid "Select Codepage for"
msgstr ""
-#: Merge.rc:1515
+#: Merge.rc:1509
#, c-format
msgid "&File Loading:"
msgstr ""
-#: Merge.rc:1517
-#: Merge.rc:1520
+#: Merge.rc:1511
+#: Merge.rc:1514
#, c-format
msgid "..."
msgstr ""
-#: Merge.rc:1518
+#: Merge.rc:1512
#, c-format
msgid "File &Saving:"
msgstr ""
-#: Merge.rc:1521
+#: Merge.rc:1515
#, c-format
msgid "&Use same codepage for both"
msgstr ""
-#: Merge.rc:1524
+#: Merge.rc:1518
#, c-format
msgid "&Apply"
msgstr ""
-#: Merge.rc:1525
-#: Merge.rc:1872
+#: Merge.rc:1519
+#: Merge.rc:1866
#, c-format
msgid "&Cancel"
msgstr ""
-#: Merge.rc:1530
+#: Merge.rc:1524
#, c-format
msgid "Test Filter"
msgstr ""
-#: Merge.rc:1533
+#: Merge.rc:1527
#, c-format
msgid "Testing filter ..."
msgstr ""
-#: Merge.rc:1535
+#: Merge.rc:1529
#, c-format
msgid "&Enter text to test:"
msgstr ""
-#: Merge.rc:1537
+#: Merge.rc:1531
#, c-format
msgid "&Folder Name"
msgstr ""
-#: Merge.rc:1539
+#: Merge.rc:1533
#, c-format
msgid "Result:"
msgstr ""
-#: Merge.rc:1543
+#: Merge.rc:1537
#, c-format
msgid "&Test"
msgstr ""
-#: Merge.rc:1544
+#: Merge.rc:1538
#, c-format
msgid "&Close"
msgstr ""
-#: Merge.rc:1552
+#: Merge.rc:1546
#, c-format
msgid "&Use customized text colors"
msgstr ""
-#: Merge.rc:1555
+#: Merge.rc:1549
#, c-format
msgid "Custom text colors"
msgstr ""
-#: Merge.rc:1557
+#: Merge.rc:1551
#, c-format
msgid "Whitespace:"
msgstr ""
-#: Merge.rc:1558
+#: Merge.rc:1552
#, c-format
msgid "Regular text:"
msgstr ""
-#: Merge.rc:1559
+#: Merge.rc:1553
#, c-format
msgid "Selection:"
msgstr ""
-#: Merge.rc:1582
+#: Merge.rc:1576
#, c-format
msgid "Paths"
msgstr ""
-#: Merge.rc:1588
+#: Merge.rc:1582
#, c-format
msgid "R&ead-only"
msgstr ""
-#: Merge.rc:1592
+#: Merge.rc:1586
#, c-format
msgid "Re&ad-only"
msgstr ""
-#: Merge.rc:1598
+#: Merge.rc:1592
#, c-format
msgid "Open..."
msgstr ""
-#: Merge.rc:1599
+#: Merge.rc:1593
#, c-format
msgid "Save..."
msgstr ""
-#: Merge.rc:1604
-#: Merge.rc:1907
+#: Merge.rc:1598
+#: Merge.rc:1901
#, c-format
msgid "Backup Files"
msgstr ""
-#: Merge.rc:1607
+#: Merge.rc:1601
#, c-format
msgid "Create backup files in:"
msgstr ""
-#: Merge.rc:1612
+#: Merge.rc:1606
#, c-format
msgid "Create backup files into:"
msgstr ""
-#: Merge.rc:1613
+#: Merge.rc:1607
#, c-format
msgid "&Original file's folder"
msgstr ""
-#: Merge.rc:1615
+#: Merge.rc:1609
#, c-format
msgid "&Global backup folder:"
msgstr ""
-#: Merge.rc:1619
+#: Merge.rc:1613
#, c-format
msgid "Backup filename:"
msgstr ""
-#: Merge.rc:1620
+#: Merge.rc:1614
#, c-format
msgid "&Append .bak -extension"
msgstr ""
-#: Merge.rc:1622
+#: Merge.rc:1616
#, c-format
msgid "A&ppend timestamp"
msgstr ""
-#: Merge.rc:1629
+#: Merge.rc:1623
#, c-format
msgid "Confirm Copy"
msgstr ""
-#: Merge.rc:1633
+#: Merge.rc:1627
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr ""
-#: Merge.rc:1635
+#: Merge.rc:1629
#, c-format
msgid "From left"
msgstr ""
-#: Merge.rc:1638
+#: Merge.rc:1632
#, c-format
msgid "To right"
msgstr ""
-#: Merge.rc:1641
+#: Merge.rc:1635
#, c-format
msgid "Yes"
msgstr ""
-#: Merge.rc:1642
+#: Merge.rc:1636
#, c-format
msgid "No"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1667
+#: Merge.rc:1661
#, c-format
msgid "040904e4"
msgstr ""
#. VarFileInfo.Translation
-#: Merge.rc:1683
+#: Merge.rc:1677
#, c-format
msgid "0x409, 1252"
msgstr ""
-#: Merge.rc:1698
+#: Merge.rc:1692
#, c-format
msgid "Ready"
msgstr ""
-#: Merge.rc:1704
+#: Merge.rc:1698
#, c-format
msgid "EXT"
msgstr ""
-#: Merge.rc:1705
+#: Merge.rc:1699
#, c-format
msgid "CAP"
msgstr ""
-#: Merge.rc:1706
+#: Merge.rc:1700
#, c-format
msgid "NUM"
msgstr ""
-#: Merge.rc:1707
+#: Merge.rc:1701
#, c-format
msgid "SCRL"
msgstr ""
-#: Merge.rc:1708
+#: Merge.rc:1702
#, c-format
msgid "OVR"
msgstr ""
-#: Merge.rc:1709
+#: Merge.rc:1703
#, c-format
msgid "REC"
msgstr ""
-#: Merge.rc:1715
+#: Merge.rc:1709
#, c-format
msgid "Create empty documents\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1716
+#: Merge.rc:1710
#, c-format
msgid "Open an existing document\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1717
+#: Merge.rc:1711
#, c-format
msgid "Close the active document\nClose"
msgstr ""
-#: Merge.rc:1718
+#: Merge.rc:1712
#, c-format
msgid "Save the active document\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:1719
+#: Merge.rc:1713
#, c-format
msgid "Save the active document with a new name\nSave As"
msgstr ""
-#: Merge.rc:1720
+#: Merge.rc:1714
#, c-format
msgid "Change the printing options\nPage Setup"
msgstr ""
-#: Merge.rc:1721
+#: Merge.rc:1715
#, c-format
msgid "Change the printer and printing options\nPrint Setup"
msgstr ""
-#: Merge.rc:1722
+#: Merge.rc:1716
#, c-format
msgid "Print the active document\nPrint"
msgstr ""
-#: Merge.rc:1723
+#: Merge.rc:1717
#, c-format
msgid "Display full pages\nPrint Preview"
msgstr ""
-#: Merge.rc:1728
+#: Merge.rc:1722
#, c-format
msgid "Make all hidden items visible again"
msgstr ""
-#: Merge.rc:1734
+#: Merge.rc:1728
#, c-format
msgid "Open project file\nProject file (Ctrl+J)"
msgstr ""
-#: Merge.rc:1735
+#: Merge.rc:1729
#, c-format
msgid "Unknown error attempting to open project file"
msgstr ""
-#: Merge.rc:1736
+#: Merge.rc:1730
#, c-format
msgid "Unknown error attempting to save project file"
msgstr ""
-#: Merge.rc:1737
+#: Merge.rc:1731
#, c-format
msgid "Project File"
msgstr ""
-#: Merge.rc:1738
+#: Merge.rc:1732
#, c-format
msgid "Project file successfully loaded."
msgstr ""
-#: Merge.rc:1739
+#: Merge.rc:1733
#, c-format
msgid "Project file successfully saved."
msgstr ""
-#: Merge.rc:1740
+#: Merge.rc:1734
#, c-format
msgid "Save current paths and options to project file\nSave Project File"
msgstr ""
-#: Merge.rc:1745
+#: Merge.rc:1739
#, c-format
msgid "Display program information, version number and copyright\nAbout"
msgstr ""
-#: Merge.rc:1746
+#: Merge.rc:1740
#, c-format
msgid "Quit the application; prompts to save documents\nExit"
msgstr ""
+#: Merge.rc:1746
+#: Merge.rc:1747
+#: Merge.rc:1748
+#: Merge.rc:1749
+#: Merge.rc:1750
+#: Merge.rc:1751
#: Merge.rc:1752
#: Merge.rc:1753
#: Merge.rc:1754
@@ -2692,2768 +2684,2727 @@
#: Merge.rc:1759
#: Merge.rc:1760
#: Merge.rc:1761
-#: Merge.rc:1762
-#: Merge.rc:1763
-#: Merge.rc:1764
-#: Merge.rc:1765
-#: Merge.rc:1766
-#: Merge.rc:1767
#, c-format
msgid "Open this document"
msgstr ""
-#: Merge.rc:1772
+#: Merge.rc:1766
#, c-format
msgid "Switch to the next window pane\nNext Pane"
msgstr ""
-#: Merge.rc:1773
+#: Merge.rc:1767
#, c-format
msgid "Switch back to the previous window pane\nPrevious Pane"
msgstr ""
-#: Merge.rc:1779
+#: Merge.rc:1773
#, c-format
msgid "Arrange windows so they overlap\nCascade Windows"
msgstr ""
-#: Merge.rc:1780
+#: Merge.rc:1774
#, c-format
msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
msgstr ""
-#: Merge.rc:1781
+#: Merge.rc:1775
#, c-format
msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
msgstr ""
-#: Merge.rc:1787
+#: Merge.rc:1781
#, c-format
msgid "Copy the selection and put it on the Clipboard\nCopy"
msgstr ""
-#: Merge.rc:1788
+#: Merge.rc:1782
#, c-format
msgid "Cut the selection and put it on the Clipboard\nCut"
msgstr ""
-#: Merge.rc:1789
+#: Merge.rc:1783
#, c-format
msgid "Find the specified text\nFind"
msgstr ""
-#: Merge.rc:1790
+#: Merge.rc:1784
#, c-format
msgid "Insert Clipboard contents\nPaste"
msgstr ""
-#: Merge.rc:1791
+#: Merge.rc:1785
#, c-format
msgid "Repeat the last action\nRepeat"
msgstr ""
-#: Merge.rc:1792
+#: Merge.rc:1786
#, c-format
msgid "Replace specific text with different text\nReplace"
msgstr ""
-#: Merge.rc:1793
+#: Merge.rc:1787
#, c-format
msgid "Select the entire document\nSelect All"
msgstr ""
-#: Merge.rc:1794
+#: Merge.rc:1788
#, c-format
msgid "Undo the last action\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:1795
+#: Merge.rc:1789
#, c-format
msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:1801
+#: Merge.rc:1795
#, c-format
msgid "Show or hide the toolbar\nToggle ToolBar"
msgstr ""
-#: Merge.rc:1802
+#: Merge.rc:1796
#, c-format
msgid "Show or hide the status bar\nToggle StatusBar"
msgstr ""
-#: Merge.rc:1803
+#: Merge.rc:1797
#, c-format
msgid "Show or hide the tab bar\nToggle TabBar"
msgstr ""
-#: Merge.rc:1804
+#: Merge.rc:1798
#, c-format
msgid "Automatically resize panes\nLock Panes"
msgstr ""
-#: Merge.rc:1810
+#: Merge.rc:1804
#, c-format
msgid "Change the window size"
msgstr ""
-#: Merge.rc:1811
+#: Merge.rc:1805
#, c-format
msgid "Change the window position"
msgstr ""
-#: Merge.rc:1812
+#: Merge.rc:1806
#, c-format
msgid "Reduce the window to an icon"
msgstr ""
-#: Merge.rc:1813
+#: Merge.rc:1807
#, c-format
msgid "Enlarge the window to full size"
msgstr ""
-#: Merge.rc:1814
+#: Merge.rc:1808
#, c-format
msgid "Switch to the next document window"
msgstr ""
-#: Merge.rc:1815
+#: Merge.rc:1809
#, c-format
msgid "Switch to the previous document window"
msgstr ""
-#: Merge.rc:1816
+#: Merge.rc:1810
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr ""
-#: Merge.rc:1821
+#: Merge.rc:1815
#, c-format
msgid "Restore the window to normal size"
msgstr ""
-#: Merge.rc:1822
+#: Merge.rc:1816
#, c-format
msgid "Activate Task List"
msgstr ""
-#: Merge.rc:1823
+#: Merge.rc:1817
#, c-format
msgid "Activate this window"
msgstr ""
-#: Merge.rc:1829
+#: Merge.rc:1823
#, c-format
msgid "Close print preview mode\nCancel Preview"
msgstr ""
-#: Merge.rc:1836
+#: Merge.rc:1830
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr ""
-#: Merge.rc:1837
+#: Merge.rc:1831
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr ""
-#: Merge.rc:1844
+#: Merge.rc:1838
#, c-format
msgid "Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1851
+#: Merge.rc:1845
#, c-format
msgid "Press any key"
msgstr ""
-#: Merge.rc:1857
-#: Merge.rc:1858
+#: Merge.rc:1851
+#: Merge.rc:1852
#, c-format
msgid "Right click on the path to copy"
msgstr ""
-#: Merge.rc:1864
+#: Merge.rc:1858
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
msgstr ""
-#: Merge.rc:1865
+#: Merge.rc:1859
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
msgstr ""
-#: Merge.rc:1871
+#: Merge.rc:1865
#, c-format
msgid "&Ok"
msgstr ""
-#: Merge.rc:1873
+#: Merge.rc:1867
#, c-format
msgid "&Abort"
msgstr ""
-#: Merge.rc:1874
+#: Merge.rc:1868
#, c-format
msgid "&Retry"
msgstr ""
-#: Merge.rc:1875
+#: Merge.rc:1869
#, c-format
msgid "&Ignore"
msgstr ""
-#: Merge.rc:1876
+#: Merge.rc:1870
#, c-format
msgid "Ignore &all"
msgstr ""
-#: Merge.rc:1877
+#: Merge.rc:1871
#, c-format
msgid "&Yes"
msgstr ""
-#: Merge.rc:1883
+#: Merge.rc:1877
#, c-format
msgid "Yes to &all"
msgstr ""
-#: Merge.rc:1884
+#: Merge.rc:1878
#, c-format
msgid "&No"
msgstr ""
-#: Merge.rc:1885
+#: Merge.rc:1879
#, c-format
msgid "No to a&ll"
msgstr ""
-#: Merge.rc:1886
+#: Merge.rc:1880
#, c-format
msgid "&Continue"
msgstr ""
-#: Merge.rc:1887
+#: Merge.rc:1881
#, c-format
msgid "&Skip"
msgstr ""
-#: Merge.rc:1888
+#: Merge.rc:1882
#, c-format
msgid "Skip &all"
msgstr ""
-#: Merge.rc:1890
+#: Merge.rc:1884
#, c-format
msgid "Don't display this &message again."
msgstr ""
-#: Merge.rc:1891
+#: Merge.rc:1885
#, c-format
msgid "Don't ask this &question again."
msgstr ""
-#: Merge.rc:1901
+#: Merge.rc:1895
#, c-format
msgid "Syntax colors"
msgstr ""
-#: Merge.rc:1902
+#: Merge.rc:1896
#, c-format
msgid "Text Colors"
msgstr ""
-#: Merge.rc:1904
+#: Merge.rc:1898
#, c-format
msgid "Version Control"
msgstr ""
-#: Merge.rc:1914
+#: Merge.rc:1908
#, c-format
msgid "To:"
msgstr ""
-#: Merge.rc:1915
+#: Merge.rc:1909
#, c-format
msgid "From left:"
msgstr ""
-#: Merge.rc:1916
+#: Merge.rc:1910
#, c-format
msgid "To left:"
msgstr ""
-#: Merge.rc:1917
+#: Merge.rc:1911
#, c-format
msgid "From right:"
msgstr ""
-#: Merge.rc:1918
+#: Merge.rc:1912
#, c-format
msgid "To right:"
msgstr ""
-#: Merge.rc:1924
+#: Merge.rc:1918
#, c-format
msgid "Version %1"
msgstr ""
-#: Merge.rc:1925
+#: Merge.rc:1919
#, c-format
msgid "Unicode"
msgstr ""
-#: Merge.rc:1931
+#: Merge.rc:1925
#, c-format
msgid "Options (%1)"
msgstr ""
-#: Merge.rc:1932
+#: Merge.rc:1926
#, c-format
msgid "All message boxes are now displayed again."
msgstr ""
-#: Merge.rc:1933
+#: Merge.rc:1927
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr ""
-#: Merge.rc:1934
+#: Merge.rc:1928
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr ""
-#: Merge.rc:1936
+#: Merge.rc:1930
#, c-format
msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
msgstr ""
-#: Merge.rc:1938
+#: Merge.rc:1932
#, c-format
msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
msgstr ""
-#: Merge.rc:1944
+#: Merge.rc:1938
#, c-format
msgid "Open"
msgstr ""
-#: Merge.rc:1945
+#: Merge.rc:1939
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1946
+#: Merge.rc:1940
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1947
+#: Merge.rc:1941
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr ""
-#: Merge.rc:1949
+#: Merge.rc:1943
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1955
+#: Merge.rc:1949
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1956
+#: Merge.rc:1950
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1957
+#: Merge.rc:1951
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1963
+#: Merge.rc:1957
#, c-format
msgid "Full Contents"
msgstr ""
-#: Merge.rc:1964
+#: Merge.rc:1958
#, c-format
msgid "Quick Contents"
msgstr ""
-#: Merge.rc:1965
+#: Merge.rc:1959
#, c-format
msgid "Modified Date"
msgstr ""
-#: Merge.rc:1966
+#: Merge.rc:1960
#, c-format
msgid "Modified Date and Size"
msgstr ""
-#: Merge.rc:1967
+#: Merge.rc:1961
#, c-format
msgid "Size"
msgstr ""
-#: Merge.rc:1973
+#: Merge.rc:1967
#, c-format
msgid "Name"
msgstr ""
-#: Merge.rc:1974
+#: Merge.rc:1968
#, c-format
msgid "Location"
msgstr ""
-#: Merge.rc:1975
+#: Merge.rc:1969
#, c-format
msgid "Filters"
msgstr ""
-#: Merge.rc:1976
+#: Merge.rc:1970
#, c-format
msgid "[F] "
msgstr ""
-#: Merge.rc:1977
+#: Merge.rc:1971
#, c-format
msgid "Description"
msgstr ""
-#: Merge.rc:1978
+#: Merge.rc:1972
#, c-format
msgid "Select filename for new filter"
msgstr ""
-#: Merge.rc:1979
+#: Merge.rc:1973
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1981
+#: Merge.rc:1975
#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
msgstr ""
-#: Merge.rc:1983
+#: Merge.rc:1977
#, c-format
msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
msgstr ""
-#: Merge.rc:1985
+#: Merge.rc:1979
#, c-format
msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
msgstr ""
-#: Merge.rc:1987
+#: Merge.rc:1981
#, c-format
msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
msgstr ""
-#: Merge.rc:1988
+#: Merge.rc:1982
#, c-format
msgid "Locate filter file to install"
msgstr ""
-#: Merge.rc:1990
+#: Merge.rc:1984
#, c-format
msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
msgstr ""
-#: Merge.rc:1992
+#: Merge.rc:1986
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr ""
-#: Merge.rc:1998
+#: Merge.rc:1992
#, c-format
msgid "Regular expression"
msgstr ""
-#: Merge.rc:2004
+#: Merge.rc:1998
#, c-format
msgid "&Path to cleartool.exe :"
msgstr ""
-#: Merge.rc:2005
+#: Merge.rc:1999
#, c-format
msgid "&Path to SS.EXE :"
msgstr ""
-#: Merge.rc:2011
+#: Merge.rc:2005
#, c-format
msgid "Folder Comparison Results"
msgstr ""
-#: Merge.rc:2012
+#: Merge.rc:2006
#, c-format
msgid "File Comparison"
msgstr ""
-#: Merge.rc:2013
+#: Merge.rc:2007
#, c-format
msgid "Untitled left"
msgstr ""
-#: Merge.rc:2014
+#: Merge.rc:2008
#, c-format
msgid "Untitled right"
msgstr ""...
[truncated message content] |
|
From: <jt...@us...> - 2008-02-09 09:07:55
|
Revision: 5015
http://winmerge.svn.sourceforge.net/winmerge/?rev=5015&view=rev
Author: jtuc
Date: 2008-02-09 01:07:53 -0800 (Sat, 09 Feb 2008)
Log Message:
-----------
Patch #1885119 - (3) Make DirCompProgressDlg operational for single threaded operation.
Modified Paths:
--------------
trunk/Src/DiffThread.cpp
trunk/Src/DiffThread.h
Modified: trunk/Src/DiffThread.cpp
===================================================================
--- trunk/Src/DiffThread.cpp 2008-02-07 21:40:57 UTC (rev 5014)
+++ trunk/Src/DiffThread.cpp 2008-02-09 09:07:53 UTC (rev 5015)
@@ -124,6 +124,22 @@
}
/**
+ * @brief runtime interface for child thread, called on child thread
+ */
+bool CDiffThread::ShouldAbort() const
+{
+ if (bSinglethreaded)
+ {
+ MSG msg;
+ while (::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE))
+ {
+ AfxGetApp()->PumpMessage();
+ }
+ }
+ return m_bAborting;
+}
+
+/**
* @brief Start and run directory compare thread.
* @param [in] dir1 First directory to compare.
* @param [in] dir2 Second directory to compare.
Modified: trunk/Src/DiffThread.h
===================================================================
--- trunk/Src/DiffThread.h 2008-02-07 21:40:57 UTC (rev 5014)
+++ trunk/Src/DiffThread.h 2008-02-09 09:07:53 UTC (rev 5015)
@@ -63,7 +63,7 @@
bool IsAborting() const { return m_bAborting; }
// runtime interface for child thread, called on child thread
- bool ShouldAbort() const { return m_bAborting; }
+ bool ShouldAbort() const;
private:
CDiffContext * m_pDiffContext; /**< Compare context storing results. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2008-02-10 11:50:38
|
Revision: 5019
http://winmerge.svn.sourceforge.net/winmerge/?rev=5019&view=rev
Author: jtuc
Date: 2008-02-10 03:50:33 -0800 (Sun, 10 Feb 2008)
Log Message:
-----------
Patch #1885119 - (1) Remove redundant variables from DIFFITEM.
Modified Paths:
--------------
trunk/Src/7zCommon.cpp
trunk/Src/7zCommon.h
trunk/Src/DiffContext.cpp
trunk/Src/DiffFileInfo.cpp
trunk/Src/DiffFileInfo.h
trunk/Src/DiffItem.cpp
trunk/Src/DiffItem.h
trunk/Src/DirActions.cpp
trunk/Src/DirDoc.cpp
trunk/Src/DirItem.cpp
trunk/Src/DirItem.h
trunk/Src/DirScan.cpp
trunk/Src/DirView.cpp
trunk/Src/DirView.h
trunk/Src/DirViewColItems.cpp
trunk/Src/FolderCmp.cpp
trunk/Src/MainFrm.cpp
Modified: trunk/Src/7zCommon.cpp
===================================================================
--- trunk/Src/7zCommon.cpp 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/7zCommon.cpp 2008-02-10 11:50:33 UTC (rev 5019)
@@ -805,7 +805,7 @@
// Collect implied folders
for (UINT i = Open() ; i-- ; )
{
- DIFFITEM di = Next();
+ const DIFFITEM &di = Next();
if ((m_nFlags & DiffsOnly) && !m_pView->IsItemNavigableDiff(di))
{
continue;
@@ -816,7 +816,7 @@
if (!di.diffcode.isSideLeftOnly())
{
// Item is present on right side, i.e. folder is implied
- m_rgImpliedFoldersRight[di.sRightSubdir.c_str()] = PVOID(1);
+ m_rgImpliedFoldersRight[di.right.path.c_str()] = PVOID(1);
}
}
else
@@ -825,7 +825,7 @@
if (!di.diffcode.isSideRightOnly())
{
// Item is present on left side, i.e. folder is implied
- m_rgImpliedFoldersLeft[di.sLeftSubdir.c_str()] = PVOID(1);
+ m_rgImpliedFoldersLeft[di.left.path.c_str()] = PVOID(1);
}
}
}
@@ -860,7 +860,7 @@
/**
* @brief Return next item.
*/
-DIFFITEM CDirView::DirItemEnumerator::Next()
+const DIFFITEM &CDirView::DirItemEnumerator::Next()
{
enum {nMask = LVNI_FOCUSED|LVNI_SELECTED|LVNI_CUT|LVNI_DROPHILITED};
while ((m_nIndex = pView(m_pView)->GetNextItem(m_nIndex, m_nFlags & nMask)) == -1)
@@ -868,7 +868,7 @@
m_strFolderPrefix = m_rgFolderPrefix.GetNext(m_curFolderPrefix);
m_bRight = TRUE;
}
- return m_pView->GetItemAt(m_nIndex);
+ return m_pView->GetDiffItem(m_nIndex);
}
/**
@@ -888,7 +888,7 @@
Merge7z::Envelope *CDirView::DirItemEnumerator::Enum(Item &item)
{
CDirDoc * pDoc = m_pView->GetDocument();
- DIFFITEM di = Next();
+ const DIFFITEM &di = Next();
if ((m_nFlags & DiffsOnly) && !m_pView->IsItemNavigableDiff(di))
{
@@ -900,8 +900,8 @@
Envelope *envelope = new Envelope;
- const String &sFilename = m_bRight ? di.sRightFilename : di.sLeftFilename;
- const String &sSubdir = m_bRight ? di.sRightSubdir : di.sLeftSubdir;
+ const String &sFilename = m_bRight ? di.right.filename : di.left.filename;
+ const String &sSubdir = m_bRight ? di.right.path : di.left.path;
envelope->Name = sFilename;
if (sSubdir.length())
{
@@ -924,12 +924,12 @@
if (isSideLeft)
{
// Item is missing on right side
- PVOID &implied = m_rgImpliedFoldersRight[di.sLeftSubdir.c_str()];
+ PVOID &implied = m_rgImpliedFoldersRight[di.left.path.c_str()];
if (!implied)
{
// Folder is not implied by some other file, and has
// not been enumerated so far, so enumerate it now!
- envelope->Name = di.sLeftSubdir;
+ envelope->Name = di.left.path;
envelope->FullPath = di.getLeftFilepath(pDoc->GetLeftBasePath());
implied = PVOID(2); // Don't enumerate same folder twice!
isSideLeft = false;
@@ -943,12 +943,12 @@
if (isSideRight)
{
// Item is missing on left side
- PVOID &implied = m_rgImpliedFoldersLeft[di.sRightSubdir.c_str()];
+ PVOID &implied = m_rgImpliedFoldersLeft[di.right.path.c_str()];
if (!implied)
{
// Folder is not implied by some other file, and has
// not been enumerated so far, so enumerate it now!
- envelope->Name = di.sRightSubdir;
+ envelope->Name = di.right.path;
envelope->FullPath = di.getRightFilepath(pDoc->GetRightBasePath());
implied = PVOID(2); // Don't enumerate same folder twice!
isSideRight = false;
@@ -1100,19 +1100,19 @@
int cchBuffer = 0;
for (i = Open() ; i-- ; )
{
- DIFFITEM di = Next();
+ const DIFFITEM &di = Next();
if (m_bRight ? m_pView->IsItemOpenableOnRightWith(di) : m_pView->IsItemOpenableOnLeftWith(di))
{
cchBuffer +=
(
m_bRight ? di.getRightFilepath(sLeftRootPath) : di.getLeftFilepath(sRightRootPath)
- ).length() + (m_bRight ? di.sRightFilename : di.sLeftFilename).length() + 2;
+ ).length() + (m_bRight ? di.right.filename : di.left.filename).length() + 2;
}
}
LPTSTR pchBuffer = strBuffer.GetBufferSetLength(cchBuffer);
for (i = Open() ; i-- ; )
{
- DIFFITEM di = Next();
+ const DIFFITEM &di = Next();
if (m_bRight ? m_pView->IsItemOpenableOnRightWith(di) : m_pView->IsItemOpenableOnLeftWith(di))
{
pchBuffer += wsprintf
@@ -1120,7 +1120,7 @@
pchBuffer,
_T("%s\\%s"),
m_bRight ? di.getRightFilepath(sLeftRootPath).c_str() : di.getLeftFilepath(sRightRootPath).c_str(),
- m_bRight ? di.sRightFilename.c_str() : di.sLeftFilename.c_str()
+ m_bRight ? di.right.filename.c_str() : di.left.filename.c_str()
) + 1;
}
}
Modified: trunk/Src/7zCommon.h
===================================================================
--- trunk/Src/7zCommon.h 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/7zCommon.h 2008-02-10 11:50:33 UTC (rev 5019)
@@ -66,7 +66,7 @@
CMapStringToPtr m_rgImpliedFoldersLeft;
CMapStringToPtr m_rgImpliedFoldersRight;
// helper methods
- DIFFITEM Next();
+ const DIFFITEM &Next();
bool MultiStepCompressArchive(LPCTSTR);
public:
enum
Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DiffContext.cpp 2008-02-10 11:50:33 UTC (rev 5019)
@@ -141,13 +141,13 @@
DIFFITEM &di = m_pList->GetAt(diffpos);
if (bLeft)
{
- di.left.Clear();
+ di.left.ClearPartial();
if (!di.diffcode.isSideRightOnly())
UpdateInfoFromDiskHalf(di, TRUE);
}
if (bRight)
{
- di.right.Clear();
+ di.right.ClearPartial();
if (!di.diffcode.isSideLeftOnly())
UpdateInfoFromDiskHalf(di, FALSE);
}
@@ -165,9 +165,9 @@
String filepath;
if (bLeft == TRUE)
- filepath = paths_ConcatPath(di.getLeftFilepath(GetNormalizedLeft()), di.sLeftFilename);
+ filepath = paths_ConcatPath(di.getLeftFilepath(GetNormalizedLeft()), di.left.filename);
else
- filepath = paths_ConcatPath(di.getRightFilepath(GetNormalizedRight()), di.sRightFilename);
+ filepath = paths_ConcatPath(di.getRightFilepath(GetNormalizedRight()), di.right.filename);
DiffFileInfo & dfi = bLeft ? di.left : di.right;
if (!dfi.Update(filepath.c_str()))
@@ -219,21 +219,21 @@
{
if (di.diffcode.isSideRightOnly())
return;
- LPCTSTR ext = PathFindExtension(di.sLeftFilename.c_str());
+ LPCTSTR ext = PathFindExtension(di.left.filename.c_str());
if (!CheckFileForVersion(ext))
return;
spath = di.getLeftFilepath(GetNormalizedLeft());
- spath = paths_ConcatPath(spath, di.sLeftFilename);
+ spath = paths_ConcatPath(spath, di.left.filename);
}
else
{
if (di.diffcode.isSideLeftOnly())
return;
- LPCTSTR ext = PathFindExtension(di.sRightFilename.c_str());
+ LPCTSTR ext = PathFindExtension(di.right.filename.c_str());
if (!CheckFileForVersion(ext))
return;
spath = di.getRightFilepath(GetNormalizedRight());
- spath = paths_ConcatPath(spath, di.sRightFilename);
+ spath = paths_ConcatPath(spath, di.right.filename);
}
// Get version info if it exists
Modified: trunk/Src/DiffFileInfo.cpp
===================================================================
--- trunk/Src/DiffFileInfo.cpp 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DiffFileInfo.cpp 2008-02-10 11:50:33 UTC (rev 5019)
@@ -30,12 +30,23 @@
/**
* @brief Clears FileInfo data.
*/
-void DiffFileInfo::Clear()
+/*void DiffFileInfo::Clear()
{
DirItem::Clear();
bVersionChecked = false;
encoding.Clear();
m_textStats.clear();
+}*/
+
+/**
+ * @brief Clears FileInfo data.
+ */
+void DiffFileInfo::ClearPartial()
+{
+ DirItem::ClearPartial();
+ bVersionChecked = false;
+ encoding.Clear();
+ m_textStats.clear();
}
/**
Modified: trunk/Src/DiffFileInfo.h
===================================================================
--- trunk/Src/DiffFileInfo.h 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DiffFileInfo.h 2008-02-10 11:50:33 UTC (rev 5019)
@@ -43,7 +43,7 @@
struct DiffFileFlags : public FileFlags
{
DWORD coding; /**< Coding info for item */
- DiffFileFlags() : coding(0) { FileFlags(); }
+ DiffFileFlags() : coding(0) { }
/// Convert flags and coding to string for UI.
String toString() const
@@ -102,8 +102,9 @@
// methods
- DiffFileInfo() { Clear(); }
- void Clear();
+ DiffFileInfo(): bVersionChecked(false) { }
+ //void Clear();
+ void ClearPartial();
bool IsEditableEncoding() const;
};
Modified: trunk/Src/DiffItem.cpp
===================================================================
--- trunk/Src/DiffItem.cpp 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DiffItem.cpp 2008-02-10 11:50:33 UTC (rev 5019)
@@ -25,10 +25,6 @@
diffcode = di.diffcode;
left = di.left;
right = di.right;
- sLeftFilename = di.sLeftFilename;
- sRightFilename = di.sRightFilename;
- sLeftSubdir = di.sLeftSubdir;
- sRightSubdir = di.sRightSubdir;
nsdiffs = di.nsdiffs;
nidiffs = di.nidiffs;
errorDesc = di.errorDesc;
@@ -48,10 +44,6 @@
diffcode = di.diffcode;
left = di.left;
right = di.right;
- sLeftFilename = di.sLeftFilename;
- sRightFilename = di.sRightFilename;
- sLeftSubdir = di.sLeftSubdir;
- sRightSubdir = di.sRightSubdir;
nsdiffs = di.nsdiffs;
nidiffs = di.nidiffs;
errorDesc = di.errorDesc;
@@ -75,7 +67,7 @@
String sPath;
if (!diffcode.isSideRightOnly())
{
- sPath = paths_ConcatPath(sLeftRoot, sLeftSubdir);
+ sPath = paths_ConcatPath(sLeftRoot, left.path);
}
return sPath;
}
@@ -86,7 +78,7 @@
String sPath;
if (!diffcode.isSideLeftOnly())
{
- sPath = paths_ConcatPath(sRightRoot, sRightSubdir);
+ sPath = paths_ConcatPath(sRightRoot, right.path);
}
return sPath;
}
Modified: trunk/Src/DiffItem.h
===================================================================
--- trunk/Src/DiffItem.h 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DiffItem.h 2008-02-10 11:50:33 UTC (rev 5019)
@@ -124,10 +124,6 @@
{
DiffFileInfo left; /**< Fileinfo for left file */
DiffFileInfo right; /**< Fileinfo for right file */
- String sLeftFilename; /**< Left filename (without path!) */
- String sRightFilename; /**< Right filename (without path!) */
- String sLeftSubdir; /**< Left subdirectory from root of comparison */
- String sRightSubdir; /**< Right subdirectory from root of comparison */
int nsdiffs; /**< Amount of non-ignored differences */
int nidiffs; /**< Amount of ignored differences */
String errorDesc; /**< technical note about error */
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DirActions.cpp 2008-02-10 11:50:33 UTC (rev 5019)
@@ -540,13 +540,13 @@
if (GetDocument()->GetRecursive())
{
- if (!di.sLeftSubdir.empty())
+ if (!di.left.path.empty())
{
- sFullDest += di.sLeftSubdir.c_str();
+ sFullDest += di.left.path.c_str();
sFullDest += _T("\\");
}
}
- sFullDest += di.sLeftFilename.c_str();
+ sFullDest += di.left.filename.c_str();
act.dest = sFullDest;
act.src = slFile;
@@ -610,13 +610,13 @@
if (GetDocument()->GetRecursive())
{
- if (!di.sRightSubdir.empty())
+ if (!di.right.path.empty())
{
- sFullDest += di.sRightSubdir.c_str();
+ sFullDest += di.right.path.c_str();
sFullDest += _T("\\");
}
}
- sFullDest += di.sRightFilename.c_str();
+ sFullDest += di.right.filename.c_str();
act.dest = sFullDest;
act.src = srFile;
@@ -677,13 +677,13 @@
sFullDest += _T("\\");
if (GetDocument()->GetRecursive())
{
- if (!di.sLeftSubdir.empty())
+ if (!di.left.path.empty())
{
- sFullDest += di.sLeftSubdir.c_str();
+ sFullDest += di.left.path.c_str();
sFullDest += _T("\\");
}
}
- sFullDest += di.sLeftFilename.c_str();
+ sFullDest += di.left.filename.c_str();
act.dest = sFullDest;
act.src = slFile;
@@ -744,13 +744,13 @@
sFullDest += _T("\\");
if (GetDocument()->GetRecursive())
{
- if (!di.sRightSubdir.empty())
+ if (!di.right.path.empty())
{
- sFullDest += di.sRightSubdir.c_str();
+ sFullDest += di.right.path.c_str();
sFullDest += _T("\\");
}
}
- sFullDest += di.sRightFilename.c_str();
+ sFullDest += di.right.filename.c_str();
act.dest = sFullDest;
act.src = srFile;
@@ -1176,8 +1176,8 @@
else
{
const DIFFITEM & di = GetDocument()->GetDiffByKey(diffpos);
- const String leftrelpath = paths_ConcatPath(di.sLeftSubdir, di.sLeftFilename);
- const String rightrelpath = paths_ConcatPath(di.sRightSubdir, di.sRightFilename);
+ const String leftrelpath = paths_ConcatPath(di.left.path, di.left.filename);
+ const String rightrelpath = paths_ConcatPath(di.right.path, di.right.filename);
const String & leftpath = GetDocument()->GetLeftBasePath();
const String & rightpath = GetDocument()->GetRightBasePath();
strLeft = paths_ConcatPath(leftpath, leftrelpath);
@@ -1280,7 +1280,7 @@
if (GetItemKey(sel) == SPECIAL_ITEM_POS)
continue;
- DIFFITEM di = GetDiffItem(sel);
+ const DIFFITEM &di = GetDiffItem(sel);
GetDocument()->SetDiffStatus(0, DIFFCODE::TEXTFLAGS | DIFFCODE::SIDEFLAGS | DIFFCODE::COMPAREFLAGS, sel);
GetDocument()->SetDiffStatus(DIFFCODE::NEEDSCAN, DIFFCODE::SCANFLAGS, sel);
++items;
@@ -1486,7 +1486,7 @@
POSITION key = GetItemKey(nSelItem);
ASSERT(key != SPECIAL_ITEM_POS);
- di = GetDocument()->GetDiffRefByKey(key);
+ ASSERT(&di == &GetDocument()->GetDiffRefByKey(key));
BOOL bRenameLeft = FALSE;
BOOL bRenameRight = FALSE;
@@ -1497,18 +1497,18 @@
if ((TRUE == bRenameLeft) && (TRUE == bRenameRight))
{
- di.sLeftFilename = szNewItemName;
- di.sRightFilename = szNewItemName;
+ di.left.filename = szNewItemName;
+ di.right.filename = szNewItemName;
}
else if (TRUE == bRenameLeft)
{
- di.sLeftFilename = szNewItemName;
- di.sRightFilename.erase();
+ di.left.filename = szNewItemName;
+ di.right.filename.erase();
}
else if (TRUE == bRenameRight)
{
- di.sLeftFilename.erase();
- di.sRightFilename = szNewItemName;
+ di.left.filename.erase();
+ di.right.filename = szNewItemName;
}
return (bRenameLeft || bRenameRight);
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DirDoc.cpp 2008-02-10 11:50:33 UTC (rev 5019)
@@ -511,45 +511,43 @@
*/
POSITION CDirDoc::FindItemFromPaths(LPCTSTR pathLeft, LPCTSTR pathRight)
{
- POSITION pos = m_pCtxt->GetFirstDiffPosition();
- POSITION currentPos;
+ LPCTSTR file1 = paths_FindFileName(pathLeft);
+ LPCTSTR file2 = paths_FindFileName(pathRight);
- String path1, file1;
- SplitFilename(pathLeft, &path1, &file1, NULL);
- //CString path1(tpath1.c_str()), file1(tfile1.c_str());
- String path2, file2;
- SplitFilename(pathRight, &path2, &file2, NULL);
- //CString path2(tpath2.c_str()), file2(tfile2.c_str());
-
// Filenames must be identical
- if (lstrcmpi(file1.c_str(), file2.c_str()) != 0)
+ if (lstrcmpi(file1, file2) != 0)
return NULL;
+ String path1(pathLeft, file1 - pathLeft); // include trailing backslash
+ String path2(pathRight, file2 - pathRight); // include trailing backslash
+
// Path can contain (because of difftools?) '/' and '\'
// so for comparing purposes, convert whole path to use '\\'
replace_char(&*path1.begin(), '/', '\\');
replace_char(&*path2.begin(), '/', '\\');
- // Add trailing slash to root paths, to work with getLeftFilepath etc
- if (path1.length() == 2 && path1[1] == ':')
- path1 += '\\';
- if (path2.length() == 2 && path2[1] == ':')
- path2 += '\\';
+ String base1 = m_pCtxt->GetLeftPath(); // include trailing backslash
+ if (path1.compare(0, base1.length(), base1.c_str()) != 0)
+ return NULL;
+ path1.erase(0, base1.length()); // turn into relative path
+ if (String::size_type length = path1.length())
+ path1.resize(length - 1); // remove trailing backslash
- // Get first item
- DIFFITEM current = m_pCtxt->GetDiffAt(pos);
+ String base2 = m_pCtxt->GetRightPath(); // include trailing backslash
+ if (path2.compare(0, base2.length(), base2.c_str()) != 0)
+ return NULL;
+ path2.erase(0, base2.length()); // turn into relative path
+ if (String::size_type length = path2.length())
+ path2.resize(length - 1); // remove trailing backslash
- int count = m_pCtxt->GetDiffCount();
- for (int i=0; i < count; ++i)
+ POSITION pos = m_pCtxt->GetFirstDiffPosition();
+ while (POSITION currentPos = pos) // Save our current pos before getting next
{
- // Save our current pos before getting next
- currentPos = pos;
- current = m_pCtxt->GetNextDiffPosition(pos);
-
- if (path1 == current.getLeftFilepath(GetLeftBasePath()) &&
- path2 == current.getRightFilepath(GetRightBasePath()) &&
- file1 == current.sLeftFilename &&
- file2 == current.sRightFilename)
+ const DIFFITEM &di = m_pCtxt->GetNextDiffPosition(pos);
+ if (di.left.path == path1 &&
+ di.right.path == path2 &&
+ di.left.filename == file1 &&
+ di.right.filename == file2)
{
return currentPos;
}
@@ -948,8 +946,7 @@
void CDirDoc::UpdateDiffAfterOperation(const FileActionItem & act, POSITION pos)
{
ASSERT(pos != NULL);
- DIFFITEM di;
- di = GetDiffByKey(pos);
+ const DIFFITEM &di = GetDiffByKey(pos);
// Use FileActionItem types for simplicity for now.
// Better would be to use FileAction contained, since it is not
Modified: trunk/Src/DirItem.cpp
===================================================================
--- trunk/Src/DirItem.cpp 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DirItem.cpp 2008-02-10 11:50:33 UTC (rev 5019)
@@ -83,13 +83,21 @@
/**
* @brief Clears FileInfo data.
*/
-void DirItem::Clear()
+/*void DirItem::Clear()
{
+ ClearPartial();
+ filename.erase();
+ path.erase();
+}*/
+
+/**
+ * @brief Clears FileInfo data except path/filename.
+ */
+void DirItem::ClearPartial()
+{
ctime = 0;
mtime = 0;
size = -1;
- filename.erase();
- path.erase();
bIsDir = false;
version.Clear();
flags.reset();
Modified: trunk/Src/DirItem.h
===================================================================
--- trunk/Src/DirItem.h 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DirItem.h 2008-02-10 11:50:33 UTC (rev 5019)
@@ -54,11 +54,11 @@
bool bIsDir; /**< is this a directory item or file item? */
FileVersion version; /**< string of fixed file version, eg, 1.2.3.4 */
FileFlags flags; /**< file attributes */
- DirItem() { Clear(); }
-
+ DirItem() : ctime(0), mtime(0), size(-1), bIsDir(false) { }
void SetFile(String fullPath);
BOOL Update(const String &sFilePath);
- void Clear();
+ //void Clear();
+ void ClearPartial();
};
#endif // _DIR_ITEM_H_INCLUDED
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DirScan.cpp 2008-02-10 11:50:33 UTC (rev 5019)
@@ -373,8 +373,8 @@
void UpdateDiffItem(DIFFITEM & di, BOOL & bExists, CDiffContext *pCtxt)
{
// Clear side-info and file-infos
- di.left.Clear();
- di.right.Clear();
+ di.left.ClearPartial();
+ di.right.ClearPartial();
BOOL bLeftExists = pCtxt->UpdateInfoFromDiskHalf(di, TRUE);
BOOL bRightExists = pCtxt->UpdateInfoFromDiskHalf(di, FALSE);
bExists = bLeftExists || bRightExists;
@@ -417,7 +417,7 @@
if (di.diffcode.isDirectory())
{
// 1. Test against filters
- if (pCtxt->m_piFilterGlobal->includeDir(di.sLeftFilename.c_str(), di.sRightFilename.c_str()))
+ if (pCtxt->m_piFilterGlobal->includeDir(di.left.filename.c_str(), di.right.filename.c_str()))
di.diffcode.diffcode |= DIFFCODE::INCLUDED;
else
di.diffcode.diffcode |= DIFFCODE::SKIPPED;
@@ -428,7 +428,7 @@
else
{
// 1. Test against filters
- if (pCtxt->m_piFilterGlobal->includeFile(di.sLeftFilename.c_str(), di.sRightFilename.c_str()))
+ if (pCtxt->m_piFilterGlobal->includeFile(di.left.filename.c_str(), di.right.filename.c_str()))
{
di.diffcode.diffcode |= DIFFCODE::INCLUDED;
// 2. Add unique files
@@ -503,7 +503,7 @@
GetLog()->Write
(
CLogFile::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"),
- di.sLeftFilename.c_str(), (LPCTSTR)_T("di.left.spath"), (LPCTSTR)_T("di.right.spath"), di.diffcode
+ di.left.filename.c_str(), di.left.path.c_str(), di.right.path.c_str(), di.diffcode
);
pCtxt->AddDiff(di);
@@ -528,12 +528,12 @@
DIFFITEM di;
- di.sLeftSubdir = sLeftDir;
- di.sRightSubdir = sRightDir;
+ di.left.path = sLeftDir;
+ di.right.path = sRightDir;
if (lent)
{
- di.sLeftFilename = lent->filename.c_str();
+ di.left.filename = lent->filename;
di.left.mtime = lent->mtime;
di.left.ctime = lent->ctime;
di.left.size = lent->size;
@@ -542,15 +542,15 @@
else
{
// Don't break CDirView::DoCopyRightToLeft()
- di.sLeftFilename = rent->filename.c_str();
+ di.left.filename = rent->filename;
}
if (rent)
{
- di.sRightFilename = OPTIMIZE_SHARE_CSTRINGDATA
+ di.right.filename = OPTIMIZE_SHARE_CSTRINGDATA
(
- di.sLeftFilename == rent->filename.c_str() ? di.sLeftFilename :
- ) rent->filename.c_str();
+ di.left.filename.c_str() == rent->filename.c_str() ? di.left.filename :
+ ) rent->filename;
di.right.mtime = rent->mtime;
di.right.ctime = rent->ctime;
di.right.size = rent->size;
@@ -559,7 +559,7 @@
else
{
// Don't break CDirView::DoCopyLeftToRight()
- di.sRightFilename = lent->filename.c_str();
+ di.right.filename = lent->filename;
}
di.diffcode = code;
@@ -567,7 +567,7 @@
GetLog()->Write
(
CLogFile::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"),
- di.sLeftFilename.c_str(), (LPCTSTR)_T("di.left.spath"), (LPCTSTR)_T("di.right.spath"), code
+ di.left.filename.c_str(), di.left.path.c_str(), di.right.path.c_str(), code
);
pCtxt->m_pCompareStats->IncreaseTotalItems();
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DirView.cpp 2008-02-10 11:50:33 UTC (rev 5019)
@@ -406,7 +406,7 @@
while (diffpos)
{
POSITION curdiffpos = diffpos;
- DIFFITEM di = ctxt.GetNextDiffPosition(diffpos);
+ const DIFFITEM &di = ctxt.GetNextDiffPosition(diffpos);
// If item has hidden flag, don't add it
if (di.customFlags1 & ViewCustomFlags::HIDDEN)
@@ -593,9 +593,9 @@
!di.diffcode.isResultFiltered())
{
String leftPath = di.getLeftFilepath(pDoc->GetLeftBasePath()) +
- _T("\\") + di.sLeftFilename;
+ _T("\\") + di.left.filename;
String rightPath = di.getRightFilepath(pDoc->GetRightBasePath()) +
- _T("\\") + di.sRightFilename;
+ _T("\\") + di.right.filename;
CString filteredFilenames;
filteredFilenames.Format(_T("%s|%s"), leftPath.c_str(), rightPath.c_str());
PackingInfo * unpacker;
@@ -955,14 +955,14 @@
{
// Get left side (side1) folder name (existing) and
// right side base path (where to create)
- subdir = di.sLeftFilename;
+ subdir = di.left.filename;
basedir = GetDocument()->GetRightBasePath();
}
else
{
// Get right side (side2) folder name (existing) and
// left side base path (where to create)
- subdir = di.sRightFilename;
+ subdir = di.right.filename;
basedir = GetDocument()->GetLeftBasePath();
}
String createpath = paths_ConcatPath(basedir, subdir);
@@ -1481,11 +1481,10 @@
* @param [in] sel Item's index in folder compare GUI list.
* @return DIFFITEM for item.
*/
-DIFFITEM CDirView::GetDiffItem(int sel) const
+const DIFFITEM &CDirView::GetDiffItem(int sel) const
{
- // make a copy of a reference, and return copy
- DIFFITEM di = GetDiffItemConstRef(sel);
- return di;
+ CDirView * pDirView = const_cast<CDirView *>(this);
+ return pDirView->GetDiffItemRef(sel);
}
/**
@@ -2423,7 +2422,7 @@
if (sel != -1)
{
// let the user choose a handler
- CSelectUnpackerDlg dlg(GetDiffItem(sel).sLeftFilename.c_str(), this);
+ CSelectUnpackerDlg dlg(GetDiffItem(sel).left.filename.c_str(), this);
// create now a new infoUnpacker to initialize the manual/automatic flag
PackingInfo infoUnpacker;
dlg.SetInitialInfoHandler(&infoUnpacker);
@@ -2720,7 +2719,7 @@
strPaths += _T("\\");
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
- strPaths += di.sLeftFilename;
+ strPaths += di.left.filename;
strPaths += _T("\r\n");
}
}
@@ -2745,7 +2744,7 @@
strPaths += _T("\\");
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
- strPaths += di.sRightFilename;
+ strPaths += di.right.filename;
strPaths += _T("\r\n");
}
}
@@ -2770,7 +2769,7 @@
strPaths += _T("\\");
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
- strPaths += di.sLeftFilename;
+ strPaths += di.left.filename;
strPaths += _T("\r\n");
}
@@ -2780,7 +2779,7 @@
strPaths += _T("\\");
// If item is a folder then subfolder (relative to base folder)
// is in filename member.
- strPaths += di.sRightFilename;
+ strPaths += di.right.filename;
strPaths += _T("\r\n");
}
}
@@ -2800,7 +2799,7 @@
const DIFFITEM& di = GetDiffItem(sel);
if (!di.diffcode.isDirectory())
{
- strPaths += di.sLeftFilename;
+ strPaths += di.left.filename;
strPaths += _T("\r\n");
}
}
Modified: trunk/Src/DirView.h
===================================================================
--- trunk/Src/DirView.h 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DirView.h 2008-02-10 11:50:33 UTC (rev 5019)
@@ -403,7 +403,7 @@
void DoUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI);
void DoUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI);
POSITION GetItemKeyFromData(DWORD_PTR dw) const;
- DIFFITEM GetDiffItem(int sel) const;
+ const DIFFITEM & GetDiffItem(int sel) const;
DIFFITEM & GetDiffItemRef(int sel);
const DIFFITEM & GetDiffItemConstRef(int sel) const;
int GetSingleSelectedItem() const;
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/DirViewColItems.cpp 2008-02-10 11:50:33 UTC (rev 5019)
@@ -172,10 +172,10 @@
const DIFFITEM &di = *static_cast<const DIFFITEM*>(p);
return
(
- di.sLeftFilename.empty() ? di.sRightFilename :
- di.sRightFilename.empty() ? di.sLeftFilename :
- di.sLeftFilename == di.sRightFilename ? di.sLeftFilename :
- di.sLeftFilename + _T("|") + di.sRightFilename
+ di.left.filename.empty() ? di.right.filename :
+ di.right.filename.empty() ? di.left.filename :
+ di.left.filename == di.right.filename ? di.left.filename :
+ di.left.filename + _T("|") + di.right.filename
);
}
/*static CString ColNameGet(const CDiffContext *, const void *p) //sfilename
@@ -192,8 +192,8 @@
static String ColPathGet(const CDiffContext *, const void *p)
{
const DIFFITEM &di = *static_cast<const DIFFITEM*>(p);
- String s = di.sRightSubdir;
- const String &t = di.sLeftSubdir;
+ String s = di.right.path;
+ const String &t = di.left.path;
int i = 0, j = 0;
do
{
@@ -587,7 +587,7 @@
{ _T("Rmtime"), IDS_COLHDR_RTIMEM, IDS_COLDESC_RTIMEM, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, right.mtime), 4, false, LVCFMT_LEFT },
{ _T("Lctime"), IDS_COLHDR_LTIMEC, IDS_COLDESC_LTIMEC, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, left.ctime), -1, false, LVCFMT_LEFT },
{ _T("Rctime"), IDS_COLHDR_RTIMEC, IDS_COLDESC_RTIMEC, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, right.ctime), -1, false, LVCFMT_LEFT },
- { _T("Ext"), IDS_COLHDR_EXTENSION, IDS_COLDESC_EXTENSION, &ColExtGet, &ColExtSort, FIELD_OFFSET(DIFFITEM, sLeftFilename), 5, true, LVCFMT_LEFT },
+ { _T("Ext"), IDS_COLHDR_EXTENSION, IDS_COLDESC_EXTENSION, &ColExtGet, &ColExtSort, FIELD_OFFSET(DIFFITEM, left.filename), 5, true, LVCFMT_LEFT },
{ _T("Lsize"), IDS_COLHDR_LSIZE, IDS_COLDESC_LSIZE, &ColSizeGet, &ColSizeSort, FIELD_OFFSET(DIFFITEM, left.size), -1, false, LVCFMT_RIGHT },
{ _T("Rsize"), IDS_COLHDR_RSIZE, IDS_COLDESC_RSIZE, &ColSizeGet, &ColSizeSort, FIELD_OFFSET(DIFFITEM, right.size), -1, false, LVCFMT_RIGHT },
{ _T("LsizeShort"), IDS_COLHDR_LSIZE_SHORT, IDS_COLDESC_LSIZE_SHORT, &ColSizeShortGet, &ColSizeSort, FIELD_OFFSET(DIFFITEM, left.size), -1, false, LVCFMT_RIGHT },
Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/FolderCmp.cpp 2008-02-10 11:50:33 UTC (rev 5019)
@@ -345,9 +345,9 @@
left = pCtxt->GetNormalizedLeft();
if (!paths_EndsWithSlash(left.c_str()))
left += backslash;
- if (!di.sLeftSubdir.empty())
- left += di.sLeftSubdir + backslash;
- left += di.sLeftFilename;
+ if (!di.left.path.empty())
+ left += di.left.path + backslash;
+ left += di.left.filename;
if (di.diffcode.isSideLeftOnly())
right = left;
}
@@ -357,9 +357,9 @@
right = pCtxt->GetNormalizedRight();
if (!paths_EndsWithSlash(right.c_str()))
right += backslash;
- if (!di.sRightSubdir.empty())
- right += di.sRightSubdir + backslash;
- right += di.sRightFilename;
+ if (!di.right.path.empty())
+ right += di.right.path + backslash;
+ right += di.right.filename;
if (di.diffcode.isSideRightOnly())
left = right;
}
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-02-10 10:43:53 UTC (rev 5018)
+++ trunk/Src/MainFrm.cpp 2008-02-10 11:50:33 UTC (rev 5019)
@@ -2059,7 +2059,7 @@
int ind = pView->GetFirstSelectedInd();
while (ind != -1 && bValidFiles)
{
- const DIFFITEM item = pView->GetItemAt(ind);
+ const DIFFITEM &item = pView->GetItemAt(ind);
if (item.diffcode.isBin())
{
LangMessageBox(IDS_CANNOT_CREATE_BINARYPATCH, MB_ICONWARNING |
@@ -2078,20 +2078,20 @@
// Format full paths to files (leftFile/rightFile)
String leftFile = item.getLeftFilepath(pDoc->GetLeftBasePath());
if (!leftFile.empty())
- leftFile += _T("\\") + item.sLeftFilename;
+ leftFile += _T("\\") + item.left.filename;
String rightFile = item.getRightFilepath(pDoc->GetRightBasePath());
if (!rightFile.empty())
- rightFile += _T("\\") + item.sRightFilename;
+ rightFile += _T("\\") + item.right.filename;
// Format relative paths to files in folder compare
- String leftpatch = item.sLeftSubdir;
+ String leftpatch = item.left.path;
if (!leftpatch.empty())
leftpatch += _T("/");
- leftpatch += item.sLeftFilename;
- String rightpatch = item.sRightSubdir;
+ leftpatch += item.left.filename;
+ String rightpatch = item.right.path;
if (!rightpatch.empty())
rightpatch += _T("/");
- rightpatch += item.sRightFilename;
+ rightpatch += item.right.filename;
patcher.AddFiles(leftFile, leftpatch, rightFile, rightpatch);
pView->GetNextSelectedInd(ind);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-10 13:34:29
|
Revision: 5022
http://winmerge.svn.sourceforge.net/winmerge/?rev=5022&view=rev
Author: kimmov
Date: 2008-02-10 05:34:26 -0800 (Sun, 10 Feb 2008)
Log Message:
-----------
Remove some usage of CString in DiffThread.
Modified Paths:
--------------
trunk/Src/DiffThread.cpp
trunk/Src/DiffThread.h
Modified: trunk/Src/DiffThread.cpp
===================================================================
--- trunk/Src/DiffThread.cpp 2008-02-10 13:23:21 UTC (rev 5021)
+++ trunk/Src/DiffThread.cpp 2008-02-10 13:34:26 UTC (rev 5022)
@@ -23,6 +23,7 @@
// $Id$
#include "stdafx.h"
+#include "UnicodeString.h"
#include "diffcontext.h"
#include "diffthread.h"
#include "DirScan.h"
@@ -51,8 +52,8 @@
*/
struct DiffFuncStruct
{
- CString path1; /**< First path to compare. */
- CString path2; /**< Second path to compare. */
+ String path1; /**< First path to compare. */
+ String path2; /**< Second path to compare. */
CDiffContext * context; /**< Compare context. */
UINT msgUIUpdate; /**< Windows message for updating GUI. */
HWND hWindow; /**< Window getting status updates. */
@@ -146,8 +147,8 @@
* @param [in] bRecursive Is the compare recursive (subfolders included)?
* @return Success (1) or error for thread. Currently always 1.
*/
-UINT CDiffThread::CompareDirectories(const CString & dir1,
- const CString & dir2, BOOL bRecursive)
+UINT CDiffThread::CompareDirectories(LPCTSTR dir1, LPCTSTR dir2,
+ BOOL bRecursive)
{
ASSERT(m_pDiffParm->nThreadState != THREAD_COMPARING);
@@ -255,7 +256,6 @@
else
{
myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_START);
- CString subdir; // blank to start at roots specified in diff context
#ifdef _DEBUG
_CrtMemState memStateBefore;
_CrtMemState memStateAfter;
@@ -267,7 +267,9 @@
SetEvent(myStruct->hEvent);
// Build results list (except delaying file comparisons until below)
- DirScan_GetItems(paths, subdir, subdir, myStruct->pItemList, casesensitive, depth, myStruct->context);
+ // Empty subdirs to start compare from root folders in diff context
+ DirScan_GetItems(paths, _T(""), _T(""), myStruct->pItemList,
+ casesensitive, depth, myStruct->context);
#ifdef _DEBUG
_CrtMemCheckpoint(&memStateAfter);
Modified: trunk/Src/DiffThread.h
===================================================================
--- trunk/Src/DiffThread.h 2008-02-10 13:23:21 UTC (rev 5021)
+++ trunk/Src/DiffThread.h 2008-02-10 13:34:26 UTC (rev 5022)
@@ -52,7 +52,7 @@
CDiffThread();
~CDiffThread();
void SetContext(CDiffContext * pCtx);
- UINT CompareDirectories(const CString & dir1, const CString & dir2, BOOL bRecursive);
+ UINT CompareDirectories(LPCTSTR dir1, LPCTSTR dir2, BOOL bRecursive);
void SetHwnd(HWND hWnd);
void SetMessageIDs(UINT updateMsg);
void SetCompareSelected(bool bSelected = false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-10 19:31:01
|
Revision: 5025
http://winmerge.svn.sourceforge.net/winmerge/?rev=5025&view=rev
Author: kimmov
Date: 2008-02-10 11:30:58 -0800 (Sun, 10 Feb 2008)
Log Message:
-----------
Remove unneeded path parameters from compare thread function. Paths are passed in the compare context.
Modified Paths:
--------------
trunk/Src/DiffThread.cpp
trunk/Src/DiffThread.h
trunk/Src/DirDoc.cpp
Modified: trunk/Src/DiffThread.cpp
===================================================================
--- trunk/Src/DiffThread.cpp 2008-02-10 19:18:05 UTC (rev 5024)
+++ trunk/Src/DiffThread.cpp 2008-02-10 19:30:58 UTC (rev 5025)
@@ -139,13 +139,11 @@
/**
* @brief Start and run directory compare thread.
- * @param [in] dir1 First directory to compare.
- * @param [in] dir2 Second directory to compare.
* @param [in] bRecursive Is the compare recursive (subfolders included)?
* @return Success (1) or error for thread. Currently always 1.
+ * @note Folders names to compare are passed in the compare context.
*/
-UINT CDiffThread::CompareDirectories(LPCTSTR dir1, LPCTSTR dir2,
- BOOL bRecursive)
+UINT CDiffThread::CompareDirectories(BOOL bRecursive)
{
ASSERT(m_pDiffParm->nThreadState != THREAD_COMPARING);
Modified: trunk/Src/DiffThread.h
===================================================================
--- trunk/Src/DiffThread.h 2008-02-10 19:18:05 UTC (rev 5024)
+++ trunk/Src/DiffThread.h 2008-02-10 19:30:58 UTC (rev 5025)
@@ -52,7 +52,7 @@
CDiffThread();
~CDiffThread();
void SetContext(CDiffContext * pCtx);
- UINT CompareDirectories(LPCTSTR dir1, LPCTSTR dir2, BOOL bRecursive);
+ UINT CompareDirectories(BOOL bRecursive);
void SetHwnd(HWND hWnd);
void SetMessageIDs(UINT updateMsg);
void SetCompareSelected(bool bSelected = false);
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2008-02-10 19:18:05 UTC (rev 5024)
+++ trunk/Src/DirDoc.cpp 2008-02-10 19:30:58 UTC (rev 5025)
@@ -365,12 +365,12 @@
// Empty display before new compare
m_pDirView->DeleteAllDisplayItems();
+ // Folder names to compare are in the compare context
m_diffThread.SetContext(m_pCtxt);
m_diffThread.SetHwnd(m_pDirView->GetSafeHwnd());
m_diffThread.SetMessageIDs(MSG_UI_UPDATE);
m_diffThread.SetCompareSelected(!!m_bMarkedRescan);
- m_diffThread.CompareDirectories(m_pCtxt->GetNormalizedLeft().c_str(),
- m_pCtxt->GetNormalizedRight().c_str(), m_bRecursive);
+ m_diffThread.CompareDirectories(m_bRecursive);
m_bMarkedRescan = FALSE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-02-11 21:59:50
|
Revision: 5027
http://winmerge.svn.sourceforge.net/winmerge/?rev=5027&view=rev
Author: sdottaka
Date: 2008-02-11 13:17:11 -0800 (Mon, 11 Feb 2008)
Log Message:
-----------
BUG: [ 1880628 ] LineFilter doesn't filter out non-ascii lines
Modified Paths:
--------------
trunk/Src/CompareEngines/ByteCompare.cpp
trunk/Src/CompareEngines/ByteCompare.h
trunk/Src/CompareEngines/DiffUtils.cpp
trunk/Src/CompareEngines/DiffUtils.h
trunk/Src/DiffFileData.cpp
trunk/Src/DiffFileData.h
trunk/Src/DiffWrapper.cpp
trunk/Src/DiffWrapper.h
trunk/Src/FilterList.cpp
trunk/Src/FilterList.h
trunk/Src/FolderCmp.cpp
trunk/Src/MergeDoc.cpp
trunk/Src/codepage_detect.cpp
Modified: trunk/Src/CompareEngines/ByteCompare.cpp
===================================================================
--- trunk/Src/CompareEngines/ByteCompare.cpp 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/CompareEngines/ByteCompare.cpp 2008-02-11 21:17:11 UTC (rev 5027)
@@ -111,7 +111,7 @@
* @param [in] piAbortable Interface allowing to abort compare
* @return DIFFCODE
*/
-int ByteCompare::CompareFiles(FileLocation *location, BOOL guessEncoding)
+int ByteCompare::CompareFiles(FileLocation *location)
{
// TODO
// Right now, we assume files are in 8-bit encoding
@@ -164,8 +164,6 @@
if (rtn < space)
eof[i] = true;
bfend[i] += rtn;
- if (guessEncoding)
- DiffFileData::GuessEncoding_from_buffer(location[i], buff[i], rtn);
if (m_inf[0].desc == m_inf[1].desc)
{
location[1].encoding = location[0].encoding;
@@ -173,7 +171,6 @@
}
}
}
- guessEncoding = FALSE;
// where to start comparing right now
LPCSTR ptr0 = &buff[0][bfstart[0]];
LPCSTR ptr1 = &buff[1][bfstart[1]];
Modified: trunk/Src/CompareEngines/ByteCompare.h
===================================================================
--- trunk/Src/CompareEngines/ByteCompare.h 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/CompareEngines/ByteCompare.h 2008-02-11 21:17:11 UTC (rev 5027)
@@ -30,7 +30,7 @@
void SetAdditionalOptions(BOOL stopAfterFirstDiff);
void SetAbortable(const IAbortable * piAbortable);
void SetFileData(int items, file_data *data);
- int CompareFiles(FileLocation *location, BOOL guessEncoding);
+ int CompareFiles(FileLocation *location);
void GetTextStats(int side, FileTextStats *stats);
private:
Modified: trunk/Src/CompareEngines/DiffUtils.cpp
===================================================================
--- trunk/Src/CompareEngines/DiffUtils.cpp 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/CompareEngines/DiffUtils.cpp 2008-02-11 21:17:11 UTC (rev 5027)
@@ -262,7 +262,7 @@
LineData.erase(EolPos);
}
- if (!m_pFilterList->Match(LineData.c_str()))
+ if (!m_pFilterList->Match(LineData.c_str(), m_codepage))
{
linesMatch = false;
}
Modified: trunk/Src/CompareEngines/DiffUtils.h
===================================================================
--- trunk/Src/CompareEngines/DiffUtils.h 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/CompareEngines/DiffUtils.h 2008-02-11 21:17:11 UTC (rev 5027)
@@ -42,6 +42,7 @@
void GetTextStats(int side, FileTextStats *stats);
BOOL Diff2Files(struct change ** diffs, int depth,
int * bin_status, BOOL bMovedBlocks, int * bin_file);
+ void SetCodepage(int codepage) { m_codepage = codepage; }
protected:
void ClearCompareOptions();
@@ -52,6 +53,7 @@
file_data * m_inf; /**< Compared files data (for diffutils). */
int m_ndiffs; /**< Real diffs found. */
int m_ntrivialdiffs; /**< Ignored diffs found. */
+ int m_codepage; /**< Codepage used in line filter */
};
Modified: trunk/Src/DiffFileData.cpp
===================================================================
--- trunk/Src/DiffFileData.cpp 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/DiffFileData.cpp 2008-02-11 21:17:11 UTC (rev 5027)
@@ -146,28 +146,6 @@
}
}
-/**
- * @brief Try to deduce encoding for this file (given copy in memory)
- */
-void DiffFileData::GuessEncoding_from_buffer(FileLocation & fpenc, const char *src, size_t len)
-{
- if (!fpenc.encoding.m_bom)
- {
- LPCTSTR sExt = PathFindExtension(fpenc.filepath);
- if (unsigned cp = GuessEncoding_from_bytes(sExt, src, len))
- {
- fpenc.encoding.Clear();
- fpenc.encoding.SetCodepage(cp);
- }
- }
-}
-
-/** @brief Guess encoding for one file (in DiffContext memory buffer) */
-void DiffFileData::GuessEncoding_from_buffer_in_DiffContext(int side, CDiffContext * pCtxt)
-{
- GuessEncoding_from_buffer(m_FileLocation[side], m_inf[side].buffer, m_inf[side].buffered_chars);
-}
-
/** @brief detect unicode file and quess encoding */
DiffFileData::UniFileBom::UniFileBom(int fd)
{
@@ -211,15 +189,10 @@
* caller has to DeleteFile filepathTransformed, if it differs from filepath
*/
bool DiffFileData::Filepath_Transform(FileLocation & fpenc, const String & filepath, String & filepathTransformed,
- LPCTSTR filteredFilenames, PrediffingInfo * infoPrediffer, int fd)
+ LPCTSTR filteredFilenames, PrediffingInfo * infoPrediffer)
{
BOOL bMayOverwrite = FALSE; // temp variable set each time it is used
- // Read BOM to check for Unicode
- UniFileBom bom = fd;
- if (bom.unicoding)
- fpenc.encoding.SetUnicoding(bom.unicoding);
-
if (fpenc.encoding.m_unicoding && fpenc.encoding.m_unicoding != ucr::UCS2LE)
{
// second step : normalize Unicode to OLECHAR (most of time, do nothing) (OLECHAR = UCS-2LE in Windows)
Modified: trunk/Src/DiffFileData.h
===================================================================
--- trunk/Src/DiffFileData.h 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/DiffFileData.h 2008-02-11 21:17:11 UTC (rev 5027)
@@ -46,7 +46,7 @@
void SetDisplayFilepaths(LPCTSTR szTrueFilepath1, LPCTSTR szTrueFilepath2);
bool Filepath_Transform(FileLocation & fpenc, const String & filepath, String & filepathTransformed,
- LPCTSTR filteredFilenames, PrediffingInfo * infoPrediffer, int fd);
+ LPCTSTR filteredFilenames, PrediffingInfo * infoPrediffer);
void GuessEncoding_from_buffer_in_DiffContext(int side, CDiffContext * pCtxt);
static void GuessEncoding_from_buffer(FileLocation & fpenc, const char *src, size_t len);
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/DiffWrapper.cpp 2008-02-11 21:17:11 UTC (rev 5027)
@@ -84,6 +84,7 @@
, m_bAddCmdLine(TRUE)
, m_bAppendFiles(FALSE)
, m_nDiffs(0)
+, m_codepage(0)
, m_infoPrediffer(NULL)
, m_pDiffList(NULL)
, m_bPathsAreTemp(FALSE)
@@ -987,7 +988,7 @@
BOOL bRet = TRUE;
__try
{
- // Diff files. depth is zero because we are not comparing dirs
+ // Diff files. depth is zero because we are not 6comparing dirs
*diffs = diff_2_files (diffData->m_inf, 0, bin_status,
(m_pMovedLines != NULL), bin_file);
CopyDiffutilTextStats(diffData->m_inf, diffData);
@@ -1049,7 +1050,7 @@
LineData.erase(EolPos);
}
- if (!m_pFilterList->Match(LineData.c_str()))
+ if (!m_pFilterList->Match(LineData.c_str(), m_codepage))
{
linesMatch = false;
}
Modified: trunk/Src/DiffWrapper.h
===================================================================
--- trunk/Src/DiffWrapper.h 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/DiffWrapper.h 2008-02-11 21:17:11 UTC (rev 5027)
@@ -166,6 +166,7 @@
BOOL SetAppendFiles(BOOL bAppendFiles);
void SetPaths(const String &filepath1, const String &filepath2, BOOL tempPaths);
void SetAlternativePaths(const String &altPath1, const String &altPath2);
+ void SetCodepage(int codepage) { m_codepage = codepage; }
BOOL RunFileDiff();
void GetDiffStatus(DIFFSTATUS *status);
void AddDiffRange(UINT begin0, UINT end0, UINT begin1, UINT end1, BYTE op);
@@ -203,6 +204,7 @@
BOOL m_bAddCmdLine; /**< Do we add commandline to patch file? */
BOOL m_bAppendFiles; /**< Do we append to existing patch file? */
int m_nDiffs; /**< Difference count */
+ int m_codepage; /**< Codepage used in line filter */
DiffList *m_pDiffList; /**< Pointer to external DiffList */
MovedLines * m_pMovedLines;
FilterCommentsManager * m_FilterCommentsManager; /**< Comments filtering manager */
Modified: trunk/Src/FilterList.cpp
===================================================================
--- trunk/Src/FilterList.cpp 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/FilterList.cpp 2008-02-11 21:17:11 UTC (rev 5027)
@@ -10,6 +10,7 @@
#include <vector>
#include "FilterList.h"
#include "pcre.h"
+#include "unicoder.h"
/**
* @brief Constructor.
@@ -95,14 +96,22 @@
* This function matches given @p string against the list of regular
* expressions. The matching ends when first match is found, so all
* expressions may not be matched against.
- * @param [in] string UTF-8 string to match.
+ * @param [in] string string to match.
+ * @param [in] codepage codepage of string.
* @return true if any of the expressions did match the string.
*/
-bool FilterList::Match(const char *string)
+bool FilterList::Match(const char *string, int codepage/*=CP_UTF8*/)
{
bool retval = false;
unsigned int count = m_list.size();
+ int stringlen = strlen(string);
+ // convert string into UTF-8
+ ucr::buffer buf(stringlen * 2);
+ if (codepage != CP_UTF8)
+ ucr::convert(ucr::NONE, codepage, (const unsigned char *)string,
+ stringlen, ucr::UTF8, CP_UTF8, &buf);
+
unsigned int i = 0;
while (i < count && retval == false)
{
@@ -110,9 +119,13 @@
int ovector[30];
pcre * regexp = item.pRegExp;
pcre_extra * extra = item.pRegExpExtra;
- int result = pcre_exec(regexp, extra, string, strlen(string),
- 0, 0, ovector, 30);
-
+ int result;
+ if (codepage != CP_UTF8)
+ result = pcre_exec(regexp, extra, (const char *)buf.ptr, buf.size,
+ 0, 0, ovector, 30);
+ else
+ result = pcre_exec(regexp, extra, string, stringlen,
+ 0, 0, ovector, 30);
if (result >= 0)
{
if (m_lastMatchExpression != NULL)
Modified: trunk/Src/FilterList.h
===================================================================
--- trunk/Src/FilterList.h 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/FilterList.h 2008-02-11 21:17:11 UTC (rev 5027)
@@ -48,7 +48,7 @@
void AddRegExp(const char *regularExpression, EncodingType encoding);
void RemoveAllFilters();
bool HasRegExps();
- bool Match(const char *string);
+ bool Match(const char *string, int codepage = CP_UTF8);
const char * GetLastMatchExpression();
private:
Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/FolderCmp.cpp 2008-02-11 21:17:11 UTC (rev 5027)
@@ -20,6 +20,7 @@
#include "IAbortable.h"
#include "FolderCmp.h"
#include "ByteComparator.h"
+#include "codepage_detect.h"
using namespace CompareEngines;
@@ -91,11 +92,13 @@
return false;
}
+ GuessCodepageEncoding(m_diffFileData.m_FileLocation[0].filepath,
+ &m_diffFileData.m_FileLocation[0].encoding, pCtxt->m_bGuessEncoding);
+
// Invoke prediff'ing plugins
if (!m_diffFileData.Filepath_Transform(m_diffFileData.m_FileLocation[0],
plugCtxt->filepathUnpacked1, plugCtxt->filepathTransformed1,
- filteredFilenames.c_str(), plugCtxt->infoPrediffer,
- m_diffFileData.m_inf[0].desc))
+ filteredFilenames.c_str(), plugCtxt->infoPrediffer))
{
errStr = _T("Transform Error Side 1");
return false;
@@ -104,10 +107,12 @@
// we use the same plugins for both files, so they must be defined before second file
ASSERT(plugCtxt->infoPrediffer->bToBeScanned == FALSE);
+ GuessCodepageEncoding(m_diffFileData.m_FileLocation[1].filepath,
+ &m_diffFileData.m_FileLocation[1].encoding, pCtxt->m_bGuessEncoding);
+
if (!m_diffFileData.Filepath_Transform(m_diffFileData.m_FileLocation[1],
plugCtxt->filepathUnpacked2, plugCtxt->filepathTransformed2,
- filteredFilenames.c_str(), plugCtxt->infoPrediffer,
- m_diffFileData.m_inf[1].desc))
+ filteredFilenames.c_str(), plugCtxt->infoPrediffer))
{
errStr = _T("Transform Error Side 2");
return false;
@@ -199,6 +204,9 @@
{
if (m_pDiffUtilsEngine == NULL)
m_pDiffUtilsEngine = new CompareEngines::DiffUtils();
+ m_pDiffUtilsEngine->SetCodepage(
+ m_diffFileData.m_FileLocation[0].encoding.m_unicoding ?
+ CP_UTF8 : m_diffFileData.m_FileLocation[0].encoding.m_codepage);
bool success = m_pDiffUtilsEngine->SetCompareOptions(
*m_pCtx->GetCompareOptions(CMP_CONTENT));
if (success)
@@ -225,14 +233,6 @@
}
if (DIFFCODE::isResultError(code))
di.errorDesc = _T("DiffUtils Error");
-
- if (!DIFFCODE::isResultError(code) && pCtxt->m_bGuessEncoding)
- {
- // entire file is in memory in the diffutils buffers
- // inside the diff context, so may as well use in-memory copy
- m_diffFileData.GuessEncoding_from_buffer_in_DiffContext(0, pCtxt);
- m_diffFileData.GuessEncoding_from_buffer_in_DiffContext(1, pCtxt);
- }
}
else if (nCompMethod == CMP_QUICK_CONTENT)
{
@@ -248,7 +248,7 @@
m_pByteCompare->SetFileData(2, m_diffFileData.m_inf);
// use our own byte-by-byte compare
- code = m_pByteCompare->CompareFiles(m_diffFileData.m_FileLocation, pCtxt->m_bGuessEncoding);
+ code = m_pByteCompare->CompareFiles(m_diffFileData.m_FileLocation);
m_pByteCompare->GetTextStats(0, &m_diffFileData.m_textStats0);
m_pByteCompare->GetTextStats(1, &m_diffFileData.m_textStats1);
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/MergeDoc.cpp 2008-02-11 21:17:11 UTC (rev 5027)
@@ -447,6 +447,7 @@
// Set paths for diffing and run diff
m_diffWrapper.SetPaths(m_tempFiles[0].GetPath(), m_tempFiles[1].GetPath(), TRUE);
m_diffWrapper.SetCompareFiles(m_filePaths.GetLeft(), m_filePaths.GetRight());
+ m_diffWrapper.SetCodepage(m_ptBuf[0]->m_unicoding ? CP_UTF8 : m_ptBuf[0]->m_codepage);
diffSuccess = m_diffWrapper.RunFileDiff();
// Read diff-status
Modified: trunk/Src/codepage_detect.cpp
===================================================================
--- trunk/Src/codepage_detect.cpp 2008-02-11 16:38:26 UTC (rev 5026)
+++ trunk/Src/codepage_detect.cpp 2008-02-11 21:17:11 UTC (rev 5027)
@@ -15,6 +15,7 @@
#include "charsets.h"
#include "markdown.h"
#include "FileTextEncoding.h"
+#include "Utf8FileDetect.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -208,6 +209,8 @@
encoding->m_bom = true;
break;
default:
+ if (fi.pImage && !CheckForInvalidUtf8((LPBYTE)fi.pImage, 4096))
+ encoding->SetUnicoding(ucr::UTF8);
encoding->m_bom = false;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-11 22:50:48
|
Revision: 5029
http://winmerge.svn.sourceforge.net/winmerge/?rev=5029&view=rev
Author: kimmov
Date: 2008-02-11 14:50:37 -0800 (Mon, 11 Feb 2008)
Log Message:
-----------
PATCH: [ 1868989 ] Language idiomatics in the *.po-files in the Trunk
Submitted by Hans Eriksson
Fix the name of the license to GNU General Public License
Modified Paths:
--------------
trunk/Src/Languages/English.pot
trunk/Src/Merge.rc
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-02-11 21:17:53 UTC (rev 5028)
+++ trunk/Src/Languages/English.pot 2008-02-11 22:50:37 UTC (rev 5029)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-02-07 22:20+0000\n"
+"POT-Creation-Date: 2008-02-12 00:48+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -420,7 +420,7 @@
#: Merge.rc:296
#: Merge.rc:481
#, c-format
-msgid "&GNU Public License..."
+msgid "&GNU General Public License..."
msgstr ""
#: Merge.rc:183
@@ -2866,7 +2866,7 @@
#: Merge.rc:1859
#, c-format
-msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
+msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr ""
#: Merge.rc:1865
@@ -5131,7 +5131,7 @@
#: Merge.rc:2674
#, c-format
-msgid "Display the GNU public license"
+msgid "Display the GNU Genral Public License"
msgstr ""
#: Merge.rc:2675
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2008-02-11 21:17:53 UTC (rev 5028)
+++ trunk/Src/Merge.rc 2008-02-11 22:50:37 UTC (rev 5029)
@@ -179,7 +179,7 @@
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
- MENUITEM "&GNU Public License...", ID_HELP_GNULICENSE
+ MENUITEM "&GNU General Public License...", ID_HELP_GNULICENSE
MENUITEM "&About WinMerge...", ID_APP_ABOUT
END
END
@@ -293,7 +293,7 @@
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
- MENUITEM "&GNU Public License...", ID_HELP_GNULICENSE
+ MENUITEM "&GNU General Public License...", ID_HELP_GNULICENSE
MENUITEM "&About WinMerge...", ID_APP_ABOUT
END
END
@@ -478,7 +478,7 @@
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
- MENUITEM "&GNU Public License...", ID_HELP_GNULICENSE
+ MENUITEM "&GNU General Public License...", ID_HELP_GNULICENSE
MENUITEM "&About WinMerge...", ID_APP_ABOUT
END
END
@@ -1856,7 +1856,7 @@
STRINGTABLE
BEGIN
IDS_SPLASH_DEVELOPERS "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
- IDS_SPLASH_GPLTEXT "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
+ IDS_SPLASH_GPLTEXT "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
END
// "DO NOT SHOW AGAIN" MESSAGEBOXES
@@ -2671,7 +2671,7 @@
BEGIN
ID_HELP_CONTENTS "Opens the WinMerge help\nWinMerge Help"
ID_HELP_GETCONFIG "Outputs current WinMerge version info and configuration to text file"
- ID_HELP_GNULICENSE "Display the GNU public license"
+ ID_HELP_GNULICENSE "Display the GNU Genral Public License"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
ID_HELP_RELEASENOTES "Opens the release notes document\nRelease Notes"
ID_HELP_TRANSLATIONS "Opens the translations website\nTranslations"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-02-13 22:05:46
|
Revision: 5041
http://winmerge.svn.sourceforge.net/winmerge/?rev=5041&view=rev
Author: gerundt
Date: 2008-02-13 14:05:37 -0800 (Wed, 13 Feb 2008)
Log Message:
-----------
RFE: [ 1875111 ] Cleaning up Help-menu
Remove "..." from "Configuration" and "GNU General Public License" menu items
Modified Paths:
--------------
trunk/Src/Languages/English.pot
trunk/Src/Languages/German.po
trunk/Src/Merge.rc
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-02-13 15:12:13 UTC (rev 5040)
+++ trunk/Src/Languages/English.pot 2008-02-13 22:05:37 UTC (rev 5041)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-02-13 17:11+0000\n"
+"POT-Creation-Date: 2008-02-13 23:00+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -406,7 +406,7 @@
#: Merge.rc:293
#: Merge.rc:478
#, c-format
-msgid "C&onfiguration..."
+msgid "C&onfiguration"
msgstr ""
#: Merge.rc:180
@@ -420,7 +420,7 @@
#: Merge.rc:296
#: Merge.rc:481
#, c-format
-msgid "&GNU General Public License..."
+msgid "&GNU General Public License"
msgstr ""
#: Merge.rc:183
Modified: trunk/Src/Languages/German.po
===================================================================
--- trunk/Src/Languages/German.po 2008-02-13 15:12:13 UTC (rev 5040)
+++ trunk/Src/Languages/German.po 2008-02-13 22:05:37 UTC (rev 5041)
@@ -411,8 +411,8 @@
#: Merge.rc:293
#: Merge.rc:478
#, c-format
-msgid "C&onfiguration..."
-msgstr "&Konfiguration..."
+msgid "C&onfiguration"
+msgstr "&Konfiguration"
#: Merge.rc:180
#: Merge.rc:294
@@ -425,8 +425,8 @@
#: Merge.rc:296
#: Merge.rc:481
#, c-format
-msgid "&GNU General Public License..."
-msgstr "&GNU General Public License..."
+msgid "&GNU General Public License"
+msgstr "&GNU General Public License"
#: Merge.rc:183
#: Merge.rc:297
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2008-02-13 15:12:13 UTC (rev 5040)
+++ trunk/Src/Merge.rc 2008-02-13 22:05:37 UTC (rev 5041)
@@ -176,10 +176,10 @@
MENUITEM SEPARATOR
MENUITEM "R&elease Notes", ID_HELP_RELEASENOTES
MENUITEM "&Translations", ID_HELP_TRANSLATIONS
- MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
+ MENUITEM "C&onfiguration", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
- MENUITEM "&GNU General Public License...", ID_HELP_GNULICENSE
+ MENUITEM "&GNU General Public License", ID_HELP_GNULICENSE
MENUITEM "&About WinMerge...", ID_APP_ABOUT
END
END
@@ -290,10 +290,10 @@
MENUITEM SEPARATOR
MENUITEM "R&elease Notes", ID_HELP_RELEASENOTES
MENUITEM "&Translations", ID_HELP_TRANSLATIONS
- MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
+ MENUITEM "C&onfiguration", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
- MENUITEM "&GNU General Public License...", ID_HELP_GNULICENSE
+ MENUITEM "&GNU General Public License", ID_HELP_GNULICENSE
MENUITEM "&About WinMerge...", ID_APP_ABOUT
END
END
@@ -475,10 +475,10 @@
MENUITEM SEPARATOR
MENUITEM "R&elease Notes", ID_HELP_RELEASENOTES
MENUITEM "&Translations", ID_HELP_TRANSLATIONS
- MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
+ MENUITEM "C&onfiguration", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
- MENUITEM "&GNU General Public License...", ID_HELP_GNULICENSE
+ MENUITEM "&GNU General Public License", ID_HELP_GNULICENSE
MENUITEM "&About WinMerge...", ID_APP_ABOUT
END
END
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-15 18:50:19
|
Revision: 5044
http://winmerge.svn.sourceforge.net/winmerge/?rev=5044&view=rev
Author: kimmov
Date: 2008-02-15 10:50:14 -0800 (Fri, 15 Feb 2008)
Log Message:
-----------
PATCH: [ 1893167 ] Allow setting custom temporary folder
Add missing mnemonic chars for controls in System options dialog.
Modified Paths:
--------------
trunk/Src/Languages/English.pot
trunk/Src/Merge.rc
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-02-14 17:40:20 UTC (rev 5043)
+++ trunk/Src/Languages/English.pot 2008-02-15 18:50:14 UTC (rev 5044)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-02-14 19:09+0000\n"
+"POT-Creation-Date: 2008-02-15 20:49+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -1575,13 +1575,8 @@
msgstr ""
#: Merge.rc:992
-#: Merge.rc:999
-#: Merge.rc:1414
-#: Merge.rc:1588
-#: Merge.rc:1592
-#: Merge.rc:1619
#, c-format
-msgid "Browse..."
+msgid "B&rowse..."
msgstr ""
#: Merge.rc:993
@@ -1591,14 +1586,20 @@
#: Merge.rc:994
#, c-format
-msgid "System's temp folder"
+msgid "S&ystem's temp folder"
msgstr ""
#: Merge.rc:996
#, c-format
-msgid "Custom folder:"
+msgid "C&ustom folder:"
msgstr ""
+#: Merge.rc:999
+#: Merge.rc:1015
+#, c-format
+msgid "Br&owse..."
+msgstr ""
+
#: Merge.rc:1005
#, c-format
msgid "Patch Generator"
@@ -1614,11 +1615,6 @@
msgid "File&2:"
msgstr ""
-#: Merge.rc:1015
-#, c-format
-msgid "Br&owse..."
-msgstr ""
-
#: Merge.rc:1016
#, c-format
msgid "&Swap"
@@ -2209,6 +2205,14 @@
msgid "Report &File:"
msgstr ""
+#: Merge.rc:1414
+#: Merge.rc:1588
+#: Merge.rc:1592
+#: Merge.rc:1619
+#, c-format
+msgid "Browse..."
+msgstr ""
+
#: Merge.rc:1415
#, c-format
msgid "&Style:"
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2008-02-14 17:40:20 UTC (rev 5043)
+++ trunk/Src/Merge.rc 2008-02-15 18:50:14 UTC (rev 5044)
@@ -989,14 +989,14 @@
PUSHBUTTON "&Browse...",IDC_EXT_EDITOR_BROWSE,179,83,50,14
LTEXT "&Filter folder:",IDC_STATIC,7,101,166,8
EDITTEXT IDC_FILTER_USER_PATH,7,111,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_FILTER_USER_BROWSE,179,111,50,14
+ PUSHBUTTON "B&rowse...",IDC_FILTER_USER_BROWSE,179,111,50,14
GROUPBOX "Temporary files folder",IDC_STATIC,7,130,218,56
- CONTROL "System's temp folder",IDC_TMPFOLDER_SYSTEM,"Button",
+ CONTROL "S&ystem's temp folder",IDC_TMPFOLDER_SYSTEM,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,142,199,10
- CONTROL "Custom folder:",IDC_STATIC,"Button",BS_AUTORADIOBUTTON,
+ CONTROL "C&ustom folder:",IDC_STATIC,"Button",BS_AUTORADIOBUTTON,
17,152,199,10
EDITTEXT IDC_TMPFOLDER_NAME,27,164,136,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_TMPFOLDER_BROWSE,167,164,50,14
+ PUSHBUTTON "Br&owse...",IDC_TMPFOLDER_BROWSE,167,164,50,14
END
IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 180
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-15 23:44:51
|
Revision: 5045
http://winmerge.svn.sourceforge.net/winmerge/?rev=5045&view=rev
Author: kimmov
Date: 2008-02-15 15:44:47 -0800 (Fri, 15 Feb 2008)
Log Message:
-----------
Use FileTextEncoding member in MergeDoc / CDiffTextBuffer instead of separate members for different related values.
Modified Paths:
--------------
trunk/Src/MergeDoc.cpp
trunk/Src/MergeDoc.h
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2008-02-15 18:50:14 UTC (rev 5044)
+++ trunk/Src/MergeDoc.cpp 2008-02-15 23:44:47 UTC (rev 5045)
@@ -30,6 +30,7 @@
#include "stdafx.h"
#include <Shlwapi.h> // PathCompactPathEx()
#include "UnicodeString.h"
+#include "FileTextEncoding.h"
#include "Merge.h"
#include "MainFrm.h"
#include "Environment.h"
@@ -447,7 +448,8 @@
// Set paths for diffing and run diff
m_diffWrapper.SetPaths(m_tempFiles[0].GetPath(), m_tempFiles[1].GetPath(), TRUE);
m_diffWrapper.SetCompareFiles(m_filePaths.GetLeft(), m_filePaths.GetRight());
- m_diffWrapper.SetCodepage(m_ptBuf[0]->m_unicoding ? CP_UTF8 : m_ptBuf[0]->m_codepage);
+ m_diffWrapper.SetCodepage(m_ptBuf[0]->m_encoding.m_unicoding ?
+ CP_UTF8 : m_ptBuf[0]->m_encoding.m_codepage);
diffSuccess = m_diffWrapper.RunFileDiff();
// Read diff-status
@@ -658,9 +660,6 @@
: m_pOwnerDoc(pDoc)
, m_nThisPane(pane)
, unpackerSubcode(0)
-, m_unicoding(0)
-, m_bBom(false)
-, m_codepage(0)
{
}
@@ -1793,9 +1792,9 @@
nRetVal = FileLoadResult::FRESULT_OK_IMPURE;
// stash original encoding away
- m_unicoding = pufile->GetUnicoding();
- m_bBom = pufile->HasBom();
- m_codepage = pufile->GetCodepage();
+ m_encoding.m_unicoding = pufile->GetUnicoding();
+ m_encoding.m_bom = pufile->HasBom();
+ m_encoding.m_codepage = pufile->GetCodepage();
if (pufile->GetTxtStats().nlosses)
{
@@ -1853,9 +1852,9 @@
BOOL bSaveSuccess = FALSE;
UniStdioFile file;
- file.SetUnicoding(m_unicoding);
- file.SetBom(m_bBom);
- file.SetCodepage(m_codepage);
+ file.SetUnicoding(m_encoding.m_unicoding);
+ file.SetBom(m_encoding.m_bom);
+ file.SetCodepage(m_encoding.m_codepage);
String sIntermediateFilename; // used when !bTempFile
Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h 2008-02-15 18:50:14 UTC (rev 5044)
+++ trunk/Src/MergeDoc.h 2008-02-15 23:44:47 UTC (rev 5045)
@@ -154,9 +154,7 @@
* Unicode:
* in memory it is wchars
*/
- int m_unicoding; /**< File's Unicode encoding */
- bool m_bBom; /**< Has the file BOM? */
- int m_codepage; /**< @brief 8-bit codepage, if relevant m_unicoding==ucr::NONE */
+ FileTextEncoding m_encoding; /**< File's encoding information. */
int NoteCRLFStyleFromBuffer(TCHAR *lpLineBegin, DWORD dwLineLen = 0);
void ReadLineFromBuffer(TCHAR *lpLineBegin, DWORD dwLineNum, DWORD dwLineLen = 0);
@@ -174,10 +172,10 @@
int SaveToFile (LPCTSTR pszFileName, BOOL bTempFile, CString & sError,
PackingInfo * infoUnpacker = NULL, int nCrlfStyle = CRLF_STYLE_AUTOMATIC,
BOOL bClearModifiedFlag = TRUE );
- int getUnicoding() const { return m_unicoding; }
- void setUnicoding(int value) { m_unicoding = value; }
- int getCodepage() const { return m_codepage; }
- void setCodepage(int value) { m_codepage = value; }
+ int getUnicoding() const { return m_encoding.m_unicoding; }
+ void setUnicoding(int value) { m_encoding.m_unicoding = value; }
+ int getCodepage() const { return m_encoding.m_codepage; }
+ void setCodepage(int value) { m_encoding.m_codepage = value; }
CDiffTextBuffer(CMergeDoc * pDoc, int pane);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-16 17:17:13
|
Revision: 5047
http://winmerge.svn.sourceforge.net/winmerge/?rev=5047&view=rev
Author: kimmov
Date: 2008-02-16 08:59:25 -0800 (Sat, 16 Feb 2008)
Log Message:
-----------
PATCH: [ 1894692 ] Load unicoding type names from resource
Modified Paths:
--------------
trunk/Src/FileTextEncoding.cpp
trunk/Src/Languages/English.pot
trunk/Src/Merge.rc
trunk/Src/resource.h
Modified: trunk/Src/FileTextEncoding.cpp
===================================================================
--- trunk/Src/FileTextEncoding.cpp 2008-02-16 06:49:32 UTC (rev 5046)
+++ trunk/Src/FileTextEncoding.cpp 2008-02-16 16:59:25 UTC (rev 5047)
@@ -54,15 +54,22 @@
/**
* @brief Return string representation of encoding, eg "UCS-2LE", or "1252"
+ * @todo This resource lookup should be done in GUI code?
*/
String FileTextEncoding::GetName() const
{
+ if (m_unicoding == ucr::UTF8)
+ {
+ if (m_bom)
+ return LoadResString(IDS_UNICODING_UTF8_BOM);
+ else
+ return LoadResString(IDS_UNICODING_UTF8);
+ }
+
if (m_unicoding == ucr::UCS2LE)
- return _T("UCS-2LE");
+ return LoadResString(IDS_UNICODING_UCS2_LE);
if (m_unicoding == ucr::UCS2BE)
- return _T("UCS-2BE");
- if (m_unicoding == ucr::UTF8)
- return _T("UTF-8");
+ return LoadResString(IDS_UNICODING_UCS2_BE);
String str;
if (m_codepage > -1)
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-02-16 06:49:32 UTC (rev 5046)
+++ trunk/Src/Languages/English.pot 2008-02-16 16:59:25 UTC (rev 5047)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-02-15 20:49+0000\n"
+"POT-Creation-Date: 2008-02-16 18:59+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -692,7 +692,7 @@
msgstr ""
#: Merge.rc:360
-#: Merge.rc:2693
+#: Merge.rc:2702
#, c-format
msgid "< Empty >"
msgstr ""
@@ -1402,7 +1402,7 @@
msgstr ""
#: Merge.rc:851
-#: Merge.rc:2124
+#: Merge.rc:2133
#, c-format
msgid "Rational ClearCase"
msgstr ""
@@ -2295,7 +2295,7 @@
msgstr ""
#: Merge.rc:1467
-#: Merge.rc:2266
+#: Merge.rc:2275
#, c-format
msgid "Different"
msgstr ""
@@ -2327,7 +2327,7 @@
msgstr ""
#: Merge.rc:1485
-#: Merge.rc:2261
+#: Merge.rc:2270
#, c-format
msgid "Identical"
msgstr ""
@@ -3081,2350 +3081,2370 @@
#: Merge.rc:1964
#, c-format
-msgid "Full Contents"
+msgid "UTF-8"
msgstr ""
#: Merge.rc:1965
#, c-format
-msgid "Quick Contents"
+msgid "UTF-8 (B)"
msgstr ""
#: Merge.rc:1966
#, c-format
-msgid "Modified Date"
+msgid "UCS-2 LE"
msgstr ""
#: Merge.rc:1967
#, c-format
+msgid "UCS-2 BE"
+msgstr ""
+
+#: Merge.rc:1973
+#, c-format
+msgid "Full Contents"
+msgstr ""
+
+#: Merge.rc:1974
+#, c-format
+msgid "Quick Contents"
+msgstr ""
+
+#: Merge.rc:1975
+#, c-format
+msgid "Modified Date"
+msgstr ""
+
+#: Merge.rc:1976
+#, c-format
msgid "Modified Date and Size"
msgstr ""
-#: Merge.rc:1968
+#: Merge.rc:1977
#, c-format
msgid "Size"
msgstr ""
-#: Merge.rc:1974
+#: Merge.rc:1983
#, c-format
msgid "Name"
msgstr ""
-#: Merge.rc:1975
+#: Merge.rc:1984
#, c-format
msgid "Location"
msgstr ""
-#: Merge.rc:1976
+#: Merge.rc:1985
#, c-format
msgid "Filters"
msgstr ""
-#: Merge.rc:1977
+#: Merge.rc:1986
#, c-format
msgid "[F] "
msgstr ""
-#: Merge.rc:1978
+#: Merge.rc:1987
#, c-format
msgid "Description"
msgstr ""
-#: Merge.rc:1979
+#: Merge.rc:1988
#, c-format
msgid "Select filename for new filter"
msgstr ""
-#: Merge.rc:1980
+#: Merge.rc:1989
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1982
+#: Merge.rc:1991
#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
msgstr ""
-#: Merge.rc:1984
+#: Merge.rc:1993
#, c-format
msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
msgstr ""
-#: Merge.rc:1986
+#: Merge.rc:1995
#, c-format
msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
msgstr ""
-#: Merge.rc:1988
+#: Merge.rc:1997
#, c-format
msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
msgstr ""
-#: Merge.rc:1989
+#: Merge.rc:1998
#, c-format
msgid "Locate filter file to install"
msgstr ""
-#: Merge.rc:1991
+#: Merge.rc:2000
#, c-format
msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
msgstr ""
-#: Merge.rc:1993
+#: Merge.rc:2002
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr ""
-#: Merge.rc:1999
+#: Merge.rc:2008
#, c-format
msgid "Regular expression"
msgstr ""
-#: Merge.rc:2005
+#: Merge.rc:2014
#, c-format
msgid "&Path to cleartool.exe :"
msgstr ""
-#: Merge.rc:2006
+#: Merge.rc:2015
#, c-format
msgid "&Path to SS.EXE :"
msgstr ""
-#: Merge.rc:2012
+#: Merge.rc:2021
#, c-format
msgid "Folder Comparison Results"
msgstr ""
-#: Merge.rc:2013
+#: Merge.rc:2022
#, c-format
msgid "File Comparison"
msgstr ""
-#: Merge.rc:2014
+#: Merge.rc:2023
#, c-format
msgid "Untitled left"
msgstr ""
-#: Merge.rc:2015
+#: Merge.rc:2024
#, c-format
msgid "Untitled right"
msgstr ""
-#: Merge.rc:2016
+#: Merge.rc:2025
#, c-format
msgid "Theirs File"
msgstr ""
-#: Merge.rc:2017
+#: Merge.rc:2026
#, c-format
msgid "Mine File"
msgstr ""
-#: Merge.rc:2023
+#: Merge.rc:2032
#, c-format
msgid "Scanning files..."
msgstr ""
-#: Merge.rc:2024
+#: Merge.rc:2033
#, c-format
msgid "Opening selection"
msgstr ""
-#: Merge.rc:2025
+#: Merge.rc:2034
#, c-format
msgid "Copying Left to Right"
msgstr ""
-#: Merge.rc:2026
+#: Merge.rc:2035
#, c-format
msgid "Copying Right to Left"
msgstr ""
-#: Merge.rc:2027
+#: Merge.rc:2036
#, c-format
msgid "Copying All to Left"
msgstr ""
-#: Merge.rc:2028
+#: Merge.rc:2037
#, c-format
msgid "Copying All to Right"
msgstr ""
-#: Merge.rc:2029
+#: Merge.rc:2038
#, c-format
msgid "Copying files..."
msgstr ""
-#: Merge.rc:2030
+#: Merge.rc:2039
#, c-format
msgid "Deleting files..."
msgstr ""
-#: Merge.rc:2031
+#: Merge.rc:2040
#, c-format
msgid "Moving files..."
msgstr ""
-#: Merge.rc:2032
+#: Merge.rc:2041
#, c-format
msgid "Creating the report..."
msgstr ""
-#: Merge.rc:2038
+#: Merge.rc:2047
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
-#: Merge.rc:2039
+#: Merge.rc:2048
#, c-format
msgid "Line: %s"
msgstr ""
-#: Merge.rc:2040
+#: Merge.rc:2049
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
-#: Merge.rc:2041
+#: Merge.rc:2050
#, c-format
msgid "Merge"
msgstr ""
-#: Merge.rc:2042
+#: Merge.rc:2051
#, c-format
msgid "Difference %1 of %2"
msgstr ""
-#: Merge.rc:2043
+#: Merge.rc:2052
#, c-format
msgid "%1 Differences Found"
msgstr ""
-#: Merge.rc:2044
+#: Merge.rc:2053
#, c-format
msgid "1 Difference Found"
msgstr ""
#. Abbreviation from "Read Only"
-#: Merge.rc:2045
+#: Merge.rc:2054
#, c-format
msgid "RO"
msgstr ""
-#: Merge.rc:2051
+#: Merge.rc:2060
#, c-format
msgid "Item %1 of %2"
msgstr ""
-#: Merge.rc:2052
+#: Merge.rc:2061
#, c-format
msgid "Items: %1"
msgstr ""
-#: Merge.rc:2058
+#: Merge.rc:2067
#, c-format
msgid "Select two existing folders or files to compare"
msgstr ""
-#: Merge.rc:2059
+#: Merge.rc:2068
#, c-format
msgid "Folder Selection"
msgstr ""
-#: Merge.rc:2060
+#: Merge.rc:2069
#, c-format
msgid "Select two folders or two files to compare."
msgstr ""
-#: Merge.rc:2061
+#: Merge.rc:2070
#, c-format
msgid "Left path is invalid!"
msgstr ""
-#: Merge.rc:2062
+#: Merge.rc:2071
#, c-format
msgid "Right path is invalid!"
msgstr ""
-#: Merge.rc:2063
+#: Merge.rc:2072
#, c-format
msgid "Both paths are invalid!"
msgstr ""
-#: Merge.rc:2064
+#: Merge.rc:2073
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr ""
-#: Merge.rc:2065
+#: Merge.rc:2074
#, c-format
msgid "Cannot compare file and folder!"
msgstr ""
-#: Merge.rc:2071
+#: Merge.rc:2080
#, c-format
msgid "File not found: %1"
msgstr ""
-#: Merge.rc:2072
+#: Merge.rc:2081
#, c-format
msgid "File not unpacked: %1"
msgstr ""
-#: Merge.rc:2073
+#: Merge.rc:2082
#, c-format
msgid "Cannot open file\n%1\n\n%2"
msgstr ""
-#: Merge.rc:2074
+#: Merge.rc:2083
#, c-format
msgid "Failed to parse conflict file."
msgstr ""
-#: Merge.rc:2075
+#: Merge.rc:2084
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
-#: Merge.rc:2081
+#: Merge.rc:2090
#, c-format
msgid "Save As"
msgstr ""
-#: Merge.rc:2082
+#: Merge.rc:2091
#, c-format
msgid "Save changes to %1?"
msgstr ""
-#: Merge.rc:2083
+#: Merge.rc:2092
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr ""
-#: Merge.rc:2084
+#: Merge.rc:2093
#, c-format
msgid "Error checking destination writeability"
msgstr ""
-#: Merge.rc:2085
+#: Merge.rc:2094
#, c-format
msgid "Error backing up file"
msgstr ""
-#: Merge.rc:2087
+#: Merge.rc:2096
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr ""
-#: Merge.rc:2088
+#: Merge.rc:2097
#, c-format
msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
msgstr ""
-#: Merge.rc:2089
+#: Merge.rc:2098
#, c-format
msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
msgstr ""
-#: Merge.rc:2090
+#: Merge.rc:2099
#, c-format
msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
msgstr ""
-#: Merge.rc:2091
+#: Merge.rc:2100
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
msgstr ""
-#: Merge.rc:2092
+#: Merge.rc:2101
#, c-format
msgid "%1\nis marked read-only. Would you like to override the read-only item?"
msgstr ""
-#: Merge.rc:2093
+#: Merge.rc:2102
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nIf you want to refresh files close current file compare and load files again."
msgstr ""
-#: Merge.rc:2094
+#: Merge.rc:2103
#, c-format
msgid "Save Left File As"
msgstr ""
-#: Merge.rc:2095
+#: Merge.rc:2104
#, c-format
msgid "Save Right File As"
msgstr ""
-#: Merge.rc:2101
+#: Merge.rc:2110
#, c-format
msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
msgstr ""
-#: Merge.rc:2107
+#: Merge.rc:2116
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr ""
-#: Merge.rc:2108
+#: Merge.rc:2117
#, c-format
msgid "Checkout files from VSS..."
msgstr ""
-#: Merge.rc:2109
+#: Merge.rc:2118
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr ""
-#: Merge.rc:2110
+#: Merge.rc:2119
#, c-format
msgid "Error executing versioning system command."
msgstr ""
-#: Merge.rc:2111
+#: Merge.rc:2120
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr ""
-#: Merge.rc:2112
+#: Merge.rc:2121
#, c-format
msgid "No VSS database(s) found!"
msgstr ""
-#: Merge.rc:2113
+#: Merge.rc:2122
#, c-format
msgid "Error from VSS:"
msgstr ""
-#: Merge.rc:2114
+#: Merge.rc:2123
#, c-format
msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?"
msgstr ""
-#: Merge.rc:2115
+#: Merge.rc:2124
#, c-format
msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. "
msgstr ""
-#: Merge.rc:2121
-#: Merge.rc:2729
+#: Merge.rc:2130
+#: Merge.rc:2738
#, c-format
msgid "None"
msgstr ""
-#: Merge.rc:2122
+#: Merge.rc:2131
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr ""
-#: Merge.rc:2123
+#: Merge.rc:2132
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr ""
-#: Merge.rc:2125
+#: Merge.rc:2134
#, c-format
msgid "Break at whitespace"
msgstr ""
-#: Merge.rc:2126
+#: Merge.rc:2135
#, c-format
msgid "Break at whitespace or punctuation"
msgstr ""
-#: Merge.rc:2132
-#: Merge.rc:2134
+#: Merge.rc:2141
+#: Merge.rc:2143
#, c-format
msgid "Copy selected item to named directory"
msgstr ""
-#: Merge.rc:2133
-#: Merge.rc:2135
+#: Merge.rc:2142
+#: Merge.rc:2144
#, c-format
msgid "Copy selected item to custom directory"
msgstr ""
-#: Merge.rc:2136
+#: Merge.rc:2145
#, c-format
msgid "Delete selected item on left"
msgstr ""
-#: Merge.rc:2137
+#: Merge.rc:2146
#, c-format
msgid "Delete selected item on right"
msgstr ""
-#: Merge.rc:2138
+#: Merge.rc:2147
#, c-format
msgid "Delete selected item(s) on both sides"
msgstr ""
-#: Merge.rc:2139
+#: Merge.rc:2148
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr ""
-#: Merge.rc:2140
+#: Merge.rc:2149
#, c-format
msgid "Rename selected item on both sides"
msgstr ""
-#: Merge.rc:2141
+#: Merge.rc:2150
#, c-format
msgid "Right to Left (%1)"
msgstr ""
-#: Merge.rc:2142
+#: Merge.rc:2151
#, c-format
msgid "Left to Right (%1)"
msgstr ""
-#: Merge.rc:2143
+#: Merge.rc:2152
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2144
+#: Merge.rc:2153
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2145
-#: Merge.rc:2161
+#: Merge.rc:2154
+#: Merge.rc:2170
#, c-format
msgid "Left to... (%1)"
msgstr ""
-#: Merge.rc:2146
-#: Merge.rc:2162
+#: Merge.rc:2155
+#: Merge.rc:2171
#, c-format
msgid "Right to... (%1)"
msgstr ""
-#: Merge.rc:2147
-#: Merge.rc:2163
+#: Merge.rc:2156
+#: Merge.rc:2172
#, c-format
msgid "Left to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2148
-#: Merge.rc:2164
+#: Merge.rc:2157
+#: Merge.rc:2173
#, c-format
msgid "Right to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2154
+#: Merge.rc:2163
#, c-format
msgid "Left (%1)"
msgstr ""
-#: Merge.rc:2155
+#: Merge.rc:2164
#, c-format
msgid "Right (%1)"
msgstr ""
-#: Merge.rc:2156
+#: Merge.rc:2165
#, c-format
msgid "Both (%1)"
msgstr ""
-#: Merge.rc:2157
+#: Merge.rc:2166
#, c-format
msgid "Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2158
+#: Merge.rc:2167
#, c-format
msgid "Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2159
+#: Merge.rc:2168
#, c-format
msgid "Both (%1 of %2)"
msgstr ""
-#: Merge.rc:2160
+#: Merge.rc:2169
#, c-format
msgid "Select destination folder"
msgstr ""
-#: Merge.rc:2165
+#: Merge.rc:2174
#, c-format
msgid "Left side - select destination folder:"
msgstr ""
-#: Merge.rc:2166
+#: Merge.rc:2175
#, c-format
msgid "Right side - select destination folder:"
msgstr ""
-#: Merge.rc:2167
+#: Merge.rc:2176
#, c-format
msgid "(%1 Files Affected)"
msgstr ""
-#: Merge.rc:2168
+#: Merge.rc:2177
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr ""
-#: Merge.rc:2174
+#: Merge.rc:2183
#, c-format
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr ""
-#: Merge.rc:2175
+#: Merge.rc:2184
#, c-format
msgid "Are you sure you want to copy:"
msgstr ""
-#: Merge.rc:2176
+#: Merge.rc:2185
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr ""
-#: Merge.rc:2177
+#: Merge.rc:2186
#, c-format
msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare."
msgstr ""
-#: Merge.rc:2183
+#: Merge.rc:2192
#, c-format
msgid "Open left file"
msgstr ""
-#: Merge.rc:2184
+#: Merge.rc:2193
#, c-format
msgid "Open the left file to external editor"
msgstr ""
-#: Merge.rc:2185
+#: Merge.rc:2194
#, c-format
msgid "Open left file with ..."
msgstr ""
-#: Merge.rc:2186
+#: Merge.rc:2195
#, c-format
msgid "Open right file"
msgstr ""
-#: Merge.rc:2187
+#: Merge.rc:2196
#, c-format
msgid "Open the right file to external editor"
msgstr ""
-#: Merge.rc:2188
+#: Merge.rc:2197
#, c-format
msgid "Open right file with..."
msgstr ""
-#: Merge.rc:2189
+#: Merge.rc:2198
#, c-format
msgid "Failed to execute external editor: %1"
msgstr ""
-#: Merge.rc:2190
+#: Merge.rc:2199
#, c-format
msgid "Unknown extension on external editor: %1"
msgstr ""
-#: Merge.rc:2191
+#: Merge.rc:2200
#, c-format
msgid "Copy filenames to clipboard"
msgstr ""
-#: Merge.rc:2192
+#: Merge.rc:2201
#, c-format
msgid "Copy left side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2193
+#: Merge.rc:2202
#, c-format
msgid "Copy right side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2194
+#: Merge.rc:2203
#, c-format
msgid "Copy both sides pathnames to clipboard"
msgstr ""
-#: Merge.rc:2200
+#: Merge.rc:2209
#, c-format
msgid "Unknown archive format"
msgstr ""
-#: Merge.rc:2201
+#: Merge.rc:2210
#, c-format
msgid "Add items from left side to archive"
msgstr ""
-#: Merge.rc:2202
+#: Merge.rc:2211
#, c-format
msgid "Add items from right side to archive"
msgstr ""
-#: Merge.rc:2203
+#: Merge.rc:2212
#, c-format
msgid "Add items from both sides to archive"
msgstr ""
-#: Merge.rc:2204
+#: Merge.rc:2213
#, c-format
msgid "Add different items to archive (both sides)"
msgstr ""
-#: Merge.rc:2206
+#: Merge.rc:2215
#, c-format
msgid "Move selected file on left to custom directory"
msgstr ""
-#: Merge.rc:2208
+#: Merge.rc:2217
#, c-format
msgid "Move selected file on right to custom directory"
msgstr ""
-#: Merge.rc:2214
+#: Merge.rc:2223
#, c-format
msgid "Filename"
msgstr ""
-#: Merge.rc:2215
+#: Merge.rc:2224
#, c-format
msgid "Folder"
msgstr ""
-#: Merge.rc:2216
+#: Merge.rc:2225
#, c-format
msgid "Comparison result"
msgstr ""
-#: Merge.rc:2217
+#: Merge.rc:2226
#, c-format
msgid "Left Date"
msgstr ""
-#: Merge.rc:2218
+#: Merge.rc:2227
#, c-format
msgid "Right Date"
msgstr ""
-#: Merge.rc:2219
+#: Merge.rc:2228
#, c-format
msgid "Extension"
msgstr ""
-#: Merge.rc:2220
+#: Merge.rc:2229
#, c-format
msgid "Left Size"
msgstr ""
-#: Merge.rc:2221
+#: Merge.rc:2230
#, c-format
msgid "Right Size"
msgstr ""
-#: Merge.rc:2222
+#: Merge.rc:2231
#, c-format
msgid "Right Size (Short)"
msgstr ""
-#: Merge.rc:2223
+#: Merge.rc:2232
#, c-format
msgid "Left Size (Short)"
msgstr ""
-#: Merge.rc:2229
+#: Merge.rc:2238
#, c-format
msgid "Left Creation Time"
msgstr ""
-#: Merge.rc:2230
+#: Merge.rc:2239
#, c-format
msgid "Right Creation Time"
msgstr ""
-#: Merge.rc:2231
+#: Merge.rc:2240
#, c-format
msgid "Newer File"
msgstr ""
-#: Merge.rc:2232
+#: Merge.rc:2241
#, c-format
msgid "Left File Version"
msgstr ""
-#: Merge.rc:2233
+#: Merge.rc:2242
#, c-format
msgid "Right File Version"
msgstr ""
-#: Merge.rc:2234
+#: Merge.rc:2243
#, c-format
msgid "Short Result"
msgstr ""
-#: Merge.rc:2235
+#: Merge.rc:2244
#, c-format
msgid "Left Attributes"
msgstr ""
-#: Merge.rc:2236
+#: Merge.rc:2245
#, c-format
msgid "Right Attributes"
msgstr ""
-#: Merge.rc:2237
+#: Merge.rc:2246
#, c-format
msgid "Left EOL"
msgstr ""
-#: Merge.rc:2238
+#: Merge.rc:2247
#, c-format
msgid "Right EOL"
msgstr ""
-#: Merge.rc:2244
+#: Merge.rc:2253
#, c-format
msgid "Left Encoding"
msgstr ""
-#: Merge.rc:2245
+#: Merge.rc:2254
#, c-format
msgid "Right Encoding"
msgstr ""
-#: Merge.rc:2246
+#: Merge.rc:2255
#, c-format
msgid "Ignored Diff."
msgstr ""
-#: Merge.rc:2247
+#: Merge.rc:2256
#, c-format
msgid "Differences"
msgstr ""
-#: Merge.rc:2248
-#: Merge.rc:2552
+#: Merge.rc:2257
+#: Merge.rc:2561
#, c-format
msgid "Binary"
msgstr ""
-#: Merge.rc:2254
+#: Merge.rc:2263
#, c-format
msgid "Unable to compare files"
msgstr ""
-#: Merge.rc:2255
+#: Merge.rc:2264
#, c-format
msgid "Item aborted"
msgstr ""
-#: Merge.rc:2256
+#: Merge.rc:2265
#, c-format
msgid "File skipped"
msgstr ""
-#: Merge.rc:2257
+#: Merge.rc:2266
#, c-format
msgid "Folder skipped"
msgstr ""
-#: Merge.rc:2258
+#: Merge.rc:2267
#, c-format
msgid "Left only: %1"
msgstr ""
-#: Merge.rc:2259
+#: Merge.rc:2268
#, c-format
msgid "Right only: %1"
msgstr ""
-#: Merge.rc:2260
+#: Merge.rc:2269
#, c-format
msgid "Binary files are identical"
msgstr ""
-#: Merge.rc:2262
+#: Merge.rc:2271
#, c-format
msgid "Binary files are different"
msgstr ""
-#: Merge.rc:2263
+#: Merge.rc:2272
#, c-format
msgid "Files are different"
msgstr ""
-#: Merge.rc:2264
+#: Merge.rc:2273
#, c-format
msgid "Left Only"
msgstr ""
-#: Merge.rc:2265
+#: Merge.rc:2274
#, c-format
msgid "Right Only"
msgstr ""
-#: Merge.rc:2267
+#: Merge.rc:2276
#, c-format
msgid "Error"
msgstr ""
-#: Merge.rc:2273
+#: Merge.rc:2282
#, c-format
msgid "Elapsed time: %ld ms"
msgstr ""
-#: Merge.rc:2274
+#: Merge.rc:2283
#, c-format
msgid "1 item selected"
msgstr ""
-#: Merge.rc:2275
+#: Merge.rc:2284
#, c-format
msgid "%1 items selected"
msgstr ""
-#: Merge.rc:2281
+#: Merge.rc:2290
#, c-format
msgid "Filename or folder name."
msgstr ""
-#: Merge.rc:2282
+#: Merge.rc:2291
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr ""
-#: Merge.rc:2283
+#: Merge.rc:2292
#, c-format
msgid "Comparison result, long form."
msgstr ""
-#: Merge.rc:2284
+#: Merge.rc:2293
#, c-format
msgid "Left side modification date."
msgstr ""
-#: Merge.rc:2285
+#: Merge.rc:2294
#, c-format
msgid "Right side modification date."
msgstr ""
-#: Merge.rc:2286
+#: Merge.rc:2295
#, c-format
msgid "File's extension."
msgstr ""
-#: Merge.rc:2287
+#: Merge.rc:2296
#, c-format
msgid "Left file size in bytes."
msgstr ""
-#: Merge.rc:2288
+#: Merge.rc:2297
#, c-format
msgid "Right file size in bytes."
msgstr ""
-#: Merge.rc:2289
+#: Merge.rc:2298
#, c-format
msgid "Left file size abbreviated."
msgstr ""
-#: Merge.rc:2290
+#: Merge.rc:2299
#, c-format
msgid "Right file size abbreviated."
msgstr ""
-#: Merge.rc:2296
+#: Merge.rc:2305
#, c-format
msgid "Left side creation time."
msgstr ""
-#: Merge.rc:2297
+#: Merge.rc:2306
#, c-format
msgid "Right side creation time."
msgstr ""
-#: Merge.rc:2298
+#: Merge.rc:2307
#, c-format
msgid "Tells which side has newer modification date."
msgstr ""
-#: Merge.rc:2299
+#: Merge.rc:2308
#, c-format
msgid "Left side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2300
+#: Merge.rc:2309
#, c-format
msgid "Right side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2301
+#: Merge.rc:2310
#, c-format
msgid "Short comparison result."
msgstr ""
-#: Merge.rc:2302
+#: Merge.rc:2311
#, c-format
msgid "Left side attributes."
msgstr ""
-#: Merge.rc:2303
+#: Merge.rc:2312
#, c-format
msgid "Right side attributes."
msgstr ""
-#: Merge.rc:2304
+#: Merge.rc:2313
#, c-format
msgid "Left side file EOL type"
msgstr ""
-#: Merge.rc:2305
+#: Merge.rc:2314
#, c-format
msgid "Right side file EOL type"
msgstr ""
-#: Merge.rc:2311
+#: Merge.rc:2320
#, c-format
msgid "Left side encoding."
msgstr ""
-#: Merge.rc:2312
+#: Merge.rc:2321
#, c-format
msgid "Right side encoding."
msgstr ""
-#: Merge.rc:2313
+#: Merge.rc:2322
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
msgstr ""
-#: Merge.rc:2314
+#: Merge.rc:2323
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
msgstr ""
-#: Merge.rc:2315
+#: Merge.rc:2324
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr ""
-#: Merge.rc:2321
+#: Merge.rc:2330
#, c-format
msgid "Compare %1 with %2"
msgstr ""
-#: Merge.rc:2322
+#: Merge.rc:2331
#, c-format
msgid "Comma-separated list"
msgstr ""
-#: Merge.rc:2323
+#: Merge.rc:2332
#, c-format
msgid "Tab-separated list"
msgstr ""
-#: Merge.rc:2324
+#: Merge.rc:2333
#, c-format
msgid "Simple HTML"
msgstr ""
-#: Merge.rc:2325
+#: Merge.rc:2334
#, c-format
msgid "Simple XML"
msgstr ""
-#: Merge.rc:2327
+#: Merge.rc:2336
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
msgstr ""
-#: Merge.rc:2328
+#: Merge.rc:2337
#, c-format
msgid "Error creating the report:\n%1"
msgstr ""
-#: Merge.rc:2329
+#: Merge.rc:2338
#, c-format
msgid "The report has been created successfully."
msgstr ""
-#: Merge.rc:2335
+#: Merge.rc:2344
#, c-format
msgid "The same file is opened in both panels."
msgstr ""
-#: Merge.rc:2336
+#: Merge.rc:2345
#, c-format
msgid "The selected files are identical."
msgstr ""
-#: Merge.rc:2337
+#: Merge.rc:2346
#, c-format
msgid "An error occurred while comparing the files."
msgstr ""
-#: Merge.rc:2338
+#: Merge.rc:2347
#, c-format
msgid "Temporary files could not be created. Check your temporary path settings."
msgstr ""
-#: Merge.rc:2339
+#: Merge.rc:2348
#, c-format
msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
msgstr ""
-#: Merge.rc:2340
+#: Merge.rc:2349
#, c-format
msgid "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
msgstr ""
-#: Merge.rc:2341
+#: Merge.rc:2350
#, c-format
msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
msgstr ""
-#: Merge.rc:2342
+#: Merge.rc:2351
#, c-format
msgid "The selected folder is invalid."
msgstr ""
-#: Merge.rc:2343
+#: Merge.rc:2352
#, c-format
msgid "Cannot open a binary file to editor."
msgstr ""
-#: Merge.rc:2344
+#: Merge.rc:2353
#, c-format
msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
msgstr ""
-#: Merge.rc:2350
+#: Merge.rc:2359
#, c-format
msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?"
msgstr ""
-#: Merge.rc:2351
+#: Merge.rc:2360
#, c-format
msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
msgstr ""
-#: Merge.rc:2352
+#: Merge.rc:2361
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr ""
-#: Merge.rc:2353
+#: Merge.rc:2362
#, c-format
msgid "Information lost due to encoding errors: right file"
msgstr ""
-#: Merge.rc:2354
+#: Merge.rc:2363
#, c-format
msgid "Information lost due to encoding errors: left file"
msgstr ""
-#: Merge.rc:2360
+#: Merge.rc:2369
#, c-format
msgid "No difference"
msgstr ""
-#: Merge.rc:2361
+#: Merge.rc:2370
#, c-format
msgid "Line difference"
msgstr ""
-#: Merge.rc:2367
+#: Merge.rc:2376
#, c-format
msgid "Replaced %1 string(s)."
msgstr ""
-#: Merge.rc:2368
+#: Merge.rc:2377
#, c-format
msgid "Cannot find string \"%s\""
msgstr ""
-#: Merge.rc:2374
+#: Merge.rc:2383
#, c-format
msgid "Copy Full Path"
msgstr ""
-#: Merge.rc:2375
+#: Merge.rc:2384
#, c-format
msgid "Copy Filename"
msgstr ""
-#: Merge.rc:2381
+#: Merge.rc:2390
#, c-format
msgid "Location Pane"
msgstr ""
-#: Merge.rc:2382
+#: Merge.rc:2391
#, c-format
msgid "Diff Pane"
msgstr ""
-#: Merge.rc:2388
+#: Merge.rc:2397
#, c-format
msgid "Patch file successfully written."
msgstr ""
-#: Merge.rc:2389
+#: Merge.rc:2398
#, c-format
msgid "1. item is not found or is directory!"
msgstr ""
-#: Merge.rc:2390
+#: Merge.rc:2399
#, c-format
msgid "2. item is not found or is directory!"
msgstr ""
-#: Merge.rc:2391
+#: Merge.rc:2400
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
msgstr ""
-#: Merge.rc:2392
+#: Merge.rc:2401
#, c-format
msgid "[%1 files selected]"
msgstr ""
-#: Merge.rc:2393
+#: Merge.rc:2402
#, c-format
msgid "Normal"
msgstr ""
-#: Merge.rc:2394
+#: Merge.rc:2403
#, c-format
msgid "Context"
msgstr ""
-#: Merge.rc:2395
+#: Merge.rc:2404
#, c-format
msgid "Unified"
msgstr ""
-#: Merge.rc:2396
+#: Merge.rc:2405
#, c-format
msgid "Could not write to file %1."
msgstr ""
-#: Merge.rc:2397
+#: Merge.rc:2406
#, c-format
msgid "The specified output path is not an absolute path: %1"
msgstr ""
-#: Merge.rc:2398
+#: Merge.rc:2407
#, c-format
msgid "Specify an output file"
msgstr ""
-#: Merge.rc:2399
+#: Merge.rc:2408
#, c-format
msgid "Cannot create a patch file from binary files."
msgstr ""
-#: Merge.rc:2400
+#: Merge.rc:2409
#, c-format
msgid "Cannot create a patch file from directories."
msgstr ""
-#: Merge.rc:2401
+#: Merge.rc:2410
#, c-format
msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
msgstr ""
-#: Merge.rc:2402
+#: Merge.rc:2411
#, c-format
msgid "Folder does not exist."
msgstr ""
-#: Merge.rc:2407
+#: Merge.rc:2416
#, c-format
msgid "Current directory comparison results will be cleared."
msgstr ""
-#: Merge.rc:2408
+#: Merge.rc:2417
#, c-format
msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it."
msgstr ""
-#: Merge.rc:2409
+#: Merge.rc:2418
#, c-format
msgid "\nNote: 7-Zip integration is disabled in WinMerge settings."
msgstr ""
-#: Merge.rc:2410
+#: Merge.rc:2419
#, c-format
msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings."
msgstr ""
-#: Merge.rc:2411
+#: Merge.rc:2420
#, c-format
msgid "Select file for export"
msgstr ""
-#: Merge.rc:2412
+#: Merge.rc:2421
#, c-format
msgid "Select file for import"
msgstr ""
-#: Merge.rc:2413
+#: Merge.rc:2422
#, c-format
msgid "Options imported from the file."
msgstr ""
-#: Merge.rc:2414
+#: Merge.rc:2423
#, c-format
msgid "Options exported to the file."
msgstr ""
-#: Merge.rc:2415
+#: Merge.rc:2424
#, c-format
msgid "Failed to import options from the file."
msgstr ""
-#: Merge.rc:2416
+#: Merge.rc:2425
#, c-format
msgid "Failed to write options to the file."
msgstr ""
-#: Merge.rc:2417
+#: Merge.rc:2426
#, c-format
msgid "You are about to close several compare windows.\n\nDo you want to continue?"
msgstr ""
-#: Merge.rc:2423
+#: Merge.rc:2432
#, c-format
msgid "Regular expression error"
msgstr ""
-#: Merge.rc:2424
+#: Merge.rc:2433
#, c-format
msgid "No match"
msgstr ""
-#: Merge.rc:2425
+#: Merge.rc:2434
#, c-format
msgid "Invalid regular expression"
msgstr ""
-#: Merge.rc:2426
+#: Merge.rc:2435
#, c-format
msgid "Invalid collation character"
msgstr ""
-#: Merge.rc:2427
+#: Merge.rc:2436
#, c-format
msgid "Invalid character class name"
msgstr ""
-#: Merge.rc:2428
+#: Merge.rc:2437
#, c-format
msgid "Trailing backslash"
msgstr ""
-#: Merge.rc:2429
+#: Merge.rc:2438
#, c-format
msgid "Invalid back reference"
msgstr ""
-#: Merge.rc:2430
+#: Merge.rc:2439
#, c-format
msgid "Unmatched [ or [^"
msgstr ""
-#: Merge.rc:2431
+#: Merge.rc:2440
#, c-format
msgid "Unmatched ( or \\("
msgstr ""
-#: Merge.rc:2432
+#: Merge.rc:2441
#, c-format
msgid "Unmatched \\{"
msgstr ""
-#: Merge.rc:2433
+#: Merge.rc:2442
#, c-format
msgid "Invalid content of \\{\\}"
msgstr ""
-#: Merge.rc:2434
+#: Merge.rc:2443
#, c-format
msgid "Invalid range end"
msgstr ""
-#: Merge.rc:2435
+#: Merge.rc:2444
#, c-format
msgid "Out of memory"
msgstr ""
-#: Merge.rc:2436
+#: Merge.rc:2445
#, c-format
msgid "Invalid preceding regular expression"
msgstr ""
-#: Merge.rc:2437
+#: Merge.rc:2446
#, c-format
msgid "Premature end of regular expression"
msgstr ""
-#: Merge.rc:2438
+#: Merge.rc:2447
#, c-format
msgid "Regular expression too big"
msgstr ""
-#: Merge.rc:2443
+#: Merge.rc:2452
#, c-format
msgid "Unmatched ) or \\)"
msgstr ""
-#: Merge.rc:2449
+#: Merge.rc:2458
#, c-format
msgid "Western European"
msgstr ""
-#: Merge.rc:2450
+#: Merge.rc:2459
#, c-format
msgid "Eastern European"
msgstr ""
-#: Merge.rc:2451
+#: Merge.rc:2460
#, c-format
msgid "East Asian"
msgstr ""
-#: Merge.rc:2452
+#: Merge.rc:2461
#, c-format
msgid "SE & SW Asian"
msgstr ""
-#: Merge.rc:2453
+#: Merge.rc:2462
#, c-format
msgid "Middle Eastern"
msgstr ""
-#: Merge.rc:2454
-#: Merge.rc:2464
+#: Merge.rc:2463
+#: Merge.rc:2473
#, c-format
msgid "Not applicable"
msgstr ""
-#: Merge.rc:2460
+#: Merge.rc:2469
#, c-format
msgid "MS-Windows"
msgstr ""
-#: Merge.rc:2461
+#: Merge.rc:2470
#, c-format
msgid "MS-DOS"
msgstr ""
-#: Merge.rc:2462
+#: Merge.rc:2471
#, c-format
msgid "Macintosh"
msgstr ""
-#: Merge.rc:2463
+#: Merge.rc:2472
#, c-format
msgid "IBM"
msgstr ""
-#: Merge.rc:2470
+#: Merge.rc:2479
#, c-format
msgid "EBCDIC"
msgstr ""
-#: Merge.rc:2471
+#: Merge.rc:2480
#, c-format
msgid "IBM EBCDIC Cyrillic"
msgstr ""
-#: Merge.rc:2477
+#: Merge.rc:2486
#, c-format
msgid "MS-DOS Latin US"
msgstr ""
-#: Merge.rc:2478
+#: Merge.rc:2487
#, c-format
msgid "MS-DOS Arabic"
msgstr ""
-#: Merge.rc:2479
+#: Merge.rc:2488
#, c-format
msgid "MS-DOS Greek"
msgstr ""
-#: Merge.rc:2480
+#: Merge.rc:2489
#, c-format
msgid "MS-DOS Baltic Rim"
msgstr ""
-#: Merge.rc:2481
+#: Merge.rc:2490
#, c-format
msgid "MS-DOS Latin 1"
msgstr ""
-#: Merge.rc:2482
+#: Merge.rc:2491
#, c-format
msgid "MS-DOS Greek 1"
msgstr ""
-#: Merge.rc:2483
+#: Merge.rc:2492
#, c-format
msgid "MS-DOS Latin 2"
msgstr ""
-#: Merge.rc:2484
+#: Merge.rc:2493
#, c-format
msgid "MS-DOS Cyrillic"
msgstr ""
-#: Merge.rc:2485
+#: Merge.rc:2494
#, c-format
msgid "MS-DOS Turkish"
msgstr ""
-#: Merge.rc:2486
+#: Merge.rc:2495
#, c-format
msgid "MS-DOS Portuguese"
msgstr ""
-#: Merge.rc:2492
+#: Merge.rc:2501
#, c-format
msgid "MS-DOS Icelandic"
msgstr ""
-#: Merge.rc:2493
+#: Merge.rc:2502
#, c-format
msgid "MS-DOS Hebrew"
msgstr ""
-#: Merge.rc:2494
+#: Merge.rc:2503
#, c-format
msgid "MS-DOS French Canada"
msgstr ""
-#: Merge.rc:2495
+#: Merge.rc:2504
#, c-format
msgid "MS-DOS Nordic"
msgstr ""
-#: Merge.rc:2496
+#: Merge.rc:2505
#, c-format
msgid "MS-DOS Cyrillic CIS 1"
msgstr ""
-#: Merge.rc:2497
+#: Merge.rc:2506
#, c-format
msgid "MS-DOS Greek 2"
msgstr ""
-#: Merge.rc:2503
+#: Merge.rc:2512
#, c-format
msgid "Windows Thai"
msgstr ""
-#: Merge.rc:2504
+#: Merge.rc:2513
#, c-format
msgid "Windows Japanese"
msgstr ""
-#: Merge.rc:2505
+#: Merge.rc:2514
#, c-format
msgid "Windows Simplified Chinese"
msgstr ""
-#: Merge.rc:2506
+#: Merge.rc:2515
#, c-format
msgid "Windows Korean"
msgstr ""
-#: Merge.rc:2507
+#: Merge.rc:2516
#, c-format
msgid "Windows Traditional Chinese"
msgstr ""
-#: Merge.rc:2508
+#: Merge.rc:2517
#, c-format
msgid "Windows Latin 2"
msgstr ""
-#: Merge.rc:2509
+#: Merge.rc:2518
#, c-format
msgid "Windows Cyrillic (Slavic)"
msgstr ""
-#: Merge.rc:2510
+#: Merge.rc:2519
#, c-format
msgid "Windows Latin 1"
msgstr ""
-#: Merge.rc:2511
+#: Merge.rc:2520
#, c-format
msgid "Windows Greek"
msgstr ""
-#: Merge.rc:2512
+#: Merge.rc:2521
#, c-format
msgid "Windows Latin 5 (Turkish)"
msgstr ""
-#: Merge.rc:2513
+#: Merge.rc:2522
#, c-format
msgid "Windows Hebrew"
msgstr ""
-#: Merge.rc:2514
+#: Merge.rc:2523
#, c-format
msgid "Windows Arabic"
msgstr ""
-#: Merge.rc:2515
+#: Merge.rc:2524
#, c-format
msgid "Windows Baltic Rim"
msgstr ""
-#: Merge.rc:2516
+#: Merge.rc:2525
#, c-format
msgid "Windows Vietnamese"
msgstr ""
-#: Merge.rc:2522
+#: Merge.rc:2531
#, c-format
msgid "Macintosh Roman"
msgstr ""
-#: Merge.rc:2523
+#: Merge.rc:2532
#, c-format
msgid "Macintosh Greek"
msgstr ""
-#: Merge.rc:2524
+#: Merge.rc:2533
#, c-format
msgid "Macintosh Cyrillic"
msgstr ""
-#: Merge.rc:2525
+#: Merge.rc:2534
#, c-format
msgid "Macintosh "
msgstr ""
-#: Merge.rc:2526
+#: Merge.rc:2535
#, c-format
msgid "Macintosh Central Europe"
msgstr ""
-#: Merge.rc:2527
+#: Merge.rc:2536
#, c-format
msgid "Macintosh Turkish"
msgstr ""
-#: Merge.rc:2536
+#: Merge.rc:2545
#, c-format
msgid "Approximates ISO-8859-2"
msgstr ""
-#: Merge.rc:2539
+#: Merge.rc:2548
#, c-format
msgid "Approximates ISO-8859-1"
msgstr ""
-#: Merge.rc:2540
+#: Merge.rc:2549
#, c-format
msgid "Approximates ISO-8859-7"
msgstr ""
-#: Merge.rc:2541
+#: Merge.rc:2550
#, c-format
msgid "Approximates ISO-8859-9"
msgstr ""
-#: Merge.rc:2542
+#: Merge.rc:2551
#, c-format
msgid "Approximates ISO-8859-8"
msgstr ""
-#: Merge.rc:2548
+#: Merge.rc:2557
#, c-format
msgid "Win"
msgstr ""
-#: Merge.rc:2549
+#: Merge.rc:2558
#, c-format
msgid "Mac"
msgstr ""
-#: Merge.rc:2550
+#: Merge.rc:2559
#, c-format
msgid "Unix"
msgstr ""
-#: Merge.rc:2551
+#: Merge.rc:2560
#, c-format
msgid "Mixed"
msgstr ""
-#: Merge.rc:2558
+#: Merge.rc:2567
#, c-format
msgid " B"
msgstr ""
-#: Merge.rc:2559
+#: Merge.rc:2568
#, c-format
msgid " KB"
msgstr ""
-#: Merge.rc:2560
+#: Merge.rc:2569
#, c-format
msgid " MB"
msgstr ""
-#: Merge.rc:2561
+#: Merge.rc:2570
#, c-format
msgid " GB"
msgstr ""
-#: Merge.rc:2562
+#: Merge.rc:2571
#, c-format
msgid " TB"
msgstr ""
-#: Merge.rc:2563
+#: Merge.rc:2572
#, c-format
msgid " PB"
msgstr ""
-#: Merge.rc:2570
+#: Merge.rc:2579
#, c-format
msgid "Save the left file"
msgstr ""
-#: Merge.rc:2571
+#: Merge.rc:2580
#, c-format
msgid "Save the right file"
msgstr ""
-#: Merge.rc:2572
+#: Merge.rc:2581
#, c-format
msgid "Save the left file with name..."
msgstr ""
-#: Merge.rc:2573
+#: Merge.rc:2582
#, c-format
msgid "Save the right file with name..."
msgstr ""
-#: Merge.rc:2574
+#: Merge.rc:2583
#, c-format
msgid "Change left file/dir read-only status"
msgstr ""
-#: Merge.rc:2575
+#: Merge.rc:2584
#, c-format
msgid "Change right file/dir read-only status"
msgstr ""
-#: Merge.rc:2576
+#: Merge.rc:2585
#, c-format
msgid "Convert EOL to DOS mode"
msgstr ""
-#: Merge.rc:2577
+#: Merge.rc:2586
#, c-format
msgid "Convert EOL to UNIX mode"
msgstr ""
-#: Merge.rc:2578
+#: Merge.rc:2587
#, c-format
msgid "Convert EOL to MAC mode"
msgstr ""
-#: Merge.rc:2579
+#: Merge.rc:2588
#, c-format
msgid "Switch between editing and merging modes"
msgstr ""
-#: Merge.rc:2580
+#: Merge.rc:2589
#, c-format
msgid "View and adjust file encoding properties\nFile encoding properties"
msgstr ""
-#: Merge.rc:2581
+#: Merge.rc:2590
#, c-format
msgid "Open and resolve conflict file"
msgstr ""
-#: Merge.rc:2587
+#: Merge.rc:2596
#, c-format
msgid "Select difference area in the current line\nDifference in the Current Line"
msgstr ""
-#: Merge.rc:2588
+#: Merge.rc:2597
#, c-format
msgid "Go to line or difference\nGo to (Ctrl+G)"
msgstr ""
-#: Merge.rc:2589
+#: Merge.rc:2598
#, c-format
msgid "Set program options\nOptions"
msgstr ""
-#: Merge.rc:2590
+#: Merge.rc:2599
#, c-format
msgid "Refresh display\nRefresh (F5)"
msgstr ""
-#: Merge.rc:2591
+#: Merge.rc:2600
#, c-format
msgid "Copy selected lines to clipboard adding linenumbers to line begin"
msgstr ""
-#: Merge.rc:2592
+#: Merge.rc:2601
#, c-format
msgid "Refresh selected items"
msgstr ""
-#: Merge.rc:2593
+#: Merge.rc:2602
#, c-format
msgid "Toggle bookmark"
msgstr ""
-#: Merge.rc:2594
+#: Merge.rc:2603
#, c-format
msgid "Go to next bookmark"
msgstr ""
-#: Merge.rc:2595
+#: Merge.rc:2604
#, c-format
msgid "Go to previous bookmark"
msgstr ""
-#: Merge.rc:2596
+#: Merge.rc:2605
#, c-format
msgid "Clear all bookmarks"
msgstr ""
-#: Merge.rc:2602
+#: Merge.rc:2611
#, c-format
msgid "Displays items that are exactly the same\nShow Identical Items"
msgstr ""
-#: Merge.rc:2603
+#: Merge.rc:2612
#, c-format
msgid "Displays items that have differences\nShow Different Items"
msgstr ""
-#: Merge.rc:2604
+#: Merge.rc:2613
#, c-format
msgid "Displays items that exist in only on the left side\nShow Left Unique Items"
msgstr ""
-#: Merge.rc:2605
+#: Merge.rc:2614
#, c-format
msgid "Displays items that exist in only on the right side\nShow Right Unique Items"
msgstr ""
-#: Merge.rc:2606
+#: Merge.rc:2615
#, c-format
msgid "Displays binary files\nShow Binary Files"
msgstr ""
-#: Merge.rc:2607
+#: Merge.rc:2616
#, c-format
msgid "Displays skipped items\nShow Skipped Items"
msgstr ""
-#: Merge.rc:2613
+#: Merge.rc:2622
#, c-format
msgid "Select the font for the view\nSelect View Font"
msgstr ""
-#: Merge.rc:2614
+#: Merge.rc:2623
#, c-format
msgid "Revert to using the default system font for view\nDefault Font"
msgstr ""
-#: Merge.rc:2615
+#: Merge.rc:2624
#, c-format
msgid "Shows whitespace characters"
msgstr ""
-#: Merge.rc:2616
+#: Merge.rc:2625
#, c-format
msgid "Toggle Diff Pane"
msgstr ""
-#: Merge.rc:2617
+#: Merge.rc:2626
#, c-format
msgid "Location pane shows overall picture from files"
msgstr ""
-#: Merge.rc:2618
+#: Merge.rc:2627
#, c-format
msgid "Show folder compare statistics dialog"
msgstr ""
-#: Merge.rc:2619
+#: Merge.rc:2628
#, c-format
msgid "Select the current user interfacce language\nLanguage"
msgstr ""
-#: Merge.rc:2620
+#: Merge.rc:2629
#, c-format
msgid "Shows differences inside lines with different color\nShow Line Diff"
msgstr ""
-#: Merge.rc:2621
+#: Merge.rc:2630
#, c-format
msgid "Swap the positions of the two panes"
msgstr ""
-#: Merge.rc:2622
+#: Merge.rc:2631
#, c-format
msgid "Shows line numbers\nShow Line Numbers"
msgstr ""
-#: Merge.rc:2623
+#: Merge.rc:2632
#, c-format
msgid "Enable word wrap\nWrap Lines"
msgstr ""
-#: Merge.rc:2624
+#: Merge.rc:2633
#, c-format
msgid "Shows selection margins for both panes\nShow Selection Margins"
msgstr ""
-#: Merge.rc:2625
+#: Merge.rc:2634
#, c-format
msgid "Increase text size"
msgstr ""
-#: Merge.rc:2626
+#: Merge.rc:2635
#, c-format
msgid "Decrease text size"
msgstr ""
-#: Merge.rc:2627
+#: Merge.rc:2636
#, c-format
msgid "Reset text zoom to default size"
msgstr ""
-#: Merge.rc:2633
+#: Merge.rc:2642
#, c-format
msgid "Scroll to the previous difference\nPrev Diff (Alt+Up)"
msgstr ""
-#: Merge.rc:2634
+#: Merge.rc:2643
#, c-format
msgid "Scroll to the next difference\nNext Diff (Alt+Down)"
msgstr ""
-#: Merge.rc:2635
+#: Merge.rc:2644
#, c-format
msgid "Scroll to the first difference\nFirst Diff (Alt+Home)"
msgstr ""
-#: Merge.rc:2636
+#: Merge.rc:2645
#, c-format
msgid "Scroll to the current difference\nCurrent Diff (Alt+Enter)"
msgstr ""
-#: Merge.rc:2637
+#: Merge.rc:2646
#, c-format
msgid "Scroll to the last difference\nLast Diff (Alt+End)"
msgstr ""
-#: Merge.rc:2638
+#: Merge.rc:2647
#, c-format
msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)"
msgstr ""
-#: Merge.rc:2639
+#: Merge.rc:2648
#, c-format
msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)"
msgstr ""
-#: Merge.rc:2640
+#: Merge.rc:2649
#, c-format
msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
-#: Merge.rc:2641
+#: Merge.rc:2650
#, c-format
msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
-#: Merge.rc:2642
+#: Merge.rc:2651
#, c-format
msgid "Copy all differences to the right file\nAll Right"
msgstr ""
-#: Merge.rc:2643
+#: Merge.rc:2652
#, c-format
msgid "Copy all differences to the left file\nAll Left"
msgstr ""
-#: Merge.rc:2644
+#: Merge.rc:2653
#, c-format
msgid "Delete selected items from both directories"
msgstr ""
-#: Merge.rc:2645
+#: Merge.rc:2654
#, c-format
msgid "Compare selected item (compare first item if multiple items selected)"
msgstr ""
-#: Merge.rc:2651
+#: Merge.rc:2660
#, c-format
msgid "Select and reorder directory compare columns"
msgstr ""
-#: Merge.rc:2652
+#: Merge.rc:2661
#, c-format
msgid "Generate a patch-file"
msgstr ""
-#: Merge.rc:2653
+#: Merge.rc:2662
#, c-format
msgid "Select and modify filters"
msgstr ""
-#: Merge.rc:2654
+#: Merge.rc:2663
#, c-format
msgid "Generates a report from compare results"
msgstr ""
-#: Merge.rc:2660
+#: Merge.rc:2669
#, c-format
msgid "The user selects the unpacker (no unpacking when comparing dir)"
msgstr ""
-#: Merge.rc:2661
+#: Merge.rc:2670
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
msgstr ""
-#: Merge.rc:2662
+#: Merge.rc:2671
#, c-format
msgid "Select an unpacker to edit this file"
msgstr ""
-#: Merge.rc:2663
+#: Merge.rc:2672
#, c-format
msgid "No prediffer (normal)"
msgstr ""
-#: Merge.rc:2664
+#: Merge.rc:2673
#, c-format
msgid "Suggested plugins"
msgstr ""
-#: Merge.rc:2665
+#: Merge.rc:2674
#, c-format
msgid "Other plugins"
msgstr ""
-#: Merge.rc:2666
+#: Merge.rc:2675
#, c-format
msgid "Unload all plugins and reload them (for developers)"
msgstr ""
-#: Merge.rc:2672
+#: Merge.rc:2681
#, c-format
msgid "Activates next file visible\nActive next File"
msgstr ""
-#: Merge.rc:2673
+#: Merge.rc:2682
#, c-format
msgid "Closes all open windows"
msgstr ""
-#: Merge.rc:2679
+#: Merge.rc:2688
#, c-format
msgid "Opens the WinMerge Help\nWinMerge Help"
msgstr ""
-#: Merge.rc:2680
+#: Merge.rc:2689
#, c-format
msgid "Outputs current WinMerge version info and configuration to text file"
msgstr ""
-#: Merge.rc:2681
+#: Merge.rc:2690
#, c-format
msgid "Display the GNU General Public License"
msgstr ""
-#: Merge.rc:2682
+#: Merge.rc:2691
#, c-format
msgid "Private Build: %1"
msgstr ""
-#: Merge.rc:2683
+#: Merge.rc:2692
#, c-format
msgid "Opens the release notes document\nRelease Notes"
msgstr ""
-#: Merge.rc:2684
+#: Merge.rc:2693
#, c-format
msgid "Opens the translations website\nTranslations"
msgstr ""
-#: Merge.rc:2690
+#: Merge.rc:2699
#, c-format
msgid "Plugin Settings"
msgstr ""
-#: Merge.rc:2691
+#: Merge.rc:2700
#, c-format
msgid "No prediffer"
msgstr ""
-#: Merge.rc:2692
+#: Merge.rc:2701
#, c-format
msgid "Prediff if possible"
msgstr ""
-#: Merge.rc:2694
+#: Merge.rc:2703
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr ""
-#: Merge.rc:2695
+#: Merge.rc:2704
#, c-format
msgid "<None>"
msgstr ""
-#: Merge.rc:2696
+#: Merge.rc:2705
#, c-format
msgid "<Automatic>"
msgstr ""
-#: Merge.rc:2702
+#: Merge.rc:2711
#, c-format
msgid "Open the file with registered application"
msgstr ""
-#: Merge.rc:2703
+#: Merge.rc:2712
#, c-format
msgid "Open the file with external editor"
msgstr ""
-#: Merge.rc:2704
+#: Merge.rc:2713
#, c-format
msgid "Open the file with a particular program"
msgstr ""
-#: Merge.rc:2710
+#: Merge.rc:2719
#, c-format
msgid "Do not display moved blocks"
msgstr ""
-#: Merge.rc:2711
+#: Merge.rc:2720
#, c-format
msgid "Display all moved blocks"
msgstr ""
-#: Merge.rc:2712
+#: Merge.rc:2721
#, c-format
msgid "Display moved blocks only from current diff"
msgstr ""
-#: Merge.rc:2713
+#: Merge.rc:2722
#, c-format
msgid "Go to diff under cursor"
msgstr ""
-#: Merge.rc:2714
+#: Merge.rc:2723
#, c-format
msgid "G&oto Diff %1 of %2"
msgstr ""
-#: Merge.rc:2715
+#: Merge.rc:2724
#, c-format
msgid "G&oto Line %1"
msgstr ""
-#: Merge.rc:2721
+#: Merge.rc:2730
#, c-format
msgid "Disabled"
msgstr ""
-#: Merge.rc:2722
+#: Merge.rc:2731
#, c-format
msgid "From file system"
msgstr ""
-#: Merge.rc:2723
+#: Merge.rc:2732
#, c-format
msgid "From MRU list"
msgstr ""
-#: Merge.rc:2730
+#: Merge.rc:2739
#, c-format
msgid "ASP"
msgstr ""
-#: Merge.rc:2731
+#: Merge.rc:2740
#, c-format
msgid "Basic"
msgstr ""
-#: Merge.rc:2732
+#: Merge.rc:2741
#, c-format
msgid "Batch"
msgstr ""
-#: Merge.rc:2733
+#: Merge.rc:2742
#, c-format
msgid "C/C++"
msgstr ""
-#: Merge.rc:2734
+#: Merge.rc:2743
#, c-format
msgid "C#"
msgstr ""
-#: Merge.rc:2735
+#: Merge.rc:2744
#, c-format
msgid "CSS"
msgstr ""
-#: Merge.rc:2736
+#: Merge.rc:2745
#, c-format
msgid "DCL"
msgstr ""
-#: Merge.rc:2737
+#: Merge.rc:2746
#, c-format
msgid "Fortran"
msgstr ""
-#: Merge.rc:2738
+#: Merge.rc:2747
#, c-format
msgid "HTML"
msgstr ""
-#: Merge.rc:2739
+#: Merge.rc:2748
#, c-format
msgid "INI"
msgstr ""
-#: Merge.rc:2740
+#: Merge.rc:2749
#, c-format
msgid "InnoSetup"
msgstr ""
-#: Merge.rc:2741
+#: Merge.rc:2750
#, c-format
msgid "InstallShield"
msgstr ""
-#: Merge.rc:2742
+#: Merge.rc:2751
#, c-format
msgid "Java"
msgstr ""
-#: Merge.rc:2743
+#: Merge.rc:2752
#, c-format
msgid "AutoLISP"
msgstr ""
-#: Merge.rc:2744
+#: Merge.rc:2753
#, c-format
msgid "NSIS"
msgstr ""
-#: Merge.rc:2745
+#: Merge.rc:2754
#, c-format
msgid "Pascal"
msgstr ""
-#: Merge.rc:2746
+#: Merge.rc:2755
#, c-format
msgid "Perl"
msgstr ""
-#: Merge.rc:2747
+#: Merge.rc:2756
#, c-format
msgid "PHP"
msgstr ""
-#: Merge.rc:2748
+#: Merge.rc:2757
#, c-format
msgid "Portable Object"
msgstr ""
-#: Merge.rc:2749
+#: Merge.rc:2758
#, c-format
msgid "PowerShell"
msgstr ""
-#: Merge.rc:2750
+#: Merge.rc:2759
#, c-format
msgid "Python"
msgstr ""
-#: Merge.rc:2751
+#: Merge.rc:2760
#, c-format
msgid "REXX"
msgstr ""
-#: Merge.rc:2752
+#: Merge.rc:2761
#, c-format
msgid "Resources"
msgstr ""
-#: Merge.rc:2753
+#: Merge.rc:2762
#, c-format
msgid "Ruby"
msgstr ""
-#: Merge.rc:2754
+#: Merge.rc:2763
#, c-format
msgid "SGML"
msgstr ""
-#: Merge.rc:2755
+#: Merge.rc:2764
#, c-format
msgid "Shell"
msgstr ""
-#: Merge.rc:2756
+#: Merge.rc:2765
#, c-format
msgid "SIOD"
msgstr ""
-#: Merge.rc:2757
+#: Merge.rc:2766
#, c-format
msgid "SQL"
msgstr ""
-#: Merge.rc:2758
+#: Merge.rc:2767
#, c-format
msgid "TCL"
msgstr ""
-#: Merge.rc:2759
+#: Merge.rc:2768
#, c-format
msgid "TEX"
msgstr ""
-#: Merge.rc:2760
+#: Merge.rc:2769
#, c-format
msgid "XML"
msgstr ""
-#: Merge.rc:2765
+#: Merge.rc:2774
#, c-format
msgid "Hide the toolbar"
msgstr ""
-#: Merge.rc:2766
+#: Merge.rc:2775
#, c-format
msgid "Show small toolbar"
msgstr ""
-#: Merge.rc:2767
+#: Merge.rc:2776
#, c-format
msgid "Show big toolbar"
msgstr ""
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2008-02-16 06:49:32 UTC (rev 5046)
+++ trunk/Src/Merge.rc 2008-02-16 16:59:25 UTC (rev 5047)
@@ -1958,6 +1958,15 @@
IDS_XML_REPORT_FILES "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
END
+// Unicoding types
+STRINGTABLE
+BEGIN
+ IDS_UNICODING_UTF8 "UTF-8"
+ IDS_UNICODING_UTF8_BOM "UTF-8 (B)"
+ IDS_UNICODING_UCS2_LE "UCS-2 LE"
+ IDS_UNICODING_UCS2_BE "UCS-2 BE"
+END
+
// COMPARE OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2008-02-16 06:49:32 UTC (rev 5046)
+++ trunk/Src/resource.h 2008-02-16 16:59:25 UTC (rev 5047)
@@ -779,6 +779,10 @@
#define IDS_TEXT_REPORT_FILES 18540
#define IDS_HTML_REPORT_FILES 18541
#define IDS_XML_REPORT_FILES 18542
+#define IDS_UNICODING_UTF8 18592
+#define IDS_UNICODING_UTF8_BOM 18593
+#define IDS_UNICODING_UCS2_LE 18594
+#define IDS_UNICODING_UCS2_BE 18595
#define IDD_LANGUAGE_SELECT 30000
#define IDS_CPG_WESTERN_EUROPEAN 30200
#define IDS_CPG_EASTERN_EUROPEAN 30201
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-18 20:39:17
|
Revision: 5051
http://winmerge.svn.sourceforge.net/winmerge/?rev=5051&view=rev
Author: kimmov
Date: 2008-02-18 12:39:13 -0800 (Mon, 18 Feb 2008)
Log Message:
-----------
Update and improve comments for CDiffContext.
Modified Paths:
--------------
trunk/Src/DiffContext.cpp
trunk/Src/DiffContext.h
Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp 2008-02-18 18:44:44 UTC (rev 5050)
+++ trunk/Src/DiffContext.cpp 2008-02-18 20:39:13 UTC (rev 5051)
@@ -119,7 +119,7 @@
}
/**
- * @brief Add new diffitem to CDiffContext array.
+ * @brief Add new result item to result list.
* @param [in] di DIFFITEM to add.
*/
void CDiffContext::AddDiff(const DIFFITEM & di)
@@ -129,7 +129,9 @@
}
/**
- * @brief Update info in DIFFITEM from disk.
+ * @brief Update info in item in result list from disk.
+ * This function updates result list item's file information from actual
+ * file in the disk. This updates info like date, size and attributes.
* @param [in] diffpos DIFFITEM to update.
* @param [in] bLeft Update left-side info.
* @param [in] bRight Update right-side info.
@@ -152,7 +154,9 @@
}
/**
- * @brief Update information from disk for selected side.
+ * @brief Update file information from disk for DIFFITEM.
+ * This function updates DIFFITEM's file information from actual file in
+ * the disk. This updates info like date, size and attributes.
* @param [in, out] di DIFFITEM to update (selected side, see bLeft param).
* @param [in] bLeft If TRUE left side information is updated,
* right side otherwise.
@@ -176,7 +180,10 @@
}
/**
- * @brief Return if this extension is one we expect to have a file version.
+ * @brief Determine if file is one to have a version information.
+ * This function determines if the given file has a version information
+ * attached into it in resource. This is done by comparing file extension to
+ * list of known filename extensions usually to have a version information.
* @param [in] ext Extension to check.
* @return true if extension has version info, false otherwise.
*/
@@ -245,9 +252,9 @@
/**
* @brief Create compare-method specific compare options class.
* This function creates a compare options class that is specific for
- * selectec compare method. Compare options class is initialized from
+ * selected compare method. Compare options class is initialized from
* given set of options.
- * @param [in] compareMethod Selectec compare method.
+ * @param [in] compareMethod Selected compare method.
* @param [in] options Initial set of compare options.
* @return TRUE if creation succeeds.
*/
@@ -279,7 +286,11 @@
}
/**
- * @brief Return compare-method specific compare options.
+ * @brief Get compare-type specific compare options.
+ * This function returns per-compare method options. The compare options
+ * returned are converted from general options to match options for specific
+ * comapare type. Not all compare options in general set are available for
+ * some other compare type. And some options can have different values.
* @param [in] compareMethod Compare method used.
* @return Compare options class.
*/
Modified: trunk/Src/DiffContext.h
===================================================================
--- trunk/Src/DiffContext.h 2008-02-18 18:44:44 UTC (rev 5050)
+++ trunk/Src/DiffContext.h 2008-02-18 20:39:13 UTC (rev 5051)
@@ -42,7 +42,11 @@
};
/**
- * @brief Directory compare context.
+ * The folder compare context.
+ * This class holds data of the current folder compare. There are paths
+ * to compare, filters used, compare options etc. And compare results list
+ * is also contained in this class. Many compare classes and functions have
+ * a pointer to instance of this class.
*
* @note If you add new member variables, remember to copy values in
* CDiffContext::CDiffContext(..,CDiffContext) constructor!
@@ -74,10 +78,25 @@
* Normalized paths are preferred to use - short paths are expanded
* and trailing slashes removed (except from root path).
*/
+ /**
+ * Get left-side compare path.
+ * @return full path in left-side.
+ */
String GetLeftPath() const { return m_paths.GetLeft(FALSE); }
+ /**
+ * Get right-side compare path.
+ * @return full path in right-side.
+ */
String GetRightPath() const { return m_paths.GetRight(FALSE); }
+ /**
+ * Get left-side compare path in normalized form.
+ * @return full path in left-side.
+ */
String GetNormalizedLeft() const { return m_paths.GetLeft(); }
- String GetNormalizedRight() const { return m_paths.GetRight(); }
+ /**
+ * Get right-side compare path in normalized form.
+ * @return full path in left-side.
+ */ String GetNormalizedRight() const { return m_paths.GetRight(); }
//@}
// change an existing difference
@@ -91,18 +110,58 @@
void FetchPluginInfos(LPCTSTR filteredFilenames,
PackingInfo ** infoUnpacker, PrediffingInfo ** infoPrediffer);
+ //@{
+ /**
+ * @name Compare aborting interface.
+ * These functions handle compare aborting using IAbortable interface.
+ */
bool ShouldAbort() const;
+
+ /**
+ * Set pointer to IAbortable interface.
+ * This function sets pointer to interface used to abort the compare when
+ * user wants to.
+ * @param [in] piAbortable Pointer to interface.
+ */
void SetAbortable(IAbortable * piAbortable) { m_piAbortable = piAbortable; }
+
+ /**
+ * Returns a pointer to current IAbortable interface.
+ * This function returns a pointer to interface used to abort the compare.
+ * @return Pointer to current IAbortable interface.
+ */
const IAbortable * GetAbortable() const { return m_piAbortable; }
+ //@}
IDiffFilter * m_piFilterGlobal; /**< Interface for file filtering. */
IPluginInfos * m_piPluginInfos;
BOOL m_bGuessEncoding;
- int m_nCompMethod; /**< Compare method */
+
+ /**
+ * The main compare method used.
+ * This is the main compare method set when compare is started. There
+ * can be temporary switches to other method (e.g. for large file) but
+ * this main method must be set back for next file.
+ */
+ int m_nCompMethod;
BOOL m_bIgnoreSmallTimeDiff; /**< Ignore small timedifferences when comparing by date */
CompareStats *m_pCompareStats; /**< Pointer to compare statistics */
- BOOL m_bStopAfterFirstDiff; /**< Optimize compare by stopping after first difference? */
- int m_nQuickCompareLimit; /**< Bigger files are always compared with quick compare */
+
+ /**
+ * Optimize compare by stopping after first difference.
+ * In some compare methods (currently quick compare) we can stop the
+ * compare right after finding the first difference. This speeds up the
+ * compare, but also causes compare statistics to be inaccurate.
+ */
+ BOOL m_bStopAfterFirstDiff;
+
+ /**
+ * Threshold size for switching to quick compare.
+ * When diffutils compare is selected, files bigger (in bytes) than this
+ * value are compared using Quick compare. This is because diffutils simply
+ * cannot compare large files. And large files are usually binary files.
+ */
+ int m_nQuickCompareLimit;
FilterList * m_pFilterList; /**< Filter list for line filters */
CRITICAL_SECTION m_criticalSect; /**< Critical section protecting list access. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-19 21:03:08
|
Revision: 5057
http://winmerge.svn.sourceforge.net/winmerge/?rev=5057&view=rev
Author: kimmov
Date: 2008-02-19 13:02:22 -0800 (Tue, 19 Feb 2008)
Log Message:
-----------
Convert path in FileLocation to String.
Modified Paths:
--------------
trunk/Src/Common/UnicodeString.cpp
trunk/Src/Common/UnicodeString.h
trunk/Src/DiffFileData.cpp
trunk/Src/FileLocation.h
trunk/Src/FolderCmp.cpp
trunk/Src/MainFrm.cpp
trunk/Src/MergeDoc.cpp
Modified: trunk/Src/Common/UnicodeString.cpp
===================================================================
--- trunk/Src/Common/UnicodeString.cpp 2008-02-19 19:52:54 UTC (rev 5056)
+++ trunk/Src/Common/UnicodeString.cpp 2008-02-19 21:02:22 UTC (rev 5057)
@@ -23,8 +23,18 @@
// ID line follows -- this is updated by SVN
// $Id$
+#include <tchar.h>
#include "UnicodeString.h"
+/**
+ * @brief Replace a string inside a string with another string.
+ * This function searches for a string inside another string an if found,
+ * replaces it with another string. Function can replace several instances
+ * of the string inside one string.
+ * @param [in] target A string containing another string to replace.
+ * @param [in] find A string to search and replace with another (@p replace).
+ * @param [in] replace A string used to replace original (@p find).
+ */
void string_replace(String &target, const String &find, const String &replace)
{
const std::string::size_type replace_len = find.length();
@@ -35,3 +45,22 @@
pos += replace_len;
}
}
+
+/**
+ * @brief Compare two strings ignoring the character casing.
+ * @param [in] str1 First string to compare.
+ * @param [in] str2 Second string to compare.
+ * @return As strcmp(), 0 if strings match.
+ */
+int string_compare_nocase(const String &str1, const String &str2)
+{
+ String s1(str1);
+ String s2(str2);
+ int i = 0;
+ for (i = 0; i < s1.length(); i++)
+ s1[i] = _totlower(s1[i]);
+ for (i = 0; i < s2.length(); i++)
+ s2[i] = _totlower(s2[i]);
+
+ return s1.compare(s2);
+}
Modified: trunk/Src/Common/UnicodeString.h
===================================================================
--- trunk/Src/Common/UnicodeString.h 2008-02-19 19:52:54 UTC (rev 5056)
+++ trunk/Src/Common/UnicodeString.h 2008-02-19 21:02:22 UTC (rev 5057)
@@ -30,18 +30,16 @@
#include <string>
#ifdef _UNICODE
-
#define std_tchar(type) std::w##type
-
#else
-
#define std_tchar(type) std::type
-
#endif // _UNICODE
typedef std_tchar(string) String;
void string_replace(String &target, const String &find, const String &replace);
+// Comparing
+int string_compare_nocase(const String &str1, const String &str2);
#endif // _UNICODE_STRING_
Modified: trunk/Src/DiffFileData.cpp
===================================================================
--- trunk/Src/DiffFileData.cpp 2008-02-19 19:52:54 UTC (rev 5056)
+++ trunk/Src/DiffFileData.cpp 2008-02-19 21:02:22 UTC (rev 5057)
@@ -96,7 +96,8 @@
// Also, WinMerge-modified diffutils handles all three major eol styles
if (m_inf[i].desc == 0)
{
- m_inf[i].desc = _topen(m_FileLocation[i].filepath, O_RDONLY|O_BINARY, _S_IREAD);
+ m_inf[i].desc = _topen(m_FileLocation[i].filepath.c_str(),
+ O_RDONLY | O_BINARY, _S_IREAD);
}
if (m_inf[i].desc < 0)
return false;
@@ -106,7 +107,9 @@
{
return false;
}
- if (0 == m_FileLocation[1].filepath.CompareNoCase(m_FileLocation[0].filepath))
+
+ if (string_compare_nocase(m_FileLocation[0].filepath,
+ m_FileLocation[1].filepath) == 0)
{
m_inf[1].desc = m_inf[0].desc;
}
Modified: trunk/Src/FileLocation.h
===================================================================
--- trunk/Src/FileLocation.h 2008-02-19 19:52:54 UTC (rev 5056)
+++ trunk/Src/FileLocation.h 2008-02-19 21:02:22 UTC (rev 5057)
@@ -19,7 +19,7 @@
*/
struct FileLocation
{
- CString filepath; /**< Full path for the file. */
+ String filepath; /**< Full path for the file. */
FileTextEncoding encoding; /**< Encoding info for the file. */
/**
@@ -43,7 +43,7 @@
* Set the file path.
* @param [in] sFilePath Full path for the file.
*/
- void setPath(const CString & sFilePath) { this->filepath = sFilePath; }
+ void setPath(const String & sFilePath) { this->filepath = sFilePath; }
// Copy constructor & copy operator should do the obvious correct things
};
Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp 2008-02-19 19:52:54 UTC (rev 5056)
+++ trunk/Src/FolderCmp.cpp 2008-02-19 21:02:22 UTC (rev 5057)
@@ -92,7 +92,7 @@
return false;
}
- GuessCodepageEncoding(m_diffFileData.m_FileLocation[0].filepath,
+ GuessCodepageEncoding(m_diffFileData.m_FileLocation[0].filepath.c_str(),
&m_diffFileData.m_FileLocation[0].encoding, pCtxt->m_bGuessEncoding);
// Invoke prediff'ing plugins
@@ -107,7 +107,7 @@
// we use the same plugins for both files, so they must be defined before second file
ASSERT(plugCtxt->infoPrediffer->bToBeScanned == FALSE);
- GuessCodepageEncoding(m_diffFileData.m_FileLocation[1].filepath,
+ GuessCodepageEncoding(m_diffFileData.m_FileLocation[1].filepath.c_str(),
&m_diffFileData.m_FileLocation[1].encoding, pCtxt->m_bGuessEncoding);
if (!m_diffFileData.Filepath_Transform(m_diffFileData.m_FileLocation[1],
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-02-19 19:52:54 UTC (rev 5056)
+++ trunk/Src/MainFrm.cpp 2008-02-19 21:02:22 UTC (rev 5057)
@@ -636,7 +636,8 @@
static void
FileLocationGuessEncodings(FileLocation & fileloc, BOOL bGuessEncoding)
{
- GuessCodepageEncoding(fileloc.filepath, &fileloc.encoding, bGuessEncoding);
+ GuessCodepageEncoding(fileloc.filepath.c_str(), &fileloc.encoding,
+ bGuessEncoding);
}
/**
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2008-02-19 19:52:54 UTC (rev 5056)
+++ trunk/Src/MergeDoc.cpp 2008-02-19 21:02:22 UTC (rev 5057)
@@ -2853,16 +2853,16 @@
m_ptBuf[0]->FreeAll();
m_ptBuf[1]->FreeAll();
- CString sLeftFile = filelocLeft.filepath;
- CString sRightFile = filelocRight.filepath;
+ String sLeftFile = filelocLeft.filepath;
+ String sRightFile = filelocRight.filepath;
// build the text being filtered, "|" separates files as it is forbidden in filenames
m_strBothFilenames = sLeftFile + _T("|") + sRightFile;
// Load files
- DWORD nLeftSuccess = LoadOneFile(0, (LPCTSTR)sLeftFile, bROLeft,
+ DWORD nLeftSuccess = LoadOneFile(0, sLeftFile.c_str(), bROLeft,
filelocLeft.encoding.m_codepage);
- DWORD nRightSuccess = LoadOneFile(1, (LPCTSTR)sRightFile, bRORight,
+ DWORD nRightSuccess = LoadOneFile(1, sRightFile.c_str(), bRORight,
filelocRight.encoding.m_codepage);
// scratchpad : we don't call LoadFile, so
@@ -2970,8 +2970,8 @@
}
else
{
- sextL = GetFileExt(sLeftFile, m_strDesc[0].c_str());
- sextR = GetFileExt(sRightFile, m_strDesc[1].c_str());
+ sextL = GetFileExt(sLeftFile.c_str(), m_strDesc[0].c_str());
+ sextR = GetFileExt(sRightFile.c_str(), m_strDesc[1].c_str());
}
BOOL bLeftTyped = pLeft->SetTextType(sextL.c_str());
pLeftDetail->SetTextType(sextL.c_str());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-20 18:20:54
|
Revision: 5060
http://winmerge.svn.sourceforge.net/winmerge/?rev=5060&view=rev
Author: kimmov
Date: 2008-02-20 10:20:42 -0800 (Wed, 20 Feb 2008)
Log Message:
-----------
Convert some CStrings to Strings in FileActionScript.
Modified Paths:
--------------
trunk/Src/DirActions.cpp
trunk/Src/FileActionScript.cpp
trunk/Src/FileActionScript.h
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2008-02-19 22:19:29 UTC (rev 5059)
+++ trunk/Src/DirActions.cpp 2008-02-20 18:20:42 UTC (rev 5060)
@@ -832,7 +832,7 @@
}
else
{
- if (!actionList.m_destBase.IsEmpty())
+ if (!actionList.m_destBase.empty())
dst = actionList.m_destBase;
else
item.dest;
Modified: trunk/Src/FileActionScript.cpp
===================================================================
--- trunk/Src/FileActionScript.cpp 2008-02-19 22:19:29 UTC (rev 5059)
+++ trunk/Src/FileActionScript.cpp 2008-02-20 18:20:42 UTC (rev 5060)
@@ -23,6 +23,7 @@
// $Id$
#include "stdafx.h"
+#include "UnicodeString.h"
#include "Merge.h"
#include "OptionsDef.h"
#include "MainFrm.h"
@@ -88,7 +89,7 @@
* @param [in,out] bApplyToAll Apply user selection to all (selected)files?
* @return One of CreateScriptReturn values.
*/
-int FileActionScript::VCSCheckOut(const CString &path, BOOL &bApplyToAll)
+int FileActionScript::VCSCheckOut(const String &path, BOOL &bApplyToAll)
{
CString strErr;
int retVal = SCRIPT_SUCCESS;
@@ -97,7 +98,7 @@
return retVal;
// TODO: First param is not used!
- int nRetVal = GetMainFrame()->SyncFileToVCS(path, bApplyToAll, &strErr);
+ int nRetVal = GetMainFrame()->SyncFileToVCS(path.c_str(), bApplyToAll, &strErr);
if (nRetVal == -1)
{
retVal = SCRIPT_FAIL; // So we exit without file operations done
@@ -150,7 +151,7 @@
// has been modified.
if (GetOptionsMgr()->GetInt(OPT_VCS_SYSTEM) != VCS_NONE)
{
- int retVal = VCSCheckOut(act.dest.c_str(), bApplyToAll);
+ int retVal = VCSCheckOut(act.dest, bApplyToAll);
if (retVal == SCRIPT_USERCANCEL)
bContinue = FALSE;
else if (retVal == SCRIPT_USERSKIP)
Modified: trunk/Src/FileActionScript.h
===================================================================
--- trunk/Src/FileActionScript.h 2008-02-19 22:19:29 UTC (rev 5059)
+++ trunk/Src/FileActionScript.h 2008-02-20 18:20:42 UTC (rev 5060)
@@ -107,10 +107,10 @@
FileActionItem RemoveTailActionItem() { return m_actions.RemoveTail(); }
FileActionItem GetHeadActionItem() const { return m_actions.GetHead(); }
- CString m_destBase; /**< Base destination path for some operations */
+ String m_destBase; /**< Base destination path for some operations */
protected:
- int VCSCheckOut(const CString &path, BOOL &bApplyToAll);
+ int VCSCheckOut(const String &path, BOOL &bApplyToAll);
int CreateOperationsScripts();
private:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-20 19:18:22
|
Revision: 5061
http://winmerge.svn.sourceforge.net/winmerge/?rev=5061&view=rev
Author: kimmov
Date: 2008-02-20 11:18:20 -0800 (Wed, 20 Feb 2008)
Log Message:
-----------
Doxygen comment improvements and fixes for FileActionScript.
Modified Paths:
--------------
trunk/Src/CompareEngines/ByteComparator.cpp
trunk/Src/FileActionScript.cpp
trunk/Src/FileActionScript.h
trunk/Src/Languages/English.pot
Modified: trunk/Src/CompareEngines/ByteComparator.cpp
===================================================================
--- trunk/Src/CompareEngines/ByteComparator.cpp 2008-02-20 18:20:42 UTC (rev 5060)
+++ trunk/Src/CompareEngines/ByteComparator.cpp 2008-02-20 19:18:20 UTC (rev 5061)
@@ -423,8 +423,8 @@
// one side had an end-of-line, but the other didn't
return RESULT_DIFF;
}
- // otherwise, both sides had end-of-line
- // pointers have already been advanced, so just continue happily
+ if (ptr0 != end0 && ptr1 != end1)
+ continue;
}
}
}
Modified: trunk/Src/FileActionScript.cpp
===================================================================
--- trunk/Src/FileActionScript.cpp 2008-02-20 18:20:42 UTC (rev 5060)
+++ trunk/Src/FileActionScript.cpp 2008-02-20 19:18:20 UTC (rev 5061)
@@ -58,7 +58,7 @@
/**
* @brief Set parent window used for showing MessageBoxes.
- * @param [in] hnd Handle to parent window.
+ * @param [in] hWnd Handle to parent window.
*/
void FileActionScript::SetParentWindow(HWND hWnd)
{
@@ -75,7 +75,7 @@
}
/**
- * @brief Return amount of actions (copy, move, etc) in script.
+ * @brief Return amount of actions (copy, move, etc) in script.
* @return Amount of actions.
*/
int FileActionScript::GetActionItemCount() const
Modified: trunk/Src/FileActionScript.h
===================================================================
--- trunk/Src/FileActionScript.h 2008-02-20 18:20:42 UTC (rev 5060)
+++ trunk/Src/FileActionScript.h 2008-02-20 19:18:20 UTC (rev 5061)
@@ -32,10 +32,10 @@
*/
enum CreateScriptReturn
{
- SCRIPT_FAIL = 0,
- SCRIPT_SUCCESS,
- SCRIPT_USERCANCEL,
- SCRIPT_USERSKIP,
+ SCRIPT_FAIL = 0, /**< The script failed. */
+ SCRIPT_SUCCESS, /**< The script succeeded. */
+ SCRIPT_USERCANCEL, /**< The user cancelled the action. */
+ SCRIPT_USERSKIP, /**< The user wanted to skip one or more items. */
};
/**
@@ -47,7 +47,17 @@
**/
struct FileAction
{
- typedef enum { ACT_COPY = 1, ACT_MOVE, ACT_DEL, } ACT_TYPE;
+ /**
+ * @brief the type of the action.
+ * These action types are low level actions for filesystem, not
+ * higher level actions user is doing (e.g. synchronizing).
+ */
+ enum ACT_TYPE
+ {
+ ACT_COPY = 1, /**< Copy the item(s). */
+ ACT_MOVE, /**< Move the item(s). */
+ ACT_DEL, /**< Delete the item(s). */
+ };
String src; /**< Source for action */
String dest; /**< Destination action */
@@ -56,27 +66,42 @@
};
/**
- * @brief FileActionItem presents one filesystem action with UI context.
- *
- * This struct adds UI context and UI action to filesystem action.
- * UI context and action is for storing reference to UI and then updating
- * UI after action script is run.
+ * @brief FileActionItem presents one filesystem action from GUI perspective.
*/
struct FileActionItem : public FileAction
{
- typedef enum
+ /**
+ * @brief UI result of the action done.
+ * These values present the change in the UI happening, due to lower
+ * level actions. E.g. delete operation may cause left item to be removed
+ * from the list.
+ */
+ enum UI_RESULT
{
- UI_SYNC = 1,
- UI_DESYNC,
- UI_DEL_LEFT,
- UI_DEL_RIGHT,
- UI_DEL_BOTH,
- UI_DONT_CARE,
- } UI_RESULT;
+ UI_SYNC = 1, /**< Make items identical (synchronized). */
+ UI_DESYNC, /**< Make items different. */
+ UI_DEL_LEFT, /**< Remove left item. */
+ UI_DEL_RIGHT, /**< Remove right item. */
+ UI_DEL_BOTH, /**< Remove both items (removes the row). */
+ UI_DONT_CARE, /**< Ignore the GUI change. */
+ };
- typedef enum { UI_LEFT, UI_RIGHT } UI_SIDE;
+ /**
+ * @brief Side of the action.
+ * This lists possible values for origin and destination sides.
+ */
+ enum UI_SIDE
+ {
+ UI_LEFT,
+ UI_RIGHT
+ };
- int context; /**< UI context */
+ /**
+ * Optional context value for the item.
+ * This is an arbitrary value that can be used to associate the item with
+ * other items. This can be e.g. indext of the item in the GUI.
+ */
+ int context;
UI_RESULT UIResult; /**< Resulting UI action */
UI_SIDE UIOrigin; /**< Original UI-side */
UI_SIDE UIDestination; /**< Destination UI-side */
@@ -103,8 +128,21 @@
// Manipulate the FileActionList
int GetActionItemCount() const;
+
+ /**
+ * Add new item to the action list.
+ * @param [in] item Item to add to the list.
+ */
void AddActionItem(FileActionItem & item) { m_actions.AddTail(item); }
+ /**
+ * Remove last action item from the list.
+ * @return Item removed from the list.
+ */
FileActionItem RemoveTailActionItem() { return m_actions.RemoveTail(); }
+ /**
+ * Get first action item in the list.
+ * @return First item in the list.
+ */
FileActionItem GetHeadActionItem() const { return m_actions.GetHead(); }
String m_destBase; /**< Base destination path for some operations */
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-02-20 18:20:42 UTC (rev 5060)
+++ trunk/Src/Languages/English.pot 2008-02-20 19:18:20 UTC (rev 5061)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-02-19 17:42+0000\n"
+"POT-Creation-Date: 2008-02-19 20:25+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-22 15:48:06
|
Revision: 5067
http://winmerge.svn.sourceforge.net/winmerge/?rev=5067&view=rev
Author: kimmov
Date: 2008-02-22 07:48:03 -0800 (Fri, 22 Feb 2008)
Log Message:
-----------
Move PATCHFILES definition to PatchTool.h to make includes more logical. Make dialog member of CPatchTool a pointer. Convert some CStrings to strings. Fix and improve doxygen comments.
Modified Paths:
--------------
trunk/Src/MainFrm.cpp
trunk/Src/PatchDlg.cpp
trunk/Src/PatchDlg.h
trunk/Src/PatchTool.cpp
trunk/Src/PatchTool.h
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-02-22 15:41:47 UTC (rev 5066)
+++ trunk/Src/MainFrm.cpp 2008-02-22 15:48:03 UTC (rev 5067)
@@ -2086,7 +2086,7 @@
{
if (patcher.GetOpenToEditor())
{
- OpenFileToExternalEditor(patcher.GetPatchFile());
+ OpenFileToExternalEditor(patcher.GetPatchFile().c_str());
}
}
}
Modified: trunk/Src/PatchDlg.cpp
===================================================================
--- trunk/Src/PatchDlg.cpp 2008-02-22 15:41:47 UTC (rev 5066)
+++ trunk/Src/PatchDlg.cpp 2008-02-22 15:48:03 UTC (rev 5067)
@@ -24,6 +24,7 @@
#include "stdafx.h"
#include "merge.h"
+#include "PatchTool.h"
#include "PatchDlg.h"
#include "diff.h"
#include "coretools.h"
@@ -57,7 +58,9 @@
{
}
-
+/**
+ * @brief Map dialog controls and class member variables.
+ */
void CPatchDlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
@@ -98,7 +101,8 @@
// CPatchDlg message handlers
/**
- * @brief OK button pressed: check options and filenames and close dialog
+ * @brief Called when dialog is closed with OK.
+ * Check options and filenames given and close the dialog.
*/
void CPatchDlg::OnOK()
{
@@ -432,7 +436,8 @@
}
/**
- * @brief Add file to internal list.
+ * @brief Add patch item to internal list.
+ * @param [in] pf Patch item to add.
*/
void CPatchDlg::AddItem(PATCHFILES pf)
{
@@ -440,8 +445,8 @@
}
/**
- * @brief Returns amount of files in internal list.
- * @return Count of filepairs in list.
+ * @brief Returns amount of patch items in the internal list.
+ * @return Count of patch items in the list.
*/
int CPatchDlg::GetItemCount()
{
@@ -449,8 +454,8 @@
}
/**
- * @brief Return ref to first files in internal list
- * @return POSITION of first item in list.
+ * @brief Return ref to first item in the internal list
+ * @return POSITION of first item in the list.
*/
POSITION CPatchDlg::GetFirstItem()
{
@@ -458,11 +463,11 @@
}
/**
- * @brief Return next files in internal list
+ * @brief Return next item in the internal list
* @param [in, out] pos
* - in POSITION for item to get
* - out Next item's POSITION
- * @return PATCHFILE from given position.
+ * @return PATCHFILES from given position.
*/
PATCHFILES CPatchDlg::GetNextItem(POSITION &pos)
{
@@ -480,7 +485,7 @@
}
/**
- * @brief Empties internal file list.
+ * @brief Empties internal item list.
*/
void CPatchDlg::ClearItems()
{
Modified: trunk/Src/PatchDlg.h
===================================================================
--- trunk/Src/PatchDlg.h 2008-02-22 15:41:47 UTC (rev 5066)
+++ trunk/Src/PatchDlg.h 2008-02-22 15:48:03 UTC (rev 5067)
@@ -19,37 +19,21 @@
*
* @brief Declaration file for patch creation dialog
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_PATCHDLG_H__AB3CE671_1328_11D7_B088_005004D9D386__INCLUDED_)
#define AFX_PATCHDLG_H__AB3CE671_1328_11D7_B088_005004D9D386__INCLUDED_
-
#include "resource.h"
#include "SuperComboBox.h"
+struct PATCHFILES;
+
/////////////////////////////////////////////////////////////////////////////
// PatchDlg dialog
/**
- * @brief Files used for patch creating.
- * Stores paths of two files used to create a patch. Left side file
- * is considered as "original" file and right side file as "changed" file.
- * Times are for printing filetimes to patch file.
- */
-struct PATCHFILES
-{
- String lfile; /**< Left file */
- String pathLeft; /**< Left path added to patch file */
- String rfile; /**< Right file */
- String pathRight; /**< Right path added to patch file */
- time_t ltime; /**< Left time */
- time_t rtime; /**< Right time */
- PATCHFILES() : ltime(0), rtime(0) {};
-};
-
-/**
* @brief Dialog class for Generate Patch -dialog.
* This dialog allows user to select files from which to create a patch,
* patch file's filename and several options related to patch.
Modified: trunk/Src/PatchTool.cpp
===================================================================
--- trunk/Src/PatchTool.cpp 2008-02-22 15:41:47 UTC (rev 5066)
+++ trunk/Src/PatchTool.cpp 2008-02-22 15:48:03 UTC (rev 5067)
@@ -25,13 +25,37 @@
#include "stdafx.h"
#include "UnicodeString.h"
#include "DiffWrapper.h"
-#include "patchDlg.h"
#include "patchtool.h"
+#include "PatchDlg.h"
#include "Coretools.h"
#include "paths.h"
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/**
+ * @brief Default constructor.
+ */
+CPatchTool::CPatchTool()
+: m_pDlgPatch(NULL)
+{
+}
+
+/**
+ * @brief Default destructor.
+ */
+CPatchTool::~CPatchTool()
+{
+ delete m_pDlgPatch;
+}
+
/**
- * @brief Adds files to list for patching
+ * @brief Adds files to list for patching.
+ * @param [in] file1 First file to add.
+ * @param [in] file2 Second file to add.
*/
void CPatchTool::AddFiles(const String &file1, const String &file2)
{
@@ -43,6 +67,17 @@
m_fileList.AddTail(files);
}
+/**
+ * @brief Add files with alternative paths.
+ * This function adds files with alternative paths. Alternative path is the
+ * one that is added to the patch file. So while @p file1 and @p file2 are
+ * paths in disk (can be temp file names), @p altPath1 and @p altPath2 are
+ * "visible " paths printed to the patch file.
+ * @param [in] file1 First path in disk.
+ * @param [in] altPath1 First path as printed to the patch file.
+ * @param [in] file2 Second path in disk.
+ * @param [in] altPath2 Second path as printed to the patch file.
+ */
void CPatchTool::AddFiles(const String &file1, const String &altPath1,
const String &file2, const String &altPath2)
{
@@ -57,7 +92,7 @@
}
/**
- * @brief Create patch from files given
+ * @brief Create a patch from files given.
* @note Files can be given using AddFiles() or selecting using
* CPatchDlg.
*/
@@ -68,6 +103,9 @@
BOOL bDiffSuccess;
int retVal = 0;
+ if (m_pDlgPatch == NULL)
+ m_pDlgPatch = new CPatchDlg();
+
// If files already inserted, add them to dialog
int count = m_fileList.GetCount();
POSITION pos = m_fileList.GetHeadPosition();
@@ -75,13 +113,13 @@
for (int i = 0; i < count; i++)
{
PATCHFILES files = m_fileList.GetNext(pos);
- m_dlgPatch.AddItem(files);
+ m_pDlgPatch->AddItem(files);
}
if (ShowDialog())
{
String path;
- SplitFilename(m_dlgPatch.m_fileResult, &path, NULL, NULL);
+ SplitFilename(m_pDlgPatch->m_fileResult, &path, NULL, NULL);
if (!paths_CreateIfNeeded(path.c_str()))
{
LangMessageBox(IDS_FOLDER_NOTEXIST, MB_OK | MB_ICONSTOP);
@@ -89,16 +127,16 @@
}
// Select patch create -mode
- m_diffWrapper.SetCreatePatchFile(m_dlgPatch.m_fileResult);
- m_diffWrapper.SetAppendFiles(m_dlgPatch.m_appendFile);
+ m_diffWrapper.SetCreatePatchFile(m_pDlgPatch->m_fileResult);
+ m_diffWrapper.SetAppendFiles(m_pDlgPatch->m_appendFile);
m_diffWrapper.SetPrediffer(NULL);
- int fileCount = m_dlgPatch.GetItemCount();
- POSITION pos = m_dlgPatch.GetFirstItem();
+ int fileCount = m_pDlgPatch->GetItemCount();
+ POSITION pos = m_pDlgPatch->GetFirstItem();
for (int i = 0; i < fileCount; i++)
{
- PATCHFILES files = m_dlgPatch.GetNextItem(pos);
+ PATCHFILES files = m_pDlgPatch->GetNextItem(pos);
// Set up DiffWrapper
m_diffWrapper.SetPaths(files.lfile, files.rfile, FALSE);
@@ -122,7 +160,7 @@
else if (status.bPatchFileFailed)
{
CString errMsg;
- LangFormatString1(errMsg, IDS_FILEWRITE_ERROR, m_dlgPatch.m_fileResult);
+ LangFormatString1(errMsg, IDS_FILEWRITE_ERROR, m_pDlgPatch->m_fileResult);
AfxMessageBox(errMsg, MB_ICONSTOP);
bResult = FALSE;
break;
@@ -137,12 +175,12 @@
LangMessageBox(IDS_DIFF_SUCCEEDED, MB_ICONINFORMATION|MB_DONT_DISPLAY_AGAIN,
IDS_DIFF_SUCCEEDED);
- m_sPatchFile = m_dlgPatch.m_fileResult;
- m_bOpenToEditor = m_dlgPatch.m_openToEditor;
+ m_sPatchFile = m_pDlgPatch->m_fileResult;
+ m_bOpenToEditor = m_pDlgPatch->m_openToEditor;
retVal = 1;
}
}
- m_dlgPatch.ClearItems();
+ m_pDlgPatch->ClearItems();
return retVal;
}
@@ -156,30 +194,30 @@
PATCHOPTIONS patchOptions;
BOOL bRetVal = TRUE;
- if (m_dlgPatch.DoModal() == IDOK)
+ if (m_pDlgPatch->DoModal() == IDOK)
{
// There must be one filepair
- if (m_dlgPatch.GetItemCount() < 1)
+ if (m_pDlgPatch->GetItemCount() < 1)
bRetVal = FALSE;
// These two are from dropdown list - can't be wrong
- patchOptions.outputStyle = m_dlgPatch.m_outputStyle;
- patchOptions.nContext = m_dlgPatch.m_contextLines;
+ patchOptions.outputStyle = m_pDlgPatch->m_outputStyle;
+ patchOptions.nContext = m_pDlgPatch->m_contextLines;
// Checkbox - can't be wrong
- patchOptions.bAddCommandline = m_dlgPatch.m_includeCmdLine;
+ patchOptions.bAddCommandline = m_pDlgPatch->m_includeCmdLine;
m_diffWrapper.SetPatchOptions(&patchOptions);
// These are from checkboxes and radiobuttons - can't be wrong
- diffOptions.nIgnoreWhitespace = m_dlgPatch.m_whitespaceCompare;
- diffOptions.bIgnoreBlankLines = m_dlgPatch.m_ignoreBlanks;
- m_diffWrapper.SetAppendFiles(m_dlgPatch.m_appendFile);
+ diffOptions.nIgnoreWhitespace = m_pDlgPatch->m_whitespaceCompare;
+ diffOptions.bIgnoreBlankLines = m_pDlgPatch->m_ignoreBlanks;
+ m_diffWrapper.SetAppendFiles(m_pDlgPatch->m_appendFile);
// Use this because non-sensitive setting can't write
// patch file EOLs correctly
diffOptions.bIgnoreEol = FALSE;
- diffOptions.bIgnoreCase = !m_dlgPatch.m_caseSensitive;
+ diffOptions.bIgnoreCase = !m_pDlgPatch->m_caseSensitive;
m_diffWrapper.SetOptions(&diffOptions);
}
else
@@ -191,7 +229,7 @@
/**
* @brief Returns filename and path for patch-file
*/
-CString CPatchTool::GetPatchFile() const
+String CPatchTool::GetPatchFile() const
{
return m_sPatchFile;
}
Modified: trunk/Src/PatchTool.h
===================================================================
--- trunk/Src/PatchTool.h 2008-02-22 15:41:47 UTC (rev 5066)
+++ trunk/Src/PatchTool.h 2008-02-22 15:48:03 UTC (rev 5067)
@@ -19,25 +19,48 @@
*
* @brief Declaration file for PatchTool class
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#ifndef _PATCHTOOL_H_
#define _PATCHTOOL_H_
-#include "PatchDlg.h"
+class CPatchDlg;
/**
- * @brief Provides patch creation functionality.
+ * @brief Files used for patch creating.
+ * Stores paths of two files used to create a patch. Left side file
+ * is considered as "original" file and right side file as "changed" file.
+ * Times are for printing filetimes to patch file.
*/
+struct PATCHFILES
+{
+ String lfile; /**< Left file */
+ String pathLeft; /**< Left path added to patch file */
+ String rfile; /**< Right file */
+ String pathRight; /**< Right path added to patch file */
+ time_t ltime; /**< Left time */
+ time_t rtime; /**< Right time */
+ PATCHFILES() : ltime(0), rtime(0) {};
+};
+
+/**
+ * @brief A class which creates patch files.
+ * This class is used to create patch files. The files to patch can be added
+ * to list before calling CreatePatch(). Or user can select files in the
+ * the dialog that CreatePatch() shows.
+ */
class CPatchTool
{
public:
+ CPatchTool();
+ ~CPatchTool();
+
void AddFiles(const String &file1, const String &file2);
void AddFiles(const String &file1, const String &altPath1,
const String &file2, const String &altPath2);
int CreatePatch();
- CString GetPatchFile() const;
+ String GetPatchFile() const;
BOOL GetOpenToEditor() const;
protected:
@@ -46,9 +69,9 @@
private:
CList<PATCHFILES, PATCHFILES&> m_fileList; /**< List of files to patch. */
CDiffWrapper m_diffWrapper; /**< DiffWrapper instance we use to create patch. */
- CPatchDlg m_dlgPatch; /**< Dialog for selecting files and options. */
- CString m_sPatchFile; /**< Patch file path and filename. */
+ CPatchDlg *m_pDlgPatch; /**< Dialog for selecting files and options. */
+ String m_sPatchFile; /**< Patch file path and filename. */
BOOL m_bOpenToEditor; /**< Is patch file opened to external editor? */
};
-#endif // _PATCHTOOL_H_
\ No newline at end of file
+#endif // _PATCHTOOL_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-03-18 15:25:31
|
Revision: 5161
http://winmerge.svn.sourceforge.net/winmerge/?rev=5161&view=rev
Author: kimmov
Date: 2008-03-18 08:25:28 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
PATCH: [ 1917281 ] Make building more quiet
Modified Paths:
--------------
trunk/Src/PostBuild.bat
trunk/Src/PreLink.bat
Modified: trunk/Src/PostBuild.bat
===================================================================
--- trunk/Src/PostBuild.bat 2008-03-17 23:20:37 UTC (rev 5160)
+++ trunk/Src/PostBuild.bat 2008-03-18 15:25:28 UTC (rev 5161)
@@ -1,11 +1,12 @@
-@echo on
+@echo off
if "%_ACP_ATLPROV%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%)
:_MSDEV_BLD_ENV_(1)
cd
-echo %0
-echo $(IntDir) = %1
-echo $(TargetPath) = %2
+REM Enable echo lines below if you need to debug this script
+REM echo %0
+REM echo $(IntDir) = %1
+REM echo $(TargetPath) = %2
REM Create English.pot and MergeLang.rc from Merge.rc
cd Languages
cscript CreateMasterPotFile.vbs
Modified: trunk/Src/PreLink.bat
===================================================================
--- trunk/Src/PreLink.bat 2008-03-17 23:20:37 UTC (rev 5160)
+++ trunk/Src/PreLink.bat 2008-03-18 15:25:28 UTC (rev 5161)
@@ -1,4 +1,4 @@
-@echo on
+@echo off
set info=echo *
REM _ACP_ATLPROV was introduced in VC7. If not set, assume VC6.
@@ -25,9 +25,10 @@
%info% Configure
cd
-echo %0
-echo $(IntDir) = %1
-echo $(TargetPath) = %2
+REM Enable echo lines below if you need to debug this script
+REM echo %0
+REM echo $(IntDir) = %1
+REM echo $(TargetPath) = %2
del $(TargetPath)
REM Create build directories
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-03-24 21:34:40
|
Revision: 5187
http://winmerge.svn.sourceforge.net/winmerge/?rev=5187&view=rev
Author: kimmov
Date: 2008-03-24 14:34:35 -0700 (Mon, 24 Mar 2008)
Log Message:
-----------
Trivial cleanups and doxygen comment fixes and additions for SyntaxColors.
Modified Paths:
--------------
trunk/Src/SyntaxColors.cpp
trunk/Src/SyntaxColors.h
Modified: trunk/Src/SyntaxColors.cpp
===================================================================
--- trunk/Src/SyntaxColors.cpp 2008-03-24 20:13:56 UTC (rev 5186)
+++ trunk/Src/SyntaxColors.cpp 2008-03-24 21:34:35 UTC (rev 5187)
@@ -3,7 +3,7 @@
*
* @brief Implementation for SyntaxColors class.
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -11,7 +11,9 @@
#include "OptionsDef.h"
#include "OptionsMgr.h"
+/** @brief Setting name for default colors. */
static const TCHAR DefColorsPath[] =_T("DefaultSyntaxColors");
+/** @brief Setting name for user-defined custom colors. */
static const TCHAR Section[] = _T("Custom Colors");
/**
@@ -27,8 +29,9 @@
/**
* @brief Copy constructor.
+ * @param [in] pColors Instance to copy.
*/
-SyntaxColors::SyntaxColors(SyntaxColors *pColors)
+SyntaxColors::SyntaxColors(const SyntaxColors *pColors)
: m_pOptionsMgr(NULL)
{
m_colors.SetSize(COLORINDEX_COUNT);
@@ -39,8 +42,9 @@
/**
* @brief Copy colors from another instance.
+ * @param [in] Instance from which to copy colors.
*/
-void SyntaxColors::Clone(SyntaxColors *pColors)
+void SyntaxColors::Clone(const SyntaxColors *pColors)
{
m_colors.SetSize(COLORINDEX_COUNT);
m_bolds.SetSize(COLORINDEX_COUNT);
@@ -48,14 +52,24 @@
m_bolds.Copy(pColors->m_bolds);
}
+/**
+ * @brief Checks if given color is themeable.
+ * @param [in] nColorIndex Index of color to check.
+ * @return true if color is themeable, false otherwise.
+ */
bool SyntaxColors::IsThemeableColorIndex(int nColorIndex) const
{
- int temp=0;
+ int temp = 0;
return GetSystemColorIndex(nColorIndex, &temp);
}
/**
- * @brief Get system color for this index (if this varies with theme)
+ * @brief Get system color for this index.
+ * Returns the system color for given index in the case it varies by
+ * used theme.
+ * @param [in] nColorIndex Index of color to get.
+ * @param [out] pSysIndex System color index, if any.
+ * @return true if system color index was found, false otherwise.
*/
bool SyntaxColors::GetSystemColorIndex(int nColorIndex, int * pSysIndex) const
{
Modified: trunk/Src/SyntaxColors.h
===================================================================
--- trunk/Src/SyntaxColors.h 2008-03-24 20:13:56 UTC (rev 5186)
+++ trunk/Src/SyntaxColors.h 2008-03-24 21:34:35 UTC (rev 5187)
@@ -3,7 +3,7 @@
*
* @brief Declaration file for SyntaxColors class
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#ifndef _SYNTAX_COLORS_H_
@@ -71,8 +71,8 @@
{
public:
SyntaxColors();
- SyntaxColors(SyntaxColors *pColors);
- void Clone(SyntaxColors *pColors);
+ SyntaxColors(const SyntaxColors *pColors);
+ void Clone(const SyntaxColors *pColors);
COLORREF GetColor(UINT index) const { return m_colors[index]; }
void SetColor(UINT index, COLORREF color);
BOOL GetBold(UINT index) const { return m_bolds[index]; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-04-11 19:57:04
|
Revision: 5283
http://winmerge.svn.sourceforge.net/winmerge/?rev=5283&view=rev
Author: kimmov
Date: 2008-04-11 12:56:56 -0700 (Fri, 11 Apr 2008)
Log Message:
-----------
Move bitmap helper functions from LocationView.cpp to new files (Common/Bitmap.h and Common/Bitmap.cpp).
Modified Paths:
--------------
trunk/Src/LocationView.cpp
trunk/Src/Merge.dsp
trunk/Src/Merge.vcproj
Added Paths:
-----------
trunk/Src/Common/Bitmap.cpp
trunk/Src/Common/Bitmap.h
Added: trunk/Src/Common/Bitmap.cpp
===================================================================
--- trunk/Src/Common/Bitmap.cpp (rev 0)
+++ trunk/Src/Common/Bitmap.cpp 2008-04-11 19:56:56 UTC (rev 5283)
@@ -0,0 +1,133 @@
+/**
+ * @file Bitmap.cpp
+ *
+ * @brief Implementation file for Bitmap helper functions.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include "stdafx.h"
+#include <math.h>
+#include "Bitmap.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+
+/**
+ * @brief Save an area as a bitmap
+ * @param pDC [in] The source device context
+ * @param rect [in] The rect to be copied
+ * @return The bitmap object
+ */
+CBitmap *CopyRectToBitmap(CDC *pDC, const CRect & rect)
+{
+ CRect rc = rect;
+ CDC dcMem;
+ dcMem.CreateCompatibleDC(pDC);
+ CBitmap *pBitmap = new CBitmap;
+ pBitmap->CreateCompatibleBitmap(pDC, rc.Width(), rc.Height());
+ CBitmap *pOldBitmap = dcMem.SelectObject(pBitmap);
+ dcMem.BitBlt(0, 0, rc.Width(), rc.Height(), pDC, rc.left, rc.top, SRCCOPY);
+ dcMem.SelectObject(pOldBitmap);
+ dcMem.DeleteDC();
+ return pBitmap;
+}
+
+/**
+ * @brief Draw a bitmap image
+ * @param pDC [in] The destination device context to draw to
+ * @param x [in] The x-coordinate of the upper-left corner of the bitmap
+ * @param y [in] The y-coordinate of the upper-left corner of the bitmap
+ * @param pBitmap [in] the bitmap to draw
+ */
+void DrawBitmap(CDC *pDC, int x, int y, CBitmap *pBitmap)
+{
+ CDC dcMem;
+ dcMem.CreateCompatibleDC(pDC);
+ BITMAP bm;
+ pBitmap->GetBitmap(&bm);
+ CBitmap *pOldBitmap = dcMem.SelectObject(pBitmap);
+ pDC->BitBlt(x, y, bm.bmWidth, bm.bmHeight, &dcMem, 0, 0, SRCCOPY);
+ dcMem.SelectObject(pOldBitmap);
+ dcMem.DeleteDC();
+}
+
+/**
+ * @brief Duplicate a bitmap and make it dark
+ * @param pDC [in] Device context
+ * @param pBitmap [in] the bitmap to darken
+ * @return The bitmap object
+ */
+CBitmap *GetDarkenedBitmap(CDC *pDC, CBitmap *pBitmap)
+{
+ CDC dcMem;
+ dcMem.CreateCompatibleDC(pDC);
+ BITMAP bm;
+ pBitmap->GetObject(sizeof(bm), &bm);
+ CBitmap *pBitmapDarkened = new CBitmap();
+ pBitmapDarkened->CreateCompatibleBitmap(pDC, bm.bmWidth, bm.bmHeight);
+ CBitmap *pOldBitmap = dcMem.SelectObject(pBitmapDarkened);
+ DrawBitmap(&dcMem, 0, 0, pBitmap);
+
+ BITMAPINFO bi;
+ bi.bmiHeader.biSize = sizeof(bi.bmiHeader);
+ bi.bmiHeader.biWidth = bm.bmWidth;
+ bi.bmiHeader.biHeight = bm.bmHeight;
+ bi.bmiHeader.biPlanes = 1;
+ bi.bmiHeader.biBitCount = 32;
+ bi.bmiHeader.biCompression = 0;
+ bi.bmiHeader.biSizeImage = bm.bmWidth * 4 * bm.bmHeight;
+ bi.bmiHeader.biXPelsPerMeter = 0;
+ bi.bmiHeader.biYPelsPerMeter = 0;
+ bi.bmiHeader.biClrUsed = 0;
+ bi.bmiHeader.biClrImportant = 0;
+
+ BYTE *pbuf = new BYTE[bi.bmiHeader.biSizeImage];
+ GetDIBits(dcMem.m_hDC, (HBITMAP)*pBitmapDarkened, 0, bm.bmHeight, pbuf, &bi, DIB_RGB_COLORS);
+
+ int x;
+ for (x = 0; x < bm.bmWidth; x++)
+ {
+ double b = 0.70 + (0.20 * sin(acos((double)x/bm.bmWidth*2.0-1.0)));
+ for (int y = 1; y < bm.bmHeight-1; y++)
+ {
+ int i = x * 4 + y * bm.bmWidth * 4;
+ pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
+ pbuf[i+1] = (BYTE)(pbuf[i+1] * b);
+ pbuf[i+2] = (BYTE)(pbuf[i+2] * b);
+ }
+ }
+ for (x = 0; x < bm.bmWidth; x++)
+ {
+ int i = x * 4 + 0 * bm.bmWidth * 4;
+ pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
+ pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.7);
+ pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.7);
+ i = x * 4 + (bm.bmHeight-1) * bm.bmWidth * 4;
+ pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
+ pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.7);
+ pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.7);
+ }
+ for (int y = 0; y < bm.bmHeight; y++)
+ {
+ int i = 0 * 4 + y * bm.bmWidth * 4;
+ pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
+ pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.4);
+ pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.4);
+ i = (bm.bmWidth-1) * 4 + y * bm.bmWidth * 4;
+ pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
+ pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.4);
+ pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.4);
+ }
+
+ SetDIBits(dcMem.m_hDC, (HBITMAP)*pBitmapDarkened, 0, bm.bmHeight, pbuf, &bi, DIB_RGB_COLORS);
+ delete pbuf;
+ dcMem.SelectObject(pOldBitmap);
+ dcMem.DeleteDC();
+ return pBitmapDarkened;
+}
Property changes on: trunk/Src/Common/Bitmap.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/Src/Common/Bitmap.h
===================================================================
--- trunk/Src/Common/Bitmap.h (rev 0)
+++ trunk/Src/Common/Bitmap.h 2008-04-11 19:56:56 UTC (rev 5283)
@@ -0,0 +1,17 @@
+/**
+ * @file Bitmap.h
+ *
+ * @brief Declaration file for Bitmap helper functions.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#ifndef _BITMAP_H_
+#define _BITMAP_H_
+
+CBitmap *CopyRectToBitmap(CDC *pDC, const CRect & rect);
+void DrawBitmap(CDC *pDC, int x, int y, CBitmap *pBitmap);
+CBitmap *GetDarkenedBitmap(CDC *pDC, CBitmap *pBitmap);
+
+#endif // _BITMAP_H_
Property changes on: trunk/Src/Common/Bitmap.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2008-04-10 23:15:23 UTC (rev 5282)
+++ trunk/Src/LocationView.cpp 2008-04-11 19:56:56 UTC (rev 5283)
@@ -26,7 +26,7 @@
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -38,7 +38,7 @@
#include "BCMenu.h"
#include "OptionsDef.h"
#include "MergeLineFlags.h"
-#include <math.h>
+#include "Bitmap.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -77,120 +77,7 @@
IMPLEMENT_DYNCREATE(CLocationView, CView)
-/**
- * @brief Save an area as a bitmap
- * @param pDC [in] The source device context
- * @param rect [in] The rect to be copied
- * @return The bitmap object
- */
-static CBitmap *CopyRectToBitmap(CDC *pDC, const CRect & rect)
-{
- CRect rc = rect;
- CDC dcMem;
- dcMem.CreateCompatibleDC(pDC);
- CBitmap *pBitmap = new CBitmap;
- pBitmap->CreateCompatibleBitmap(pDC, rc.Width(), rc.Height());
- CBitmap *pOldBitmap = dcMem.SelectObject(pBitmap);
- dcMem.BitBlt(0, 0, rc.Width(), rc.Height(), pDC, rc.left, rc.top, SRCCOPY);
- dcMem.SelectObject(pOldBitmap);
- dcMem.DeleteDC();
- return pBitmap;
-}
-/**
- * @brief Draw a bitmap image
- * @param pDC [in] The destination device context to draw to
- * @param x [in] The x-coordinate of the upper-left corner of the bitmap
- * @param y [in] The y-coordinate of the upper-left corner of the bitmap
- * @param pBitmap [in] the bitmap to draw
- */
-static void DrawBitmap(CDC *pDC, int x, int y, CBitmap *pBitmap)
-{
- CDC dcMem;
- dcMem.CreateCompatibleDC(pDC);
- BITMAP bm;
- pBitmap->GetBitmap(&bm);
- CBitmap *pOldBitmap = dcMem.SelectObject(pBitmap);
- pDC->BitBlt(x, y, bm.bmWidth, bm.bmHeight, &dcMem, 0, 0, SRCCOPY);
- dcMem.SelectObject(pOldBitmap);
- dcMem.DeleteDC();
-}
-
-/**
- * @brief Duplicate a bitmap and make it dark
- * @param pDC [in] Device context
- * @param pBitmap [in] the bitmap to darken
- * @return The bitmap object
- */
-static CBitmap *GetDarkenedBitmap(CDC *pDC, CBitmap *pBitmap)
-{
- CDC dcMem;
- dcMem.CreateCompatibleDC(pDC);
- BITMAP bm;
- pBitmap->GetObject(sizeof(bm), &bm);
- CBitmap *pBitmapDarkened = new CBitmap();
- pBitmapDarkened->CreateCompatibleBitmap(pDC, bm.bmWidth, bm.bmHeight);
- CBitmap *pOldBitmap = dcMem.SelectObject(pBitmapDarkened);
- DrawBitmap(&dcMem, 0, 0, pBitmap);
-
- BITMAPINFO bi;
- bi.bmiHeader.biSize = sizeof(bi.bmiHeader);
- bi.bmiHeader.biWidth = bm.bmWidth;
- bi.bmiHeader.biHeight = bm.bmHeight;
- bi.bmiHeader.biPlanes = 1;
- bi.bmiHeader.biBitCount = 32;
- bi.bmiHeader.biCompression = 0;
- bi.bmiHeader.biSizeImage = bm.bmWidth * 4 * bm.bmHeight;
- bi.bmiHeader.biXPelsPerMeter = 0;
- bi.bmiHeader.biYPelsPerMeter = 0;
- bi.bmiHeader.biClrUsed = 0;
- bi.bmiHeader.biClrImportant = 0;
-
- BYTE *pbuf = new BYTE[bi.bmiHeader.biSizeImage];
- GetDIBits(dcMem.m_hDC, (HBITMAP)*pBitmapDarkened, 0, bm.bmHeight, pbuf, &bi, DIB_RGB_COLORS);
-
- int x;
- for (x = 0; x < bm.bmWidth; x++)
- {
- double b = 0.70 + (0.20 * sin(acos((double)x/bm.bmWidth*2.0-1.0)));
- for (int y = 1; y < bm.bmHeight-1; y++)
- {
- int i = x * 4 + y * bm.bmWidth * 4;
- pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
- pbuf[i+1] = (BYTE)(pbuf[i+1] * b);
- pbuf[i+2] = (BYTE)(pbuf[i+2] * b);
- }
- }
- for (x = 0; x < bm.bmWidth; x++)
- {
- int i = x * 4 + 0 * bm.bmWidth * 4;
- pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
- pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.7);
- pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.7);
- i = x * 4 + (bm.bmHeight-1) * bm.bmWidth * 4;
- pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
- pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.7);
- pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.7);
- }
- for (int y = 0; y < bm.bmHeight; y++)
- {
- int i = 0 * 4 + y * bm.bmWidth * 4;
- pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
- pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.4);
- pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.4);
- i = (bm.bmWidth-1) * 4 + y * bm.bmWidth * 4;
- pbuf[i ] = (BYTE)(pbuf[i] * 0.95);
- pbuf[i+1] = (BYTE)(pbuf[i+1] * 0.4);
- pbuf[i+2] = (BYTE)(pbuf[i+2] * 0.4);
- }
-
- SetDIBits(dcMem.m_hDC, (HBITMAP)*pBitmapDarkened, 0, bm.bmHeight, pbuf, &bi, DIB_RGB_COLORS);
- delete pbuf;
- dcMem.SelectObject(pOldBitmap);
- dcMem.DeleteDC();
- return pBitmapDarkened;
-}
-
CLocationView::CLocationView()
: m_visibleTop(-1)
, m_visibleBottom(-1)
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2008-04-10 23:15:23 UTC (rev 5282)
+++ trunk/Src/Merge.dsp 2008-04-11 19:56:56 UTC (rev 5283)
@@ -195,6 +195,10 @@
# End Source File
# Begin Source File
+SOURCE=.\Common\Bitmap.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\CCPrompt.cpp
# End Source File
# Begin Source File
@@ -1047,6 +1051,10 @@
# End Source File
# Begin Source File
+SOURCE=.\Common\Bitmap.h
+# End Source File
+# Begin Source File
+
SOURCE=.\CCPrompt.h
# End Source File
# Begin Source File
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2008-04-10 23:15:23 UTC (rev 5282)
+++ trunk/Src/Merge.vcproj 2008-04-11 19:56:56 UTC (rev 5283)
@@ -425,6 +425,9 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\Common\Bitmap.cpp">
+ </File>
+ <File
RelativePath="CCPrompt.cpp">
<FileConfiguration
Name="UnicodeRelease|Win32">
@@ -5973,6 +5976,9 @@
RelativePath="BCMenu.h">
</File>
<File
+ RelativePath=".\Common\Bitmap.h">
+ </File>
+ <File
RelativePath="CCPrompt.h">
</File>
<File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-04-14 05:58:28
|
Revision: 5293
http://winmerge.svn.sourceforge.net/winmerge/?rev=5293&view=rev
Author: kimmov
Date: 2008-04-13 22:58:23 -0700 (Sun, 13 Apr 2008)
Log Message:
-----------
Cleanup and add doxygen comments for CompareStatisticsDlg.
Modified Paths:
--------------
trunk/Src/CompareStatisticsDlg.cpp
trunk/Src/CompareStatisticsDlg.h
Modified: trunk/Src/CompareStatisticsDlg.cpp
===================================================================
--- trunk/Src/CompareStatisticsDlg.cpp 2008-04-13 12:01:48 UTC (rev 5292)
+++ trunk/Src/CompareStatisticsDlg.cpp 2008-04-14 05:58:23 UTC (rev 5293)
@@ -19,7 +19,7 @@
*
* @brief Implementation file for CompareStatisticsDlg dialog
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -33,10 +33,10 @@
static char THIS_FILE[] = __FILE__;
#endif
-// Icon size
-static const int IconCX = 16;
-static const int IconCY = 16;
+/** @brief Icon size in the dialog. */
+static const CSize IconSize(16, 16);
+
/////////////////////////////////////////////////////////////////////////////
// SaveClosingDlg dialog
@@ -59,7 +59,10 @@
/////////////////////////////////////////////////////////////////////////////
// SaveClosingDlg message handlers
-BOOL CompareStatisticsDlg::OnInitDialog()
+/**
+ * @brief Initialize the dialog, set statistics and load icons.
+ */
+BOOL CompareStatisticsDlg::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CDialog::OnInitDialog();
@@ -106,64 +109,68 @@
// Load small folder icons
CStatic * pBitmapCtrl = (CStatic *) GetDlgItem(IDC_STAT_ILUNIQFOLDER);
HICON hIcon = (HICON) LoadImage(AfxGetInstanceHandle(),
- MAKEINTRESOURCE(IDI_LFOLDER), IMAGE_ICON, IconCX, IconCY, LR_SHARED);
+ MAKEINTRESOURCE(IDI_LFOLDER), IMAGE_ICON, IconSize.cx, IconSize.cy, LR_SHARED);
pBitmapCtrl->SetIcon(hIcon);
pBitmapCtrl = (CStatic *) GetDlgItem(IDC_STAT_IRUNIQFOLDER);
hIcon = (HICON) LoadImage(AfxGetInstanceHandle(),
- MAKEINTRESOURCE(IDI_RFOLDER), IMAGE_ICON, IconCX, IconCY, LR_SHARED);
+ MAKEINTRESOURCE(IDI_RFOLDER), IMAGE_ICON, IconSize.cx, IconSize.cy, LR_SHARED);
pBitmapCtrl->SetIcon(hIcon);
pBitmapCtrl = (CStatic *) GetDlgItem(IDC_STAT_IIDENTICFOLDER);
hIcon = (HICON) LoadImage(AfxGetInstanceHandle(),
- MAKEINTRESOURCE(IDI_FOLDER), IMAGE_ICON, IconCX, IconCY, LR_SHARED);
+ MAKEINTRESOURCE(IDI_FOLDER), IMAGE_ICON, IconSize.cy, IconSize.cy, LR_SHARED);
pBitmapCtrl->SetIcon(hIcon);
pBitmapCtrl = (CStatic *) GetDlgItem(IDC_STAT_INOTEQUAL);
hIcon = (HICON) LoadImage(AfxGetInstanceHandle(),
- MAKEINTRESOURCE(IDI_NOTEQUALFILE), IMAGE_ICON, IconCX, IconCY, LR_SHARED);
+ MAKEINTRESOURCE(IDI_NOTEQUALFILE), IMAGE_ICON, IconSize.cx, IconSize.cy, LR_SHARED);
pBitmapCtrl->SetIcon(hIcon);
pBitmapCtrl = (CStatic *) GetDlgItem(IDC_STAT_IDIFFBINFILE);
hIcon = (HICON) LoadImage(AfxGetInstanceHandle(),
- MAKEINTRESOURCE(IDI_BINARYDIFF), IMAGE_ICON, IconCX, IconCY, LR_SHARED);
+ MAKEINTRESOURCE(IDI_BINARYDIFF), IMAGE_ICON, IconSize.cx, IconSize.cy, LR_SHARED);
pBitmapCtrl->SetIcon(hIcon);
pBitmapCtrl = (CStatic *) GetDlgItem(IDC_STAT_ILUNIQFILE);
hIcon = (HICON) LoadImage(AfxGetInstanceHandle(),
- MAKEINTRESOURCE(IDI_LFILE), IMAGE_ICON, IconCX, IconCY, LR_SHARED);
+ MAKEINTRESOURCE(IDI_LFILE), IMAGE_ICON, IconSize.cx, IconSize.cy, LR_SHARED);
pBitmapCtrl->SetIcon(hIcon);
pBitmapCtrl = (CStatic *) GetDlgItem(IDC_STAT_IRUNIQFILE);
hIcon = (HICON) LoadImage(AfxGetInstanceHandle(),
- MAKEINTRESOURCE(IDI_RFILE), IMAGE_ICON, IconCX, IconCY, LR_SHARED);
+ MAKEINTRESOURCE(IDI_RFILE), IMAGE_ICON, IconSize.cx, IconSize.cy, LR_SHARED);
pBitmapCtrl->SetIcon(hIcon);
pBitmapCtrl = (CStatic *) GetDlgItem(IDC_STAT_IEQUALFILE);
hIcon = (HICON) LoadImage(AfxGetInstanceHandle(),
- MAKEINTRESOURCE(IDI_EQUALFILE), IMAGE_ICON, IconCX, IconCY, LR_SHARED);
+ MAKEINTRESOURCE(IDI_EQUALFILE), IMAGE_ICON, IconSize.cx, IconSize.cy, LR_SHARED);
pBitmapCtrl->SetIcon(hIcon);
pBitmapCtrl = (CStatic *) GetDlgItem(IDC_STAT_IEQUALBINFILE);
hIcon = (HICON) LoadImage(AfxGetInstanceHandle(),
- MAKEINTRESOURCE(IDI_EQUALBINARY), IMAGE_ICON, IconCX, IconCY, LR_SHARED);
+ MAKEINTRESOURCE(IDI_EQUALBINARY), IMAGE_ICON, IconSize.cx, IconSize.cy, LR_SHARED);
pBitmapCtrl->SetIcon(hIcon);
pBitmapCtrl = (CStatic *) GetDlgItem(IDC_STAT_ITOTALFOLDERS);
hIcon = (HICON) LoadImage(AfxGetInstanceHandle(),
- MAKEINTRESOURCE(IDI_SIGMA), IMAGE_ICON, IconCX, IconCY, LR_SHARED);
+ MAKEINTRESOURCE(IDI_SIGMA), IMAGE_ICON, IconSize.cx, IconSize.cy, LR_SHARED);
pBitmapCtrl->SetIcon(hIcon);
pBitmapCtrl = (CStatic *) GetDlgItem(IDC_STAT_ITOTALFILES);
hIcon = (HICON) LoadImage(AfxGetInstanceHandle(),
- MAKEINTRESOURCE(IDI_SIGMA), IMAGE_ICON, IconCX, IconCY, LR_SHARED);
+ MAKEINTRESOURCE(IDI_SIGMA), IMAGE_ICON, IconSize.cx, IconSize.cy, LR_SHARED);
pBitmapCtrl->SetIcon(hIcon);
return FALSE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
+/**
+ * @brief Set compare stats for the dialog.
+ * @param [in] pStats Pointer to the structure containing compare stats.
+ */
void CompareStatisticsDlg::SetCompareStats(const CompareStats * pStats)
{
m_pCompareStats = pStats;
-}
\ No newline at end of file
+}
Modified: trunk/Src/CompareStatisticsDlg.h
===================================================================
--- trunk/Src/CompareStatisticsDlg.h 2008-04-13 12:01:48 UTC (rev 5292)
+++ trunk/Src/CompareStatisticsDlg.h 2008-04-14 05:58:23 UTC (rev 5293)
@@ -19,7 +19,7 @@
*
* @brief Declaration file for CompareStatisticsDlg dialog
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#ifndef _COMPARESTATISTICSDLG_H_
@@ -27,6 +27,11 @@
class CompareStats;
+/**
+ * @brief A dialog showing folder compare statistics.
+ * This dialog shows statistics about current folder compare. It shows amounts
+ * if items in different compare status categories.
+ */
class CompareStatisticsDlg : public CDialog
{
DECLARE_DYNAMIC(CompareStatisticsDlg)
@@ -49,7 +54,7 @@
// Implementation data
private:
- const CompareStats * m_pCompareStats;
+ const CompareStats * m_pCompareStats; /**< Compare statistics structure. */
};
#endif // _COMPARESTATISTICSDLG_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-04-14 06:41:06
|
Revision: 5294
http://winmerge.svn.sourceforge.net/winmerge/?rev=5294&view=rev
Author: kimmov
Date: 2008-04-13 23:41:02 -0700 (Sun, 13 Apr 2008)
Log Message:
-----------
Move environment-related functions for getting windows path and user's Myfolders-path from paths.h/cpp to Environment.h/cpp.
Modified Paths:
--------------
trunk/Src/Environment.cpp
trunk/Src/Environment.h
trunk/Src/FileOrFolderSelect.cpp
trunk/Src/Merge.cpp
trunk/Src/paths.cpp
trunk/Src/paths.h
Modified: trunk/Src/Environment.cpp
===================================================================
--- trunk/Src/Environment.cpp 2008-04-14 05:58:23 UTC (rev 5293)
+++ trunk/Src/Environment.cpp 2008-04-14 06:41:02 UTC (rev 5294)
@@ -76,3 +76,42 @@
}
return buffer;
}
+
+/**
+ * @brief Get Windows directory.
+ * @return Windows directory.
+ */
+String env_GetWindowsDirectory()
+{
+ TCHAR buf[MAX_PATH] = {0};
+ GetWindowsDirectory(buf, MAX_PATH);
+ return buf;
+}
+
+/**
+ * @brief Return User's My Documents Folder.
+ * This function returns full path to User's My Documents -folder.
+ * @param [in] hWindow Parent window.
+ * @return Full path to My Documents -folder.
+ */
+String env_GetMyDocuments(HWND hWindow)
+{
+ LPITEMIDLIST pidl;
+ LPMALLOC pMalloc;
+ String path;
+
+ HRESULT rv = SHGetSpecialFolderLocation(hWindow, CSIDL_PERSONAL, &pidl);
+ if (rv == S_OK)
+ {
+ TCHAR szPath[MAX_PATH] = {0};
+ if (SHGetPathFromIDList(pidl, szPath))
+ {
+ path = szPath;
+ }
+
+ SHGetMalloc(&pMalloc);
+ pMalloc->Free(pidl);
+ pMalloc->Release();
+ }
+ return path;
+}
Modified: trunk/Src/Environment.h
===================================================================
--- trunk/Src/Environment.h 2008-04-14 05:58:23 UTC (rev 5293)
+++ trunk/Src/Environment.h 2008-04-14 06:41:02 UTC (rev 5294)
@@ -13,5 +13,7 @@
String env_GetTempFileName(LPCTSTR lpPathName, LPCTSTR lpPrefixString,
int * pnerr = NULL);
+String env_GetWindowsDirectory();
+String env_GetMyDocuments(HWND hWindow);
#endif // _ENVIRONMENT_H_
Modified: trunk/Src/FileOrFolderSelect.cpp
===================================================================
--- trunk/Src/FileOrFolderSelect.cpp 2008-04-14 05:58:23 UTC (rev 5293)
+++ trunk/Src/FileOrFolderSelect.cpp 2008-04-14 06:41:02 UTC (rev 5294)
@@ -29,6 +29,7 @@
#include "stdafx.h"
#include <sys/stat.h>
#include "UnicodeString.h"
+#include "Environment.h"
#include "FileOrFolderSelect.h"
#include "coretools.h"
#include "paths.h"
@@ -127,7 +128,7 @@
bRetVal = GetSaveFileName((OPENFILENAME *)&ofn);
// common file dialog populated sSelectedFile variable's buffer
sSelectedFile.ReleaseBuffer();
- SetCurrentDirectory(paths_GetWindowsDirectory().c_str()); // Free handle held by GetOpenFileName
+ SetCurrentDirectory(env_GetWindowsDirectory().c_str()); // Free handle held by GetOpenFileName
if (bRetVal)
path = sSelectedFile;
@@ -254,7 +255,7 @@
BOOL bRetVal = GetOpenFileName((OPENFILENAME *)&ofn);
// common file dialog populated sSelectedFile variable's buffer
sSelectedFile.ReleaseBuffer();
- SetCurrentDirectory(paths_GetWindowsDirectory().c_str()); // Free handle held by GetOpenFileName
+ SetCurrentDirectory(env_GetWindowsDirectory().c_str()); // Free handle held by GetOpenFileName
if (bRetVal)
{
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2008-04-14 05:58:23 UTC (rev 5293)
+++ trunk/Src/Merge.cpp 2008-04-14 06:41:02 UTC (rev 5294)
@@ -29,6 +29,7 @@
#include "stdafx.h"
#include "UnicodeString.h"
+#include "Environment.h"
#include "OptionsMgr.h"
#include "Merge.h"
#include "AboutDlg.h"
@@ -820,7 +821,7 @@
*/
CString CMergeApp::GetDefaultEditor()
{
- CString path = paths_GetWindowsDirectory().c_str();
+ CString path = env_GetWindowsDirectory().c_str();
path += _T("\\NOTEPAD.EXE");
return path;
}
@@ -837,7 +838,7 @@
*/
CString CMergeApp::GetDefaultFilterUserPath(BOOL bCreate /*=FALSE*/)
{
- CString pathMyFolders = paths_GetMyDocuments(NULL).c_str();
+ CString pathMyFolders = env_GetMyDocuments(NULL).c_str();
CString pathFilters(pathMyFolders);
if (pathFilters.Right(1) != _T("\\"))
pathFilters += _T("\\");
Modified: trunk/Src/paths.cpp
===================================================================
--- trunk/Src/paths.cpp 2008-04-14 05:58:23 UTC (rev 5293)
+++ trunk/Src/paths.cpp 2008-04-14 06:41:02 UTC (rev 5294)
@@ -572,41 +572,3 @@
return _T("");
}
-/**
- * @brief Get Windows directory.
- * @return Windows directory.
- */
-String paths_GetWindowsDirectory()
-{
- TCHAR buf[MAX_PATH] = {0};
- GetWindowsDirectory(buf, MAX_PATH);
- return buf;
-}
-
-/**
- * @brief Return User's My Documents Folder.
- * This function returns full path to User's My Documents -folder.
- * @param [in] hWindow Parent window.
- * @return Full path to My Documents -folder.
- */
-String paths_GetMyDocuments(HWND hWindow)
-{
- LPITEMIDLIST pidl;
- LPMALLOC pMalloc;
- String path;
-
- HRESULT rv = SHGetSpecialFolderLocation(hWindow, CSIDL_PERSONAL, &pidl);
- if (rv == S_OK)
- {
- TCHAR szPath[MAX_PATH] = {0};
- if (SHGetPathFromIDList(pidl, szPath))
- {
- path = szPath;
- }
-
- SHGetMalloc(&pMalloc);
- pMalloc->Free(pidl);
- pMalloc->Release();
- }
- return path;
-}
Modified: trunk/Src/paths.h
===================================================================
--- trunk/Src/paths.h 2008-04-14 05:58:23 UTC (rev 5293)
+++ trunk/Src/paths.h 2008-04-14 06:41:02 UTC (rev 5294)
@@ -35,7 +35,5 @@
String paths_GetLastSubdir(const String & path);
BOOL paths_IsPathAbsolute(const String & path);
String paths_EnsurePathExist(const String & sPath);
-String paths_GetWindowsDirectory();
-String paths_GetMyDocuments(HWND hWindow);
#endif // paths_h_included
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-04-14 08:09:16
|
Revision: 5295
http://winmerge.svn.sourceforge.net/winmerge/?rev=5295&view=rev
Author: kimmov
Date: 2008-04-14 01:09:06 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Rename CWMGotoDlg to WMGotoDlg. Add/improve doxygen comments.
Modified Paths:
--------------
trunk/Src/MergeEditView.cpp
trunk/Src/WMGotoDlg.cpp
trunk/Src/WMGotoDlg.h
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2008-04-14 06:41:02 UTC (rev 5294)
+++ trunk/Src/MergeEditView.cpp 2008-04-14 08:09:06 UTC (rev 5295)
@@ -1141,8 +1141,7 @@
// If cursor is inside diff get number of that diff
if (m_bCurrentLineIsDiff)
{
- CPoint pt;
- pt = GetCursorPos();
+ CPoint pt = GetCursorPos();
currentDiff = pDoc->m_diffList.LineToDiff(pt.y);
}
}
@@ -2227,7 +2226,7 @@
*/
void CMergeEditView::OnWMGoto()
{
- CWMGotoDlg dlg;
+ WMGotoDlg dlg;
CMergeDoc *pDoc = GetDocument();
CPoint pos = GetCursorPos();
int nRealLine = 0;
Modified: trunk/Src/WMGotoDlg.cpp
===================================================================
--- trunk/Src/WMGotoDlg.cpp 2008-04-14 06:41:02 UTC (rev 5294)
+++ trunk/Src/WMGotoDlg.cpp 2008-04-14 08:09:06 UTC (rev 5295)
@@ -17,7 +17,7 @@
/**
* @file WMGotoDlg.cpp
*
- * @brief Implementation of the CWMGotoDlg class
+ * @brief Implementation of the WMGotoDlg dialog.
*/
// ID line follows -- this is updated by SVN
// $Id$
@@ -35,16 +35,20 @@
/////////////////////////////////////////////////////////////////////////////
// CGotoDlg dialog
-
-CWMGotoDlg::CWMGotoDlg(CWnd* pParent /*=NULL*/)
- : CDialog(CWMGotoDlg::IDD, pParent)
+/**
+ * @brief Constructor.
+ */
+WMGotoDlg::WMGotoDlg(CWnd* pParent /*=NULL*/)
+ : CDialog(WMGotoDlg::IDD, pParent)
, m_nFile(-1)
, m_nGotoWhat(-1)
{
}
-
-BOOL CWMGotoDlg::OnInitDialog()
+/**
+ * @brief Initialize dialog.
+ */
+BOOL WMGotoDlg::OnInitDialog()
{
theApp.TranslateDialog(m_hWnd);
CDialog::OnInitDialog();
@@ -52,10 +56,10 @@
}
-void CWMGotoDlg::DoDataExchange(CDataExchange* pDX)
+void WMGotoDlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CWMGotoDlg)
+ //{{AFX_DATA_MAP(WMGotoDlg)
DDX_Text(pDX, IDC_WMGOTO_PARAM, m_strParam);
DDX_Radio(pDX, IDC_WMGOTO_FILELEFT, m_nFile);
DDX_Radio(pDX, IDC_WMGOTO_TOLINE, m_nGotoWhat);
@@ -63,11 +67,11 @@
}
-BEGIN_MESSAGE_MAP(CWMGotoDlg, CDialog)
- //{{AFX_MSG_MAP(CWMGotoDlg)
+BEGIN_MESSAGE_MAP(WMGotoDlg, CDialog)
+ //{{AFX_MSG_MAP(WMGotoDlg)
// NOTE: the ClassWizard will add message map macros here
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
-// CWMGotoDlg message handlers
+// WMGotoDlg message handlers
Modified: trunk/Src/WMGotoDlg.h
===================================================================
--- trunk/Src/WMGotoDlg.h 2008-04-14 06:41:02 UTC (rev 5294)
+++ trunk/Src/WMGotoDlg.h 2008-04-14 08:09:06 UTC (rev 5295)
@@ -17,10 +17,10 @@
/**
* @file WMGotoDlg.h
*
- * @brief Declaration file for CWMGotoDlg
+ * @brief Declaration file for WMGotoDlg dialog.
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_WMGOTODLG_H__A9D2366D_6358_4A74_9A45_6681D22EC786__INCLUDED_)
@@ -28,26 +28,30 @@
/**
- * @brief Class for Goto-dialog
+ * @brief Class for Goto-dialog.
+ * This dialog allows user to go to certain line or or difference in the file
+ * compare. As there are two panels with different line numbers, there is a
+ * choice for target panel. When dialog is opened, its values are initialized
+ * for active file's line number.
*/
-class CWMGotoDlg : public CDialog
+class WMGotoDlg : public CDialog
{
// Construction
public:
- CWMGotoDlg(CWnd* pParent = NULL); // standard constructor
+ WMGotoDlg(CWnd* pParent = NULL); // standard constructor
// Dialog Data
- //{{AFX_DATA(CWMGotoDlg)
+ //{{AFX_DATA(WMGotoDlg)
enum { IDD = IDD_WMGOTO };
- CString m_strParam;
- int m_nFile;
- int m_nGotoWhat;
+ CString m_strParam; /**< Line/difference number. */
+ int m_nFile; /**< Target file number. */
+ int m_nGotoWhat; /**< Goto line or difference? */
//}}AFX_DATA
// Overrides
// ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CWMGotoDlg)
+ //{{AFX_VIRTUAL(WMGotoDlg)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
@@ -56,7 +60,7 @@
protected:
// Generated message map functions
- //{{AFX_MSG(CWMGotoDlg)
+ //{{AFX_MSG(WMGotoDlg)
virtual BOOL OnInitDialog();
// NOTE: the ClassWizard will add member functions here
//}}AFX_MSG
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-04-14 15:55:50
|
Revision: 5296
http://winmerge.svn.sourceforge.net/winmerge/?rev=5296&view=rev
Author: kimmov
Date: 2008-04-14 08:55:47 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Make paths.cpp to compile without MFC.
Modified Paths:
--------------
trunk/Src/Merge.dsp
trunk/Src/Merge.vcproj
trunk/Src/paths.cpp
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2008-04-14 08:09:06 UTC (rev 5295)
+++ trunk/Src/Merge.dsp 2008-04-14 15:55:47 UTC (rev 5296)
@@ -714,6 +714,8 @@
# Begin Source File
SOURCE=.\paths.cpp
+# ADD CPP /YX
+
# End Source File
# Begin Source File
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2008-04-14 08:09:06 UTC (rev 5295)
+++ trunk/Src/Merge.vcproj 2008-04-14 15:55:47 UTC (rev 5296)
@@ -3878,7 +3878,9 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough=""/>
</FileConfiguration>
<FileConfiguration
Name="UnicodeDebug|Win32">
@@ -3887,6 +3889,8 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -3896,6 +3900,8 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -3904,7 +3910,9 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough=""/>
</FileConfiguration>
</File>
<File
Modified: trunk/Src/paths.cpp
===================================================================
--- trunk/Src/paths.cpp 2008-04-14 08:09:06 UTC (rev 5295)
+++ trunk/Src/paths.cpp 2008-04-14 15:55:47 UTC (rev 5296)
@@ -6,7 +6,9 @@
// ID line follows -- this is updated by SVN
// $Id$
-#include "stdafx.h"
+#include <windows.h>
+#include <tchar.h>
+#include <assert.h>
#include "paths.h"
#include <direct.h>
#include <mbctype.h> // MBCS (multibyte codepage stuff)
@@ -389,11 +391,13 @@
*/
String ExpandShortcut(const String &inFile)
{
- String outFile;
+ assert(inFile != _T(""));
- // Make sure we have a path
- ASSERT(inFile != _T(""));
+ // No path, nothing to return
+ if (inFile == _T(""))
+ return _T("");
+ String outFile;
IShellLink* psl;
HRESULT hres;
@@ -407,10 +411,15 @@
hres = psl->QueryInterface(IID_IPersistFile, (LPVOID*) &ppf);
if (SUCCEEDED(hres))
{
- USES_CONVERSION;
- LPCTSTR szFile = inFile.c_str();
+ WCHAR wsz[MAX_PATH];
+#ifdef _UNICODE
+ wcsncpy((wchar_t *)wsz, inFile.c_str(), sizeof(wsz) / sizeof(WCHAR));
+#else
+ ::MultiByteToWideChar(CP_ACP, 0, lpsz, -1, wsz, MAX_PATH);
+#endif
+
// Load shortcut
- hres = ppf->Load(T2CW(szFile), STGM_READ);
+ hres = ppf->Load(wsz, STGM_READ);
if (SUCCEEDED(hres))
{
@@ -571,4 +580,3 @@
else
return _T("");
}
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
