Skip to content

Commit 111bb86

Browse files
committed
release 3.1.4
1 parent 8861058 commit 111bb86

File tree

4 files changed

+30
-24
lines changed

4 files changed

+30
-24
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,14 @@ requires 'cn.ieclipse.pde.explorer 4.1.0' but it could not be found
101101

102102
## 问题提交
103103

104+
提交问题前,请参考[常见问题](https://github.com/Jamling/SmartIM/wiki/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98)
105+
104106
任何问题包括建议均可以在[Issue](https://github.com/Jamling/SmartQQ4Eclipse/issues)中提交
105107

106108
如果为Issue,建议带上eclipse版本及本插件版本信息(可以在Preference->SmartQQ中查看并复制版本信息)
107109

110+
## 开发
111+
112+
如果您对本项目感兴趣,请fork本项目,源代码下载完成之后,会有编译错误,需要将依赖的smartim-core等三个工程从build path中移除,并将libs下的core-x.x.x.jar, smartqq-x.x.x.jar, wechat.x.x.x.jar添加到build path.
113+
108114
[Eclipse Explorer]: https://github.com/Jamling/eclipse-explorer

cn.ieclipse.smartqq.feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="cn.ieclipse.smartqq.feature"
44
label="SmartQQ"
5-
version="3.1.3.qualifier"
5+
version="3.1.4.qualifier"
66
provider-name="ieclipse.cn"
77
plugin="cn.ieclipse.smartqq">
88

cn.ieclipse.smartqq/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: SmartQQ
44
Bundle-SymbolicName: cn.ieclipse.smartqq;singleton:=true
5-
Bundle-Version: 3.1.3.qualifier
5+
Bundle-Version: 3.1.4.qualifier
66
Bundle-Activator: cn.ieclipse.smartim.IMPlugin
77
Bundle-Vendor: ieclipse.cn
88
Require-Bundle: org.eclipse.ui,

cn.ieclipse.smartqq/src/cn/ieclipse/smartim/common/Notifications.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
package cn.ieclipse.smartim.common;
22

3-
import java.awt.Insets;
4-
import java.awt.Toolkit;
53
import java.lang.reflect.Method;
64
import java.util.Timer;
75
import java.util.TimerTask;
86

9-
import javax.swing.JFrame;
10-
117
import org.eclipse.core.runtime.Platform;
128
import org.eclipse.swt.SWT;
139
import org.eclipse.swt.events.MouseAdapter;
@@ -40,9 +36,9 @@ public class Notifications extends Shell {
4036
public static void main(String args[]) {
4137
try {
4238
final Display display = Display.getDefault();
43-
// Notifications.getInstance(new Shell(display)).setMock(true)
44-
// .setMessage(null, "test");
45-
// Notifications.notify("title", "message");
39+
// Notifications.getInstance(new Shell(display)).setMock(true)
40+
// .setMessage(null, "test");
41+
// Notifications.notify("title", "message");
4642
Notifications instance = new Notifications(display);
4743
instance.open();
4844
instance.layout();
@@ -69,7 +65,7 @@ public static void main(String args[]) {
6965
* @wbp.parser.constructor
7066
*/
7167
public Notifications(Display display) {
72-
this(display, SWT.ON_TOP | SWT.CLOSE | SWT.TITLE);
68+
this(display, SWT.ON_TOP | SWT.CLOSE | SWT.TITLE);
7369
}
7470

7571
/**
@@ -107,18 +103,19 @@ protected void createContents() {
107103
setSize(300, 150);
108104

109105
setLayout(new GridLayout(2, false));
110-
if (Platform.OS_LINUX.equals(Platform.getOS()))
111-
{
106+
if (Platform.OS_LINUX.equals(Platform.getOS())) {
112107
fIcon = new Label(this, SWT.NONE);
113-
fIcon.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
114-
fIcon.setImage(SWTResourceManager.getImage(org.eclipse.ui.IWorkbench.class,
115-
"/icons/full/etool16/delete_edit.png"));
108+
fIcon.setLayoutData(
109+
new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
110+
fIcon.setImage(
111+
SWTResourceManager.getImage(org.eclipse.ui.IWorkbench.class,
112+
"/icons/full/etool16/delete_edit.png"));
116113
fIcon.addMouseListener(new MouseAdapter() {
117-
@Override
118-
public void mouseDown(MouseEvent e) {
119-
setVisible(false);
120-
}
121-
});
114+
@Override
115+
public void mouseDown(MouseEvent e) {
116+
setVisible(false);
117+
}
118+
});
122119

123120
fTitle = new Label(this, SWT.NONE);
124121
fTitle.setText("通知");
@@ -157,10 +154,13 @@ public void widgetSelected(SelectionEvent e) {
157154
}
158155
});
159156

160-
Insets sd = Toolkit.getDefaultToolkit().getScreenInsets(
161-
new JFrame().getGraphicsConfiguration());
157+
162158
Rectangle screen = Display.getDefault().getClientArea();
163-
screen.height = screen.height - sd.bottom;
159+
if (Platform.OS_LINUX.equals(Platform.getOS())) {
160+
java.awt.Insets sd = java.awt.Toolkit.getDefaultToolkit()
161+
.getScreenInsets(new java.awt.Frame().getGraphicsConfiguration());
162+
screen.height = screen.height - sd.bottom;
163+
}
164164
ta = new TranslateAnimation(screen.width, screen.width - getSize().x,
165165
screen.height, screen.height - getSize().y).setTarget(this)
166166
.setDuration(300);
@@ -219,7 +219,7 @@ private void doSetMessage(String title, CharSequence text) {
219219
if (title != null) {
220220
this.setText(title);
221221
if (fTitle != null) {
222-
fTitle.setText(title);
222+
fTitle.setText(title);
223223
}
224224
}
225225
this.fText.setText(text == null ? "" : text.toString());

0 commit comments

Comments
 (0)