diff --git a/saori_ja.qm b/saori_ja.qm index 7e09b7f..f6d26e4 100644 --- a/saori_ja.qm +++ b/saori_ja.qm Binary files differ diff --git a/saori_ja.ts b/saori_ja.ts index 8a543e0..792078c 100644 --- a/saori_ja.ts +++ b/saori_ja.ts @@ -54,22 +54,27 @@ <message> <location filename="saoriconfiguredialog.ui" line="14"/> <source>Setting</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location filename="saoriconfiguredialog.ui" line="24"/> <source>Application Setting</source> - <translation type="unfinished"></translation> + <translation>アプリケーション設定</translation> </message> <message> <location filename="saoriconfiguredialog.ui" line="30"/> <source>Maximum number of entries to get:</source> - <translation type="unfinished"></translation> + <translation>エントリを取得する最大値:</translation> </message> <message> <location filename="saoriconfiguredialog.ui" line="40"/> <source>Auto reload Interval (minutes):</source> - <translation type="unfinished"></translation> + <translation type="unfinished">自動更新間隔:</translation> + </message> + <message> + <location filename="saoriconfiguredialog.ui" line="50"/> + <source>Blur NSFW image preview:</source> + <translation>NSFW画像のプレビューをぼかす:</translation> </message> </context> <context> @@ -118,78 +123,78 @@ <translation></translation> </message> <message> - <location filename="saoriview.ui" line="77"/> + <location filename="saoriview.ui" line="84"/> <source>Pin</source> <translation>ピン</translation> </message> <message> - <location filename="saoriview.ui" line="91"/> + <location filename="saoriview.ui" line="98"/> <source>Notify</source> <translation>通知</translation> </message> <message> - <location filename="saoriview.ui" line="105"/> + <location filename="saoriview.ui" line="112"/> <source>Auto reload</source> <translation>自動更新</translation> </message> <message> - <location filename="saoriview.ui" line="119"/> + <location filename="saoriview.ui" line="126"/> <source>Newest</source> <translation>最新</translation> </message> <message> - <location filename="saoriview.ui" line="130"/> + <location filename="saoriview.ui" line="137"/> <source>Reload</source> <translation>更新</translation> </message> <message> - <location filename="saoriview.ui" line="160"/> + <location filename="saoriview.ui" line="167"/> <source>Toot</source> <translation>トゥート</translation> </message> <message> - <location filename="saoriview.cpp" line="151"/> + <location filename="saoriview.cpp" line="154"/> <source>boosted by: %1</source> <translation>%1 さんがブースト</translation> </message> <message> - <location filename="saoriview.cpp" line="154"/> - <location filename="saoriview.cpp" line="264"/> + <location filename="saoriview.cpp" line="157"/> + <location filename="saoriview.cpp" line="271"/> <source>created at :</source> <translation>投稿日時 :</translation> </message> <message> - <location filename="saoriview.cpp" line="181"/> + <location filename="saoriview.cpp" line="186"/> <source> following: </source> <translation> フォロー: </translation> </message> <message> - <location filename="saoriview.cpp" line="183"/> + <location filename="saoriview.cpp" line="188"/> <source> followers: </source> <translation> フォロワー: </translation> </message> <message> - <location filename="saoriview.cpp" line="244"/> + <location filename="saoriview.cpp" line="251"/> <source>%1 mentioned your status.</source> <translation>%1 さんが言及</translation> </message> <message> - <location filename="saoriview.cpp" line="248"/> + <location filename="saoriview.cpp" line="255"/> <source>%1 boosted your status.</source> <translation>%1 さんがブースト</translation> </message> <message> - <location filename="saoriview.cpp" line="252"/> + <location filename="saoriview.cpp" line="259"/> <source>%1 favourited your status.</source> <translation>%1 さんがお気に入りに追加</translation> </message> <message> - <location filename="saoriview.cpp" line="256"/> + <location filename="saoriview.cpp" line="263"/> <source>%1 followed you.</source> <translation>%1 さんにフォローされました</translation> </message> <message> - <location filename="saoriview.cpp" line="268"/> + <location filename="saoriview.cpp" line="275"/> <source>%1 (@%2)</source> <translation></translation> </message> @@ -200,52 +205,52 @@ <location filename="saoriwindow.ui" line="14"/> <source>Saori</source> <oldsource>SaoriWindow</oldsource> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location filename="saoriwindow.ui" line="63"/> <source>&File</source> - <translation type="unfinished">ファイル(&F)</translation> + <translation>ファイル(&F)</translation> </message> <message> <location filename="saoriwindow.ui" line="69"/> <source>&View</source> - <translation type="unfinished">表示(&V)</translation> + <translation>表示(&V)</translation> </message> <message> <location filename="saoriwindow.ui" line="77"/> <source>&Edit</source> - <translation type="unfinished">編集(&E)</translation> + <translation>編集(&E)</translation> </message> <message> <location filename="saoriwindow.ui" line="84"/> <source>&Help</source> - <translation type="unfinished">ヘルプ(&H)</translation> + <translation>ヘルプ(&H)</translation> </message> <message> <location filename="saoriwindow.ui" line="118"/> <source>Timeline &list</source> - <translation type="unfinished">タイムラインリスト(&l)</translation> + <translation>タイムラインリスト(&l)</translation> </message> <message> <location filename="saoriwindow.ui" line="135"/> <source>List</source> - <translation type="unfinished">リスト</translation> + <translation>リスト</translation> </message> <message> <location filename="saoriwindow.ui" line="140"/> <source>Account</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location filename="saoriwindow.ui" line="145"/> <source>Instance</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location filename="saoriwindow.ui" line="155"/> <source>&Quit</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location filename="saoriwindow.ui" line="166"/> @@ -283,37 +288,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="saoriwindow.cpp" line="137"/> + <location filename="saoriwindow.cpp" line="140"/> <source>Accounts</source> <translation type="unfinished">アカウント</translation> </message> <message> - <location filename="saoriwindow.cpp" line="58"/> + <location filename="saoriwindow.cpp" line="61"/> <source>home</source> <translation type="unfinished">ホーム</translation> </message> <message> - <location filename="saoriwindow.cpp" line="62"/> + <location filename="saoriwindow.cpp" line="65"/> <source>local</source> <translation type="unfinished">ローカルタイムライン</translation> </message> <message> - <location filename="saoriwindow.cpp" line="66"/> + <location filename="saoriwindow.cpp" line="69"/> <source>public</source> <translation type="unfinished">連合タイムライン</translation> </message> <message> - <location filename="saoriwindow.cpp" line="70"/> + <location filename="saoriwindow.cpp" line="73"/> <source>notifications</source> - <translation type="unfinished">通知</translation> + <translation>通知</translation> </message> <message> - <location filename="saoriwindow.cpp" line="74"/> + <location filename="saoriwindow.cpp" line="77"/> <source>instance</source> - <translation type="unfinished"></translation> + <translation>インスタンス</translation> </message> <message> - <location filename="saoriwindow.cpp" line="152"/> + <location filename="saoriwindow.cpp" line="155"/> <source>Instances</source> <translation type="unfinished">インスタンス</translation> </message> diff --git a/saoriconfiguredialog.ui b/saoriconfiguredialog.ui index f879109..a1f2663 100644 --- a/saoriconfiguredialog.ui +++ b/saoriconfiguredialog.ui @@ -58,6 +58,16 @@ </property> </widget> </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Maximum number of entries to show:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QSpinBox" name="spinBox_entriesCount"/> + </item> </layout> </widget> </widget> diff --git a/saoridef.h b/saoridef.h index a9d84d0..0103252 100644 --- a/saoridef.h +++ b/saoridef.h @@ -52,6 +52,8 @@ #define SAORI_SETTING_NSFWBLUR_DEFAULT true #define SAORI_SETTING_RELOADINT "application/reloadinterval" #define SAORI_SETTING_RELOADINT_DEFAULT 5 +#define SAORI_SETTING_SHOWENTRIES "application/showentries" +#define SAORI_SETTING_SHOWENTRIES_DEFAULT 100 #endif // SAORIDEF_H diff --git a/saoriviewentry.cpp b/saoriviewentry.cpp index 700cb57..63732f7 100644 --- a/saoriviewentry.cpp +++ b/saoriviewentry.cpp @@ -30,6 +30,7 @@ #include "saoridef.h" #include <QRegExp> #include <QImage> +#include <QPainter> #include <QDebug> SaoriViewEntry::SaoriViewEntry(qlonglong id, QWidget *parent) : @@ -113,18 +114,19 @@ c << "avatar" << "mavatar" << "media" << "nsfwmedia"; switch (c.indexOf(type)) { case 0: - image = image.scaled(64,64,Qt::KeepAspectRatio,Qt::SmoothTransformation); + image = roundedImage(image,10).scaled(64,64,Qt::KeepAspectRatio,Qt::SmoothTransformation); break; case 1: - image = image.scaled(32,32,Qt::KeepAspectRatio,Qt::SmoothTransformation); + image = roundedImage(image,10).scaled(32,32,Qt::KeepAspectRatio,Qt::SmoothTransformation); break; case 2: - image = image.scaledToWidth(200,Qt::SmoothTransformation); + image = roundedImage(image,20).scaledToWidth(200,Qt::SmoothTransformation); break; case 3: if (SaoriApplication::saori()->setting()->value(SAORI_SETTING_NSFWBLUR,SAORI_SETTING_NSFWBLUR_DEFAULT).toBool()) image = image.scaledToWidth(10,Qt::SmoothTransformation); image = image.scaledToWidth(200,Qt::SmoothTransformation); + image = roundedImage(image,20); break; default: break; @@ -132,6 +134,20 @@ return; } +QImage SaoriViewEntry::roundedImage(QImage &image, int r) +{ + QPainter painter; + QPainterPath p; + QImage i; + i = QImage(image.width(),image.height(),QImage::Format_RGBA8888); + i.fill(QColor(0,0,0,0)); + p.addRoundedRect(0,0,image.width(),image.height(),image.width() / r,image.width() / r); + painter.begin(&i); + painter.fillPath(p,QBrush(image)); + painter.end(); + return i; +} + void SaoriViewEntry::downloaded(const QUrl url) { m_urlmap[url.toString()] = SaoriApplication::saori()->cache()->fileCache(url); diff --git a/saoriviewentry.h b/saoriviewentry.h index 737e5a2..87c7941 100644 --- a/saoriviewentry.h +++ b/saoriviewentry.h @@ -45,6 +45,7 @@ const QString designedText(); const QString imageReplacer(); void imageResizer(const QString type,QImage &image); + QImage roundedImage(QImage &image,int r); protected: qlonglong m_id;