mirror of
https://github.com/holub/mame
synced 2025-07-04 17:38:08 +03:00
fixed qt build (nw)
This commit is contained in:
parent
e8512cb57b
commit
a23a0abc76
@ -46,9 +46,9 @@ void DeviceInformationWindow::fill_device_information()
|
|||||||
gl1->addWidget(new QLabel(QString("Tag"), primaryFrame), 0, 0);
|
gl1->addWidget(new QLabel(QString("Tag"), primaryFrame), 0, 0);
|
||||||
gl1->addWidget(new QLabel(QString(m_device->tag().c_str()), primaryFrame), 0, 1);
|
gl1->addWidget(new QLabel(QString(m_device->tag().c_str()), primaryFrame), 0, 1);
|
||||||
gl1->addWidget(new QLabel(QString("Name"), primaryFrame), 1, 0);
|
gl1->addWidget(new QLabel(QString("Name"), primaryFrame), 1, 0);
|
||||||
gl1->addWidget(new QLabel(QString(m_device->name()), primaryFrame), 1, 1);
|
gl1->addWidget(new QLabel(QString(m_device->name().c_str()), primaryFrame), 1, 1);
|
||||||
gl1->addWidget(new QLabel(QString("Shortname"), primaryFrame), 2, 0);
|
gl1->addWidget(new QLabel(QString("Shortname"), primaryFrame), 2, 0);
|
||||||
gl1->addWidget(new QLabel(QString(m_device->shortname()), primaryFrame), 2, 1);
|
gl1->addWidget(new QLabel(QString(m_device->shortname().c_str()), primaryFrame), 2, 1);
|
||||||
|
|
||||||
int cpos = 3;
|
int cpos = 3;
|
||||||
device_interface *intf = m_device->first_interface();
|
device_interface *intf = m_device->first_interface();
|
||||||
|
@ -19,8 +19,8 @@ QVariant DevicesWindowModel::data(const QModelIndex &index, int role) const
|
|||||||
|
|
||||||
device_t *dev = static_cast<device_t *>(index.internalPointer());
|
device_t *dev = static_cast<device_t *>(index.internalPointer());
|
||||||
switch(index.column()) {
|
switch(index.column()) {
|
||||||
case 0: return dev == &m_machine->root_device() ? QString("<root>") : QString(dev->basetag());
|
case 0: return dev == &m_machine->root_device() ? QString("<root>") : QString(dev->basetag().c_str());
|
||||||
case 1: return QString(dev->name());
|
case 1: return QString(dev->name().c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
return QVariant();
|
return QVariant();
|
||||||
|
@ -145,7 +145,7 @@ void MainWindow::setProcessor(device_t* processor)
|
|||||||
|
|
||||||
// Window title
|
// Window title
|
||||||
std::string title;
|
std::string title;
|
||||||
strprintf(title,"Debug: %s - %s '%s'", m_machine->system().name, processor->name(), processor->tag().c_str());
|
strprintf(title,"Debug: %s - %s '%s'", m_machine->system().name, processor->name().c_str(), processor->tag().c_str());
|
||||||
setWindowTitle(title.c_str());
|
setWindowTitle(title.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -476,10 +476,10 @@ void MainWindow::createImagesMenu()
|
|||||||
for (device_image_interface *img = iter.first(); img != NULL; img = iter.next())
|
for (device_image_interface *img = iter.first(); img != NULL; img = iter.next())
|
||||||
{
|
{
|
||||||
std::string menuName;
|
std::string menuName;
|
||||||
strprintf(menuName,"%s : %s", img->device().name(), img->exists() ? img->filename() : "[empty slot]");
|
strprintf(menuName,"%s : %s", img->device().name().c_str(), img->exists() ? img->filename() : "[empty slot]");
|
||||||
|
|
||||||
QMenu* interfaceMenu = imagesMenu->addMenu(menuName.c_str());
|
QMenu* interfaceMenu = imagesMenu->addMenu(menuName.c_str());
|
||||||
interfaceMenu->setObjectName(img->device().name());
|
interfaceMenu->setObjectName(img->device().name().c_str());
|
||||||
|
|
||||||
QAction* mountAct = new QAction("Mount...", interfaceMenu);
|
QAction* mountAct = new QAction("Mount...", interfaceMenu);
|
||||||
QAction* unmountAct = new QAction("Unmount", interfaceMenu);
|
QAction* unmountAct = new QAction("Unmount", interfaceMenu);
|
||||||
|
Loading…
Reference in New Issue
Block a user