From 9400fd9103fa52cd2fb503e13c7680c980aaa4b6 Mon Sep 17 00:00:00 2001 From: Jeff Wallace Date: Tue, 3 Dec 2013 13:14:38 -0500 Subject: [PATCH] Unhid netbeans general (proxy) options. Changed General options panel to Display --- Core/src/org/sleuthkit/autopsy/core/layer.xml | 3 +- .../GeneralOptionsPanelController.java | 31 +++++++++++++++--- .../corecomponents/display-options.png | Bin 0 -> 1504 bytes 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100755 Core/src/org/sleuthkit/autopsy/corecomponents/display-options.png diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml index 54bec76816..6796ad9d91 100644 --- a/Core/src/org/sleuthkit/autopsy/core/layer.xml +++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml @@ -13,7 +13,8 @@ --> - + + diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java index ec255fe021..695f5c33d6 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java @@ -1,6 +1,20 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * Autopsy Forensic Browser + * + * Copyright 2013 Basis Technology Corp. + * Contact: carrier sleuthkit org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.sleuthkit.autopsy.corecomponents; @@ -13,51 +27,60 @@ import org.openide.util.Lookup; @OptionsPanelController.TopLevelRegistration( categoryName = "#OptionsCategory_Name_General", -iconBase = "org/sleuthkit/autopsy/corecomponents/general-options.png", +iconBase = "org/sleuthkit/autopsy/corecomponents/display-options.png", position = 1, keywords = "#OptionsCategory_Keywords_General", keywordsCategory = "General") -@org.openide.util.NbBundle.Messages({"OptionsCategory_Name_General=General", "OptionsCategory_Keywords_General=general"}) +@org.openide.util.NbBundle.Messages({"OptionsCategory_Name_General=Display", "OptionsCategory_Keywords_General=display"}) public final class GeneralOptionsPanelController extends OptionsPanelController { private GeneralPanel panel; private final PropertyChangeSupport pcs = new PropertyChangeSupport(this); private boolean changed; + @Override public void update() { getPanel().load(); changed = false; } + @Override public void applyChanges() { getPanel().store(); changed = false; } + @Override public void cancel() { // need not do anything special, if no changes have been persisted yet } + @Override public boolean isValid() { return getPanel().valid(); } + @Override public boolean isChanged() { return changed; } + @Override public HelpCtx getHelpCtx() { return null; // new HelpCtx("...ID") if you have a help set } + @Override public JComponent getComponent(Lookup masterLookup) { return getPanel(); } + @Override public void addPropertyChangeListener(PropertyChangeListener l) { pcs.addPropertyChangeListener(l); } + @Override public void removePropertyChangeListener(PropertyChangeListener l) { pcs.removePropertyChangeListener(l); } diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/display-options.png b/Core/src/org/sleuthkit/autopsy/corecomponents/display-options.png new file mode 100755 index 0000000000000000000000000000000000000000..8020d8d83300752424382c26cc8a270c54fc23d4 GIT binary patch literal 1504 zcmV<61t0o}P)ugq*rl_Hq`9w?1A08ceikBckkX+ zIy*b%tgI|hRTX4ewsZoGzuJL|o$OE-$BLqW!{GqG-w)@`om0!o${gI%?c2B6*|TRM zBO?Qxmq&rfGTksY9=j%tb+3fEBAd&IwQwp8R?&W|Sq5Jx7zYHF4n7f>D6qQSy*t0&6=6 z;AiI{o`j^pv17-yTf@V{th>9L6KMWYAdpgi$xuopu!55Rxvs|MB@QYQm~PVukOIe# zAJ=XT4GnPxaBo8W7h^_-CnTCpw(H;u{``f&t6^rI7uugC1i!SuZV;%etJ4TvxpIXo zKm_VO_auVb>hG-rioG10~L36EwwEB*-VYy?ha7 z0kgziGCkMVEPYxHYin!ZbULBFzFvD|aBz_I^z=Y(ZY~_?x?>}|bw@-nyO;ecMAUeR zO;0Uq2ujTLlye2z+uNa`p+S3mU|@iqKYt!_a&ll_r^ie}8wLF6@k&q+h~Q~l+$8~A zRASy$#tC$EbUGJ94Kz}*d`wxENdYZk5#b7*Tz#j&m~#=f5B}MXliQG z2wb{!iSGhZ;H5Jj15lSgic)*gYkHx8O@bx!Tm;tp!iCq2UC`XzY!aZiArW}tl*f{Q zA$*be!_08iHo@$`W&81ii=}|I2N0e?ps%lw6QB?jy*qArAH;Y^R3^k)^IkI;4=!2f zV`EvIM>Q5M9N-ENUQ0`hNq{6F1)e$S0R<%wN3}PYm|&?qqp=)6&*y|N$iNAZ0u=HD z0;E7*lLw*-GY*!dp2=1)Sx$XlCo|`Ml^?|x0=Ny8wzf82l2OS;Ws`VK)v4(vmtCha zEPhM`@Z3>x8)_xl`1ttcrKP1eaY6Em^FM6p7~8dL*S7}`9(>CH9335Xpj5Km1EEle zAD^qMt1vY+B|m=rxVxsN<|DBPy>a8lCj|us9eeidQFrXv0eN|Oyu`C>xL&QOs8B$E ze{9rBOG_mTPZ~1M$K(1HjNNC2g@w;YA`$Rk1! zy&(at+ny^aDfytdxVRcUd=^0^+D4Sglw3rDVoM23?-C@cBB6)(?%f-ioSf{%VrOp4 z1h8t|=XSeC(CBsoqokxO0g~r5)=P8R!gOE%4xom$-zpxt)z_|F`(e`rFn%&-sSDp) zACp1xV}wA$;jm?WdV0ELjs6VQ85gnMXvO?dH$@;VElonBFJkfdRc&qUeu=)Pgzc4J zDE9fLD}`$qdj37Wy^e%uo@dSq}*uB{O*n`AvBg0!ccqE~V&GOmsZ`(g3;lED$Xq{gG0000