Merge pull request #2393 from r000n/staging
Staging - GUI fixes for upstream
This commit is contained in:
commit
8142ac2c18
3 changed files with 35 additions and 1 deletions
|
@ -145,6 +145,11 @@ void BitcoinAmountField::unitChanged(int idx)
|
|||
amount->setDecimals(BitcoinUnits::decimals(currentUnit));
|
||||
amount->setMaximum(qPow(10, BitcoinUnits::amountDigits(currentUnit)) - qPow(10, -amount->decimals()));
|
||||
|
||||
if(currentUnit == BitcoinUnits::uBTC)
|
||||
amount->setSingleStep(0.01);
|
||||
else
|
||||
amount->setSingleStep(0.001);
|
||||
|
||||
if(valid)
|
||||
{
|
||||
// If value was valid, re-place it in the widget with the new unit
|
||||
|
|
|
@ -54,6 +54,8 @@
|
|||
#include <QUrl>
|
||||
#include <QMimeData>
|
||||
#include <QStyle>
|
||||
#include <QSettings>
|
||||
#include <QDesktopWidget>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
|
@ -69,7 +71,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
|
|||
rpcConsole(0),
|
||||
prevBlocks(0)
|
||||
{
|
||||
resize(850, 550);
|
||||
restoreWindowGeometry();
|
||||
setWindowTitle(tr("Bitcoin") + " - " + tr("Wallet"));
|
||||
#ifndef Q_OS_MAC
|
||||
qApp->setWindowIcon(QIcon(":icons/bitcoin"));
|
||||
|
@ -187,6 +189,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
|
|||
|
||||
BitcoinGUI::~BitcoinGUI()
|
||||
{
|
||||
saveWindowGeometry();
|
||||
if(trayIcon) // Hide tray icon, as deleting will let it linger until quit (on Ubuntu)
|
||||
trayIcon->hide();
|
||||
#ifdef Q_OS_MAC
|
||||
|
@ -468,6 +471,28 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
|
|||
}
|
||||
#endif
|
||||
|
||||
void BitcoinGUI::saveWindowGeometry()
|
||||
{
|
||||
QSettings settings;
|
||||
settings.setValue("nWindowPos", pos());
|
||||
settings.setValue("nWindowSize", size());
|
||||
}
|
||||
|
||||
void BitcoinGUI::restoreWindowGeometry()
|
||||
{
|
||||
QSettings settings;
|
||||
QPoint pos = settings.value("nWindowPos").toPoint();
|
||||
QSize size = settings.value("nWindowSize", QSize(850, 550)).toSize();
|
||||
if (!pos.x() && !pos.y())
|
||||
{
|
||||
QRect screen = qApp->desktop()->screenGeometry();
|
||||
pos.setX((screen.width()-size.width())/2);
|
||||
pos.setY((screen.height()-size.height())/2);
|
||||
}
|
||||
resize(size);
|
||||
move(pos);
|
||||
}
|
||||
|
||||
void BitcoinGUI::optionsClicked()
|
||||
{
|
||||
if(!clientModel || !clientModel->getOptionsModel())
|
||||
|
|
|
@ -108,6 +108,10 @@ private:
|
|||
void createTrayIcon();
|
||||
/** Create system tray menu (or setup the dock menu) */
|
||||
void createTrayIconMenu();
|
||||
/** Save window size and position */
|
||||
void saveWindowGeometry();
|
||||
/** Restore window size and position */
|
||||
void restoreWindowGeometry();
|
||||
|
||||
public slots:
|
||||
/** Set number of connections shown in the UI */
|
||||
|
|
Loading…
Reference in a new issue