diff --git a/.classpath b/.classpath
index 07c5b23..de44daf 100644
--- a/.classpath
+++ b/.classpath
@@ -6,5 +6,6 @@
<classpathentry kind="lib" path="jfreechart-1.5.0.jar"/>
<classpathentry kind="lib" path="LGoodDatePicker-10.4.1-javadoc.jar"/>
<classpathentry kind="lib" path="LGoodDatePicker-10.4.1.jar"/>
+ <classpathentry kind="lib" path="Loggin.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/.config b/.config
index 37a4847..aa35193 100644
--- a/.config
+++ b/.config
@@ -1,4 +1,4 @@
#Configuracion general
-#Sun Nov 17 14:23:42 CET 2019
+#Fri Nov 22 12:55:58 CET 2019
tema=0
ruta=.mes
diff --git a/.contrasenias.txt b/.contrasenias.txt
new file mode 100644
index 0000000..24e6cf7
--- /dev/null
+++ b/.contrasenias.txt
@@ -0,0 +1 @@
+admin:8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918
diff --git a/.mes b/.mes
index 73c5009..1a24fde 100644
Binary files a/.mes and b/.mes differ
diff --git a/Loggin.jar b/Loggin.jar
new file mode 100644
index 0000000..7dda23a
Binary files /dev/null and b/Loggin.jar differ
diff --git a/bin/.gitignore b/bin/.gitignore
index b9067c1..a1bbed7 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,5 +1 @@
-/Fichero/
-/Ficheros/
-/Logica/
-/Main.class
/VistaControlador/
diff --git a/bin/Ficheros/Configuracion.class b/bin/Ficheros/Configuracion.class
new file mode 100644
index 0000000..c24153b
Binary files /dev/null and b/bin/Ficheros/Configuracion.class differ
diff --git a/bin/Logica/Mes.class b/bin/Logica/Mes.class
new file mode 100644
index 0000000..ee4f78b
Binary files /dev/null and b/bin/Logica/Mes.class differ
diff --git a/bin/Logica/Meses.class b/bin/Logica/Meses.class
new file mode 100644
index 0000000..d9318f9
Binary files /dev/null and b/bin/Logica/Meses.class differ
diff --git a/bin/Main.class b/bin/Main.class
index cfeaff2..82d0f20 100644
Binary files a/bin/Main.class and b/bin/Main.class differ
diff --git a/src/Main.java b/src/Main.java
index da8e79a..35c87af 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,4 +1,5 @@
import VistaControlador.Menu;
+import loggin.Vista;
public class Main {
/**
@@ -7,9 +8,12 @@ public class Main {
* @param args
*/
public static void main(String[] args) {
+ /*Vista loggin = new Vista(Vista.Comprobar);
+ while(!loggin.verResultado()) {
+
+ }*/
Menu menu=new Menu();
menu.setVisible(true);
-
}
}
diff --git a/src/VistaControlador/BarraOpciones.java b/src/VistaControlador/BarraOpciones.java
index c0ecc76..65de52b 100644
--- a/src/VistaControlador/BarraOpciones.java
+++ b/src/VistaControlador/BarraOpciones.java
@@ -21,6 +21,8 @@ public class BarraOpciones extends JMenuBar{
JMenu vistas;
JMenuItem gestion;
JMenuItem modificacion;
+ JMenu administracion;
+ JMenuItem aniadirUsuario;
/**
* Inicializa labarra con los datos por defecto
@@ -54,5 +56,9 @@ public class BarraOpciones extends JMenuBar{
this.vistas.add(this.gestion);
this.modificacion = new JMenuItem("Modificacion");
this.vistas.add(this.modificacion);
+ this.administracion = new JMenu("Administracion");
+ this.add(this.administracion);
+ this.aniadirUsuario = new JMenuItem("Aniadir usuario");
+ this.administracion.add(this.aniadirUsuario);
}
}
diff --git a/src/VistaControlador/ControladorBarra.java b/src/VistaControlador/ControladorBarra.java
index 5d3061f..ac977b5 100644
--- a/src/VistaControlador/ControladorBarra.java
+++ b/src/VistaControlador/ControladorBarra.java
@@ -8,6 +8,7 @@ import java.time.LocalDate;
import javax.swing.JOptionPane;
import Ficheros.Configuracion;
+import loggin.Vista;
public class ControladorBarra implements ActionListener{
private BarraOpciones barra;
@@ -87,6 +88,11 @@ public class ControladorBarra implements ActionListener{
}
case "Cambiar Modificar":{
this.menu.cambiarVista(this.menu.VISTA_MODIFICAR);
+ break;
+ }
+ case "Aniadir usuario":{
+ Vista loggin = new Vista(Vista.Guardar);
+ break;
}
}
@@ -117,6 +123,8 @@ public class ControladorBarra implements ActionListener{
this.barra.gestion.setActionCommand("Cambiar Gestion");
this.barra.modificacion.addActionListener(this);
this.barra.modificacion.setActionCommand("Cambiar Modificar");
+ this.barra.aniadirUsuario.addActionListener(this);
+ this.barra.aniadirUsuario.setActionCommand("Aniadir usuario");
}
}
diff --git a/src/VistaControlador/ControladorPanelInterfaz.java b/src/VistaControlador/ControladorPanelInterfaz.java
new file mode 100644
index 0000000..bcc8830
--- /dev/null
+++ b/src/VistaControlador/ControladorPanelInterfaz.java
@@ -0,0 +1,23 @@
+package VistaControlador;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class ControladorPanelInterfaz implements ActionListener{
+ VistaPanelInterfaz vista;
+ Menu menu;
+ public ControladorPanelInterfaz(VistaPanelInterfaz vista, Menu menu) {
+ this.menu = menu;
+ this.vista = vista;
+ this.aniadirListener();
+ }
+
+ private void aniadirListener() {
+ //his.vista.
+ }
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ // TODO Auto-generated method stub
+
+ }
+}
diff --git a/src/VistaControlador/Menu.java b/src/VistaControlador/Menu.java
index 50a6910..0e555bc 100644
--- a/src/VistaControlador/Menu.java
+++ b/src/VistaControlador/Menu.java
@@ -26,6 +26,7 @@ import Ficheros.Configuracion;
import Logica.Gestion;
import Logica.Meses;
import Logica.Transaccion;
+import loggin.Vista;
public class Menu extends JFrame{
static final int VISTA_MODIFICAR = 0;
@@ -54,6 +55,11 @@ public class Menu extends JFrame{
* Constructor que carga los datos del menu
*/
public Menu() {
+ Vista loggin = new Vista(Vista.Comprobar);
+
+ if(!loggin.verResultado()) {
+ System.exit(0);
+ }
this.rutaGuardado = ".mes";
this.tema = 0;
this.barra = new BarraOpciones();
diff --git a/src/VistaControlador/VistaPanelInterfaz.java b/src/VistaControlador/VistaPanelInterfaz.java
new file mode 100644
index 0000000..51db419
--- /dev/null
+++ b/src/VistaControlador/VistaPanelInterfaz.java
@@ -0,0 +1,31 @@
+package VistaControlador;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JRadioButton;
+import javax.swing.JRadioButtonMenuItem;
+
+public class VistaPanelInterfaz extends VistaPanel{
+JRadioButtonMenuItem menu;
+JRadioButton temaClaro;
+JRadioButton temaRosa;
+JRadioButton temaOscuro;
+JCheckBox aplicarBarra;
+JButton aplicarCambios;
+
+VistaPanelInterfaz() {
+ this.menu = new JRadioButtonMenuItem();
+ this.temaClaro = new JRadioButton();
+ this.menu.add(this.temaClaro);
+ this.temaOscuro = new JRadioButton();
+ this.menu.add(this.temaOscuro);
+ this.temaRosa = new JRadioButton();
+ this.menu.add(this.temaRosa);
+ this.add(this.menu);
+ this.aplicarBarra = new JCheckBox();
+ this.add(this.aplicarBarra);
+ this.aplicarCambios = new JButton("Aplicar");
+ this.add(this.aplicarCambios);
+}
+
+}