Skip to content

Commit f98fbda

Browse files
sunzhonghuisunzhonghui
committed
1.更新UI
2.文档补充
1 parent 4edb8c3 commit f98fbda

File tree

11 files changed

+146
-17
lines changed

11 files changed

+146
-17
lines changed

‎.goreleaser.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ archives:
2121
- replacements:
2222
linux: Linux
2323
windows: Windows
24+
darwin: Darwin
2425
386: i386
2526
amd64: x86_64
2627
format_overrides:

‎README.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,22 @@
2222

2323
### 自动加载配置
2424

25-
项目启动的时候会自动加载配置到 /resource 下
25+
项目启动的时候会自动创建配置文件夹
26+
27+
自动加载默认配置文件到 /resource 下
2628

2729
font/ 字体文件
2830
temp/ 模板文件
2931
conf.yaml 默认配置文件
3032

3133
### 配置
3234

35+
36+
37+
38+
### 打包
39+
40+
fyne package -os windows -icon idmisstx.png
3341
……
3442

3543

‎go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ go 1.15
44

55
require (
66
fyne.io/fyne v1.4.3
7-
fyne.io/fyne/v2 v2.0.0
7+
fyne.io/fyne/v2 v2.0.1
88
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
99
github.com/lestrrat-go/strftime v1.0.4 // indirect
10-
github.com/mattn/go-sqlite3 v1.14.6 // indirect
1110
github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
1211
github.com/sirupsen/logrus v1.8.0
1312
github.com/spf13/viper v1.7.1
1413
gorm.io/driver/mysql v1.0.4
15-
gorm.io/driver/sqlite v1.1.4 // indirect
1614
gorm.io/gorm v1.20.12
1715
)

‎go.sum‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ fyne.io/fyne v1.4.3 h1:356CnXCiYrrfaLGsB7qLK3c6ktzyh8WR05v/2RBu51I=
1515
fyne.io/fyne v1.4.3/go.mod h1:8kiPBNSDmuplxs9WnKCkaWYqbcXFy0DeAzwa6PBO9Z8=
1616
fyne.io/fyne/v2 v2.0.0 h1:TfsS3bNq5663BpXsoz1OfzyjcaMqqOf9usI8ZKkw4IE=
1717
fyne.io/fyne/v2 v2.0.0/go.mod h1:FmobqvPpBW+nG1nDyxZWf1SQLED9g/vXIxiIIVjHazY=
18+
fyne.io/fyne/v2 v2.0.1 h1:GlW2AHAt3CK5l/cpr0jPfsxWFgNo751yaLk/v3+v888=
19+
fyne.io/fyne/v2 v2.0.1/go.mod h1:Q12wKzvdrCct+tkaJcMuTmcyDz4ZDjc6+/llerrFnFc=
1820
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
1921
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
2022
github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9 h1:1ltqoej5GtaWF8jaiA49HwsZD459jqm9YFz9ZtMFpQA=
@@ -141,6 +143,10 @@ github.com/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9B
141143
github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
142144
github.com/lucor/goinfo v0.0.0-20200401173949-526b5363a13a h1:4djPngMU3ttoFCf6DOgPNQYmxyNmRRmpLg4/uz2TTEg=
143145
github.com/lucor/goinfo v0.0.0-20200401173949-526b5363a13a/go.mod h1:ORP3/rB5IsulLEBwQZCJyyV6niqmI7P4EWSmkug+1Ng=
146+
github.com/lusingander/colorpicker v0.7.0 h1:hXF7UvW432/mDcfymkCI1RyEctAQ80pbHSrDLL20WnU=
147+
github.com/lusingander/colorpicker v0.7.0/go.mod h1:7IORrz100ckeBbSGO/7Y5WHramkdW5tDwpCMolLdn/o=
148+
github.com/lusingander/fyne-theme-generator v0.2.2 h1:DZELv8sjB6oO/u1Z8Cz20kwPyhi/sjb7p/WA0rnWxxs=
149+
github.com/lusingander/fyne-theme-generator v0.2.2/go.mod h1:e+BQr37kOJ3Fqd3ERQvXArnNJdy/2DGK0vMen+G052g=
144150
github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g=
145151
github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
146152
github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
@@ -246,6 +252,8 @@ golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMx
246252
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
247253
golang.org/x/image v0.0.0-20200430140353-33d19683fad8 h1:6WW6V3x1P/jokJBpRQYUJnMHRP6isStQwCozxnU7XQw=
248254
golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
255+
golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb h1:fqpd0EBDzlHRCjiphRR5Zo/RSWWQlWv34418dnEixWk=
256+
golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
249257
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
250258
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
251259
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -276,6 +284,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
276284
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
277285
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
278286
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
287+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
288+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
279289
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
280290
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
281291
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -303,10 +313,16 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
303313
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
304314
golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666 h1:gVCS+QOncANNPlmlO1AhlU3oxs4V9z+gTtPwIk3p2N8=
305315
golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
316+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
317+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
318+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
306319
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
307320
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
308321
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
309322
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
323+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
324+
golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
325+
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
310326
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
311327
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
312328
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎main.go‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,30 @@ package main
33

