Skip to content

Commit da5c09a

Browse files
tobtohttobtoht
committed
Remove plugins
1 parent 3e91fda commit da5c09a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+4
-3983
lines changed

‎CMakeLists.txt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@ option(DONATE_BEG "Prompt donation window every once in a while" OFF)
2727
option(WITH_SCANNER "Enable webcam QR scanner" ON)
2828
option(STACK_TRACE "Dump stack trace on crash (Linux only)" OFF)
2929

30-
# Plugins
31-
option(WITH_PLUGIN_HOME "Include Home tab plugin" ON)
32-
option(WITH_PLUGIN_TICKERS "Include Tickers Home plugin" ON)
33-
option(WITH_PLUGIN_CROWDFUNDING "Include Crowdfunding Home plugin" ON)
34-
option(WITH_PLUGIN_BOUNTIES "Include Bounties Home plugin" ON)
35-
option(WITH_PLUGIN_REVUO "Include Revuo Home plugin" ON)
36-
option(WITH_PLUGIN_CALC "Include Calc tab plugin" ON)
37-
3830
list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake")
3931
include(CheckCCompilerFlag)
4032
include(CheckCXXCompilerFlag)

‎HACKING.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,3 @@ There are some CMake options that you may pass to control how Feather is built:
126126
- `-DDONATE_BEG=OFF` - disable the dreaded donate requests
127127
- `-DUSE_DEVICE_TREZOR=OFF` - disable Trezor hardware wallet support
128128
- `-DWITH_SCANNER=ON` - enable the webcam QR code scanner
129-
- `-DWITH_PLUGIN_<NAME>=OFF` - disable a plugin

‎contrib/guix/libexec/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}"
289289

290290

291291
# Set appropriate CMake options for build type
292-
CMAKEVARS="-DWITH_SCANNER=On -DCHECK_UPDATES=On -DSELF_CONTAINED=On -DDONATE_BEG=On -DFEATHER_TARGET_TRIPLET=${HOST} -DWITH_PLUGIN_REDDIT=Off"
292+
CMAKEVARS="-DWITH_SCANNER=On -DCHECK_UPDATES=On -DSELF_CONTAINED=On -DDONATE_BEG=On -DFEATHER_TARGET_TRIPLET=${HOST}"
293293

294294
if [[ -n "${TAG}" ]]; then
295295
CMAKEVARS+=" -DOFFICIAL_BUILD=On"

‎src/CMakeLists.txt‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -70,33 +70,9 @@ file(GLOB SOURCE_FILES
7070
"monero_seed/*.cpp"
7171
"monero_seed/*.c"
7272
"monero_seed/*.hpp"
73-
"plugins/*.cpp"
74-
"plugins/*.h"
7573
)
7674

7775
get_cmake_property(_vars VARIABLES)
78-
set(PLUGIN_PREFIX "WITH_PLUGIN_")
79-
80-
foreach (_var ${_vars})
81-
string(REGEX MATCH "^${PLUGIN_PREFIX}" _isPlugin ${_var})
82-
83-
if (NOT ${_var})
84-
continue()
85-
endif()
86-
87-
if(_isPlugin)
88-
string(REPLACE "${PLUGIN_PREFIX}" "" _suffix ${_var})
89-
string(TOLOWER "${_suffix}" _plugin)
90-
message(STATUS "Adding plugin: ${_plugin}")
91-
file (GLOB PLUGIN_FILES
92-
"plugins/${_plugin}/*.cpp"
93-
"plugins/${_plugin}/*.h"
94-
)
95-
list (APPEND SOURCE_FILES
96-
${PLUGIN_FILES}
97-
)
98-
endif()
99-
endforeach()
10076

