lib/osx_notify.rb @@ -14,6 +14,7 @@ $:.unshift(libdir, "#{libdir}/grit/lib", "#{libdir}/mime-types/lib") require 'grit' require 'time_extensions' require 'string_extensions' +require 'osx_notify' require 'InfoWindowController' OSX.ns_import 'CommitSummaryCell' @@ -37,6 +38,7 @@ class ApplicationController < OSX::NSObject ib_outlet :remote_branches_menu ib_outlet :tags_menu ib_outlet :search_field + ib_outlet :paging_segment def applicationDidFinishLaunching(sender) @window.makeKeyAndOrderFront(self) @@ -57,9 +59,20 @@ class ApplicationController < OSX::NSObject @main_canvas.addSubview(@main_view) @branch_field.cell.setBackgroundStyle(NSBackgroundStyleRaised) + @tab_panel.setDelegate(self) setup_refs_view_menu setup_search_field + + Notify.on "tab_view_changed" do |opts| + if(opts[:tab_item] != "commits") + @paging_segment.setEnabled(false) + @search_field.setEnabled(false) + else + @paging_segment.setEnabled(true) + @search_field.setEnabled(true) + end + end end end @@ -95,6 +108,9 @@ class ApplicationController < OSX::NSObject @commits_controller.search_commits(@current_search_item, sender.stringValue) end + def tabView_didSelectTabViewItem(tab_view, tab_item) + Notify.send "tab_view_changed", { :tab_item => tab_item.identifier } + end private def setup_refs_view_menu ApplicationController.rb @@ -24,6 +24,7 @@ class CommitsController < OSX::NSObject ib_outlet :application_controller def awakeFromNib + @searching = false @current_commit_offset = 0 @offset = 50 @active_commit = nil @@ -70,11 +71,13 @@ class CommitsController < OSX::NSObject when 2 then @current_commit_offset += @offset end - @current_commit_offset = 0 if @current_commit_offset == -(@offset) - fetch_commits_for(@branch, @offset, @current_commit_offset) - @commits_table.reloadData + unless @searching + @current_commit_offset = 0 if @current_commit_offset == -(@offset) + fetch_commits_for(@branch, @offset, @current_commit_offset) + @commits_table.reloadData - select_latest_commit + select_latest_commit + end if @commits.size == 0 || @current_commit_offset == 0 @paging_segment.setEnabled_forSegment(false, 0) @@ -226,6 +229,7 @@ class CommitsController < OSX::NSObject def search_commits(category, query) unless query == "" + @searching = true repo = @application_controller.repo case category.downcase.to_sym when :message CommitsController.rb @@ -519,18 +519,18 @@ <int key="NSSegmentStyle">2</int> </object> </object> - <object class="NSSearchField" id="349599463"> + <object class="NSSearchField" id="829811974"> <reference key="NSNextResponder" ref="831824449"/> <int key="NSvFlags">292</int> <string key="NSFrame">{{347, 11}, {189, 22}}</string> <reference key="NSSuperview" ref="831824449"/> <bool key="NSEnabled">YES</bool> - <object class="NSSearchFieldCell" key="NSCell" id="508547132"> + <object class="NSSearchFieldCell" key="NSCell" id="183119731"> <int key="NSCellFlags">343014976</int> <int key="NSCellFlags2">268436480</int> <string key="NSContents"/> <reference key="NSSupport" ref="98627494"/> - <reference key="NSControlView" ref="349599463"/> + <reference key="NSControlView" ref="829811974"/> <bool key="NSDrawsBackground">YES</bool> <int key="NSTextBezelStyle">1</int> <object class="NSColor" key="NSBackgroundColor"> @@ -548,8 +548,8 @@ <int key="NSCellFlags2">0</int> <string key="NSContents">search</string> <string key="NSAction">_searchFieldSearch:</string> - <reference key="NSTarget" ref="508547132"/> - <reference key="NSControlView" ref="349599463"/> + <reference key="NSTarget" ref="183119731"/> + <reference key="NSControlView" ref="829811974"/> <int key="NSButtonFlags">138690815</int> <int key="NSButtonFlags2">0</int> <string key="NSKeyEquivalent"/> @@ -577,8 +577,8 @@ </object> </object> <string key="NSAction">_searchFieldCancel:</string> - <reference key="NSTarget" ref="508547132"/> - <reference key="NSControlView" ref="349599463"/> + <reference key="NSTarget" ref="183119731"/> + <reference key="NSControlView" ref="829811974"/> <int key="NSButtonFlags">138690815</int> <int key="NSButtonFlags2">0</int> <string key="NSKeyEquivalent"/> @@ -1532,10 +1532,18 @@ <object class="IBOutletConnection" key="connection"> <string key="label">search_field</string> <reference key="source" ref="620275248"/> - <reference key="destination" ref="349599463"/> + <reference key="destination" ref="829811974"/> </object> <int key="connectionID">555</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">paging_segment</string> + <reference key="source" ref="620275248"/> + <reference key="destination" ref="421922180"/> + </object> + <int key="connectionID">556</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1581,7 +1589,7 @@ <reference ref="869639466"/> <reference ref="1049027428"/> <reference ref="637722390"/> - <reference ref="349599463"/> + <reference ref="829811974"/> </object> <reference key="parent" ref="469667931"/> </object> @@ -2211,17 +2219,17 @@ </object> <object class="IBObjectRecord"> <int key="objectID">553</int> - <reference key="object" ref="349599463"/> + <reference key="object" ref="829811974"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="508547132"/> + <reference ref="183119731"/> </object> <reference key="parent" ref="831824449"/> </object> <object class="IBObjectRecord"> <int key="objectID">554</int> - <reference key="object" ref="508547132"/> - <reference key="parent" ref="349599463"/> + <reference key="object" ref="183119731"/> + <reference key="parent" ref="829811974"/> </object> </object> </object> @@ -2564,7 +2572,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">555</int> + <int key="maxID">556</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -2596,6 +2604,7 @@ <string>local_branches_menu</string> <string>main_canvas</string> <string>main_view</string> + <string>paging_segment</string> <string>remote_branches_menu</string> <string>search_field</string> <string>tab_panel</string> @@ -2616,6 +2625,7 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> English.lproj/MainMenu.xib fb7a785963ed20fdcd2fc067c016e1c17a198d84 Justin Palmer justin@activereload.net http://github.com/Caged/gitnub/commit/74cd84c5dc65def307b9f8043e0abff9ebdf3862 74cd84c5dc65def307b9f8043e0abff9ebdf3862 2008-06-13T15:32:21-07:00 2008-06-13T15:32:21-07:00 Toggle controls when swapping from network view to commits view 828ea69936964e5d5d1c079d59a43a5cadf3ced5 Justin Palmer justin@activereload.net