Showing the changes to interface/src/Menu.cpp (1 of 65 files). Show all
Unified · Split
| @@ -635,11 +635,6 @@ Menu::Menu() : · 634 unmodified lines | ||
| 635 | 635 | |
| 636 | 636 | connect(appInstance->getAudio(), SIGNAL(muteToggled()), this, SLOT(audioMuteToggled())); |
| 637 | 637 | |
| 638 | − addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel, | |
| 639 | − Qt::CTRL | Qt::SHIFT | Qt::Key_V, | |
| 640 | − this, | |
| 641 | − SLOT(pasteToVoxel())); | |
| 642 | − | |
| 643 | 638 | #ifndef Q_OS_MAC |
| 644 | 639 | QMenu* helpMenu = addMenu("Help"); |
| 645 | 640 | QAction* helpAction = helpMenu->addAction(MenuOption::AboutApp); |
| @@ -1259,33 +1254,6 @@ void Menu::nameLocation() { · 613 unmodified lines | ||
| 1259 | 1254 | _newLocationDialog->showNormal(); |
| 1260 | 1255 | } |
| 1261 | 1256 | |
| 1262 | −void Menu::pasteToVoxel() { | |
| 1263 | − QInputDialog pasteToOctalCodeDialog(Application::getInstance()->getWindow()); | |
| 1264 | − pasteToOctalCodeDialog.setWindowTitle("Paste to Voxel"); | |
| 1265 | − pasteToOctalCodeDialog.setLabelText("Octal Code:"); | |
| 1266 | − QString octalCode = ""; | |
| 1267 | − pasteToOctalCodeDialog.setTextValue(octalCode); | |
| 1268 | − pasteToOctalCodeDialog.setWindowFlags(Qt::Sheet); | |
| 1269 | − pasteToOctalCodeDialog.resize(pasteToOctalCodeDialog.parentWidget()->size().width() * DIALOG_RATIO_OF_WINDOW, | |
| 1270 | − pasteToOctalCodeDialog.size().height()); | |
| 1271 | − | |
| 1272 | − int dialogReturn = pasteToOctalCodeDialog.exec(); | |
| 1273 | − if (dialogReturn == QDialog::Accepted && !pasteToOctalCodeDialog.textValue().isEmpty()) { | |
| 1274 | − // we got an octalCode to paste to... | |
| 1275 | − QString locationToPaste = pasteToOctalCodeDialog.textValue(); | |
| 1276 | − unsigned char* octalCodeDestination = hexStringToOctalCode(locationToPaste); | |
| 1277 | − | |
| 1278 | − // check to see if it was a legit octcode... | |
| 1279 | − if (locationToPaste == octalCodeToHexString(octalCodeDestination)) { | |
| 1280 | − Application::getInstance()->pasteVoxelsToOctalCode(octalCodeDestination); | |
| 1281 | − } else { | |
| 1282 | − qDebug() << "Problem with octcode..."; | |
| 1283 | − } | |
| 1284 | − } | |
| 1285 | − | |
| 1286 | − sendFakeEnterEvent(); | |
| 1287 | −} | |
| 1288 | − | |
| 1289 | 1257 | void Menu::toggleLoginMenuItem() { |
| 1290 | 1258 | AccountManager& accountManager = AccountManager::getInstance(); |
| 1291 | 1259 | |