maj V1.0.6
This commit is contained in:
parent
0ff44760e4
commit
39883626d8
@ -197,17 +197,47 @@ public class Window_demarre extends JFrame {
|
||||
tabbedPane.addTab("<html>Gestionnaire de la<br>base de données</html>", tabGestionnaire);
|
||||
|
||||
JPanel tabInscriptions = new JPanel();
|
||||
tabbedPane.addTab("<html>Inscriptions<br>des étudiants</html>", tabInscriptions);
|
||||
tabbedPane.addTab("<html>Importer des<br>inscriptions</html>", tabInscriptions);
|
||||
|
||||
JPanel tabExporteImporte = new JPanel();
|
||||
tabbedPane.addTab("<html>Importer depuis un<br>classeur Ms Excel</html>", tabExporteImporte);
|
||||
tabbedPane.addTab("<html>Importer des données<br>depuis Ms Excel</html>", tabExporteImporte);
|
||||
tabbedPane.setEnabledAt(2, true);
|
||||
tabExporteImporte.setLayout(null);
|
||||
|
||||
JPanel tabAides = new JPanel();
|
||||
tabbedPane.addTab("Aides-Tickets", tabAides);
|
||||
tabbedPane.addTab("<html>Aides-Tutoriels<br>Tickets-Versions</html>", tabAides);
|
||||
|
||||
JPanel tabLicence = new JPanel();
|
||||
tabbedPane.addTab("<html>Crédits<br>Licences</html>", tabLicence);
|
||||
tabLicence.setLayout(null);
|
||||
|
||||
JLabel lblCredits = new JLabel("<html><h4>Auteur : Pablo Rodriguez<br>Université d'Artois</h4>\r\n<hr>\r\n<p><b>Matières </b>: Informatique - T.I.C.E. - Automatisme - Productique - Statistique.</p>\r\n<p><b>Email </b>: pablo.rodriguez@univ-artois.fr</p>");
|
||||
lblCredits.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
lblCredits.setVerticalAlignment(SwingConstants.TOP);
|
||||
lblCredits.setFont(new Font("Arial", Font.PLAIN, 12));
|
||||
lblCredits.setToolTipText("");
|
||||
lblCredits.setBounds(10, 10, 456, 113);
|
||||
tabLicence.add(lblCredits);
|
||||
|
||||
JButton btnNewButton_1 = new JButton(" Licence GNU GPL V3.0");
|
||||
btnNewButton_1.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
String url = "https://www.gnu.org/licenses/gpl-3.0.html#license-text";
|
||||
try {
|
||||
Desktop.getDesktop().browse(new URI(url));
|
||||
} catch (IOException | URISyntaxException ex) {
|
||||
JOptionPane.showMessageDialog(null, "Problème avec la connexion internet.");
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
});
|
||||
btnNewButton_1.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/gplv3-127x51.png")));
|
||||
btnNewButton_1.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
btnNewButton_1.setBounds(10, 134, 704, 78);
|
||||
tabLicence.add(btnNewButton_1);
|
||||
|
||||
|
||||
frmEvalwriter.getContentPane().add(tabbedPane);
|
||||
tabExporteImporte.setLayout(null);
|
||||
|
||||
|
||||
|
||||
@ -217,17 +247,6 @@ public class Window_demarre extends JFrame {
|
||||
btnExporterTouteLaBase.setBounds(370, 10, 340, 80);
|
||||
|
||||
tabExporteImporte.add(btnExporterTouteLaBase);
|
||||
// frmEvalwriter.getContentPane().add(btnExporterTouteLaBase);
|
||||
|
||||
// actImporterInscriptionDepuisCSV = new JButton("<html>Importer des inscriptions<br>depuis CSV (UTF-8, point-virgule)</html>");
|
||||
// actImporterInscriptionDepuisCSV.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
// actImporterInscriptionDepuisCSV.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/importationcsv.png")));
|
||||
// actImporterInscriptionDepuisCSV.setFont(new Font("Arial", Font.BOLD | Font.ITALIC, 16));
|
||||
// actImporterInscriptionDepuisCSV.setBounds(409, 721, 377, 60);
|
||||
// actImporterInscriptionDepuisCSV.setForeground(Color.DARK_GRAY);
|
||||
|
||||
// frmEvalwriter.getContentPane().add(actImporterInscriptionDepuisCSV);
|
||||
|
||||
|
||||
btnMiseAJourDepuisClasseur = new JButton("");
|
||||
btnMiseAJourDepuisClasseur.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/importer_data_bouton.png")));
|
||||
@ -235,9 +254,7 @@ public class Window_demarre extends JFrame {
|
||||
btnMiseAJourDepuisClasseur.setBounds(10, 10, 340, 200);
|
||||
tabExporteImporte.add(btnMiseAJourDepuisClasseur);
|
||||
tabGestionnaire.setLayout(null);
|
||||
|
||||
|
||||
// frmEvalwriter.getContentPane().add(btnMiseAJourDepuisClasseur);
|
||||
|
||||
|
||||
btnGestionnaire = new JButton("");
|
||||
btnGestionnaire.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/gestionnaire_bouton.png")));
|
||||
@ -246,8 +263,6 @@ public class Window_demarre extends JFrame {
|
||||
tabGestionnaire.add(btnGestionnaire);
|
||||
tabInscriptions.setLayout(null);
|
||||
|
||||
// frmEvalwriter.getContentPane().add(btnGestionnaire);
|
||||
|
||||
btnimporterDesInscriptionsdepuisClasseur = new JButton("");
|
||||
btnimporterDesInscriptionsdepuisClasseur.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/importer_inscriptions_bouton.png")));
|
||||
btnimporterDesInscriptionsdepuisClasseur.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
@ -255,16 +270,13 @@ public class Window_demarre extends JFrame {
|
||||
|
||||
tabInscriptions.add(btnimporterDesInscriptionsdepuisClasseur);
|
||||
tabAides.setLayout(null);
|
||||
|
||||
// frmEvalwriter.getContentPane().add(btnimporterDesInscriptionsdepuisClasseur);
|
||||
|
||||
|
||||
btnNAideMiseAJour.setForeground(Color.GRAY);
|
||||
btnNAideMiseAJour.setFont(new Font("Tahoma", Font.BOLD | Font.ITALIC, 12));
|
||||
btnNAideMiseAJour.setBounds(360, 11, 354, 30);
|
||||
btnNAideMiseAJour.setBounds(370, 11, 340, 30);
|
||||
tabAides.add(btnNAideMiseAJour);
|
||||
|
||||
// frmEvalwriter.getContentPane().add(btnNAideMiseAJour);
|
||||
|
||||
|
||||
if(commandes.newVersion) {
|
||||
btnNewVersion = new JButton("<html>Nouvelle version disponible : "+ commandes.nameNewVersion + "</html>");
|
||||
@ -274,17 +286,15 @@ public class Window_demarre extends JFrame {
|
||||
btnNewVersion.setBounds(20, 602, 705, 63);
|
||||
btnNewVersion.setVisible(commandes.newVersion);
|
||||
frmEvalwriter.getContentPane().add(btnNewVersion);
|
||||
|
||||
btnHelpDownload = new JButton("Aide au téléchargement et à l'installation");
|
||||
|
||||
btnHelpDownload.setFont(new Font("Tahoma", Font.BOLD | Font.ITALIC, 12));
|
||||
btnHelpDownload.setForeground(Color.GRAY);
|
||||
btnHelpDownload.setBounds(360, 74, 354, 30);
|
||||
// tabAideParamètres.add(btnHelpDownload);
|
||||
btnHelpDownload.setBounds(370, 74, 340, 30);
|
||||
|
||||
tabAides.add(btnHelpDownload);
|
||||
|
||||
btnAideImportationInscriptionXLSX.setFont(new Font("Tahoma", Font.BOLD | Font.ITALIC, 12));
|
||||
btnAideImportationInscriptionXLSX.setBounds(360, 42, 354, 30);
|
||||
btnAideImportationInscriptionXLSX.setBounds(370, 42, 340, 30);
|
||||
btnAideImportationInscriptionXLSX.setForeground(Color.GRAY);
|
||||
tabAides.add(btnAideImportationInscriptionXLSX);
|
||||
|
||||
@ -301,14 +311,40 @@ public class Window_demarre extends JFrame {
|
||||
}
|
||||
}
|
||||
});
|
||||
btnNewButton.setBounds(10, 10, 340, 200);
|
||||
btnNewButton.setBounds(10, 10, 340, 95);
|
||||
tabAides.add(btnNewButton);
|
||||
|
||||
// JButton btnAideImportationInscriptionCSV = new JButton("Aide à l'importation des inscriptions depuis fichier CSV");
|
||||
// btnAideImportationInscriptionCSV.setFont(new Font("Tahoma", Font.BOLD | Font.ITALIC, 12));
|
||||
// btnAideImportationInscriptionCSV.setBounds(409, 762, 377, 30);
|
||||
// frmEvalwriter.getContentPane().add(btnAideImportationInscriptionCSV);
|
||||
// btnAideImportationInscriptionCSV.setForeground(Color.GRAY);
|
||||
JButton btnTutoriels = new JButton("");
|
||||
btnTutoriels.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
String url = "https://artoistv.univ-artois.fr/search/?q=gestion+inscription+pablo";
|
||||
try {
|
||||
Desktop.getDesktop().browse(new URI(url));
|
||||
} catch (IOException | URISyntaxException ex) {
|
||||
JOptionPane.showMessageDialog(null, "Problème avec la connexion internet.");
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
});
|
||||
btnTutoriels.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/tutoriels_bouton.png")));
|
||||
btnTutoriels.setBounds(10, 116, 340, 95);
|
||||
tabAides.add(btnTutoriels);
|
||||
|
||||
JButton btnVersions = new JButton("");
|
||||
btnVersions.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
String url = "https://forge.chapril.org/pablo/GestionDesInscriptions/releases";
|
||||
try {
|
||||
Desktop.getDesktop().browse(new URI(url));
|
||||
} catch (IOException | URISyntaxException ex) {
|
||||
JOptionPane.showMessageDialog(null, "Problème avec la connexion internet.");
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
});
|
||||
btnVersions.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/versions_bouton.png")));
|
||||
btnVersions.setBounds(370, 116, 340, 95);
|
||||
tabAides.add(btnVersions);
|
||||
|
||||
JButton btnParametresClasseurInscription = new JButton("<html>Paramètres classeur<br>des inscriptions</html>");
|
||||
btnParametresClasseurInscription.addActionListener(new ActionListener() {
|
||||
@ -322,8 +358,6 @@ public class Window_demarre extends JFrame {
|
||||
btnParametresClasseurInscription.setBounds(370, 10, 340, 80);
|
||||
tabInscriptions.add(btnParametresClasseurInscription);
|
||||
|
||||
// frmEvalwriter.getContentPane().add(btnParametresClasseurInscription);
|
||||
|
||||
JButton btnRenommerActiverColonne = new JButton("<html>Renommer et activer<br>des colonnes</html>");
|
||||
btnRenommerActiverColonne.setIcon(new ImageIcon(Window_demarre.class.getResource("/resources/newColumnsApplication.png")));
|
||||
btnRenommerActiverColonne.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
|
@ -538,12 +538,28 @@ public class Window_gestionnaire extends JFrame {
|
||||
|
||||
JMenu menuFile = new JMenu("Fichier");
|
||||
menuFile.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
|
||||
JMenuItem mnActualiser = new JMenuItem("Actualiser");
|
||||
mnActualiser.setIcon(new ImageIcon(Window_gestionnaire.class.getResource("/resources/actualise.png")));
|
||||
mnActualiser.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_DOWN_MASK));
|
||||
mnActualiser.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
mnActualiser.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
majFiltres();
|
||||
}
|
||||
});
|
||||
menuFile.add(mnActualiser);
|
||||
|
||||
menuFile.addSeparator();
|
||||
|
||||
JMenuItem saveBaseItem = menuFile.add(new saveTable(this));
|
||||
saveBaseItem.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
saveBaseItem.setText("<html>Archiver (Zip) et sauvegarder<br>les modifications</html>");
|
||||
menuFile.add(saveBaseItem);
|
||||
|
||||
menuFile.addSeparator();
|
||||
|
||||
JMenuItem exitItem = new JMenuItem("Quitter");
|
||||
exitItem.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
exitItem.setIcon(new ImageIcon(Window_gestionnaire.class.getResource("/resources/exit.png")));
|
||||
@ -686,7 +702,7 @@ public class Window_gestionnaire extends JFrame {
|
||||
JMenu menuExport = new JMenu("Exportation");
|
||||
menuExport.setFont(new Font("Arial", Font.BOLD, 16));
|
||||
JMenuItem exportTable = menuExport.add(new exportTable(this));
|
||||
exportTable.setText("<html>Exporter la table Ms Excel<br>en tenant compte des filtres</html>");
|
||||
exportTable.setText("<html>Exporter la table vers Ms Excel<br>en tenant compte des filtres</html>");
|
||||
exportTable.setFont(new Font("Arial", Font.BOLD, 14));
|
||||
menuExport.add(exportTable);
|
||||
menuExport.addSeparator();
|
||||
|
@ -23,7 +23,7 @@ public class exportEmargement extends AbstractAction{
|
||||
public exportEmargement(Window_gestionnaire instance) {
|
||||
|
||||
this.instance = instance;
|
||||
putValue( Action.NAME, "Exporter émargement Ms Excel" );
|
||||
putValue( Action.NAME, "<html>Créer feuille d'émargement<br>en tenant compte des filtres</html>" );
|
||||
putValue( Action.SMALL_ICON, new ImageIcon(Window_gestionnaire.class.getResource("/resources/emargement.png")) );
|
||||
putValue( Action.LARGE_ICON_KEY, new ImageIcon(Window_gestionnaire.class.getResource("/resources/emargement.png")) );
|
||||
putValue( Action.SHORT_DESCRIPTION, "Exporter l'émargement dans un classeur Ms Excel." );
|
||||
|
BIN
src/resources/actualise.png
Normal file
BIN
src/resources/actualise.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.4 KiB |
BIN
src/resources/gplv3-127x51.png
Normal file
BIN
src/resources/gplv3-127x51.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
BIN
src/resources/tutoriels_bouton.png
Normal file
BIN
src/resources/tutoriels_bouton.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 15 KiB |
BIN
src/resources/versions_bouton.png
Normal file
BIN
src/resources/versions_bouton.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 18 KiB |
Loading…
Reference in New Issue
Block a user