From: APTX Date: Tue, 24 Jul 2012 13:55:10 +0000 (+0200) Subject: Reorder methods a bit X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=bfb4dcdb1c7b605e96736241a36028c0e6483007;p=localmylist.git Reorder methods a bit --- diff --git a/management-gui/mainwindow.cpp b/management-gui/mainwindow.cpp index 3649419..2c14b9f 100644 --- a/management-gui/mainwindow.cpp +++ b/management-gui/mainwindow.cpp @@ -71,17 +71,6 @@ MainWindow::~MainWindow() delete ui; } -void MainWindow::on_actionConnect_triggered() -{ - MyList::instance()->database()->connect(); -} - -void MainWindow::on_actionDisconnect_triggered() -{ - MyList::instance()->database()->disconnect(); -} - - void MainWindow::dbConnected() { databaseConnectionStatusIndicator->setText("Connected"); @@ -117,6 +106,51 @@ void MainWindow::openRenameScriptEditor(int fid) renameSettingsDialog->show(); } +void MainWindow::on_actionConnect_triggered() +{ + MyList::instance()->database()->connect(); +} + +void MainWindow::on_actionDisconnect_triggered() +{ + MyList::instance()->database()->disconnect(); +} + +void MainWindow::on_actionStartUDPCLient_triggered() +{ + MyList::instance()->setupUdpClient(); + MyList::instance()->setupRequestHandler(); +} + +void MainWindow::on_actionStartRenameHandler_triggered() +{ + MyList::instance()->setupRenameHandler(); +} + +void MainWindow::on_actionStartDirectoryWatcher_triggered() +{ + MyList::instance()->setupDirectoryWatcher(); +} + +void MainWindow::on_actionAddFiles_triggered() +{ + QString filter = tr("LocalMyList Files (%1);;All Files (*.*)").arg(MyList::instance()->settings()->get("fileFilter").toString()); + QStringList files = QFileDialog::getOpenFileNames(this, tr("Add Files"), QString(), filter); + + if (files.isEmpty()) + return; + + foreach (const QString &fileName, files) + { + QFileInfo fileInfo(fileName); + if (!fileInfo.exists()) + continue; + if (!fileInfo.isFile()) + continue; + MyList::instance()->addFile(fileInfo); + } +} + void MainWindow::on_actionScanDirectory_triggered() { QString dir = QFileDialog::getExistingDirectory(this, tr("Scan Directory")); @@ -141,6 +175,37 @@ void MainWindow::on_actionImportTitles_triggered() MyList::instance()->importTitles(file); } +void MainWindow::on_actionHandleRequests_triggered() +{ + MyList::instance()->database()->notifyNewPendingRequest(); + MyList::instance()->database()->notifyNewPendingMyListUpdate(); +} + +void MainWindow::on_actionRenameFiles_triggered() +{ + MyList::instance()->database()->notifyRenameDataChanged(); +} + +void MainWindow::on_actionClearStartedPendingRequests_triggered() +{ + MyList::instance()->database()->clearStartedPendingRequests(); +} + +void MainWindow::on_actionClearStartedMyListUpdates_triggered() +{ + MyList::instance()->database()->clearStartedMyListUpdateRequests(); +} + +void MainWindow::on_actionClearFailedFileRenames_triggered() +{ + MyList::instance()->database()->clearFailedFileRenames(); +} + +void MainWindow::on_actionClearFileRenames_triggered() +{ + MyList::instance()->database()->clearFileRenames(); +} + void MainWindow::on_actionClearDatabase_triggered() { MyList::instance()->database()->truncateDatabase(); @@ -156,6 +221,26 @@ void MainWindow::on_actionClearAnimeTitleData_triggered() MyList::instance()->database()->truncateTitleData(); } +void MainWindow::on_actionRemoveKnownUnknownFiles_triggered() +{ + LocalMyList::instance()->executeTask(new UnknownFileLookupTask()); +} + +void MainWindow::on_actionRenameScript_triggered() +{ + openRenameScriptEditor(0); +} + +void MainWindow::on_actionAddRelatedEpisodeInfo_triggered() +{ + MyList::instance()->executeTask(new AddRelatedEpisodesTask()); +} + +void MainWindow::on_refreshButton_clicked() +{ + myListModel->reload(); +} + void MainWindow::on_myListView_openFileRequested(const QModelIndex &index) { MyListNode *node = myListFilterModel->node(index); @@ -275,90 +360,26 @@ void MainWindow::on_myListView_dataRequested(const QModelIndex &index) MyList::instance()->database()->addRequest(r); } -void MainWindow::on_actionStartUDPCLient_triggered() -{ - MyList::instance()->setupUdpClient(); - MyList::instance()->setupRequestHandler(); -} - -void MainWindow::on_actionRenameFiles_triggered() -{ - MyList::instance()->database()->notifyRenameDataChanged(); -} - -void MainWindow::on_actionStartRenameHandler_triggered() -{ - MyList::instance()->setupRenameHandler(); -} - -void MainWindow::on_actionClearStartedPendingRequests_triggered() -{ - MyList::instance()->database()->clearStartedPendingRequests(); -} - -void MainWindow::on_actionHandleRequests_triggered() -{ - MyList::instance()->database()->notifyNewPendingRequest(); - MyList::instance()->database()->notifyNewPendingMyListUpdate(); -} - -void MainWindow::on_actionClearFailedFileRenames_triggered() -{ - MyList::instance()->database()->clearFailedFileRenames(); -} - -void MainWindow::on_actionClearFileRenames_triggered() -{ - MyList::instance()->database()->clearFileRenames(); -} - -void MainWindow::on_actionClearStartedMyListUpdates_triggered() -{ - MyList::instance()->database()->clearStartedMyListUpdateRequests(); -} - -void MainWindow::on_actionAddFiles_triggered() +void MainWindow::on_filterInput_textChanged(const QString &filter) { - QString filter = tr("LocalMyList Files (%1);;All Files (*.*)").arg(MyList::instance()->settings()->get("fileFilter").toString()); - QStringList files = QFileDialog::getOpenFileNames(this, tr("Add Files"), QString(), filter); - - if (files.isEmpty()) - return; - - foreach (const QString &fileName, files) + switch (ui->filterType->currentIndex()) { - QFileInfo fileInfo(fileName); - if (!fileInfo.exists()) - continue; - if (!fileInfo.isFile()) - continue; - MyList::instance()->addFile(fileInfo); + case 1: + myListFilterModel->setFilterWildcard(filter); + break; + case 2: + myListFilterModel->setFilterRegExp(filter); + break; + case 0: + default: + myListFilterModel->setFilterFixedString(filter); + break; } } -void MainWindow::on_actionRemoveKnownUnknownFiles_triggered() -{ - LocalMyList::instance()->executeTask(new UnknownFileLookupTask()); -} - -void MainWindow::on_refreshButton_clicked() -{ - myListModel->reload(); -} - -void MainWindow::on_actionRenameScript_triggered() -{ - openRenameScriptEditor(0); -} - -void MainWindow::on_actionStartDirectoryWatcher_triggered() -{ - MyList::instance()->setupDirectoryWatcher(); -} - -void MainWindow::on_actionAddRelatedEpisodeInfo_triggered() +void MainWindow::on_filterType_currentIndexChanged(int) { - MyList::instance()->executeTask(new AddRelatedEpisodesTask()); + on_filterInput_textChanged(ui->filterInput->text()); } void MainWindow::dragEnterEvent(QDragEnterEvent *event) @@ -381,25 +402,3 @@ void MainWindow::dropEvent(QDropEvent *event) } event->acceptProposedAction(); } - -void MainWindow::on_filterInput_textChanged(const QString &filter) -{ - switch (ui->filterType->currentIndex()) - { - case 1: - myListFilterModel->setFilterWildcard(filter); - break; - case 2: - myListFilterModel->setFilterRegExp(filter); - break; - case 0: - default: - myListFilterModel->setFilterFixedString(filter); - break; - } -} - -void MainWindow::on_filterType_currentIndexChanged(int) -{ - on_filterInput_textChanged(ui->filterInput->text()); -} diff --git a/management-gui/mainwindow.h b/management-gui/mainwindow.h index 96f4c09..fa2476b 100644 --- a/management-gui/mainwindow.h +++ b/management-gui/mainwindow.h @@ -25,8 +25,6 @@ public: ~MainWindow(); private slots: - void on_actionConnect_triggered(); - void dbConnected(); void dbDisconnected(); @@ -37,32 +35,40 @@ private slots: void openRenameScriptEditor(int fid); + void on_actionStartUDPCLient_triggered(); + void on_actionStartRenameHandler_triggered(); + void on_actionStartDirectoryWatcher_triggered(); + + void on_actionConnect_triggered(); void on_actionDisconnect_triggered(); + + void on_actionAddFiles_triggered(); void on_actionScanDirectory_triggered(); void on_actionImportMyList_triggered(); void on_actionImportTitles_triggered(); - void on_actionClearDatabase_triggered(); - void on_actionClearMyListData_triggered(); - void on_actionClearAnimeTitleData_triggered(); - void on_myListView_openFileRequested(const QModelIndex &index); - void on_myListView_renameFilesRequested(const QModelIndex &index); - void on_myListView_dataRequested(const QModelIndex &index); - void on_actionStartUDPCLient_triggered(); + void on_actionHandleRequests_triggered(); void on_actionRenameFiles_triggered(); - void on_actionStartRenameHandler_triggered(); + void on_actionClearStartedPendingRequests_triggered(); - void on_actionHandleRequests_triggered(); + void on_actionClearStartedMyListUpdates_triggered(); void on_actionClearFailedFileRenames_triggered(); void on_actionClearFileRenames_triggered(); - void on_actionClearStartedMyListUpdates_triggered(); - void on_actionAddFiles_triggered(); + void on_actionClearDatabase_triggered(); + void on_actionClearMyListData_triggered(); + void on_actionClearAnimeTitleData_triggered(); + void on_actionRemoveKnownUnknownFiles_triggered(); - void on_refreshButton_clicked(); void on_actionRenameScript_triggered(); - void on_actionStartDirectoryWatcher_triggered(); + void on_actionAddRelatedEpisodeInfo_triggered(); - void on_filterInput_textChanged(const QString &filter); + void on_refreshButton_clicked(); + + void on_myListView_openFileRequested(const QModelIndex &index); + void on_myListView_renameFilesRequested(const QModelIndex &index); + void on_myListView_dataRequested(const QModelIndex &index); + + void on_filterInput_textChanged(const QString &filter); void on_filterType_currentIndexChanged(int); protected: