rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00
Code Issues Releases Activity

OP-202 Cleaned up the 'File' menu and removed (commented out) the entries which are not doing anything. "Save All" now saves the current GCS config so that everything is not lost in case of a crash. Easy to revert in case you don't like it. Also:

Browse Source 
moved the logging menu entries to 'tools' where I think they belong - comments welcome - and also small change to iconnection.h to remove compile-time warnings.



git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2120 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2010-11-14 14:58:16 +00:00 committed by edouard
parent 213e582f56
commit c463abab93
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/src/plugins/coreplugin/iconnection.h
View File

@ -58,7 +58,7 @@ public:
*/
virtual QIODevice *openDevice(const QString &deviceName) = 0;
virtual void closeDevice(const QString &deviceName) {};
virtual void closeDevice(const QString &deviceName) { Q_UNUSED(deviceName) };
/**
* Connection type name "USB HID"

26
ground/src/plugins/coreplugin/mainwindow.cpp
View File

@ -474,7 +474,6 @@ void MainWindow::registerDefaultActions()
// Help menu separators
// Return to editor shortcut: Note this requires Qt to fix up
// handling of shortcut overrides in menus, item views, combos....
m_focusToEditor = new QShortcut(this);
@ -483,30 +482,39 @@ void MainWindow::registerDefaultActions()
connect(m_focusToEditor, SIGNAL(activated()), this, SLOT(setFocusToEditor()));
// New File Action
/*
m_newAction = new QAction(QIcon(Constants::ICON_NEWFILE), tr("&New File or Project..."), this);
cmd = am->registerAction(m_newAction, Constants::NEW, m_globalContext);
cmd->setDefaultKeySequence(QKeySequence::New);
mfile->addAction(cmd, Constants::G_FILE_NEW);
connect(m_newAction, SIGNAL(triggered()), this, SLOT(newFile()));
*/
// Open Action
/*
m_openAction = new QAction(QIcon(Constants::ICON_OPENFILE), tr("&Open File or Project..."), this);
cmd = am->registerAction(m_openAction, Constants::OPEN, m_globalContext);
cmd->setDefaultKeySequence(QKeySequence::Open);
mfile->addAction(cmd, Constants::G_FILE_OPEN);
connect(m_openAction, SIGNAL(triggered()), this, SLOT(openFile()));
*/
// Open With Action
/*
m_openWithAction = new QAction(tr("&Open File With..."), this);
cmd = am->registerAction(m_openWithAction, Constants::OPEN_WITH, m_globalContext);
mfile->addAction(cmd, Constants::G_FILE_OPEN);
connect(m_openWithAction, SIGNAL(triggered()), this, SLOT(openFileWith()));
*/
// File->Recent Files Menu
// File->Recent Files Menu
/*
ActionContainer *ac = am->createMenu(Constants::M_FILE_RECENTFILES);
mfile->addMenu(ac, Constants::G_FILE_OPEN);
ac->menu()->setTitle(tr("Recent Files"));
*/
/*
// Save Action
QAction *tmpaction = new QAction(QIcon(Constants::ICON_SAVEFILE), tr("&Save"), this);
cmd = am->registerAction(tmpaction, Constants::SAVE, m_globalContext);
@ -524,6 +532,7 @@ void MainWindow::registerDefaultActions()
cmd->setAttribute(Command::CA_UpdateText);
cmd->setDefaultText(tr("Save &As..."));
mfile->addAction(cmd, Constants::G_FILE_SAVE);
*/
// SaveAll Action
m_saveAllAction = new QAction(tr("Save A&ll"), this);
@ -542,7 +551,7 @@ void MainWindow::registerDefaultActions()
connect(m_exitAction, SIGNAL(triggered()), this, SLOT(exit()));
// Undo Action
tmpaction = new QAction(QIcon(Constants::ICON_UNDO), tr("&Undo"), this);
QAction *tmpaction = new QAction(QIcon(Constants::ICON_UNDO), tr("&Undo"), this);
cmd = am->registerAction(tmpaction, Constants::UNDO, m_globalContext);
cmd->setDefaultKeySequence(QKeySequence::Undo);
cmd->setAttribute(Command::CA_UpdateText);
@ -734,6 +743,7 @@ bool MainWindow::showOptionsDialog(const QString &category,
void MainWindow::saveAll()
{
emit m_coreImpl->saveSettingsRequested();
saveSettings(); // OpenPilot-specific.
}
void MainWindow::exit()
@ -1074,11 +1084,13 @@ void MainWindow::aboutToShowRecentFiles()
{
ActionContainer *aci =
m_actionManager->actionContainer(Constants::M_FILE_RECENTFILES);
aci->menu()->clear();
if (aci) {
aci->menu()->clear();
bool hasRecentFiles = false;
bool hasRecentFiles = false;
aci->menu()->setEnabled(hasRecentFiles);
aci->menu()->setEnabled(hasRecentFiles);
}
}
void MainWindow::openRecentFile()