mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-19 13:34:44 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

A?adido nuevo edit para la b?squeda que sustituye al antiguo junto con la etiqueta y el bot?n

Browse Source 
Se ha eliminado la posibilidad de realizar b?squedas que no incluyan los c?mics(falta a?adir una b?squeda m?s potente)
This commit is contained in:
Luis Ángel San Martín
2013-05-13 17:39:37 +02:00
parent 65a50fb612
commit af6c6c26b5
7 changed files with 84 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
YACReaderLibrary/images.qrc
View File

@ -65,5 +65,7 @@
<file>../images/importTopCoversDecoration.png</file>
<file>../images/importBottomCoversDecoration.png</file>
<file>../images/glowLine.png</file>
<file>../images/clearSearch.png</file>
<file>../images/iconSearch.png</file>
</qresource>
</RCC>

2
YACReaderLibrary/import_widget.cpp
View File

@ -335,7 +335,7 @@ void ImportWidget::setImportLook()
{
iconLabel->setPixmap(QPixmap(":/images/importingIcon.png"));
text->setText("<font color=\"#495252\">"+tr("Importing comics")+"</font>");
textDescription->setText("<font color=\"#565959\">"+tr("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")+"</font>");
textDescription->setText("<font color=\"#565959\">"+tr("Create a library could take several minutes. You can stop the process and update the library later for completing the task.")+"</font>");
}
void ImportWidget::setUpdateLook()

22
YACReaderLibrary/library_window.cpp
View File

@ -181,16 +181,17 @@ void LibraryWindow::doLayout()
QVBoxLayout * searchLayout = new QVBoxLayout;
QHBoxLayout * filter = new QHBoxLayout;
filter->addWidget(foldersFilter = new QLineEdit());
filter->addWidget(foldersFilter = new YACReaderLineEdit());
foldersFilter->setPlaceholderText(tr("Search folders and comics"));
previousFilter = "";
filter->addWidget(clearFoldersFilter = new QPushButton(tr("Clear")));
//filter->addWidget(clearFoldersFilter = new QPushButton(tr("Clear")));
searchLayout->addWidget(new QLabel(tr("Search folders/comics"),this));
//searchLayout->addWidget(new QLabel(tr("Search folders/comics"),this));
searchLayout->addLayout(filter);
includeComicsCheckBox = new QCheckBox(tr("Include files (slower)"),this);
includeComicsCheckBox->setChecked(true);
searchLayout->addWidget(includeComicsCheckBox);
//includeComicsCheckBox = new QCheckBox(tr("Include files (slower)"),this);
//includeComicsCheckBox->setChecked(true);
//searchLayout->addWidget(includeComicsCheckBox);
l->addLayout(searchLayout);
l->setSpacing(1);
@ -506,7 +507,7 @@ void LibraryWindow::enableLibraryActions()
deleteLibraryAction->setEnabled(true);
removeLibraryAction->setEnabled(true);
foldersFilter->setEnabled(true);
clearFoldersFilter->setEnabled(true);
//clearFoldersFilter->setEnabled(true);
}
void LibraryWindow::createToolBars()
@ -682,9 +683,9 @@ void LibraryWindow::createConnections()
connect(comicFlow,SIGNAL(selected(unsigned int)),this,SLOT(openComic()));
connect(comicView,SIGNAL(doubleClicked(QModelIndex)),this,SLOT(openComic()));
//Folders filter
connect(clearFoldersFilter,SIGNAL(clicked()),foldersFilter,SLOT(clear()));
//connect(clearFoldersFilter,SIGNAL(clicked()),foldersFilter,SLOT(clear()));
connect(foldersFilter,SIGNAL(textChanged(QString)),this,SLOT(setFoldersFilter(QString)));
connect(includeComicsCheckBox,SIGNAL(stateChanged(int)),this,SLOT(searchInFiles(int)));
//connect(includeComicsCheckBox,SIGNAL(stateChanged(int)),this,SLOT(searchInFiles(int)));
//ContextMenus
connect(openContainingFolderComicAction,SIGNAL(triggered()),this,SLOT(openContainingFolderComic()));
@ -759,7 +760,6 @@ void LibraryWindow::loadLibrary(const QString & name)
//TODO encontrar el bug que provoca que no se carguen adecuadamente las car<61>tulas en root.
setRootIndex();
//includeComicsCheckBox->setCheckState(Qt::Unchecked);
foldersFilter->clear();
}
else if(comparation > 0)
@ -1291,7 +1291,7 @@ void LibraryWindow::setFoldersFilter(QString filter)
{
if(!filter.isEmpty())
{
dm->setFilter(filter, includeComicsCheckBox->isChecked());
dm->setFilter(filter, true);//includeComicsCheckBox->isChecked());
foldersView->expandAll();
}
}

2
YACReaderLibrary/library_window.h
View File

@ -64,7 +64,7 @@ private:
QSize slideSizeW;
QSize slideSizeF;
//search filter
QLineEdit * foldersFilter;
YACReaderLineEdit * foldersFilter;
TreeItem * index; //index al que hay que hacer scroll despu<70>s de pulsar sobre un folder filtrado
int column;
QString previousFilter;