IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-04 13:17:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add a shortcut (Ctrl/Cmd + 0 (zero)) to the runtime to allow the zoom level to be reset. Fixes #2485

Browse Source
This commit is contained in:
Khushboo Vashi 2017-06-13 10:21:51 +01:00 committed by Dave Page
parent 1208206bc0
commit 3a5fda44e4
3 changed files with 33 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en_US/keyboard_shortcuts.rst
View File

@ -23,6 +23,8 @@ When running in the Desktop Runtime, the following keyboard shortcuts are availa
+--------------------------+----------------+---------------------------------------+
| Ctrl+Minus | Cmd+Minus | Zoom out |
+--------------------------+----------------+---------------------------------------+
| Ctrl+0 | Cmd+0 | Reset the zoom level |
+--------------------------+----------------+---------------------------------------+
**SQL Editors**

71
runtime/BrowserWindow.cpp
View File

@ -197,6 +197,8 @@ void BrowserWindow::createActions()
exitShortcut->setContext(Qt::ApplicationShortcut);
connect(exitShortcut, SIGNAL(activated()), this, SLOT(close()));
signalMapper = new QSignalMapper(this);
// About box
aboutShortcut = new QShortcut(QKeySequence(Qt::ALT + Qt::SHIFT + Qt::Key_A), this);
aboutShortcut->setContext(Qt::ApplicationShortcut);
@ -205,12 +207,23 @@ void BrowserWindow::createActions()
// Zoom in
zoomInShortcut = new QShortcut(QKeySequence(QKeySequence::ZoomIn), this);
zoomInShortcut->setContext(Qt::ApplicationShortcut);
connect(zoomInShortcut, SIGNAL(activated()), this, SLOT(zoomIn()));
signalMapper->setMapping(zoomInShortcut, 1);
connect(zoomInShortcut, SIGNAL(activated()), signalMapper, SLOT(map()));
// Zoom out
zoomOutShortcut = new QShortcut(QKeySequence(QKeySequence::ZoomOut), this);
zoomOutShortcut->setContext(Qt::ApplicationShortcut);
connect(zoomOutShortcut, SIGNAL(activated()), this, SLOT(zoomOut()));
signalMapper->setMapping(zoomOutShortcut, -1);
connect(zoomOutShortcut, SIGNAL(activated()), signalMapper, SLOT(map()));
// Reset Zoom
zoomResetShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_0), this);
zoomResetShortcut->setContext(Qt::ApplicationShortcut);
signalMapper->setMapping(zoomResetShortcut, 0);
connect(zoomResetShortcut, SIGNAL(activated()), signalMapper, SLOT(map()));
connect(signalMapper, SIGNAL(mapped(int)), this, SLOT(setZoomLevel(int)));
#ifdef __APPLE__
#ifdef PGADMIN4_USE_WEBENGINE
@ -1186,8 +1199,8 @@ void BrowserWindow::about()
}
// Zoom in
void BrowserWindow::zoomIn()
// Set Zoom Level
void BrowserWindow::setZoomLevel(int zoomFlag)
{
int tabCount = 0;
WebViewWindow *webviewPtr = NULL;
@ -1209,55 +1222,27 @@ void BrowserWindow::zoomIn()
if (webviewPtr != NULL)
{
webviewPtr->setZoomFactor(m_mainWebView->zoomFactor() + 0.1);
if (zoomFlag == 1) {
webviewPtr->setZoomFactor(m_mainWebView->zoomFactor() + 0.1);
}
else if (zoomFlag == -1) {
webviewPtr->setZoomFactor(m_mainWebView->zoomFactor() - 0.1);
}
else if(zoomFlag == 0) {
webviewPtr->setZoomFactor(1.0);
}
}
}
}
}
}
// Save the zoom factor for next time
// Set the zoom value for the next time
QSettings settings;
settings.setValue("Browser/Zoom", m_mainWebView->zoomFactor());
}
// Zoom out
void BrowserWindow::zoomOut()
{
int tabCount = 0;
WebViewWindow *webviewPtr = NULL;
// Loop through all the tabs
for (tabCount = 0; tabCount < m_tabWidget->count(); tabCount++)
{
QWidget *tab = m_tabWidget->widget(tabCount);
if (tab != NULL)
{
// Find and loop through any child controls
QList<QWidget*> widgetList = tab->findChildren<QWidget*>();
foreach( QWidget* widgetPtr, widgetList )
{
if (widgetPtr != NULL)
{
// If it's a web view control, set the zoom level based on the main view
webviewPtr = dynamic_cast<WebViewWindow*>(widgetPtr);
if (webviewPtr != NULL)
{
webviewPtr->setZoomFactor(m_mainWebView->zoomFactor() - 0.1);
}
}
}
}
}
// Save the zoom factor for next time
QSettings settings;
settings.setValue("Browser/Zoom", m_mainWebView->zoomFactor());
}
// Open an arbitrary URL
void BrowserWindow::openUrl()
{

5
runtime/BrowserWindow.h
View File

@ -70,8 +70,7 @@ private slots:
void openUrl();
void preferences();
void about();
void zoomIn();
void zoomOut();
void setZoomLevel(int zoomFlag);
#ifdef PGADMIN4_USE_WEBENGINE
void downloadRequested(QWebEngineDownloadItem *download);
#endif
@ -104,6 +103,8 @@ private:
QShortcut *aboutShortcut;
QShortcut *zoomInShortcut;
QShortcut *zoomOutShortcut;
QShortcut *zoomResetShortcut;
QSignalMapper *signalMapper;
QGridLayout *m_tabGridLayout;
QGridLayout *m_mainGridLayout;