10177
if (CHECK_UPDATES)
10278
file(GLOB UPDATER_FILES

‎src/MainWindow.cpp‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "libwalletqt/rows/Output.h"
3030
#include "libwalletqt/TransactionHistory.h"
3131
#include "model/AddressBookModel.h"
32-
#include "plugins/PluginRegistry.h"
3332
#include "utils/AppData.h"
3433
#include "utils/AsyncTask.h"
3534
#include "utils/ColorScheme.h"
@@ -70,7 +69,6 @@ MainWindow::MainWindow(WindowManager *windowManager, Wallet *wallet, QWidget *pa
7069
this->restoreGeo();
7170

7271
this->initStatusBar();
73-
this->initPlugins();
7472
this->initWidgets();
7573
this->initMenu();
7674
this->initOffline();
@@ -190,32 +188,6 @@ void MainWindow::initStatusBar() {
190188
m_statusBtnHwDevice->hide();
191189
}
192190

193-
void MainWindow::initPlugins() {
194-
const QStringList enabledPlugins = conf()->get(Config::enabledPlugins).toStringList();
195-
196-
for (const auto& plugin_creator : PluginRegistry::getPluginCreators()) {
197-
Plugin* plugin = plugin_creator();
198-
199-
if (!PluginRegistry::getInstance().isPluginEnabled(plugin->id())) {
200-
continue;
201-
}
202-
203-
qDebug() << "Initializing plugin: " << plugin->id();
204-
plugin->initialize(m_wallet, this);
205-
connect(plugin, &Plugin::setStatusText, this, &MainWindow::setStatusText);
206-
connect(plugin, &Plugin::fillSendTab, this, &MainWindow::fillSendTab);
207-
connect(this, &MainWindow::updateIcons, plugin, &Plugin::skinChanged);
208-
connect(this, &MainWindow::aboutToQuit, plugin, &Plugin::aboutToQuit);
209-
connect(this, &MainWindow::uiSetup, plugin, &Plugin::uiSetup);
210-
211-
m_plugins.append(plugin);
212-
}
213-
214-
std::sort(m_plugins.begin(), m_plugins.end(), [](Plugin *a, Plugin *b) {
215-
return a->idx() < b->idx();
216-
});
217-
}
218-
219191
void MainWindow::initWidgets() {
220192
// [History]
221193
m_historyWidget = new HistoryWidget(m_wallet, this);
@@ -253,25 +225,6 @@ void MainWindow::initWidgets() {
253225
m_wallet->setCacheAttribute("wallet.notes", ui->notes->toPlainText());
254226
});
255227

256-
// [Plugins..]
257-
for (auto* plugin : m_plugins) {
258-
if (!plugin->hasParent()) {
259-
qDebug() << "Adding tab: " << plugin->displayName();
260-
261-
if (plugin->insertFirst()) {
262-
ui->tabWidget->insertTab(0, plugin->tab(), icons()->icon(plugin->icon()), plugin->displayName());
263-
} else {
264-
ui->tabWidget->addTab(plugin->tab(), icons()->icon(plugin->icon()), plugin->displayName());
265-
}
266-
267-
for (auto* child : m_plugins) {
268-
if (child->hasParent() && child->parent() == plugin->id()) {
269-
plugin->addSubPlugin(child);
270-
}
271-
}
272-
}
273-
}
274-
275228
ui->frame_coinControl->setVisible(false);
276229
connect(ui->btn_resetCoinControl, &QPushButton::clicked, [this]{
277230
m_wallet->setSelectedInputs({});
@@ -342,18 +295,6 @@ void MainWindow::initMenu() {
342295
m_tabShowHideMapper["Notes"] = new ToggleTab(ui->tabNotes, "Notes", "Notes", ui->actionShow_Notes, this);
343296
m_tabShowHideSignalMapper->setMapping(ui->actionShow_Notes, "Notes");
344297

345-
// Show/Hide Plugins..
346-
for (const auto &plugin : m_plugins) {
347-
if (plugin->parent() != "") {
348-
continue;
349-
}
350-
351-
auto* pluginAction = new QAction(plugin->displayName(), this);
352-
ui->menuView->insertAction(plugin->insertFirst() ? ui->actionPlaceholderBegin : ui->actionPlaceholderEnd, pluginAction);
353-
connect(pluginAction, &QAction::triggered, m_tabShowHideSignalMapper, QOverload<>::of(&QSignalMapper::map));
354-
m_tabShowHideMapper[plugin->displayName()] = new ToggleTab(plugin->tab(), plugin->displayName(), plugin->displayName(), pluginAction, this);
355-
m_tabShowHideSignalMapper->setMapping(pluginAction, plugin->displayName());
356-
}
357298
ui->actionPlaceholderBegin->setVisible(false);
358299
ui->actionPlaceholderEnd->setVisible(false);
359300

@@ -669,17 +610,6 @@ void MainWindow::onWebsocketStatusChanged(bool enabled) {
669610

670611
QStringList enabledTabs = conf()->get(Config::enabledTabs).toStringList();
671612

672-
for (const auto &plugin : m_plugins) {
673-
if (plugin->hasParent()) {
674-
continue;
675-
}
676-
677-
if (plugin->requiresWebsocket()) {
678-
// TODO: unload plugins
679-
ui->tabWidget->setTabVisible(this->findTab(plugin->displayName()), enabled && enabledTabs.contains(plugin->displayName()));
680-
}
681-
}
682-
683613
m_historyWidget->setWebsocketEnabled(enabled);
684614
m_sendWidget->setWebsocketEnabled(enabled);
685615
}

‎src/MainWindow.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
#include "CoinsWidget.h"
4242

4343
#include "WindowManager.h"
44-
#include "plugins/Plugin.h"
4544

4645
#ifdef CHECK_UPDATES
4746
#include "utils/updater/Updater.h"
@@ -179,7 +178,6 @@ private slots:
179178
friend WindowManager;
180179

181180
void initStatusBar();
182-
void initPlugins();
183181
void initWidgets();
184182
void initMenu();
185183
void initOffline();
@@ -252,8 +250,6 @@ private slots:
252250
QTimer m_updateBytes;
253251
QTimer m_checkUserActivity;
254252

255-
QList<Plugin*> m_plugins;
256-
257253
QString m_statusText;
258254
int m_statusDots;
259255
bool m_constructingTransaction = false;

‎src/SettingsDialog.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Settings::Settings(Nodes *nodes, QWidget *parent)
3030
this->setupDisplayTab();
3131
this->setupMemoryTab();
3232
this->setupTransactionsTab();
33-
this->setupPluginsTab();
3433
this->setupMiscTab();
3534

3635
connect(ui->selector, &QListWidget::currentItemChanged, [this](QListWidgetItem *current, QListWidgetItem *previous){
@@ -47,7 +46,6 @@ Settings::Settings(Nodes *nodes, QWidget *parent)
4746
// new QListWidgetItem(icons()->icon("chipset_32px.png"), "Memory", ui->selector, Pages::MEMORY);
4847
new QListWidgetItem(icons()->icon("file_manager_32px.png"), "Transactions", ui->selector, Pages::TRANSACTIONS);
4948
QString connectIcon = ColorScheme::darkScheme ? "connect_white.svg" : "connect.svg";;
50-
new QListWidgetItem(icons()->icon(connectIcon), "Plugins", ui->selector, Pages::PLUGINS);
5149
new QListWidgetItem(icons()->icon("settings_disabled_32px.png"), "Misc", ui->selector, Pages::MISC);
5250

5351
ui->selector->setFixedWidth(ui->selector->sizeHintForColumn(0) + ui->selector->frameWidth() + 5);
@@ -366,12 +364,6 @@ void Settings::setupTransactionsTab() {
366364
});
367365
}
368366

369-
void Settings::setupPluginsTab() {
370-
connect(ui->pluginWidget, &PluginWidget::pluginConfigured, [this](const QString &id) {
371-
emit pluginConfigured(id);
372-
});
373-
}
374-
375367
void Settings::setupMiscTab() {
376368
// [Block explorer]
377369
ui->blockExplorerConfigureWidget->setup("Block explorers", Config::blockExplorers, Config::blockExplorer, {"%txid%"});

‎src/SettingsDialog.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Q_OBJECT
2828
DISPLAY,
2929
MEMORY,
3030
TRANSACTIONS,
31-
PLUGINS,
3231
MISC
3332
};
3433

@@ -41,7 +40,6 @@ Q_OBJECT
4140
void proxySettingsChanged();
4241
void updateBalance();
4342
void offlineMode(bool offline);
44-
void pluginConfigured(const QString &id);
4543
void manualFeeSelectionEnabled(bool enabled);
4644
void subtractFeeFromAmountEnabled(bool enabled);
4745

@@ -59,7 +57,6 @@ private slots:
5957
void setupDisplayTab();
6058
void setupMemoryTab();
6159
void setupTransactionsTab();
62-
void setupPluginsTab();
6360
void setupMiscTab();
6461

6562
void setupThemeComboBox();

‎src/SettingsDialog.ui‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,36 +1035,6 @@
10351035
</item>
10361036
</layout>
10371037
</widget>
1038-
<widget class="QWidget" name="page_plugins">
1039-
<layout class="QVBoxLayout" name="verticalLayout_21">
1040-
<property name="leftMargin">
1041-
<number>0</number>
1042-
</property>
1043-
<property name="topMargin">
1044-
<number>0</number>
1045-
</property>
1046-
<property name="bottomMargin">
1047-
<number>0</number>
1048-
</property>
1049-
<item>
1050-
<widget class="QLabel" name="label_20">
1051-
<property name="text">
1052-
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Plugins&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
1053-
</property>
1054-
</widget>
1055-
</item>
1056-
<item>
1057-
<widget class="PluginWidget" name="pluginWidget" native="true">
1058-
<property name="sizePolicy">
1059-
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
1060-
<horstretch>0</horstretch>
1061-
<verstretch>0</verstretch>
1062-
</sizepolicy>
1063-
</property>
1064-
</widget>
1065-
</item>
1066-
</layout>
1067-
</widget>
10681038
<widget class="QWidget" name="page_misc">
10691039
<layout class="QVBoxLayout" name="verticalLayout_18">
10701040
<property name="leftMargin">
@@ -1163,12 +1133,6 @@
11631133
<header>widgets/NetworkProxyWidget.h</header>
11641134
<container>1</container>
11651135
</customwidget>
1166-
<customwidget>
1167-
<class>PluginWidget</class>
1168-
<extends>QWidget</extends>
1169-
<header>widgets/PluginWidget.h</header>
1170-
<container>1</container>
1171-
</customwidget>
11721136
<customwidget>
11731137
<class>UrlListConfigureWidget</class>
11741138
<extends>QWidget</extends>

‎src/WindowManager.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,6 @@ void WindowManager::showSettings(Nodes *nodes, QWidget *parent, bool showProxyTa
193193
connect(&settings, &Settings::showTrayIcon, [this](bool visible) {
194194
m_tray->setVisible(visible);
195195
});
196-
connect(&settings, &Settings::pluginConfigured, [this](const QString &id) {
197-
emit pluginConfigured(id);
198-
});
199196

200197
if (showProxyTab) {
201198
settings.showNetworkProxyTab();

0 commit comments

Comments
 (0)