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

Restructuring directory layout. Move towards "Modern CMake" usage.

Browse Source
This commit is contained in:
Jim Evins
2017-11-23 22:15:24 -05:00
parent 8bec3594ec
commit b8ee5e1f73
198 changed files with 4509 additions and 5324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/SelectProductDialog.cpp
+21 -20
View File
@@ -20,10 +20,11 @@
#include "SelectProductDialog.h"
#include "Db.h"
#include "Settings.h"
#include "TemplatePickerItem.h"
#include "model/Db.h"
#include "model/Settings.h"
#include <QtDebug>
@@ -38,18 +39,18 @@ namespace glabels
{
setupUi( this );
pageSizeIsoCheck->setChecked( Settings::searchIsoPaperSizes() );
pageSizeUsCheck->setChecked( Settings::searchUsPaperSizes() );
pageSizeOtherCheck->setChecked( Settings::searchOtherPaperSizes() );
pageSizeIsoCheck->setChecked( model::Settings::searchIsoPaperSizes() );
pageSizeUsCheck->setChecked( model::Settings::searchUsPaperSizes() );
pageSizeOtherCheck->setChecked( model::Settings::searchOtherPaperSizes() );
allCategoriesRadio->setChecked( Settings::searchAllCategories() );
selectedCategoriesRadio->setChecked( !Settings::searchAllCategories() );
allCategoriesRadio->setChecked( model::Settings::searchAllCategories() );
selectedCategoriesRadio->setChecked( !model::Settings::searchAllCategories() );
categoriesCheckContainer->setEnabled( !Settings::searchAllCategories() );
mCategoryIdList = Settings::searchCategoryList();
categoriesCheckContainer->setEnabled( !model::Settings::searchAllCategories() );
mCategoryIdList = model::Settings::searchCategoryList();
QList<Category*> categories = Db::categories();
foreach ( Category *category, categories )
QList<model::Category*> categories = model::Db::categories();
foreach ( model::Category *category, categories )
{
QCheckBox* check = new QCheckBox( category->name() );
check->setChecked( mCategoryIdList.contains( category->id() ) );
@@ -60,10 +61,10 @@ namespace glabels
connect( check, SIGNAL(clicked()), this, SLOT(onCategoryCheckClicked()) );
}
QList<Template*> tmplates = Db::templates();
QList<model::Template*> tmplates = model::Db::templates();
templatePicker->setTemplates( tmplates );
if ( Settings::recentTemplateList().count() > 0 )
if ( model::Settings::recentTemplateList().count() > 0 )
{
modeNotebook->setCurrentIndex(1);
}
@@ -75,7 +76,7 @@ namespace glabels
///
/// Get selected template
///
const Template* SelectProductDialog::tmplate() const
const model::Template* SelectProductDialog::tmplate() const
{
if ( !mCanceled )
{
@@ -106,7 +107,7 @@ namespace glabels
break;
case 1:
// Recent Tab
templatePicker->applyFilter( Settings::recentTemplateList() );
templatePicker->applyFilter( model::Settings::recentTemplateList() );
break;
default:
qDebug() << "onModeTabChanged(): unknown tab!";
@@ -142,9 +143,9 @@ namespace glabels
///
void SelectProductDialog::onPageSizeCheckClicked()
{
Settings::setSearchIsoPaperSizes( pageSizeIsoCheck->isChecked() );
Settings::setSearchUsPaperSizes( pageSizeUsCheck->isChecked() );
Settings::setSearchOtherPaperSizes( pageSizeOtherCheck->isChecked() );
model::Settings::setSearchIsoPaperSizes( pageSizeIsoCheck->isChecked() );
model::Settings::setSearchUsPaperSizes( pageSizeUsCheck->isChecked() );
model::Settings::setSearchOtherPaperSizes( pageSizeOtherCheck->isChecked() );
templatePicker->applyFilter( searchEntry->text(),
pageSizeIsoCheck->isChecked(),
@@ -170,7 +171,7 @@ namespace glabels
allCategoriesRadio->isChecked(),
mCategoryIdList );
Settings::setSearchAllCategories( allCategoriesRadio->isChecked() );
model::Settings::setSearchAllCategories( allCategoriesRadio->isChecked() );
}
@@ -189,7 +190,7 @@ namespace glabels
mCategoryIdList );
Settings::setSearchCategoryList( mCategoryIdList );
model::Settings::setSearchCategoryList( mCategoryIdList );
}