Menu
▾
▴
[41331 svn/public] plugins/azpromo
|
From: <am...@vu...> - 2014-12-22 18:38:15
|
Revision: 41331
Author: amogge
Date: 2014-12-22 18:38:07 +0000 (Mon, 22 Dec 2014)
Log Message:
-----------
Implement requested changes
Modified Paths:
--------------
plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoPlugin.java
plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java
plugins/azpromo/plugin_live.properties
plugins/azpromo/plugin_qa.properties
Modified: plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoPlugin.java
===================================================================
--- plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoPlugin.java 2014-12-22 17:16:52 UTC (rev 41330)
+++ plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoPlugin.java 2014-12-22 18:38:07 UTC (rev 41331)
@@ -52,7 +52,7 @@
private static final String VIEWID = "SidebarPromo";
- private UISWTInstance swtInstance = null;
+ public static UISWTInstance swtInstance = null;
private BasicPluginConfigModel configModel;
public static PluginInterface pluginInterface;
Modified: plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java
===================================================================
--- plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java 2014-12-22 17:16:52 UTC (rev 41330)
+++ plugins/azpromo/com/vuze/azureus/plugin/azpromo/PromoView.java 2014-12-22 18:38:07 UTC (rev 41331)
@@ -36,7 +36,11 @@
import org.gudy.azureus2.ui.swt.plugins.UISWTViewEvent;
import org.gudy.azureus2.ui.swt.plugins.UISWTViewEventListener;
+import com.aelitis.azureus.ui.UIFunctionsManager;
+import com.aelitis.azureus.ui.mdi.MultipleDocumentInterface;
import com.aelitis.azureus.ui.swt.skin.SWTSkinObjectSash;
+import com.aelitis.azureus.ui.swt.utils.FontUtils;
+import com.aelitis.azureus.ui.swt.views.skin.SBC_PlusFTUX;
import com.aelitis.azureus.ui.swt.views.skin.sidebar.SideBar;
import com.appadx.adcontrol.*;
@@ -49,6 +53,8 @@
{
private AdControlSWT adControl;
+ private UISWTView view;
+
public PromoView() {
}
@@ -85,8 +91,7 @@
break;
case UISWTViewEvent.TYPE_LANGUAGEUPDATE:
- log("TYPE_LANGUAGEUPDATE Called "
- + Locale.getDefault().toString());
+ log("TYPE_LANGUAGEUPDATE Called " + Locale.getDefault().toString());
break;
}
return true;
@@ -94,6 +99,7 @@
private void initialize(Composite parent, final UISWTView view) {
+ this.view = view;
try {
PluginConfig config = PromoPlugin.pluginInterface.getPluginconfig();
if (!config.getPluginBooleanParameter("resized.once")) {
@@ -120,16 +126,14 @@
fd.left = null;
fd.right.offset = -3;
- final Label lbl = new Label(ourParent, SWT.NONE);
- lbl.setText("x");
- lbl.setCursor(lbl.getDisplay().getSystemCursor(SWT.CURSOR_HAND));
- lbl.setLayoutData(fd);
- lbl.addMouseListener(new MouseListener() {
+ final Label lblClose = new Label(ourParent, SWT.NONE);
+ lblClose.setText("x");
+ lblClose.setCursor(lblClose.getDisplay().getSystemCursor(SWT.CURSOR_HAND));
+ lblClose.setLayoutData(fd);
+ lblClose.addMouseListener(new MouseListener() {
public void mouseUp(MouseEvent e) {
- view.closeView();
- PromoPlugin.pluginInterface.getPluginconfig().setPluginParameter(
- "enabled", false);
+ temporaryClose();
}
public void mouseDown(MouseEvent e) {
@@ -139,11 +143,47 @@
}
});
+ final Label lblText = new Label(ourParent, SWT.NONE);
+ lblText.setText("Plus Users Don't See Ads");
+ lblText.setFont(FontUtils.getFontWithHeight(lblText.getFont(), null, 9));
+ lblText.addMouseListener(new MouseListener() {
+
+ public void mouseUp(MouseEvent e) {
+
+ PromoPlugin.pluginInterface.getUtilities().createThread("LoadPromo",
+ new Runnable() {
+
+ public void run() {
+ try {
+ log("loadclick");
+ adControl.loadAd();
+ } catch (Throwable t) {
+ }
+ }
+ });
+
+ }
+
+ public void mouseDown(MouseEvent e) {
+ }
+
+ public void mouseDoubleClick(MouseEvent e) {
+ }
+ });
+
adControl = new AdControlSWT(ourParent, SWT.NO_SCROLL);
fd = Utils.getFilledFormData();
fd.height = 254;
- fd.top = new FormAttachment(lbl, 2);
+ fd.top = new FormAttachment(lblClose, 2);
adControl.setLayoutData(fd);
+
+ fd = Utils.getFilledFormData();
+ fd.bottom = new FormAttachment(adControl, -1);
+ fd.top = null;
+ fd.right = null;
+ fd.left.offset = 3;
+ lblText.setLayoutData(fd);
+
adControl.addAdControlEventListener(new AdControlEventListener() {
public void onAdClicked() {
@@ -171,9 +211,11 @@
super.onAdStarted();
}
});
-
- String pubID = PromoPlugin.pluginInterface.getPluginProperties().getProperty("PubID", "mawra2ag1");
- int reloadTime = Integer.parseInt(PromoPlugin.pluginInterface.getPluginProperties().getProperty("ReloadSecs", "86400"));
+
+ String pubID = PromoPlugin.pluginInterface.getPluginProperties().getProperty(
+ "PubID", "mawra2ag1");
+ int reloadTime = Integer.parseInt(PromoPlugin.pluginInterface.getPluginProperties().getProperty(
+ "ReloadSecs", "86400"));
log("pubID len=" + pubID.length() + ";reload in " + reloadTime);
IAdControlOptions options = adControl.getOptions();
@@ -180,11 +222,11 @@
options.setPlayerOption(IAdControlOptions.Player.AUTO_MUTE, true);
options.setPubID(pubID);
options.setPageName("vuze");
- options.setPubConfigURL("http://vuze-pubcfg.desktopadx.com/service/pubcfg/get.php?id=");
+ options.setPubConfigURL("http://vuze-pubcfg.desktopadx.com/service/pubcfg/get.php?id=");
options.setRequestDomain("btpr.vuze.com");
-
+
options.setPublisherDefaultAdReloadTime(reloadTime);
-
+
PromoPlugin.pluginInterface.getUtilities().createThread("LoadPromo",
new Runnable() {
@@ -202,7 +244,6 @@
}
});
-
PromoPlugin.logEvent("shown");
} catch (AdControlException e1) {
// Bad or missing Publisher Configuration - Connection timed out: connect
@@ -219,6 +260,29 @@
adControl.getShell().layout(true, true);
}
+ protected void temporaryClose() {
+ if (view == null) {
+ return;
+ }
+ view.closeView();
+ if (PromoPlugin.swtInstance == null) {
+ return;
+ }
+ int result = PromoPlugin.swtInstance.promptUser("Get Vuze Plus",
+ "Upgrading to Vuze Plus will remove ads from the client.",
+ new String[] {
+ "Not Now",
+ "Upgrade"
+ }, 1);
+
+ if (result == 1) {
+ SBC_PlusFTUX.setSourceRef("dlg-promo");
+
+ MultipleDocumentInterface mdi = UIFunctionsManager.getUIFunctions().getMDI();
+ mdi.showEntryByID(MultipleDocumentInterface.SIDEBAR_SECTION_PLUS);
+ }
+ }
+
protected void log(String string) {
System.out.println("PromoView: " + string);
}
Modified: plugins/azpromo/plugin_live.properties
===================================================================
--- plugins/azpromo/plugin_live.properties 2014-12-22 17:16:52 UTC (rev 41330)
+++ plugins/azpromo/plugin_live.properties 2014-12-22 18:38:07 UTC (rev 41331)
@@ -2,4 +2,4 @@
plugin.langfile=com.vuze.azureus.plugin.azpromo.internat.Messages
plugin.name=Promo View
plugin.id=azpromo
-plugin.version=1.0.8
\ No newline at end of file
+plugin.version=1.1.0
\ No newline at end of file
Modified: plugins/azpromo/plugin_qa.properties
===================================================================
--- plugins/azpromo/plugin_qa.properties 2014-12-22 17:16:52 UTC (rev 41330)
+++ plugins/azpromo/plugin_qa.properties 2014-12-22 18:38:07 UTC (rev 41331)
@@ -2,6 +2,6 @@
plugin.langfile=com.vuze.azureus.plugin.azpromo.internat.Messages
plugin.name=Promo View QA
plugin.id=azpromo-qa
-plugin.version=1.0.8
+plugin.version=1.1.0
PubID=mawra2ag1-staging
ReloadSecs=30
\ No newline at end of file
|