0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-04 12:07:24 +03:00

Fixed defined objectname changed after pasting items

This commit is contained in:
yanis60
2023-02-03 15:55:36 +01:00
parent 98ac5ce37f
commit 5e91fb0c33
62 changed files with 2760 additions and 2271 deletions

View File

@@ -8,18 +8,20 @@ namespace Ui {
class LanguageSelectDialog;
}
class LanguageSelectDialog : public QDialog
{
class LanguageSelectDialog : public QDialog {
Q_OBJECT
public:
public:
explicit LanguageSelectDialog(QWidget *parent = 0);
~LanguageSelectDialog();
QLocale::Language getSelectedLanguage();
private:
private:
Ui::LanguageSelectDialog *ui;
};
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_DECLARE_METATYPE(QLocale::Language)
#endif
#endif // LANGUAGESELECTDIALOG_H

View File

@@ -29,7 +29,11 @@ TranslationEditor::TranslationEditor(QWidget *parent) :
ui->tbStrings->setHorizontalHeaderItem(1,new QTableWidgetItem(tr("Report Item")));
ui->tbStrings->setHorizontalHeaderItem(2,new QTableWidgetItem(tr("Property")));
ui->tbStrings->setHorizontalHeaderItem(3,new QTableWidgetItem(tr("Source text")));
new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Return), this, SLOT(slotItemChecked()));
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
m_clrReturn = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_Return), this, SLOT(slotItemChecked()));
#else
m_clrReturn = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Return), this, SLOT(slotItemChecked()));
#endif
//ui->tbStrings->setSortingEnabled(true);
}
@@ -50,6 +54,7 @@ void TranslationEditor::setReportEngine(ITranslationContainer* translationContai
TranslationEditor::~TranslationEditor()
{
delete ui;
delete m_clrReturn;
}
QLocale::Language TranslationEditor::getLanguageByName(const QString& languageName){

View File

@@ -4,6 +4,7 @@
#include <QWidget>
#include <QLocale>
#include <QTreeWidgetItem>
#include <QShortcut>
#include "lrreporttranslation.h"
namespace LimeReport {
@@ -46,6 +47,7 @@ private:
PageTranslation* m_currentPageTranslation;
PropertyTranslation* m_currentPropertyTranslation;
bool m_translationChanging;
QShortcut* m_clrReturn;
};
} //namespace LimeReport