Skip to content

Commit

Permalink
Implementing AutoOpDialog.
Browse files Browse the repository at this point in the history
  • Loading branch information
psychs committed Aug 5, 2007
1 parent f84ce38 commit a7e625f
Show file tree
Hide file tree
Showing 17 changed files with 273 additions and 38 deletions.
2 changes: 2 additions & 0 deletions English.lproj/AutoOpDialog.nib/classes.nib

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified English.lproj/AutoOpDialog.nib/keyedobjects.nib
Binary file not shown.
3 changes: 2 additions & 1 deletion English.lproj/MainMenu.nib/classes.nib

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions English.lproj/MainMenu.nib/info.nib

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified English.lproj/MainMenu.nib/keyedobjects.nib
Binary file not shown.
25 changes: 23 additions & 2 deletions LimeChat.tmproj
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>currentDocument</key>
<string>ruby/dialog/autoopdialog.rb</string>
<key>documents</key>
<array>
<dict>
Expand All @@ -18,10 +20,29 @@
<key>fileHierarchyDrawerWidth</key>
<integer>294</integer>
<key>metaData</key>
<dict/>
<dict>
<key>ruby/dialog/autoopdialog.rb</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>17</integer>
<key>line</key>
<integer>114</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>106</integer>
</dict>
</dict>
<key>openDocuments</key>
<array>
<string>ruby/dialog/autoopdialog.rb</string>
</array>
<key>showFileHierarchyDrawer</key>
<true/>
<key>windowFrame</key>
<string>{{599, 93}, {991, 1073}}</string>
<string>{{619, 94}, {991, 1073}}</string>
</dict>
</plist>
4 changes: 4 additions & 0 deletions LimeChat.xcodeproj/project.pbxproj
Expand Up @@ -66,6 +66,7 @@
78496EFD0C2890200084A836 /* preferencedialog.rb in Resources */ = {isa = PBXBuildFile; fileRef = 78496EFC0C2890200084A836 /* preferencedialog.rb */; };
7867EA4B0C227AD40017B510 /* NickSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 7867EA490C227AD40017B510 /* NickSheet.nib */; };
78755D730C2AC0B30073FF42 /* logrenderer.rb in Resources */ = {isa = PBXBuildFile; fileRef = 78755D720C2AC0B30073FF42 /* logrenderer.rb */; };
7877E0620C65B84E002F13C7 /* textfield.rb in Resources */ = {isa = PBXBuildFile; fileRef = 7877E0610C65B84E002F13C7 /* textfield.rb */; };
788C5E660C5F4F5A0034C46E /* growlcontroller.rb in Resources */ = {isa = PBXBuildFile; fileRef = 788C5E650C5F4F5A0034C46E /* growlcontroller.rb */; };
7890B4E90C659E4700DF983F /* autoopdialog.rb in Resources */ = {isa = PBXBuildFile; fileRef = 7890B4E80C659E4700DF983F /* autoopdialog.rb */; };
7890B4ED0C659E5D00DF983F /* AutoOpDialog.nib in Resources */ = {isa = PBXBuildFile; fileRef = 7890B4EB0C659E5D00DF983F /* AutoOpDialog.nib */; };
Expand Down Expand Up @@ -167,6 +168,7 @@
786926F40BB6EC1B0081019B /* main.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = main.m; path = objc/main.m; sourceTree = "<group>"; };
7869272D0BB6ED9E0081019B /* rb_main.rb */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text.script.ruby; name = rb_main.rb; path = objc/rb_main.rb; sourceTree = "<group>"; };
78755D720C2AC0B30073FF42 /* logrenderer.rb */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text.script.ruby; path = logrenderer.rb; sourceTree = "<group>"; };
7877E0610C65B84E002F13C7 /* textfield.rb */ = {isa = PBXFileReference; fileEncoding = "-2147483647"; lastKnownFileType = text.script.ruby; path = textfield.rb; sourceTree = "<group>"; };
78785B580BEDCF6800456645 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/ServerDialog.nib; sourceTree = "<group>"; };
787FD46C0BFE960100F2F22D /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
788C5E650C5F4F5A0034C46E /* growlcontroller.rb */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text.script.ruby; path = growlcontroller.rb; sourceTree = "<group>"; };
Expand Down Expand Up @@ -377,6 +379,7 @@
78229BB80C288188001DD4C3 /* view */ = {
isa = PBXGroup;
children = (
7877E0610C65B84E002F13C7 /* textfield.rb */,
78DA4EBF0C461D52008780C8 /* memberlistview.rb */,
78DA4EC00C461D52008780C8 /* servertreeview.rb */,
780D09EF0C2F2C20007C0F4F /* splitter.rb */,
Expand Down Expand Up @@ -553,6 +556,7 @@
78AD78E40C61B8F8001E77F4 /* Localizable.strings in Resources */,
7890B4E90C659E4700DF983F /* autoopdialog.rb in Resources */,
7890B4ED0C659E5D00DF983F /* AutoOpDialog.nib in Resources */,
7877E0620C65B84E002F13C7 /* textfield.rb in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
6 changes: 3 additions & 3 deletions ruby/controller/appcontroller.rb
Expand Up @@ -197,8 +197,8 @@ def tab
when Preferences::General::TAB_UNREAD
move(:down, :unread)
true
when Preferences::General::TAB_COMPLEMENT_NICK
complement_nick
when Preferences::General::TAB_COMPLETE_NICK
complete_nick
true
else
false
Expand Down Expand Up @@ -247,7 +247,7 @@ def number(n)

private

def complement_nick
def complete_nick
u, c = @world.sel
return unless u && c
@world.select_text if @window.firstResponder != @window.fieldEditor_forObject(true, @text)
Expand Down
7 changes: 1 addition & 6 deletions ruby/controller/menucontroller.rb
Expand Up @@ -207,8 +207,6 @@ def treeDialog_onClose(sender)
@tree_dialog = nil
end



def onAutoOp(sender)
unless @autoop_dialog
@autoop_dialog = AutoOpDialog.alloc.init
Expand All @@ -220,17 +218,14 @@ def onAutoOp(sender)
end

def autoOpDialog_onOk(sender, conf)
puts 'ok'
@world.update_autoop(conf)
end

def autoOpDialog_onClose(sender)
@autoop_dialog = nil
end





def onDcc(sender)
@world.dcc.show
end
Expand Down
2 changes: 1 addition & 1 deletion ruby/controller/preferences.rb
Expand Up @@ -50,7 +50,7 @@ class General
persistent_attr :connect_on_doubleclick, :disconnect_on_doubleclick, :join_on_doubleclick, :leave_on_doubleclick
persistent_attr :use_growl

TAB_COMPLEMENT_NICK = 0
TAB_COMPLETE_NICK = 0
TAB_UNREAD = 1
TAB_NONE = 100

Expand Down

0 comments on commit a7e625f

Please sign in to comment.