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

Replace runtime menu with shortcuts for a cleaner UI (and

Browse Source 
because 99% of users don't need those options anyway).
This commit is contained in:
Dave Page
2016-06-17 11:31:52 +01:00
parent e9dc1496e2
commit 7e27c6280f
2 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
runtime/BrowserWindow.cpp
View File

@@ -45,9 +45,8 @@ BrowserWindow::BrowserWindow(QString url)
m_appServerUrl = url;
// Setup the UI
// Setup the shortcuts
createActions();
createMenus();
m_tabWidget = new TabWindow(this);
m_mainGridLayout = new QGridLayout(m_tabWidget);
@@ -111,45 +110,24 @@ void BrowserWindow::closeEvent(QCloseEvent *event)
void BrowserWindow::createActions()
{
// Open an arbitrary URL
openUrlAction = new QAction(tr("&Open URL..."), this);
openUrlAction->setShortcut(tr("Ctrl+U"));
openUrlAction->setStatusTip(tr("Open a URL"));
connect(openUrlAction, SIGNAL(triggered()), this, SLOT(openUrl()));
openUrlShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_U), this);
openUrlShortcut->setContext(Qt::ApplicationShortcut);
connect(openUrlShortcut, SIGNAL(activated()), this, SLOT(openUrl()));
// Set the Python Path
configurationAction = new QAction(tr("&Configuration..."), this);
configurationAction->setStatusTip(tr("Configure the application paths"));
connect(configurationAction, SIGNAL(triggered()), this, SLOT(configuration()));
preferencesShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_P), this);
preferencesShortcut->setContext(Qt::ApplicationShortcut);
connect(preferencesShortcut, SIGNAL(activated()), this, SLOT(preferences()));
// Exit the app
exitAction = new QAction(tr("E&xit"), this);
exitAction->setStatusTip(tr("Exit the application"));
exitAction->setShortcuts(QKeySequence::Quit);
connect(exitAction, SIGNAL(triggered()), this, SLOT(close()));
exitShortcut = new QShortcut(QKeySequence::Quit, this);
exitShortcut->setContext(Qt::ApplicationShortcut);
connect(exitShortcut, SIGNAL(activated()), this, SLOT(close()));
// About box
aboutAction = new QAction(tr("&About"), this);
aboutAction->setStatusTip(tr("Show the application's About box"));
connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
}
// Create the application menus
void BrowserWindow::createMenus()
{
// File
fileMenu = menuBar()->addMenu(tr("&File"));
fileMenu->addAction(openUrlAction);
fileMenu->addSeparator();
fileMenu->addAction(configurationAction);
fileMenu->addSeparator();
fileMenu->addAction(exitAction);
menuBar()->addSeparator();
// Help
helpMenu = menuBar()->addMenu(tr("&Help"));
helpMenu->addAction(aboutAction);
aboutShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_A), this);
aboutShortcut->setContext(Qt::ApplicationShortcut);
connect(aboutShortcut, SIGNAL(activated()), this, SLOT(about()));
}
@@ -465,7 +443,7 @@ void BrowserWindow::openUrl()
}
// Edit the app configuration
void BrowserWindow::configuration()
void BrowserWindow::preferences()
{
QSettings settings;
bool ok;
@@ -487,4 +465,3 @@ void BrowserWindow::configuration()
}
}

14
runtime/BrowserWindow.h
View File

@@ -47,7 +47,7 @@ protected slots:
private slots:
void openUrl();
void configuration();
void preferences();
void about();
public slots:
@@ -58,12 +58,11 @@ public slots:
private:
QString m_appServerUrl;
WebViewWindow *m_mainWebView;
QMenu *fileMenu;
QMenu *helpMenu;
QAction *openUrlAction;
QAction *configurationAction;
QAction *exitAction;
QAction *aboutAction;
QShortcut *openUrlShortcut;
QShortcut *preferencesShortcut;
QShortcut *exitShortcut;
QShortcut *aboutShortcut;
QGridLayout *m_tabGridLayout;
QGridLayout *m_mainGridLayout;
@@ -82,7 +81,6 @@ private:
int m_loadAttempt;
void createActions();
void createMenus();
void pause(int seconds = 1);
int findURLTab(const QUrl &name);
};