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

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

Browse Source 
# Conflicts:
#	MainWindow.h
This commit is contained in:
Tats
2016-03-05 22:47:33 -05:00
parent 3d58c92e97 ab9478c4c2
commit 038a0e7e55
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MainWindow.cpp
View File

@@ -1740,12 +1740,14 @@ void MainWindow::createActions()
outputFullScreenAction->setCheckable(true);
// Don't be displayed by default
outputFullScreenAction->setChecked(false);
outputFullScreenAction->setEnabled(QApplication::desktop()->screenCount() > 1);
outputFullScreenAction->setShortcutContext(Qt::ApplicationShortcut);
addAction(outputFullScreenAction);
// Manage fullscreen/modal show of GL output window.
connect(outputFullScreenAction, SIGNAL(toggled(bool)), outputWindow, SLOT(setFullScreen(bool)));
// When closing the GL output window or hit ESC key, uncheck the action in menu.
connect(outputWindow, SIGNAL(closed()), outputFullScreenAction, SLOT(toggle()));
connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(updateOutputAction(int)));
// Create hiden action for closing output window
QAction *closeOutput = new QAction(tr("Close output"), this);
closeOutput->setShortcut(Qt::Key_Escape);
@@ -2879,6 +2881,11 @@ int MainWindow::getItemRowFromId(const QListWidget& list, uid id)
return (-1);
}
uid MainWindow::currentMappingItemId() const
{
return mappingListModel->getItemId(currentSelectedIndex);
}
QIcon MainWindow::createColorIcon(const QColor &color) {
QPixmap pixmap(100,100);
pixmap.fill(color);
@@ -2894,10 +2901,6 @@ QIcon MainWindow::createImageIcon(const QString& filename) {
return QIcon(filename);
}
uid MainWindow::currentMappingItemId() const
{
return mappingListModel->getItemId(currentSelectedIndex);
}
void MainWindow::setCurrentPaint(int uid)
{
@@ -3000,6 +3003,14 @@ void MainWindow::pollOscInterface()
#endif
}
void MainWindow::updateOutputAction(int screen)
{
if (screen > 1)
outputFullScreenAction->setEnabled(true);
else
outputFullScreenAction->setEnabled(false);
}
// void MainWindow::applyOscCommand(const QVariantList& command)
// {
// bool VERBOSE = true;