Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

New FileUtil::makeRelativeIfInDir func; label parser_3 barcode map; unit tests

Browse Source
This commit is contained in:
gitlost
2019-08-26 03:00:32 +01:00
parent e8daa8aa48
commit 7e44bbdc06
37 changed files with 2613 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/MergeView.cpp
+4 -2
View File
@@ -22,6 +22,8 @@
#include "merge/Factory.h"
#include "model/FileUtil.h"
#include <QFileDialog>
#include <QFileInfo>
#include <QtDebug>
@@ -93,7 +95,7 @@ namespace glabels
case merge::Factory::FILE:
locationLabel->setEnabled( true );
fn = mModel->dir().relativeFilePath( mModel->merge()->source() );
fn = model::FileUtil::makeRelativeIfInDir( mModel->dir(), mModel->merge()->source() );
locationLineEdit->setText( fn );
locationBrowseButton->setVisible( true );
break;
@@ -124,7 +126,7 @@ namespace glabels
///
void MergeView::onMergeSourceChanged()
{
QString fn = mModel->dir().relativeFilePath( mModel->merge()->source() );
QString fn = model::FileUtil::makeRelativeIfInDir( mModel->dir(), mModel->merge()->source() );
locationLineEdit->setText( fn );
recordsTable->clear();