Skip to content

Commit 4f69c9a

Browse files
davidbannondavidbannon
committed
fix #70 and #63, this is v0.18
1 parent bfd0ffb commit 4f69c9a

File tree

6 files changed

+50
-43
lines changed

6 files changed

+50
-43
lines changed

‎doc/tomboy-ng.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Create or use an alternative config. That config could, for example, specify an
4444

4545
.TP
4646
.BR \-o ", " \-\-open-note=\fIPATH_to_NOTE\fR
47-
Open a note in single note mode. In this mode, a seperate process runs, it does not have access to the normal notes location, nor sync but can read, display and write back to a stand alone note. If the note name does not exist, a new note is created. If the note name specifies a plain text file or a rtf file, the contents of that file will be imported into a new note and that note will be named as specified on the command line but with an extension of ".note". In this mode, the note remains in its existing location, it is not moved to the tomboy-ng notes location, it is not synced, nor searched by tomboy-ng in its normal mode. Note that this switches are optional, "tomboy-ng some.note" will works as well.
47+
Open a note in single note mode. In this mode, a seperate process runs, it does not have access to the normal notes location, nor sync but can read, display and write back to a stand alone note. If the note name does not exist, a new note is created. If the note name specifies a plain text file or a rtf file, the contents of that file will be imported into a new note and that note will be named as specified on the command line but with an extension of ".note". In this mode, the note remains in its existing location, it is not moved to the tomboy-ng notes location, it is not synced, nor searched by tomboy-ng in its normal mode. Note that the switch (-o or --open-note) is optional, "tomboy-ng some.note" will works as well.
4848

4949
.SH DEBUGGING
5050
tomboy-ng accepts a couple of debug switches as noted above. They will write detailed progress reports relating to their section of the application to the console. However, Windows does not, for this purpose, have a console. But it can be told to capture this log info to a file using another command line switch or by setting an env variable that specifies a file name. Please ensure you have permission to write to the location specified.

‎package/package_debian.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ function DebianPackage () {
8787
echo "Architecture: $1" >> BUILD/DEBIAN/control
8888
echo "Maintainer: $WHOAMI" >> BUILD/DEBIAN/control
8989
echo "Installed-Size: 4096" >> BUILD/DEBIAN/control
90-
echo "Depends: libgtk2.0-0 (>= 2.6), libc6 (>= 2.14)" >> BUILD/DEBIAN/control
90+
# We don't use libcanberra-gtk-module but binary complains when on an OS that does not have it, sigh ...
91+
echo "Depends: libgtk2.0-0 (>= 2.6), libc6 (>= 2.14), libcanberra-gtk-module" >> BUILD/DEBIAN/control
9192
echo "Priority: optional" >> BUILD/DEBIAN/control
9293
echo "Homepage: https://wiki.gnome.org/Apps/Tomboy" >> BUILD/DEBIAN/control
9394
echo "Section: x11" >> BUILD/DEBIAN/control

‎package/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.17d
1+
0.18

‎tomboy-ng/backupview.pas

+8-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
2018/07/03 Finished the recver a backup note code
1010
2018/08/14 Update the last-metadata-change-date instead of last-change-date
1111
when restoring a Backup file. See Sync spec.
12+
2018/08/16 We now update both last-metadata-change-date AND last-change-date
13+
when restoring a backup file.
1214
}
1315

1416
{$mode objfpc}{$H+}
@@ -122,9 +124,12 @@ procedure TFormBackupView.ButtonRecoverClick(Sender: TObject);
122124
Rewrite(OutFile);
123125
while not eof(InFile) do begin
124126
readln(InFile, InString);
125-
if Pos('<last-metadata-change-date>', InString) > 0 then
126-
writeln(OutFile, ' <last-metadata-change-date>' + Sett.GetLocalTime() + '</last-metadata-change-date>')
127-
else writeln(OutFile, InString);
127+
if (Pos('<last-metadata-change-date>', InString) > 0) or
128+
(Pos('<last-change-date>', InString) > 0) then begin
129+
if (Pos('<last-metadata-change-date>', InString) > 0) then
130+
writeln(OutFile, ' <last-metadata-change-date>' + Sett.GetLocalTime() + '</last-metadata-change-date>')
131+
else writeln(OutFile, ' <last-change-date>' + Sett.GetLocalTime() + '</last-change-date>');
132+
end else writeln(OutFile, InString);
128133
end;
129134
finally
130135
CloseFile(OutFile);

