comparison: src/primitives.cpp
src/primitives.cpp
- changeset 970
- c8aae45afd85
- parent 969
- b1742ee91d5b
- child 971
- c00f9665a9f8
equal
deleted
inserted
replaced
| 969:b1742ee91d5b | 970:c8aae45afd85 |
|---|---|
| 30 QList<PrimitiveCategory*> g_PrimitiveCategories; | 30 QList<PrimitiveCategory*> g_PrimitiveCategories; |
| 31 QList<Primitive> g_primitives; | 31 QList<Primitive> g_primitives; |
| 32 static PrimitiveScanner* g_activeScanner = null; | 32 static PrimitiveScanner* g_activeScanner = null; |
| 33 PrimitiveCategory* g_unmatched = null; | 33 PrimitiveCategory* g_unmatched = null; |
| 34 | 34 |
| 35 EXTERN_CFGENTRY (String, DefaultName) | |
| 36 EXTERN_CFGENTRY (String, DefaultUser) | |
| 37 EXTERN_CFGENTRY (Int, DefaultLicense) | |
| 38 | |
| 39 static const QStringList g_radialNameRoots = | 35 static const QStringList g_radialNameRoots = |
| 40 { | 36 { |
| 41 "edge", | 37 "edge", |
| 42 "cyli", | 38 "cyli", |
| 43 "disc", | 39 "disc", |
| 620 f->setDefaultName (name); | 616 f->setDefaultName (name); |
| 621 | 617 |
| 622 QString author = APPNAME; | 618 QString author = APPNAME; |
| 623 QString license = ""; | 619 QString license = ""; |
| 624 | 620 |
| 625 if (not cfg::DefaultName.isEmpty()) | 621 if (not g_win->configBag()->defaultName.isEmpty()) |
| 626 { | 622 { |
| 627 license = PreferredLicenseText(); | 623 license = PreferredLicenseText(); |
| 628 author = format ("%1 [%2]", cfg::DefaultName, cfg::DefaultUser); | 624 author = format ("%1 [%2]", g_win->configBag()->defaultName, g_win->configBag()->defaultUser); |
| 629 } | 625 } |
| 630 | 626 |
| 631 LDObjectList objs; | 627 LDObjectList objs; |
| 632 | 628 |
| 633 objs << LDSpawn<LDComment> (descr) | 629 objs << LDSpawn<LDComment> (descr) |
