* Mas cambios GUI

[z.facultad/75.06/emufs.git] / emufs_gui / gui.c

diff --git a/emufs_gui/gui.c b/emufs_gui/gui.c
index 88130d51a4d00f3f6ffe4d90b0159f44b49e005e..a25ec5456e2c0c81c8bee859e2d937be01beaee7 100644 (file)
--- a/emufs_gui/gui.c
+++ b/emufs_gui/gui.c
@@ -8,6 +8,7 @@
 
 #include "form.h"
 #include "articulos.h"
+#include "facturas.h"
 #include "emufs.h"
 
 #define CTRLD 4
@@ -23,8 +24,6 @@ int main(int argc, char *argv[])
 
 /*     art_cargar(argv[1]);
 
-       art_obtener(NULL, "438");
-
        art_liberar(NULL);
        return 1;
 */
@@ -56,9 +55,10 @@ int main(int argc, char *argv[])
                return 1;
        }
 
-       if (argc == 2)
+       if (argc == 2) {
                art_cargar(argv[1]);
-       else
+               fact_cargar(argv[1]);
+       } else
                art_cargar(NULL);
        
        /* Ventana, caracter para linea vertical, caracter para linea horizontal*/
@@ -89,6 +89,7 @@ int main(int argc, char *argv[])
        endwin();
 
        art_liberar(NULL);
+       fact_liberar(NULL);
 
        return 0;
 }
@@ -118,16 +119,16 @@ void menu_articulos()
        items[4] = NULL;
 
        menu = new_menu((ITEM **)items);
-       menu_win = newwin(8, 68, 3, 1);
+       menu_win = newwin(8, COLS-2, 3, 1);
        keypad(menu_win, TRUE);
        set_menu_mark(menu, " > ");
        set_menu_win(menu, menu_win);
-       set_menu_sub(menu, derwin(menu_win, 5, 66, 3, 1));
+       set_menu_sub(menu, derwin(menu_win, 5, COLS-4, 3, 1));
 
        box(menu_win, 0, 0);
        mvwaddch(menu_win, 2, 0, ACS_LTEE);
-       mvwhline(menu_win, 2, 1, ACS_HLINE, 67);
-       mvwaddch(menu_win, 2, 67, ACS_RTEE);
+       mvwhline(menu_win, 2, 1, ACS_HLINE, COLS-3);
+       mvwaddch(menu_win, 2, COLS-3, ACS_RTEE);
        wattron(menu_win, COLOR_PAIR(COLOR_RED));
        mvwaddstr(menu_win, 1, 1, "Menu Articulos");
        wattroff(menu_win, COLOR_PAIR(COLOR_RED));
@@ -204,16 +205,16 @@ int main_menu()
        items[5] = NULL;
 
        menu = new_menu((ITEM **)items);
-       menu_win = newwin(9, 68, 3, 1);
+       menu_win = newwin(9, COLS-2, 3, 1);
        keypad(menu_win, TRUE);
        set_menu_mark(menu, " > ");
        set_menu_win(menu, menu_win);
-       set_menu_sub(menu, derwin(menu_win, 6, 66, 3, 1));
+       set_menu_sub(menu, derwin(menu_win, 6, COLS-4, 3, 1));
 
        box(menu_win, 0, 0);
        mvwaddch(menu_win, 2, 0, ACS_LTEE);
-       mvwhline(menu_win, 2, 1, ACS_HLINE, 67);
-       mvwaddch(menu_win, 2, 67, ACS_RTEE);
+       mvwhline(menu_win, 2, 1, ACS_HLINE, COLS-3);
+       mvwaddch(menu_win, 2, COLS-3, ACS_RTEE);
        wattron(menu_win, COLOR_PAIR(COLOR_RED));
        mvwaddstr(menu_win, 1, 1, "Menu Principal");
        wattroff(menu_win, COLOR_PAIR(COLOR_RED));