‎tomboy-ng/searchunit.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ procedure TSearchForm.UpdateList(const Title, LastChange, FullFileName : ANSIStr
286286
if NoteLister = Nil then exit; // we are quitting the app !
287287
// Can we find line with passed file name ? If so, apply new data.
288288
if not NoteLister.AlterNote(ExtractFileNameOnly(FullFileName), LastChange, Title) then begin
289-
DebugLn('Assuming a new note ', FullFileName, ' [', Title, ']');
289+
// DebugLn('Assuming a new note ', FullFileName, ' [', Title, ']');
290290
NoteLister.AddNote(ExtractFileNameOnly(FullFileName)+'.note', Title, LastChange);
291291
end;
292292
NoteLister.ThisNoteIsOpen(FullFileName, TheForm);

‎tomboy-ng/settings.lfm

+37-36
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object Sett: TSett
2-
Left = 512
2+
Left = 551
33
Height = 431
4-
Top = 233
4+
Top = 166
55
Width = 525
66
BorderIcons = []
77
Caption = 'KTomboy-NG Settings'
@@ -12,25 +12,26 @@ object Sett: TSett
1212
OnDestroy = FormDestroy
1313
OnHide = FormHide
1414
OnShow = FormShow
15-
LCLVersion = '1.8.0.6'
15+
LCLVersion = '1.8.4.0'
1616
object PageControl1: TPageControl
1717
AnchorSideLeft.Control = Owner
1818
AnchorSideTop.Control = Owner
1919
AnchorSideRight.Control = Owner
2020
AnchorSideRight.Side = asrBottom
21+
AnchorSideBottom.Control = ButtonHide
2122
Left = 0
22-
Height = 373
23+
Height = 371
2324
Top = 0
2425
Width = 525
25-
ActivePage = TabBackUp
26+
ActivePage = TabSync
2627
Anchors = [akTop, akLeft, akRight, akBottom]
2728
BorderSpacing.Bottom = 2
28-
TabIndex = 3
29+
TabIndex = 2
2930
TabOrder = 0
3031
OnChange = PageControl1Change
3132
object TabBasic: TTabSheet
3233
Caption = 'Basic'
33-
ClientHeight = 338
34+
ClientHeight = 336
3435
ClientWidth = 519
3536
object ButtonSetNotePath: TButton
3637
Left = 8
@@ -127,7 +128,7 @@ object Sett: TSett
127128
end
128129
object TabDisplay: TTabSheet
129130
Caption = 'Display'
130-
ClientHeight = 338
131+
ClientHeight = 336
131132
ClientWidth = 519
132133
object GroupBox5: TGroupBox
133134
Left = 56
@@ -191,7 +192,7 @@ object Sett: TSett
191192
end
192193
object TabSync: TTabSheet
193194
Caption = 'Sync'
194-
ClientHeight = 338
195+
ClientHeight = 336
195196
ClientWidth = 519
196197
object GroupBox3: TGroupBox
197198
Left = 8
@@ -206,7 +207,7 @@ object Sett: TSett
206207
Left = 56
207208
Height = 22
208209
Top = 0
209-
Width = 215
210+
Width = 209
210211
Caption = 'File Sync using shared drive.'
211212
Checked = True
212213
TabOrder = 0
@@ -216,7 +217,7 @@ object Sett: TSett
216217
Left = 56
217218
Height = 22
218219
Top = 24
219-
Width = 229
220+
Width = 225
220221
Caption = 'Network Server - not available'
221222
Enabled = False
222223
TabOrder = 1
@@ -235,23 +236,23 @@ object Sett: TSett
235236
Left = 40
236237
Height = 17
237238
Top = 8
238-
Width = 355
239+
Width = 347
239240
Caption = 'when a conflict is detected between a local note and'
240241
ParentColor = False
241242
end
242243
object Label4: TLabel
243244
Left = 40
244245
Height = 17
245246
Top = 24
246-
Width = 335
247+
Width = 323
247248
Caption = 'a note on the configured synchronisation server :'
248249
ParentColor = False
249250
end
250251
object RadioAlwaysAsk: TRadioButton
251252
Left = 8
252253
Height = 22
253254
Top = 48
254-
Width = 203
255+
Width = 200
255256
Caption = 'Always ask me what to do.'
256257
Checked = True
257258
TabOrder = 0
@@ -261,15 +262,15 @@ object Sett: TSett
261262
Left = 9
262263
Height = 22
263264
Top = 70
264-
Width = 307
265+
Width = 301
265266
Caption = 'Use Local note and overwrite server note.'
266267
TabOrder = 1
267268
end
268269
object RadioUseServer: TRadioButton
269270
Left = 9
270271
Height = 22
271272
Top = 92
272-
Width = 282
273+
Width = 277
273274
Caption = 'Use server note and rename local one.'
274275
TabOrder = 2
275276
end
@@ -287,15 +288,15 @@ object Sett: TSett
287288
Left = 16
288289
Height = 17
289290
Top = 144
290-
Width = 89
291+
Width = 86
291292
Caption = 'LocalConfig :'
292293
ParentColor = False
293294
end
294295
object LabelLocalConfig: TLabel
295296
Left = 16
296297
Height = 17
297298
Top = 160
298-
Width = 119
299+
Width = 116
299300
Caption = 'LabelLocalConfig'
300301
ParentColor = False
301302
end
@@ -310,14 +311,14 @@ object Sett: TSett
310311
Left = 272
311312
Height = 17
312313
Top = 88
313-
Width = 123
314+
Width = 122
314315
Caption = 'LabelWaitForSync'
315316
ParentColor = False
316317
end
317318
end
318319
object TabBackUp: TTabSheet
319320
Caption = 'BackUp'
320-
ClientHeight = 338
321+
ClientHeight = 336
321322
ClientWidth = 519
322323
object Panel1: TPanel
323324
AnchorSideLeft.Control = TabBackUp
@@ -336,23 +337,23 @@ object Sett: TSett
336337
Left = 33
337338
Height = 17
338339
Top = 33
339-
Width = 438
340+
Width = 428
340341
Caption = 'Backup files are made when you delete a note or the sync system'
341342
ParentColor = False
342343
end
343344
object Label7: TLabel
344345
Left = 32
345346
Height = 17
346347
Top = 52
347-
Width = 179
348+
Width = 175
348349
Caption = 'is about to overwrite one. '
349350
ParentColor = False
350351
end
351352
object Label8: TLabel
352353
Left = 32
353354
Height = 17
354355
Top = 72
355-
Width = 407
356+
Width = 396
356357
Caption = 'They remain, for ever, unless you do something about them.'
357358
ParentColor = False
358359
end
@@ -375,12 +376,12 @@ object Sett: TSett
375376
AnchorSideBottom.Control = TabBackUp
376377
AnchorSideBottom.Side = asrBottom
377378
Left = 0
378-
Height = 188
379+
Height = 186
379380
Top = 150
380381
Width = 519
381382
Anchors = [akTop, akLeft, akRight, akBottom]
382383
Caption = 'Panel2'
383-
ClientHeight = 188
384+
ClientHeight = 186
384385
ClientWidth = 519
385386
TabOrder = 1
386387
object StringGridBackUp: TStringGrid
@@ -391,7 +392,7 @@ object Sett: TSett
391392
AnchorSideBottom.Control = Panel2
392393
AnchorSideBottom.Side = asrBottom
393394
Left = 1
394-
Height = 186
395+
Height = 184
395396
Top = 1
396397
Width = 517
397398
Anchors = [akTop, akLeft, akRight, akBottom]
@@ -408,7 +409,7 @@ object Sett: TSett
408409
end
409410
object TabSnapshot: TTabSheet
410411
Caption = 'SnapShot'
411-
ClientHeight = 338
412+
ClientHeight = 336
412413
ClientWidth = 519
413414
object Label9: TLabel
414415
Left = 36
@@ -437,21 +438,21 @@ object Sett: TSett
437438
end
438439
object TabSpell: TTabSheet
439440
Caption = 'Spell'
440-
ClientHeight = 338
441+
ClientHeight = 336
441442
ClientWidth = 519
442443
object Label13: TLabel
443444
Left = 12
444445
Height = 17
445446
Top = 19
446-
Width = 319
447+
Width = 312
447448
Caption = 'Spell Check requires the Hunspell Libraries and'
448449
ParentColor = False
449450
end
450451
object Label14: TLabel
451452
Left = 12
452453
Height = 17
453454
Top = 40
454-
Width = 268
455+
Width = 262
455456
Caption = 'an appropriate Hunspell Dictionary set.'
456457
ParentColor = False
457458
end
@@ -470,7 +471,7 @@ object Sett: TSett
470471
Left = 16
471472
Height = 17
472473
Top = 288
473-
Width = 73
474+
Width = 72
474475
Caption = 'LabelError'
475476
ParentColor = False
476477
end
@@ -490,15 +491,15 @@ object Sett: TSett
490491
Left = 16
491492
Height = 17
492493
Top = 96
493-
Width = 129
494+
Width = 128
494495
Caption = 'LabelLibraryStatus'
495496
ParentColor = False
496497
end
497498
object LabelDicStatus: TLabel
498499
Left = 16
499500
Height = 17
500501
Top = 200
501-
Width = 103
502+
Width = 101
502503
Caption = 'LabelDicStatus'
503504
ParentColor = False
504505
end
@@ -514,7 +515,7 @@ object Sett: TSett
514515
Left = 16
515516
Height = 17
516517
Top = 216
517-
Width = 59
518+
Width = 58
518519
Caption = 'LabelDic'
519520
ParentColor = False
520521
end
@@ -533,7 +534,7 @@ object Sett: TSett
533534
Left = 376
534535
Height = 17
535536
Top = 112
536-
Width = 111
537+
Width = 110
537538
Caption = 'LabelDicPrompt'
538539
ParentColor = False
539540
end
@@ -549,7 +550,7 @@ object Sett: TSett
549550
Hint = 'Unsaved setting will remain for this session only'
550551
Top = 373
551552
Width = 113
552-
Anchors = [akTop, akLeft, akRight, akBottom]
553+
Anchors = [akRight, akBottom]
553554
BorderSpacing.Right = 4
554555
BorderSpacing.Bottom = 2
555556
Caption = 'Close'

0 commit comments

Comments
 (0)