Author: ericwa
Date: Fri Mar 14 23:05:31 2014
New Revision: 10568
URL: http://svn.gna.org/viewcvs/etoile?rev=10568&view=rev
Log:
Typewriter: disable 'add note' button when a tag group is selected. Still need
to disable menu items in this same case
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.h
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/en.lproj/Document.xib
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.h
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.h?rev=10568&r1=10567&r2=10568&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.h
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.h
Fri Mar 14 23:05:31 2014
@@ -27,6 +27,9 @@
IBOutlet NSOutlineView *tagsOutline;
IBOutlet NSSearchField *searchfield;
IBOutlet NSSplitView *splitView;
+
+ IBOutlet NSButton *addTagButton;
+ IBOutlet NSButton *addNoteButton;
PrioritySplitViewDelegate *splitViewDelegate;
COAttributedStringWrapper *textStorage;
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m?rev=10568&r1=10567&r2=10568&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
Fri Mar 14 23:05:31 2014
@@ -700,6 +700,9 @@
NSLog(@"Selected tag %@", aTag);
[noteListDataSource reloadData];
+
+ [addNoteButton setEnabled:
+ ![[[self tagsOutlineSelectedTreeNode] representedObject]
isKindOfClass: [COTagGroup class]]];
}
- (void) commitChangesInBlock: (void(^)())aBlock withIdentifier: (NSString
*)identifier descriptionArguments: (NSArray*)args
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/en.lproj/Document.xib
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/en.lproj/Document.xib?rev=10568&r1=10567&r2=10568&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/en.lproj/Document.xib
(original)
+++ trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/en.lproj/Document.xib
Fri Mar 14 23:05:31 2014
@@ -977,6 +977,22 @@
<int key="connectionID">100283</int>
</object>
<object class="IBConnectionRecord">
+ <object class="IBOutletConnection"
key="connection">
+ <string
key="label">addNoteButton</string>
+ <reference key="source"
ref="512844837"/>
+ <reference key="destination"
ref="303055204"/>
+ </object>
+ <int key="connectionID">100291</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection"
key="connection">
+ <string
key="label">addTagButton</string>
+ <reference key="source"
ref="512844837"/>
+ <reference key="destination"
ref="225019472"/>
+ </object>
+ <int key="connectionID">100292</int>
+ </object>
+ <object class="IBConnectionRecord">
<object class="IBActionConnection"
key="connection">
<string
key="label">delete:</string>
<reference key="source"
ref="613418571"/>
@@ -1454,7 +1470,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary"
key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">100290</int>
+ <int key="maxID">100292</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray"
key="referencedPartialClassDescriptions">
@@ -1517,6 +1533,8 @@
</object>
</dictionary>
<dictionary class="NSMutableDictionary"
key="outlets">
+ <string
key="addNoteButton">NSButton</string>
+ <string
key="addTagButton">NSButton</string>
<string
key="notesTable">NSTableView</string>
<string
key="searchfield">NSSearchField</string>
<string
key="splitView">NSSplitView</string>
@@ -1524,6 +1542,14 @@
<string
key="textView">EWTextView</string>
</dictionary>
<dictionary class="NSMutableDictionary"
key="toOneOutletInfosByName">
+ <object
class="IBToOneOutletInfo" key="addNoteButton">
+ <string
key="name">addNoteButton</string>
+ <string
key="candidateClassName">NSButton</string>
+ </object>
+ <object
class="IBToOneOutletInfo" key="addTagButton">
+ <string
key="name">addTagButton</string>
+ <string
key="candidateClassName">NSButton</string>
+ </object>
<object
class="IBToOneOutletInfo" key="notesTable">
<string
key="name">notesTable</string>
<string
key="candidateClassName">NSTableView</string>
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
