mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-21 06:24:39 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unificadas las acciones de eliminar y borrar bibliotecas

Browse Source 
Ahora todas las acciones relacionadas con los c?mics est?n en la misma toolbar
This commit is contained in:
Luis Ángel San Martín
2013-05-19 17:09:42 +02:00
parent 45bb72ae21
commit 68e56189bb
2 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
YACReaderLibrary/library_window.cpp
View File

@ -348,9 +348,9 @@ void LibraryWindow::createActions()
renameLibraryAction->setShortcut(Qt::Key_R); renameLibraryAction->setShortcut(Qt::Key_R);
renameLibraryAction->setIcon(QIcon(":/images/edit.png")); renameLibraryAction->setIcon(QIcon(":/images/edit.png"));
deleteLibraryAction = new QAction(this); /*deleteLibraryAction = new QAction(this);
deleteLibraryAction->setToolTip(tr("Delete current library from disk")); deleteLibraryAction->setToolTip(tr("Delete current library from disk"));
deleteLibraryAction->setIcon(QIcon(":/images/deleteLibrary.png")); deleteLibraryAction->setIcon(QIcon(":/images/deleteLibrary.png"));*/
removeLibraryAction = new QAction(this); removeLibraryAction = new QAction(this);
removeLibraryAction->setToolTip(tr("Remove current library from your collection")); removeLibraryAction->setToolTip(tr("Remove current library from your collection"));
@ -472,7 +472,7 @@ void LibraryWindow::disableAllActions()
{ {
updateLibraryAction->setEnabled(false); updateLibraryAction->setEnabled(false);
renameLibraryAction->setEnabled(false); renameLibraryAction->setEnabled(false);
deleteLibraryAction->setEnabled(false); //deleteLibraryAction->setEnabled(false);
removeLibraryAction->setEnabled(false); removeLibraryAction->setEnabled(false);
openComicAction->setEnabled(false); openComicAction->setEnabled(false);
showPropertiesAction->setEnabled(false); showPropertiesAction->setEnabled(false);
@ -526,7 +526,7 @@ void LibraryWindow::enableActions()
void LibraryWindow::enableLibraryActions() void LibraryWindow::enableLibraryActions()
{ {
renameLibraryAction->setEnabled(true); renameLibraryAction->setEnabled(true);
deleteLibraryAction->setEnabled(true); //deleteLibraryAction->setEnabled(true);
removeLibraryAction->setEnabled(true); removeLibraryAction->setEnabled(true);
foldersFilter->setEnabled(true); foldersFilter->setEnabled(true);
//clearFoldersFilter->setEnabled(true); //clearFoldersFilter->setEnabled(true);
@ -556,28 +556,7 @@ void LibraryWindow::createToolBars()
libraryToolBar->addAction(updateLibraryAction); libraryToolBar->addAction(updateLibraryAction);
libraryToolBar->addAction(renameLibraryAction); libraryToolBar->addAction(renameLibraryAction);
libraryToolBar->addAction(removeLibraryAction); libraryToolBar->addAction(removeLibraryAction);
libraryToolBar->addAction(deleteLibraryAction); //libraryToolBar->addAction(deleteLibraryAction);
libraryToolBar->addSeparator();
libraryToolBar->addAction(openComicAction);
libraryToolBar->addAction(showPropertiesAction);
QToolButton * tb = new QToolButton();
tb->addAction(setAsReadAction);
tb->addAction(setAllAsReadAction);
tb->setPopupMode(QToolButton::MenuButtonPopup);
tb->setDefaultAction(setAsReadAction);
QToolButton * tb2 = new QToolButton();
tb2->addAction(setAsNonReadAction);
tb2->addAction(setAllAsNonReadAction);
tb2->setPopupMode(QToolButton::MenuButtonPopup);
tb2->setDefaultAction(setAsNonReadAction);
libraryToolBar->addWidget(tb);
libraryToolBar->addWidget(tb2);
libraryToolBar->addAction(showHideMarksAction);
libraryToolBar->addSeparator(); libraryToolBar->addSeparator();
libraryToolBar->addAction(toggleFullScreenAction); libraryToolBar->addAction(toggleFullScreenAction);
@ -607,8 +586,29 @@ void LibraryWindow::createToolBars()
editInfoToolBar->addAction(selectAllComicsAction); editInfoToolBar->addAction(selectAllComicsAction);
editInfoToolBar->addSeparator(); editInfoToolBar->addSeparator();
editInfoToolBar->addAction(asignOrderActions); editInfoToolBar->addAction(asignOrderActions);
editInfoToolBar->addSeparator();
QToolButton * tb = new QToolButton();
tb->addAction(setAsReadAction);
tb->addAction(setAllAsReadAction);
tb->setPopupMode(QToolButton::MenuButtonPopup);
tb->setDefaultAction(setAsReadAction);
QToolButton * tb2 = new QToolButton();
tb2->addAction(setAsNonReadAction);
tb2->addAction(setAllAsNonReadAction);
tb2->setPopupMode(QToolButton::MenuButtonPopup);
tb2->setDefaultAction(setAsNonReadAction);
editInfoToolBar->addWidget(tb);
editInfoToolBar->addWidget(tb2);
editInfoToolBar->addAction(showHideMarksAction);
editInfoToolBar->addWidget(new QToolBarStretch()); editInfoToolBar->addWidget(new QToolBarStretch());
editInfoToolBar->addAction(hideComicViewAction); editInfoToolBar->addAction(hideComicViewAction);
} }
void LibraryWindow::createMenus() void LibraryWindow::createMenus()
@ -688,7 +688,7 @@ void LibraryWindow::createConnections()
connect(updateLibraryAction,SIGNAL(triggered()),this,SLOT(updateLibrary())); connect(updateLibraryAction,SIGNAL(triggered()),this,SLOT(updateLibrary()));
connect(renameLibraryAction,SIGNAL(triggered()),this,SLOT(renameLibrary())); connect(renameLibraryAction,SIGNAL(triggered()),this,SLOT(renameLibrary()));
connect(deleteLibraryAction,SIGNAL(triggered()),this,SLOT(deleteLibrary())); //connect(deleteLibraryAction,SIGNAL(triggered()),this,SLOT(deleteLibrary()));
connect(removeLibraryAction,SIGNAL(triggered()),this,SLOT(removeLibrary())); connect(removeLibraryAction,SIGNAL(triggered()),this,SLOT(removeLibrary()));
connect(openComicAction,SIGNAL(triggered()),this,SLOT(openComic())); connect(openComicAction,SIGNAL(triggered()),this,SLOT(openComic()));
connect(helpAboutAction,SIGNAL(triggered()),had,SLOT(show())); connect(helpAboutAction,SIGNAL(triggered()),had,SLOT(show()));
@ -1187,7 +1187,10 @@ void LibraryWindow::deleteCurrentLibrary()
void LibraryWindow::removeLibrary() void LibraryWindow::removeLibrary()
{ {
QString currentLibrary = selectedLibrary->currentText(); QString currentLibrary = selectedLibrary->currentText();
if(QMessageBox::question(this,tr("Are you sure?"),tr("Do you want remove ")+currentLibrary+tr(" library?\nFiles won't be erased from disk."),QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) QMessageBox * messageBox = new QMessageBox(tr("Are you sure?"),tr("Do you want remove ")+currentLibrary+tr(" library?"),QMessageBox::Question,QMessageBox::Yes,QMessageBox::YesToAll,QMessageBox::No);
messageBox->button(QMessageBox::YesToAll)->setText(tr("Remove and delete metadata"));
int ret = messageBox->exec();
if(ret == QMessageBox::Yes)
{ {
libraries.remove(currentLibrary); libraries.remove(currentLibrary);
selectedLibrary->removeItem(selectedLibrary->currentIndex()); selectedLibrary->removeItem(selectedLibrary->currentIndex());
@ -1200,6 +1203,10 @@ void LibraryWindow::removeLibrary()
} }
saveLibraries(); saveLibraries();
} }
else if(ret == QMessageBox::YesToAll)
{
deleteCurrentLibrary();
}
} }
void LibraryWindow::renameLibrary() void LibraryWindow::renameLibrary()

2
YACReaderLibrary/library_window.h
View File

@ -114,7 +114,7 @@ private:
QAction * importLibraryAction; QAction * importLibraryAction;
QAction * updateLibraryAction; QAction * updateLibraryAction;
QAction * deleteLibraryAction; //QAction * deleteLibraryAction;
QAction * removeLibraryAction; QAction * removeLibraryAction;
QAction * helpAboutAction; QAction * helpAboutAction;
QAction * renameLibraryAction; QAction * renameLibraryAction;