History

replaced Application::resourcesPath() with PathUtils::resourcesPath()

ZappoMan committed 11 years ago

Commit bfcc78c1 parent 753dc0729 files · +194 −124Browse files

Showing the changes to interface/src/ui/AddressBarDialog.cpp (1 of 29 files). Show all

Unified · Split

interface/src/ui/AddressBarDialog.cpp+6−4
@@ -9,6 +9,8 @@ · 8 unmodified lines
9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
10//10//
11 11
12#include <PathUtils.h>
13
12#include "AddressBarDialog.h"14#include "AddressBarDialog.h"
13#include "AddressManager.h"15#include "AddressManager.h"
14#include "Application.h"16#include "Application.h"
@@ -82,7 +84,7 @@ void AddressBarDialog::setupUI() { · 67 unmodified lines
82 _goButton->setSizePolicy(sizePolicy);84 _goButton->setSizePolicy(sizePolicy);
83 _goButton->setMinimumSize(QSize(GO_BUTTON_SIZE, GO_BUTTON_SIZE));85 _goButton->setMinimumSize(QSize(GO_BUTTON_SIZE, GO_BUTTON_SIZE));
84 _goButton->setMaximumSize(QSize(GO_BUTTON_SIZE, GO_BUTTON_SIZE));86 _goButton->setMaximumSize(QSize(GO_BUTTON_SIZE, GO_BUTTON_SIZE));
85 _goButton->setIcon(QIcon(Application::resourcesPath() + ADDRESSBAR_GO_BUTTON_ICON));87 _goButton->setIcon(QIcon(PathUtils::resourcesPath() + ADDRESSBAR_GO_BUTTON_ICON));
86 _goButton->setIconSize(QSize(GO_BUTTON_SIZE, GO_BUTTON_SIZE));88 _goButton->setIconSize(QSize(GO_BUTTON_SIZE, GO_BUTTON_SIZE));
87 _goButton->setDefault(true);89 _goButton->setDefault(true);
88 _goButton->setFlat(true);90 _goButton->setFlat(true);
@@ -99,7 +101,7 @@ void AddressBarDialog::setupUI() { · 10 unmodified lines
99 _closeButton->setSizePolicy(sizePolicy);101 _closeButton->setSizePolicy(sizePolicy);
100 _closeButton->setMinimumSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE));102 _closeButton->setMinimumSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE));
101 _closeButton->setMaximumSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE));103 _closeButton->setMaximumSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE));
102 QIcon icon(Application::resourcesPath() + CLOSE_BUTTON_ICON);104 QIcon icon(PathUtils::resourcesPath() + CLOSE_BUTTON_ICON);
103 _closeButton->setIcon(icon);105 _closeButton->setIcon(icon);
104 _closeButton->setIconSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE));106 _closeButton->setIconSize(QSize(CLOSE_BUTTON_SIZE, CLOSE_BUTTON_SIZE));
105 _closeButton->setFlat(true);107 _closeButton->setFlat(true);
@@ -112,7 +114,7 @@ void AddressBarDialog::setupUI() { · 6 unmodified lines
112}114}
113 115
114void AddressBarDialog::showEvent(QShowEvent* event) {116void AddressBarDialog::showEvent(QShowEvent* event) {
115 _goButton->setIcon(QIcon(Application::resourcesPath() + ADDRESSBAR_GO_BUTTON_ICON));117 _goButton->setIcon(QIcon(PathUtils::resourcesPath() + ADDRESSBAR_GO_BUTTON_ICON));
116 _addressLineEdit->setText(QString());118 _addressLineEdit->setText(QString());
117 _addressLineEdit->setFocus();119 _addressLineEdit->setFocus();
118 FramelessDialog::showEvent(event);120 FramelessDialog::showEvent(event);
@@ -120,7 +122,7 @@ void AddressBarDialog::showEvent(QShowEvent* event) { · 1 unmodified line
120 122
121void AddressBarDialog::accept() {123void AddressBarDialog::accept() {
122 if (!_addressLineEdit->text().isEmpty()) {124 if (!_addressLineEdit->text().isEmpty()) {
123 _goButton->setIcon(QIcon(Application::resourcesPath() + ADDRESSBAR_GO_BUTTON_ACTIVE_ICON));125 _goButton->setIcon(QIcon(PathUtils::resourcesPath() + ADDRESSBAR_GO_BUTTON_ACTIVE_ICON));
124 AddressManager& addressManager = AddressManager::getInstance();126 AddressManager& addressManager = AddressManager::getInstance();
125 connect(&addressManager, &AddressManager::lookupResultsFinished, this, &QDialog::hide);127 connect(&addressManager, &AddressManager::lookupResultsFinished, this, &QDialog::hide);
126 addressManager.handleLookupString(_addressLineEdit->text());128 addressManager.handleLookupString(_addressLineEdit->text());