44
import (
55
"code/gen/page"
6+
"code/gen/resource/images"
67
"code/gen/runner"
78
"code/gen/util/logger"
9+
"fyne.io/fyne/v2"
10+
"fyne.io/fyne/v2/app"
11+
"fyne.io/fyne/v2/driver/desktop"
12+
"fyne.io/fyne/v2/widget"
813
"github.com/sirupsen/logrus"
914
"net/url"
1015
"os"
11-
12-
"fyne.io/fyne/v2"
13-
"fyne.io/fyne/v2/app"
14-
"fyne.io/fyne/v2/theme"
1516
)
1617

18+
var a fyne.App
19+
var Loading fyne.Window
20+
1721
func init() {
22+
a = app.NewWithID("com.idmiss.generator")
23+
driver := fyne.CurrentApp().Driver()
24+
if drv, ok := driver.(desktop.Driver); ok {
25+
Loading = drv.CreateSplashWindow()
26+
Loading.SetContent(widget.NewLabelWithStyle("正在加载……",
27+
fyne.TextAlignCenter, fyne.TextStyle{Bold: true}))
28+
Loading.Hide()
29+
}
1830
runner.Runner()
1931
}
2032

@@ -29,8 +41,9 @@ func shortcutFocused(s fyne.Shortcut, w fyne.Window) {
2941
}
3042

3143
func main() {
32-
a := app.NewWithID("com.idmiss.generator")
33-
a.SetIcon(theme.FyneLogo())
44+
45+
a.Settings().SetTheme(page.MyTheme{})
46+
a.SetIcon(images.ResourceIdmisstxPng)
3447
w := a.NewWindow("Golang 代码生成器")
3548
w.SetFixedSize(true)
3649
topWindow = w
@@ -55,7 +68,7 @@ func main() {
5568

5669
helpMenu := fyne.NewMenu("帮助",
5770
fyne.NewMenuItem("查看文档", func() {
58-
u, _ := url.Parse("http://www.idmiss.com/")
71+
u, _ := url.Parse("http://www.idmiss.com/709")
5972
_ = a.OpenURL(u)
6073
}))
6174

@@ -85,5 +98,5 @@ func main() {
8598
w.Resize(fyne.NewSize(640, 460))
8699
w.ShowAndRun()
87100

88-
os.Unsetenv("FYNE_FONT")
101+
//os.Unsetenv("FYNE_FONT")
89102
}

‎page/data.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package page
22

33
import (
4+
"code/gen/util/conf"
45
"fyne.io/fyne/v2"
56
"fyne.io/fyne/v2/container"
67
"fyne.io/fyne/v2/widget"
@@ -13,9 +14,9 @@ type PageDetail struct {
1314

1415
var (
1516
Pages = map[string]*PageDetail{
16-
"welcome": {Title: "Golang 代码生成器 go-code-generator v0.0.1", View: welcomeScreen},
17+
"welcome": {Title: "Golang 代码生成器 go-code-generator " + conf.Version, View: welcomeScreen},
1718
"database": {Title: "设置数据库", View: DatabaseScreen},
18-
"project": {Title: "项目设置\r\n缩写会生成对应这个缩写的文件夹", View: ProjcetScreen},
19+
"project": {Title: "项目设置", View: ProjcetScreen},
1920
"autocode": {Title: "代码生成", View: AutoScreen},
2021
}
2122
)

‎page/themeGen.go‎

Lines changed: 90 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎page/welcome.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ func welcomeScreen(win fyne.Window) fyne.CanvasObject {
2929
container.NewHBox(
3030
widget.NewHyperlink("博客", parseURL("http://www.idmiss.com/")),
3131
widget.NewLabel("-"),
32-
widget.NewHyperlink("文档", parseURL("http://www.idmiss.com/")),
32+
widget.NewHyperlink("文档", parseURL("http://www.idmiss.com/709")),
3333
widget.NewLabel("-"),
34-
widget.NewHyperlink("github", parseURL("http://www.idmiss.com/")),
34+
widget.NewHyperlink("github", parseURL("https://github.com/sunzhonghui/go-code-generator")),
3535
),
3636
))
3737
}

‎resource/images/main.png‎

85 Bytes
Loading

‎runner/init.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
func Runner() {
10-
font.GetZhFont()
10+
//font.GetZhFont()
1111
font.GetTemp()
1212
conf.Init()
1313
logger.InitLog()

0 commit comments

Comments
 (0)