dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename organise to organize

Browse Source 
Prefer US spelling
This commit is contained in:
Jonas Kvinge
2020-08-04 21:18:14 +02:00
parent badc623a3c
commit 459404e3f0
43 changed files with 812 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/context/contextalbumsview.cpp
View File

@@ -56,7 +56,7 @@
# include "device/devicestatefiltermodel.h"
#endif
#include "dialogs/edittagdialog.h"
#include "organise/organisedialog.h"
#include "organize/organizedialog.h"
#include "contextalbumsmodel.h"
#include "contextalbumsview.h"
@@ -257,7 +257,7 @@ void ContextAlbumsView::contextMenuEvent(QContextMenuEvent *e) {
add_to_playlist_enqueue_ = context_menu_->addAction(IconLoader::Load("go-next"), tr("Queue track"), this, SLOT(AddToPlaylistEnqueue()));
context_menu_->addSeparator();
organise_ = context_menu_->addAction(IconLoader::Load("edit-copy"), tr("Organise files..."), this, SLOT(Organise()));
organize_ = context_menu_->addAction(IconLoader::Load("edit-copy"), tr("Organize files..."), this, SLOT(Organize()));
#ifndef Q_OS_WIN
copy_to_device_ = context_menu_->addAction(IconLoader::Load("device"), tr("Copy to device..."), this, SLOT(CopyToDevice()));
#endif
@@ -304,13 +304,13 @@ void ContextAlbumsView::contextMenuEvent(QContextMenuEvent *e) {
edit_track_->setVisible(regular_editable <= 1);
edit_track_->setEnabled(regular_editable == 1);
organise_->setVisible(regular_elements_only);
organize_->setVisible(regular_elements_only);
#ifndef Q_OS_WIN
copy_to_device_->setVisible(regular_elements_only);
#endif
// only when all selected items are editable
organise_->setEnabled(regular_elements == regular_editable);
organize_->setEnabled(regular_elements == regular_editable);
#ifndef Q_OS_WIN
copy_to_device_->setEnabled(regular_elements == regular_editable);
#endif
@@ -369,15 +369,15 @@ SongList ContextAlbumsView::GetSelectedSongs() const {
return model_->GetChildSongs(selected_indexes);
}
void ContextAlbumsView::Organise() {
void ContextAlbumsView::Organize() {
if (!organise_dialog_)
organise_dialog_.reset(new OrganiseDialog(app_->task_manager(), app_->collection_backend(), this));
if (!organize_dialog_)
organize_dialog_.reset(new OrganizeDialog(app_->task_manager(), app_->collection_backend(), this));
organise_dialog_->SetDestinationModel(app_->collection_model()->directory_model());
organise_dialog_->SetCopy(false);
if (organise_dialog_->SetSongs(GetSelectedSongs()))
organise_dialog_->show();
organize_dialog_->SetDestinationModel(app_->collection_model()->directory_model());
organize_dialog_->SetCopy(false);
if (organize_dialog_->SetSongs(GetSelectedSongs()))
organize_dialog_->show();
else {
QMessageBox::warning(this, tr("Error"), tr("None of the selected songs were suitable for copying to a device"));
}
@@ -396,13 +396,13 @@ void ContextAlbumsView::EditTracks() {
void ContextAlbumsView::CopyToDevice() {
#ifndef Q_OS_WIN
if (!organise_dialog_)
organise_dialog_.reset(new OrganiseDialog(app_->task_manager()));
if (!organize_dialog_)
organize_dialog_.reset(new OrganizeDialog(app_->task_manager()));
organise_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true);
organise_dialog_->SetCopy(true);
organise_dialog_->SetSongs(GetSelectedSongs());
organise_dialog_->show();
organize_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true);
organize_dialog_->SetCopy(true);
organize_dialog_->SetSongs(GetSelectedSongs());
organize_dialog_->show();
#endif
}

8
src/context/contextalbumsview.h
View File

@@ -48,7 +48,7 @@ class QPaintEvent;
class Application;
class ContextAlbumsModel;
class EditTagDialog;
class OrganiseDialog;
class OrganizeDialog;
class ContextItemDelegate : public QStyledItemDelegate {
Q_OBJECT
@@ -93,7 +93,7 @@ class ContextAlbumsView : public AutoExpandingTreeView {
void AddToPlaylist();
void AddToPlaylistEnqueue();
void OpenInNewPlaylist();
void Organise();
void Organize();
void CopyToDevice();
void EditTracks();
void ShowInBrowser();
@@ -112,7 +112,7 @@ class ContextAlbumsView : public AutoExpandingTreeView {
QAction *add_to_playlist_;
QAction *add_to_playlist_enqueue_;
QAction *open_in_new_playlist_;
QAction *organise_;
QAction *organize_;
#ifndef Q_OS_WIN
QAction *copy_to_device_;
#endif
@@ -120,7 +120,7 @@ class ContextAlbumsView : public AutoExpandingTreeView {
QAction *edit_tracks_;
QAction *show_in_browser_;
std::unique_ptr<OrganiseDialog> organise_dialog_;
std::unique_ptr<OrganizeDialog> organize_dialog_;
std::unique_ptr<EditTagDialog> edit_tag_dialog_;
bool is_in_keyboard_search_;