Skip to content

Commit c0c56e0

Browse files
committed
更新UI,增加数据管理界面
1 parent e80fa4d commit c0c56e0

File tree

14 files changed

+41
-18
lines changed

14 files changed

+41
-18
lines changed

conf/nbs.db

0 Bytes
Binary file not shown.

src/main/java/io/nbs/client/listener/IPFSFileUploader.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ private void uploadSuccessNotify(MerkleNode node){
107107
}
108108

109109
// ipfs.pubsub.pub(IpfsMessageSender.NBSWORLD_IMS_TOPIC,)
110+
//ipfs.object.
110111

112+
//ipfs.pin.add()
111113
}
112114

113115
/**

src/main/java/io/nbs/client/ui/frames/MainFrame.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public static MainFrame getContext() {
204204
}
205205

206206
public static enum MainCardLayoutTypes{
207-
INFO,IM,DATDA,MUSIC,ABOUT;
207+
INFO,IM,DATD,MUSIC,ABOUT;
208208
}
209209

210210
public PeerInfo getCurrentPeer() {

src/main/java/io/nbs/client/ui/panels/ToolbarPanel.java

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ private void initView(){
130130
upButtonPanel.setOpaque(false);
131131
//upButtonPanel.setBackground(ColorCnst.DARKER);
132132
upButtonPanel.add(avatarLabel);
133-
avatarLabel.setBackground(ColorCnst.DARK);
133+
//avatarLabel.setBackground(ColorCnst.DARK);
134134

135135
upButtonPanel.add(infoBTN);
136136
upButtonPanel.add(imBTN);
137-
imBTN.actived();
137+
//imBTN.actived();
138138
upButtonPanel.add(dataBTN);
139139
upButtonPanel.add(musicBTN);
140140

@@ -167,13 +167,31 @@ public void actionPerformed(ActionEvent e) {
167167
}
168168
});
169169

170+
dataBTN.addActionListener(new ActionListener() {
171+
@Override
172+
public void actionPerformed(ActionEvent e) {
173+
selectedBTN(dataBTN);
174+
mainCtx.mainWinShow(MainFrame.MainCardLayoutTypes.DATD);
175+
}
176+
});
177+
170178
aboutBTN.addActionListener(new ActionListener() {
171179
@Override
172180
public void actionPerformed(ActionEvent e) {
173181
selectedBTN(aboutBTN);
174182
mainCtx.mainWinShow(MainFrame.MainCardLayoutTypes.ABOUT);
175183
}
176184
});
185+
186+
187+
188+
musicBTN.addActionListener(new ActionListener() {
189+
@Override
190+
public void actionPerformed(ActionEvent e) {
191+
selectedBTN(musicBTN);
192+
mainCtx.mainWinShow(MainFrame.MainCardLayoutTypes.ABOUT);
193+
}
194+
});
177195
}
178196

179197
public void refreshToolbarAvatar(){

src/main/java/io/nbs/commons/utils/ButtonIconUtil.java

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,40 +20,43 @@ public class ButtonIconUtil {
2020

2121
public static final ImageIcon CHAT_NORMAL = new ImageIcon("");
2222

23+
/**
24+
* 信息
25+
*/
2326
public static NBSIconButton infoBTN =
2427
new NBSIconButton(
25-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/info_normal.png")),
26-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/info_active.png")),
27-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/info_normal.png")),
28+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/info.png")),
29+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/info_pre.png")),
30+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/info_dis.png")),
2831
"PEER INFO"
2932
);
3033
public static NBSIconButton imBTN =
3134
new NBSIconButton(
32-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/chat_normal.png")),
33-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/chat_active.png")),
34-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/chat_normal.png")),
35+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/chat.png")),
36+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/chat_pre.png")),
37+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/chat_dis.png")),
3538
"聊天"
3639
);
3740
public static NBSIconButton dataBTN =
3841
new NBSIconButton(
39-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/chain_normal.png")),
40-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/chain_active.png")),
41-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/chain_normal.png")),
42+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/manage.png")),
43+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/manage_pre.png")),
44+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/manage_dis.png")),
4245
"链上数据"
4346
);
4447
public static NBSIconButton videoBTN =
4548
new NBSIconButton(
46-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/music_normal.png")),
47-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/music_active.png")),
48-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/music_normal.png")),
49+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/media.png")),
50+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/media_pre.png")),
51+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/media_dis.png")),
4952
"视频"
5053
);
5154

5255
public static NBSIconButton musicBTN =
5356
new NBSIconButton(
54-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/music_normal.png")),
55-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/music_active.png")),
56-
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/music_normal.png")),
57+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/media.png")),
58+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/media_pre.png")),
59+
new ImageIcon(LamButtonIcon.class.getResource("/icons/tools/media_dis.png")),
5760
"音乐"
5861
);
5962
public static NBSIconButton confBTN;
1.24 KB
Loading
1.27 KB
Loading
1.2 KB
Loading
1.04 KB
Loading
1.06 KB
Loading

0 commit comments

Comments
 (0)