Resolved issue #355. Change Measurements 'Create new' to 'Create/Edit'.
--HG-- branch : develop
This commit is contained in:
parent
ef45bf2a94
commit
516c3eaa8f
|
@ -315,7 +315,7 @@ void TMainWindow::OpenIndividual()
|
||||||
{
|
{
|
||||||
if (m == nullptr)
|
if (m == nullptr)
|
||||||
{
|
{
|
||||||
const QString filter = tr("Individual measurements (*.vit);;Standard measurements (*.vst)");
|
const QString filter = tr("Individual measurements (*.vit);;Standard measurements (*.vst);;All files (*.*)");
|
||||||
//Use standard path to individual measurements
|
//Use standard path to individual measurements
|
||||||
const QString pathTo = qApp->TapeSettings()->GetPathIndividualMeasurements();
|
const QString pathTo = qApp->TapeSettings()->GetPathIndividualMeasurements();
|
||||||
Open(pathTo, filter);
|
Open(pathTo, filter);
|
||||||
|
@ -332,8 +332,8 @@ void TMainWindow::OpenStandard()
|
||||||
{
|
{
|
||||||
if (m == nullptr)
|
if (m == nullptr)
|
||||||
{
|
{
|
||||||
const QString filter = tr("Standard measurements (*.vst);;Individual measurements (*.vit)");
|
const QString filter = tr("Standard measurements (*.vst);;Individual measurements (*.vit);;All files (*.*)");
|
||||||
//Use standard path to individual measurements
|
//Use standard path to standard measurements
|
||||||
const QString pathTo = qApp->TapeSettings()->GetPathStandardMeasurements();
|
const QString pathTo = qApp->TapeSettings()->GetPathStandardMeasurements();
|
||||||
Open(pathTo, filter);
|
Open(pathTo, filter);
|
||||||
}
|
}
|
||||||
|
@ -349,8 +349,8 @@ void TMainWindow::OpenTemplate()
|
||||||
{
|
{
|
||||||
if (m == nullptr)
|
if (m == nullptr)
|
||||||
{
|
{
|
||||||
const QString filter = tr("Measurements (*.vst, *.vit)");
|
const QString filter = tr("Measurements (*.vst *.vit);;All files (*.*)");
|
||||||
//Use standard path to individual measurements
|
//Use standard path to template files
|
||||||
const QString pathTo = qApp->TapeSettings()->GetPathTemplate();
|
const QString pathTo = qApp->TapeSettings()->GetPathTemplate();
|
||||||
Open(pathTo, filter);
|
Open(pathTo, filter);
|
||||||
}
|
}
|
||||||
|
|
|
@ -645,6 +645,7 @@
|
||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
</attribute>
|
</attribute>
|
||||||
<addaction name="actionNew"/>
|
<addaction name="actionNew"/>
|
||||||
|
<addaction name="actionOpenIndividual"/>
|
||||||
<addaction name="actionSave"/>
|
<addaction name="actionSave"/>
|
||||||
<addaction name="actionAddKnown"/>
|
<addaction name="actionAddKnown"/>
|
||||||
<addaction name="actionAddCustom"/>
|
<addaction name="actionAddCustom"/>
|
||||||
|
@ -673,7 +674,7 @@
|
||||||
</widget>
|
</widget>
|
||||||
<action name="actionOpenIndividual">
|
<action name="actionOpenIndividual">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset theme="document-open">
|
||||||
<normaloff/>
|
<normaloff/>
|
||||||
</iconset>
|
</iconset>
|
||||||
</property>
|
</property>
|
||||||
|
@ -782,11 +783,17 @@
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionOpenStandard">
|
<action name="actionOpenStandard">
|
||||||
|
<property name="icon">
|
||||||
|
<iconset theme="document-open"/>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Open standard ...</string>
|
<string>Open standard ...</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionOpenTemplate">
|
<action name="actionOpenTemplate">
|
||||||
|
<property name="icon">
|
||||||
|
<iconset theme="document-open"/>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Open template</string>
|
<string>Open template</string>
|
||||||
</property>
|
</property>
|
||||||
|
|
|
@ -372,7 +372,7 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>130</width>
|
<width>100</width>
|
||||||
<height>58</height>
|
<height>58</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
|
@ -458,7 +458,7 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>130</width>
|
<width>100</width>
|
||||||
<height>156</height>
|
<height>156</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
|
@ -622,7 +622,7 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>130</width>
|
<width>100</width>
|
||||||
<height>196</height>
|
<height>196</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
|
@ -864,7 +864,7 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>130</width>
|
<width>100</width>
|
||||||
<height>58</height>
|
<height>58</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
|
@ -950,8 +950,8 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>130</width>
|
<width>98</width>
|
||||||
<height>386</height>
|
<height>58</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<attribute name="icon">
|
<attribute name="icon">
|
||||||
|
@ -1878,10 +1878,10 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="actionCreateNew">
|
<action name="actionCreateNew">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Create new ...</string>
|
<string>Create/Edit</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Create new measurements</string>
|
<string>Create/edit measurements</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionShowM">
|
<action name="actionShowM">
|
||||||
|
@ -1920,8 +1920,8 @@
|
||||||
<tabstop>toolButtonSplinePath</tabstop>
|
<tabstop>toolButtonSplinePath</tabstop>
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources>
|
<resources>
|
||||||
<include location="../../libs/vmisc/share/resources/icon.qrc"/>
|
|
||||||
<include location="share/resources/toolicon.qrc"/>
|
<include location="share/resources/toolicon.qrc"/>
|
||||||
|
<include location="../../libs/vmisc/share/resources/icon.qrc"/>
|
||||||
</resources>
|
</resources>
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user