Quellcode durchsuchen

Remove Ask For Pasa on GUI Wallet

PascalCoin vor 3 Jahren
Ursprung
Commit
284b8fabb5

+ 9 - 9
src/gui-classic/UFRMPascalCoinWalletConfig.dfm

@@ -297,36 +297,36 @@ object FRMPascalCoinWalletConfig: TFRMPascalCoinWalletConfig
     Left = 8
     Top = 250
     Width = 334
-    Height = 121
+    Height = 112
     Caption = ' Miner Server Private Key: '
     TabOrder = 9
     object rbGenerateANewPrivateKeyEachBlock: TRadioButton
-      Left = 18
-      Top = 6
+      Left = 11
+      Top = 14
       Width = 277
       Height = 19
       Caption = 'Generate a new private key for each generated block'
       TabOrder = 0
     end
     object rbUseARandomKey: TRadioButton
-      Left = 18
-      Top = 26
+      Left = 11
+      Top = 34
       Width = 146
       Height = 19
       Caption = 'Use a random existing key'
       TabOrder = 1
     end
     object rbMineAllwaysWithThisKey: TRadioButton
-      Left = 18
-      Top = 47
+      Left = 11
+      Top = 55
       Width = 146
       Height = 19
       Caption = 'Always mine with this key:'
       TabOrder = 2
     end
     object cbPrivateKeyToMine: TComboBox
-      Left = 43
-      Top = 71
+      Left = 36
+      Top = 79
       Width = 266
       Height = 21
       Style = csDropDownList

+ 0 - 32
src/gui-classic/UFRMWallet.dfm

@@ -383,10 +383,6 @@ object FRMWallet: TFRMWallet
     OnChange = PageControlChange
     object tsMyAccounts: TTabSheet
       Caption = 'Account Explorer'
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object Splitter1: TSplitter
         Left = 400
         Top = 66
@@ -624,10 +620,6 @@ object FRMWallet: TFRMWallet
         TabOrder = 2
         object tsAccountOperations: TTabSheet
           Caption = 'Account Operations'
-          ExplicitLeft = 0
-          ExplicitTop = 0
-          ExplicitWidth = 0
-          ExplicitHeight = 0
           object dgAccountOperations: TDrawGrid
             Left = 0
             Top = 0
@@ -641,10 +633,6 @@ object FRMWallet: TFRMWallet
         object tsMultiSelectAccounts: TTabSheet
           Caption = 'Selected Accounts For Batch Operation'
           ImageIndex = 1
-          ExplicitLeft = 0
-          ExplicitTop = 0
-          ExplicitWidth = 0
-          ExplicitHeight = 0
           object dgSelectedAccounts: TDrawGrid
             Left = 41
             Top = 31
@@ -836,10 +824,6 @@ object FRMWallet: TFRMWallet
     object tsPendingOperations: TTabSheet
       Caption = 'Pending Operations'
       ImageIndex = 5
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object dgPendingOperations: TDrawGrid
         Left = 0
         Top = 86
@@ -886,10 +870,6 @@ object FRMWallet: TFRMWallet
     object tsBlockChain: TTabSheet
       Caption = 'Block Explorer'
       ImageIndex = 1
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object Panel2: TPanel
         Left = 0
         Top = 0
@@ -982,10 +962,6 @@ object FRMWallet: TFRMWallet
     object tsOperations: TTabSheet
       Caption = 'Operations Explorer'
       ImageIndex = 1
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object Panel1: TPanel
         Left = 0
         Top = 0
@@ -1034,10 +1010,6 @@ object FRMWallet: TFRMWallet
     object tsLogs: TTabSheet
       Caption = 'Logs'
       ImageIndex = 2
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object pnlTopLogs: TPanel
         Left = 0
         Top = 0
@@ -1069,10 +1041,6 @@ object FRMWallet: TFRMWallet
     object tsNodeStats: TTabSheet
       Caption = 'Node Stats'
       ImageIndex = 3
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       DesignSize = (
         857
         438)

+ 1 - 16
src/gui-classic/UFRMWallet.pas

@@ -228,7 +228,6 @@ type
     procedure MiAccountInformationClick(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure Test_ShowDiagnosticTool(Sender: TObject);
-    procedure miAskForAccountClick(Sender: TObject);
   private
     FLastNodesCacheUpdatedTS : TDateTime;
     FBackgroundPanel : TPanel;
@@ -332,7 +331,6 @@ Uses UFolderHelper,{$IFDEF USE_GNUGETTEXT}gnugettext,{$ENDIF}
   UFRMDiagnosticTool,
   {$ENDIF}
   UPCTNetDataExtraMessages,
-  UFRMAskForAccount,
   UAbstractBTree, UEPasaDecoder,
   UFRMAbout, UFRMOperation, UFRMWalletKeys, UFRMPayloadDecoder, UFRMNodesIp, UFRMMemoText,
   UCommon, UPCOrderedLists;
@@ -902,8 +900,7 @@ begin
     FNode.Bank.SafeBox.EndThreadSave;
   end;
   if LFoundAccounts<1 then begin
-    // Will only ask if no accounts
-    TFRMAskForAccount.AskForAccount(Self,FNode,TNetData.NetData,FWalletKeys,GetAccountKeyForMiner);
+    // TODO: Wallet has no PASA ...
   end;
 end;
 
@@ -1129,13 +1126,6 @@ begin
   miAbout.Add(mi);
 {$ELSE}
 {$ENDIF}
-  mi := TMenuItem.Create(MainMenu);
-  mi.Caption:='-';
-  MiOperations.Add(mi);
-  mi := TMenuItem.Create(MainMenu);
-  mi.Caption:='Ask for Free Account';
-  mi.OnClick:=miAskForAccountClick;
-  MiOperations.Add(mi);
 end;
 
 {$IFDEF TESTING_NO_POW_CHECK}
@@ -1712,11 +1702,6 @@ begin
   sbSelectedAccountsAddClick(Sender);
 end;
 
-procedure TFRMWallet.miAskForAccountClick(Sender: TObject);
-begin
-  TFRMAskForAccount.AskForAccount(Self,FNode,TNetData.NetData,FWalletKeys,GetAccountKeyForMiner);
-end;
-
 procedure TFRMWallet.MiCloseClick(Sender: TObject);
 begin
   Close;