Skip to content

Commit

Permalink
Merge pull request #226 from ioriayane/Release/v0.31.0
Browse files Browse the repository at this point in the history
Release/v0.31.0
  • Loading branch information
ioriayane authored May 31, 2024
2 parents 41b34d7 + 10dcb41 commit ee732e0
Show file tree
Hide file tree
Showing 183 changed files with 8,415 additions and 1,127 deletions.
2 changes: 1 addition & 1 deletion 1stparty/atproto
Submodule atproto updated 252 files
77 changes: 77 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,45 @@ $ qmake CONFIG+=debug_and_release ../qthttpserver/qthttpserver.pro
$ make && make install
```

## コントリビューション

変更を加えるときは`dev`からブランチして、`dev`にプルリクエストを提出してください。

また、下記の事項を実施してください。Github Actionsにてチェックしています。

### ソースコードの整形

[pre-commit](https://pre-commit.com/)を使用しています。

git hookで実行されるように公式サイトを確認してセットアップしてください。

セットアップ例
```bash
$ pip install pre-commit
$ pre-commit --version
pre-commit 3.7.1
$ cd path/to/this_repo
$ pre-commit install
pre-commit installed at .git/hooks/pre-commit
```

### 単体テスト

いづれかの環境で実行してクリアできることを確認してください。

Windows
```cmd
> .\scripts\unittest.bat path\to\Qt\5.15.2\msvc2019_64\bin
```
Ubuntu
```bash
$ ./scripts/unittest.sh linux path/to/Qt/5.15.2/gcc_64/bin
```
Mac
```bash
$ ./scripts/unittest.sh mac path/to/Qt/5.15.2/gcc_64/bin
```

---

## Overview
Expand Down Expand Up @@ -215,3 +254,41 @@ $ cd 3rdparty/build-qthttpserver
$ qmake CONFIG+=debug_and_release ../qthttpserver/qthttpserver.pro
$ make && make install
```

## Contribution

If you want to make changes, please branch from `dev` and submit a pull request to `dev`.

Also, please do the following: Check in Github Actions.

### Code formatting

[pre-commit](https://pre-commit.com/) are used for source code formatting.
Please check the official site and set it up to run with git hook.

Setup Example
```bash
$ pip install pre-commit
$ pre-commit --version
pre-commit 3.7.1
$ cd path/to/this_repo
$ pre-commit install
pre-commit installed at .git/hooks/pre-commit
```

### Unit Tests

Please confirm that you can clear it by running it in one of the environments.

Windows
```cmd
> .\scripts\unittest.bat path\to\Qt\5.15.2\msvc2019_64\bin
```
Ubuntu
```bash
$ ./scripts/unittest.sh linux path/to/Qt/5.15.2/gcc_64/bin
```
Mac
```bash
$ ./scripts/unittest.sh mac path/to/Qt/5.15.2/gcc_64/bin
```
20 changes: 18 additions & 2 deletions app/app.pro
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ QT += quick network quickcontrols2
TARGET = Hagoromo

SOURCES += \
main.cpp
main.cpp \
tools/translatorchanger.cpp

HEADERS += \
tools/translatorchanger.h

QML_FILES = \
qml/main.qml \
Expand All @@ -13,6 +17,8 @@ QML_FILES = \
qml/controls/IconButton.qml \
qml/controls/IconLabelFrame.qml \
qml/controls/ImageWithIndicator.qml \
qml/controls/MessageBubble.qml \
qml/controls/MoreButton.qml \
qml/controls/RadioButtonEx.qml \
qml/data/Account.qml \
qml/data/AdjustedValues.qml \
Expand All @@ -38,6 +44,7 @@ QML_FILES = \
qml/dialogs/MutedListsDialog.qml \
qml/dialogs/PostDialog.qml \
qml/dialogs/ReportAccountDialog.qml \
qml/dialogs/ReportMessageDialog.qml \
qml/dialogs/ReportPostDialog.qml \
qml/dialogs/SearchDialog.qml \
qml/dialogs/SelectThreadGateDialog.qml \
Expand All @@ -48,13 +55,16 @@ QML_FILES = \
qml/parts/ApplicationShortcut.qml \
qml/parts/Author.qml \
qml/parts/AvatarImage.qml \
qml/parts/ChatErrorMessage.qml \
qml/parts/CoverFrame.qml \
qml/parts/CursorRect.qml \
qml/parts/CursorRectHandle.qml \
qml/parts/ImagePreview.qml \
qml/parts/ExternalLinkCard.qml \
qml/parts/FeedGeneratorLinkCard.qml \
qml/parts/HandleHistoryPopup.qml \
qml/parts/HashTagMenu.qml \
qml/parts/LabelerComboBox.qml \
qml/parts/ListLinkCard.qml \
qml/parts/MentionSuggestionView.qml \
qml/parts/NotificationDelegate.qml \
Expand All @@ -71,6 +81,8 @@ QML_FILES = \
qml/parts/TagLabelLayout.qml \
qml/parts/VersionInfomation.qml \
qml/view/AnyProfileListView.qml \
qml/view/ChatListView.qml \
qml/view/ChatMessageListView.qml \
qml/view/ColumnView.qml \
qml/view/FeedGeneratorListView.qml \
qml/view/ImageFullView.qml \
Expand All @@ -81,6 +93,7 @@ QML_FILES = \
qml/view/PostThreadView.qml \
qml/view/ProfileListView.qml \
qml/view/ProfileView.qml \
qml/view/SuggestionProfileListView.qml \
qml/view/TimelineView.qml

IMAGE_FILES += \
Expand All @@ -98,6 +111,7 @@ IMAGE_FILES += \
qml/images/database.png \
qml/images/block.png \
qml/images/bookmark_add.png \
qml/images/chat.png \
qml/images/check.png \
qml/images/close.png \
qml/images/column.png \
Expand All @@ -113,6 +127,7 @@ IMAGE_FILES += \
qml/images/label.png \
qml/images/labeling.png \
qml/images/language.png \
qml/images/leave.png \
qml/images/like.png \
qml/images/list.png \
qml/images/logo.png \
Expand All @@ -128,6 +143,7 @@ IMAGE_FILES += \
qml/images/report.png \
qml/images/repost.png \
qml/images/search.png \
qml/images/send.png \
qml/images/settings.png \
qml/images/tag.png \
qml/images/terminal.png \
Expand All @@ -141,7 +157,7 @@ resources.files = $$QML_FILES $$IMAGE_FILES
resources.prefix = /$${TARGET}
RESOURCES += resources

TRANSLATIONS += i18n/qt_ja_JP.ts
TRANSLATIONS += i18n/app_ja.ts

# icon
win32:RC_FILE = app.rc
Expand Down
Binary file renamed app/i18n/qt_ja_JP.qm → app/i18n/app_ja.qm
Binary file not shown.
Loading

0 comments on commit ee732e0

Please sign in to comment.