Use qt-designer to setup action slots.
Their are slots that are automatically connected when a .ui file is compiled. I have changed New, Save, SaveAs, and Open to use that method for connecting the slots. Also, I added Ctrl-O as a shortcut for Open while I was in there. --HG-- branch : develop
This commit is contained in:
parent
13237ffd83
commit
3979d0e9db
|
@ -2668,10 +2668,10 @@ void MainWindow::ActionLayout(bool checked)
|
|||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* @brief SaveAs save as pattern file.
|
||||
* @brief on_actionSaveAs_triggered save as pattern file.
|
||||
* @return true for successes saving.
|
||||
*/
|
||||
bool MainWindow::SaveAs()
|
||||
bool MainWindow::on_actionSaveAs_triggered()
|
||||
{
|
||||
const QString oldFilePath = qApp->GetPatternPath();
|
||||
QString filters(tr("Pattern files") + QLatin1String("(*.val)"));
|
||||
|
@ -2792,14 +2792,14 @@ bool MainWindow::SaveAs()
|
|||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* @brief Save save pattern file.
|
||||
* @brief on_actionSave_triggered save pattern file.
|
||||
* @return true for successes saving.
|
||||
*/
|
||||
bool MainWindow::Save()
|
||||
bool MainWindow::on_actionSave_triggered()
|
||||
{
|
||||
if (qApp->GetPatternPath().isEmpty() || patternReadOnly)
|
||||
{
|
||||
return SaveAs();
|
||||
return on_actionSaveAs_triggered();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -2878,9 +2878,9 @@ bool MainWindow::Save()
|
|||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* @brief Open ask user select pattern file.
|
||||
* @brief on_actionOpen_triggered ask user select pattern file.
|
||||
*/
|
||||
void MainWindow::Open()
|
||||
void MainWindow::on_actionOpen_triggered()
|
||||
{
|
||||
qCDebug(vMainWindow, "Openning new file.");
|
||||
const QString filter(tr("Pattern files") + QLatin1String(" (*.val)"));
|
||||
|
@ -3394,9 +3394,9 @@ void MainWindow::UpdateSizesList(const QStringList &list)
|
|||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* @brief NewPattern create new empty pattern.
|
||||
* @brief on_actionNew_triggered create new empty pattern.
|
||||
*/
|
||||
void MainWindow::New()
|
||||
void MainWindow::on_actionNew_triggered()
|
||||
{
|
||||
if (comboBoxDraws->count() == 0)
|
||||
{
|
||||
|
@ -3859,11 +3859,11 @@ bool MainWindow::MaybeSave()
|
|||
case QMessageBox::Yes:
|
||||
if (patternReadOnly)
|
||||
{
|
||||
return SaveAs();
|
||||
return on_actionSaveAs_triggered();
|
||||
}
|
||||
else
|
||||
{
|
||||
return Save();
|
||||
return on_actionSave_triggered();
|
||||
}
|
||||
case QMessageBox::No:
|
||||
return true;
|
||||
|
@ -4253,10 +4253,6 @@ void MainWindow::CreateActions()
|
|||
AddPP(patternPieceName);
|
||||
});
|
||||
|
||||
connect(ui->actionSaveAs, &QAction::triggered, this, &MainWindow::SaveAs);
|
||||
connect(ui->actionSave, &QAction::triggered, this, &MainWindow::Save);
|
||||
connect(ui->actionOpen, &QAction::triggered, this, &MainWindow::Open);
|
||||
connect(ui->actionNew, &QAction::triggered, this, &MainWindow::New);
|
||||
connect(ui->actionExportIncrementsToCSV, &QAction::triggered, this, &MainWindow::ExportDataToCSV);
|
||||
connect(ui->actionExportFinalMeasurementsToCSV, &QAction::triggered, this, &MainWindow::ExportFMeasurementsToCSV);
|
||||
|
||||
|
|
|
@ -178,10 +178,10 @@ private slots:
|
|||
void ActionDetails(bool checked);
|
||||
void ActionLayout(bool checked);
|
||||
|
||||
void New();
|
||||
bool SaveAs();
|
||||
bool Save();
|
||||
void Open();
|
||||
void on_actionNew_triggered();
|
||||
bool on_actionSaveAs_triggered();
|
||||
bool on_actionSave_triggered();
|
||||
void on_actionOpen_triggered();
|
||||
|
||||
void ClosedDialogUnionDetails(int result);
|
||||
void ClosedDialogDuplicateDetail(int result);
|
||||
|
|
|
@ -2036,7 +2036,7 @@
|
|||
<string>Open file with pattern</string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string notr="true"/>
|
||||
<string>Ctrl+O</string>
|
||||
</property>
|
||||
<property name="menuRole">
|
||||
<enum>QAction::NoRole</enum>
|
||||
|
|
Loading…
Reference in New Issue
Block a user