Index: javacvs/src/org/netbeans/modules/cvsclient/actions/Bundle.properties =================================================================== RCS file: /shared/data/helm/cvs/repository/javacvs/src/org/netbeans/modules/cvsclient/actions/Bundle.properties,v retrieving revision 1.11 diff -c -r1.11 Bundle.properties *** javacvs/src/org/netbeans/modules/cvsclient/actions/Bundle.properties 22 Feb 2002 17:29:44 -0000 1.11 --- javacvs/src/org/netbeans/modules/cvsclient/actions/Bundle.properties 8 Dec 2002 19:08:49 -0000 *************** *** 38,51 **** CollectingAction.displayName=CV&S CollectingAction.DialogDots=... CollectingAction.firstTimer1.text=The IDE's CVS support is currently set to use only default CVS command options. To be prompted for all CVS command options, hold down CTRL while choosing commands. ! CollectingAction.firstTimer2.text=You can also have all command options displayed by default without needing to press CTRL. ! CollectingAction.firstTimer3.text=Choose Tools | Options. Expand the Source Creation and Management node and the Version Control Settings node. Then select the CVS Client Settings node and set the User Interface Mode property to GUI Style. ! CollectingAction.firstTimerBox.text=\ Do Not Show This Dialog Box Again ! CollectingAction.firstTimerBox.mnemonic=D CollectingAction.firstTimer.title=Enabling Advanced CVS Command Options ! CollectingAction.btnClose.text=Close ! CollectingAction.btnClose.mnemonic=C ! JavaCvsActionSupporter.tooltipVCSName=VCS --- 38,50 ---- CollectingAction.displayName=CV&S CollectingAction.DialogDots=... CollectingAction.firstTimer1.text=The IDE's CVS support is currently set to use only default CVS command options. To be prompted for all CVS command options, hold down CTRL while choosing commands. ! CollectingAction.firstTimer2.text=You can also have all command options displayed by default without needing to press CTRL, to do so, click Run Advanced. ! CollectingAction.firstTimer3.text=To change the behaviour any time later Customize the CVS Filesystem and set User Interface Mode to whatever you like. ! CollectingAction.firstTimerBox=&Do Not Show This Dialog Box Again CollectingAction.firstTimer.title=Enabling Advanced CVS Command Options ! CollectingAction.btnRunDefault=&Run ! CollectingAction.btnCancel=&Cancel ! CollectingAction.btnRunGUI=Run &Advanced JavaCvsActionSupporter.tooltipVCSName=VCS Index: javacvs/src/org/netbeans/modules/cvsclient/actions/CollectingAction.java =================================================================== RCS file: /shared/data/helm/cvs/repository/javacvs/src/org/netbeans/modules/cvsclient/actions/CollectingAction.java,v retrieving revision 1.7 diff -c -r1.7 CollectingAction.java *** javacvs/src/org/netbeans/modules/cvsclient/actions/CollectingAction.java 24 Jun 2002 08:29:19 -0000 1.7 --- javacvs/src/org/netbeans/modules/cvsclient/actions/CollectingAction.java 8 Dec 2002 19:08:51 -0000 *************** *** 148,160 **** // System.out.println("performing cvs client action.."); JavaCvsSettings settings = (JavaCvsSettings)SharedClassObject.findObject(JavaCvsSettings.class, true); if (settings.isFirstTimer() && usedUiMode == NbJavaCvsFileSystem.MODE_NOVICE && !isCTRLDown()) { ! // if (!firstPopupDialogShown) { ! // show onky once during the session.. ! // firstPopupDialogShown = true; ! showFirstTimerDialog(); ! // } } ! super.actionPerformed(e); /* Object obj = e.getSource(); if (obj instanceof JMenuItem) { --- 148,158 ---- // System.out.println("performing cvs client action.."); JavaCvsSettings settings = (JavaCvsSettings)SharedClassObject.findObject(JavaCvsSettings.class, true); if (settings.isFirstTimer() && usedUiMode == NbJavaCvsFileSystem.MODE_NOVICE && !isCTRLDown()) { ! if (showFirstTimerDialog()) ! super.actionPerformed(e); } ! else ! super.actionPerformed(e); /* Object obj = e.getSource(); if (obj instanceof JMenuItem) { *************** *** 166,172 **** */ } ! public void showFirstTimerDialog() { JPanel panel = new JPanel(); JLabel label1 = new JLabel(); JTextArea textArea = new JTextArea(); --- 164,176 ---- */ } ! private ResourceBundle bundle=NbBundle.getBundle(CollectingAction.class); ! /** ! * Function that shows off the warning About Default Switches ! * dialog and gives the possibility to cancel the command. ! * @return Should we proceed executing a CVS command ! */ ! public boolean showFirstTimerDialog() { JPanel panel = new JPanel(); JLabel label1 = new JLabel(); JTextArea textArea = new JTextArea(); *************** *** 196,217 **** gridBagConstraints1.insets = new java.awt.Insets(12, 12, 0, 11); panel.add(textArea, gridBagConstraints1); ! /* gridBagConstraints1 = new java.awt.GridBagConstraints(); ! gridBagConstraints1.gridx = 0; ! gridBagConstraints1.gridy = 1; ! gridBagConstraints1.fill = java.awt.GridBagConstraints.BOTH; ! gridBagConstraints1.insets = new java.awt.Insets(0, 12, 0, 11); ! panel.add(label2, gridBagConstraints1); ! ! gridBagConstraints1 = new java.awt.GridBagConstraints(); ! gridBagConstraints1.gridx = 0; ! gridBagConstraints1.gridy = 2; ! gridBagConstraints1.fill = java.awt.GridBagConstraints.BOTH; ! gridBagConstraints1.insets = new java.awt.Insets(0, 12, 0, 11); ! panel.add(label3, gridBagConstraints1); ! */ ! box.setText(NbBundle.getBundle(CollectingAction.class).getString("CollectingAction.firstTimerBox.text")); //NOI18N ! box.setMnemonic(NbBundle.getBundle(CollectingAction.class).getString("CollectingAction.firstTimerBox.mnemonic").charAt (0)); //NOI18N box.setSelected(false); gridBagConstraints1 = new java.awt.GridBagConstraints(); gridBagConstraints1.gridx = 0; --- 200,206 ---- gridBagConstraints1.insets = new java.awt.Insets(12, 12, 0, 11); panel.add(textArea, gridBagConstraints1); ! Actions.setMenuText(box, bundle.getString("CollectingAction.firstTimerBox"), true); //NOI18N box.setSelected(false); gridBagConstraints1 = new java.awt.GridBagConstraints(); gridBagConstraints1.gridx = 0; *************** *** 225,243 **** String title = NbBundle.getBundle(CollectingAction.class).getString("CollectingAction.firstTimer.title"); //NOI18N DialogDescriptor dd = new DialogDescriptor(panel, title); dd.setModal(true); ! JButton btnClose = new JButton(NbBundle.getBundle(CollectingAction.class).getString("CollectingAction.btnClose.text")); ! btnClose.setMnemonic(NbBundle.getBundle(CollectingAction.class).getString("CollectingAction.btnClose.mnemonic").charAt(0)); ! Object[] options = new Object[] {btnClose}; dd.setOptions(options); dd.setClosingOptions(options); ! dd.setValue(btnClose); final DialogDescriptor ddFin = dd; Object retValue = TopManager.getDefault().notify(ddFin); ! if (box.isSelected()) { ! JavaCvsSettings settings = (JavaCvsSettings)SharedClassObject.findObject(JavaCvsSettings.class, true); settings.setFirstTimer(false); ! } ! } --- 214,238 ---- String title = NbBundle.getBundle(CollectingAction.class).getString("CollectingAction.firstTimer.title"); //NOI18N DialogDescriptor dd = new DialogDescriptor(panel, title); dd.setModal(true); ! JButton btnRunDefault = new JButton(), btnRunGUI = new JButton(), btnCancel = new JButton(); ! Actions.setMenuText(btnRunDefault, bundle.getString("CollectingAction.btnRunDefault"),true); ! Actions.setMenuText(btnRunGUI, bundle.getString("CollectingAction.btnRunGUI"), true); ! Actions.setMenuText(btnCancel, bundle.getString("CollectingAction.btnCancel"), true); ! Object[] options = new Object[] {btnRunDefault, btnRunGUI, btnCancel}; dd.setOptions(options); dd.setClosingOptions(options); ! dd.setValue(btnCancel); final DialogDescriptor ddFin = dd; Object retValue = TopManager.getDefault().notify(ddFin); ! JavaCvsSettings settings = (JavaCvsSettings)SharedClassObject.findObject(JavaCvsSettings.class, true); ! if (box.isSelected()) settings.setFirstTimer(false); ! if( retValue==btnCancel ) ! return false; ! if( retValue==btnRunGUI ) ! settings.setUiMode(1); ! // 1 for GUI mode, strange it's not constanted anywhere ! return true; }