summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--beetplayer.cpp2
-rw-r--r--beetplayer.qrc7
-rw-r--r--butt_plug_light.pngbin0 -> 5135 bytes
-rw-r--r--chastity_belt_light.pngbin0 -> 4834 bytes
-rw-r--r--collectionwebradioview.cpp2
-rw-r--r--collectionwidget.cpp25
-rw-r--r--dice_light.pngbin0 -> 2937 bytes
-rw-r--r--dog_hood_light.pngbin0 -> 4767 bytes
-rw-r--r--helper.cpp18
-rw-r--r--male_chastity_belt.pngbin927 -> 5064 bytes
-rw-r--r--playerwidget.cpp38
-rw-r--r--shuffle_light.pngbin0 -> 2942 bytes
-rw-r--r--song.pngbin12807 -> 5482 bytes
-rw-r--r--stomp.pngbin946 -> 0 bytes
-rw-r--r--stop.pngbin8770 -> 17577 bytes
-rw-r--r--used_tampon.pngbin757 -> 0 bytes
-rw-r--r--webradiodialog.cpp2
17 files changed, 57 insertions, 37 deletions
diff --git a/beetplayer.cpp b/beetplayer.cpp
index a97ff7d..c1ecc38 100644
--- a/beetplayer.cpp
+++ b/beetplayer.cpp
@@ -97,7 +97,7 @@ void BeetPlayer::createGlobalActions(){
connect(quitA, &QAction::triggered, qApp, &QApplication::closeAllWindows);
quitA->setData(Globals::QuitAction);
Globals::instance()->addAction(quitA);
- QAction *configA = new QAction(QIcon(":/chastity_belt.png"), tr("Configure..."), this);
+ QAction *configA = new QAction(QIcon(":/chastity_belt_light.png"), tr("Configure..."), this);
connect(configA, &QAction::triggered, this, &BeetPlayer::configure);
configA->setData(Globals::ConfigAction);
Globals::instance()->addAction(configA);
diff --git a/beetplayer.qrc b/beetplayer.qrc
index b8b0ab0..316591f 100644
--- a/beetplayer.qrc
+++ b/beetplayer.qrc
@@ -18,7 +18,6 @@
<file>artist.png</file>
<file>song.png</file>
<file>genre.png</file>
- <file>stomp.png</file>
<file>clean_tampon.png</file>
<file>belly_right_and_clear.png</file>
<file>folder.png</file>
@@ -31,6 +30,10 @@
<file>quadd.png</file>
<file>dog_hood.png</file>
<file>male_chastity_belt.png</file>
- <file>used_tampon.png</file>
+ <file>butt_plug_light.png</file>
+ <file>chastity_belt_light.png</file>
+ <file>dog_hood_light.png</file>
+ <file>dice_light.png</file>
+ <file>shuffle_light.png</file>
</qresource>
</RCC>
diff --git a/butt_plug_light.png b/butt_plug_light.png
new file mode 100644
index 0000000..d6e2f03
--- /dev/null
+++ b/butt_plug_light.png
Binary files differ
diff --git a/chastity_belt_light.png b/chastity_belt_light.png
new file mode 100644
index 0000000..f3430ad
--- /dev/null
+++ b/chastity_belt_light.png
Binary files differ
diff --git a/collectionwebradioview.cpp b/collectionwebradioview.cpp
index 7fa01de..0ec9287 100644
--- a/collectionwebradioview.cpp
+++ b/collectionwebradioview.cpp
@@ -13,7 +13,7 @@ void CollectionWebradioView::populate(){
model()->setHorizontalHeaderLabels(headers());
QSqlDatabase db = QSqlDatabase::database("beetplayerdb");
QStandardItem *root = model()->invisibleRootItem();
- QIcon wrIcon(":/dog_hood.png");
+ QIcon wrIcon(":/dog_hood_light.png");
QSqlQuery wrQ = QSqlQuery("SELECT tdescription, turl FROM webradio ORDER BY tdescription DESC", db);
while(wrQ.next()){
QStandardItem *curWr = new QStandardItem;
diff --git a/collectionwidget.cpp b/collectionwidget.cpp
index 127c6a6..b0eb29b 100644
--- a/collectionwidget.cpp
+++ b/collectionwidget.cpp
@@ -1,13 +1,15 @@
#include <QStandardItem>
#include <QSortFilterProxyModel>
#include <QLineEdit>
-#include <QGroupBox>
+//#include <QGroupBox>
+#include <QLabel>
#include <QToolBar>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include "collectionwidget.h"
#include "collectionwidgetproxy.h"
+#include "helper.h"
CollectionWidget::CollectionWidget(QWidget *parent) : QWidget(parent){
mCustomActions = new QActionGroup(this);
@@ -19,25 +21,26 @@ CollectionWidget::CollectionWidget(QWidget *parent) : QWidget(parent){
mView->setSortingEnabled(true);
mView->setAlternatingRowColors(true);
mView->setSelectionMode(QAbstractItemView::ExtendedSelection);
- QGroupBox *filterGB = new QGroupBox(tr("Filter"));
- QHBoxLayout *filterGBL = new QHBoxLayout;
+ QLabel *filterL = new QLabel(tr("&Filter:"));
+ QHBoxLayout *filterLayout = new QHBoxLayout;
mFilter = new QLineEdit;
- filterGBL->addWidget(mFilter);
- QToolBar *filterTB = new QToolBar;
- QAction *clearFilter = new QAction(QIcon(":/clean_tampon.png"), tr("Clear filter"), this);
+ filterL->setBuddy(mFilter);
+ QAction *clearFilter = new QAction(Helper::iconFromQChar(QChar(0x2694), 28), tr("Clear filter"), this);
connect(clearFilter, &QAction::triggered, [this, proxy] { mFilter->clear(); proxy->setFilterRegExp("");} );
- filterTB->addAction(clearFilter);
- QAction *activateFilter = new QAction(QIcon(":/stomp.png"), tr("Filter!"), this);
+ QAction *activateFilter = new QAction(Helper::iconFromQChar(QChar(0x2245), 28), tr("Filter!"), this);
connect(activateFilter, &QAction::triggered, [this, proxy] {
proxy->setFilterRegExp(mFilter->text());
expandFirst(proxy);
} );
connect(mFilter, &QLineEdit::returnPressed, activateFilter, &QAction::trigger);
+ QToolBar *filterTB = new QToolBar;
filterTB->addAction(activateFilter);
- filterGBL->addWidget(filterTB);
- filterGB->setLayout(filterGBL);
+ filterTB->addAction(clearFilter);
+ filterLayout->addWidget(filterL);
+ filterLayout->addWidget(mFilter);
+ filterLayout->addWidget(filterTB);
QVBoxLayout *mainLayout = new QVBoxLayout;
- mainLayout->addWidget(filterGB);
+ mainLayout->addLayout(filterLayout);
mainLayout->addWidget(mView);
setLayout(mainLayout);
}
diff --git a/dice_light.png b/dice_light.png
new file mode 100644
index 0000000..b55097f
--- /dev/null
+++ b/dice_light.png
Binary files differ
diff --git a/dog_hood_light.png b/dog_hood_light.png
new file mode 100644
index 0000000..f16fdd3
--- /dev/null
+++ b/dog_hood_light.png
Binary files differ
diff --git a/helper.cpp b/helper.cpp
index 5fa3a3b..306a2d1 100644
--- a/helper.cpp
+++ b/helper.cpp
@@ -10,15 +10,19 @@
namespace Helper {
QIcon iconFromQChar(const QChar &c, int pixelSize){
- QPixmap pm(QSize(64,64));
- QPainter p(&pm);
- QFont f = p.font();
+ QImage img(32, 32, QImage::Format_ARGB32);
+ img.fill(QColor(0, 0, 0, 0));
+ QPainter p(&img);
+ p.setRenderHint(QPainter::Antialiasing);
+ p.setRenderHint(QPainter::TextAntialiasing);
+ p.setRenderHint(QPainter::SmoothPixmapTransform);
+ p.setPen(qApp->palette().color(QPalette::Text));
+ QFont f(qApp->font());
f.setPixelSize(pixelSize);
+ f.setBold(true);
p.setFont(f);
- p.fillRect(pm.rect(), qApp->palette().color(QPalette::Window));
- p.setBrush(QBrush(Qt::black));
- p.drawText(pm.rect(), Qt::AlignCenter, c);
- return QIcon(pm);
+ p.drawText(img.rect(), Qt::AlignCenter, c);
+ return QIcon(QPixmap::fromImage(img));
}
QAction* createSeparator(QObject *parent){
diff --git a/male_chastity_belt.png b/male_chastity_belt.png
index ca3a859..a01531b 100644
--- a/male_chastity_belt.png
+++ b/male_chastity_belt.png
Binary files differ
diff --git a/playerwidget.cpp b/playerwidget.cpp
index cab33b9..a21cdca 100644
--- a/playerwidget.cpp
+++ b/playerwidget.cpp
@@ -140,7 +140,7 @@ void PlayerWidget::setupGui(QSplashScreen *splash){
qApp->processEvents();
webradioView->populate();
cIdx = mCollectionStack->addWidget(webradioView);
- QAction *viewByWebradioA = new QAction(QIcon(":/dog_hood.png"), tr("Webradio"), this);
+ QAction *viewByWebradioA = new QAction(QIcon(":/dog_hood_light.png"), tr("Webradio"), this);
viewByWebradioA->setCheckable(true);
connect(viewByWebradioA, &QAction::triggered, [this, cIdx] { setCollectionIndex(cIdx, true); });
mBottomTBG->addAction(viewByWebradioA);
@@ -191,10 +191,10 @@ void PlayerWidget::setupGui(QSplashScreen *splash){
QStandardItemModel *model = curW->model();
QModelIndex rootIdx = model->invisibleRootItem()->index();
if(model->hasChildren(model->index(0, 0, rootIdx))){
- QAction *expandA = new QAction(Helper::iconFromQChar(QChar(0x2640), 90), tr("Expand"), this);
+ QAction *expandA = new QAction(Helper::iconFromQChar(QChar(0x2640), 28), tr("Expand"), this);
connect(expandA, &QAction::triggered, [curW] { curW->view()->expandOrCollapse(BeetView::Expand);} );
curW->view()->addAction(expandA);
- QAction *collapseA = new QAction(Helper::iconFromQChar(QChar(0x2642), 120), tr("Collapse"), this);
+ QAction *collapseA = new QAction(Helper::iconFromQChar(QChar(0x2642), 28), tr("Collapse"), this);
connect(collapseA, &QAction::triggered, [curW] { curW->view()->expandOrCollapse(BeetView::Collapse);} );
curW->view()->addAction(collapseA);
curW->view()->addAction(Helper::createSeparator(this));
@@ -221,18 +221,22 @@ void PlayerWidget::setupGui(QSplashScreen *splash){
);
curW->view()->addAction(refreshA);
curW->view()->addAction(Helper::createSeparator(this));
- QAction *searchMBA = new QAction(QIcon(":/bizarre_amputee.png"), tr("Search Musicbrainz"), this);
+ QAction *searchMBA = new QAction(Helper::iconFromQChar(QChar(0x2047), 28), tr("Search Musicbrainz"), this);
connect(searchMBA, &QAction::triggered, [this, curW] { searchMusicbrainz(curW->view()->selectionModel()->currentIndex()); });
curW->view()->addAction(searchMBA);
if(name == "favorites"){
- QAction *addAllFavsA = new QAction((QIcon(":/shuffle.png")), tr("Clear and Add all"), this);
+ QAction *addAllFavsA = new QAction((QIcon(":/shuffle_light.png")), tr("Clear and Add all"), this);
connect(addAllFavsA, &QAction::triggered, this, &PlayerWidget::clearAndAddAllFavorites);
curW->customActions()->addAction(addAllFavsA);
}
curW->view()->addActions(curW->customActions()->actions());
}
}
- QAction *gotoAlbumA = new QAction(QIcon(":/next.png"), tr("Goto album"), this);
+ QPixmap buttPlug(":/butt_plug_light.png");
+ QMatrix rotateMatrix;
+ rotateMatrix.rotate(90);
+ QIcon gotoIcon(buttPlug.transformed(rotateMatrix));
+ QAction *gotoAlbumA = new QAction(gotoIcon, tr("Goto album"), this);
connect(gotoAlbumA, &QAction::triggered, this, &PlayerWidget::gotoAlbum);
artistsView->view()->addAction(gotoAlbumA);
@@ -390,11 +394,17 @@ void PlayerWidget::createActions(){
playOrPauseA->setObjectName("beetPlayerDoPlayOrPause");
connect(playOrPauseA, &QAction::triggered, this, &PlayerWidget::doPlayOrPause);
KGlobalAccel::self()->setShortcut(playOrPauseA, QList<QKeySequence>() << QKeySequence(Qt::Key_MediaPlay), KGlobalAccel::Autoloading);
- QAction *previousA = new QAction(QIcon(":/previous.png"), tr("Previous"), this);
+ QPixmap buttPlug(":/butt_plug_light.png");
+ QMatrix rotateMatrix;
+ rotateMatrix.rotate(-90);
+ QIcon prevIcon(buttPlug.transformed(rotateMatrix));
+ rotateMatrix.rotate(180);
+ QIcon nextIcon(buttPlug.transformed(rotateMatrix));
+ QAction *previousA = new QAction(prevIcon, tr("Previous"), this);
previousA->setObjectName("beetPlayerPrevious");
connect(previousA, &QAction::triggered, this, &PlayerWidget::previous);
KGlobalAccel::self()->setShortcut(previousA, QList<QKeySequence>() << QKeySequence(Qt::Key_Launch2), KGlobalAccel::Autoloading);
- QAction *nextA = new QAction(QIcon(":/next.png"), tr("Next"), this);
+ QAction *nextA = new QAction(nextIcon, tr("Next"), this);
nextA->setObjectName("beetPlayerNext");
connect(nextA, &QAction::triggered, this, &PlayerWidget::next);
KGlobalAccel::self()->setShortcut(nextA, QList<QKeySequence>() << QKeySequence(Qt::Key_Launch3), KGlobalAccel::Autoloading);
@@ -406,9 +416,9 @@ void PlayerWidget::createActions(){
connect(clearPlayListA, &QAction::triggered, this, &PlayerWidget::clearPlayList);
QAction *refreshA = new QAction(QIcon(":/refresh.png"), tr("Refresh..."), this);
connect(refreshA, &QAction::triggered, this, &PlayerWidget::reindex);
- QAction *shufflePlayistA = new QAction(QIcon(":/shuffle.png"), tr("Shuffle playlist"), this);
+ QAction *shufflePlayistA = new QAction(QIcon(":/shuffle_light.png"), tr("Shuffle playlist"), this);
connect(shufflePlayistA, &QAction::triggered, this, &PlayerWidget::shufflePlayList);
- QAction *randomPlayA = new QAction(QIcon(":/dice.png"), tr("Play random"), this);
+ QAction *randomPlayA = new QAction(QIcon(":/dice_light.png"), tr("Play random"), this);
connect(randomPlayA, &QAction::triggered, this, &PlayerWidget::randomPlay);
QAction *muteA = new QAction(QIcon(":/mute.png"), tr("Mute"), this);
muteA->setObjectName("beetPlayerMute");
@@ -424,7 +434,7 @@ void PlayerWidget::createActions(){
connect(volumeDownA, &QAction::triggered, this, &PlayerWidget::volumeDown);
KGlobalAccel::self()->setShortcut(volumeDownA, QList<QKeySequence>() << QKeySequence(Qt::Key_VolumeDown), KGlobalAccel::Autoloading);
QAction *configA = Globals::instance()->action(Globals::ConfigAction);
- QAction *helpA = new QAction(Helper::iconFromQChar(QChar(0x00BF), 50), tr("Help"), this);
+ QAction *helpA = new QAction(Helper::iconFromQChar(QChar(0x00BF), 28), tr("Help"), this);
QMenu *helpM = new QMenu;
QAction *aboutThisA = new QAction(tr("About..."), this);
connect(aboutThisA, &QAction::triggered, this, &PlayerWidget::aboutDlg);;
@@ -433,7 +443,7 @@ void PlayerWidget::createActions(){
connect(aboutQtA, &QAction::triggered, qApp, &QApplication::aboutQt);
helpM->addAction(aboutQtA);
helpA->setMenu(helpM);
- QAction *plSearchMB = new QAction(QIcon(":/bizarre_amputee.png"), tr("Search Musicbrainz"), this);
+ QAction *plSearchMB = new QAction(Helper::iconFromQChar(QChar(0x2047), 28), tr("Search Musicbrainz"), this);
connect(plSearchMB, &QAction::triggered, [this] { searchMusicbrainz(mSongView->selectionModel()->currentIndex()); });
QAction *addToFavoritesA = new QAction(QIcon(":/male_chastity_belt.png"), tr("Add to Favorites"), this);
connect(addToFavoritesA, &QAction::triggered, [this] { addToFavorites(mSongView->selectionModel()->selectedRows()); });
@@ -667,7 +677,7 @@ void PlayerWidget::addToPlayList(){
mSongModel->setHorizontalHeaderLabels(QStringList() << tr("Title"));
QStandardItem *wrItem = new QStandardItem;
wrItem->setEditable(false);
- wrItem->setIcon(QIcon(":dog_hood.png"));
+ wrItem->setIcon(QIcon(":/dog_hood_light.png"));
wrItem->setText(i.data(CollectionWidget::TitleRole).toString());
wrItem->setData(CollectionWidget::WebRadio, CollectionWidget::TypeRole);
wrItem->setData(i.data(CollectionWidget::UrlRole), CollectionWidget::UrlRole);
@@ -875,7 +885,7 @@ void PlayerWidget::doMetadataChange(const QString &key, const QVariant &value){
QStandardItem *nowP = new QStandardItem;
nowP->setFont(QFont("courier"));
nowP->setEditable(false);
- nowP->setIcon(QIcon(":/dog_hood.png"));
+ nowP->setIcon(QIcon(":/dog_hood_light.png"));
nowP->setData(1, CollectionWidget::RemoteRole);
nowP->setData(artist, CollectionWidget::ArtistRole);
nowP->setData(title, CollectionWidget::TitleRole);
diff --git a/shuffle_light.png b/shuffle_light.png
new file mode 100644
index 0000000..4a94a81
--- /dev/null
+++ b/shuffle_light.png
Binary files differ
diff --git a/song.png b/song.png
index 26dd3e8..0e79927 100644
--- a/song.png
+++ b/song.png
Binary files differ
diff --git a/stomp.png b/stomp.png
deleted file mode 100644
index e45b2f9..0000000
--- a/stomp.png
+++ /dev/null
Binary files differ
diff --git a/stop.png b/stop.png
index 86bfbf7..bddf81f 100644
--- a/stop.png
+++ b/stop.png
Binary files differ
diff --git a/used_tampon.png b/used_tampon.png
deleted file mode 100644
index 73c318f..0000000
--- a/used_tampon.png
+++ /dev/null
Binary files differ
diff --git a/webradiodialog.cpp b/webradiodialog.cpp
index 089be38..53ff3fc 100644
--- a/webradiodialog.cpp
+++ b/webradiodialog.cpp
@@ -60,7 +60,7 @@ void WebRadioDialog::populate(){
mModel->clear();
mModel->setHorizontalHeaderLabels(QStringList() << tr("Description") << tr("URL"));
QStandardItem *root = mModel->invisibleRootItem();
- QIcon wrIcon(":/dog_hood.png");
+ QIcon wrIcon(":/dog_hood_light.png");
QSqlQuery wrQ = QSqlQuery(db);
wrQ.prepare("SELECT tdescription, turl FROM webradio ORDER BY tdescription DESC");
wrQ.exec();
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-04-26 22:54:48 +0000