Skip to content

[monobean] history commit browse & history file content view #1344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
genedna merged 7 commits into from
Aug 18, 2025
Merged

[monobean] history commit browse & history file content view #1344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b8cdb7
before change
pleasedontbreak123 Aug 7, 2025
29200e8
adjust ui
pleasedontbreak123 Aug 14, 2025
d4e5d4e
before break change
pleasedontbreak123 Aug 14, 2025
cf17417
history commit browse & history file content display
pleasedontbreak123 Aug 16, 2025
0290050
Merge branch 'web3infra-foundation:main' into main
pleasedontbreak123 Aug 16, 2025
cbd7a0e
fix clippy
pleasedontbreak123 Aug 16, 2025
8f1223a
fix async execute bug
pleasedontbreak123 Aug 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions monobean/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ scv = { version = "0.9.0", package = "sourceview5", features = ["gtk_v4_12", "v5
# To run mega core, we have to add these:
mono = { path = "../mono" }
common = { path = "../common" }
jupiter = { path = "../jupiter" }

vault = { path = "../vault" }
gateway = { path = "../gateway" }
ceres = { path = "../ceres" }
mercury = { path = "../mercury" }
context = {path = "../context"}


thiserror = { version = "2.0.11", features = ["default"] }
tracing-subscriber = { version = "0.3.19", features = ["default", "env-filter"] }
tokio = "1.45.0"
russh = "0.52"
axum = "0.8.1"
axum-server = "0.7.1"
bytes = "1.10.0"
async-channel = "2.3.1"
Expand All @@ -40,13 +40,11 @@ rustls = "0.23.23"
gix-config = "0.45.1"
home = "0.5.11"
smallvec = "1.14.0"
directories = "6.0.0"
tracing-appender = "0.2.3"
toml = "0.8.22"
#once_cell = "1.21.3"
chrono = "0.4"


resvg = "0.27"
tiny-skia = "0.11"

[build-dependencies]
glib-build-tools = "0.20.0"
Expand Down
7 changes: 4 additions & 3 deletions monobean/resources/gtk/code_page.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
</object>
</child>

<!-- sidebar-->
<child>
<object class="GtkBox" id="sidebar">
<property name="orientation">vertical</property>
Expand All @@ -118,7 +119,7 @@
<child>
<object class="GtkImage">
<property name="icon-name">monobean-url-clone-symbolic</property>
<property name="icon-size">large</property> <!-- 或者使用数字：1=small, 2=normal, 3=large, 4=extra-large -->
<property name="icon-size">large</property>
</object>
</child>
<style>
Expand Down Expand Up @@ -259,9 +260,9 @@
<property name="vexpand">True</property>
<property name="hexpand">True</property>
<property name="propagate-natural-height">False</property>
<property name="min-content-height">400</property>
<property name="min-content-height">500</property>
<property name="max-content-height">600</property>
<property name="min-content-width">150</property>
<property name="min-content-width">250</property>
<property name="hscrollbar-policy">automatic</property>
<property name="vscrollbar-policy">automatic</property>

Expand Down
4 changes: 2 additions & 2 deletions monobean/resources/gtk/preferences.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<child>
<object class="AdwPreferencesPage">
<property name="title" translatable="yes">Mega Configuration</property>
<property name="icon_name">preferences-desktop-apps-symbolic</property>
<property name="icon_name">monobean-repo-symbolic</property>
<child>
<object class="AdwPreferencesGroup">
<property name="title" translatable="yes">Base Settings</property>
Expand Down Expand Up @@ -483,7 +483,7 @@
<child>
<object class="AdwPreferencesPage">
<property name="title" translatable="yes">P2P</property>
<property name="icon_name">user-available-symbolic</property>
<property name="icon_name">monobean-network-symbolic</property>
<child>
<object class="AdwPreferencesGroup">
<property name="title" translatable="yes">Relay Settings</property>
Expand Down
69 changes: 46 additions & 23 deletions monobean/resources/gtk/window.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,35 +73,58 @@


<!-- control visable-->
<child>
<object class="GtkBox" id="search_container">
<property name="orientation">horizontal</property>
<property name="spacing">0</property>
<!-- <child>-->
<!-- <object class="GtkBox" id="search_container">-->
<!-- <property name="orientation">horizontal</property>-->
<!-- <property name="spacing">0</property>-->

<!-- &lt;!&ndash; 搜索框，拉伸 &ndash;&gt;-->
<!-- <child>-->
<!-- <object class="GtkSearchEntry" id="search_entry">-->
<!-- <property name="hexpand">true</property>-->
<!-- <property name="placeholder-text">请输入文本</property>-->
<!-- </object>-->
<!-- </child>-->

<!-- &lt;!&ndash; 搜索按钮 &ndash;&gt;-->
<!-- <child>-->
<!-- <object class="GtkButton" id="search_button">-->
<!-- <property name="label">搜索</property>-->
<!-- </object>-->
<!-- </child>-->

<!-- </object>-->
<!-- </child>-->

<!-- 搜索框，拉伸 -->
<child>
<object class="GtkSearchEntry" id="search_entry">
<property name="hexpand">true</property>
<property name="placeholder-text">请输入文本</property>
</object>
</child>
</object>
</child>

<!-- 搜索按钮 -->
<child>
<object class="GtkButton" id="search_button">
<property name="label">搜索</property>
</object>
</child>

<child type="title">
<object class="GtkBox" id="search_container">
<property name="orientation">horizontal</property>
<property name="spacing">5</property>

<child>
<object class="GtkBox" >
<property name="hexpand">true</property>
</object>
</child>

</object>
</child>
<child>
<object class="GtkSearchEntry" id="search_entry">
<property name="hexpand">true</property>
<property name="placeholder-text">请输入文本</property>
</object>
</child>

<child>
<object class="GtkBox" >
<property name="hexpand">true</property>
</object>
</child>

<child type="title">
<object class="GtkBox"/>
</object>
</child>


Expand Down Expand Up @@ -217,7 +240,7 @@
<property name="spacing">4</property>

<child>
<object class="GtkImage">
<object class="GtkImage" id="status_icon">
<property name="icon-name">dialog-warning</property>
</object>
</child>
Expand Down Expand Up @@ -253,7 +276,7 @@

<child>
<object class="GtkImage">
<property name="icon-name">network-wired-symbolic</property>
<property name="icon-name">link-status-icon</property>
</object>
</child>

Expand Down
4 changes: 4 additions & 0 deletions monobean/resources/icons/scalable/apps/link-status-icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions monobean/resources/icons/scalable/apps/status-normal-icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions monobean/resources/org.Web3Infrastructure.Monobean.gresource.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
<file compressed="true">icons/scalable/apps/walrus-4.png</file>
<file compressed="true">icons/scalable/apps/walrus-5.png</file>
<file compressed="true">icons/scalable/apps/walrus-6.png</file>
<file compressed="true">icons/scalable/apps/status-normal-icon.svg</file>
<file compressed="true">icons/scalable/apps/link-status-icon.svg</file>

<file preprocess="xml-stripblanks" compressed="true">icons/symbolic/apps/monobean-archive-restore-symbolic.svg</file>
<file preprocess="xml-stripblanks" compressed="true">icons/symbolic/apps/monobean-arrow-down-symbolic.svg</file>
Expand Down Expand Up @@ -71,5 +73,6 @@
<file preprocess="xml-stripblanks" compressed="true">icons/symbolic/apps/monobean-rss-symbolic.svg</file>
<file preprocess="xml-stripblanks" compressed="true">icons/symbolic/apps/monobean-css-symbolic.svg</file>
<file preprocess="xml-stripblanks" compressed="true">icons/symbolic/apps/monobean-json-symbolic.svg</file>

</gresource>
</gresources>
Loading
Loading