Author: jflesch
Date: 2007-04-23 13:11:28 +0000 (Mon, 23 Apr 2007)
New Revision: 12895
Modified:
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
trunk/apps/Thaw/src/thaw/plugins/index/BlackList.java
trunk/apps/Thaw/src/thaw/plugins/signatures/SigConfigTab.java
Log:
Allow to not ignore all the trust level + remove the comment and blacklist tabs
when stoping the index browser
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-04-23
02:01:21 UTC (rev 12894)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-04-23
13:11:28 UTC (rev 12895)
@@ -410,6 +410,7 @@
thaw.plugin.signature.trustLevel.check=VALIDE
thaw.plugin.signature.trustLevel.bad=MAUVAIS
thaw.plugin.signature.trustLevel.evil=DIABOLIQUE
+thaw.plugin.signature.trustLevel.none=(aucun)
thaw.plugin.signature.trustLevel.me=MOI
thaw.plugin.signature.ignoreLowerThan=Ignorer les signatures avec un status
inf?rieur ?
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-04-23 02:01:21 UTC
(rev 12894)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-04-23 13:11:28 UTC
(rev 12895)
@@ -418,6 +418,8 @@
thaw.plugin.signature.trustLevel.check=CHECK
thaw.plugin.signature.trustLevel.bad=BAD
thaw.plugin.signature.trustLevel.evil=EVIL
+# the following one is used for the ignorance level
+thaw.plugin.signature.trustLevel.none=(none)
thaw.plugin.signature.trustLevel.me=ME
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-04-23 02:01:21 UTC
(rev 12894)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-04-23 13:11:28 UTC
(rev 12895)
@@ -410,6 +410,7 @@
thaw.plugin.signature.trustLevel.check=VALIDE
thaw.plugin.signature.trustLevel.bad=MAUVAIS
thaw.plugin.signature.trustLevel.evil=DIABOLIQUE
+thaw.plugin.signature.trustLevel.none=(aucun)
thaw.plugin.signature.trustLevel.me=MOI
thaw.plugin.signature.ignoreLowerThan=Ignorer les signatures avec un status
inf\u00e9rieur \u00e0
Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-04-23 02:01:21 UTC
(rev 12894)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-04-23 13:11:28 UTC
(rev 12895)
@@ -121,6 +121,9 @@
if (autoRefresh != null)
autoRefresh.stop();
+ browserPanel.getCommentTab().hideTab();
+ browserPanel.getBlackList().hidePanel();
+
browserPanel.stopAllThreads();
core.getMainWindow().getTabbedPane().removeChangeListener(this);
Modified: trunk/apps/Thaw/src/thaw/plugins/index/BlackList.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/BlackList.java 2007-04-23
02:01:21 UTC (rev 12894)
+++ trunk/apps/Thaw/src/thaw/plugins/index/BlackList.java 2007-04-23
13:11:28 UTC (rev 12895)
@@ -171,6 +171,9 @@
public void displayPanel() {
+ if (visible)
+ return;
+
visible = true;
updateList();
core.getMainWindow().addTab(I18n.getMessage("thaw.plugin.index.blackList"),
@@ -180,6 +183,9 @@
public void hidePanel() {
+ if (!visible)
+ return;
+
visible = false;
purgeList();
core.getMainWindow().removeTab(panel);
Modified: trunk/apps/Thaw/src/thaw/plugins/signatures/SigConfigTab.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/signatures/SigConfigTab.java
2007-04-23 02:01:21 UTC (rev 12894)
+++ trunk/apps/Thaw/src/thaw/plugins/signatures/SigConfigTab.java
2007-04-23 13:11:28 UTC (rev 12895)
@@ -80,6 +80,7 @@
if (Identity.trustLevelInt[i] < 100)
possibleLevels.add(I18n.getMessage(Identity.trustLevelStr[i]));
}
+
possibleLevels.add(I18n.getMessage("thaw.plugin.signature.trustLevel.none"));
minLevel = new JComboBox(possibleLevels);
@@ -105,17 +106,22 @@
return;
}
- for (i = 0 ; i < Identity.trustLevelStr.length ; i++) {
- if
(I18n.getMessage(Identity.trustLevelStr[i]).equals(val))
- break;
- }
+ if
(I18n.getMessage("thaw.plugin.signature.trustLevel.none").equals(val)) {
+ config.setValue("minTrustLevel", "-254");
+ } else {
- if (i >= Identity.trustLevelStr.length)
- return;
+ for (i = 0 ; i < Identity.trustLevelStr.length ; i++) {
+ if
(I18n.getMessage(Identity.trustLevelStr[i]).equals(val))
+ break;
+ }
- Logger.error(this, "Setting min trust level to :
"+Integer.toString(Identity.trustLevelInt[i]));
+ if (i >= Identity.trustLevelStr.length)
+ return;
- config.setValue("minTrustLevel",
Integer.toString(Identity.trustLevelInt[i]));
+ Logger.error(this, "Setting min trust level to :
"+Integer.toString(Identity.trustLevelInt[i]));
+
+ config.setValue("minTrustLevel",
Integer.toString(Identity.trustLevelInt[i]));
+ }
}
public void reset() {
@@ -123,6 +129,11 @@
int min = Integer.parseInt(config.getValue("minTrustLevel"));
+ if (min == -254) {
+
minLevel.setSelectedItem(I18n.getMessage("thaw.plugin.signature.trustLevel.none"));
+ return;
+ }
+
for (i = 0 ; i < Identity.trustLevelInt.length ; i++) {
if (Identity.trustLevelInt[i] == min)
break;
