Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:41:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR fixes

Browse source
This commit is contained in:
stojce 2014-09-26 00:57:56 +02:00
parent 6a3bc8f255
commit 5610cfeb34
3 changed files with 99 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Menu.cpp
View file

@ -1158,6 +1158,9 @@ void Menu::changePrivateKey() {
void Menu::toggleAddressBar() { void Menu::toggleAddressBar() {
if (!_addressBarDialog) { if (!_addressBarDialog) {
_addressBarDialog = new AddressBarDialog(); _addressBarDialog = new AddressBarDialog();
}
if (!_addressBarDialog->isVisible()) {
_addressBarDialog->show(); _addressBarDialog->show();
} }
} }

134
interface/src/ui/AddressBarDialog.cpp
View file

@ -13,79 +13,119 @@
#include "AddressManager.h" #include "AddressManager.h"
#include "Application.h" #include "Application.h"
const QString ADDRESSBAR_GO_BUTTON_ICON = "images/address-bar-submit.svg";
const QString ADDRESSBAR_GO_BUTTON_ACTIVE_ICON = "images/address-bar-submit-active.svg";
AddressBarDialog::AddressBarDialog() : AddressBarDialog::AddressBarDialog() :
FramelessDialog(Application::getInstance()->getWindow(), 0, FramelessDialog::POSITION_TOP){ FramelessDialog(Application::getInstance()->getWindow(), 0, FramelessDialog::POSITION_TOP) {
setAttribute(Qt::WA_DeleteOnClose, false);
setupUI(); setupUI();
} }
void AddressBarDialog::setupUI() { void AddressBarDialog::setupUI() {
const QString DIALOG_STYLESHEET = "font-family: Helvetica, Arial, sans-serif;";
const QString ADDRESSBAR_PLACEHOLDER = "Go to: domain, @user, #location";
const QString ADDRESSBAR_STYLESHEET = "padding: 0 10px;";
const QString ADDRESSBAR_FONT_FAMILY = "Helvetica,Arial,sans-serif";
const int ADDRESSBAR_FONT_SIZE = 20;
const int ADDRESSBAR_MIN_WIDTH = 200;
const int ADDRESSBAR_MAX_WIDTH = 615;
const int ADDRESSBAR_HEIGHT = 54;
const int ADDRESSBAR_STRETCH = 60;
const int BUTTON_SPACER_SIZE = 10;
const int DEFAULT_SPACER_SIZE = 20;
const int ADDRESS_LAYOUT_RIGHT_MARGIN = 10;
const int GO_BUTTON_SIZE = 55;
const int CLOSE_BUTTON_SIZE = 16;
const QString CLOSE_BUTTON_ICON = "styles/close.svg";
const int DIALOG_HEIGHT = 100;
const int DIALOG_INITIAL_WIDTH = 560;
setModal(true); setModal(true);
setWindowModality(Qt::WindowModal); setWindowModality(Qt::WindowModal);
setHideOnBlur(false); setHideOnBlur(false);
QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
setSizePolicy(sizePolicy); setSizePolicy(sizePolicy);
setMinimumSize(QSize(560, 100)); setMinimumSize(QSize(DIALOG_INITIAL_WIDTH, DIALOG_HEIGHT));
setStyleSheet("font-family: Helvetica, Arial, sans-serif;"); setStyleSheet(DIALOG_STYLESHEET);
verticalLayout = new QVBoxLayout(this); _verticalLayout = new QVBoxLayout(this);
addressLayout = new QHBoxLayout(); _addressLayout = new QHBoxLayout();
addressLayout->setContentsMargins(0, 0, 10, 0); _addressLayout->setContentsMargins(0, 0, ADDRESS_LAYOUT_RIGHT_MARGIN, 0);
leftSpacer = new QSpacerItem(20, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum); _leftSpacer = new QSpacerItem(DEFAULT_SPACER_SIZE,
addressLayout->addItem(leftSpacer); DEFAULT_SPACER_SIZE,
QSizePolicy::MinimumExpanding,
QSizePolicy::Minimum);
addressLineEdit = new QLineEdit(this); _addressLayout->addItem(_leftSpacer);
addressLineEdit->setPlaceholderText("Go to: domain, @user, #location");
_addressLineEdit = new QLineEdit(this);
_addressLineEdit->setPlaceholderText(ADDRESSBAR_PLACEHOLDER);
QSizePolicy sizePolicyLineEdit(QSizePolicy::Preferred, QSizePolicy::Fixed); QSizePolicy sizePolicyLineEdit(QSizePolicy::Preferred, QSizePolicy::Fixed);
sizePolicyLineEdit.setHorizontalStretch(60); sizePolicyLineEdit.setHorizontalStretch(ADDRESSBAR_STRETCH);
addressLineEdit->setSizePolicy(sizePolicyLineEdit); _addressLineEdit->setSizePolicy(sizePolicyLineEdit);
addressLineEdit->setMinimumSize(QSize(200, 54)); _addressLineEdit->setMinimumSize(QSize(ADDRESSBAR_MIN_WIDTH, ADDRESSBAR_HEIGHT));
addressLineEdit->setMaximumSize(QSize(615, 54)); _addressLineEdit->setMaximumSize(QSize(ADDRESSBAR_MAX_WIDTH, ADDRESSBAR_HEIGHT));
QFont font("Helvetica,Arial,sans-serif", 20); QFont font(ADDRESSBAR_FONT_FAMILY, ADDRESSBAR_FONT_SIZE);
addressLineEdit->setFont(font); _addressLineEdit->setFont(font);
addressLineEdit->setStyleSheet("padding: 0 10px;"); _addressLineEdit->setStyleSheet(ADDRESSBAR_STYLESHEET);
addressLayout->addWidget(addressLineEdit); _addressLayout->addWidget(_addressLineEdit);
buttonSpacer = new QSpacerItem(10, 20, QSizePolicy::Fixed, QSizePolicy::Minimum); _buttonSpacer = new QSpacerItem(BUTTON_SPACER_SIZE, BUTTON_SPACER_SIZE, QSizePolicy::Fixed, QSizePolicy::Minimum);
addressLayout->addItem(buttonSpacer); _addressLayout->addItem(_buttonSpacer);
goButton = new QPushButton(this); _goButton = new QPushButton(this);
goButton->setSizePolicy(sizePolicy); _goButton->setSizePolicy(sizePolicy);
goButton->setMinimumSize(QSize(55, 55)); _goButton->setMinimumSize(QSize(GO_BUTTON_SIZE, GO_BUTTON_SIZE));
goButton->setMaximumSize(QSize(55, 55)); _goButton->setMaximumSize(QSize(GO_BUTTON_SIZE, GO_BUTTON_SIZE));
goButton->setIcon(QIcon(Application::resourcesPath() + "images/address-bar-submit.svg")); _goButton->setIcon(QIcon(Application::resourcesPath() + ADDRESSBAR_GO_BUTTON_ICON));
goButton->setIconSize(QSize(55, 55)); _goButton->setIconSize(QSize(GO_BUTTON_SIZE, GO_BUTTON_SIZE));
goButton->setDefault(true); _goButton->setDefault(true);
goButton->setFlat(true); _goButton->setFlat(true);
addressLayout->addWidget(goButton); _addressLayout->addWidget(_goButton);
rightSpacer = new QSpacerItem(20, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum); _rightSpacer = new QSpacerItem(DEFAULT_SPACER_SIZE,
addressLayout->addItem(rightSpacer); DEFAULT_SPACER_SIZE,
QSizePolicy::MinimumExpanding,
QSizePolicy::Minimum);
closeButton = new QPushButton(this); _addressLayout->addItem(_rightSpacer);
closeButton->setSizePolicy(sizePolicy);
closeButton->setMinimumSize(QSize(16, 16));
closeButton->setMaximumSize(QSize(16, 16));
closeButton->setStyleSheet("color: #333");
QIcon icon(Application::resourcesPath() + "styles/close.svg");
closeButton->setIcon(icon);
closeButton->setFlat(true);
addressLayout->addWidget(closeButton, 0, Qt::AlignRight);
verticalLayout->addLayout(addressLayout); _closeButton = new QPushButton(this);
_closeButton->setSizePolicy(sizePolicy);
_closeButton->setMinimumSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE));
_closeButton->setMaximumSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE));
QIcon icon(Application::resourcesPath() + CLOSE_BUTTON_ICON);
_closeButton->setIcon(icon);
_closeButton->setFlat(true);
_addressLayout->addWidget(_closeButton, 0, Qt::AlignRight);
connect(goButton, &QPushButton::clicked, this, &AddressBarDialog::accept); _verticalLayout->addLayout(_addressLayout);
connect(closeButton, &QPushButton::clicked, this, &QDialog::close);
connect(_goButton, &QPushButton::clicked, this, &AddressBarDialog::accept);
connect(_closeButton, &QPushButton::clicked, this, &QDialog::close);
}
void AddressBarDialog::showEvent(QShowEvent* event) {
_goButton->setIcon(QIcon(Application::resourcesPath() + ADDRESSBAR_GO_BUTTON_ICON));
_addressLineEdit->setText(QString());
FramelessDialog::showEvent(event);
} }
void AddressBarDialog::accept() { void AddressBarDialog::accept() {
if (!addressLineEdit->text().isEmpty()) { if (!_addressLineEdit->text().isEmpty()) {
goButton->setIcon(QIcon(Application::resourcesPath() + "images/address-bar-submit-active.svg")); _goButton->setIcon(QIcon(Application::resourcesPath() + ADDRESSBAR_GO_BUTTON_ACTIVE_ICON));
AddressManager& addressManager = AddressManager::getInstance(); AddressManager& addressManager = AddressManager::getInstance();
connect(&addressManager, &AddressManager::lookupResultsFinished, this, &QDialog::close); connect(&addressManager, &AddressManager::lookupResultsFinished, this, &QDialog::hide);
addressManager.handleLookupString(addressLineEdit->text()); addressManager.handleLookupString(_addressLineEdit->text());
} }
} }

18
interface/src/ui/AddressBarDialog.h
View file

@ -19,7 +19,6 @@
#include <QSpacerItem> #include <QSpacerItem>
#include <QVBoxLayout> #include <QVBoxLayout>
class AddressBarDialog : public FramelessDialog { class AddressBarDialog : public FramelessDialog {
Q_OBJECT Q_OBJECT
@ -28,15 +27,16 @@ public:
private: private:
void setupUI(); void setupUI();
void showEvent(QShowEvent* event);
QVBoxLayout *verticalLayout; QVBoxLayout *_verticalLayout;
QHBoxLayout *addressLayout; QHBoxLayout *_addressLayout;
QSpacerItem *leftSpacer; QSpacerItem *_leftSpacer;
QLineEdit *addressLineEdit; QSpacerItem *_rightSpacer;
QSpacerItem *buttonSpacer; QSpacerItem *_buttonSpacer;
QPushButton *goButton; QPushButton *_goButton;
QSpacerItem *rightSpacer; QPushButton *_closeButton;
QPushButton *closeButton; QLineEdit *_addressLineEdit;
private slots: private slots:
void accept(); void accept();