Skip to content

Commit 8bec8b0

Browse files
MKleusbergMKleusberg
committed
Remove dbhub.io code
Remove all code related to dbhub.io because the servers have been shut down some months ago. We can always restore this code later if needed. This keeps some of the networking code as well as the proxy settings because they are still needed for checking for new program versions.
1 parent 8b5e1ac commit 8bec8b0

28 files changed

Lines changed: 210 additions & 4939 deletions

‎CMakeLists.txt‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,8 @@ target_sources(${PROJECT_NAME}
144144
src/FileDialog.h
145145
src/ColumnDisplayFormatDialog.h
146146
src/FilterLineEdit.h
147-
src/RemoteDatabase.h
148147
src/ForeignKeyEditorDelegate.h
149148
src/PlotDock.h
150-
src/RemoteDock.h
151-
src/RemoteModel.h
152-
src/RemotePushDialog.h
153149
src/FindReplaceDialog.h
154150
src/ExtendedScintilla.h
155151
src/FileExtensionManager.h
@@ -162,8 +158,6 @@ target_sources(${PROJECT_NAME}
162158
src/SelectItemsPopup.h
163159
src/TableBrowser.h
164160
src/ImageViewer.h
165-
src/RemoteLocalFilesModel.h
166-
src/RemoteCommitsModel.h
167161
src/RemoteNetwork.h
168162
src/TableBrowserDock.h
169163
)
@@ -203,12 +197,8 @@ target_sources(${PROJECT_NAME}
203197
src/FileDialog.cpp
204198
src/ColumnDisplayFormatDialog.cpp
205199
src/FilterLineEdit.cpp
206-
src/RemoteDatabase.cpp
207200
src/ForeignKeyEditorDelegate.cpp
208201
src/PlotDock.cpp
209-
src/RemoteDock.cpp
210-
src/RemoteModel.cpp
211-
src/RemotePushDialog.cpp
212202
src/FindReplaceDialog.cpp
213203
src/ExtendedScintilla.cpp
214204
src/FileExtensionManager.cpp
@@ -226,8 +216,6 @@ target_sources(${PROJECT_NAME}
226216
src/sql/parser/sqlite3_lexer.cpp
227217
src/sql/parser/sqlite3_parser.cpp
228218
src/ImageViewer.cpp
229-
src/RemoteLocalFilesModel.cpp
230-
src/RemoteCommitsModel.cpp
231219
src/RemoteNetwork.cpp
232220
src/TableBrowserDock.cpp
233221
)
@@ -250,8 +238,6 @@ target_sources(${PROJECT_NAME}
250238
src/ExportSqlDialog.ui
251239
src/ColumnDisplayFormatDialog.ui
252240
src/PlotDock.ui
253-
src/RemoteDock.ui
254-
src/RemotePushDialog.ui
255241
src/FindReplaceDialog.ui
256242
src/FileExtensionManager.ui
257243
src/CondFormatManager.ui
@@ -268,7 +254,6 @@ target_sources(${PROJECT_NAME}
268254
PRIVATE
269255

270256
# General
271-
src/certs/CaCerts.qrc
272257
src/sql/parser/sqlite3_parser.yy
273258
src/sql/parser/sqlite3_lexer.ll
274259

‎src/MainWindow.cpp‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
#include "ExportSqlDialog.h"
2323
#include "SqlUiLexer.h"
2424
#include "FileDialog.h"
25-
#include "RemoteDock.h"
2625
#include "FindReplaceDialog.h"
2726
#include "RunSql.h"
2827
#include "ExtendedTableWidget.h"
2928
#include "Data.h"
29+
#include "RemoteNetwork.h"
3030
#include "TableBrowser.h"
3131
#include "TableBrowserDock.h"
3232

@@ -72,7 +72,6 @@ MainWindow::MainWindow(QWidget* parent)
7272
m_currentTabTableModel(nullptr),
7373
editDock(new EditDialog(this)),
7474
plotDock(new PlotDock(this)),
75-
remoteDock(new RemoteDock(this)),
7675
currentTableBrowser(nullptr),
7776
findReplaceDialog(new FindReplaceDialog(this)),
7877
execute_sql_worker(nullptr),
@@ -102,7 +101,6 @@ void MainWindow::init()
102101
// Load window settings
103102
tabifyDockWidget(ui->dockLog, ui->dockPlot);
104103
tabifyDockWidget(ui->dockLog, ui->dockSchema);
105-
tabifyDockWidget(ui->dockLog, ui->dockRemote);
106104

107105
#ifdef Q_OS_MACX
108106
// Add OpenGL Context for macOS
@@ -158,7 +156,6 @@ void MainWindow::init()
158156
// Create docks
159157
ui->dockEdit->setWidget(editDock);
160158
ui->dockPlot->setWidget(plotDock);
161-
ui->dockRemote->setWidget(remoteDock);
162159

163160
// Set up edit dock
164161
editDock->setReadOnly(true);
@@ -315,10 +312,6 @@ void MainWindow::init()
315312
ui->viewMenu->actions().at(3)->setShortcut(QKeySequence(tr("Ctrl+E")));
316313
ui->viewMenu->actions().at(3)->setIcon(QIcon(":/icons/log_dock"));
317314

318-
// Add menu item for plot dock
319-
ui->viewMenu->insertAction(ui->viewDBToolbarAction, ui->dockRemote->toggleViewAction());
320-
ui->viewMenu->actions().at(4)->setIcon(QIcon(":/icons/log_dock"));
321-
322315
// Set checked state if toolbar is visible
323316
ui->viewDBToolbarAction->setChecked(!ui->toolbarDB->isHidden());
324317
ui->viewExtraDBToolbarAction->setChecked(!ui->toolbarExtraDB->isHidden());
@@ -369,7 +362,6 @@ void MainWindow::init()
369362
ui->dockPlot->hide();
370363
ui->dockSchema->hide();
371364
ui->dockEdit->hide();
372-
ui->dockRemote->hide();
373365
});
374366
QAction* atBottomLayoutAction = layoutMenu->addAction(tr("Dock Windows at Bottom"));
375367
connect(atBottomLayoutAction, &QAction::triggered, this, [=]() {
@@ -445,7 +437,6 @@ void MainWindow::init()
445437
connect(editDock, &EditDialog::requestUrlOrFileOpen, this, &MainWindow::openUrlOrFile);
446438
connect(ui->dbTreeWidget->selectionModel(), &QItemSelectionModel::selectionChanged, this, &MainWindow::changeObjectSelection);
447439
connect(ui->dockEdit, &QDockWidget::visibilityChanged, this, &MainWindow::toggleEditDock);
448-
connect(remoteDock, SIGNAL(openFile(QString)), this, SLOT(fileOpen(QString)));
449440
connect(ui->actionDropSelectQueryCheck, &QAction::toggled, dbStructureModel, &DbStructureModel::setDropSelectQuery);
450441
connect(ui->actionDropInsertCheck, &QAction::toggled, dbStructureModel, &DbStructureModel::setDropInsert);
451442
connect(ui->actionDropNamesCheck, &QAction::toggled, dbStructureModel,
@@ -519,7 +510,6 @@ void MainWindow::init()
519510
ui->dockLog->setWindowTitle(ui->dockLog->windowTitle().remove('&'));
520511
ui->dockPlot->setWindowTitle(ui->dockPlot->windowTitle().remove('&'));
521512
ui->dockSchema->setWindowTitle(ui->dockSchema->windowTitle().remove('&'));
522-
ui->dockRemote->setWindowTitle(ui->dockRemote->windowTitle().remove('&'));
523513
}
524514

525515
bool MainWindow::fileOpen(const QString& fileName, bool openFromProject, bool readOnly)
@@ -594,9 +584,6 @@ bool MainWindow::fileOpen(const QString& fileName, bool openFromProject, bool re
594584

595585
refreshTableBrowsers();
596586

597-
// Update remote dock
598-
remoteDock->fileOpened(wFile);
599-
600587
retval = true;
601588
} else {
602589
QMessageBox::warning(this, qApp->applicationName(), tr("Could not open database file.\nReason: %1").arg(db.lastError()));
@@ -641,7 +628,6 @@ void MainWindow::fileNewInMemoryDatabase(bool open_create_dialog)
641628
statusEncodingLabel->setText(db.getPragma("encoding"));
642629
statusEncryptionLabel->setVisible(false);
643630
statusReadOnlyLabel->setVisible(false);
644-
remoteDock->fileOpened(":memory:");
645631
refreshTableBrowsers();
646632
if(ui->tabSqlAreas->count() == 0)
647633
openSqlTab(true);
@@ -784,9 +770,6 @@ bool MainWindow::fileClose()
784770
for(int i=0; i < ui->tabSqlAreas->count(); i++)
785771
qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->widget(i))->getEditor()->reloadKeywords();
786772

787-
// Clear remote dock
788-
remoteDock->fileOpened(QString());
789-
790773
return true;
791774
}
792775

@@ -1978,8 +1961,6 @@ void MainWindow::activateFields(bool enable)
19781961
if(!enable)
19791962
ui->actionSqlResultsSave->setEnabled(false);
19801963

1981-
remoteDock->enableButtons();
1982-
19831964
for(const auto& d : allTableBrowserDocks())
19841965
d->tableBrowser()->setEnabled(enable);
19851966
}
@@ -2469,15 +2450,6 @@ void MainWindow::reloadSettings()
24692450
emit db.structureUpdated();
24702451
refreshTableBrowsers();
24712452

2472-
// Hide or show the remote dock as needed
2473-
bool showRemoteActions = Settings::getValue("remote", "active").toBool();
2474-
ui->viewMenu->actions().at(4)->setVisible(showRemoteActions);
2475-
if(!showRemoteActions)
2476-
ui->dockRemote->setHidden(true);
2477-
2478-
// Reload remote dock settings
2479-
remoteDock->reloadSettings();
2480-
24812453
sqlb::setIdentifierQuoting(static_cast<sqlb::escapeQuoting>(Settings::getValue("editor", "identifier_quotes").toInt()));
24822454

24832455
ui->tabSqlAreas->setTabsClosable(
@@ -2495,7 +2467,7 @@ void MainWindow::reloadSettings()
24952467
void MainWindow::checkNewVersion(const bool automatic)
24962468
{
24972469
RemoteNetwork::get().fetch(QUrl("https://download.sqlitebrowser.org/currentrelease"), RemoteNetwork::RequestTypeCustom,
2498-
QString(), [this, automatic](const QByteArray& reply) {
2470+
[this, automatic](const QByteArray& reply) {
24992471
QList<QByteArray> info = reply.split('\n');
25002472
if(info.size() >= 2)
25012473
{
@@ -3924,7 +3896,6 @@ void MainWindow::moveDocksTo(Qt::DockWidgetArea area)
39243896
addDockWidget(area, ui->dockLog);
39253897
tabifyDockWidget(ui->dockLog, ui->dockPlot);
39263898
tabifyDockWidget(ui->dockLog, ui->dockSchema);
3927-
tabifyDockWidget(ui->dockLog, ui->dockRemote);
39283899
}
39293900

39303901
void MainWindow::clearRecentFiles()

‎src/MainWindow.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class EditDialog;
1414
class ExtendedTableWidget;
1515
class FindReplaceDialog;
1616
class PlotDock;
17-
class RemoteDock;
1817
class RunSql;
1918
class SqliteTableModel;
2019
class TableBrowser;
@@ -111,7 +110,6 @@ friend TableBrowserDock;
111110

112111
EditDialog* editDock;
113112
PlotDock* plotDock;
114-
RemoteDock* remoteDock;
115113
TableBrowser* currentTableBrowser;
116114
FindReplaceDialog* findReplaceDialog;
117115

‎src/MainWindow.ui‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,15 +1480,6 @@ You can drag SQL statements from the Schema column and drop them into the SQL ed
14801480
</layout>
14811481
</widget>
14821482
</widget>
1483-
<widget class="QDockWidget" name="dockRemote">
1484-
<property name="windowTitle">
1485-
<string>&amp;Remote</string>
1486-
</property>
1487-
<attribute name="dockWidgetArea">
1488-
<number>2</number>
1489-
</attribute>
1490-
<widget class="QWidget" name="dockWidgetContents_5"/>
1491-
</widget>
14921483
<widget class="QToolBar" name="toolbarProject">
14931484
<property name="windowTitle">
14941485
<string>Project Toolbar</string>

0 commit comments

Comments
 (0)