eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-17 04:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop

Browse Source
This commit is contained in:
Alexandre Quessy
2016-12-28 14:25:22 -05:00
parent 995a0d6edb c5f916281f
commit d2c8ad65ab
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MainWindow.cpp
View File

@@ -1814,7 +1814,7 @@ void MainWindow::createActions()
displayTestSignalAction = new QAction(tr("Show &Test Signal"), this);
displayTestSignalAction->setShortcut(Qt::ALT + Qt::Key_T);
displayTestSignalAction->setIcon(QIcon(":/control-points"));
displayTestSignalAction->setIcon(QIcon(":/toggle-test-signal"));
displayTestSignalAction->setToolTip(tr("Show Test signal"));
displayTestSignalAction->setIconVisibleInMenu(false);
displayTestSignalAction->setCheckable(true);

58
PreferenceDialog.cpp
View File

@@ -211,16 +211,16 @@ void PreferenceDialog::createMappingPage()
vertexGroupBox->setLayout(vertexLayout);
// Shape
QGroupBox *shapeGroupBox = new QGroupBox(tr("Shape"));
// Mapping
QGroupBox *layerGroupBox = new QGroupBox(tr("Layers"));
// // Shape
// QGroupBox *shapeGroupBox = new QGroupBox(tr("Shape"));
//
// // Mapping
// QGroupBox *layerGroupBox = new QGroupBox(tr("Layers"));
QVBoxLayout *pageLayout = new QVBoxLayout;
pageLayout->addWidget(vertexGroupBox);
pageLayout->addWidget(shapeGroupBox);
pageLayout->addWidget(layerGroupBox);
// pageLayout->addWidget(shapeGroupBox);
// pageLayout->addWidget(layerGroupBox);
_mappingPage->setLayout(pageLayout);
}
@@ -280,29 +280,29 @@ void PreferenceDialog::createControlsPage()
QRegExpValidator *ipValidator = new QRegExpValidator(rx);
QMargins margins(40, 0, 0, 0);
_sendMessageBox = new QCheckBox;
_sendMessageBox->setFont(bold);
_sendMessageBox->setText(tr("Send OSC messages"));
_sendMessageBox->setEnabled(false); // Disable until supported
_sendAddressEdit = new QLineEdit;
_sendAddressEdit->setValidator(ipValidator);
_sendAddressEdit->setEnabled(false); // Disable until supported
_sendPortNumber = new QSpinBox;
_sendPortNumber->setRange(1024, 65534);
_sendPortNumber->setFixedWidth(120);
_sendPortNumber->setEnabled(false); // Disable until supported
QFormLayout *sendMessageForm = new QFormLayout;
sendMessageForm->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint);
sendMessageForm->setContentsMargins(margins);
sendMessageForm->addRow(tr("to machine"), _sendAddressEdit);
sendMessageForm->addRow(tr("at port"), _sendPortNumber);
// _sendMessageBox = new QCheckBox;
// _sendMessageBox->setFont(bold);
// _sendMessageBox->setText(tr("Send OSC messages"));
// _sendMessageBox->setEnabled(false); // Disable until supported
//
// _sendAddressEdit = new QLineEdit;
// _sendAddressEdit->setValidator(ipValidator);
// _sendAddressEdit->setEnabled(false); // Disable until supported
//
// _sendPortNumber = new QSpinBox;
// _sendPortNumber->setRange(1024, 65534);
// _sendPortNumber->setFixedWidth(120);
// _sendPortNumber->setEnabled(false); // Disable until supported
//
// QFormLayout *sendMessageForm = new QFormLayout;
// sendMessageForm->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint);
// sendMessageForm->setContentsMargins(margins);
// sendMessageForm->addRow(tr("to machine"), _sendAddressEdit);
// sendMessageForm->addRow(tr("at port"), _sendPortNumber);
_listenMessageBox = new QCheckBox;
_listenMessageBox->setFont(bold);
_listenMessageBox->setText(tr("Listen OSC messages"));
_listenMessageBox->setText(tr("Listen to OSC messages"));
_listenMessageBox->setChecked(true); // TODO: Give the choice to the user
_listenPortNumber = new QSpinBox;
@@ -327,8 +327,8 @@ void PreferenceDialog::createControlsPage()
listenAddressForm->addRow(tr("Local IP"), listenAddressLayout);
QVBoxLayout *oscLayout = new QVBoxLayout;
oscLayout->addWidget(_sendMessageBox, 1);
oscLayout->addLayout(sendMessageForm, 4);
// oscLayout->addWidget(_sendMessageBox, 1);
// oscLayout->addLayout(sendMessageForm, 4);
oscLayout->addWidget(_listenMessageBox, 1);
oscLayout->addLayout(listenPortForm, 1);
oscLayout->addLayout(listenAddressForm, 3);

2
PreferenceDialog.h
View File

@@ -98,7 +98,7 @@ private:
// Controls widgets
// OSC
QWidget *_oscWidget;
QCheckBox *_sendMessageBox;
// QCheckBox *_sendMessageBox;
QCheckBox *_listenMessageBox;
QLineEdit *_sendAddressEdit;
QSpinBox *_sendPortNumber;