Changeset 7192

Timestamp:

Nov 29, 2008, 9:58:09 PM (12 years ago)

Author:

livings124

Message:

force a single row to always be selected in the group list

Location:

trunk/macosx

Files:

• GroupsWindowController.h (modified) (1 diff)
• GroupsWindowController.m (modified) (2 diffs)
• en.lproj/PrefsWindow.xib (modified) (2 diffs)

trunk/macosx/GroupsWindowController.h

@@ -29 +29 @@
 @interface GroupsWindowController : NSWindowController
 {
+    IBOutlet NSTableView * fTableView;
+    IBOutlet NSSegmentedControl * fAddRemoveControl;
+
     IBOutlet NSColorWell * fSelectedColorView;
     IBOutlet NSTextField * fSelectedColorNameField;
-    IBOutlet NSTableView * fTableView;
-    IBOutlet NSSegmentedControl * fAddRemoveControl;
-    
-    NSInteger fCurrentColorIndex;
 }
 

trunk/macosx/GroupsWindowController.m

@@ -59 +59 @@
     [fSelectedColorView addObserver: self forKeyPath: @"color" options: 0 context: NULL];
     
-    if ([fTableView numberOfRows] > 0)
-        [fTableView selectRow: 0 byExtendingSelection: NO];
-    else
-        [self updateSelectedColor]; //make sure all fields are disabled
+    [self updateSelectedColor];
 }
 
@@ -164 +161 @@
         
         case REMOVE_TAG:
-            #warning refactor in color picker (fCurrentColorIndex) code)
-            //close color picker if corresponding row is removed
             row = [fTableView selectedRow];
-            if ([[NSColorPanel sharedColorPanel] isVisible]
-                && row == [[GroupsController groups] rowValueForIndex: fCurrentColorIndex])
-                [[NSColorPanel sharedColorPanel] close];
-            
             [[GroupsController groups] removeGroupWithRowIndex: row];            
                         
             [fTableView reloadData];
             
-            //select the next row
-            if (row == [fTableView numberOfRows])
-                row--;
-            if (row >= 0)
-                [fTableView selectRow: row byExtendingSelection: NO];
+            if ([fTableView numberOfRows] > 0)
+                [fTableView scrollRowToVisible: [fTableView selectedRow]];
             
             break;

trunk/macosx/en.lproj/PrefsWindow.xib

@@ -9 +9 @@
                 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                         <bool key="EncodedWithXMLCoder">YES</bool>
-                        <integer value="1779"/>
+                        <integer value="1771"/>
                 </object>
                 <object class="NSArray" key="IBDocument.PluginDependencies">
@@ -3806 +3806 @@
                                                                                 <reference key="NSGridColor" ref="1038987165"/>
                                                                                 <double key="NSRowHeight">1.800000e+01</double>
-                                                                                <int key="NSTvFlags">448790528</int>
+                                                                                <int key="NSTvFlags">46137344</int>
                                                                                 <int key="NSColumnAutoresizingStyle">4</int>
                                                                                 <int key="NSDraggingSourceMaskForLocal">15</int>