diff --git a/CleanAMP/Eq_ex.bmp b/CleanAMP/Eq_ex.bmp deleted file mode 100644 index becb9de..0000000 Binary files a/CleanAMP/Eq_ex.bmp and /dev/null differ diff --git a/CleanAMP/Eq_ex.png b/CleanAMP/Eq_ex.png new file mode 100644 index 0000000..3e19d18 Binary files /dev/null and b/CleanAMP/Eq_ex.png differ diff --git a/CleanAMP/GENEX.bmp b/CleanAMP/GENEX.bmp deleted file mode 100644 index e3d9351..0000000 Binary files a/CleanAMP/GENEX.bmp and /dev/null differ diff --git a/CleanAMP/GENEX.png b/CleanAMP/GENEX.png new file mode 100644 index 0000000..9d15ed1 Binary files /dev/null and b/CleanAMP/GENEX.png differ diff --git a/CleanAMP/Gen.bmp b/CleanAMP/Gen.bmp deleted file mode 100644 index 6ed87cf..0000000 Binary files a/CleanAMP/Gen.bmp and /dev/null differ diff --git a/CleanAMP/Gen.png b/CleanAMP/Gen.png new file mode 100644 index 0000000..79ff648 Binary files /dev/null and b/CleanAMP/Gen.png differ diff --git a/CleanAMP/MONOSTER.BMP b/CleanAMP/MONOSTER.BMP deleted file mode 100644 index 17a27f8..0000000 Binary files a/CleanAMP/MONOSTER.BMP and /dev/null differ diff --git a/CleanAMP/VIDEO.bmp b/CleanAMP/VIDEO.bmp deleted file mode 100644 index 7d87f45..0000000 Binary files a/CleanAMP/VIDEO.bmp and /dev/null differ diff --git a/CleanAMP/VIDEO.png b/CleanAMP/VIDEO.png new file mode 100644 index 0000000..a07fee6 Binary files /dev/null and b/CleanAMP/VIDEO.png differ diff --git a/CleanAMP/Volume.bmp b/CleanAMP/Volume.bmp deleted file mode 100644 index f39a114..0000000 Binary files a/CleanAMP/Volume.bmp and /dev/null differ diff --git a/CleanAMP/Volume.png b/CleanAMP/Volume.png new file mode 100644 index 0000000..e2ee5c7 Binary files /dev/null and b/CleanAMP/Volume.png differ diff --git a/CleanAMP/balance.bmp b/CleanAMP/balance.bmp deleted file mode 100644 index 44cd424..0000000 Binary files a/CleanAMP/balance.bmp and /dev/null differ diff --git a/CleanAMP/balance.png b/CleanAMP/balance.png new file mode 100644 index 0000000..7cf9798 Binary files /dev/null and b/CleanAMP/balance.png differ diff --git a/CleanAMP/cbuttons.bmp b/CleanAMP/cbuttons.bmp deleted file mode 100644 index b93c676..0000000 Binary files a/CleanAMP/cbuttons.bmp and /dev/null differ diff --git a/CleanAMP/cbuttons.png b/CleanAMP/cbuttons.png new file mode 100644 index 0000000..d2120d9 Binary files /dev/null and b/CleanAMP/cbuttons.png differ diff --git a/CleanAMP/eqmain.bmp b/CleanAMP/eqmain.bmp deleted file mode 100644 index 4ff8440..0000000 Binary files a/CleanAMP/eqmain.bmp and /dev/null differ diff --git a/CleanAMP/eqmain.png b/CleanAMP/eqmain.png new file mode 100644 index 0000000..49d9b66 Binary files /dev/null and b/CleanAMP/eqmain.png differ diff --git a/CleanAMP/main.bmp b/CleanAMP/main.bmp deleted file mode 100644 index db8deab..0000000 Binary files a/CleanAMP/main.bmp and /dev/null differ diff --git a/CleanAMP/main.png b/CleanAMP/main.png new file mode 100644 index 0000000..e1cfc1e Binary files /dev/null and b/CleanAMP/main.png differ diff --git a/CleanAMP/mb.bmp b/CleanAMP/mb.bmp deleted file mode 100644 index 1a54fa8..0000000 Binary files a/CleanAMP/mb.bmp and /dev/null differ diff --git a/CleanAMP/mb.png b/CleanAMP/mb.png new file mode 100644 index 0000000..307f2cc Binary files /dev/null and b/CleanAMP/mb.png differ diff --git a/CleanAMP/monoster.png b/CleanAMP/monoster.png new file mode 100644 index 0000000..1c5f3a5 Binary files /dev/null and b/CleanAMP/monoster.png differ diff --git a/CleanAMP/numbers.bmp b/CleanAMP/numbers.bmp deleted file mode 100644 index 85ecad3..0000000 Binary files a/CleanAMP/numbers.bmp and /dev/null differ diff --git a/CleanAMP/numbers.png b/CleanAMP/numbers.png new file mode 100644 index 0000000..061f1f6 Binary files /dev/null and b/CleanAMP/numbers.png differ diff --git a/CleanAMP/playpaus.bmp b/CleanAMP/playpaus.bmp deleted file mode 100644 index 13d988e..0000000 Binary files a/CleanAMP/playpaus.bmp and /dev/null differ diff --git a/CleanAMP/playpaus.png b/CleanAMP/playpaus.png new file mode 100644 index 0000000..2d2eafd Binary files /dev/null and b/CleanAMP/playpaus.png differ diff --git a/CleanAMP/pledit.bmp b/CleanAMP/pledit.bmp deleted file mode 100644 index d42ee35..0000000 Binary files a/CleanAMP/pledit.bmp and /dev/null differ diff --git a/CleanAMP/pledit.png b/CleanAMP/pledit.png new file mode 100644 index 0000000..14253ad Binary files /dev/null and b/CleanAMP/pledit.png differ diff --git a/CleanAMP/posbar.bmp b/CleanAMP/posbar.bmp deleted file mode 100644 index ed92f6a..0000000 Binary files a/CleanAMP/posbar.bmp and /dev/null differ diff --git a/CleanAMP/posbar.png b/CleanAMP/posbar.png new file mode 100644 index 0000000..8c0a54e Binary files /dev/null and b/CleanAMP/posbar.png differ diff --git a/CleanAMP/shufrep.bmp b/CleanAMP/shufrep.bmp deleted file mode 100644 index 17f1943..0000000 Binary files a/CleanAMP/shufrep.bmp and /dev/null differ diff --git a/CleanAMP/shufrep.png b/CleanAMP/shufrep.png new file mode 100644 index 0000000..e74877e Binary files /dev/null and b/CleanAMP/shufrep.png differ diff --git a/CleanAMP/text.bmp b/CleanAMP/text.bmp deleted file mode 100644 index 7377d62..0000000 Binary files a/CleanAMP/text.bmp and /dev/null differ diff --git a/CleanAMP/text.png b/CleanAMP/text.png new file mode 100644 index 0000000..e9f8974 Binary files /dev/null and b/CleanAMP/text.png differ diff --git a/CleanAMP/titlebar.bmp b/CleanAMP/titlebar.bmp deleted file mode 100644 index a14b6e7..0000000 Binary files a/CleanAMP/titlebar.bmp and /dev/null differ diff --git a/CleanAMP/titlebar.png b/CleanAMP/titlebar.png new file mode 100644 index 0000000..565be7e Binary files /dev/null and b/CleanAMP/titlebar.png differ diff --git a/Medialib.cpp b/Medialib.cpp index 4b6848a..9c267c5 100644 --- a/Medialib.cpp +++ b/Medialib.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "qtmd5.h" MedialibWindow::MedialibWindow (QWidget *parent) : QMainWindow (parent) @@ -12,6 +13,14 @@ MedialibWindow::MedialibWindow (QWidget *parent) : QMainWindow (parent) #ifndef _WIN32 setWindowIcon (QIcon (":icon.png")); #endif + setWindowTitle ("Promoe - Medialib Window"); + + QSettings s; + s.beginGroup ("medialib"); + + if (!s.contains ("selected")) { + s.setValue ("selected", tr ("Artists")); + } resize (500, 550); @@ -39,6 +48,15 @@ MedialibWindow::MedialibWindow (QWidget *parent) : QMainWindow (parent) m_tab->addTab (m_list, tr ("Albums")); m_tab->addTab (new QWidget (m_tab), tr ("Songs")); + for (int i = 0; i < m_tab->count() ; i++) { + if (s.value("selected").toString () == m_tab->tabText (i)) { + m_tab->setCurrentIndex (i); + break; + } + } + + s.endGroup (); + connect (m_search, SIGNAL (textEdited (QString)), m_list, SLOT (search (QString))); } diff --git a/SettingsWindow.cpp b/SettingsWindow.cpp index 97de4c5..153303a 100644 --- a/SettingsWindow.cpp +++ b/SettingsWindow.cpp @@ -30,6 +30,7 @@ SettingsWindow::SettingsWindow (QWidget *parent) : QMainWindow (parent) QPushButton *ok = new QPushButton (tr ("OK")); ok->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed)); connect (ok, SIGNAL (clicked ()), this, SLOT (okButton ())); + connect (cancel, SIGNAL (clicked ()), this, SLOT (close ())); hbox->addWidget (new QWidget (dummy2), 1); hbox->addWidget (cancel); @@ -37,7 +38,7 @@ SettingsWindow::SettingsWindow (QWidget *parent) : QMainWindow (parent) m_mainwindow = new SettingsTabMain (tab); m_playlistwin = new SettingsTabPlaylist (tab); - m_medialib = new QWidget (tab); + m_medialib = new SettingsTabMedialib (tab); tab->addTab (m_mainwindow, tr ("Main Window")); tab->addTab (m_playlistwin, tr ("Playlist Window")); @@ -50,11 +51,56 @@ SettingsWindow::okButton (void) XMMSHandler *xmmsh = XMMSHandler::getInstance (); m_mainwindow->saveSettings (); m_playlistwin->saveSettings (); + m_medialib->saveSettings (); close (); xmmsh->updateSettings (); } +SettingsTabMedialib::SettingsTabMedialib (QWidget *parent) : QWidget (parent) +{ + QSettings s; + + s.beginGroup("medialib"); + QWidget *dummy = new QWidget (this); + + QVBoxLayout *vbox = new QVBoxLayout (dummy); + QWidget *c = new QWidget (dummy); + QHBoxLayout *h = new QHBoxLayout (c); + + vbox->addWidget (c, 1); + + m_selected = new QComboBox (c); + m_selected->addItem (tr ("Artists")); + m_selected->addItem (tr ("Albums")); + m_selected->addItem (tr ("Songs")); + m_selected->setEditable (false); + + QString curr = s.value ("selected").toString (); + for (int i = 0; i < m_selected->count(); i++) { + if (m_selected->itemText (i) == curr) { + m_selected->setCurrentIndex (i); + break; + } + } + + h->addWidget (m_selected); + + QLabel *l = new QLabel (tr ("Selected tab on startup"), c); + + h->addWidget (l, 1); + + s.endGroup (); + +} + +void +SettingsTabMedialib::saveSettings () +{ + QSettings s; + s.setValue ("medialib/selected", m_selected->currentText ()); +} + SettingsTabPlaylist::SettingsTabPlaylist (QWidget *parent) : QWidget (parent) { QSettings s; diff --git a/SettingsWindow.h b/SettingsWindow.h index fd07657..12360ed 100644 --- a/SettingsWindow.h +++ b/SettingsWindow.h @@ -9,6 +9,18 @@ #include #include #include +#include + +class SettingsTabMedialib : public QWidget { + Q_OBJECT + public: + SettingsTabMedialib (QWidget *parent); + ~SettingsTabMedialib () {} + void saveSettings (void); + + private: + QComboBox *m_selected; +}; class SettingsTabPlaylist : public QWidget { Q_OBJECT @@ -53,7 +65,7 @@ class SettingsWindow : public QMainWindow { private: SettingsTabMain *m_mainwindow; SettingsTabPlaylist *m_playlistwin; - QWidget *m_medialib; + SettingsTabMedialib *m_medialib; }; diff --git a/Skin.cpp b/Skin.cpp index 276ecb2..7ad06aa 100644 --- a/Skin.cpp +++ b/Skin.cpp @@ -32,7 +32,7 @@ Skin::BuildPlaylist (void) { QPixmap tmp; - QPixmap *img = getPixmap ("pledit.bmp"); + QPixmap *img = getPixmap ("pledit"); m_playlist->insert (PLS_CORNER_UL_0, img->copy(0, 0, 25, 20)); m_playlist->insert (PLS_CORNER_UL_1, img->copy(0, 21, 25, 20)); @@ -140,7 +140,8 @@ Skin::getPixmap (string file) QFileInfoList list = dir.entryInfoList(); for (int i = 0; i < list.size(); ++i) { QFileInfo fileInfo = list.at(i); - if (fileInfo.fileName().toLower() == f) { + QString fname = fileInfo.fileName().toLower(); + if (fname.section(".", 0, 0) == f) { return new QPixmap (fileInfo.filePath()); } } @@ -152,7 +153,7 @@ Skin::getPixmap (string file) void Skin::BuildLetterMap (void) { - QPixmap *img = getPixmap("text.bmp"); + QPixmap *img = getPixmap("text"); QList >(letters); for (int i = 0; i < 3; i++) { @@ -215,7 +216,7 @@ Skin::BuildLetterMap (void) void Skin::BuildButtons (void) { - QPixmap *img = getPixmap("cbuttons.bmp"); + QPixmap *img = getPixmap("cbuttons"); m_items->insert (BTN_PREV_0, img->copy(0, 0, 23, 18)); m_items->insert (BTN_PREV_1, img->copy(0, 18, 23, 18)); @@ -242,7 +243,7 @@ Skin::BuildButtons (void) void Skin::BuildToggleButtons (void) { - QPixmap *img = getPixmap("shufrep.bmp"); + QPixmap *img = getPixmap("shufrep"); m_items->insert(REPEAT_ON_0, img->copy(0, 30, 28, 15)); m_items->insert(REPEAT_ON_1, img->copy(0, 45, 28, 15)); @@ -275,7 +276,7 @@ Skin::BuildToggleButtons (void) void Skin::BuildTitleBar (void) { - QPixmap *img = getPixmap("titlebar.bmp"); + QPixmap *img = getPixmap("titlebar"); m_items->insert(MENUBUTTON_0, img->copy(0, 0, 9, 9)); m_items->insert(MENUBUTTON_1, img->copy(0, 9, 9, 9)); @@ -308,7 +309,7 @@ Skin::BuildOther (void) QPixmap *img, *part; QPainter(painter); - img = getPixmap("monoster.bmp"); + img = getPixmap("monoster"); m_items->insert (MONO_1, img->copy(29, 0, 27, 12)); m_items->insert (MONO_0, img->copy(29, 12, 27, 12)); m_items->insert (STEREO_1, img->copy(0, 0, 29, 12)); @@ -316,7 +317,7 @@ Skin::BuildOther (void) delete img; - img = getPixmap("playpaus.bmp"); + img = getPixmap("playpaus"); part = new QPixmap(11, 9); painter.begin(part); @@ -345,7 +346,7 @@ Skin::BuildOther (void) delete img; - img = getPixmap ("main.bmp"); + img = getPixmap ("main"); m_items->insert (MAIN_WINDOW, img->copy()); m_items->insert (ABOUT_0, img->copy(247, 83, 20, 25)); m_items->insert (ABOUT_1, img->copy(247, 83, 20, 24)); @@ -358,22 +359,22 @@ Skin::BuildSliders (void) { QPixmap *img; - img = getPixmap("posbar.bmp"); + img = getPixmap("posbar"); m_items->insert (POSBAR, img->copy (0, 0, 248, 10)); m_items->insert (POSBAR_BTN_0, img->copy (248, 0, 29, 10)); m_items->insert (POSBAR_BTN_1, img->copy (278, 0, 29, 10)); delete img; - img = getPixmap("volume.bmp"); + img = getPixmap("volume"); for (int i = VOLUMEBAR_POS_MIN; i < VOLUMEBAR_POS_MAX; i++) { m_volume_bar->insert(i, img->copy(0, i*15, 68, 13)); } delete img; - img = getPixmap("balance.bmp"); + img = getPixmap("balance"); if (!img) { - img = getPixmap("volume.bmp"); + img = getPixmap("volume"); } for (int i = BALANCE_POS_MIN; i < BALANCE_POS_MAX; i++) { @@ -388,10 +389,10 @@ Skin::BuildNumbers (void) { uint num = 11; - QPixmap *img = getPixmap("numbers.bmp"); + QPixmap *img = getPixmap("numbers"); if (!img) { num = 12; - img = getPixmap ("nums_ex.bmp"); + img = getPixmap ("nums_ex"); } for (uint i = 0; i < num; i++) { diff --git a/promoe.qrc b/promoe.qrc index 76abdb2..1c652ad 100644 --- a/promoe.qrc +++ b/promoe.qrc @@ -2,28 +2,27 @@ icon.png nocover.jpg - CleanAMP/Eq_ex.bmp - CleanAMP/GENEX.bmp - CleanAMP/Gen.bmp - CleanAMP/MONOSTER.BMP + CleanAMP/Eq_ex.png + CleanAMP/GENEX.png + CleanAMP/Gen.png + CleanAMP/monoster.png CleanAMP/PLEDIT.TXT CleanAMP/ReadMe.txt CleanAMP/Thumbs.db - CleanAMP/VIDEO.bmp - CleanAMP/Volume.bmp - CleanAMP/balance.bmp - CleanAMP/cbuttons.bmp - CleanAMP/eqmain.bmp - CleanAMP/main.bmp - CleanAMP/mb.bmp - CleanAMP/numbers.bmp - CleanAMP/playpaus.bmp - CleanAMP/pledit.bmp - CleanAMP/posbar.bmp - CleanAMP/shufrep.bmp - CleanAMP/text.bmp - CleanAMP/titlebar.bmp + CleanAMP/VIDEO.png + CleanAMP/Volume.png + CleanAMP/balance.png + CleanAMP/cbuttons.png + CleanAMP/eqmain.png + CleanAMP/main.png + CleanAMP/mb.png + CleanAMP/numbers.png + CleanAMP/playpaus.png + CleanAMP/pledit.png + CleanAMP/posbar.png + CleanAMP/shufrep.png + CleanAMP/text.png + CleanAMP/titlebar.png CleanAMP/viscolor.txt -