kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fixes "Project Information" is Misleading #11296 - replace project with document (#11367)

Browse Source 
* project to document on information, merge, util

* change project to document in unit system dialog

---------

Co-authored-by: WandererFan <WandererFan@gmail.com>
This commit is contained in:
Max Wilfinger
2023-11-20 18:03:22 +01:00
committed by GitHub
parent caaadee0fc
commit 4bf1d1cc81
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Gui/CommandDoc.cpp
View File

@@ -517,10 +517,10 @@ StdCmdMergeProjects::StdCmdMergeProjects()
{
sAppModule = "File";
sGroup = "File";
sMenuText = QT_TR_NOOP("Merge project...");
sToolTipText = QT_TR_NOOP("Merge project");
sMenuText = QT_TR_NOOP("Merge document...");
sToolTipText = QT_TR_NOOP("Merge document");
sWhatsThis = "Std_MergeProjects";
sStatusTip = QT_TR_NOOP("Merge project");
sStatusTip = QT_TR_NOOP("Merge document");
sPixmap = "Std_MergeProjects";
}
@@ -530,7 +530,7 @@ void StdCmdMergeProjects::activated(int iMsg)
QString exe = qApp->applicationName();
QString project = FileDialog::getOpenFileName(Gui::getMainWindow(),
QString::fromUtf8(QT_TR_NOOP("Merge project")), FileDialog::getWorkingDirectory(),
QString::fromUtf8(QT_TR_NOOP("Merge document")), FileDialog::getWorkingDirectory(),
QString::fromUtf8(QT_TR_NOOP("%1 document (*.FCStd)")).arg(exe));
if (!project.isEmpty()) {
FileDialog::setWorkingDirectory(project);
@@ -539,12 +539,12 @@ void StdCmdMergeProjects::activated(int iMsg)
QFileInfo proj(project);
if (proj == info) {
QMessageBox::critical(Gui::getMainWindow(),
QString::fromUtf8(QT_TR_NOOP("Merge project")),
QString::fromUtf8(QT_TR_NOOP("Cannot merge project with itself.")));
QString::fromUtf8(QT_TR_NOOP("Merge document")),
QString::fromUtf8(QT_TR_NOOP("Cannot merge document with itself.")));
return;
}
doc->openTransaction("Merge project");
doc->openTransaction("Merge document");
Base::FileInfo fi((const char*)project.toUtf8());
Base::ifstream str(fi, std::ios::in | std::ios::binary);
MergeDocuments md(doc);
@@ -825,10 +825,10 @@ StdCmdProjectInfo::StdCmdProjectInfo()
{
// setting the
sGroup = "File";
sMenuText = QT_TR_NOOP("Project i&nformation...");
sToolTipText = QT_TR_NOOP("Show details of the currently active project");
sMenuText = QT_TR_NOOP("Document i&nformation...");
sToolTipText = QT_TR_NOOP("Show details of the currently active document");
sWhatsThis = "Std_ProjectInfo";
sStatusTip = QT_TR_NOOP("Show details of the currently active project");
sStatusTip = QT_TR_NOOP("Show details of the currently active document");
sPixmap = "document-properties";
}
@@ -856,9 +856,9 @@ StdCmdProjectUtil::StdCmdProjectUtil()
// setting the
sGroup = "Tools";
sWhatsThis = "Std_ProjectUtil";
sMenuText = QT_TR_NOOP("Project utility...");
sToolTipText = QT_TR_NOOP("Utility to extract or create project files");
sStatusTip = QT_TR_NOOP("Utility to extract or create project files");
sMenuText = QT_TR_NOOP("Document utility...");
sToolTipText = QT_TR_NOOP("Utility to extract or create document files");
sStatusTip = QT_TR_NOOP("Utility to extract or create document files");
sPixmap = "Std_ProjectUtil";
}

2
src/Gui/DlgProjectInformation.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Project information</string>
<string>Document information</string>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>

4
src/Gui/DlgProjectUtility.cpp
View File

@@ -101,7 +101,7 @@ void DlgProjectUtility::tryExtractArchive(const QString& source, const QString&
Gui::Command::runCommand(Gui::Command::App, str.str().c_str());
}
catch (const Base::Exception& e) {
QMessageBox::critical(this, tr("Failed to extract project"), QString::fromLatin1(e.what()));
QMessageBox::critical(this, tr("Failed to extract document"), QString::fromLatin1(e.what()));
}
}
@@ -118,7 +118,7 @@ void DlgProjectUtility::tryCreateArchive(const QString& source, const QString& t
}
}
catch (const Base::Exception& e) {
QMessageBox::critical(this, tr("Failed to create project"), QString::fromLatin1(e.what()));
QMessageBox::critical(this, tr("Failed to create document"), QString::fromLatin1(e.what()));
}
}

10
src/Gui/DlgProjectUtility.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Project utility</string>
<string>Document utility</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0" colspan="2">
@@ -19,7 +19,7 @@
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Extract project</string>
<string>Extract document</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@@ -32,7 +32,7 @@
<item row="0" column="1">
<widget class="Gui::FileChooser" name="extractSource">
<property name="filter">
<string notr="true">Project file (*.FCStd)</string>
<string notr="true">Document file (*.FCStd)</string>
</property>
</widget>
</item>
@@ -69,7 +69,7 @@
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Create project</string>
<string>Create document</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
@@ -134,7 +134,7 @@
<item row="2" column="0">
<widget class="QCheckBox" name="checkLoadProject">
<property name="text">
<string>Load project file after creation</string>
<string>Load document file after creation</string>
</property>
</widget>
</item>

8
src/Gui/PreferencePages/DlgSettingsGeneral.ui
View File

@@ -59,7 +59,7 @@
<item row="1" column="1">
<widget class="QComboBox" name="comboBox_UnitSystem">
<property name="toolTip">
<string>Unit system for all parts of the application. Can be overridden by specifying a project unit system.</string>
<string>Unit system for all parts of the application. Can be overridden by specifying a document unit system.</string>
</property>
</widget>
</item>
@@ -90,21 +90,21 @@
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Project unit system:</string>
<string>Document unit system:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBox_projectUnitSystem">
<property name="toolTip">
<string>Unit system stored in the current project</string>
<string>Unit system stored in the current document</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QCheckBox" name="checkBox_projectUnitSystemIgnore">
<property name="toolTip">
<string>If enabled, project unit systems are ignored</string>
<string>If enabled, document unit systems are ignored</string>
</property>
<property name="text">
<string>Ignore</string>