aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed failed build.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-02-19 16:50:20 +02:00
parent ac95ecb271
commit 3419476ee1
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.txt
View File

@ -7,7 +7,7 @@
- Added language Chinese (China). - Added language Chinese (China).
- New icon for VAL file. Updated Tape logo. Updated ico for standard measurements. - New icon for VAL file. Updated Tape logo. Updated ico for standard measurements.
- [#325] Check pattern for inverse compatibility. - [#325] Check pattern for inverse compatibility.
- [#385] : Add 'Open Recent' option in Tape.exe, 'File' dropdown menu. - [#385] Add 'Open Recent' option in Tape.exe, 'File' dropdown menu.
# Version 0.4.3 # Version 0.4.3
- [#405] Fixed crash after deleting first pattern piece in the list. - [#405] Fixed crash after deleting first pattern piece in the list.

12
src/app/tape/tmainwindow.cpp
View File

@ -98,7 +98,9 @@ TMainWindow::TMainWindow(QWidget *parent)
labelPatternUnit(nullptr), labelPatternUnit(nullptr),
actionDockDiagram(nullptr), actionDockDiagram(nullptr),
dockDiagramVisible(false), dockDiagramVisible(false),
isInitialized(false) isInitialized(false),
recentFileActs(),
separatorAct(nullptr)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -117,11 +119,11 @@ TMainWindow::TMainWindow(QWidget *parent)
ui->mainToolBar->setContextMenuPolicy(Qt::PreventContextMenu); ui->mainToolBar->setContextMenuPolicy(Qt::PreventContextMenu);
ui->toolBarGradation->setContextMenuPolicy(Qt::PreventContextMenu); ui->toolBarGradation->setContextMenuPolicy(Qt::PreventContextMenu);
//MSVC doesn't support int arrays in initializer list
for (int i = 0; i < MaxRecentFiles; ++i) for (int i = 0; i < MaxRecentFiles; ++i)
{ {
recentFileActs[i] = nullptr; recentFileActs[i] = nullptr;
} }
separatorAct=nullptr;
SetupMenu(); SetupMenu();
@ -2049,7 +2051,7 @@ void TMainWindow::SetCurrentFile(const QString &fileName)
ui->lineEditPathToFile->setText(QDir::toNativeSeparators(curFile)); ui->lineEditPathToFile->setText(QDir::toNativeSeparators(curFile));
ui->lineEditPathToFile->setToolTip(QDir::toNativeSeparators(curFile)); ui->lineEditPathToFile->setToolTip(QDir::toNativeSeparators(curFile));
ui->pushButtonShowInExplorer->setEnabled(true); ui->pushButtonShowInExplorer->setEnabled(true);
VTapeSettings *settings = qApp->TapeSettings(); auto settings = qApp->TapeSettings();
QStringList files = settings->GetRecentFileList(); QStringList files = settings->GetRecentFileList();
files.removeAll(fileName); files.removeAll(fileName);
files.prepend(fileName); files.prepend(fileName);
@ -2733,8 +2735,8 @@ void TMainWindow::UpdateRecentFileActions()
for (int i = 0; i < numRecentFiles; ++i) for (int i = 0; i < numRecentFiles; ++i)
{ {
QString text = QString("&%1. %2").arg(i + 1).arg(StrippedName(files.at(i))); const QString text = QString("&%1. %2").arg(i + 1).arg(StrippedName(files.at(i)));
qCDebug(tMainWindow, "file %i = %s",numRecentFiles,text); qCDebug(tMainWindow, "file %i = %s", numRecentFiles, qUtf8Printable(text));
recentFileActs[i]->setText(text); recentFileActs[i]->setText(text);
recentFileActs[i]->setData(files.at(i)); recentFileActs[i]->setData(files.at(i));
recentFileActs[i]->setVisible(true); recentFileActs[i]->setVisible(true);