From 7ece56461a03ffd8e336b2da1cf163c02d1f2aa7 Mon Sep 17 00:00:00 2001 From: Sergii Stoian Date: Mon, 3 Jan 2005 01:25:10 +0000 Subject: [PATCH] Added files PCAddFilesPanel.[hm]. Fixed bug #11478 git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@20515 72102866-910b-0410-8b05-ffd578937521 --- Documentation/ChangeLog | 3 + Library/PCAddFilesPanel.h | 54 +++++++++ Library/PCAddFilesPanel.m | 114 ++++++++++++++++++ Library/Resources/NewFile.gorm/data.classes | 69 +---------- Library/Resources/NewFile.gorm/data.info | Bin 210 -> 210 bytes Library/Resources/NewFile.gorm/objects.gorm | Bin 7474 -> 7474 bytes .../PCAppProject+Inspector.m | 13 +- .../Resources/Inspector.gorm/data.classes | 3 - .../Resources/Inspector.gorm/objects.gorm | Bin 32395 -> 32551 bytes .../Resources/Main.gorm/data.classes | 70 +---------- .../Resources/Main.gorm/data.info | Bin 210 -> 210 bytes .../Resources/Main.gorm/objects.gorm | Bin 4071 -> 4186 bytes 12 files changed, 185 insertions(+), 141 deletions(-) create mode 100644 Library/PCAddFilesPanel.h create mode 100644 Library/PCAddFilesPanel.m diff --git a/Documentation/ChangeLog b/Documentation/ChangeLog index c9e805f..2974658 100644 --- a/Documentation/ChangeLog +++ b/Documentation/ChangeLog @@ -17,6 +17,9 @@ * Library/PCProjectBrowser.m: (doubleClick:): Don't try to open libraries. + * Modules/ApplicationProject/Resources/Main.gorm: Connect delegate to + AppController (bug #11478). + 2004-12-24 Serg Stoyan * "Build Tool" setting from Project Inspector was moved to PC diff --git a/Library/PCAddFilesPanel.h b/Library/PCAddFilesPanel.h new file mode 100644 index 0000000..8112469 --- /dev/null +++ b/Library/PCAddFilesPanel.h @@ -0,0 +1,54 @@ +/* + GNUstep ProjectCenter - http://www.gnustep.org + + Copyright (C) 2004 Free Software Foundation + + Authors: Serg Stoyan + + This file is part of GNUstep. + + This application is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This application is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. +*/ + +#ifndef _PCAddFilesPanel_h +#define _PCAddFilesPanel_h + +#include +#include + +@interface PCAddFilesPanel : NSOpenPanel +{ + NSBox *fileTypeAccessaryView; + NSPopUpButton *fileTypePopup; +} + ++ (PCAddFilesPanel *)addFilesPanel; + +- (void)setCategories:(NSArray *)categories; +- (void)selectCategory:(NSString *)category; +- (NSString *)selectedCategory; +- (void)setFileTypes:(NSArray *)fileTypes; + +- (void)filesForAddPopupClicked:(id)sender; + +@end + +@interface NSObject (PCAddFilesPanelDelegate) + +- (void)categoryChangedTo:(NSString *)category; + +@end + +#endif diff --git a/Library/PCAddFilesPanel.m b/Library/PCAddFilesPanel.m new file mode 100644 index 0000000..306fdd0 --- /dev/null +++ b/Library/PCAddFilesPanel.m @@ -0,0 +1,114 @@ +/* + GNUstep ProjectCenter - http://www.gnustep.org + + Copyright (C) 2004 Free Software Foundation + + Authors: Serg Stoyan + + This file is part of GNUstep. + + This application is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This application is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. +*/ + +#include "PCLogController.h" +#include "PCAddFilesPanel.h" + +static PCAddFilesPanel *addFilesPanel = nil; + +@implementation PCAddFilesPanel + ++ (PCAddFilesPanel *)addFilesPanel +{ + if (addFilesPanel == nil) + { + addFilesPanel = [[self alloc] init]; + } + + return addFilesPanel; +} + +// --- "Add Files..." panel +- (id)init +{ + NSRect fr; + + self = [super init]; + + fr = NSMakeRect(20,30,160,21); + + // File type popup + fileTypePopup = [[NSPopUpButton alloc] initWithFrame:fr pullsDown:NO]; + [fileTypePopup setRefusesFirstResponder:YES]; + [fileTypePopup setAutoenablesItems:NO]; + [fileTypePopup setTarget:self]; + [fileTypePopup setAction:@selector(filesForAddPopupClicked:)]; + [fileTypePopup selectItemAtIndex:0]; + + fileTypeAccessaryView = [[NSBox alloc] init]; + [fileTypeAccessaryView setTitle:@"File Types"]; + [fileTypeAccessaryView setTitlePosition:NSAtTop]; + [fileTypeAccessaryView setBorderType:NSGrooveBorder]; + [fileTypeAccessaryView addSubview:fileTypePopup]; + [fileTypeAccessaryView sizeToFit]; + [fileTypeAccessaryView setAutoresizingMask:NSViewMinXMargin + | NSViewMaxXMargin]; + + // Panel + [self setAllowsMultipleSelection:YES]; + + return self; +} + +- (void)setCategories:(NSArray *)categories +{ + [fileTypePopup addItemsWithTitles:categories]; +} + +- (void)selectCategory:(NSString *)category +{ + [self setAccessoryView:fileTypeAccessaryView]; + [fileTypePopup selectItemWithTitle:category]; + [self filesForAddPopupClicked:self]; +} + +- (NSString *)selectedCategory +{ + return [fileTypePopup titleOfSelectedItem]; +} + +- (void)setFileTypes:(NSArray *)fileTypes +{ + NSString *path = nil; + + ASSIGN(_fileTypes, fileTypes); + + path = [_browser path]; + [self validateVisibleColumns]; + [_browser setPath:path]; + + [self display]; +} + +- (void)filesForAddPopupClicked:(id)sender +{ + NSString *category = [fileTypePopup titleOfSelectedItem]; + + if ([_delegate respondsToSelector:@selector(categoryChangedTo:)]) + { + [_delegate categoryChangedTo:category]; + } +} + +@end diff --git a/Library/Resources/NewFile.gorm/data.classes b/Library/Resources/NewFile.gorm/data.classes index ead204c..b11a3ec 100644 --- a/Library/Resources/NewFile.gorm/data.classes +++ b/Library/Resources/NewFile.gorm/data.classes @@ -1,141 +1,74 @@ { + "## Comment" = "Do NOT change this file, Gorm maintains it"; FirstResponder = { Actions = ( - "activateContextHelpMode:", "alignCenter:", - "alignJustified:", "alignLeft:", - "alignRight:", "arrangeInFront:", - "cancel:", "capitalizeWord:", - "changeColor:", "checkSpelling:", - "close:", "complete:", - "copy:", "copyFont:", - "copyRuler:", "cut:", - "delete:", "deleteBackward:", - "deleteForward:", "deleteToBeginningOfLine:", - "deleteToBeginningOfParagraph:", "deleteToEndOfLine:", - "deleteToEndOfParagraph:", "deleteToMark:", - "deleteWordBackward:", "deleteWordForward:", - "deminiaturize:", "deselectAll:", - "fax:", "hide:", - "hideOtherApplications:", "indent:", - "loosenKerning:", "lowerBaseline:", - "lowercaseWord:", "makeKeyAndOrderFront:", - "miniaturize:", "miniaturizeAll:", - "moveBackward:", "moveBackwardAndModifySelection:", - "moveDown:", "moveDownAndModifySelection:", - "moveForward:", "moveForwardAndModifySelection:", - "moveLeft:", "moveRight:", - "moveToBeginningOfDocument:", "moveToBeginningOfLine:", - "moveToBeginningOfParagraph:", "moveToEndOfDocument:", - "moveToEndOfLine:", "moveToEndOfParagraph:", - "moveUp:", "moveUpAndModifySelection:", - "moveWordBackward:", "moveWordBackwardAndModifySelection:", - "moveWordForward:", "moveWordForwardAndModifySelection:", - "newDocument:", "ok:", - "open:", "openDocument:", - "orderBack:", "orderFront:", - "orderFrontColorPanel:", "orderFrontDataLinkPanel:", - "orderFrontHelpPanel:", "orderFrontStandardAboutPanel:", - "orderFrontStandardInfoPanel:", "orderOut:", - "pageDown:", "pageUp:", - "paste:", "pasteAsPlainText:", - "pasteAsRichText:", "pasteFont:", - "pasteRuler:", "performClose:", - "performMiniaturize:", "performZoom:", - "print:", "raiseBaseline:", - "revertDocumentToSaved:", "runPageLayout:", - "runToolbarCustomizationPalette:", "saveAllDocuments:", - "saveDocument:", "saveDocumentAs:", - "saveDocumentTo:", "scrollLineDown:", - "scrollLineUp:", "scrollPageDown:", - "scrollPageUp:", "scrollViaScroller:", - "selectAll:", "selectLine:", - "selectNextKeyView:", "selectParagraph:", - "selectPreviousKeyView:", "selectText:", - "selectToMark:", "selectWord:", - "showContextHelp:", "showGuessPanel:", - "showHelp:", "showWindow:", - "stop:", "subscript:", - "superscript:", "swapWithMark:", - "takeDoubleValueFrom:", "takeFloatValueFrom:", - "takeIntValueFrom:", "takeObjectValueFrom:", - "takeStringValueFrom:", "terminate:", - "tightenKerning:", "toggle:", - "toggleContinuousSpellChecking:", "toggleRuler:", - "toggleToolbarShown:", "toggleTraditionalCharacterShape:", - "transpose:", "transposeWords:", - "turnOffKerning:", "turnOffLigatures:", - "underline:", "unhide:", - "unhideAllApplications:", "unscript:", - "uppercaseWord:", "useAllLigatures:", - "useStandardKerning:", "useStandardLigatures:", - "yank:", "zoom:", "closeNewFilePanel:", "createFile:", diff --git a/Library/Resources/NewFile.gorm/data.info b/Library/Resources/NewFile.gorm/data.info index 800a4441a3a87ab1986245eb21102a7353880e16..72818cc68c458b5e0cd4607327c8b82357909e66 100644 GIT binary patch delta 12 Tcmcb_c!_a>C{vo{MDg7K9LWSw delta 12 Tcmcb_c!_a>D3hhxMDg7K8{7mS diff --git a/Library/Resources/NewFile.gorm/objects.gorm b/Library/Resources/NewFile.gorm/objects.gorm index 4fa0000bf6f69d3757ef587ddc9324cb810b33ae..7114d8655daa84aa13af26125f47a5bc9a4e09d5 100644 GIT binary patch delta 311 zcmdmFwaIFNC{vo{MsXP?HU$O-Zs&x}mQ3u7Y#ktW(quR0NJgf~3z(lV88A%lV0q6N zJ~>y!Wbzu;qdKi~{tyf@j9OAJVQaQR8x11of#fiN{5$aK0lc^y{_ zR1(=rh~#D^Zb?Q=S;q+wt-(B>fu_6ju4H7|{E;_|iP3hlhro7_w-^Pp7(xEc6?zQx Ue4ubTNN|_%8j#@T4AE2U0GpIQMF0Q* delta 317 zcmdmFwaIFND3hhxMsXP?HU#KQc>>FG zM(4@7A|{j9upR}8Y_4XLWn^U7Jd>RhNKIbMabCme1p|Ya7&p)?1~4JU?OY0Ef`pks zkdcW&4J0{v7N@SH(*q2}g&@TbCO_Z|VB9v@kV_0mdT{wkYy&HFoPjVk9;9&F!4IqoVQgh2s+2KDBQ3seV^ zjOdz0^XnVi*bUfmj^lzbS1UwGu)M{*$Z&-Dk~BS;8{-Nf)X;}HBi#!ku?i575_7Yn zYsG2dEhkRBhR)2WA(FqeQm}fzCpB=PZ;QuaC{iU31 zT67>>i?GawIpLKE%jwZ1FCEJB!3sK+w<30>j@~8FyAbZAq^Zkd@6sd)$uX~@T~jB` zyTrY%NHz?=-(=dbFMhM)Ce0m{wu4>GK8|$tz{;+P3`MBBS=eMx1|2F&8Nq&Q2S%_? zMru86$e$ZsFY~j3!0V+8`J3TxZt|)z7L2!Gf-)@dTQJcAo}P`m&tnlbQQc@Sy*S-F z{2u0>GiOXb`h+>7M>@Ni-k+WYmngZ=pCU2O3>y;hz?io zSX}e_i^t#Iq=T`bMaHCEI+mOpUXReBYZfIfj0tu!kzjg1*lU)O%3$9lbQeUA=Q{F*3!-41p{SK7X=m5((rcko_#RtcN^cqhr>USSo39(Ivb<;bfo1s3@-jXwazQvt zN2|ugp40o@d^micUa!i4A5ctn5S}@{u==eO_#qWG=8b$d5+%=qC<~T`7g`V(ZnL00 zT#stFc!82b`B6W1QVxZ(M_%~kwiawd_=(Qt zMJJb+>|8G1%H@*Xy!lNgANu7@Sp{e0rNci2OG`CKzlpi+nT$9 zaEp0soBUyH9QF-WW zS4#H~wq+J9Ml6FA0mB$f6fj&uJgyV)GI>qNI3ark`2_9O%YMQ8 zHI5g2P~#DTk92Dzfi{FNYIRrO1nm{O#$U2{y+Gp-QEi_DnNPJNZ#fq~7*CbCR}uP))Y0{%U)g zIYo0Os&q0t^34n$gG81_l}YnDrkPoK{Tixl9-U+gcbJ}l&2f=X

