Showing the changes to interface/src/Menu.cpp (1 of 7 files). Show all
Unified · Split
| @@ -173,7 +173,7 @@ Menu::Menu() : · 172 unmodified lines | |||
| 173 | SLOT(toggleLocationList())); | 173 | SLOT(toggleLocationList())); |
| 174 | addActionToQMenuAndActionHash(fileMenu, | 174 | addActionToQMenuAndActionHash(fileMenu, |
| 175 | MenuOption::AddressBar, | 175 | MenuOption::AddressBar, |
| 176 | Qt::CTRL | Qt::Key_Enter, | 176 | Qt::Key_Enter, |
| 177 | this, | 177 | this, |
| 178 | SLOT(toggleAddressBar())); | 178 | SLOT(toggleAddressBar())); |
| 179 | 179 | ||
| @@ -1154,22 +1154,10 @@ void Menu::changePrivateKey() { · 974 unmodified lines | |||
| 1154 | } | 1154 | } |
| 1155 | 1155 | ||
| 1156 | void Menu::toggleAddressBar() { | 1156 | void Menu::toggleAddressBar() { |
| 1157 | 1157 | if (!_addressBarDialog) { | |
| 1158 | QInputDialog addressBarDialog(Application::getInstance()->getWindow()); | 1158 | _addressBarDialog = new AddressBarDialog(); |
| 1159 | addressBarDialog.setWindowTitle("Address Bar"); | 1159 | _addressBarDialog->show(); |
| 1160 | addressBarDialog.setWindowFlags(Qt::Sheet); | ||
| 1161 | addressBarDialog.setLabelText("place, domain, @user, example.com, /position/orientation"); | ||
| 1162 | |||
| 1163 | addressBarDialog.resize(addressBarDialog.parentWidget()->size().width() * DIALOG_RATIO_OF_WINDOW, | ||
| 1164 | addressBarDialog.size().height()); | ||
| 1165 | |||
| 1166 | int dialogReturn = addressBarDialog.exec(); | ||
| 1167 | if (dialogReturn == QDialog::Accepted && !addressBarDialog.textValue().isEmpty()) { | ||
| 1168 | // let the AddressManger figure out what to do with this | ||
| 1169 | AddressManager::getInstance().handleLookupString(addressBarDialog.textValue()); | ||
| 1170 | } | 1160 | } |
| 1171 | |||
| 1172 | sendFakeEnterEvent(); | ||
| 1173 | } | 1161 | } |
| 1174 | 1162 | ||
| 1175 | void Menu::displayAddressOfflineMessage() { | 1163 | void Menu::displayAddressOfflineMessage() { |