diff --git a/ionicons-md/LICENSE b/ionicons-md/LICENSE new file mode 100644 index 0000000..6be4c3e --- /dev/null +++ b/ionicons-md/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015-present Ionic (http://ionic.io/) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/ionicons/LICENSE b/ionicons/LICENSE deleted file mode 100644 index 015269f..0000000 --- a/ionicons/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Drifty (http://drifty.com/) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/ionicons/alert-circled.svg b/ionicons/alert-circled.svg deleted file mode 100644 index 89d1143..0000000 --- a/ionicons/alert-circled.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/ionicons/alert.svg b/ionicons/alert.svg deleted file mode 100644 index f0c4e2c..0000000 --- a/ionicons/alert.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/ionicons/arrow-up-c.svg b/ionicons/arrow-up-c.svg deleted file mode 100644 index b0398ed..0000000 --- a/ionicons/arrow-up-c.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/ionicons/chatbox.svg b/ionicons/chatbox.svg deleted file mode 100644 index 0c2a7e7..0000000 --- a/ionicons/chatbox.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/ionicons/chatboxes.svg b/ionicons/chatboxes.svg deleted file mode 100644 index dba6e29..0000000 --- a/ionicons/chatboxes.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/ionicons/chatbubble.svg b/ionicons/chatbubble.svg deleted file mode 100644 index 5c3148f..0000000 --- a/ionicons/chatbubble.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/ionicons/chatbubbles.svg b/ionicons/chatbubbles.svg deleted file mode 100644 index 8cc5f34..0000000 --- a/ionicons/chatbubbles.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/ionicons/earth.svg b/ionicons/earth.svg deleted file mode 100644 index 078e7f7..0000000 --- a/ionicons/earth.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - diff --git a/ionicons/eye-disabled.svg b/ionicons/eye-disabled.svg deleted file mode 100644 index 7a270cb..0000000 --- a/ionicons/eye-disabled.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/ionicons/eye.svg b/ionicons/eye.svg deleted file mode 100644 index 6b64633..0000000 --- a/ionicons/eye.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/ionicons/gear-b.svg b/ionicons/gear-b.svg deleted file mode 100644 index ca69c32..0000000 --- a/ionicons/gear-b.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/ionicons/heart.svg b/ionicons/heart.svg deleted file mode 100644 index 34aa83d..0000000 --- a/ionicons/heart.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/ionicons/image.svg b/ionicons/image.svg deleted file mode 100644 index b33d4ea..0000000 --- a/ionicons/image.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/ionicons/images.svg b/ionicons/images.svg deleted file mode 100644 index 708c415..0000000 --- a/ionicons/images.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - diff --git a/ionicons/load-a.svg b/ionicons/load-a.svg deleted file mode 100644 index 469054b..0000000 --- a/ionicons/load-a.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/ionicons/locked.svg b/ionicons/locked.svg deleted file mode 100644 index beb41f1..0000000 --- a/ionicons/locked.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/ionicons/loop.svg b/ionicons/loop.svg deleted file mode 100644 index 865781e..0000000 --- a/ionicons/loop.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/ionicons/navicon.svg b/ionicons/navicon.svg deleted file mode 100644 index efd0818..0000000 --- a/ionicons/navicon.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/ionicons/paper-airplane.svg b/ionicons/paper-airplane.svg deleted file mode 100644 index fc5fb14..0000000 --- a/ionicons/paper-airplane.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/ionicons/paperclip.svg b/ionicons/paperclip.svg deleted file mode 100644 index 6c21efb..0000000 --- a/ionicons/paperclip.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/ionicons/person-add.svg b/ionicons/person-add.svg deleted file mode 100644 index 74a4b84..0000000 --- a/ionicons/person-add.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/ionicons/person-stalker.svg b/ionicons/person-stalker.svg deleted file mode 100644 index cc47173..0000000 --- a/ionicons/person-stalker.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - diff --git a/ionicons/person.svg b/ionicons/person.svg deleted file mode 100644 index 0b305ce..0000000 --- a/ionicons/person.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/ionicons/pin.svg b/ionicons/pin.svg deleted file mode 100644 index f68b9f6..0000000 --- a/ionicons/pin.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/ionicons/pricetag.svg b/ionicons/pricetag.svg deleted file mode 100644 index 21624e2..0000000 --- a/ionicons/pricetag.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/ionicons/pricetags.svg b/ionicons/pricetags.svg deleted file mode 100644 index 9294f0e..0000000 --- a/ionicons/pricetags.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - diff --git a/ionicons/refresh.svg b/ionicons/refresh.svg deleted file mode 100644 index 1e2d80e..0000000 --- a/ionicons/refresh.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - diff --git a/ionicons/reply.svg b/ionicons/reply.svg deleted file mode 100644 index d08d582..0000000 --- a/ionicons/reply.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/ionicons/share.svg b/ionicons/share.svg deleted file mode 100644 index 0030b8a..0000000 --- a/ionicons/share.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/ionicons/star.svg b/ionicons/star.svg deleted file mode 100644 index 3c4b403..0000000 --- a/ionicons/star.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/ionicons/trash-a.svg b/ionicons/trash-a.svg deleted file mode 100644 index ec2afc2..0000000 --- a/ionicons/trash-a.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/ionicons/unlocked.svg b/ionicons/unlocked.svg deleted file mode 100644 index 4775747..0000000 --- a/ionicons/unlocked.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/saori.qrc b/saori.qrc index b92fdaf..9b6c90a 100644 --- a/saori.qrc +++ b/saori.qrc @@ -3,39 +3,7 @@ saori_ja.qm - ionicons/heart.svg - ionicons/trash-a.svg - ionicons/paperclip.svg - ionicons/paper-airplane.svg - ionicons/chatboxes.svg - ionicons/images.svg - ionicons/image.svg - ionicons/earth.svg - ionicons/eye-disabled.svg - ionicons/eye.svg - ionicons/star.svg - ionicons/pricetags.svg - ionicons/pricetag.svg - ionicons/person.svg - ionicons/person-stalker.svg - ionicons/chatbubbles.svg - ionicons/alert.svg - ionicons/pin.svg - ionicons/refresh.svg - ionicons/loop.svg - ionicons/chatbox.svg - ionicons/arrow-up-c.svg - ionicons/chatbubble.svg - ionicons/share.svg - ionicons/reply.svg saori.svg - ionicons/load-a.svg - ionicons/alert-circled.svg - ionicons/person-add.svg - ionicons/locked.svg - ionicons/unlocked.svg - ionicons/gear-b.svg - ionicons/navicon.svg ionicons-md/md-unlock.svg ionicons-md/md-trash.svg ionicons-md/md-time.svg diff --git a/saoricache.cpp b/saoricache.cpp index 5bfd93b..84e91b3 100644 --- a/saoricache.cpp +++ b/saoricache.cpp @@ -73,7 +73,7 @@ { if (isCached(url)) return urlToFilename(url); else download(url); - return QString(":/icons/ionicons/load-a.svg"); + return QString(":/icons/ionicons-md/hourglass.svg"); } bool SaoriCache::migration() @@ -112,7 +112,7 @@ QSqlQuery query(*SaoriApplication::saori()->database()); query.prepare("INSERT INTO file_cache(url,filename,size,timestamp) values(?,?,?,?);"); query.addBindValue(url.toString()); - query.addBindValue(":/icons/ionicons/alert-circled.svg"); + query.addBindValue(":/icons/ionicons-md/md-alert.svg"); query.addBindValue("-1"); query.addBindValue(QDateTime::currentSecsSinceEpoch()); query.exec(); diff --git a/saoritootwidget.ui b/saoritootwidget.ui index 66d28b3..f13f367 100644 --- a/saoritootwidget.ui +++ b/saoritootwidget.ui @@ -92,7 +92,7 @@ - :/icons/ionicons/earth.svg:/icons/ionicons/earth.svg + :/icons/ionicons-md/md-planet.svg:/icons/ionicons-md/md-planet.svg @@ -101,7 +101,7 @@ - :/icons/ionicons/unlocked.svg:/icons/ionicons/unlocked.svg + :/icons/ionicons-md/md-unlock.svg:/icons/ionicons-md/md-unlock.svg @@ -110,7 +110,7 @@ - :/icons/ionicons/locked.svg:/icons/ionicons/locked.svg + :/icons/ionicons-md/md-lock.svg:/icons/ionicons-md/md-lock.svg @@ -119,7 +119,7 @@ - :/icons/ionicons/person.svg:/icons/ionicons/person.svg + :/icons/ionicons-md/md-mail.svg:/icons/ionicons-md/md-mail.svg @@ -140,6 +140,10 @@ + + + :/icons/ionicons-md/md-send.svg:/icons/ionicons-md/md-send.svg + Toot! @@ -148,6 +152,10 @@ + + + :/icons/ionicons-md/md-trash.svg:/icons/ionicons-md/md-trash.svg + clear diff --git a/saoriview.cpp b/saoriview.cpp index 3b5fd59..c83796a 100644 --- a/saoriview.cpp +++ b/saoriview.cpp @@ -221,16 +221,16 @@ vl << "public" << "unlisted" << "private" << "direct"; switch (vl.indexOf(json["visibility"].toString())) { case 0: - visibility = htmlImg("icon",":/icons/ionicons/earth.svg"); + visibility = htmlImg("icon",":/icons/ionicons-md/md-planet.svg"); break; case 1: - visibility = htmlImg("icon",":/icons/ionicons/unlocked.svg"); + visibility = htmlImg("icon",":/icons/ionicons-md/md-unlocked.svg"); break; case 2: - visibility = htmlImg("icon",":/icons/ionicons/locked.svg"); + visibility = htmlImg("icon",":/icons/ionicons-md/md-locked.svg"); break; case 3: - visibility = htmlImg("icon",":/icons/ionicons/person.svg"); + visibility = htmlImg("icon",":/icons/ionicons-md/md-person.svg"); break; default: break; @@ -238,12 +238,12 @@ result += htmlDiv("tools", visibility + " " + htmlAnc("reply:" + json["id"].toString(), - htmlImg("icon",":/icons/ionicons/reply.svg")) + " " + + htmlImg("icon",":/icons/ionicons-md/md-share-alt.svg")) + " " + htmlAnc("boost:" + json["id"].toString(), - htmlImg("icon",":/icons/ionicons/share.svg")) + + htmlImg("icon",":/icons/ionicons-md/md-share.svg")) + QString::number(json["reblogs_count"].toInt()) + htmlAnc("fav:" + json["id"].toString(), - htmlImg("icon",":/icons/ionicons/star.svg")) + + htmlImg("icon",":/icons/ionicons-md/md-star.svg")) + QString::number(json["favourites_count"].toInt()) ); } @@ -330,19 +330,19 @@ QString title; switch (type.indexOf(json["type"].toString())) { case 0: - title += htmlImg("mavatar",":/icons/ionicons/chatbubbles.svg"); + title += htmlImg("mavatar",":/icons/ionicons-md/md-chatbubbles.svg"); title += tr("%1 mentioned your status.").arg(json["account"].toObject()["display_name"].toString()); break; case 1: - title += htmlImg("mavatar",":/icons/ionicons/share.svg"); + title += htmlImg("mavatar",":/icons/ionicons-md/md-share.svg"); title += tr("%1 boosted your status.").arg(json["account"].toObject()["display_name"].toString()); break; case 2: - title += htmlImg("mavatar",":/icons/ionicons/heart.svg"); + title += htmlImg("mavatar",":/icons/ionicons-md/md-star.svg"); title += tr("%1 favourited your status.").arg(json["account"].toObject()["display_name"].toString()); break; case 3: - title += htmlImg("mavatar",":/icons/ionicons/person-add.svg"); + title += htmlImg("mavatar",":/icons/ionicons-md/md-person-add.svg"); title += tr("%1 followed you.").arg(json["account"].toObject()["display_name"].toString()); break; default: diff --git a/saoriwindow.cpp b/saoriwindow.cpp index f00ffb7..2d3c812 100644 --- a/saoriwindow.cpp +++ b/saoriwindow.cpp @@ -62,27 +62,27 @@ switch (trtl.indexOf(t[0])) { case 0: tlText = tr("home"); - icon = ":/icons/ionicons/chatbubbles.svg"; + icon = ":/icons/ionicons-md/md-chatbubbles.svg"; break; case 1: tlText = tr("local"); - icon = ":/icons/ionicons/chatbubble.svg"; + icon = ":/icons/ionicons-md/md-text.svg"; break; case 2: tlText = tr("public"); - icon = ":/icons/ionicons/earth.svg"; + icon = ":/icons/ionicons-md/md-planet.svg"; break; case 3: tlText = tr("notifications"); - icon = ":/icons/ionicons/alert.svg"; + icon = ":/icons/ionicons-md/md-notifications.svg"; break; case 4: tlText = tr("instance"); - icon = ":/icons/ionicons/earth.svg"; + icon = ":/icons/ionicons-md/md-planet.svg"; break; case 5: tlText = tr("accounts"); - icon = ":/icons/ionicons/person.svg"; + icon = ":/icons/ionicons-md/md-person.svg"; break; default: tlText = timeline; @@ -160,10 +160,10 @@ { ui->timelineTree->clear(); auto *accountItem = new QTreeWidgetItem(ui->timelineTree,QStringList() << tr("Accounts")); - accountItem->setIcon(0,QIcon(":/icons/ionicons/person-stalker.svg")); + accountItem->setIcon(0,QIcon(":/icons/ionicons-md/md-people.svg")); for (int i = 0;i < SaoriApplication::getAccountList()->count();i ++) { auto *item = new QTreeWidgetItem(accountItem,QStringList() << SaoriApplication::getAccountList()->at(i)->name()); - item->setIcon(0,QIcon(":/icons/ionicons/person.svg")); + item->setIcon(0,QIcon(":/icons/ionicons-md/md-person.svg")); accountItem->addChild(item); for (auto tl:SaoriApplication::getAccountList()->at(i)->timelineList()) { auto title = getTimelineTitle(tl); @@ -175,11 +175,11 @@ } } auto *instanceItem = new QTreeWidgetItem(ui->timelineTree,QStringList() << tr("Instances")); - instanceItem->setIcon(0,QIcon(":/icons/ionicons/earth.svg")); + instanceItem->setIcon(0,QIcon(":/icons/ionicons-md/md-planet.svg")); for (int i = 0;i < SaoriApplication::getInstanceList()->count();i ++) { auto *item = new QTreeWidgetItem(instanceItem,QStringList() << SaoriApplication::getInstanceList()->at(i)->instance().toString()); - item->setIcon(0,QIcon(":/icons/ionicons/earth.svg")); + item->setIcon(0,QIcon(":/icons/ionicons-md/md-planet.svg")); instanceItem->addChild(item); } } diff --git a/saoriwindow.ui b/saoriwindow.ui index 8e42fe9..f647df0 100644 --- a/saoriwindow.ui +++ b/saoriwindow.ui @@ -96,6 +96,7 @@ false + @@ -166,7 +167,7 @@ - :/icons/ionicons/navicon.svg:/icons/ionicons/navicon.svg + :/icons/ionicons-md/md-list-box.svg:/icons/ionicons-md/md-list-box.svg Show/Hide Timeline &List @@ -188,7 +189,7 @@ - :/icons/ionicons/gear-b.svg:/icons/ionicons/gear-b.svg + :/icons/ionicons-md/md-settings.svg:/icons/ionicons-md/md-settings.svg &Configure