!++t_5(^Oxs( zRJqRDZd7@^mOu-(xhZLzX-?Hby{PgX-fI?UZVD>?er4aY?E4V=PS^ZiRD}-j^%Ob6 zM^F{h*vy<#)I(_CW?R)~&Y=?`X%SNP6{7KO?<3qKMs=M+$>m4EuRlWT*Ind?vY!GrEYoNMY z4y|Y7|ALd X8&zXu7>(bV%HNf9c9ys};}<>#FZgKQ delta 3405 zcmZuz33yaj6@KSt2ua=$1|~CM5(XFuBrGABkW50z&N2yMIV>#{C?p}FY)xnu)+``Z zs->E6L~DWCRsmbEoe^4FTTyHaid7!1f~YOv(nYFmRZwdSJ@?+%NYt6{d*6Tld+&eN zcV`aYfcrm&?sO5V>lwQSvZC}-Hk}RyVzVQa2zhjAQV2ri&0Xrsk0y*U_%m8Q5DI8V zZcg0fXg@_#(3?qb=Z*{(21gjNa~8~QXl&zcz#FI7TM&x0LX3x3Vi1a>gAqz-kk3s6 zLkW%`LMbiFONlFsx&$DUQ)gaQY=zu3wRcmF#hd)05pf99$UKB9h7({WJvzcokne$NO3q*6nxzAG$iN*4 zvuQ{EV%Ho^f+RWIx%5u{SifZ$=G1^;c)cdmhI)9-shXy9W$vNaw~X_mi3syQtzy8L zNtcEUr1!HDhZ~~1yIUBX$%4M_7e-SNZllu$)v>onhaxN@aJy;zKrfhvF-89CH!& zCTl9`?%D7f}7%| z_!*6HN3`xyTld?x?vq;gD8f^{x)B;2PJ<}rhZn+kXm>a~?3k8z$=k#gdDntY3+}Uk zEI44X_YcBJW;Mcb?c!in$tSI9fKt2$@M~3SjFq}AcwCb%i_yJwnd_h>zi59eVGdd?xyai_&zZ#twIicZe z49{rz3x?-4{3XLH8lGo(O~VTeZ)*4}hWS$VqLg(@^lOPuO7t6va;*~O>$lRV)TdsT zxJu(UByQFC602R7CoePLqRSYs(0lg`?|+t~NBEt6LyR|nAI;+B$O(i$sAff)6RE4& zZT?a7=Mmnt`GEPB=58XqO~E!FU2FC@-%%XLiSQ@#wxpR?^(MX--sN#})8ZDt`De{t zM)->oqn3d4J^NrK!uzb|rq^0hogdg_E5cvZAPi{r!QUvob)@4g!rv8D)9N#?MYB~} z2-oS})->}UY+vR)5dNutgip1468|N&WStN`jP@hk7)XbIOHS6vf)5csk`+s0i>vdo z?U~=r8yrq%GTfA_d0a$c*lT$xfZEzZP7%%KB`Gap_v|6GcivH4K*GbBXi)N|Lqll+D8`HWH*p{PWiFg#It)wj{x9}+$#sCIs5+pLn zkYJz;F`^O>E+(%^a*!lDBpNKyF1_rQc#p` zNud~}rlNFPES=osG1K$`FN)DTLb>J`ZEr`Bt~xMjbGn(KITOWLYScds7_u%C<^tNeJG~zQh~F`-n$<~ zu@V`uEsoyUYMLc_<3SXqHt%+p*_-#ED7WjCYF6lt$5BkRIhS_^U-azGs7EnPE_XyY zndx#)D`)WR?cxrL=_taCd$`3CS2EtmJ(jqN@j-5~#4{OlyE~Lo%{7({M=^_B?K$Rb zw!O-pqkiIQ+LO(>%*g>jf$B=w+wOPHldn*RBKe;cm-#}wyK4b<X8U`6w2$A;(S` zx3M7yPZ_tfAxBRci`bCEr;NpNnrF%ZyF;QLiIzyzF40nnJQ6LFD4kC+zSAxtH%%<( zPy)2O!*s5&Sr3XDb!R=(5pdSpWIBpEbC{vo{MDg7K9LWSw delta 12 Tcmcb_c!_a>D3hhxMDg7K8{7mS diff --git a/Modules/ApplicationProject/Resources/Main.gorm/objects.gorm b/Modules/ApplicationProject/Resources/Main.gorm/objects.gorm index 1c1937f9116cc90a84b5d9c881ce5a90d5ad194f..79ccf062c1d29f4749c6cf09fdc9710d25196ec5 100644 GIT binary patch delta 1361 zcmZ`(OK=-S5S`KP=xfQ2KQfUV+lnkJcAThJk}b&;gb@EkBH3YGc5E=gc4SB3NFc9B z_?iGGPAmGBDhfDp9dY1B6?dvqP{oN`PC4fS7Y_8SRH=drI;`I7e%vt@NXXFZv4$P%sD3cgH)Qc z5M#&9y*rg!^YXq`t=HxgRKaWr7(V7MnpClv_JGwPN{b~UFw*wP2%PDZYD%NQD3y-29$nz$j-eRQv)I&AJnrxb z;tBj+kMT+TQ=j+fkfg{t%!xRkBE>MKT)x;3yu0yfTHzd=@2tRFT!vwW^cV1fi1Lg0 zqsYZl#NioUud^oY(ED3&tW3fs zCz_Euyo6<6QW$a?E_d^@G6gSp@tiyjR~&7YIxINav<$$a6Pu;_C5lav^JOP8N6uFq zlp{Aq2jyuGuQ;ecJ+9(ef5v~Ut*Mh_P{N!3lr{}zZ21%Z)$UYb4S)8JjfUZRXNn#* zd*>o}TxE0hZmrUQS36^gaMPKYL9W-)48-{ieiKNDG&$d(OhOxlO-GTXf!)9-6q$f6 z@}p)Cq}o>5lR28oYn|nz>e@u%btA|^WwTt}yHc;!D*INwp)51G20Q<2%Z4}FLAfs1 zY`96lRNzelTMFzFSdv>d>=D?IOE&Bi*i@i+i_i^)Dg?Hb`hY-5ZrgB3U{OVG6IhUo zHdF~L%LN_n4sn04t^O-`D*QuDu%kl-XTWK;a$a68pPJ&_*t7- zsy2=-usSL6^o0{TyG>X47QLeL(4=xx9>aTB2qk@YiER+Oht<$k-}}UtiG6@Sg$&<^ z#8!xXgnxw!zK@9&iG89@@LF%A|Afrv<&F)XQf5=;;XdB$O`UvZ^s+(c09KpUQN{Yt zG3=1=^R`#rBkxm#UfnTwL^bg?8CRO*a`h36po%i0%Nc&If zS<>l^RVL1W`$%~NWx1cN$1E_UU>#N4ZZ+$T>x?nZ@K@ikQDAca;UNBNWbX2Q@&@?* z&bt&1o$4MO)ddr{++hh&eNe)`d^sM$A^!~=@g+r3S@0I+EFQxH zzvY)qsvx}W)*4f%;2n2mLFM4A>y0abcgf2bL3j^$IX+Q`AG>lD-=thrRA>sfbcj1K9dOXIZt z58RCb9AK^Uuzsblpz+b+SU5ziL*jg3B~RV)vtVNZD%1 zfsYARG<-s^s^L?DX|?LW6@oQ2?Z76%x`wL+7d2cX*wEn`!GhXw;4^|L?OZ3AR8tPz zAed2;4%7)|HGEDmr{N2{6iN!}1~>6eC~tn*4(r9xaMczmDh^+1<^P(L4NaOl=AWrI zZ?)hSo(&J0E%H}X6SlDy&Y0hjS|jx>-V4v0-;tUj^*ufhOLK?REUDX=j#SJaNX?P@ z5o?iL_Z=FktS&pSOZK`d!yf(?$@l#vBP=*;FK)N4Y~HNdwU$0S8ATcGIo8Dl{Syu? Lrmx+j;;Ql*i