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

18
src/playlist/playlistlistcontainer.cpp
View File

@@ -53,7 +53,7 @@
#include "playlistlistmodel.h"
#include "playlistmanager.h"
#include "ui_playlistlistcontainer.h"
#include "organise/organisedialog.h"
#include "organize/organizedialog.h"
#include "settings/appearancesettingspage.h"
#ifndef Q_OS_WIN
# include "device/devicemanager.h"
@@ -345,12 +345,12 @@ void PlaylistListContainer::ItemDoubleClicked(const QModelIndex &proxy_index) {
void PlaylistListContainer::CopyToDevice()
{
#ifndef Q_OS_WIN
// Reuse the organise dialog, but set the detail about the playlist name
if (!organise_dialog_) {
organise_dialog_.reset(new OrganiseDialog {app_->task_manager()});
// Reuse the organize dialog, but set the detail about the playlist name
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);
organize_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true);
organize_dialog_->SetCopy(true);
const QModelIndex &current_index = proxy_->mapToSource(ui_->tree->currentIndex());
@@ -360,11 +360,11 @@ void PlaylistListContainer::CopyToDevice()
QStandardItem *item = model_->PlaylistById(playlist_id);
QString playlist_name = item ? item->text() : tr("Playlist");
organise_dialog_->SetPlaylist(playlist_name);
organize_dialog_->SetPlaylist(playlist_name);
// Get the songs in the playlist
organise_dialog_->SetSongs(app_->playlist_manager()->playlist(playlist_id)->GetAllSongs());
organise_dialog_->show();
organize_dialog_->SetSongs(app_->playlist_manager()->playlist(playlist_id)->GetAllSongs());
organize_dialog_->show();
}
#endif
}

4
src/playlist/playlistlistcontainer.h
View File

@@ -42,7 +42,7 @@ class Application;
class Playlist;
class PlaylistListModel;
class Ui_PlaylistListContainer;
class OrganiseDialog;
class OrganizeDialog;
class PlaylistListContainer : public QWidget {
Q_OBJECT
@@ -109,7 +109,7 @@ private:
int active_playlist_id_;
std::unique_ptr<OrganiseDialog> organise_dialog_;
std::unique_ptr<OrganizeDialog> organize_dialog_;
};
#endif // PLAYLISTLISTCONTAINER_H