electron-rare/leocad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show more models in the menu. Fixes #558.

Browse Source
This commit is contained in:
Leonardo Zide
2020-12-18 16:34:11 -08:00
parent baa0a70de2
commit 1925c476d6
4 changed files with 150 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/lc_commands.cpp
+113 -1
View File
@@ -1,7 +1,7 @@
#include "lc_global.h"
#include "lc_commands.h"
lcCommand gCommands[LC_NUM_COMMANDS] =
const lcCommand gCommands[] =
{
// LC_FILE_NEW
{
@@ -1592,6 +1592,118 @@ lcCommand gCommands[LC_NUM_COMMANDS] =
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_25
{
QT_TRANSLATE_NOOP("Action", "Model.Model25"),
QT_TRANSLATE_NOOP("Menu", "Model 25"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_26
{
QT_TRANSLATE_NOOP("Action", "Model.Model26"),
QT_TRANSLATE_NOOP("Menu", "Model 26"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_27
{
QT_TRANSLATE_NOOP("Action", "Model.Model27"),
QT_TRANSLATE_NOOP("Menu", "Model 27"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_28
{
QT_TRANSLATE_NOOP("Action", "Model.Model28"),
QT_TRANSLATE_NOOP("Menu", "Model 28"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_29
{
QT_TRANSLATE_NOOP("Action", "Model.Model29"),
QT_TRANSLATE_NOOP("Menu", "Model 29"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_30
{
QT_TRANSLATE_NOOP("Action", "Model.Model30"),
QT_TRANSLATE_NOOP("Menu", "Model 30"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_31
{
QT_TRANSLATE_NOOP("Action", "Model.Model31"),
QT_TRANSLATE_NOOP("Menu", "Model 31"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_32
{
QT_TRANSLATE_NOOP("Action", "Model.Model32"),
QT_TRANSLATE_NOOP("Menu", "Model 32"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_33
{
QT_TRANSLATE_NOOP("Action", "Model.Model33"),
QT_TRANSLATE_NOOP("Menu", "Model 33"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_34
{
QT_TRANSLATE_NOOP("Action", "Model.Model34"),
QT_TRANSLATE_NOOP("Menu", "Model 34"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_35
{
QT_TRANSLATE_NOOP("Action", "Model.Model35"),
QT_TRANSLATE_NOOP("Menu", "Model 35"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_36
{
QT_TRANSLATE_NOOP("Action", "Model.Model36"),
QT_TRANSLATE_NOOP("Menu", "Model 36"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_37
{
QT_TRANSLATE_NOOP("Action", "Model.Model37"),
QT_TRANSLATE_NOOP("Menu", "Model 37"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_38
{
QT_TRANSLATE_NOOP("Action", "Model.Model38"),
QT_TRANSLATE_NOOP("Menu", "Model 38"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_39
{
QT_TRANSLATE_NOOP("Action", "Model.Model39"),
QT_TRANSLATE_NOOP("Menu", "Model 39"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_MODEL_40
{
QT_TRANSLATE_NOOP("Action", "Model.Model40"),
QT_TRANSLATE_NOOP("Menu", "Model 40"),
QT_TRANSLATE_NOOP("Status", "Switch to this submodel"),
""
},
// LC_HELP_HOMEPAGE
{
QT_TRANSLATE_NOOP("Action", "Help.HomePage"),
common/lc_commands.h
+18 -2
View File
@@ -244,7 +244,23 @@ enum lcCommandId
LC_MODEL_22,
LC_MODEL_23,
LC_MODEL_24,
LC_MODEL_LAST = LC_MODEL_24,
LC_MODEL_25,
LC_MODEL_26,
LC_MODEL_27,
LC_MODEL_28,
LC_MODEL_29,
LC_MODEL_30,
LC_MODEL_31,
LC_MODEL_32,
LC_MODEL_33,
LC_MODEL_34,
LC_MODEL_35,
LC_MODEL_36,
LC_MODEL_37,
LC_MODEL_38,
LC_MODEL_39,
LC_MODEL_40,
LC_MODEL_LAST = LC_MODEL_40,
LC_HELP_HOMEPAGE,
LC_HELP_BUG_REPORT,
LC_HELP_UPDATES,
@@ -265,7 +281,7 @@ struct lcCommand
const char* DefaultShortcut;
};
extern lcCommand gCommands[LC_NUM_COMMANDS];
extern const lcCommand gCommands[];
enum class lcTool
{
common/lc_mainwindow.cpp
+17 -1
View File
@@ -2265,7 +2265,7 @@ void lcMainWindow::UpdateModels()
if (ModelIdx < Models.GetSize())
{
Action->setChecked(CurrentModel == Models[ModelIdx]);
Action->setText(QString::fromLatin1("&%1 %2").arg(QString::number(ModelIdx + 1), Models[ModelIdx]->GetProperties().mFileName));
Action->setText(QString::fromLatin1("%1%2 %3").arg(ModelIdx < 9 ? QString("&") : QString(), QString::number(ModelIdx + 1), Models[ModelIdx]->GetProperties().mFileName));
Action->setVisible(true);
}
else
@@ -3224,6 +3224,22 @@ void lcMainWindow::HandleCommand(lcCommandId CommandId)
case LC_MODEL_22:
case LC_MODEL_23:
case LC_MODEL_24:
case LC_MODEL_25:
case LC_MODEL_26:
case LC_MODEL_27:
case LC_MODEL_28:
case LC_MODEL_29:
case LC_MODEL_30:
case LC_MODEL_31:
case LC_MODEL_32:
case LC_MODEL_33:
case LC_MODEL_34:
case LC_MODEL_35:
case LC_MODEL_36:
case LC_MODEL_37:
case LC_MODEL_38:
case LC_MODEL_39:
case LC_MODEL_40:
lcGetActiveProject()->SetActiveModel(CommandId - LC_MODEL_01);
break;
qt/lc_qmodellistdialog.ui
+2 -2
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>312</height>
<width>421</width>
<height>348</height>
</rect>
</property>
<property name="windowTitle">