Changeset 18593

Show
Ignore:
Timestamp:
25.02.2009 10:13:39 (10 years ago)
Author:
kjdon
Message:

GLI three modes change: file tree filters are now editable in librarian mode, and regex plugin/classifier arguments are now shown in librarian mode

Location:
gli/trunk/src/org/greenstone/gatherer
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/src/org/greenstone/gatherer/cdm/ArgumentConfiguration.java

    r16307 r18593  
    209209    ArrayList arguments = data.getArguments(); 
    210210    int total_height = 250; 
    211     int current_mode = Configuration.getMode(); 
     211    // not currently used 
     212    //int current_mode = Configuration.getMode(); 
    212213 
    213214    String previous_owner = ""; 
     
    226227        addHeader(previous_owner, (coloured ? colour_one : colour_two)); 
    227228        } 
    228         if(!argument.isHiddenGLI() && (current_mode > Configuration.LIBRARIAN_MODE || !(argument.getType() == Argument.REGEXP))) { 
     229        if(!argument.isHiddenGLI()) { 
    229230        ArgumentControl argument_control = new ArgumentControl(argument, false, null); 
    230231        total_height = total_height - argument_control.getPreferredSize().height; 
  • gli/trunk/src/org/greenstone/gatherer/collection/CollectionTree.java

    r15107 r18593  
    5454 
    5555    filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false)); 
    56     filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE); 
     56    filter.setEditable(Configuration.getMode() >= Configuration.LIBRARIAN_MODE); 
    5757    } 
    5858 
  • gli/trunk/src/org/greenstone/gatherer/file/WorkspaceTree.java

    r13591 r18593  
    6161 
    6262    filter.setBackground(Configuration.getColor("coloring.workspace_heading_background", false)); 
    63     filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE); 
     63    filter.setEditable(Configuration.getMode() >= Configuration.LIBRARIAN_MODE); 
    6464    } 
    6565 
  • gli/trunk/src/org/greenstone/gatherer/gui/EnrichPane.java

    r18370 r18593  
    228228    public void modeChanged(int mode) 
    229229    { 
    230     collection_filter.setEditable(mode > Configuration.LIBRARIAN_MODE); 
     230    collection_filter.setEditable(mode >= Configuration.LIBRARIAN_MODE); 
    231231    } 
    232232 
  • gli/trunk/src/org/greenstone/gatherer/gui/GatherPane.java

    r18370 r18593  
    394394     */ 
    395395    public void modeChanged(int mode) { 
    396     collection_filter.setEditable(mode > Configuration.LIBRARIAN_MODE); 
    397     workspace_filter.setEditable(mode > Configuration.LIBRARIAN_MODE); 
     396    collection_filter.setEditable(mode >= Configuration.LIBRARIAN_MODE); 
     397    workspace_filter.setEditable(mode >= Configuration.LIBRARIAN_MODE); 
    398398    } 
    399399