move all getters to a getters plugin, move set_proxy to a plugin

technozhantomz · Jul 20, 2019 · 36ac073 · 36ac073
1 parent 4ba72c4
commit 36ac073
Show file tree

Hide file tree

Showing 43 changed files with 143 additions and 86 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,31 +32,31 @@ add_executable( gwallet
     #panels/sellasset.cpp
     #panels/borrowasset.cpp
     #panels/cancelorder.cpp
-    panels/setproxy.cpp
-    panels/getcommitteemember.cpp
-    panels/getaccounthistory.cpp
-    panels/getorderbook.cpp
-    panels/info.cpp
+    #panels/setproxy.cpp
+    #panels/getcommitteemember.cpp
+    #panels/getaccounthistory.cpp
+    #panels/getorderbook.cpp
+    #panels/info.cpp
     panels/wallet.cpp
     panels/cli.cpp
     panels/dashboard.cpp
     panels/commands.cpp
 
-    panels/about.cpp
-    panels/active_witnesses.cpp
-    panels/active_committee.cpp
+    #panels/about.cpp
+    #panels/active_witnesses.cpp
+    #panels/active_committee.cpp
     panels/upgradeaccount.cpp
     panels/createaccountwithbrainkey.cpp
     panels/registeraccount.cpp
     panels/createasset.cpp
-    panels/getwitness.cpp
-    panels/getaccount.cpp
-    panels/getasset.cpp
+    #panels/getwitness.cpp
+    #panels/getaccount.cpp
+    #panels/getasset.cpp
     panels/issueasset.cpp
     panels/createhtlc.cpp
     panels/redeemhtlc.cpp
     panels/extendhtlc.cpp
-    panels/gethtlc.cpp
+    #panels/gethtlc.cpp
     panels/updatefeedproducers.cpp
     panels/voteforwitness.cpp
 
@@ -65,7 +65,8 @@ add_executable( gwallet
 find_package(wxWidgets COMPONENTS core base adv xrc aui REQUIRED)
 include(${wxWidgets_USE_FILE})
 
-set(plugins "gwallet_transfer" "gwallet_sellasset" "gwallet_borrowasset" "gwallet_cancelorder")
+set(plugins "gwallet_transfer" "gwallet_sellasset" "gwallet_borrowasset" "gwallet_cancelorder" "gwallet_setproxy"
+		"gwallet_getters")
 
 target_link_libraries( gwallet
     PRIVATE graphene_app graphene_net graphene_chain graphene_egenesis_brief graphene_utilities graphene_wallet fc

diff --git a/gwallet.cpp b/gwallet.cpp
@@ -8,8 +8,8 @@
 
 #include "include/wizards/registration.hpp"
 
-#include "include/panels/info.hpp"
-#include "include/panels/about.hpp"
+#include "plugins/getters/include/info.hpp"
+#include "plugins/getters/include/about.hpp"
 
 #include "include/panels/cli.hpp"
 #include "include/panels/wallet.hpp"

diff --git a/panels/wallet.cpp b/panels/wallet.cpp
@@ -3,26 +3,26 @@
 #include "../plugins/sellasset/include/sellasset.hpp"
 #include "../plugins/borrowasset/include/borrowasset.hpp"
 #include "../plugins/cancelorder/include/cancelorder.hpp"
-#include "../include/panels/setproxy.hpp"
-#include "../include/panels/getcommitteemember.hpp"
-#include "../include/panels/getaccounthistory.hpp"
-#include "../include/panels/getorderbook.hpp"
-#include "../include/panels/about.hpp"
-#include "../include/panels/info.hpp"
-#include "../include/panels/active_committee.hpp"
-#include "../include/panels/active_witnesses.hpp"
+#include "../plugins/setproxy/include/setproxy.hpp"
+#include "../plugins/getters/include/getcommitteemember.hpp"
+#include "../plugins/getters/include/getaccounthistory.hpp"
+#include "../plugins/getters/include/getorderbook.hpp"
+#include "../plugins/getters/include/about.hpp"
+#include "../plugins/getters/include/info.hpp"
+#include "../plugins/getters/include/active_committee.hpp"
+#include "../plugins/getters/include/active_witnesses.hpp"
 #include "../include/panels/upgradeaccount.hpp"
 #include "../include/panels/createaccountwithbrainkey.hpp"
 #include "../include/panels/registeraccount.hpp"
 #include "../include/panels/createasset.hpp"
-#include "../include/panels/getwitness.hpp"
-#include "../include/panels/getaccount.hpp"
-#include "../include/panels/getasset.hpp"
+#include "../plugins/getters/include/getwitness.hpp"
+#include "../plugins/getters/include/getaccount.hpp"
+#include "../plugins/getters/include/getasset.hpp"
 #include "../include/panels/issueasset.hpp"
 #include "../include/panels/createhtlc.hpp"
 #include "../include/panels/redeemhtlc.hpp"
 #include "../include/panels/extendhtlc.hpp"
-#include "../include/panels/gethtlc.hpp"
+#include "../plugins/getters/include/gethtlc.hpp"
 #include "../include/panels/updatefeedproducers.hpp"
 #include "../include/panels/voteforwitness.hpp"
 

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -2,6 +2,10 @@ add_subdirectory( transfer )
 add_subdirectory( sellasset )
 add_subdirectory( borrowasset )
 add_subdirectory( cancelorder )
+add_subdirectory( setproxy )
+add_subdirectory( getters )
+
+
 
 
 
diff --git a/plugins/getters/CMakeLists.txt b/plugins/getters/CMakeLists.txt
@@ -0,0 +1,22 @@
+find_package(wxWidgets COMPONENTS core base adv xrc aui REQUIRED)
+include(${wxWidgets_USE_FILE})
+
+add_library( gwallet_getters
+        getcommitteemember.cpp
+        getaccounthistory.cpp
+        getorderbook.cpp
+        about.cpp
+        info.cpp
+        active_committee.cpp
+        active_witnesses.cpp
+        getwitness.cpp
+        getaccount.cpp
+        getasset.cpp
+        gethtlc.cpp
+
+        )
+
+target_link_libraries( gwallet_getters
+        PRIVATE graphene_app graphene_net graphene_chain graphene_egenesis_brief graphene_utilities graphene_wallet fc
+        ${wxWidgets_LIBRARIES} ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS}
+        )
diff --git a/panels/about.cpp → plugins/getters/about.cpp b/panels/about.cpp → plugins/getters/about.cpp
@@ -1,5 +1,7 @@
-#include "../include/panels/about.hpp"
-#include "../include/panels/wallet.hpp"
+#include "include/about.hpp"
+
+#include <panels/commands.hpp>
+#include <panels/cli.hpp>
 
 About::About(GWallet* gwallet) : wxScrolledWindow()
 {

diff --git a/panels/active_committee.cpp → plugins/getters/active_committee.cpp b/panels/active_committee.cpp → plugins/getters/active_committee.cpp
@@ -1,6 +1,7 @@
-#include "../include/panels/active_committee.hpp"
-#include "../include/panels/wallet.hpp"
-#include "../include/panels/commands.hpp"
+#include "include/active_committee.hpp"
+
+#include <panels/commands.hpp>
+#include <panels/cli.hpp>
 
 ActiveCommittee::ActiveCommittee(GWallet* gwallet) : wxScrolledWindow()
 {
@@ -10,6 +11,7 @@ ActiveCommittee::ActiveCommittee(GWallet* gwallet) : wxScrolledWindow()
    wxBusyInfo wait(_("Please wait, updating active committee members info ..."));
    wxTheApp->Yield();
 
+   wxXmlResource::Get()->LoadAllFiles(p_GWallet->directory + wxT("/plugins/getters/resources"));
    InitWidgetsFromXRC((wxWindow *)p_GWallet);
 
    response_grid->CreateGrid(0, 3);

diff --git a/panels/active_witnesses.cpp → plugins/getters/active_witnesses.cpp b/panels/active_witnesses.cpp → plugins/getters/active_witnesses.cpp
@@ -1,6 +1,7 @@
-#include "../include/panels/active_witnesses.hpp"
-#include "../include/panels/wallet.hpp"
-#include "../include/panels/commands.hpp"
+#include "include/active_witnesses.hpp"
+
+#include <panels/commands.hpp>
+#include <panels/cli.hpp>
 
 ActiveWitnesses::ActiveWitnesses(GWallet* gwallet) : wxScrolledWindow()
 {
@@ -10,6 +11,7 @@ ActiveWitnesses::ActiveWitnesses(GWallet* gwallet) : wxScrolledWindow()
    wxBusyInfo wait(_("Please wait, updating active witnesses info ..."));
    wxTheApp->Yield();
 
+   wxXmlResource::Get()->LoadAllFiles(p_GWallet->directory + wxT("/plugins/getters/resources"));
    InitWidgetsFromXRC((wxWindow *)p_GWallet);
 
    SetScrollRate(1,1);

diff --git a/panels/getaccount.cpp → plugins/getters/getaccount.cpp b/panels/getaccount.cpp → plugins/getters/getaccount.cpp
@@ -1,11 +1,13 @@
-#include "../include/panels/getaccount.hpp"
-#include "../include/panels/wallet.hpp"
-#include "../include/panels/cli.hpp"
-#include "../include/panels/commands.hpp"
+#include "include/getaccount.hpp"
+
+#include <panels/commands.hpp>
+#include <panels/cli.hpp>
 
 GetAccount::GetAccount(GWallet* gwallet)
 {
    p_GWallet = gwallet;
+
+   wxXmlResource::Get()->LoadAllFiles(p_GWallet->directory + wxT("/plugins/getters/resources"));
    InitWidgetsFromXRC((wxWindow *)p_GWallet);
 
    SetScrollRate(1,1);

diff --git a/panels/getaccounthistory.cpp → plugins/getters/getaccounthistory.cpp b/panels/getaccounthistory.cpp → plugins/getters/getaccounthistory.cpp
@@ -1,11 +1,13 @@
-#include "../include/panels/getaccounthistory.hpp"
-#include "../include/panels/wallet.hpp"
-#include "../include/panels/cli.hpp"
-#include "../include/panels/commands.hpp"
+#include "include/getaccounthistory.hpp"
+
+#include <panels/commands.hpp>
+#include <panels/cli.hpp>
 
 GetAccountHistory::GetAccountHistory(GWallet* gwallet)
 {
    p_GWallet = gwallet;
+
+   wxXmlResource::Get()->LoadAllFiles(p_GWallet->directory + wxT("/plugins/getters/resources"));
    InitWidgetsFromXRC((wxWindow *)p_GWallet);
 
    SetScrollRate(1,1);

diff --git a/panels/getasset.cpp → plugins/getters/getasset.cpp b/panels/getasset.cpp → plugins/getters/getasset.cpp
@@ -1,11 +1,13 @@
-#include "../include/panels/getasset.hpp"
-#include "../include/panels/wallet.hpp"
-#include "../include/panels/cli.hpp"
-#include "../include/panels/commands.hpp"
+#include "include/getasset.hpp"
+
+#include <panels/commands.hpp>
+#include <panels/cli.hpp>
 
 GetAsset::GetAsset(GWallet* gwallet)
 {
    p_GWallet = gwallet;
+
+   wxXmlResource::Get()->LoadAllFiles(p_GWallet->directory + wxT("/plugins/getters/resources"));
    InitWidgetsFromXRC((wxWindow *)p_GWallet);
 
    SetScrollRate(1,1);

diff --git a/panels/getcommitteemember.cpp → plugins/getters/getcommitteemember.cpp b/panels/getcommitteemember.cpp → plugins/getters/getcommitteemember.cpp
@@ -1,11 +1,13 @@
-#include "../include/panels/getcommitteemember.hpp"
-#include "../include/panels/wallet.hpp"
-#include "../include/panels/cli.hpp"
-#include "../include/panels/commands.hpp"
+#include "include/getcommitteemember.hpp"
+
+#include <panels/commands.hpp>
+#include <panels/cli.hpp>
 
 GetCommitteeMember::GetCommitteeMember(GWallet* gwallet)
 {
    p_GWallet = gwallet;
+
+   wxXmlResource::Get()->LoadAllFiles(p_GWallet->directory + wxT("/plugins/getters/resources"));
    InitWidgetsFromXRC((wxWindow *)p_GWallet);
 
    SetScrollRate(1,1);

diff --git a/panels/gethtlc.cpp → plugins/getters/gethtlc.cpp b/panels/gethtlc.cpp → plugins/getters/gethtlc.cpp
@@ -1,11 +1,13 @@
-#include "../include/panels/gethtlc.hpp"
-#include "../include/panels/wallet.hpp"
-#include "../include/panels/cli.hpp"
-#include "../include/panels/commands.hpp"
+#include "include/gethtlc.hpp"
+
+#include <panels/commands.hpp>
+#include <panels/cli.hpp>
 
 GetHtlc::GetHtlc(GWallet* gwallet)
 {
    p_GWallet = gwallet;
+
+   wxXmlResource::Get()->LoadAllFiles(p_GWallet->directory + wxT("/plugins/getters/resources"));
    InitWidgetsFromXRC((wxWindow *)p_GWallet);
 
    SetScrollRate(1,1);

diff --git a/panels/getorderbook.cpp → plugins/getters/getorderbook.cpp b/panels/getorderbook.cpp → plugins/getters/getorderbook.cpp
@@ -1,11 +1,13 @@
-#include "../include/panels/getorderbook.hpp"
-#include "../include/panels/wallet.hpp"
-#include "../include/panels/cli.hpp"
-#include "../include/panels/commands.hpp"
+#include "include/getorderbook.hpp"
+
+#include <panels/commands.hpp>
+#include <panels/cli.hpp>
 
 GetOrderBook::GetOrderBook(GWallet* gwallet) : wxScrolledWindow()
 {
    p_GWallet = gwallet;
+
+   wxXmlResource::Get()->LoadAllFiles(p_GWallet->directory + wxT("/plugins/getters/resources"));
    InitWidgetsFromXRC((wxWindow *)p_GWallet);
 
    SetScrollRate(1,1);

diff --git a/panels/getwitness.cpp → plugins/getters/getwitness.cpp b/panels/getwitness.cpp → plugins/getters/getwitness.cpp
@@ -1,11 +1,13 @@
-#include "../include/panels/getwitness.hpp"
-#include "../include/panels/wallet.hpp"
-#include "../include/panels/cli.hpp"
-#include "../include/panels/commands.hpp"
+#include "include/getwitness.hpp"
+
+#include <panels/commands.hpp>
+#include <panels/cli.hpp>
 
 GetWitness::GetWitness(GWallet* gwallet)
 {
    p_GWallet = gwallet;
+
+   wxXmlResource::Get()->LoadAllFiles(p_GWallet->directory + wxT("/plugins/getters/resources"));
    InitWidgetsFromXRC((wxWindow *)p_GWallet);
 
    SetScrollRate(1,1);

diff --git a/include/panels/about.hpp → plugins/getters/include/about.hpp b/include/panels/about.hpp → plugins/getters/include/about.hpp
@@ -1,7 +1,7 @@
 #include <wx/wx.h>
 #include <wx/xrc/xmlres.h>
 
-class GWallet;
+#include <panels/wallet.hpp>
 
 class About : public wxScrolledWindow
 {

diff --git a/include/panels/active_committee.hpp → plugins/getters/include/active_committee.hpp b/include/panels/active_committee.hpp → plugins/getters/include/active_committee.hpp
@@ -3,7 +3,7 @@
 #include <wx/numformatter.h>
 #include <wx/xrc/xmlres.h>
 
-class GWallet;
+#include <panels/wallet.hpp>
 
 class ActiveCommittee : public wxScrolledWindow
 {

diff --git a/include/panels/active_witnesses.hpp → plugins/getters/include/active_witnesses.hpp b/include/panels/active_witnesses.hpp → plugins/getters/include/active_witnesses.hpp
@@ -3,7 +3,7 @@
 #include <wx/numformatter.h>
 #include <wx/xrc/xmlres.h>
 
-class GWallet;
+#include <panels/wallet.hpp>
 
 class ActiveWitnesses : public wxScrolledWindow
 {

diff --git a/include/panels/getaccount.hpp → plugins/getters/include/getaccount.hpp b/include/panels/getaccount.hpp → plugins/getters/include/getaccount.hpp
@@ -4,7 +4,7 @@
 #include <wx/numformatter.h>
 #include <wx/xrc/xmlres.h>
 
-class GWallet;
+#include <panels/wallet.hpp>
 
 class GetAccount: public wxScrolledWindow
 {

diff --git a/include/panels/getaccounthistory.hpp → ...ins/getters/include/getaccounthistory.hpp b/include/panels/getaccounthistory.hpp → ...ins/getters/include/getaccounthistory.hpp
@@ -4,7 +4,7 @@
 #include <wx/spinctrl.h>
 #include <wx/xrc/xmlres.h>
 
-class GWallet;
+#include <panels/wallet.hpp>
 
 class GetAccountHistory: public wxScrolledWindow
 {

diff --git a/include/panels/getasset.hpp → plugins/getters/include/getasset.hpp b/include/panels/getasset.hpp → plugins/getters/include/getasset.hpp
@@ -4,7 +4,7 @@
 #include <wx/numformatter.h>
 #include <wx/xrc/xmlres.h>
 
-class GWallet;
+#include <panels/wallet.hpp>
 
 class GetAsset: public wxScrolledWindow
 {

diff --git a/include/panels/getcommitteemember.hpp → ...ns/getters/include/getcommitteemember.hpp b/include/panels/getcommitteemember.hpp → ...ns/getters/include/getcommitteemember.hpp
@@ -4,7 +4,7 @@
 #include <wx/numformatter.h>
 #include <wx/xrc/xmlres.h>
 
-class GWallet;
+#include <panels/wallet.hpp>
 
 class GetCommitteeMember: public wxScrolledWindow
 {

diff --git a/include/panels/gethtlc.hpp → plugins/getters/include/gethtlc.hpp b/include/panels/gethtlc.hpp → plugins/getters/include/gethtlc.hpp
@@ -4,7 +4,7 @@
 #include <wx/numformatter.h>
 #include <wx/xrc/xmlres.h>
 
-class GWallet;
+#include <panels/wallet.hpp>
 
 class GetHtlc: public wxScrolledWindow
 {

diff --git a/include/panels/getorderbook.hpp → plugins/getters/include/getorderbook.hpp b/include/panels/getorderbook.hpp → plugins/getters/include/getorderbook.hpp
@@ -4,7 +4,7 @@
 #include <wx/spinctrl.h>
 #include <wx/xrc/xmlres.h>
 
-class GWallet;
+#include <panels/wallet.hpp>
 
 class GetOrderBook: public wxScrolledWindow
 {