Skip to content

Commit

Permalink
Merge pull request #56 from ioriayane/ver0.12.0
Browse files Browse the repository at this point in the history 
* OGPの処理を修正 (#44)

* カラムのカスタムフィードを公式で開く、保存・解除に対応 (#45)

* カラムのカスタムフィードを公式で開く、保存・解除に対応

* カスタムフィードのURLをクリップボードにコピー

* 翻訳データ更新

* プロフィール一覧でラベルを表示する (#46)

* プロフィールにフィードを表示 (#47)

* ユーザーのフィードを読み込む処理を追加

* プロフィールにフィードを表示するレイアウトを追加

* 自動生成コード更新（atproto/api 0.6.12） (#48)

* いいねの取得機能を実装（未使用） (#49)

* カラム追加ダイアログの一覧の更新を手動に変更 (#50)

* エラー処理を追加 (#51)

* APIのレスポンスにJSONが来るときの処理を追加

* リファクタ

* エラーコードをUIへ上げる

* 期限切れエラーしたときにリフレッシュする処理を追加

* エラー内容をダイアログで表示

* 起動時の認証をrefreshに変更 (#52)

* 起動時の認証をrefreshに変更

* ログの出力を変更

* 認証のリフレッシュタイミングを変更

* テストデータ修正

* 通知のポストスレッドでルート情報を付与できていなかったのを修正 (#53)

* ポスト本文にHTMLでエスケープする文字が含まれたときの対処を追加 (#54)

* バージョン情報更新 (#55)
  • Loading branch information
@ioriayane
ioriayane authored Sep 18, 2023
2 parents 2947a3a + 6eb3b58 commit ae20b2a
Show file tree
Hide file tree
Showing 138 changed files with 2,027 additions and 470 deletions.
3 changes: 3 additions & 0 deletions app/app.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ QML_FILES = \
qml/parts/PostDelegate.qml \
qml/parts/PostInformation.qml \
qml/parts/ProfileTabBar.qml \
qml/parts/ProfileTabButton.qml \
qml/parts/ReactionAuthor.qml \
qml/parts/SelfLabelPopup.qml \
qml/parts/SideBar.qml \
Expand All @@ -51,6 +52,7 @@ QML_FILES = \
qml/parts/VersionInfomation.qml \
qml/view/AnyProfileListView.qml \
qml/view/ColumnView.qml \
qml/view/FeedGeneratorListView.qml \
qml/view/ImageFullView.qml \
qml/view/NotificationListView.qml \
qml/view/PostThreadView.qml \
Expand Down Expand Up @@ -93,6 +95,7 @@ IMAGE_FILES += \
qml/images/notification.png \
qml/images/open_in_other.png \
qml/images/quote.png \
qml/images/refresh.png \
qml/images/reply.png \
qml/images/report.png \
qml/images/repost.png \
Expand Down
Binary file modified app/i18n/qt_ja_JP.qm
View file
Binary file not shown.
69 changes: 45 additions & 24 deletions app/i18n/qt_ja_JP.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,57 +212,78 @@
<context>
<name>ColumnView</name>
<message>
<location filename="../qml/view/ColumnView.qml" line="346"/>
<location filename="../qml/view/ColumnView.qml" line="352"/>
<source>Home</source>
<translation>ホーム</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="349"/>
<location filename="../qml/view/ColumnView.qml" line="355"/>
<source>Notifications</source>
<translation>通知</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="352"/>
<location filename="../qml/view/ColumnView.qml" line="358"/>
<source>Search posts</source>
<translation>検索(ポスト)</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="355"/>
<location filename="../qml/view/ColumnView.qml" line="361"/>
<source>Search users</source>
<translation>検索(ユーザー)</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="358"/>
<location filename="../qml/view/ColumnView.qml" line="364"/>
<location filename="../qml/view/ColumnView.qml" line="493"/>
<source>Feed</source>
<translation>フィード</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="361"/>
<location filename="../qml/view/ColumnView.qml" line="367"/>
<source>User</source>
<translation>ユーザー</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="364"/>
<location filename="../qml/view/ColumnView.qml" line="370"/>
<source>Unknown</source>
<translation>不明</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="471"/>
<location filename="../qml/view/ColumnView.qml" line="477"/>
<source>Move to left</source>
<translation>左へ移動</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="476"/>
<location filename="../qml/view/ColumnView.qml" line="482"/>
<source>Move to right</source>
<translation>右へ移動</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="481"/>
<location filename="../qml/view/ColumnView.qml" line="487"/>
<source>Delete column</source>
<translation>削除</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="487"/>
<location filename="../qml/view/ColumnView.qml" line="496"/>
<source>Copy url</source>
<translation>URLをコピー</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="505"/>
<source>Open in Official</source>
<translation>公式で開く</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="516"/>
<source>Drop</source>
<translation>解除</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="516"/>
<source>Save</source>
<translation>保存</translation>
</message>
<message>
<location filename="../qml/view/ColumnView.qml" line="534"/>
<source>Settings</source>
<translation>設定</translation>
</message>
Expand Down Expand Up @@ -1486,43 +1507,43 @@
<translation>引用</translation>
</message>
<message>
<location filename="../qml/parts/PostControls.qml" line="102"/>
<location filename="../qml/parts/PostControls.qml" line="147"/>
<location filename="../qml/parts/PostControls.qml" line="103"/>
<location filename="../qml/parts/PostControls.qml" line="149"/>
<source>Translate</source>
<translation>翻訳</translation>
</message>
<message>
<location filename="../qml/parts/PostControls.qml" line="107"/>
<location filename="../qml/parts/PostControls.qml" line="152"/>
<location filename="../qml/parts/PostControls.qml" line="108"/>
<location filename="../qml/parts/PostControls.qml" line="154"/>
<source>Copy post text</source>
<translation>ポストをコピー</translation>
</message>
<message>
<location filename="../qml/parts/PostControls.qml" line="111"/>
<location filename="../qml/parts/PostControls.qml" line="156"/>
<location filename="../qml/parts/PostControls.qml" line="112"/>
<location filename="../qml/parts/PostControls.qml" line="158"/>
<source>Open in Official</source>
<translation>公式で開く</translation>
</message>
<message>
<location filename="../qml/parts/PostControls.qml" line="118"/>
<location filename="../qml/parts/PostControls.qml" line="163"/>
<location filename="../qml/parts/PostControls.qml" line="119"/>
<location filename="../qml/parts/PostControls.qml" line="165"/>
<source>Reposted by</source>
<translation>リポストしたアカウント</translation>
</message>
<message>
<location filename="../qml/parts/PostControls.qml" line="124"/>
<location filename="../qml/parts/PostControls.qml" line="169"/>
<location filename="../qml/parts/PostControls.qml" line="125"/>
<location filename="../qml/parts/PostControls.qml" line="171"/>
<source>Liked by</source>
<translation>いいねしたアカウント</translation>
</message>
<message>
<location filename="../qml/parts/PostControls.qml" line="131"/>
<location filename="../qml/parts/PostControls.qml" line="132"/>
<source>Delete post</source>
<translation>ポストを削除</translation>
</message>
<message>
<location filename="../qml/parts/PostControls.qml" line="138"/>
<location filename="../qml/parts/PostControls.qml" line="176"/>
<location filename="../qml/parts/PostControls.qml" line="139"/>
<location filename="../qml/parts/PostControls.qml" line="178"/>
<source>Report post</source>
<translation>ポストを通報</translation>
</message>
Expand Down
8 changes: 7 additions & 1 deletion app/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
#include "qtquick/timelinelistmodel.h"
#include "qtquick/authorfeedlistmodel.h"
#include "qtquick/anyfeedlistmodel.h"
#include "qtquick/actorlikelistmodel.h"
#include "qtquick/followslistmodel.h"
#include "qtquick/followerslistmodel.h"
#include "qtquick/searchpostlistmodel.h"
#include "qtquick/searchprofilelistmodel.h"
#include "qtquick/feedtypelistmodel.h"
#include "qtquick/customfeedlistmodel.h"
#include "qtquick/feedgeneratorlistmodel.h"
#include "qtquick/actorfeedgeneratorlistmodel.h"
#include "qtquick/languagelistmodel.h"
#include "qtquick/contentfiltersettinglistmodel.h"
#include "qtquick/anyprofilelistmodel.h"
Expand All @@ -44,7 +46,7 @@ int main(int argc, char *argv[])
app.setOrganizationName(QStringLiteral("relog"));
app.setOrganizationDomain(QStringLiteral("hagoromo.relog.tech"));
app.setApplicationName(QStringLiteral("Hagoromo"));
app.setApplicationVersion(QStringLiteral("0.11.0"));
app.setApplicationVersion(QStringLiteral("0.12.0"));
#ifndef HAGOROMO_RELEASE_BUILD
app.setApplicationVersion(app.applicationVersion() + "d");
#endif
Expand All @@ -65,6 +67,8 @@ int main(int argc, char *argv[])
"AuthorFeedListModel");
qmlRegisterType<AnyFeedListModel>("tech.relog.hagoromo.anyfeedlistmodel", 1, 0,
"AnyFeedListModel");
qmlRegisterType<ActorLikeListModel>("tech.relog.hagoromo.actorlikelistmodel", 1, 0,
"ActorLikeListModel");
qmlRegisterType<FollowsListModel>("tech.relog.hagoromo.followslistmodel", 1, 0,
"FollowsListModel");
qmlRegisterType<FollowersListModel>("tech.relog.hagoromo.followerslistmodel", 1, 0,
Expand All @@ -79,6 +83,8 @@ int main(int argc, char *argv[])
"CustomFeedListModel");
qmlRegisterType<FeedGeneratorListModel>("tech.relog.hagoromo.feedgeneratorlistmodel", 1, 0,
"FeedGeneratorListModel");
qmlRegisterType<ActorFeedGeneratorListModel>("tech.relog.hagoromo.actorfeedgeneratorlistmodel",
1, 0, "ActorFeedGeneratorListModel");
qmlRegisterType<LanguageListModel>("tech.relog.hagoromo.languagelistmodel", 1, 0,
"LanguageListModel");
qmlRegisterType<ContentFilterSettingListModel>(
Expand Down
2 changes: 2 additions & 0 deletions app/qml/dialogs/AccountDialog.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Dialog {
title: qsTr("Account management")

property alias accountModel: accountList.model
signal errorOccured(string account_uuid, string code, string message)

LoginDialog {
id: login
Expand All @@ -28,6 +29,7 @@ Dialog {
session.authorized)
accountModel.updateAccountProfile(session.service, session.identifier)
}
onErrorOccured: (code, message) => accountDialog.errorOccured("", code, message)
}
ContentFilterSettingDialog {
id: contentFilter
Expand Down
37 changes: 30 additions & 7 deletions app/qml/dialogs/AddColumnDialog.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import tech.relog.hagoromo.accountlistmodel 1.0
import tech.relog.hagoromo.feedtypelistmodel 1.0
import tech.relog.hagoromo.singleton 1.0

import "../controls"
import "../parts"

Dialog {
Expand All @@ -25,14 +26,12 @@ Dialog {
property string selectedUri: ""

signal openDiscoverFeeds(int account_index)
signal errorOccured(string account_uuid, string code, string message)

onOpened: {
if(accountList.currentIndex === -1){
accountList.currentIndex = 0
}
for(var i=0; i<repeater.count; i++){
repeater.itemAt(i).model.clear()
}
changeColumnTypeView(accountList.currentIndex)
}

Expand Down Expand Up @@ -89,16 +88,35 @@ Dialog {
}
}
ColumnLayout {
Label {
font.pointSize: AdjustedValues.f10
text: qsTr("Column type")
RowLayout {
Label {
Layout.fillWidth: true
font.pointSize: AdjustedValues.f10
text: qsTr("Column type")
}
IconButton {
Layout.preferredWidth: AdjustedValues.b30
Layout.preferredHeight: AdjustedValues.b24
iconSource: "../images/refresh.png"
iconSize: AdjustedValues.i16
onClicked: {
repeater.itemAt(accountList.currentIndex).model.clear()
changeColumnTypeView(accountList.currentIndex)
}
}
}
Item {
Layout.preferredWidth: 300 * AdjustedValues.ratio
Layout.preferredHeight: 300 * AdjustedValues.ratio
Repeater {
id: repeater
model: accountModel.count
onModelChanged: {
for(var i=0; i<repeater.count; i++){
repeater.itemAt(i).model.clear()
}
}

ScrollView {
id: typeScroll
anchors.fill: parent
Expand All @@ -112,7 +130,12 @@ Dialog {

ListView {
id: typeList
model: FeedTypeListModel { }
model: FeedTypeListModel {
onErrorOccured: (code, message) => {
var uuid = accountModel.item(accountList.currentIndex, AccountListModel.UuidRole)
addColumnDialog.errorOccured(uuid, code, message)
}
}
footer: ItemDelegate {
width: typeList.width - typeScroll.ScrollBar.vertical.width
height: implicitHeight * AdjustedValues.ratio
Expand Down
Loading

0 comments on commit ae20b2a

Please sign in to comment.