Commit 98047b92 authored by Aaron J. Seigo's avatar Aaron J. Seigo

icon spec naming fixes by Luca Gugelmann

svn path=/trunk/KDE/kdemultimedia/juk/; revision=640673
parent e897258c
......@@ -60,12 +60,12 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete)
if(shouldDelete) {
ddDeleteText->setText(i18n("<qt>These items will be <b>permanently "
"deleted</b> from your hard disk.</qt>"));
ddWarningIcon->setPixmap(KIconLoader::global()->loadIcon("messagebox_warning",
ddWarningIcon->setPixmap(KIconLoader::global()->loadIcon("dialog-warning",
K3Icon::Desktop, K3Icon::SizeLarge));
}
else {
ddDeleteText->setText(i18n("<qt>These items will be moved to the Trash Bin.</qt>"));
ddWarningIcon->setPixmap(KIconLoader::global()->loadIcon("trashcan_full",
ddWarningIcon->setPixmap(KIconLoader::global()->loadIcon("user-trash-full",
K3Icon::Desktop, K3Icon::SizeLarge));
}
}
......@@ -76,7 +76,7 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete)
DeleteDialog::DeleteDialog(QWidget *parent, const char *name) :
KDialog(parent, Qt::WStyle_DialogBorder),
m_trashGuiItem(i18n("&Send to Trash"), "trashcan_full")
m_trashGuiItem(i18n("&Send to Trash"), "user-trash-full")
{
setObjectName(name);
setModal(true);
......
......@@ -79,7 +79,7 @@ public:
KVBox *hbox = new KVBox(vbox);
QLabel *l = new QLabel(hbox);
l->setPixmap(SmallIcon("messagebox_warning", 32));
l->setPixmap(SmallIcon("dialog-warning", 32));
l = new QLabel(i18n("You are about to rename the following files. "
"Are you sure you want to continue?"), hbox);
......@@ -342,8 +342,8 @@ FileRenamerWidget::~FileRenamerWidget()
int FileRenamerWidget::addRowCategory(TagType category)
{
kDebug(65432) << k_funcinfo << endl;
static QIcon up = SmallIcon("up");
static QIcon down = SmallIcon("down");
static QIcon up = SmallIcon("go-up");
static QIcon down = SmallIcon("go-down");
// Find number of categories already of this type.
int categoryCount = 0;
......
......@@ -177,23 +177,23 @@ void JuK::setupActions()
connect(act, SIGNAL(triggered(bool)), clear, SLOT(clear()));
act = new KAction(KIcon("player_play"), i18n("&Play"), collection);
act = new KAction(KIcon("media-playback-start"), i18n("&Play"), collection);
collection->addAction("play", act);
connect(act, SIGNAL(triggered(bool)), m_player, SLOT(play()));
act = new KAction(KIcon("player_pause"), i18n("P&ause"), collection);
act = new KAction(KIcon("media-playback-pause"), i18n("P&ause"), collection);
collection->addAction("pause", act);
connect(act, SIGNAL(triggered(bool)), m_player, SLOT(pause()));
act = new KAction(KIcon("player_stop"), i18n("&Stop"), collection);
act = new KAction(KIcon("media-playback-stop"), i18n("&Stop"), collection);
collection->addAction("stop", act);
connect(act, SIGNAL(triggered(bool)), m_player, SLOT(stop()));
act = new KToolBarPopupAction(KIcon("player_start"), i18nc("previous track", "Previous"), collection);
act = new KToolBarPopupAction(KIcon("media-skip-backward"), i18nc("previous track", "Previous"), collection);
collection->addAction("back", act);
connect(act, SIGNAL(triggered(bool)), m_player, SLOT(back()));
act = new KAction(KIcon("player_end"), i18nc("next track", "&Next"), collection);
act = new KAction(KIcon("media-skip-forward"), i18nc("next track", "&Next"), collection);
collection->addAction("forward", act);
connect(act, SIGNAL(triggered(bool)), m_player, SLOT(forward()));
......
......@@ -2095,7 +2095,7 @@ void Playlist::slotShowRMBMenu(Q3ListViewItem *item, const QPoint &point, int co
m_rmbMenu = new KMenu(this);
m_rmbUpcomingID = m_rmbMenu->insertItem(SmallIcon("today"),
m_rmbUpcomingID = m_rmbMenu->insertItem(SmallIcon("calendar-today"),
i18n("Add to Play Queue"), this, SLOT(slotAddToUpcoming()));
m_rmbMenu->addSeparator();
......@@ -2125,7 +2125,7 @@ void Playlist::slotShowRMBMenu(Q3ListViewItem *item, const QPoint &point, int co
m_rmbMenu->addSeparator();
m_rmbMenu->insertItem(
SmallIcon("folder_new"), i18n("Create Playlist From Selected Items..."), this, SLOT(slotCreateGroup()));
SmallIcon("folder-new"), i18n("Create Playlist From Selected Items..."), this, SLOT(slotCreateGroup()));
K3bExporter *exporter = new K3bExporter(this);
KAction *k3bAction = exporter->action();
......
......@@ -123,8 +123,8 @@ PlaylistBox::PlaylistBox(QWidget *parent, Q3WidgetStack *playlistStack) :
#endif
#if 0
QMenu *p = viewModeAction->menu();
p->changeItem(0, SmallIconSet("view_detailed"), modeNames[0]);
p->changeItem(1, SmallIconSet("view_text"), modeNames[1]);
p->changeItem(0, SmallIconSet("fileview-detailed"), modeNames[0]);
p->changeItem(1, SmallIconSet("fileview-text"), modeNames[1]);
p->changeItem(2, SmallIconSet("view_tree"), modeNames[2]);
#endif
......@@ -328,7 +328,7 @@ void PlaylistBox::remove()
"playlists from your collection?"),
names,
i18n("Remove Items?"),
KGuiItem(i18n("&Remove"), "edittrash")) == KMessageBox::Cancel)
KGuiItem(i18n("&Remove"), "edit-trash")) == KMessageBox::Cancel)
{
return;
}
......
......@@ -854,15 +854,15 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
// "New" menu
menu = new KActionMenu(KIcon("filenew"), i18n("&New"), actions());
menu = new KActionMenu(KIcon("document-new"), i18n("&New"), actions());
actions()->addAction("file_new", menu);
menu->addAction(createAction(i18n("&Empty Playlist..."), SLOT(slotCreatePlaylist()),
"newPlaylist", "window_new", KShortcut(Qt::CTRL + Qt::Key_N)));
"newPlaylist", "window-new", KShortcut(Qt::CTRL + Qt::Key_N)));
menu->addAction(createAction(i18n("&Search Playlist..."), SLOT(slotCreateSearchPlaylist()),
"newSearchPlaylist", "find", KShortcut(Qt::CTRL + Qt::Key_F)));
"newSearchPlaylist", "edit-find", KShortcut(Qt::CTRL + Qt::Key_F)));
menu->addAction(createAction(i18n("Playlist From &Folder..."), SLOT(slotCreateFolderPlaylist()),
"newDirectoryPlaylist", "fileopen", KShortcut(Qt::CTRL + Qt::Key_D)));
"newDirectoryPlaylist", "document-open", KShortcut(Qt::CTRL + Qt::Key_D)));
// Guess tag info menu
......@@ -873,43 +873,43 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
/* menu->setIconSet(SmallIconSet("wizard")); */
menu->addAction(createAction(i18n("From &File Name"), SLOT(slotGuessTagFromFile()),
"guessTagFile", "fileimport", KShortcut(Qt::CTRL + Qt::Key_G)));
"guessTagFile", "file-import", KShortcut(Qt::CTRL + Qt::Key_G)));
menu->addAction(createAction(i18n("From &Internet"), SLOT(slotGuessTagFromInternet()),
"guessTagInternet", "connect_established", KShortcut(Qt::CTRL + Qt::Key_I)));
"guessTagInternet", "connection-established", KShortcut(Qt::CTRL + Qt::Key_I)));
#else
createAction(i18n("Guess Tag Information From &File Name"), SLOT(slotGuessTagFromFile()),
"guessTag", "fileimport", KShortcut(Qt::CTRL + Qt::Key_F));
"guessTag", "file-import", KShortcut(Qt::CTRL + Qt::Key_F));
#endif
createAction(i18n("Play First Track"),SLOT(slotPlayFirst()), "playFirst");
createAction(i18n("Play Next Album"), SLOT(slotPlayNextAlbum()), "forwardAlbum", "next");
createAction(i18n("Play Next Album"), SLOT(slotPlayNextAlbum()), "forwardAlbum", "find-next");
createAction(i18n("Open..."), SLOT(slotOpen()), "file_open", "fileopen", KShortcut(Qt::CTRL + Qt::Key_O));
createAction(i18n("Add &Folder..."), SLOT(slotAddFolder()), "openDirectory", "fileopen");
createAction(i18n("Open..."), SLOT(slotOpen()), "file_open", "document-open", KShortcut(Qt::CTRL + Qt::Key_O));
createAction(i18n("Add &Folder..."), SLOT(slotAddFolder()), "openDirectory", "document-open");
createAction(i18n("&Rename..."), SLOT(slotRename()), "renamePlaylist", "lineedit");
createAction(i18n("D&uplicate..."), SLOT(slotDuplicate()), "duplicatePlaylist", "editcopy");
createAction(i18n("Save"), SLOT(slotSave()), "file_save", "filesave", KShortcut(Qt::CTRL + Qt::Key_S));
createAction(i18n("Save As..."), SLOT(slotSaveAs()), "file_save_as", "filesaveas");
createAction(i18n("R&emove"), SLOT(slotRemove()), "deleteItemPlaylist", "edittrash");
createAction(i18n("Reload"), SLOT(slotReload()), "reloadPlaylist", "reload");
createAction(i18n("Edit Search..."), SLOT(slotEditSearch()), "editSearch", "editclear");
createAction(i18n("D&uplicate..."), SLOT(slotDuplicate()), "duplicatePlaylist", "edit-copy");
createAction(i18n("Save"), SLOT(slotSave()), "file_save", "document-save", KShortcut(Qt::CTRL + Qt::Key_S));
createAction(i18n("Save As..."), SLOT(slotSaveAs()), "file_save_as", "document-save-as");
createAction(i18n("R&emove"), SLOT(slotRemove()), "deleteItemPlaylist", "edit-trash");
createAction(i18n("Reload"), SLOT(slotReload()), "reloadPlaylist", "view-refresh");
createAction(i18n("Edit Search..."), SLOT(slotEditSearch()), "editSearch", "edit-clear");
createAction(i18n("&Delete"), SLOT(slotRemoveItems()), "removeItem", "editdelete");
createAction(i18n("Refresh"), SLOT(slotRefreshItems()), "refresh", "reload");
createAction(i18n("&Rename File"), SLOT(slotRenameItems()), "renameFile", "filesaveas", KShortcut(Qt::CTRL + Qt::Key_R));
createAction(i18n("&Delete"), SLOT(slotRemoveItems()), "removeItem", "edit-delete");
createAction(i18n("Refresh"), SLOT(slotRefreshItems()), "refresh", "view-refresh");
createAction(i18n("&Rename File"), SLOT(slotRenameItems()), "renameFile", "document-save-as", KShortcut(Qt::CTRL + Qt::Key_R));
menu = new KActionMenu(i18n("Cover Manager"), actions());
actions()->addAction("coverManager", menu);
/* menu->setIconSet(SmallIconSet("image")); */
menu->addAction(createAction(i18n("&View Cover"),
SLOT(slotViewCovers()), "viewCover", "viewmag"));
SLOT(slotViewCovers()), "viewCover", "zoom-original"));
menu->addAction(createAction(i18n("Get Cover From &File..."),
SLOT(slotAddLocalCover()), "addCover", "fileimport", KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_F)));
SLOT(slotAddLocalCover()), "addCover", "file-import", KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_F)));
menu->addAction(createAction(i18n("Get Cover From &Internet..."),
SLOT(slotAddInternetCover()), "googleCover", "connect_established", KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_G)));
SLOT(slotAddInternetCover()), "googleCover", "connection-established", KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_G)));
menu->addAction(createAction(i18n("&Delete Cover"),
SLOT(slotRemoveCovers()), "removeCover", "editdelete"));
SLOT(slotRemoveCovers()), "removeCover", "edit-delete"));
menu->addAction(createAction(i18n("Show Cover &Manager"),
SLOT(slotShowCoverManager()), "showCoverManager"));
......@@ -919,7 +919,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
historyAction->setCheckedState(KGuiItem(i18n("Hide &History")));
KToggleAction *upcomingAction =
new KToggleAction(KIcon("today"), i18n("Show &Play Queue"), actions());
new KToggleAction(KIcon("calendar-today"), i18n("Show &Play Queue"), actions());
actions()->addAction("showUpcoming", upcomingAction);
upcomingAction->setCheckedState(KGuiItem(i18n("Hide &Play Queue")));
......
......@@ -127,7 +127,7 @@ void PlaylistSplitter::setupActions()
{
KActionCollection* coll = ActionCollection::actions();
KToggleAction *showSearch =
new KToggleAction(KIcon("filefind"), i18n("Show &Search Bar"), this);
new KToggleAction(KIcon("file-find"), i18n("Show &Search Bar"), this);
coll->addAction("showSearch", showSearch);
showSearch->setCheckedState(KGuiItem(i18n("Hide &Search Bar")));
......
......@@ -30,7 +30,7 @@ SearchPlaylist::SearchPlaylist(PlaylistCollection *collection,
const QString &name,
bool setupPlaylist,
bool synchronizePlaying) :
DynamicPlaylist(search.playlists(), collection, name, "find",
DynamicPlaylist(search.playlists(), collection, name, "edit-find",
setupPlaylist, synchronizePlaying),
m_search(search)
{
......
......@@ -87,7 +87,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, QWidget *parent) :
jumpBox->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
QPushButton *jumpButton = new QPushButton(jumpBox);
jumpButton->setIcon(SmallIcon("up"));
jumpButton->setIcon(SmallIcon("go-up"));
jumpButton->setFlat(true);
jumpButton->setToolTip( i18n("Jump to the currently playing item"));
......
......@@ -167,11 +167,11 @@ SystemTray::SystemTray(QWidget *parent) : KSystemTrayIcon(parent),
m_appPix = loadIcon("juk_dock");
m_playPix = createPixmap("player_play");
m_pausePix = createPixmap("player_pause");
m_playPix = createPixmap("media-playback-start");
m_pausePix = createPixmap("media-playback-pause");
m_forwardPix = SmallIcon("player_end");
m_backPix = SmallIcon("player_start");
m_forwardPix = SmallIcon("media-skip-forward");
m_backPix = SmallIcon("media-skip-backward");
setIcon(m_appPix);
......
......@@ -500,7 +500,7 @@ void TagEditor::setupActions()
show->setCheckedState(KGuiItem(i18n("Hide &Tag Editor")));
connect(show, SIGNAL(toggled(bool)), this, SLOT(setShown(bool)));
KAction *act = new KAction(KIcon("filesave"), i18n("&Save"), this);
KAction *act = new KAction(KIcon("document-save"), i18n("&Save"), this);
ActionCollection::actions()->addAction("saveItem", act);
act->setShortcut(Qt::CTRL + Qt::Key_T);
connect(act, SIGNAL(triggered(bool)), SLOT(slotSave()));
......@@ -540,7 +540,7 @@ void TagEditor::setupLayout()
m_trackNameBox = new KLineEdit(this);
m_trackNameBox->setObjectName( "trackNameBox" );
addItem(i18n("&Track name:"), m_trackNameBox, leftColumnLayout, "player_play");
addItem(i18n("&Track name:"), m_trackNameBox, leftColumnLayout, "media-playback-start");
m_albumNameBox = new KComboBox( true, this );
m_albumNameBox->setObjectName( "albumNameBox" );
......
......@@ -36,8 +36,8 @@ TagGuesserConfigDlg::TagGuesserConfigDlg(QWidget *parent, const char *name)
m_child->lvSchemes->setItemsRenameable(true);
m_child->lvSchemes->setSorting(-1);
m_child->lvSchemes->setDefaultRenameAction(Q3ListView::Accept);
m_child->bMoveUp->setIcon(BarIconSet("1uparrow"));
m_child->bMoveDown->setIcon(BarIconSet("1downarrow"));
m_child->bMoveUp->setIcon(BarIconSet("arrow-up"));
m_child->bMoveDown->setIcon(BarIconSet("arrow-down"));
const QStringList schemes = TagGuesser::schemeStrings();
QStringList::ConstIterator it = schemes.begin();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment