diff --git a/about.lfm b/about.lfm
index 4faa382b..54f325b9 100644
--- a/about.lfm
+++ b/about.lfm
@@ -135,7 +135,7 @@ inherited AboutForm: TAboutForm
Cursor = crHandPoint
Left = 124
Height = 42
- Top = 213
+ Top = 221
Width = 102
Anchors = [akLeft, akBottom]
AutoSize = True
@@ -278,7 +278,7 @@ inherited AboutForm: TAboutForm
Cursor = crHandPoint
Left = 6
Height = 47
- Top = 208
+ Top = 216
Width = 102
Anchors = [akLeft, akBottom]
AutoSize = True
@@ -488,7 +488,7 @@ inherited AboutForm: TAboutForm
object txAuthor: TLabel
Left = 86
Height = 32
- Top = 74
+ Top = 104
Width = 307
AutoSize = False
Caption = 'Copyright (c) 2008-2017 by Yury Sidorov, '#13#10'Alexander Petrov'
@@ -505,69 +505,16 @@ inherited AboutForm: TAboutForm
object Bevel1: TBevel
Left = 6
Height = 7
- Top = 187
+ Top = 200
Width = 416
Anchors = [akLeft, akRight, akBottom]
Shape = bsTopLine
end
- object imgDonate: TImage
- Cursor = crHandPoint
- Left = 86
- Height = 26
- Hint = 'Donate via PayPal,WebMoney,Credit card'
- Top = 138
- Width = 92
- AutoSize = True
- OnClick = imgDonateClick
- ParentShowHint = False
- Picture.Data = {
- 1754506F727461626C654E6574776F726B477261706869638404000089504E47
- 0D0A1A0A0000000D494844520000005C0000001A08030000000D30CB1B000001
- 80504C5445909187EC8B35F4AA9EFFCA782F6CB3D7DADC2399D5FFBE5AE53632
- FFAC2C81ABD1FEE1A8E2E3E4284A6C5E7287D5E7F4B6B9BA7A8785B7D2E68A6D
- 4DF9D4D1FFEFD3FFB23C49B2E3FFF6E5E75B35777063D6C9A8D89A376AC4EF8D
- CCEC4853543F5577FEE9C0CADDEEBBB0922F3C726193C7E5F4FB6D3A5C49647C
- B83741B88B3EEC625FB97A46A17E49153A67CF87454083BCFFECC9FEDE9EF2A9
- 76FED287686451F7C0BF8D9AAFF1E6E5ADAA9EEC9842B5BDC9FEB745528ABF2B
- 200C5EA4D5A4ACB6403727ABB2B8BEC1C1FEF5F2F5C6A8F29C6AE2EDF6F6C298
- F3FAFDCACED378879FF1F6FA2B7DC15EBDEBFFA926FFF3DCFFD696FFE2B4FFF9
- EEFEE7BAFFFDF8FEE6B5FFAF34FEE4B0FEDFA20057A0C9C6C1C8CCCDC3C7C8C7
- CACCBD6728C5BB9E4E4535F2F3F6EFA635EED8A8EEDCB297BBDAF1F1EF70A1CA
- 9B9D9C847E73EED39AFEDA981062A6FBE4D0BA4E41FFE0B0A69D8DE7DBD7D1D2
- D3DCCDCF9DA6B3DECA9D5E5163F9D1B7AEB0A4EAA121003366000000FF9933FF
- FFFFFFFFFF7B0ABBB20000008074524E53FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0038054B67000000097048597300000B
- 1200000B1201D2DD7EFC0000000974455874436F6D6D656E740000892A8D0600
- 00020949444154789CB5964D8BA34010861B3C4810031246161474F1D208D310
- D143C0FF904C7657939BA01EC2E4305E02CB4B337F7DABFD984DA2CC491FB0AC
- AED2A789C16ED9678F9C91C1C906B5763CFC9987EDDBA0EFE4323EFC9A930FF9
- 5F2E8F3F66E62007B9DC1E66E745767219BD2C816CE5E976112A2597F1CF3117
- 10C2AA275AF7387FBF694A92DBDAEF31164CCE05F844EB8E8B28BEE9DA9F4CA6
- 7A3686A3C8B25AC0A1BC2E8AA1EC1475765711A8DBA23361C8AEA924791A9F46
- 0015450B4C057A4097D3A980B9A6CCE92BCEC9518FEE525111BC1A2BF44E9E5E
- 8D270AF8EA64C132D6F0778DC0CD60E4087CAAECE00716B811709856C5B1A62A
- 7B36185ADACBD3F8A9C3B0EEE537884A258C66E10685A6BDA051033537FD1EC3
- 08D4E881484F5BB9ADD0E3F33D6B30753251D03494908606415B3917F44F830A
- 671FBB3383F0B90FFFE1F6484B957490DB76AAC77134E023A0C86046A4A58CA3
- 7907A248857701AB206F1499B851DFB788E6EBD66BACE9BD92E4F904409E971B
- 20CC5FE1E5B90B51862A51411DA580ABAA39F5132ABB53929CE4AB31213A5E57
- 2BD22489A06C8364D50617484C405D25366E69521F66396159497A4327E49E62
- E3AADCF5003324AF17EEFB4063CFA31675DCB69FB8936EF5FAEF1742B6ABA2BD
- 08DDAA480BC012C87EB3D016407E6D73F1DBDCC8FB0DFA382B917CFCB488B7B3
- 6D701F72FFF0DDB2CC47D13F947E4C789D660D2C0000000049454E44AE426082
- }
- ShowHint = True
- Transparent = True
- Visible = False
- end
object txHomePage: TLabel
Cursor = crHandPoint
Left = 86
Height = 15
- Top = 96
+ Top = 134
Width = 62
Caption = 'Home page'
Font.Color = clBlue
@@ -576,14 +523,13 @@ inherited AboutForm: TAboutForm
ParentFont = False
OnClick = txHomePageClick
end
- object txDonate: TLabel
+ object txVersFPC: TLabel
Left = 86
Height = 15
- Top = 118
- Width = 211
- Caption = 'Donate to support further development:'
+ Top = 72
+ Width = 57
+ Caption = 'Version %s'
ParentColor = False
- Visible = False
end
end
object tabLicense: TTabSheet
diff --git a/about.pas b/about.pas
index a3f31c9d..a337148c 100644
--- a/about.pas
+++ b/about.pas
@@ -24,7 +24,7 @@
interface
uses
- BaseForm, Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls, ExtCtrls, ButtonPanel,
+ BaseForm, Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls, ExtCtrls, ButtonPanel, lclversion,
ssl_openssl, ssl_openssl_lib;
resourcestring
@@ -43,11 +43,9 @@ TAboutForm = class(TBaseForm)
Bevel1: TBevel;
Buttons: TButtonPanel;
edLicense: TMemo;
- imgDonate: TImage;
imgTransmission: TImage;
imgSynapse: TImage;
imgLazarus: TImage;
- txDonate: TLabel;
txHomePage: TLabel;
txAuthor: TLabel;
txVersion: TLabel;
@@ -55,6 +53,7 @@ TAboutForm = class(TBaseForm)
Page: TPageControl;
tabAbout: TTabSheet;
tabLicense: TTabSheet;
+ txVersFPC: TLabel;
procedure FormCreate(Sender: TObject);
procedure imgDonateClick(Sender: TObject);
procedure imgLazarusClick(Sender: TObject);
@@ -234,6 +233,9 @@ procedure TAboutForm.FormCreate(Sender: TObject);
txAppName.Caption:=AppName;
txVersion.Caption:=Format(txVersion.Caption, [AppVersion]);
Page.ActivePageIndex:=0;
+
+ txVersFPC.caption := 'Fpc : ' + {$I %FPCVERSION%} + ' Lazarus : ' +lcl_version;
+
{$ifdef lclcarbon}
s:=edLicense.Text;
edLicense.Text:='';
diff --git a/main.pas b/main.pas
index 350299de..3b168289 100644
--- a/main.pas
+++ b/main.pas
@@ -23,7 +23,7 @@
interface
uses
- Classes, SysUtils, FileUtil, zstream, LResources, Forms, Controls,
+ Classes, SysUtils, FileUtil, zstream, LResources, Forms, Controls,
{$ifdef windows}
windows,
{$else}
@@ -35,7 +35,7 @@ interface
const
AppName = 'Transmission Remote GUI';
- AppVersion = '5.9';
+ AppVersion = '5.10';
resourcestring
sAll = 'All torrents';
@@ -1377,7 +1377,6 @@ procedure TMainForm.FormCreate(Sender: TObject);
R: TRect;
bigt: boolean;
SL: TStringList;
-
{$ifdef darwin}
s: string;
pic: TPicture;
@@ -1537,6 +1536,12 @@ procedure TMainForm.FormCreate(Sender: TObject);
if Ini.ReadBool('MainForm', 'StatusBar', acStatusBar.Checked) <> acStatusBar.Checked then
acStatusBar.Execute;
+ if Ini.ReadBool('MainForm', 'Menu', acMenuShow.Checked) <> acMenuShow.Checked then
+ acMenuShow.Execute;
+ if Ini.ReadBool('MainForm', 'Toolbar', acToolbarShow.Checked) <> acToolbarShow.Checked then
+ acToolbarShow.Execute;
+
+
LoadColumns(gTorrents, 'TorrentsList');
TorrentColumnsChanged;
LoadColumns(lvFiles, 'FilesList');
@@ -2737,6 +2742,10 @@ procedure TMainForm.BeforeCloseApp;
Ini.WriteBool('MainForm', 'InfoPane', acInfoPane.Checked);
Ini.WriteBool('MainForm', 'StatusBar', acStatusBar.Checked);
+ Ini.WriteBool('MainForm', 'Menu', acMenuShow.Checked);
+ Ini.WriteBool('MainForm', 'Toolbar', acToolbarShow.Checked);
+
+
SaveColumns(gTorrents, 'TorrentsList');
SaveColumns(lvFiles, 'FilesList');
SaveColumns(lvPeers, 'PeerList');
@@ -5089,7 +5098,7 @@ function ExcludeInvalidChar (path: string): string; // PETROV
path := StringReplace(path, '>', '_', [rfReplaceAll, rfIgnoreCase]);
path := StringReplace(path, '"', '_', [rfReplaceAll, rfIgnoreCase]);
path := StringReplace(path, '~', '_', [rfReplaceAll, rfIgnoreCase]);
- path := StringReplace(path, '..','_', [rfReplaceAll, rfIgnoreCase]);
+//path := StringReplace(path, '..','_', [rfReplaceAll, rfIgnoreCase]); bag
Result:= path;
end;
diff --git a/transgui.lpi b/transgui.lpi
index 6cb4b16c..1ee0b66b 100644
--- a/transgui.lpi
+++ b/transgui.lpi
@@ -20,8 +20,8 @@
-
-
+
+
diff --git a/transgui.res b/transgui.res
index 87538dae..7aebce6d 100644
Binary files a/transgui.res and b/transgui.res differ