IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove CherryPy from the source tree, and change references to Flask

Browse Source 
instead. Add support to the runtime to allow the user to specify the
Python path. This needs to be more automated for release, but will be
useful for debugging and development.
This commit is contained in:
Dave Page
2014-12-16 12:53:09 +00:00
parent 1db7d968e2
commit cd9d005c49
54 changed files with 93 additions and 21827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
runtime/BrowserWindow.cpp
View File

@@ -47,8 +47,8 @@ BrowserWindow::BrowserWindow(QString url)
// Restore the geometry
QSettings settings;
restoreGeometry(settings.value("geometry").toByteArray());
restoreState(settings.value("windowState").toByteArray());
restoreGeometry(settings.value("Browser/Geometry").toByteArray());
restoreState(settings.value("Browser/WindowState").toByteArray());
// Display the app
m_initialLoad = true;
@@ -61,8 +61,8 @@ BrowserWindow::BrowserWindow(QString url)
void BrowserWindow::closeEvent(QCloseEvent *event)
{
QSettings settings;
settings.setValue("geometry", saveGeometry());
settings.setValue("windowState", saveState());
settings.setValue("Browser/Geometry", saveGeometry());
settings.setValue("Browser/WindowState", saveState());
QMainWindow::closeEvent(event);
}
@@ -76,6 +76,11 @@ void BrowserWindow::createActions()
openUrlAction->setStatusTip(tr("Open a URL"));
connect(openUrlAction, SIGNAL(triggered()), this, SLOT(openUrl()));
// Set the Python Path
pythonPathAction = new QAction(tr("&Python Path..."), this);
pythonPathAction->setStatusTip(tr("Set the Python search path"));
connect(pythonPathAction, SIGNAL(triggered()), this, SLOT(pythonPath()));
// Exit the app
exitAction = new QAction(tr("E&xit"), this);
exitAction->setStatusTip(tr("Exit the application"));
@@ -96,6 +101,8 @@ void BrowserWindow::createMenus()
fileMenu = menuBar()->addMenu(tr("&File"));
fileMenu->addAction(openUrlAction);
fileMenu->addSeparator();
fileMenu->addAction(pythonPathAction);
fileMenu->addSeparator();
fileMenu->addAction(exitAction);
menuBar()->addSeparator();
@@ -165,9 +172,22 @@ void BrowserWindow::about()
void BrowserWindow::openUrl()
{
bool ok;
QString url = QInputDialog::getText(this, tr("Enter a URL"), tr("URL:"), QLineEdit::Normal, "http://", &ok);
QString url = QInputDialog::getText(this, tr("Open URL"), tr("Enter a URL"), QLineEdit::Normal, "http://", &ok);
if (ok && !url.isEmpty())
webView->setUrl(url);
}
// Open an arbitrary URL
void BrowserWindow::pythonPath()
{
QSettings settings;
bool ok;
QString path = QInputDialog::getText(this, tr("Python Path"), tr("Set the Python search path:"), QLineEdit::Normal, settings.value("PythonPath").toString(), &ok);
if (ok)
settings.setValue("PythonPath", path);
}