mirror of
https://github.com/YACReader/yacreader
synced 2025-06-04 01:28:55 -04:00
Add a new action to scan the xml info from a folder
This commit is contained in:
parent
76642737fd
commit
ae990d82af
@ -394,7 +394,8 @@ void LibraryWindow::setUpShortcutsManagement()
|
|||||||
<< setFolderAsUnreadAction
|
<< setFolderAsUnreadAction
|
||||||
<< setFolderAsMangaAction
|
<< setFolderAsMangaAction
|
||||||
<< setFolderAsNormalAction
|
<< setFolderAsNormalAction
|
||||||
<< updateCurrentFolderAction);
|
<< updateCurrentFolderAction
|
||||||
|
<< rescanXMLFromCurrentFolderAction);
|
||||||
allActions << tmpList;
|
allActions << tmpList;
|
||||||
|
|
||||||
editShortcutsDialog->addActionsGroup("Lists", QIcon(":/images/shortcuts_group_folders.svg"), // TODO change icon
|
editShortcutsDialog->addActionsGroup("Lists", QIcon(":/images/shortcuts_group_folders.svg"), // TODO change icon
|
||||||
@ -795,6 +796,10 @@ void LibraryWindow::createActions()
|
|||||||
updateCurrentFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(UPDATE_CURRENT_FOLDER_ACTION_YL));
|
updateCurrentFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(UPDATE_CURRENT_FOLDER_ACTION_YL));
|
||||||
updateCurrentFolderAction->setIcon(QIcon(":/images/menus_icons/update_current_folder.svg"));
|
updateCurrentFolderAction->setIcon(QIcon(":/images/menus_icons/update_current_folder.svg"));
|
||||||
|
|
||||||
|
rescanXMLFromCurrentFolderAction = new QAction(tr("Scan legacy XML metadata"), this);
|
||||||
|
rescanXMLFromCurrentFolderAction->setData(SCAN_XML_FROM_CURRENT_FOLDER_ACTION_YL);
|
||||||
|
rescanXMLFromCurrentFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SCAN_XML_FROM_CURRENT_FOLDER_ACTION_YL));
|
||||||
|
|
||||||
addReadingListAction = new QAction(tr("Add new reading list"), this);
|
addReadingListAction = new QAction(tr("Add new reading list"), this);
|
||||||
addReadingListAction->setData(ADD_READING_LIST_ACTION_YL);
|
addReadingListAction->setData(ADD_READING_LIST_ACTION_YL);
|
||||||
addReadingListAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_READING_LIST_ACTION_YL));
|
addReadingListAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADD_READING_LIST_ACTION_YL));
|
||||||
@ -840,6 +845,7 @@ void LibraryWindow::createActions()
|
|||||||
this->addAction(setFolderAsMangaAction);
|
this->addAction(setFolderAsMangaAction);
|
||||||
this->addAction(setFolderAsNormalAction);
|
this->addAction(setFolderAsNormalAction);
|
||||||
this->addAction(deleteMetadataAction);
|
this->addAction(deleteMetadataAction);
|
||||||
|
this->addAction(rescanXMLFromCurrentFolderAction);
|
||||||
#ifndef Q_OS_MAC
|
#ifndef Q_OS_MAC
|
||||||
this->addAction(toggleFullScreenAction);
|
this->addAction(toggleFullScreenAction);
|
||||||
#endif
|
#endif
|
||||||
@ -905,6 +911,7 @@ void LibraryWindow::disableFoldersActions(bool disabled)
|
|||||||
openContainingFolderAction->setDisabled(disabled);
|
openContainingFolderAction->setDisabled(disabled);
|
||||||
|
|
||||||
updateFolderAction->setDisabled(disabled);
|
updateFolderAction->setDisabled(disabled);
|
||||||
|
rescanXMLFromCurrentFolderAction->setDisabled(disabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
void LibraryWindow::disableAllActions()
|
void LibraryWindow::disableAllActions()
|
||||||
@ -1055,6 +1062,8 @@ void LibraryWindow::createMenus()
|
|||||||
folderMenu->addAction(openContainingFolderAction);
|
folderMenu->addAction(openContainingFolderAction);
|
||||||
folderMenu->addAction(updateFolderAction);
|
folderMenu->addAction(updateFolderAction);
|
||||||
folderMenu->addSeparator();
|
folderMenu->addSeparator();
|
||||||
|
folderMenu->addAction(rescanXMLFromCurrentFolderAction);
|
||||||
|
folderMenu->addSeparator();
|
||||||
folderMenu->addAction(setFolderAsNotCompletedAction);
|
folderMenu->addAction(setFolderAsNotCompletedAction);
|
||||||
folderMenu->addAction(setFolderAsCompletedAction);
|
folderMenu->addAction(setFolderAsCompletedAction);
|
||||||
folderMenu->addSeparator();
|
folderMenu->addSeparator();
|
||||||
@ -1235,6 +1244,8 @@ void LibraryWindow::createConnections()
|
|||||||
connect(updateCurrentFolderAction, &QAction::triggered, this, &LibraryWindow::updateCurrentFolder);
|
connect(updateCurrentFolderAction, &QAction::triggered, this, &LibraryWindow::updateCurrentFolder);
|
||||||
connect(updateFolderAction, &QAction::triggered, this, &LibraryWindow::updateCurrentFolder);
|
connect(updateFolderAction, &QAction::triggered, this, &LibraryWindow::updateCurrentFolder);
|
||||||
|
|
||||||
|
connect(rescanXMLFromCurrentFolderAction, &QAction::triggered, this, &LibraryWindow::rescanCurrentFolderForXMLInfo);
|
||||||
|
|
||||||
// lists
|
// lists
|
||||||
connect(addReadingListAction, &QAction::triggered, this, &LibraryWindow::addNewReadingList);
|
connect(addReadingListAction, &QAction::triggered, this, &LibraryWindow::addNewReadingList);
|
||||||
connect(deleteReadingListAction, &QAction::triggered, this, &LibraryWindow::deleteSelectedReadingList);
|
connect(deleteReadingListAction, &QAction::triggered, this, &LibraryWindow::deleteSelectedReadingList);
|
||||||
@ -1808,6 +1819,8 @@ void LibraryWindow::showGridFoldersContextMenu(QPoint point, Folder folder)
|
|||||||
auto updateFolderAction = new QAction(tr("Update folder"), this);
|
auto updateFolderAction = new QAction(tr("Update folder"), this);
|
||||||
updateFolderAction->setIcon(QIcon(":/images/menus_icons/update_current_folder.svg"));
|
updateFolderAction->setIcon(QIcon(":/images/menus_icons/update_current_folder.svg"));
|
||||||
|
|
||||||
|
auto rescanLibraryForXMLInfoAction = new QAction(tr("Rescan library for XML info"), this);
|
||||||
|
|
||||||
auto setFolderAsNotCompletedAction = new QAction();
|
auto setFolderAsNotCompletedAction = new QAction();
|
||||||
setFolderAsNotCompletedAction->setText(tr("Set as uncompleted"));
|
setFolderAsNotCompletedAction->setText(tr("Set as uncompleted"));
|
||||||
|
|
||||||
@ -1829,6 +1842,8 @@ void LibraryWindow::showGridFoldersContextMenu(QPoint point, Folder folder)
|
|||||||
menu.addAction(openContainingFolderAction);
|
menu.addAction(openContainingFolderAction);
|
||||||
menu.addAction(updateFolderAction);
|
menu.addAction(updateFolderAction);
|
||||||
menu.addSeparator();
|
menu.addSeparator();
|
||||||
|
menu.addAction(rescanLibraryForXMLInfoAction);
|
||||||
|
menu.addSeparator();
|
||||||
if (folder.isCompleted())
|
if (folder.isCompleted())
|
||||||
menu.addAction(setFolderAsNotCompletedAction);
|
menu.addAction(setFolderAsNotCompletedAction);
|
||||||
else
|
else
|
||||||
@ -1852,6 +1867,9 @@ void LibraryWindow::showGridFoldersContextMenu(QPoint point, Folder folder)
|
|||||||
connect(updateFolderAction, &QAction::triggered, this, [=]() {
|
connect(updateFolderAction, &QAction::triggered, this, [=]() {
|
||||||
updateFolder(foldersModel->getIndexFromFolder(folder));
|
updateFolder(foldersModel->getIndexFromFolder(folder));
|
||||||
});
|
});
|
||||||
|
connect(rescanLibraryForXMLInfoAction, &QAction::triggered, this, [=]() {
|
||||||
|
rescanFolderForXMLInfo(foldersModel->getIndexFromFolder(folder));
|
||||||
|
});
|
||||||
connect(setFolderAsNotCompletedAction, &QAction::triggered, this, [=]() {
|
connect(setFolderAsNotCompletedAction, &QAction::triggered, this, [=]() {
|
||||||
foldersModel->updateFolderCompletedStatus(QModelIndexList() << foldersModel->getIndexFromFolder(folder), false);
|
foldersModel->updateFolderCompletedStatus(QModelIndexList() << foldersModel->getIndexFromFolder(folder), false);
|
||||||
subfolderModel->updateFolderCompletedStatus(QModelIndexList() << subfolderModel->getIndexFromFolder(folder), false);
|
subfolderModel->updateFolderCompletedStatus(QModelIndexList() << subfolderModel->getIndexFromFolder(folder), false);
|
||||||
@ -2237,6 +2255,23 @@ void LibraryWindow::rescanLibraryForXMLInfo()
|
|||||||
xmlInfoLibraryScanner->scanLibrary(path, path + "/.yacreaderlibrary");
|
xmlInfoLibraryScanner->scanLibrary(path, path + "/.yacreaderlibrary");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void LibraryWindow::rescanCurrentFolderForXMLInfo()
|
||||||
|
{
|
||||||
|
rescanFolderForXMLInfo(getCurrentFolderIndex());
|
||||||
|
}
|
||||||
|
|
||||||
|
void LibraryWindow::rescanFolderForXMLInfo(QModelIndex modelIndex)
|
||||||
|
{
|
||||||
|
importWidget->setXMLScanLook();
|
||||||
|
showImportingWidget();
|
||||||
|
|
||||||
|
QString currentLibrary = selectedLibrary->currentText();
|
||||||
|
QString path = libraries.getPath(currentLibrary);
|
||||||
|
_lastAdded = currentLibrary;
|
||||||
|
|
||||||
|
xmlInfoLibraryScanner->scanFolder(path, path + "/.yacreaderlibrary", QDir::cleanPath(currentPath() + foldersModel->getFolderPath(modelIndex)), modelIndex);
|
||||||
|
}
|
||||||
|
|
||||||
void LibraryWindow::cancelCreating()
|
void LibraryWindow::cancelCreating()
|
||||||
{
|
{
|
||||||
stopLibraryCreator();
|
stopLibraryCreator();
|
||||||
@ -2821,6 +2856,8 @@ void LibraryWindow::showFoldersContextMenu(const QPoint &point)
|
|||||||
menu.addAction(openContainingFolderAction);
|
menu.addAction(openContainingFolderAction);
|
||||||
menu.addAction(updateFolderAction);
|
menu.addAction(updateFolderAction);
|
||||||
menu.addSeparator(); //-------------------------------
|
menu.addSeparator(); //-------------------------------
|
||||||
|
menu.addAction(rescanXMLFromCurrentFolderAction);
|
||||||
|
menu.addSeparator(); //-------------------------------
|
||||||
if (isCompleted)
|
if (isCompleted)
|
||||||
menu.addAction(setFolderAsNotCompletedAction);
|
menu.addAction(setFolderAsNotCompletedAction);
|
||||||
else
|
else
|
||||||
|
@ -230,6 +230,7 @@ public:
|
|||||||
|
|
||||||
QAction *updateFolderAction;
|
QAction *updateFolderAction;
|
||||||
QAction *updateCurrentFolderAction;
|
QAction *updateCurrentFolderAction;
|
||||||
|
QAction *rescanXMLFromCurrentFolderAction;
|
||||||
|
|
||||||
// reading lists actions
|
// reading lists actions
|
||||||
QAction *addReadingListAction;
|
QAction *addReadingListAction;
|
||||||
@ -346,6 +347,8 @@ public slots:
|
|||||||
void removeLibrary();
|
void removeLibrary();
|
||||||
void renameLibrary();
|
void renameLibrary();
|
||||||
void rescanLibraryForXMLInfo();
|
void rescanLibraryForXMLInfo();
|
||||||
|
void rescanCurrentFolderForXMLInfo();
|
||||||
|
void rescanFolderForXMLInfo(QModelIndex modelIndex);
|
||||||
void rename(QString newName);
|
void rename(QString newName);
|
||||||
void cancelCreating();
|
void cancelCreating();
|
||||||
void stopLibraryCreator();
|
void stopLibraryCreator();
|
||||||
|
@ -82,6 +82,7 @@ public:
|
|||||||
#define SHOW_EDIT_SHORTCUTS_ACTION_YL "SHOW_EDIT_SHORTCUTS_ACTION_YL"
|
#define SHOW_EDIT_SHORTCUTS_ACTION_YL "SHOW_EDIT_SHORTCUTS_ACTION_YL"
|
||||||
#define QUIT_ACTION_YL "QUIT_ACTION_YL"
|
#define QUIT_ACTION_YL "QUIT_ACTION_YL"
|
||||||
#define UPDATE_CURRENT_FOLDER_ACTION_YL "UPDATE_CURRENT_FOLDER_ACTION_YL"
|
#define UPDATE_CURRENT_FOLDER_ACTION_YL "UPDATE_CURRENT_FOLDER_ACTION_YL"
|
||||||
|
#define SCAN_XML_FROM_CURRENT_FOLDER_ACTION_YL "SCAN_XML_FROM_CURRENT_FOLDER_ACTION_YL"
|
||||||
#define ADD_FOLDER_ACTION_YL "ADD_FOLDER_ACTION_YL"
|
#define ADD_FOLDER_ACTION_YL "ADD_FOLDER_ACTION_YL"
|
||||||
#define REMOVE_FOLDER_ACTION_YL "REMOVE_FOLDER_ACTION_YL"
|
#define REMOVE_FOLDER_ACTION_YL "REMOVE_FOLDER_ACTION_YL"
|
||||||
#define ADD_READING_LIST_ACTION_YL "ADD_READING_LIST_ACTION_YL"
|
#define ADD_READING_LIST_ACTION_YL "ADD_READING_LIST_ACTION_YL"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user