From: Torste Aikio Date: Thu, 8 Jul 2010 11:54:26 +0000 (+0300) Subject: Added png thumb icons and code to support them X-Git-Url: http://vcs.maemo.org/git/?p=irwi;a=commitdiff_plain;h=eb29b282d9e3a0f3a23827b83ee591f0e194056c Added png thumb icons and code to support them --- diff --git a/data/symbols/0_thumbs.png b/data/symbols/0_thumbs.png new file mode 100644 index 0000000..4f5d53f Binary files /dev/null and b/data/symbols/0_thumbs.png differ diff --git a/data/symbols/down_1_thumbs.png b/data/symbols/down_1_thumbs.png new file mode 100644 index 0000000..5ed7ec8 Binary files /dev/null and b/data/symbols/down_1_thumbs.png differ diff --git a/data/symbols/down_2_thumbs.png b/data/symbols/down_2_thumbs.png new file mode 100644 index 0000000..447115e Binary files /dev/null and b/data/symbols/down_2_thumbs.png differ diff --git a/data/symbols/down_3_thumbs.png b/data/symbols/down_3_thumbs.png new file mode 100644 index 0000000..b70ffce Binary files /dev/null and b/data/symbols/down_3_thumbs.png differ diff --git a/data/symbols/down_4_thumbs.png b/data/symbols/down_4_thumbs.png new file mode 100644 index 0000000..c9f60ee Binary files /dev/null and b/data/symbols/down_4_thumbs.png differ diff --git a/data/symbols/down_5_thumbs.png b/data/symbols/down_5_thumbs.png new file mode 100644 index 0000000..6719d26 Binary files /dev/null and b/data/symbols/down_5_thumbs.png differ diff --git a/data/symbols/symbol_thumbs_down.png b/data/symbols/symbol_thumbs_down.png new file mode 100644 index 0000000..9ecb2d1 Binary files /dev/null and b/data/symbols/symbol_thumbs_down.png differ diff --git a/data/symbols/symbol_thumbs_up.png b/data/symbols/symbol_thumbs_up.png new file mode 100644 index 0000000..7ea0f1a Binary files /dev/null and b/data/symbols/symbol_thumbs_up.png differ diff --git a/data/symbols/up_1_thumbs.png b/data/symbols/up_1_thumbs.png new file mode 100644 index 0000000..0a270a1 Binary files /dev/null and b/data/symbols/up_1_thumbs.png differ diff --git a/data/symbols/up_2_thumbs.png b/data/symbols/up_2_thumbs.png new file mode 100644 index 0000000..6654e81 Binary files /dev/null and b/data/symbols/up_2_thumbs.png differ diff --git a/data/symbols/up_3_thumbs.png b/data/symbols/up_3_thumbs.png new file mode 100644 index 0000000..8e21b51 Binary files /dev/null and b/data/symbols/up_3_thumbs.png differ diff --git a/data/symbols/up_4_thumbs.png b/data/symbols/up_4_thumbs.png new file mode 100644 index 0000000..a3e9f84 Binary files /dev/null and b/data/symbols/up_4_thumbs.png differ diff --git a/data/symbols/up_5_thumbs.png b/data/symbols/up_5_thumbs.png new file mode 100644 index 0000000..3186a0d Binary files /dev/null and b/data/symbols/up_5_thumbs.png differ diff --git a/src/advsettingsdlg.cpp b/src/advsettingsdlg.cpp index 98a43b6..8a2a15f 100644 --- a/src/advsettingsdlg.cpp +++ b/src/advsettingsdlg.cpp @@ -85,6 +85,7 @@ void AdvSettingsDlg::setDefaults() settings->setValue("width", 250); settings->setValue("idleTimeout", 300); settings->setValue("baseUrl", "http://mercury.wipsl.com/irwi/"); + settings->setValue("symbolPath", "/usr/share/irwi/symbols/"); } void AdvSettingsDlg::showResetQuery() diff --git a/src/remotetable.cpp b/src/remotetable.cpp index b27301e..c01d7d0 100644 --- a/src/remotetable.cpp +++ b/src/remotetable.cpp @@ -1,14 +1,16 @@ #include #include -#include +#include +#include +#include +#include + #include "remotetable.h" #include "remote.h" RemoteTable::RemoteTable(QWidget *parent) // Always two columns: Remote name and rating. - : QTableWidget(0, 2, parent), - thumbsUp("/usr/share/irwi/symbols/symbol_thumbs_up.svg"), - thumbsDown("/usr/share/irwi/symbols/symbol_thumbs_down.svg") + : QTableWidget(0, 2, parent) { verticalHeader()->setVisible(false); horizontalHeader()->setVisible(false); @@ -20,6 +22,39 @@ RemoteTable::~RemoteTable() { } +QWidget *RemoteTable::selectRatingWidget(int rating) +{ + QSettings settings; + QLabel *label = new QLabel; + QPixmap pix; + if (rating < -45) { + pix = QPixmap(settings.value("symbolPath", "/usr/share/irwi/symbols/").toString() + "down_5_thumbs.png"); + } else if (rating < -25) { + pix = QPixmap(settings.value("symbolPath", "/usr/share/irwi/symbols/").toString() + "down_4_thumbs.png"); + } else if (rating < -12) { + pix = QPixmap(settings.value("symbolPath", "/usr/share/irwi/symbols/").toString() + "down_3_thumbs.png"); + } else if (rating < -5) { + pix = QPixmap(settings.value("symbolPath", "/usr/share/irwi/symbols/").toString() + "down_2_thumbs.png"); + } else if (rating < 0) { + pix = QPixmap(settings.value("symbolPath", "/usr/share/irwi/symbols/").toString() + "down_1_thumbs.png"); + } else if (rating == 0) { + pix = QPixmap(settings.value("symbolPath", "/usr/share/irwi/symbols/").toString() + "0_thumbs.png"); + } else if (rating < 5) { + pix = QPixmap(settings.value("symbolPath", "/usr/share/irwi/symbols/").toString() + "up_1_thumbs.png"); + } else if (rating < 12) { + pix = QPixmap(settings.value("symbolPath", "/usr/share/irwi/symbols/").toString() + "up_2_thumbs.png"); + } else if (rating < 25) { + pix = QPixmap(settings.value("symbolPath", "/usr/share/irwi/symbols/").toString() + "up_3_thumbs.png"); + } else if (rating < 45) { + pix = QPixmap(settings.value("symbolPath", "/usr/share/irwi/symbols/").toString() + "up_4_thumbs.png"); + } else { + pix = QPixmap(settings.value("symbolPath", "/usr/share/irwi/symbols/").toString() + "up_5_thumbs.png"); + } + + label->setPixmap(pix); + return label; +} + void RemoteTable::addItem(Remote *remote) { if (remote == NULL) { @@ -29,12 +64,7 @@ void RemoteTable::addItem(Remote *remote) remotes[currentRow] = remote; QString key = remote->name(); - QWidget *ratingWidget = NULL; - if (remote->rating() > 5) { - ratingWidget = new QSvgWidget(thumbsUp); - } else { - ratingWidget = new QSvgWidget(thumbsDown); - } + QWidget *ratingWidget = selectRatingWidget(remote->rating()); QTableWidgetItem *k = new QTableWidgetItem(key); k->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); insertRow(currentRow); @@ -59,10 +89,9 @@ void RemoteTable::removeAllRows() setRowCount(0); remotes.clear(); } -/* + void RemoteTable::resizeEvent(QResizeEvent *e) { - setColumnWidth(0, (2 * e->size().width() / 3) - 10); - setColumnWidth(1, (e->size().width() / 3) - 10); + setColumnWidth(0, e->size().width() - 148); + setColumnWidth(1, 128); } -*/ diff --git a/src/remotetable.h b/src/remotetable.h index e783cf7..af0e141 100644 --- a/src/remotetable.h +++ b/src/remotetable.h @@ -7,6 +7,7 @@ class QResizeEvent; class Remote; +class QWidget; class RemoteTable : public QTableWidget { @@ -19,12 +20,11 @@ public: Remote *selected(); protected: - //void resizeEvent(QResizeEvent *); + void resizeEvent(QResizeEvent *); private: QMap remotes; - QString thumbsUp; - QString thumbsDown; + QWidget *selectRatingWidget(int rating); }; #endif // _REMOTETABLE_H_ diff --git a/src/selectremotedlg.cpp b/src/selectremotedlg.cpp index b6fefb2..16926fa 100644 --- a/src/selectremotedlg.cpp +++ b/src/selectremotedlg.cpp @@ -26,7 +26,7 @@ SelectRemoteDlg::SelectRemoteDlg(QWidget *parent) layout = new QHBoxLayout(this); alphabetList = new QListWidget(this); - alphabetList->setMaximumWidth(96); + alphabetList->setMaximumWidth(64); layout->addWidget(alphabetList); connect(alphabetList, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), @@ -34,6 +34,7 @@ SelectRemoteDlg::SelectRemoteDlg(QWidget *parent) SLOT(alphabetItemChanged(QListWidgetItem*, QListWidgetItem*))); mfgList = new QListWidget(this); + mfgList->setMaximumWidth(192); layout->addWidget(mfgList); connect(mfgList, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp index 443c37b..42ec42b 100644 --- a/src/settingsdlg.cpp +++ b/src/settingsdlg.cpp @@ -27,14 +27,14 @@ SettingsDlg::SettingsDlg(QWidget *parent) m_selectRemoteBtn = new QPushButton(tr("Select remote"), this); m_aboutBtn = new QPushButton(tr("About"), this); m_rateUpBtn = new QPushButton( - QIcon(settings.value("rateUpIcon", - "/usr/share/icons/hicolor/48x48/hildon/chat_smiley_happy.png"). - toString()), + QIcon(settings.value("symbolPath", + "/usr/share/irwi/symbols/"). + toString() + "symbol_thumbs_up.png"), "", this); m_rateDownBtn = new QPushButton( - QIcon(settings.value("rateDownIcon", - "/usr/share/icons/hicolor/48x48/hildon/chat_smiley_sad.png"). - toString()), + QIcon(settings.value("symbolPath", + "/usr/share/irwi/symbols/"). + toString() + "symbol_thumbs_down.png"), "", this); m_rateUpBtn->setMaximumSize(72, 72); m_rateDownBtn->setMaximumSize(72, 72); diff --git a/src/src.pro b/src/src.pro index 98d82c0..2f948cc 100644 --- a/src/src.pro +++ b/src/src.pro @@ -40,7 +40,6 @@ MOC_DIR = moc QT += network QT += xml QT += dbus -QT += svg CONFIG += mobility MOBILITY += bearer @@ -78,7 +77,6 @@ INSTALLS += target desktop iconxpm icon26 icon48 icon64 symbols icon64.files += ../data/64x64/$${TARGET}.png symbols.path = $$DATADIR/irwi/symbols - symbols.files += ../data/symbols/symbol_thumbs_up.svg - symbols.files += ../data/symbols/symbol_thumbs_down.svg + symbols.files += ../data/symbols/*.png }