Menu
▾
▴
[27970 svn/public] plugins/aercm/com/aelitis/plugins/rcmplugin
|
From: <am...@vu...> - 2013-02-12 21:50:42
|
Revision: 27970
Author: amogge
Date: 2013-02-12 21:50:31 +0000 (Tue, 12 Feb 2013)
Log Message:
-----------
second text spew dialog box
Modified Paths:
--------------
plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentUI.java
plugins/aercm/com/aelitis/plugins/rcmplugin/internat/Messages.properties
Added Paths:
-----------
plugins/aercm/com/aelitis/plugins/rcmplugin/skins/skin3_rcm_ftux2.properties
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentUI.java
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentUI.java 2013-02-12 00:48:44 UTC (rev 27969)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/RelatedContentUI.java 2013-02-12 21:50:31 UTC (rev 27970)
@@ -2401,33 +2401,78 @@
}
return;
}
- boolean enabled = result == 0;
+ boolean enabled = result == 0;
- if ( so_list != null ){
- so_list.setVisible(enabled);
+ if (enabled && radioResult[0] == 1) {
+ showFTUX2(new UserPrompterResultListener() {
+ public void prompterClosed(int result) {
+ if (result == 0) {
+ enableRCM(true, true, so_list);
+ } else if (so_list != null) {
+ UIFunctionsManager.getUIFunctions().openView(UIFunctions.VIEW_MYTORRENTS, null);
+ }
+ }
+ });
+ return;
}
+ enableRCM(enabled, false, so_list);
+ }
+ });
+
+ box.waitUntilClosed();
+ }
+ private static void enableRCM(boolean enabled, boolean all, SWTSkinObject so_list) {
+ if ( so_list != null ){
+ so_list.setVisible(enabled);
+ }
- RelatedContentUI ui = RelatedContentUI.getSingleton();
+ RelatedContentUI ui = RelatedContentUI.getSingleton();
- if (ui != null) {
- if (enabled) {
- ui.plugin.setRCMEnabled(enabled);
+ if (ui != null) {
+ if (enabled) {
+ ui.plugin.setRCMEnabled(enabled);
+ }
+ ui.setSearchEnabled(enabled);
+ ui.setUIEnabled(enabled);
+ ui.plugin.setFTUXBeenShown(true);
+
+ if (all) {
+ ui.plugin.setToAllSources();
+ } else {
+ ui.plugin.setToDefaultSourcesList();
+ }
+ }
+
+ }
+
+ protected static void showFTUX2(UserPrompterResultListener l) {
+ final VuzeMessageBox box = new VuzeMessageBox(
+ MessageText.getString("rcm.ftux2.title"), null, new String[] {
+ MessageText.getString("Button.ok"),
+ MessageText.getString("Button.cancel"),
+ }, 0);
+ box.setSubTitle(MessageText.getString("rcm.ftux2.heading"));
+ box.setListener(new VuzeMessageBoxListener() {
+ public void shellReady(Shell shell, SWTSkinObjectContainer soExtra) {
+ SWTSkin skin = soExtra.getSkin();
+ addResourceBundle(skin, "com/aelitis/plugins/rcmplugin/skins/",
+ "skin3_rcm_ftux2");
+
+ String id = "rcm.ftux2.shell";
+ skin.createSkinObject(id, id, soExtra);
+
+ box.setButtonEnabled(0, false);
+
+ final SWTSkinObjectCheckbox cb = (SWTSkinObjectCheckbox) skin.getSkinObject("agree-checkbox");
+ cb.addSelectionListener(new SWTSkinCheckboxListener() {
+ public void checkboxChanged(SWTSkinObjectCheckbox so, boolean checked) {
+ box.setButtonEnabled(0, checked);
}
- ui.setSearchEnabled(enabled);
- ui.setUIEnabled(enabled);
- ui.plugin.setFTUXBeenShown(true);
-
- if (radioResult[0] == 1) {
- ui.plugin.setToAllSources();
- } else {
- ui.plugin.setToDefaultSourcesList();
- }
- }
-
+ });
}
});
- box.waitUntilClosed();
+ box.open(l);
}
}
Modified: plugins/aercm/com/aelitis/plugins/rcmplugin/internat/Messages.properties
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/internat/Messages.properties 2013-02-12 00:48:44 UTC (rev 27969)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/internat/Messages.properties 2013-02-12 21:50:31 UTC (rev 27970)
@@ -23,7 +23,7 @@
rcm.ftux.option.preselect=Enable Vuze Pre-Selected Tracker Sites. \
I have read <A HREF="http://wiki.vuze.com/w/Swarm_Discoveries">here</A> and \
- <A HREF="http://en.wikipedia.org/wiki/BitTorrent#Legal_issues">here</A> about those sites and some risks of them using them, \
+ <A HREF="http://en.wikipedia.org/wiki/BitTorrent#Legal_issues">here</A> about those sites and some risks of using them, \
and I understand and agree that Vuze has no responsibility whatsoever with my enabling this function and using any of those trackers. \
I agree that it is my responsibility to ensure that I am only downloading lawful and non-infringing content.
@@ -32,7 +32,7 @@
rcm.ftux.option.all=Enable all tracker sites related to my existing torrent files. \
I have read <A HREF="http://wiki.vuze.com/w/Swarm_Discoveries">here</A> and \
- <A HREF="http://en.wikipedia.org/wiki/BitTorrent#Legal_issues">here</A> about those sites and some risks of them using them, \
+ <A HREF="http://en.wikipedia.org/wiki/BitTorrent#Legal_issues">here</A> about those sites and some risks of using them, \
and I understand and agree that Vuze has no responsibility whatsoever with my enabling this function and using all tracker sites. \
I agree that it is my responsibility to ensure that I am only downloading lawful and non-infringing content.
@@ -101,3 +101,25 @@
rcm.ftux.accept=Accept
rcm.ftux.decline=Decline
+
+rcm.ftux2.title={rcm.view.heading}
+rcm.ftux2.heading=Additional Information and Warnings about this feature
+rcm.ftux2.info=For tracker sites not included in the tracker sites pre-selected by Vuze, \
+ we additionally warn that some of those tracker sites might be accused of being more likely to track torrent \
+ files that might infringe upon the rights of others, including copyright, and might include more "adult" content. \
+ Give how Swarm Discoveries works, \
+ third party torrent files that might automatically be considered "related" to the torrent files on your device \
+ which are found by the way of either Vuze pre-selected or "all" tracker sites might be "related" only by virtue \
+ of the fact that if you and other users have "ABC.torrent," for example, and many or some of those other users have \
+ "XXX.torrent," Swarm Discoveries might consider the "XXX.torrent" to be "related". \
+ You might want to take additional care in selecting what Swarm Discovery content you wish to download, \
+ as well as then make available for uploading.
+
+rcm.ftux2.agree=I understand and agree. \
+ Enable all tracker sites related to my existing torrent files. \
+ I have read <A HREF="http://wiki.vuze.com/w/Swarm_Discoveries">here</A> and \
+ <A HREF="http://en.wikipedia.org/wiki/BitTorrent#Legal_issues">here</A> about those tracker sites and some risks of using them, \
+ and I understand and agree that Vuze has no responsibility whatsoever with my enabling this function. \
+ I agree that is my responsibility to ensure that I am only downloading lawful and non-infringing content.
+
+
\ No newline at end of file
Added: plugins/aercm/com/aelitis/plugins/rcmplugin/skins/skin3_rcm_ftux2.properties
===================================================================
--- plugins/aercm/com/aelitis/plugins/rcmplugin/skins/skin3_rcm_ftux2.properties (rev 0)
+++ plugins/aercm/com/aelitis/plugins/rcmplugin/skins/skin3_rcm_ftux2.properties 2013-02-12 21:50:31 UTC (rev 27970)
@@ -0,0 +1,38 @@
+shell.padding=10
+
+rcm.ftux2.shell.type=container
+rcm.ftux2.shell.attach.left=0,0
+rcm.ftux2.shell.attach.right=100,0
+rcm.ftux2.shell.attach.top=0,0
+rcm.ftux2.shell.attach.bottom=100,-20
+rcm.ftux2.shell.widgets=\
+ shell.info,\
+ shell.confirm.area
+
+shell.info.type=text,{rcm.ftux2.info}
+shell.info.text.urlcolor={color.links.normal}
+shell.info.attach.right=100,0
+shell.info.attach.left=0,0
+shell.info.attach.bottom=
+shell.info.attach.top=0,0
+
+shell.confirm.area.type=container
+shell.confirm.area.widgets=agree.check,agree.label
+shell.confirm.area.attach.right=100,0
+shell.confirm.area.attach.left=0,0
+shell.confirm.area.attach.top=shell.info,10
+shell.confirm.area.attach.bottom=
+
+agree.check.type=checkbox
+agree.check.view=agree-checkbox
+agree.check.attach.left=0,0
+agree.check.attach.right=
+agree.check.attach.top=0,0
+
+agree.label.type=text,{rcm.ftux2.agree}
+agree.label.text.urlcolor={color.links.normal}
+agree.label.attach.left=agree.check,3
+agree.label.attach.right=100,0
+agree.label.attach.top=0,1
+agree.label.attach.bottom=
+
|
