diff --git a/saoristyle.css b/saoristyle.css index 2daa4c0..898e1b4 100644 --- a/saoristyle.css +++ b/saoristyle.css @@ -49,3 +49,15 @@ div.notification_type img { float:left; } + +div.instance_title { + font-size:large; +} + +div.instance_uri { + text-align:right; +} + +div.instance_version { + text-align:right; +} diff --git a/saoriview.cpp b/saoriview.cpp index e4678e2..e934099 100644 --- a/saoriview.cpp +++ b/saoriview.cpp @@ -52,6 +52,7 @@ m_maxid = 0; if (m_viewname == "instance") { + ui->frame_buttons->setVisible(false); m_entries.append(new SaoriViewEntry(0,ui->scrollAreaWidgetContents)); m_entries.at(0)->setContent(instanceInfoParser(account)); ui->scrollAreaWidgetContents->layout()->addWidget(m_entries.at(0)); @@ -123,11 +124,13 @@ QString result; result = QString(htmlDiv("instance_title","%1") + htmlDiv("instance_uri","%2") + + htmlHr() + htmlDiv("instance_description","%3") + + htmlHr() + htmlDiv("instance_email","email : %4") + htmlDiv("instance_contact_account","%5") + htmlDiv("instance_version","Version : %6") - ).arg(i->instanceInfo("title").toString(), + ).arg(i->instanceInfo("title").toString(), i->instanceInfo("uri").toString(), i->instanceInfo("description").toString(), i->instanceInfo("email").toString(), diff --git a/saoriview.ui b/saoriview.ui index 0ffd198..6f6ea3a 100644 --- a/saoriview.ui +++ b/saoriview.ui @@ -43,7 +43,7 @@ 0 0 297 - 397 + 379 @@ -67,108 +67,116 @@ - - - 0 + + + QFrame::StyledPanel - - - - Pin - - - - :/icons/ionicons/pin.svg:/icons/ionicons/pin.svg - - - true - - - - - - - Notify - - - - :/icons/ionicons/alert.svg:/icons/ionicons/alert.svg - - - true - - - - - - - Auto reload - - - - :/icons/ionicons/loop.svg:/icons/ionicons/loop.svg - - - true - - - - - - - Newest - - - - :/icons/ionicons/arrow-up-c.svg:/icons/ionicons/arrow-up-c.svg - - - - - - - Reload - - - - :/icons/ionicons/refresh.svg:/icons/ionicons/refresh.svg - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - Toot - - - - :/icons/ionicons/chatbox.svg:/icons/ionicons/chatbox.svg - - - true - - - - + + QFrame::Raised + + + 1 + + + + + + Pin + + + + :/icons/ionicons/pin.svg:/icons/ionicons/pin.svg + + + true + + + + + + + Notify + + + + :/icons/ionicons/alert.svg:/icons/ionicons/alert.svg + + + true + + + + + + + Auto reload + + + + :/icons/ionicons/loop.svg:/icons/ionicons/loop.svg + + + true + + + + + + + Newest + + + + :/icons/ionicons/arrow-up-c.svg:/icons/ionicons/arrow-up-c.svg + + + + + + + Reload + + + + :/icons/ionicons/refresh.svg:/icons/ionicons/refresh.svg + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Toot + + + + :/icons/ionicons/chatbox.svg:/icons/ionicons/chatbox.svg + + + true + + + + + diff --git a/saoriwindow.cpp b/saoriwindow.cpp index b807d91..6a77c8a 100644 --- a/saoriwindow.cpp +++ b/saoriwindow.cpp @@ -72,7 +72,7 @@ break; case 4: tlText = tr("instance"); - icon = ""; + icon = ":/icons/ionicons/earth.svg"; break; default: tlText = timeline; @@ -150,8 +150,11 @@ } } auto *instanceItem = new QTreeWidgetItem(ui->timelineTree,QStringList() << tr("Instances")); + instanceItem->setIcon(0,QIcon(":/icons/ionicons/earth.svg")); for (int i = 0;i < SaoriApplication::getInstanceList()->count();i ++) { - auto *item = new QTreeWidgetItem(instanceItem,QStringList() << SaoriApplication::getInstanceList()->at(i)->instance().toString()); + auto *item = new QTreeWidgetItem(instanceItem,QStringList() + << SaoriApplication::getInstanceList()->at(i)->instance().toString()); + item->setIcon(0,QIcon(":/icons/ionicons/earth.svg")); instanceItem->addChild(item); //item->addChild(new QTreeWidgetItem(item,QStringList() << tr("Infomation"))); }