mvideo-cvs Mailing List for MVideo
Status: Beta
Brought to you by:
little_rock
You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(23) |
Sep
(68) |
Oct
(51) |
Nov
(36) |
Dec
(52) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(53) |
Feb
(85) |
Mar
(17) |
Apr
(2) |
May
(31) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Luca R. <lit...@us...> - 2004-05-04 16:16:53
|
Update of /cvsroot/mvideo/MVideo2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24915 Log Message: Initial import. Status: Vendor Tag: vendor Release Tags: start N MVideo2/NEWS N MVideo2/aclocal.m4 N MVideo2/README N MVideo2/configure.in N MVideo2/autogen.sh N MVideo2/mkinstalldirs N MVideo2/Makefile.am N MVideo2/AUTHORS N MVideo2/INSTALL N MVideo2/ABOUT-NLS N MVideo2/ChangeLog N MVideo2/COPYING N MVideo2/m4/mysql.m4 N MVideo2/po/POTFILES.in N MVideo2/po/mvideo.pot N MVideo2/po/ChangeLog N MVideo2/po/Makefile.in.in N MVideo2/src/arguments.cs N MVideo2/src/db.cs N MVideo2/src/config.cs N MVideo2/src/film.cs N MVideo2/src/mvideo.cs N MVideo2/src/mvideo.in N MVideo2/src/Makefile.am N MVideo2/src/AssemblyInfo.cs N MVideo2/src/play.cs N MVideo2/src/GettextCatalog.cs N MVideo2/src/dbfilm.cs N MVideo2/src/eximport.cs N MVideo2/src/utils.cs N MVideo2/src/Gui/setup_collection.cs N MVideo2/src/Gui/menu_utils.cs N MVideo2/src/Gui/body_list.cs N MVideo2/src/Gui/body_notes.cs N MVideo2/src/Gui/filmList.cs N MVideo2/src/Gui/setup_bar.cs N MVideo2/src/Gui/menu.cs N MVideo2/src/Gui/about.cs N MVideo2/src/Gui/first_setup.cs N MVideo2/src/Gui/gui.cs N MVideo2/src/Gui/help.cs N MVideo2/src/Gui/body_bios.cs N MVideo2/src/Gui/filmView.cs N MVideo2/src/Gui/print.cs N MVideo2/src/Gui/setup.cs N MVideo2/src/Gui/body_stats.cs N MVideo2/src/Gui/body_query.cs N MVideo2/src/Gui/filmModify.cs N MVideo2/src/Gui/body.cs N MVideo2/src/Gui/filmFormat.cs N MVideo2/src/Gui/utils.cs N MVideo2/Dlls/SharpZipLib.dll N MVideo2/Dlls/ByteFX.MySqlClient.Design.dll N MVideo2/Dlls/AmazonSearchService.wsdl N MVideo2/Dlls/Makefile.am N MVideo2/Dlls/ByteFX.MySqlClient.dll N MVideo2/Dlls/ICSharpCode.SharpZipLib.dll N MVideo2/docs/FAQ N MVideo2/docs/TODO N MVideo2/docs/SETUP N MVideo2/docs/SEARCH N MVideo2/docs/Makefile.am N MVideo2/docs/FIRST-SETUP N MVideo2/docs/html/database.html N MVideo2/docs/html/dbsetup.html N MVideo2/docs/html/faq.html N MVideo2/docs/html/general.html N MVideo2/docs/html/skin.html N MVideo2/docs/html/index.html N MVideo2/docs/html/export.html N MVideo2/docs/html/fw.html N MVideo2/docs/html/Makefile.am N MVideo2/docs/html/setup.html N MVideo2/docs/html/use.html N MVideo2/docs/html/search.html N MVideo2/docs/html/user.html N MVideo2/docs/html/help.html N MVideo2/docs/html/printer.html N MVideo2/docs/html/first_setup.html N MVideo2/docs/html/img/bg_menu.png N MVideo2/docs/html/img/use_on.png N MVideo2/docs/html/img/dbsetup_on.png N MVideo2/docs/html/img/faq_on.png N MVideo2/docs/html/img/dbsetup.png N MVideo2/docs/html/img/faq.png N MVideo2/docs/html/img/setup_on.png N MVideo2/docs/html/img/help_on.png N MVideo2/docs/html/img/bg.png N MVideo2/docs/html/img/Makefile.am N MVideo2/docs/html/img/top.png N MVideo2/docs/html/img/setup.png N MVideo2/docs/html/img/use.png N MVideo2/docs/html/img/bg2.png N MVideo2/docs/html/img/menu2_r3_c1.png N MVideo2/docs/html/img/logo.png N MVideo2/docs/html/img/help.png N MVideo2/libmvideo/get_file.c N MVideo2/libmvideo/get_file.h N MVideo2/libmvideo/Makefile.am N MVideo2/libmvideo/Makefile.in N MVideo2/libmvideo/gettext-utils.c N MVideo2/libmvideo/gettext-utils.h N MVideo2/libmvideo/player.h N MVideo2/libmvideo/player-gst.c N MVideo2/skins/Makefile.am N MVideo2/skins/default/example.png N MVideo2/skins/default/index.html N MVideo2/skins/default/Makefile.am N MVideo2/skins/default/print.html N MVideo2/skins/default/imgs/edit.png N MVideo2/skins/default/imgs/print_preview.png N MVideo2/skins/default/imgs/Makefile.am N MVideo2/skins/default/imgs/fullscreen.png N MVideo2/skins/default/imgs/star10.png N MVideo2/skins/default/imgs/star1.png N MVideo2/skins/default/imgs/star2.png N MVideo2/skins/default/imgs/star3.png N MVideo2/skins/default/imgs/star4.png N MVideo2/skins/default/imgs/star5.png N MVideo2/skins/default/imgs/star6.png N MVideo2/skins/default/imgs/star7.png N MVideo2/skins/default/imgs/star8.png N MVideo2/skins/default/imgs/star9.png N MVideo2/skins/default/imgs/quit.png N MVideo2/skins/default/imgs/delete.png N MVideo2/skins/default/imgs/export.png N MVideo2/skins/default/imgs/print.png N MVideo2/scripts/post_install.sh.in N MVideo2/scripts/Makefile.am N MVideo2/scripts/mvideo.desktop.in N MVideo2/macros/distro N MVideo2/macros/tools-version.sh N MVideo2/pixmaps/none.png N MVideo2/pixmaps/modify_final.png N MVideo2/pixmaps/modify_notes.png N MVideo2/pixmaps/modify_general.png N MVideo2/pixmaps/star_no.png N MVideo2/pixmaps/closed.png N MVideo2/pixmaps/star_ok.png N MVideo2/pixmaps/MVideo_splash_blu.jpg N MVideo2/pixmaps/modify_media.png N MVideo2/pixmaps/modify_plot.png N MVideo2/pixmaps/config.png N MVideo2/pixmaps/setup_arrow_down.png N MVideo2/pixmaps/Makefile.am N MVideo2/pixmaps/smile.png N MVideo2/pixmaps/modify_audiovideo.png N MVideo2/pixmaps/mvideo.png N MVideo2/pixmaps/printer_icon.png N MVideo2/pixmaps/setup_collection_auto.png N MVideo2/pixmaps/modify_actors.png N MVideo2/pixmaps/dat_icon.png N MVideo2/pixmaps/setup_arrow_up.png N MVideo2/pixmaps/export_icon.png No conflicts created by this import ***** Bogus filespec: - ***** Bogus filespec: Imported ***** Bogus filespec: sources |
From: Luca R. <lit...@us...> - 2004-05-04 16:14:10
|
Update of /cvsroot/mvideo/modulename In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24428 Log Message: Initial import. Status: Vendor Tag: vendor Release Tags: start N modulename/NEWS N modulename/aclocal.m4 N modulename/README N modulename/configure.in N modulename/autogen.sh N modulename/mkinstalldirs N modulename/Makefile.am N modulename/AUTHORS N modulename/INSTALL N modulename/ABOUT-NLS N modulename/ChangeLog N modulename/COPYING N modulename/m4/mysql.m4 N modulename/po/POTFILES.in N modulename/po/mvideo.pot N modulename/po/ChangeLog N modulename/po/Makefile.in.in N modulename/src/arguments.cs N modulename/src/db.cs N modulename/src/config.cs N modulename/src/film.cs N modulename/src/mvideo.cs N modulename/src/mvideo.in N modulename/src/Makefile.am N modulename/src/AssemblyInfo.cs N modulename/src/play.cs N modulename/src/GettextCatalog.cs N modulename/src/dbfilm.cs N modulename/src/eximport.cs N modulename/src/utils.cs N modulename/src/Gui/setup_collection.cs N modulename/src/Gui/menu_utils.cs N modulename/src/Gui/body_list.cs N modulename/src/Gui/body_notes.cs N modulename/src/Gui/filmList.cs N modulename/src/Gui/setup_bar.cs N modulename/src/Gui/menu.cs N modulename/src/Gui/about.cs N modulename/src/Gui/first_setup.cs N modulename/src/Gui/gui.cs N modulename/src/Gui/help.cs N modulename/src/Gui/body_bios.cs N modulename/src/Gui/filmView.cs N modulename/src/Gui/print.cs N modulename/src/Gui/setup.cs N modulename/src/Gui/body_stats.cs N modulename/src/Gui/body_query.cs N modulename/src/Gui/filmModify.cs N modulename/src/Gui/body.cs N modulename/src/Gui/filmFormat.cs N modulename/src/Gui/utils.cs N modulename/Dlls/SharpZipLib.dll N modulename/Dlls/ByteFX.MySqlClient.Design.dll N modulename/Dlls/AmazonSearchService.wsdl N modulename/Dlls/Makefile.am N modulename/Dlls/ByteFX.MySqlClient.dll N modulename/Dlls/ICSharpCode.SharpZipLib.dll N modulename/docs/FAQ N modulename/docs/TODO N modulename/docs/SETUP N modulename/docs/SEARCH N modulename/docs/Makefile.am N modulename/docs/FIRST-SETUP N modulename/docs/html/database.html N modulename/docs/html/dbsetup.html N modulename/docs/html/faq.html N modulename/docs/html/general.html N modulename/docs/html/skin.html N modulename/docs/html/index.html N modulename/docs/html/export.html N modulename/docs/html/fw.html N modulename/docs/html/Makefile.am N modulename/docs/html/setup.html N modulename/docs/html/use.html N modulename/docs/html/search.html N modulename/docs/html/user.html N modulename/docs/html/help.html N modulename/docs/html/printer.html N modulename/docs/html/first_setup.html N modulename/docs/html/img/bg_menu.png N modulename/docs/html/img/use_on.png N modulename/docs/html/img/dbsetup_on.png N modulename/docs/html/img/faq_on.png N modulename/docs/html/img/dbsetup.png N modulename/docs/html/img/faq.png N modulename/docs/html/img/setup_on.png N modulename/docs/html/img/help_on.png N modulename/docs/html/img/bg.png N modulename/docs/html/img/Makefile.am N modulename/docs/html/img/top.png N modulename/docs/html/img/setup.png N modulename/docs/html/img/use.png N modulename/docs/html/img/bg2.png N modulename/docs/html/img/menu2_r3_c1.png N modulename/docs/html/img/logo.png N modulename/docs/html/img/help.png N modulename/libmvideo/get_file.c N modulename/libmvideo/get_file.h N modulename/libmvideo/Makefile.am N modulename/libmvideo/Makefile.in N modulename/libmvideo/gettext-utils.c N modulename/libmvideo/gettext-utils.h N modulename/libmvideo/player.h N modulename/libmvideo/player-gst.c N modulename/skins/Makefile.am N modulename/skins/default/example.png N modulename/skins/default/index.html N modulename/skins/default/Makefile.am N modulename/skins/default/print.html N modulename/skins/default/imgs/edit.png N modulename/skins/default/imgs/print_preview.png N modulename/skins/default/imgs/Makefile.am N modulename/skins/default/imgs/fullscreen.png N modulename/skins/default/imgs/star10.png N modulename/skins/default/imgs/star1.png N modulename/skins/default/imgs/star2.png N modulename/skins/default/imgs/star3.png N modulename/skins/default/imgs/star4.png N modulename/skins/default/imgs/star5.png N modulename/skins/default/imgs/star6.png N modulename/skins/default/imgs/star7.png N modulename/skins/default/imgs/star8.png N modulename/skins/default/imgs/star9.png N modulename/skins/default/imgs/quit.png N modulename/skins/default/imgs/delete.png N modulename/skins/default/imgs/export.png N modulename/skins/default/imgs/print.png N modulename/scripts/post_install.sh.in N modulename/scripts/Makefile.am N modulename/scripts/mvideo.desktop.in N modulename/macros/distro N modulename/macros/tools-version.sh N modulename/pixmaps/none.png N modulename/pixmaps/modify_final.png N modulename/pixmaps/modify_notes.png N modulename/pixmaps/modify_general.png N modulename/pixmaps/star_no.png N modulename/pixmaps/closed.png N modulename/pixmaps/star_ok.png N modulename/pixmaps/MVideo_splash_blu.jpg N modulename/pixmaps/modify_media.png N modulename/pixmaps/modify_plot.png N modulename/pixmaps/config.png N modulename/pixmaps/setup_arrow_down.png N modulename/pixmaps/Makefile.am N modulename/pixmaps/smile.png N modulename/pixmaps/modify_audiovideo.png N modulename/pixmaps/mvideo.png N modulename/pixmaps/printer_icon.png N modulename/pixmaps/setup_collection_auto.png N modulename/pixmaps/modify_actors.png N modulename/pixmaps/dat_icon.png N modulename/pixmaps/setup_arrow_up.png N modulename/pixmaps/export_icon.png No conflicts created by this import ***** Bogus filespec: - ***** Bogus filespec: Imported ***** Bogus filespec: sources |
From: Luca R. <lit...@us...> - 2003-06-01 11:01:04
|
Update of /cvsroot/mvideo/MVideo In directory sc8-pr-cvs1:/tmp/cvs-serv17333 Modified Files: ABOUT-NLS Log Message: Added import icon to film_view Index: ABOUT-NLS =================================================================== RCS file: /cvsroot/mvideo/MVideo/ABOUT-NLS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 Binary files /tmp/cvsb4HVOm and /tmp/cvsClF1uD differ |
From: Luca R. <lit...@us...> - 2003-06-01 10:59:41
|
Update of /cvsroot/mvideo/MVideo/pixmaps In directory sc8-pr-cvs1:/tmp/cvs-serv17254 Added Files: setup_arrow_up.png Log Message: Added import icon to film_view --- NEW FILE: setup_arrow_up.png --- PNG B ¾ |
From: Luca R. <lit...@us...> - 2003-06-01 10:22:25
|
Update of /cvsroot/mvideo/MVideo/src In directory sc8-pr-cvs1:/tmp/cvs-serv5546/src Modified Files: eximport.c film_view_cal.c film_view_cal.h film_view_func.c film_view_func.h film_view_wid.c film_view_wid.h generic_cal.c generic_funcs.c interface.c main.c menu_cal.c project_menu.c project_setup_win.c search_cal.c setup_wid.c title_cal.c trade.h Log Message: Added import icon to film_view Index: eximport.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/eximport.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- eximport.c 24 May 2003 11:51:18 -0000 1.18 +++ eximport.c 1 Jun 2003 10:22:21 -0000 1.19 @@ -42,6 +42,10 @@ #define EXPORT_VERSION 1 +/* + * Slezionare le icone per film_view in base allo stato corrente + */ + enum { EXPORT_MVIDEO, @@ -97,6 +101,7 @@ Film_info *film; int *pic; glong size; + gboolean running; }; @@ -126,8 +131,6 @@ void on_open_choose_file_button_cancel_clicked (GtkButton * button, gpointer user_data); GtkWidget *open_create_window (gint type, gboolean running, gzFile zfd); int on_open_treeview_list_right_click_event (GtkWidget * widget, GdkEventButton * event, gpointer user_data); -void on_open_import_activate (GtkMenuItem * togglebutton, gpointer user_data); -int on_open_import_click_event (GtkWidget * widget, GdkEventButton * event, gpointer user_data); gboolean open_win_quit (GtkWidget * widget, GdkEvent * event, gpointer user_data); gboolean open_win_quit_free (GtkTreeModel * model, GtkTreePath * path, GtkTreeIter * iter, gpointer user_data); @@ -586,39 +589,6 @@ return window; } -void -on_open_import_activate (GtkMenuItem * togglebutton, gpointer user_data) -{ - GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - GdkColor colors[2]; - z_off_t position; - gzFile zfd; - export_read_file *struct_file; - MVipc *mvipc_main; - - colors[0].red = 11000; - colors[0].green = 11000; - colors[0].blue = 65535; - colors[1].red = 41000; - colors[1].green = 51000; - colors[1].blue = 65535; - - zfd = gtk_object_get_data (GTK_OBJECT (user_data), "file"); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (user_data)); - gtk_tree_selection_get_selected (selection, &model, &iter); - gtk_tree_model_get (model, &iter, 1, &position, -1); - - gtk_list_store_set (GTK_LIST_STORE (model), &iter, 2, &colors[1], 3, &colors[0], -1); - - gzseek (zfd, position, SEEK_SET); - struct_file = open_read_format_file (zfd); - - mvipc_main = gtk_object_get_data (GTK_OBJECT (user_data), "mvipc_main"); - import_title (NULL, mvipc_main->main_list, struct_file, -1); -} - int on_open_treeview_list_right_click_event (GtkWidget * widget, GdkEventButton * event, gpointer user_data) { @@ -629,7 +599,9 @@ export_read_file *struct_file; z_off_t position; gzFile zfd; + MVipc *mvipc_main; + mvipc_main = user_data; zfd = gtk_object_get_data (GTK_OBJECT (widget), "file"); model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), event->x, event->y, &path, NULL, NULL, NULL) != 0) @@ -663,35 +635,11 @@ gzseek (zfd, position, SEEK_SET); struct_file = open_read_format_file (zfd); - gtk_film_view_new_show_all (TRUE, NULL, (gpointer)struct_file->film, NULL, iter); - } - if (event->type == GDK_BUTTON_PRESS && event->button == 3 && selection != NULL) - { - GtkWidget *popup_menu; - GtkWidget *mnu_1; - GtkWidget *image; - MVipc *mvipc_main; - - mvipc_main = user_data; - popup_menu = gtk_menu_new (); - mnu_1 = gtk_image_menu_item_new_with_mnemonic (_("Import")); - image = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU); - gtk_widget_show (image); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mnu_1), image); - gtk_menu_append (GTK_MENU (popup_menu), mnu_1); - - gtk_menu_item_deselect (GTK_MENU_ITEM (mnu_1)); - - if (project_opened == FALSE) - gtk_widget_set_sensitive (mnu_1, FALSE); - - gtk_widget_show_all (popup_menu); - gtk_menu_popup (GTK_MENU (popup_menu), NULL, NULL, NULL, NULL, event->button, event->time); - - gtk_object_set_data (GTK_OBJECT (widget), "mvipc_main", mvipc_main); - - gtk_signal_connect (GTK_OBJECT (mnu_1), "activate", GTK_SIGNAL_FUNC (on_open_import_activate), widget); + if (mvipc_main != NULL && mvipc_main->project_opened == TRUE) + gtk_film_view_new_show_all (TRUE, NULL, (gpointer)struct_file->film, NULL, iter, FILM_VIEW_ICON_FUNC_CLOSE | FILM_VIEW_ICON_FUNC_IMPORT | FILM_VIEW_ICON_FUNC_FULLSCREEN); + else + gtk_film_view_new_show_all (TRUE, NULL, (gpointer)struct_file->film, NULL, iter, FILM_VIEW_ICON_FUNC_CLOSE | FILM_VIEW_ICON_FUNC_FULLSCREEN); } return TRUE; @@ -729,7 +677,10 @@ struct_file = open_read_format_file (zfd); - gtk_film_view_new_show_all (running, NULL, (gpointer)struct_file->film, NULL, iter); + if (mvipc_main != NULL && mvipc_main->project_opened == TRUE) + gtk_film_view_new_show_all (running, NULL, (gpointer)struct_file->film, NULL, iter, FILM_VIEW_ICON_FUNC_CLOSE | FILM_VIEW_ICON_FUNC_IMPORT | FILM_VIEW_ICON_FUNC_FULLSCREEN); + else + gtk_film_view_new_show_all (running, NULL, (gpointer)struct_file->film, NULL, iter, FILM_VIEW_ICON_FUNC_CLOSE | FILM_VIEW_ICON_FUNC_FULLSCREEN); if (struct_file->pic != NULL) g_free (struct_file->pic); g_free (struct_file); @@ -1622,7 +1573,7 @@ gtk_widget_show (fileselection); } else - open_file (file, FALSE, NULL); + open_file (file, FALSE, mvipc_main); return; } Index: film_view_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_cal.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- film_view_cal.c 24 May 2003 11:51:18 -0000 1.2 +++ film_view_cal.c 1 Jun 2003 10:22:21 -0000 1.3 @@ -127,6 +127,14 @@ } gboolean + +gtk_film_view_icon_import (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) +{ + printf ("Importa\n"); + return FALSE; +} + +gboolean gtk_film_view_icon_remove (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { GdkColor colors[2]; Index: film_view_cal.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_cal.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- film_view_cal.h 24 May 2003 11:51:18 -0000 1.2 +++ film_view_cal.h 1 Jun 2003 10:22:21 -0000 1.3 @@ -27,5 +27,6 @@ gboolean gtk_film_view_icon_print (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); gboolean gtk_film_view_icon_print_preview (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); gboolean gtk_film_view_icon_export (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); +gboolean gtk_film_view_icon_import (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); gboolean gtk_film_view_icon_remove (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); gboolean gtk_film_view_icon_modify (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); Index: film_view_func.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_func.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- film_view_func.c 24 May 2003 11:51:19 -0000 1.2 +++ film_view_func.c 1 Jun 2003 10:22:21 -0000 1.3 @@ -25,16 +25,22 @@ #include <gtk/gtk.h> #include "film_view_wid.h" +#include "film_view_func.h" #include "db.h" #include "support.h" -GString *gtk_film_view_substiute_char (gchar *entries, gchar *old, gchar *new) +/* + * Gestire copertina passata per struct + */ + +GString * +gtk_film_view_substiute_char (gchar * entries, gchar * old, gchar * new) { int i; GString *ret; ret = NULL; - if (strchr (entries, (int)old[0]) == NULL) + if (strchr (entries, (int) old[0]) == NULL) ret = g_string_new (entries); else { @@ -62,7 +68,8 @@ return ret; } -void gtk_film_view_new_show_all (gboolean running, gchar *id, gpointer *film_info, GtkWidget *tree, GtkTreeIter iter) +void +gtk_film_view_new_show_all (gboolean running, gchar * id, gpointer * film_info, GtkWidget * tree, GtkTreeIter iter, gint icons) { GtkFilmView *film_view; GtkFilmViewString *film_string; @@ -74,28 +81,67 @@ Film_info *film; GdkPixbuf *pixbuf; GString *string; + gint c; if (film_info == NULL) film = db_get_film_info (id); else - film = (Film_info *)film_info; + film = (Film_info *) film_info; txt = g_strdup_printf ("MVideo: %s: %s", _("Film view"), film->film->title); film_view = gtk_film_view_new (running, txt, id, tree, iter); g_free (txt); gtk_film_view_add_top_title (film_view, film->film->title); - gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_CLOSE, NULL); - gtk_film_view_add_top_bar (film_view); - gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_PRINT, NULL); - gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_PRINT_PREVIEW, NULL); - gtk_film_view_add_top_bar (film_view); - gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_EXPORT, NULL); - gtk_film_view_add_top_bar (film_view); - gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_SETUP, NULL); - gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_REMOVE, NULL); - gtk_film_view_add_top_bar (film_view); - gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_FULLSCREEN, NULL); + + while (icons > 0) + { + if (icons >= FILM_VIEW_ICON_FUNC_CLOSE) + { + gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_CLOSE, NULL); + gtk_film_view_add_top_bar (film_view); + c = FILM_VIEW_ICON_FUNC_CLOSE; + } + else if (icons >= FILM_VIEW_ICON_FUNC_PRINT) + { + gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_PRINT, NULL); + gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_PRINT_PREVIEW, NULL); + gtk_film_view_add_top_bar (film_view); + c = FILM_VIEW_ICON_FUNC_PRINT; + } + else if (icons >= FILM_VIEW_ICON_FUNC_IMPORT) + { + gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_IMPORT, NULL); + gtk_film_view_add_top_bar (film_view); + c = FILM_VIEW_ICON_FUNC_IMPORT; + } + else if (icons >= FILM_VIEW_ICON_FUNC_EXPORT) + { + gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_EXPORT, NULL); + gtk_film_view_add_top_bar (film_view); + c = FILM_VIEW_ICON_FUNC_EXPORT; + } + else if (icons >= FILM_VIEW_ICON_FUNC_WORK) + { + gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_SETUP, NULL); + gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_REMOVE, NULL); + gtk_film_view_add_top_bar (film_view); + c = FILM_VIEW_ICON_FUNC_WORK; + } + else if (icons >= FILM_VIEW_ICON_FUNC_NAV) + { + gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_NEXT, NULL); + gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_PREV, NULL); + gtk_film_view_add_top_bar (film_view); + c = FILM_VIEW_ICON_FUNC_NAV; + } + else + { + gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_FULLSCREEN, NULL); + c = FILM_VIEW_ICON_FUNC_FULLSCREEN; + } + icons -= c; + } if (film->film->pic != NULL) pixbuf = gdk_pixbuf_new_from_file (film->film->pic, NULL); Index: film_view_func.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_func.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- film_view_func.h 24 May 2003 11:51:19 -0000 1.2 +++ film_view_func.h 1 Jun 2003 10:22:21 -0000 1.3 @@ -18,10 +18,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - * Gestire copertina passata per struct - * possibilità di settare quali icone attivare!! attenzione al tree = NULL!!! - */ +#define FILM_VIEW_ICON_FUNC_FULLSCREEN 1 +#define FILM_VIEW_ICON_FUNC_NAV 2 +#define FILM_VIEW_ICON_FUNC_WORK 4 +#define FILM_VIEW_ICON_FUNC_EXPORT 8 +#define FILM_VIEW_ICON_FUNC_IMPORT 16 +#define FILM_VIEW_ICON_FUNC_PRINT 32 +#define FILM_VIEW_ICON_FUNC_CLOSE 64 GString *gtk_film_view_substiute_char (gchar * entries, gchar *entry, gchar *new); -void gtk_film_view_new_show_all (gboolean running, gchar *id, gpointer *film_info, GtkWidget *tree, GtkTreeIter iter); +void gtk_film_view_new_show_all (gboolean running, gchar *id, gpointer *film_info, GtkWidget *tree, GtkTreeIter iter, gint icons); Index: film_view_wid.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_wid.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- film_view_wid.c 25 May 2003 19:11:52 -0000 1.4 +++ film_view_wid.c 1 Jun 2003 10:22:21 -0000 1.5 @@ -56,6 +56,8 @@ #define SPACE_BW_LINES 7 #define PIC_BOR_LEN 15 +/* Finire l'import -> gli passo già la struttura del film, controllare che non venga liberata */ + GtkWidget *gtk_film_view_icon_new (GtkFilmView * film_view, gchar * icon, gpointer func, gpointer data, gchar *tooltip); gboolean gtk_film_view_icon_enter_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); gboolean gtk_film_view_icon_leave_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); @@ -277,6 +279,9 @@ case (FILM_VIEW_ICON_EXPORT): eventbox = gtk_film_view_icon_new (film_view, "gtk-go-down", gtk_film_view_icon_export, film_view, _("Export")); break; + case (FILM_VIEW_ICON_IMPORT): + eventbox = gtk_film_view_icon_new (film_view, "gtk-go-up", gtk_film_view_icon_import, film_view, _("Import")); + break; case (FILM_VIEW_ICON_REMOVE): eventbox = gtk_film_view_icon_new (film_view, "gtk-remove", gtk_film_view_icon_remove, film_view, _("Delete")); break; @@ -341,7 +346,7 @@ gtk_fixed_put (GTK_FIXED (film_view->central), image, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 10, 15); - /* Top right */ + /* Top left */ viewport = gtk_viewport_new (NULL, NULL); gtk_widget_show (viewport); gtk_widget_modify_bg (viewport, 0, &black); @@ -362,7 +367,7 @@ gtk_widget_set_size_request (viewport, 1, PIC_BOR_LEN); gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 20, 9); - /* Top left */ + /* Top Right */ viewport = gtk_viewport_new (NULL, NULL); gtk_widget_show (viewport); gtk_widget_modify_bg (viewport, 0, &black); @@ -403,7 +408,7 @@ gtk_widget_modify_bg (viewport, 3, &black); gtk_widget_modify_bg (viewport, 4, &black); gtk_widget_set_size_request (viewport, 1, PIC_BOR_LEN); - gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 19, + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 20, film_view->pic_ysize - 5 - PIC_BOR_LEN); /* Bottom right */ Index: film_view_wid.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_wid.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- film_view_wid.h 25 May 2003 19:11:52 -0000 1.3 +++ film_view_wid.h 1 Jun 2003 10:22:21 -0000 1.4 @@ -32,6 +32,7 @@ FILM_VIEW_ICON_PRINT_PREVIEW, FILM_VIEW_ICON_SETUP, FILM_VIEW_ICON_EXPORT, + FILM_VIEW_ICON_IMPORT, FILM_VIEW_ICON_REMOVE, FILM_VIEW_ICON_NEXT, FILM_VIEW_ICON_PREV, Index: generic_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/generic_cal.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- generic_cal.c 6 Mar 2003 09:50:36 -0000 1.30 +++ generic_cal.c 1 Jun 2003 10:22:21 -0000 1.31 @@ -123,7 +123,7 @@ gtk_widget_destroy (GTK_WIDGET (group->misc_1)); if (update_database () != GTK_RESPONSE_ACCEPT) return; - project_opened = TRUE; + group->project_opened = TRUE; txt = g_strdup_printf ("%s: %s", _("Opened archive"), dat); add_statusbar (txt); g_free (txt); @@ -213,7 +213,7 @@ gtk_widget_set_sensitive (GTK_WIDGET (GTK_NOTEBOOK (group->notebook)), FALSE); gtk_widget_hide (group->menu_note); gtk_widget_hide (group->menu_title); - project_opened = FALSE; + group->project_opened = FALSE; } gtk_widget_destroy (GTK_WIDGET (group->misc_1)); } Index: generic_funcs.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/generic_funcs.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- generic_funcs.c 21 Feb 2003 11:08:02 -0000 1.15 +++ generic_funcs.c 1 Jun 2003 10:22:21 -0000 1.16 @@ -44,7 +44,10 @@ gboolean Main_quit (GtkWidget * widget, GdkEvent * event, gpointer user_data) { - if ( project_opened == TRUE ) + MVipc *group; + + group = user_data; + if ( group->project_opened == TRUE ) create_Choose_win (NULL, NULL, _("A project is open\nAre you sure to quit?"), (gpointer)gtk_main_quit, (gpointer)dummy_func); else Index: interface.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/interface.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- interface.c 6 May 2003 08:05:52 -0000 1.54 +++ interface.c 1 Jun 2003 10:22:21 -0000 1.55 @@ -1150,6 +1150,7 @@ mvipc_main = (MVipc *) malloc (sizeof (MVipc)); mvipc_main->query = (MVipc_query *) malloc (sizeof (MVipc_query)); + mvipc_main->project_opened = FALSE; Main_win = gtk_window_new (GTK_WINDOW_TOPLEVEL); title = g_strdup_printf ("MVideo - %s", VERSION); Index: main.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/main.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- main.c 23 May 2003 07:43:31 -0000 1.28 +++ main.c 1 Jun 2003 10:22:21 -0000 1.29 @@ -96,8 +96,6 @@ g_thread_init (NULL); audio_init (); - project_opened = FALSE; - /* use the nice PNG icon for all the windows */ icon = gdk_pixbuf_new_from_file (PACKAGE_PIXMAPS_DIR "/mvideo.png", NULL); if (icon) Index: menu_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/menu_cal.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- menu_cal.c 6 May 2003 08:05:52 -0000 1.44 +++ menu_cal.c 1 Jun 2003 10:22:21 -0000 1.45 @@ -75,7 +75,7 @@ { if (update_database () != GTK_RESPONSE_ACCEPT) return; - project_opened = TRUE; + group->project_opened = TRUE; txt = g_strdup_printf ("%s: %s", _("Opened archive"), options_global_read->def_dat); add_statusbar (txt); g_free (txt); @@ -94,9 +94,9 @@ void on_file_file_open_activate (GtkMenuItem * togglebutton, gpointer user_data) { - open_titles(NULL, user_data); + open_titles(NULL, user_data); - return; + return; } void Index: project_menu.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/project_menu.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project_menu.c 6 May 2003 08:05:53 -0000 1.6 +++ project_menu.c 1 Jun 2003 10:22:21 -0000 1.7 @@ -58,8 +58,10 @@ { GtkWidget *dia; /* GtkWidget *print;*/ + MVipc *group; - if (project_opened == FALSE) + group = user_data; + if (group->project_opened == FALSE) return; add_statusbar (_("Print")); dia = create_Dialog_win ("Print\n\nFunction partially implemented", DIALOG_WARNING); @@ -73,8 +75,10 @@ { GtkWidget *dia; /* GtkWidget *print;*/ + MVipc *group; - if (project_opened == FALSE) + group = user_data; + if (group->project_opened == FALSE) return; add_statusbar (_("Preview")); dia = create_Dialog_win ("Preview\n\nFunction partially implemented", DIALOG_WARNING); @@ -101,9 +105,9 @@ MVipc *group; group = user_data; - if (project_opened == FALSE) + if (group->project_opened == FALSE) return; - project_opened = FALSE; + group->project_opened = FALSE; if (db_disconnect ()) { gtk_notebook_set_current_page (GTK_NOTEBOOK (group->notebook), 0); Index: project_setup_win.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/project_setup_win.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- project_setup_win.c 23 May 2003 07:43:31 -0000 1.7 +++ project_setup_win.c 1 Jun 2003 10:22:21 -0000 1.8 @@ -160,8 +160,10 @@ { GtkSetup *setup; Project_ipc *project_ipc; + MVipc *group; - if (project_opened == FALSE) + group = user_data; + if (group->project_opened == FALSE) return; project_ipc = (Project_ipc *) g_malloc (sizeof (Project_ipc)); Index: search_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/search_cal.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- search_cal.c 24 May 2003 11:51:19 -0000 1.24 +++ search_cal.c 1 Jun 2003 10:22:21 -0000 1.25 @@ -1074,7 +1074,7 @@ } else if (event->type == GDK_2BUTTON_PRESS && event->button == 1) { - gtk_film_view_new_show_all (TRUE, id, NULL, widget, iter); + gtk_film_view_new_show_all (TRUE, id, NULL, widget, iter, FILM_VIEW_ICON_FUNC_CLOSE | FILM_VIEW_ICON_FUNC_PRINT | FILM_VIEW_ICON_FUNC_WORK | FILM_VIEW_ICON_FUNC_FULLSCREEN); } if (id != NULL) Index: setup_wid.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/setup_wid.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- setup_wid.c 23 May 2003 07:45:22 -0000 1.1 +++ setup_wid.c 1 Jun 2003 10:22:22 -0000 1.2 @@ -18,11 +18,16 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include <gtk/gtk.h> #include "setup_wid.h" -#define SETUP_ARROW_DOWN "/home/little_rock/mvideo/MVideo/pixmaps/setup_arrow_down.png" +#define SETUP_ARROW_DOWN PACKAGE_PIXMAPS_DIR "/setup_arrow_down.png" +#define SETUP_ARROW_UP PACKAGE_PIXMAPS_DIR "/setup_arrow_up.png" #define BLINK_TIMES 15 #define BLINK_STEP 800 @@ -160,11 +165,15 @@ { gtk_widget_hide_all (setup_text->vbox); setup_text->active = FALSE; + gtk_image_set_from_file (setup_text->strob_left, SETUP_ARROW_DOWN); + gtk_image_set_from_file (setup_text->strob_right, SETUP_ARROW_DOWN); } else { gtk_widget_show_all (setup_text->vbox); setup_text->active = TRUE; + gtk_image_set_from_file (setup_text->strob_left, SETUP_ARROW_UP); + gtk_image_set_from_file (setup_text->strob_right, SETUP_ARROW_UP); } return FALSE; Index: title_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/title_cal.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- title_cal.c 24 May 2003 11:51:19 -0000 1.12 +++ title_cal.c 1 Jun 2003 10:22:22 -0000 1.13 @@ -275,7 +275,7 @@ } else if (event->type == GDK_2BUTTON_PRESS && event->button == 1 && selection != NULL) { - gtk_film_view_new_show_all (TRUE, id, NULL, widget, iter); + gtk_film_view_new_show_all (TRUE, id, NULL, widget, iter, FILM_VIEW_ICON_FUNC_CLOSE | FILM_VIEW_ICON_FUNC_EXPORT | FILM_VIEW_ICON_FUNC_PRINT | FILM_VIEW_ICON_FUNC_WORK | FILM_VIEW_ICON_FUNC_FULLSCREEN); } if (id != NULL) Index: trade.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/trade.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- trade.h 17 May 2003 13:29:02 -0000 1.32 +++ trade.h 1 Jun 2003 10:22:22 -0000 1.33 @@ -75,6 +75,7 @@ GtkWidget *misc_2; gchar *txt; + gboolean project_opened; }; struct _Grouped_wid_print @@ -123,4 +124,3 @@ GtkWidget *status_bar; GtkWidget *Sort_button; gint context_id; -gboolean project_opened; |
From: Luca R. <lit...@us...> - 2003-06-01 10:22:24
|
Update of /cvsroot/mvideo/MVideo In directory sc8-pr-cvs1:/tmp/cvs-serv5546 Modified Files: ABOUT-NLS ChangeLog TODO Log Message: Added import icon to film_view Index: ABOUT-NLS =================================================================== RCS file: /cvsroot/mvideo/MVideo/ABOUT-NLS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 Binary files /tmp/cvsV2Aiqv and /tmp/cvsO1c6IU differ Index: ChangeLog =================================================================== RCS file: /cvsroot/mvideo/MVideo/ChangeLog,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- ChangeLog 23 May 2003 07:43:30 -0000 1.58 +++ ChangeLog 1 Jun 2003 10:22:20 -0000 1.59 @@ -8,7 +8,7 @@ * Setup: major ^ New element: container * Core: major - ^ Totally rewritten setup and film_view, now they are like widgets + ^ Totally rewritten setup and film_view, now they are a sort of widgets 0.4.0 Berserk (6/05/2003) ========================= Index: TODO =================================================================== RCS file: /cvsroot/mvideo/MVideo/TODO,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- TODO 17 May 2003 13:29:01 -0000 1.59 +++ TODO 1 Jun 2003 10:22:20 -0000 1.60 @@ -7,11 +7,7 @@ TODO for 0.4.2 ============== * Ability to select more than one entry in all lists - -TODO for 0.4.3 -============== - * Let user choose if changes made in seach windows should be reflected in - main list, this will affect memory usage, at least right now + * Reflect changes made in seach windows in main list TODO for 0.5.0 ============== |
From: Luca R. <lit...@us...> - 2003-06-01 10:22:24
|
Update of /cvsroot/mvideo/MVideo/pixmaps In directory sc8-pr-cvs1:/tmp/cvs-serv5546/pixmaps Modified Files: Makefile.am Log Message: Added import icon to film_view Index: Makefile.am =================================================================== RCS file: /cvsroot/mvideo/MVideo/pixmaps/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Makefile.am 17 May 2003 13:29:01 -0000 1.13 +++ Makefile.am 1 Jun 2003 10:22:21 -0000 1.14 @@ -12,6 +12,7 @@ printer_icon.png\ auto_comp.png\ setup_arrow_down.png\ + setup_arrow_up.png\ export_icon.png\ sound_icon.png |
From: Luca R. <lit...@us...> - 2003-05-25 19:11:57
|
Update of /cvsroot/mvideo/MVideo/src In directory sc8-pr-cvs1:/tmp/cvs-serv31181/src Modified Files: film_view_wid.c film_view_wid.h Log Message: Added tooltips to film-view Index: film_view_wid.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_wid.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- film_view_wid.c 25 May 2003 12:11:44 -0000 1.3 +++ film_view_wid.c 25 May 2003 19:11:52 -0000 1.4 @@ -22,6 +22,25 @@ # include <config.h> #endif +#ifdef ENABLE_NLS +# include <libintl.h> +# undef _ +# define _(String) dgettext (PACKAGE, String) +# ifdef gettext_noop +# define N_(String) gettext_noop (String) +# else +# define N_(String) (String) +# endif +#else +# define textdomain(String) (String) +# define gettext(String) (String) +# define dgettext(Domain,Message) (Message) +# define dcgettext(Domain,Message,Type) (Message) +# define bindtextdomain(Domain,Directory) (Domain) +# define _(String) (String) +# define N_(String) (String) +#endif + #include <gtk/gtk.h> #include "film_view_wid.h" @@ -37,13 +56,13 @@ #define SPACE_BW_LINES 7 #define PIC_BOR_LEN 15 -GtkWidget *gtk_film_view_icon_new (gchar * icon, gpointer func, gpointer data, GtkWidget * window); +GtkWidget *gtk_film_view_icon_new (GtkFilmView * film_view, gchar * icon, gpointer func, gpointer data, gchar *tooltip); gboolean gtk_film_view_icon_enter_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); gboolean gtk_film_view_icon_leave_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); -gboolean gtk_film_view_quit (GtkWidget *widget, GdkEvent * event, gpointer user_data); +gboolean gtk_film_view_quit (GtkWidget * widget, GdkEvent * event, gpointer user_data); gboolean -gtk_film_view_quit (GtkWidget *widget, GdkEvent * event, gpointer user_data) +gtk_film_view_quit (GtkWidget * widget, GdkEvent * event, gpointer user_data) { GtkFilmView *film_view; gboolean running; @@ -86,7 +105,7 @@ } GtkWidget * -gtk_film_view_icon_new (gchar * icon, gpointer func, gpointer data, GtkWidget * window) +gtk_film_view_icon_new (GtkFilmView * film_view, gchar * icon, gpointer func, gpointer data, gchar *tooltip) { GtkWidget *image; GtkWidget *eventbox; @@ -98,22 +117,21 @@ gtk_widget_modify_bg (eventbox, 2, &grey); gtk_widget_modify_bg (eventbox, 3, &grey); gtk_widget_modify_bg (eventbox, 4, &grey); - g_signal_connect (eventbox, "enter_notify_event", G_CALLBACK (gtk_film_view_icon_enter_event), window); - g_signal_connect (eventbox, "leave_notify_event", G_CALLBACK (gtk_film_view_icon_leave_event), window); + g_signal_connect (eventbox, "enter_notify_event", G_CALLBACK (gtk_film_view_icon_enter_event), film_view->window); + g_signal_connect (eventbox, "leave_notify_event", G_CALLBACK (gtk_film_view_icon_leave_event), film_view->window); if (func != NULL) g_signal_connect (eventbox, "button_press_event", G_CALLBACK (func), data); image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (eventbox), image); gtk_widget_show (image); + gtk_tooltips_set_tip (film_view->tooltips, eventbox, tooltip, NULL); + return eventbox; } - - - GtkFilmView * -gtk_film_view_new (gboolean running, gchar * title, gchar * id, GtkWidget *tree, GtkTreeIter iter) +gtk_film_view_new (gboolean running, gchar * title, gchar * id, GtkWidget * tree, GtkTreeIter iter) { GtkWidget *window; GtkWidget *scrolledwindow; @@ -123,6 +141,7 @@ GdkColor white = { 0, 65535, 65535, 65535 }; GdkColor grey = { 0, 55535, 55535, 55535 }; GtkWidget *top; + GtkTooltips *tooltips; GtkFilmView *film_view; film_view = (GtkFilmView *) g_malloc (sizeof (GtkFilmView)); @@ -178,11 +197,13 @@ film_view->icon_xpos = film_view->max_x - 10; film_view->central_current_y = 5; film_view->running = running; - film_view->id = g_strdup(id); - film_view->title = g_strdup(title); + film_view->id = g_strdup (id); + film_view->title = g_strdup (title); film_view->tree = tree; film_view->iter = iter; film_view->text_fs_grow = NULL; + film_view->tooltips = gtk_tooltips_new (); + gtk_object_set_data (GTK_OBJECT (film_view->window), "tooltips", film_view->tooltips); return film_view; } @@ -241,35 +262,35 @@ switch (type) { - case (FILM_VIEW_ICON_CLOSE): - eventbox = gtk_film_view_icon_new ("gtk-close", gtk_film_view_icon_close, film_view, film_view->window); - break; - case (FILM_VIEW_ICON_PRINT): - eventbox = gtk_film_view_icon_new ("gtk-print", gtk_film_view_icon_print, NULL, film_view->window); - break; - case (FILM_VIEW_ICON_PRINT_PREVIEW): - eventbox = gtk_film_view_icon_new ("gtk-print-preview", gtk_film_view_icon_print_preview, NULL, film_view->window); - break; - case (FILM_VIEW_ICON_SETUP): - eventbox = gtk_film_view_icon_new ("gtk-properties", gtk_film_view_icon_modify, film_view, film_view->window); - break; - case (FILM_VIEW_ICON_EXPORT): - eventbox = gtk_film_view_icon_new ("gtk-go-down", gtk_film_view_icon_export, film_view, film_view->window); - break; - case (FILM_VIEW_ICON_REMOVE): - eventbox = gtk_film_view_icon_new ("gtk-remove", gtk_film_view_icon_remove, film_view, film_view->window); - break; - case (FILM_VIEW_ICON_NEXT): - eventbox = gtk_film_view_icon_new ("gtk-go-forward", NULL, NULL, film_view->window); - break; - case (FILM_VIEW_ICON_PREV): - eventbox = gtk_film_view_icon_new ("gtk-go-back", NULL, NULL, film_view->window); - break; - case (FILM_VIEW_ICON_FULLSCREEN): - eventbox = gtk_film_view_icon_new ("gtk-zoom-fit", gtk_film_view_icon_go_fullscreen, film_view, film_view->window); - break; - default: - return FALSE; + case (FILM_VIEW_ICON_CLOSE): + eventbox = gtk_film_view_icon_new (film_view, "gtk-close", gtk_film_view_icon_close, film_view, _("Close")); + break; + case (FILM_VIEW_ICON_PRINT): + eventbox = gtk_film_view_icon_new (film_view, "gtk-print", gtk_film_view_icon_print, film_view, _("Print")); + break; + case (FILM_VIEW_ICON_PRINT_PREVIEW): + eventbox = gtk_film_view_icon_new (film_view, "gtk-print-preview", gtk_film_view_icon_print_preview, film_view, _("Print preview")); + break; + case (FILM_VIEW_ICON_SETUP): + eventbox = gtk_film_view_icon_new (film_view, "gtk-properties", gtk_film_view_icon_modify, film_view, _("Modify")); + break; + case (FILM_VIEW_ICON_EXPORT): + eventbox = gtk_film_view_icon_new (film_view, "gtk-go-down", gtk_film_view_icon_export, film_view, _("Export")); + break; + case (FILM_VIEW_ICON_REMOVE): + eventbox = gtk_film_view_icon_new (film_view, "gtk-remove", gtk_film_view_icon_remove, film_view, _("Delete")); + break; + case (FILM_VIEW_ICON_NEXT): + eventbox = gtk_film_view_icon_new (film_view, "gtk-go-forward", NULL, film_view, _("Next")); + break; + case (FILM_VIEW_ICON_PREV): + eventbox = gtk_film_view_icon_new (film_view, "gtk-go-back", NULL, film_view, _("Previous")); + break; + case (FILM_VIEW_ICON_FULLSCREEN): + eventbox = gtk_film_view_icon_new (film_view, "gtk-zoom-fit", gtk_film_view_icon_go_fullscreen, film_view, _("Fullscreen")); + break; + default: + return FALSE; } film_view->icon_xpos -= 28; @@ -371,7 +392,8 @@ gtk_widget_modify_bg (viewport, 3, &black); gtk_widget_modify_bg (viewport, 4, &black); gtk_widget_set_size_request (viewport, PIC_BOR_LEN, 1); - gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 15, film_view->pic_ysize - 1); + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 15, + film_view->pic_ysize - 1); viewport = gtk_viewport_new (NULL, NULL); gtk_widget_show (viewport); @@ -381,7 +403,8 @@ gtk_widget_modify_bg (viewport, 3, &black); gtk_widget_modify_bg (viewport, 4, &black); gtk_widget_set_size_request (viewport, 1, PIC_BOR_LEN); - gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 19, film_view->pic_ysize - 5 - PIC_BOR_LEN); + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 19, + film_view->pic_ysize - 5 - PIC_BOR_LEN); /* Bottom right */ viewport = gtk_viewport_new (NULL, NULL); @@ -402,7 +425,8 @@ gtk_widget_modify_bg (viewport, 3, &black); gtk_widget_modify_bg (viewport, 4, &black); gtk_widget_set_size_request (viewport, 1, PIC_BOR_LEN); - gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - SPACE_WM_BORDER_WIDTH, film_view->pic_ysize - 5 - PIC_BOR_LEN); + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - SPACE_WM_BORDER_WIDTH, + film_view->pic_ysize - 5 - PIC_BOR_LEN); } @@ -686,7 +710,9 @@ return; } -void gtk_film_view_add_hline (GtkFilmView *film_view) + +void +gtk_film_view_add_hline (GtkFilmView * film_view) { GtkWidget *viewport; GdkColor black = { 0, 0, 0, 0 }; Index: film_view_wid.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_wid.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- film_view_wid.h 24 May 2003 11:51:19 -0000 1.2 +++ film_view_wid.h 25 May 2003 19:11:52 -0000 1.3 @@ -20,7 +20,6 @@ /* * Migliorare la gestione delle dimensioni - * Aggiungere tooltips */ typedef struct _GtkFilmView GtkFilmView; @@ -43,6 +42,8 @@ GtkWidget *top; GtkWidget *window; GtkWidget *central; + + GtkTooltips *tooltips; GtkWidget *text_fs_grow; gint text_fs_size_y; |
From: Luca R. <lit...@us...> - 2003-05-25 19:11:57
|
Update of /cvsroot/mvideo/MVideo/po In directory sc8-pr-cvs1:/tmp/cvs-serv31181/po Modified Files: it.po mvideo.pot Log Message: Added tooltips to film-view Index: it.po =================================================================== RCS file: /cvsroot/mvideo/MVideo/po/it.po,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- it.po 24 May 2003 11:51:18 -0000 1.55 +++ it.po 25 May 2003 19:11:51 -0000 1.56 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: MVideo\n" -"POT-Creation-Date: 2003-05-23 09:56+0200\n" -"PO-Revision-Date: 2003-05-23 09:56--100\n" +"POT-Creation-Date: 2003-05-25 21:13+0200\n" +"PO-Revision-Date: 2003-05-25 21:14--100\n" "Last-Translator: Luca Roccia <lit...@us...>\n" "Language-Team: Italian <lit...@us...>\n" "MIME-Version: 1.0\n" @@ -88,14 +88,14 @@ #: src/callbacks.c:56 src/callbacks.c:71 src/db.c:635 src/select_win.c:296 #: src/interface.c:327 src/interface.c:375 src/interface.c:738 -#: src/setup_win.c:398 src/search_cal.c:818 src/eximport.c:1413 +#: src/setup_win.c:398 src/search_cal.c:818 src/eximport.c:1414 #: src/project_setup_win.c:124 msgid "Genre" msgstr "Genere" #: src/callbacks.c:58 src/callbacks.c:73 src/db.c:642 src/select_win.c:180 #: src/interface.c:328 src/interface.c:376 src/interface.c:744 -#: src/setup_win.c:363 src/search_cal.c:788 src/eximport.c:1403 +#: src/setup_win.c:363 src/search_cal.c:788 src/eximport.c:1404 msgid "Director" msgstr "Regista" @@ -117,7 +117,7 @@ #. End notebook #: src/generic_win.c:174 src/select_win.c:554 src/print_win.c:129 -#: src/first_setup_win.c:371 src/project_menu.c:208 +#: src/first_setup_win.c:371 src/project_menu.c:208 src/film_view_wid.c:266 msgid "Close" msgstr "Chiudi" @@ -130,16 +130,16 @@ msgid "Open" msgstr "Apri" -#: src/generic_win.c:242 +#: src/generic_win.c:242 src/film_view_wid.c:281 msgid "Delete" msgstr "Cancella" -#: src/generic_win.c:322 src/eximport.c:831 +#: src/generic_win.c:322 src/eximport.c:832 msgid "Choose" msgstr "Scegli" -#: src/generic_win.c:374 src/eximport.c:1460 src/eximport.c:1561 -#: src/eximport.c:1598 +#: src/generic_win.c:374 src/eximport.c:1461 src/eximport.c:1562 +#: src/eximport.c:1599 msgid "Select file" msgstr "Scegli un file" @@ -249,7 +249,7 @@ #: src/db.c:648 src/select_win.c:339 src/interface.c:329 src/interface.c:377 #: src/interface.c:732 src/setup_win.c:384 src/search_cal.c:806 -#: src/eximport.c:1409 +#: src/eximport.c:1410 msgid "Year" msgstr "Anno" @@ -290,7 +290,7 @@ msgstr "Films" #: src/db.c:910 src/select_win.c:487 src/select_win.c:507 src/interface.c:188 -#: src/interface.c:623 src/setup_win.c:468 src/eximport.c:1435 +#: src/interface.c:623 src/setup_win.c:468 src/eximport.c:1436 msgid "Notes" msgstr "Note" @@ -360,6 +360,7 @@ #: src/select_win.c:101 src/select_win.c:594 src/interface.c:581 #: src/notes_cal.c:55 src/search_cal.c:1036 src/title_cal.c:303 +#: src/film_view_wid.c:275 msgid "Modify" msgstr "Modifica" @@ -368,27 +369,27 @@ msgstr "MVideo: Aggiungi" #: src/select_win.c:158 src/interface.c:726 src/setup_win.c:356 -#: src/search_cal.c:782 src/eximport.c:1401 +#: src/search_cal.c:782 src/eximport.c:1402 msgid "Original title" msgstr "Titolo originale" #: src/select_win.c:197 src/interface.c:756 src/setup_win.c:370 -#: src/search_cal.c:794 src/eximport.c:1405 +#: src/search_cal.c:794 src/eximport.c:1406 msgid "Producer" msgstr "Produttore" #: src/select_win.c:209 src/interface.c:750 src/setup_win.c:377 -#: src/search_cal.c:800 src/eximport.c:1407 +#: src/search_cal.c:800 src/eximport.c:1408 msgid "Actors" msgstr "Attori" #: src/select_win.c:231 src/interface.c:762 src/setup_win.c:405 -#: src/search_cal.c:842 src/eximport.c:1415 +#: src/search_cal.c:842 src/eximport.c:1416 msgid "Distributor" msgstr "Distributore" #: src/select_win.c:248 src/interface.c:768 src/setup_win.c:454 -#: src/search_cal.c:866 src/eximport.c:1430 +#: src/search_cal.c:866 src/eximport.c:1431 msgid "Stars" msgstr "Stelle" @@ -402,7 +403,7 @@ msgstr "Lingua" #: src/select_win.c:322 src/interface.c:814 src/setup_win.c:412 -#: src/search_cal.c:848 src/eximport.c:1417 +#: src/search_cal.c:848 src/eximport.c:1418 msgid "Country" msgstr "Nazione" @@ -411,31 +412,31 @@ msgstr "Lascaite \"1900\" per non cercare l'anno" #: src/select_win.c:359 src/interface.c:802 src/setup_win.c:391 -#: src/search_cal.c:812 src/eximport.c:1411 +#: src/search_cal.c:812 src/eximport.c:1412 msgid "Time" msgstr "Tempo" #: src/select_win.c:381 src/interface.c:774 src/search_cal.c:824 -#: src/eximport.c:1420 src/project_setup_win.c:128 +#: src/eximport.c:1421 src/project_setup_win.c:128 msgid "Format" msgstr "Formato" #: src/select_win.c:403 src/interface.c:904 src/search_cal.c:830 -#: src/eximport.c:1424 src/project_setup_win.c:132 +#: src/eximport.c:1425 src/project_setup_win.c:132 msgid "Audio" msgstr "Audio" #: src/select_win.c:425 src/interface.c:934 src/setup_win.c:440 -#: src/search_cal.c:836 src/eximport.c:1426 +#: src/search_cal.c:836 src/eximport.c:1427 msgid "Quality" msgstr "Qualità " #: src/select_win.c:442 src/interface.c:921 src/setup_win.c:447 -#: src/search_cal.c:854 src/eximport.c:1428 +#: src/search_cal.c:854 src/eximport.c:1429 msgid "CDs" msgstr "CD" -#: src/select_win.c:467 src/setup_win.c:461 src/eximport.c:1433 +#: src/select_win.c:467 src/setup_win.c:461 src/eximport.c:1434 msgid "Story" msgstr "Trama" @@ -568,13 +569,14 @@ #. GtkWidget *print; #: src/print_win.c:92 src/print_win.c:100 src/search_cal.c:1212 -#: src/title_cal.c:199 src/project_menu.c:64 src/film_view_cal.c:165 +#: src/title_cal.c:199 src/project_menu.c:64 src/film_view_wid.c:269 +#: src/film_view_cal.c:158 msgid "Print" msgstr "Stampa" #. GtkWidget *print; #: src/print_win.c:108 src/print_win.c:116 src/search_cal.c:1222 -#: src/title_cal.c:212 src/project_menu.c:79 src/film_view_cal.c:176 +#: src/title_cal.c:212 src/project_menu.c:79 src/film_view_cal.c:170 msgid "Preview" msgstr "Anteprima" @@ -715,7 +717,7 @@ msgid "First setup guide" msgstr "Guida al primo setup" -#: src/first_setup_win.c:267 +#: src/first_setup_win.c:267 src/film_view_wid.c:284 msgid "Next" msgstr "Succ." @@ -876,7 +878,7 @@ msgstr "Avanzato" #: src/setup_win.c:636 src/search_cal.c:1043 src/title_cal.c:310 -#: src/eximport.c:1532 src/project_menu.c:163 +#: src/eximport.c:1533 src/project_menu.c:163 src/film_view_wid.c:278 msgid "Export" msgstr "Esporta" @@ -897,7 +899,7 @@ "Certi di uscire?" #: src/notes_cal.c:141 src/search_cal.c:1155 src/title_cal.c:98 -#: src/film_view_cal.c:150 +#: src/film_view_cal.c:145 msgid "Sure to delete" msgstr "Certi di cancellare" @@ -981,7 +983,7 @@ msgid "Deleted film" msgstr "Cancellato il film" -#: src/search_cal.c:1184 src/title_cal.c:165 src/film_view_cal.c:111 +#: src/search_cal.c:1184 src/title_cal.c:165 src/film_view_cal.c:107 msgid "Modify film" msgstr "Modificato il film" @@ -1069,51 +1071,51 @@ msgid "Importing" msgstr "In importazione" -#: src/eximport.c:677 src/eximport.c:831 src/project_menu.c:172 +#: src/eximport.c:677 src/eximport.c:832 src/project_menu.c:172 msgid "Import" msgstr "Importa" -#: src/eximport.c:714 src/eximport.c:908 +#: src/eximport.c:715 src/eximport.c:909 msgid "Cannot open file" msgstr "Impossibile aprire il file" -#: src/eximport.c:844 +#: src/eximport.c:845 msgid "Poster yet owned" msgstr "Copertina già posseduta" -#: src/eximport.c:850 +#: src/eximport.c:851 msgid "Overwrite" msgstr "Sovrascivi" -#: src/eximport.c:852 +#: src/eximport.c:853 msgid "Rename" msgstr "Rinomina" -#: src/eximport.c:854 +#: src/eximport.c:855 msgid "No image" msgstr "Nessuna immagine" -#: src/eximport.c:856 +#: src/eximport.c:857 msgid "Use local" msgstr "Usa la locale" -#: src/eximport.c:863 +#: src/eximport.c:864 msgid "Don't ask any more" msgstr "Non chiedere più" -#: src/eximport.c:921 +#: src/eximport.c:922 msgid "Archive version not supported or not an MVideo archive" msgstr "Versione dell'archivio non supportata oppure non un archiov di MVideo" -#: src/eximport.c:985 src/eximport.c:995 +#: src/eximport.c:986 src/eximport.c:996 msgid "Export list" msgstr "Esporta lista" -#: src/eximport.c:985 +#: src/eximport.c:986 msgid "Progress bar" msgstr "Barra di progresso" -#: src/eximport.c:1039 +#: src/eximport.c:1040 msgid "" "File exist\n" "Do you want to overwrite?" @@ -1121,23 +1123,23 @@ "Il file esiste\n" "Vuoi sovrascriverlo" -#: src/eximport.c:1068 src/eximport.c:1153 +#: src/eximport.c:1069 src/eximport.c:1154 msgid "Cannot write to file" msgstr "Impossibile scrivere in quel file" -#: src/eximport.c:1115 src/eximport.c:1190 +#: src/eximport.c:1116 src/eximport.c:1191 msgid "Added title" msgstr "Aggiungi titolo" -#: src/eximport.c:1422 +#: src/eximport.c:1423 msgid "Lang" msgstr "Lingua" -#: src/eximport.c:1486 +#: src/eximport.c:1487 msgid "Save file like:" msgstr "Salva il file come:" -#: src/eximport.c:1540 +#: src/eximport.c:1541 msgid "Export all" msgstr "Esporta tutto" @@ -1181,3 +1183,15 @@ #: src/project_setup_cal.c:76 msgid "There is another entry with that name" msgstr "C'è già un elemento con quel nome" + +#: src/film_view_wid.c:272 +msgid "Print preview" +msgstr "Anteprima di stampa" + +#: src/film_view_wid.c:287 +msgid "Previous" +msgstr "Precedente" + +#: src/film_view_wid.c:290 +msgid "Fullscreen" +msgstr "Pieno schermo" Index: mvideo.pot =================================================================== RCS file: /cvsroot/mvideo/MVideo/po/mvideo.pot,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- mvideo.pot 24 May 2003 11:51:18 -0000 1.52 +++ mvideo.pot 25 May 2003 19:11:52 -0000 1.53 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-05-23 09:56+0200\n" +"POT-Creation-Date: 2003-05-25 21:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -84,14 +84,14 @@ #: src/callbacks.c:56 src/callbacks.c:71 src/db.c:635 src/select_win.c:296 #: src/interface.c:327 src/interface.c:375 src/interface.c:738 -#: src/setup_win.c:398 src/search_cal.c:818 src/eximport.c:1413 +#: src/setup_win.c:398 src/search_cal.c:818 src/eximport.c:1414 #: src/project_setup_win.c:124 msgid "Genre" msgstr "" #: src/callbacks.c:58 src/callbacks.c:73 src/db.c:642 src/select_win.c:180 #: src/interface.c:328 src/interface.c:376 src/interface.c:744 -#: src/setup_win.c:363 src/search_cal.c:788 src/eximport.c:1403 +#: src/setup_win.c:363 src/search_cal.c:788 src/eximport.c:1404 msgid "Director" msgstr "" @@ -113,7 +113,7 @@ #. End notebook #: src/generic_win.c:174 src/select_win.c:554 src/print_win.c:129 -#: src/first_setup_win.c:371 src/project_menu.c:208 +#: src/first_setup_win.c:371 src/project_menu.c:208 src/film_view_wid.c:266 msgid "Close" msgstr "" @@ -126,16 +126,16 @@ msgid "Open" msgstr "" -#: src/generic_win.c:242 +#: src/generic_win.c:242 src/film_view_wid.c:281 msgid "Delete" msgstr "" -#: src/generic_win.c:322 src/eximport.c:831 +#: src/generic_win.c:322 src/eximport.c:832 msgid "Choose" msgstr "" -#: src/generic_win.c:374 src/eximport.c:1460 src/eximport.c:1561 -#: src/eximport.c:1598 +#: src/generic_win.c:374 src/eximport.c:1461 src/eximport.c:1562 +#: src/eximport.c:1599 msgid "Select file" msgstr "" @@ -237,7 +237,7 @@ #: src/db.c:648 src/select_win.c:339 src/interface.c:329 src/interface.c:377 #: src/interface.c:732 src/setup_win.c:384 src/search_cal.c:806 -#: src/eximport.c:1409 +#: src/eximport.c:1410 msgid "Year" msgstr "" @@ -278,7 +278,7 @@ msgstr "" #: src/db.c:910 src/select_win.c:487 src/select_win.c:507 src/interface.c:188 -#: src/interface.c:623 src/setup_win.c:468 src/eximport.c:1435 +#: src/interface.c:623 src/setup_win.c:468 src/eximport.c:1436 msgid "Notes" msgstr "" @@ -348,6 +348,7 @@ #: src/select_win.c:101 src/select_win.c:594 src/interface.c:581 #: src/notes_cal.c:55 src/search_cal.c:1036 src/title_cal.c:303 +#: src/film_view_wid.c:275 msgid "Modify" msgstr "" @@ -356,27 +357,27 @@ msgstr "" #: src/select_win.c:158 src/interface.c:726 src/setup_win.c:356 -#: src/search_cal.c:782 src/eximport.c:1401 +#: src/search_cal.c:782 src/eximport.c:1402 msgid "Original title" msgstr "" #: src/select_win.c:197 src/interface.c:756 src/setup_win.c:370 -#: src/search_cal.c:794 src/eximport.c:1405 +#: src/search_cal.c:794 src/eximport.c:1406 msgid "Producer" msgstr "" #: src/select_win.c:209 src/interface.c:750 src/setup_win.c:377 -#: src/search_cal.c:800 src/eximport.c:1407 +#: src/search_cal.c:800 src/eximport.c:1408 msgid "Actors" msgstr "" #: src/select_win.c:231 src/interface.c:762 src/setup_win.c:405 -#: src/search_cal.c:842 src/eximport.c:1415 +#: src/search_cal.c:842 src/eximport.c:1416 msgid "Distributor" msgstr "" #: src/select_win.c:248 src/interface.c:768 src/setup_win.c:454 -#: src/search_cal.c:866 src/eximport.c:1430 +#: src/search_cal.c:866 src/eximport.c:1431 msgid "Stars" msgstr "" @@ -390,7 +391,7 @@ msgstr "" #: src/select_win.c:322 src/interface.c:814 src/setup_win.c:412 -#: src/search_cal.c:848 src/eximport.c:1417 +#: src/search_cal.c:848 src/eximport.c:1418 msgid "Country" msgstr "" @@ -399,31 +400,31 @@ msgstr "" #: src/select_win.c:359 src/interface.c:802 src/setup_win.c:391 -#: src/search_cal.c:812 src/eximport.c:1411 +#: src/search_cal.c:812 src/eximport.c:1412 msgid "Time" msgstr "" #: src/select_win.c:381 src/interface.c:774 src/search_cal.c:824 -#: src/eximport.c:1420 src/project_setup_win.c:128 +#: src/eximport.c:1421 src/project_setup_win.c:128 msgid "Format" msgstr "" #: src/select_win.c:403 src/interface.c:904 src/search_cal.c:830 -#: src/eximport.c:1424 src/project_setup_win.c:132 +#: src/eximport.c:1425 src/project_setup_win.c:132 msgid "Audio" msgstr "" #: src/select_win.c:425 src/interface.c:934 src/setup_win.c:440 -#: src/search_cal.c:836 src/eximport.c:1426 +#: src/search_cal.c:836 src/eximport.c:1427 msgid "Quality" msgstr "" #: src/select_win.c:442 src/interface.c:921 src/setup_win.c:447 -#: src/search_cal.c:854 src/eximport.c:1428 +#: src/search_cal.c:854 src/eximport.c:1429 msgid "CDs" msgstr "" -#: src/select_win.c:467 src/setup_win.c:461 src/eximport.c:1433 +#: src/select_win.c:467 src/setup_win.c:461 src/eximport.c:1434 msgid "Story" msgstr "" @@ -532,13 +533,14 @@ #. GtkWidget *print; #: src/print_win.c:92 src/print_win.c:100 src/search_cal.c:1212 -#: src/title_cal.c:199 src/project_menu.c:64 src/film_view_cal.c:165 +#: src/title_cal.c:199 src/project_menu.c:64 src/film_view_wid.c:269 +#: src/film_view_cal.c:158 msgid "Print" msgstr "" #. GtkWidget *print; #: src/print_win.c:108 src/print_win.c:116 src/search_cal.c:1222 -#: src/title_cal.c:212 src/project_menu.c:79 src/film_view_cal.c:176 +#: src/title_cal.c:212 src/project_menu.c:79 src/film_view_cal.c:170 msgid "Preview" msgstr "" @@ -675,7 +677,7 @@ msgid "First setup guide" msgstr "" -#: src/first_setup_win.c:267 +#: src/first_setup_win.c:267 src/film_view_wid.c:284 msgid "Next" msgstr "" @@ -828,7 +830,7 @@ msgstr "" #: src/setup_win.c:636 src/search_cal.c:1043 src/title_cal.c:310 -#: src/eximport.c:1532 src/project_menu.c:163 +#: src/eximport.c:1533 src/project_menu.c:163 src/film_view_wid.c:278 msgid "Export" msgstr "" @@ -847,7 +849,7 @@ msgstr "" #: src/notes_cal.c:141 src/search_cal.c:1155 src/title_cal.c:98 -#: src/film_view_cal.c:150 +#: src/film_view_cal.c:145 msgid "Sure to delete" msgstr "" @@ -931,7 +933,7 @@ msgid "Deleted film" msgstr "" -#: src/search_cal.c:1184 src/title_cal.c:165 src/film_view_cal.c:111 +#: src/search_cal.c:1184 src/title_cal.c:165 src/film_view_cal.c:107 msgid "Modify film" msgstr "" @@ -991,73 +993,73 @@ msgid "Importing" msgstr "" -#: src/eximport.c:677 src/eximport.c:831 src/project_menu.c:172 +#: src/eximport.c:677 src/eximport.c:832 src/project_menu.c:172 msgid "Import" msgstr "" -#: src/eximport.c:714 src/eximport.c:908 +#: src/eximport.c:715 src/eximport.c:909 msgid "Cannot open file" msgstr "" -#: src/eximport.c:844 +#: src/eximport.c:845 msgid "Poster yet owned" msgstr "" -#: src/eximport.c:850 +#: src/eximport.c:851 msgid "Overwrite" msgstr "" -#: src/eximport.c:852 +#: src/eximport.c:853 msgid "Rename" msgstr "" -#: src/eximport.c:854 +#: src/eximport.c:855 msgid "No image" msgstr "" -#: src/eximport.c:856 +#: src/eximport.c:857 msgid "Use local" msgstr "" -#: src/eximport.c:863 +#: src/eximport.c:864 msgid "Don't ask any more" msgstr "" -#: src/eximport.c:921 +#: src/eximport.c:922 msgid "Archive version not supported or not an MVideo archive" msgstr "" -#: src/eximport.c:985 src/eximport.c:995 +#: src/eximport.c:986 src/eximport.c:996 msgid "Export list" msgstr "" -#: src/eximport.c:985 +#: src/eximport.c:986 msgid "Progress bar" msgstr "" -#: src/eximport.c:1039 +#: src/eximport.c:1040 msgid "" "File exist\n" "Do you want to overwrite?" msgstr "" -#: src/eximport.c:1068 src/eximport.c:1153 +#: src/eximport.c:1069 src/eximport.c:1154 msgid "Cannot write to file" msgstr "" -#: src/eximport.c:1115 src/eximport.c:1190 +#: src/eximport.c:1116 src/eximport.c:1191 msgid "Added title" msgstr "" -#: src/eximport.c:1422 +#: src/eximport.c:1423 msgid "Lang" msgstr "" -#: src/eximport.c:1486 +#: src/eximport.c:1487 msgid "Save file like:" msgstr "" -#: src/eximport.c:1540 +#: src/eximport.c:1541 msgid "Export all" msgstr "" @@ -1096,4 +1098,16 @@ #: src/project_setup_cal.c:76 msgid "There is another entry with that name" +msgstr "" + +#: src/film_view_wid.c:272 +msgid "Print preview" +msgstr "" + +#: src/film_view_wid.c:287 +msgid "Previous" +msgstr "" + +#: src/film_view_wid.c:290 +msgid "Fullscreen" msgstr "" |
From: Luca R. <lit...@us...> - 2003-05-25 12:11:47
|
Update of /cvsroot/mvideo/MVideo/src In directory sc8-pr-cvs1:/tmp/cvs-serv18989/src Modified Files: film_view_wid.c Log Message: Updates to film-fiew Index: film_view_wid.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_wid.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- film_view_wid.c 24 May 2003 11:51:19 -0000 1.2 +++ film_view_wid.c 25 May 2003 12:11:44 -0000 1.3 @@ -30,11 +30,12 @@ #define NONE PACKAGE_PIXMAPS_DIR "/none.png" #define STAR PACKAGE_PIXMAPS_DIR "/star.xpm" #define BLANK_STAR PACKAGE_PIXMAPS_DIR "/blank_star.xpm" -#define SPACE_BF_PIC 10 +#define SPACE_BF_PIC 20 #define TEXT_MIN_SIZE_Y 60 #define SPACE_WM_BORDER_WIDTH 60 #define SPACE_WM_BORDER_HEIGHT 130 #define SPACE_BW_LINES 7 +#define PIC_BOR_LEN 15 GtkWidget *gtk_film_view_icon_new (gchar * icon, gpointer func, gpointer data, GtkWidget * window); gboolean gtk_film_view_icon_enter_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); @@ -287,6 +288,9 @@ GtkWidget *image; gint XSize; gint YSize; + GtkWidget *viewport; + GdkColor black = { 0, 0, 0, 0 }; + if (image_pix == NULL) image_pix = gdk_pixbuf_new_from_file (NONE, NULL); @@ -311,10 +315,95 @@ gtk_widget_show (image); gdk_pixbuf_unref (image_pix); - film_view->pic_ysize = YSize + 5; - film_view->pic_xsize = XSize + SPACE_WM_BORDER_WIDTH; + film_view->pic_ysize = YSize + 27; + film_view->pic_xsize = XSize + SPACE_WM_BORDER_WIDTH + 15; + + gtk_fixed_put (GTK_FIXED (film_view->central), image, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 10, 15); + + /* Top right */ + viewport = gtk_viewport_new (NULL, NULL); + gtk_widget_show (viewport); + gtk_widget_modify_bg (viewport, 0, &black); + gtk_widget_modify_bg (viewport, 1, &black); + gtk_widget_modify_bg (viewport, 2, &black); + gtk_widget_modify_bg (viewport, 3, &black); + gtk_widget_modify_bg (viewport, 4, &black); + gtk_widget_set_size_request (viewport, PIC_BOR_LEN, 1); + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 16, 5); + + viewport = gtk_viewport_new (NULL, NULL); + gtk_widget_show (viewport); + gtk_widget_modify_bg (viewport, 0, &black); + gtk_widget_modify_bg (viewport, 1, &black); + gtk_widget_modify_bg (viewport, 2, &black); + gtk_widget_modify_bg (viewport, 3, &black); + gtk_widget_modify_bg (viewport, 4, &black); + gtk_widget_set_size_request (viewport, 1, PIC_BOR_LEN); + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 20, 9); + + /* Top left */ + viewport = gtk_viewport_new (NULL, NULL); + gtk_widget_show (viewport); + gtk_widget_modify_bg (viewport, 0, &black); + gtk_widget_modify_bg (viewport, 1, &black); + gtk_widget_modify_bg (viewport, 2, &black); + gtk_widget_modify_bg (viewport, 3, &black); + gtk_widget_modify_bg (viewport, 4, &black); + gtk_widget_set_size_request (viewport, PIC_BOR_LEN, 1); + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - SPACE_WM_BORDER_WIDTH - 19, 5); + + viewport = gtk_viewport_new (NULL, NULL); + gtk_widget_show (viewport); + gtk_widget_modify_bg (viewport, 0, &black); + gtk_widget_modify_bg (viewport, 1, &black); + gtk_widget_modify_bg (viewport, 2, &black); + gtk_widget_modify_bg (viewport, 3, &black); + gtk_widget_modify_bg (viewport, 4, &black); + gtk_widget_set_size_request (viewport, 1, PIC_BOR_LEN); + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - SPACE_WM_BORDER_WIDTH, 9); + + /* Bottom left */ + viewport = gtk_viewport_new (NULL, NULL); + gtk_widget_show (viewport); + gtk_widget_modify_bg (viewport, 0, &black); + gtk_widget_modify_bg (viewport, 1, &black); + gtk_widget_modify_bg (viewport, 2, &black); + gtk_widget_modify_bg (viewport, 3, &black); + gtk_widget_modify_bg (viewport, 4, &black); + gtk_widget_set_size_request (viewport, PIC_BOR_LEN, 1); + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 15, film_view->pic_ysize - 1); + + viewport = gtk_viewport_new (NULL, NULL); + gtk_widget_show (viewport); + gtk_widget_modify_bg (viewport, 0, &black); + gtk_widget_modify_bg (viewport, 1, &black); + gtk_widget_modify_bg (viewport, 2, &black); + gtk_widget_modify_bg (viewport, 3, &black); + gtk_widget_modify_bg (viewport, 4, &black); + gtk_widget_set_size_request (viewport, 1, PIC_BOR_LEN); + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH - 19, film_view->pic_ysize - 5 - PIC_BOR_LEN); + + /* Bottom right */ + viewport = gtk_viewport_new (NULL, NULL); + gtk_widget_show (viewport); + gtk_widget_modify_bg (viewport, 0, &black); + gtk_widget_modify_bg (viewport, 1, &black); + gtk_widget_modify_bg (viewport, 2, &black); + gtk_widget_modify_bg (viewport, 3, &black); + gtk_widget_modify_bg (viewport, 4, &black); + gtk_widget_set_size_request (viewport, PIC_BOR_LEN, 1); + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - SPACE_WM_BORDER_WIDTH - 19, film_view->pic_ysize - 1); + + viewport = gtk_viewport_new (NULL, NULL); + gtk_widget_show (viewport); + gtk_widget_modify_bg (viewport, 0, &black); + gtk_widget_modify_bg (viewport, 1, &black); + gtk_widget_modify_bg (viewport, 2, &black); + gtk_widget_modify_bg (viewport, 3, &black); + gtk_widget_modify_bg (viewport, 4, &black); + gtk_widget_set_size_request (viewport, 1, PIC_BOR_LEN); + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, film_view->max_x - SPACE_WM_BORDER_WIDTH, film_view->pic_ysize - 5 - PIC_BOR_LEN); - gtk_fixed_put (GTK_FIXED (film_view->central), image, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH, 5); } void |
From: Luca R. <lit...@us...> - 2003-05-25 12:11:47
|
Update of /cvsroot/mvideo/MVideo In directory sc8-pr-cvs1:/tmp/cvs-serv18989 Modified Files: configure.in Log Message: Updates to film-fiew Index: configure.in =================================================================== RCS file: /cvsroot/mvideo/MVideo/configure.in,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- configure.in 28 Feb 2003 07:47:16 -0000 1.35 +++ configure.in 25 May 2003 12:11:43 -0000 1.36 @@ -23,6 +23,8 @@ AC_ARG_ENABLE(verbous, [ --enable-verbous be more verbous while compiling, default=no],,enable_verbous=no) AC_ARG_ENABLE(optimize,[ --enable-optimization optimize binaries for your arch, default=yes],,enable_optimization=yes) +CXXFLAGS="" +CFLAGS="" AC_PART_HEADER([Checking C environment]) AC_PROG_CC AC_ISC_POSIX |
From: Luca R. <lit...@us...> - 2003-05-24 11:51:22
|
Update of /cvsroot/mvideo/MVideo/src In directory sc8-pr-cvs1:/tmp/cvs-serv30944/src Modified Files: about_cal.c eximport.c film_view_cal.c film_view_cal.h film_view_func.c film_view_func.h film_view_wid.c film_view_wid.h search_cal.c setup_win.c title_cal.c Log Message: Finished new film viewer Index: about_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/about_cal.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- about_cal.c 17 May 2003 17:56:18 -0000 1.23 +++ about_cal.c 24 May 2003 11:51:18 -0000 1.24 @@ -75,9 +75,9 @@ GAsyncQueue *queue; static int old_title; -static int draw_faster=0; -static int draw_slower=0; -static int draw_start=NAME_TIMEOUT; +static int draw_faster = 0; +static int draw_slower = 0; +static int draw_start = NAME_TIMEOUT; gchar draw_str[5]; void @@ -194,8 +194,7 @@ about_ipc *AboutIpc; AboutIpc = user_data; - if (event->x >= CLOSE_BTT_X_MIN && event->x <= CLOSE_BTT_X_MAX - && event->y >= CLOSE_BTT_Y_MIN && event->y <= CLOSE_BTT_Y_MAX) + if (event->x >= CLOSE_BTT_X_MIN && event->x <= CLOSE_BTT_X_MAX && event->y >= CLOSE_BTT_Y_MIN && event->y <= CLOSE_BTT_Y_MAX) { CursorOffset *icon_pos; @@ -212,9 +211,9 @@ state = DRAWING_INTRO; reset = TRUE; pause_scroll = FALSE; - draw_faster=0; - draw_slower=0; - draw_start=20; + draw_faster = 0; + draw_slower = 0; + draw_start = 20; fast_fwd = 0; gdk_gc_unref (gc_blue); gdk_gc_unref (gc_green); @@ -250,9 +249,9 @@ { if (pause_scroll == FALSE) { - draw_start=0; - draw_faster=0; - draw_slower=0; + draw_start = 0; + draw_faster = 0; + draw_slower = 0; set_pause (); } else @@ -272,9 +271,9 @@ { if (fast_fwd == 0 && pause_scroll == FALSE) { - draw_start=0; - draw_faster=0; - draw_slower=0; + draw_start = 0; + draw_faster = 0; + draw_slower = 0; set_pause (); } else if (fast_fwd > 0 && pause_scroll == FALSE) @@ -282,16 +281,16 @@ fast_fwd--; if (fast_fwd != 0) { - draw_start=0; - draw_faster=0; - sprintf(draw_str, "x%d", fast_fwd + 1); - draw_slower=NAME_TIMEOUT+1<<fast_fwd/2; + draw_start = 0; + draw_faster = 0; + sprintf (draw_str, "x%d", fast_fwd + 1); + draw_slower = NAME_TIMEOUT + 1 << fast_fwd / 2; } else { - draw_slower=0; - draw_faster=0; - draw_start=NAME_TIMEOUT; + draw_slower = 0; + draw_faster = 0; + draw_start = NAME_TIMEOUT; } } } @@ -300,17 +299,17 @@ if (pause_scroll == TRUE) { pause_scroll = FALSE; - draw_slower=0; - draw_faster=0; - draw_start=NAME_TIMEOUT; + draw_slower = 0; + draw_faster = 0; + draw_start = NAME_TIMEOUT; } else { fast_fwd++; - draw_start=0; - draw_slower=0; - sprintf(draw_str, "x%d", fast_fwd + 1); - draw_faster=NAME_TIMEOUT+1<<fast_fwd/2; + draw_start = 0; + draw_slower = 0; + sprintf (draw_str, "x%d", fast_fwd + 1); + draw_faster = NAME_TIMEOUT + 1 << fast_fwd / 2; } } @@ -493,8 +492,7 @@ pango_layout_set_markup (layout, markup, -1); g_free (markup); pango_layout_get_pixel_extents (layout, NULL, &extents); - gdk_draw_layout (pixmap, area->style->white_gc, - (area->allocation.width - extents.width) / 2, 0, layout); + gdk_draw_layout (pixmap, area->style->white_gc, (area->allocation.width - extents.width) / 2, 0, layout); } if (title == 1) { @@ -504,8 +502,7 @@ pango_layout_get_pixel_extents (layout, NULL, &extents); - gdk_draw_layout (pixmap, area->style->white_gc, - (area->allocation.width - extents.width) / 2, current_y, layout); + gdk_draw_layout (pixmap, area->style->white_gc, (area->allocation.width - extents.width) / 2, current_y, layout); if (current_y <= 0) { title = 0; @@ -529,9 +526,7 @@ pango_layout_set_markup (layout, markup, -1); g_free (markup); pango_layout_get_pixel_extents (layout, NULL, &extents); - gdk_draw_layout (pixmap, area->style->white_gc, - (area->allocation.width - extents.width) / 2, old_title_y, - layout); + gdk_draw_layout (pixmap, area->style->white_gc, (area->allocation.width - extents.width) / 2, old_title_y, layout); old_title_y -= 2; } old_title = -1; @@ -549,8 +544,7 @@ } pango_layout_set_markup (layout, contributors[index], -1); pango_layout_get_pixel_extents (layout, NULL, &extents); - gdk_draw_layout (pixmap, area->style->white_gc, - (area->allocation.width - extents.width) / 2, current_y, layout); + gdk_draw_layout (pixmap, area->style->white_gc, (area->allocation.width - extents.width) / 2, current_y, layout); if (current_y == top_height) { if (index + 1 < G_N_ELEMENTS (contributors)) @@ -558,8 +552,7 @@ fade_timeout = gtk_timeout_add (20, fade_name, contributors[index]); current_y = area->allocation.height; index++; - if (strspn (contributors[index], "ABCDEFGHIJKLMNOPQRSTUVWXYZ ") == - strlen (contributors[index])) + if (strspn (contributors[index], "ABCDEFGHIJKLMNOPQRSTUVWXYZ ") == strlen (contributors[index])) title = 1; } else @@ -611,12 +604,11 @@ pango_layout_set_markup (layout, markup, -1); g_free (markup); pango_layout_get_pixel_extents (layout, NULL, &extents); - gdk_draw_layout (pixmap, area->style->white_gc, - (area->allocation.width - extents.width) / 2, current_y, layout); + gdk_draw_layout (pixmap, area->style->white_gc, (area->allocation.width - extents.width) / 2, current_y, layout); current_y -= 2; if (current_y <= top_height) { - draw_thanks=FALSE; + draw_thanks = FALSE; top_height = extents.height; current_y = area->allocation.height; } @@ -627,18 +619,15 @@ pango_layout_set_markup (layout, markup, -1); g_free (markup); pango_layout_get_pixel_extents (layout, NULL, &extents); - gdk_draw_layout (pixmap, area->style->white_gc, - (area->allocation.width - extents.width) / 2, current_y--, layout); + gdk_draw_layout (pixmap, area->style->white_gc, (area->allocation.width - extents.width) / 2, current_y--, layout); - gdk_draw_rectangle (pixmap, area->style->black_gc, TRUE, 40, 0, - area->allocation.width-40, top_height); + gdk_draw_rectangle (pixmap, area->style->black_gc, TRUE, 40, 0, area->allocation.width - 40, top_height); markup = g_strdup ("<big><b>THANKS TO</b></big>"); pango_layout_set_markup (layout, markup, -1); g_free (markup); pango_layout_get_pixel_extents (layout, NULL, &extents); - gdk_draw_layout (pixmap, area->style->white_gc, - (area->allocation.width - extents.width) / 2, 0, layout); + gdk_draw_layout (pixmap, area->style->white_gc, (area->allocation.width - extents.width) / 2, 0, layout); if (current_y < -extents.height) { @@ -666,10 +655,10 @@ color_fade.red = color_fade.green = color_fade.blue = 1600 * i; gdk_gc_set_rgb_fg_color (gc_fade, &color_fade); markup = g_strdup_printf ("<big><b>%s</b></big>", contributors[old_title]); - pango_layout_set_markup(layout, markup, -1); + pango_layout_set_markup (layout, markup, -1); g_free (markup); - pango_layout_get_pixel_extents(layout, NULL, &extents); - gdk_draw_layout(pixmap, gc_fade, (area->allocation.width - extents.width) / 2, 0, layout); + pango_layout_get_pixel_extents (layout, NULL, &extents); + gdk_draw_layout (pixmap, gc_fade, (area->allocation.width - extents.width) / 2, 0, layout); pango_layout_set_markup (layout, contributors[G_N_ELEMENTS (contributors) - 1], -1); pango_layout_get_pixel_extents (layout, NULL, &extents); gdk_draw_layout (pixmap, gc_fade, (area->allocation.width - extents.width) / 2, top_height, layout); @@ -813,14 +802,13 @@ while (scroll_fast >= 0) { - gdk_draw_rectangle (pixmap, area->style->black_gc, TRUE, 0, 0, - area->allocation.width, area->allocation.height); + gdk_draw_rectangle (pixmap, area->style->black_gc, TRUE, 0, 0, area->allocation.width, area->allocation.height); if (draw_start != 0) - set_start_2(); + set_start_2 (); if (draw_faster != 0) - set_faster_2(); + set_faster_2 (); if (draw_slower != 0) - set_slower_2(); + set_slower_2 (); switch (state) { case DRAWING_INTRO: @@ -859,8 +847,7 @@ { gdk_draw_drawable (widget->window, widget->style->fg_gc[GTK_WIDGET_STATE (widget)], - pixmap, event->area.x, event->area.y, - event->area.x, event->area.y, event->area.width, event->area.height); + pixmap, event->area.x, event->area.y, event->area.x, event->area.y, event->area.width, event->area.height); return TRUE; } Index: eximport.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/eximport.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- eximport.c 23 May 2003 07:43:31 -0000 1.17 +++ eximport.c 24 May 2003 11:51:18 -0000 1.18 @@ -663,7 +663,7 @@ gzseek (zfd, position, SEEK_SET); struct_file = open_read_format_file (zfd); - gtk_film_view_new_show_all (TRUE, NULL, (gpointer)struct_file->film); + gtk_film_view_new_show_all (TRUE, NULL, (gpointer)struct_file->film, NULL, iter); } if (event->type == GDK_BUTTON_PRESS && event->button == 3 && selection != NULL) { @@ -705,6 +705,7 @@ gint version; gint tot_num; gint i; + GtkTreeIter iter; zfd = gzopen (file, "r"); if (zfd == NULL) @@ -728,7 +729,7 @@ struct_file = open_read_format_file (zfd); - gtk_film_view_new_show_all (running, NULL, (gpointer)struct_file->film); + gtk_film_view_new_show_all (running, NULL, (gpointer)struct_file->film, NULL, iter); if (struct_file->pic != NULL) g_free (struct_file->pic); g_free (struct_file); Index: film_view_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_cal.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- film_view_cal.c 23 May 2003 07:43:31 -0000 1.1 +++ film_view_cal.c 24 May 2003 11:51:18 -0000 1.2 @@ -33,25 +33,25 @@ void gtk_film_view_icon_delete_film (gpointer user_data); void gtk_film_view_icon_restore_color (gpointer user_data); -void gtk_film_view_icon_restore_color (gpointer user_data) +void +gtk_film_view_icon_restore_color (gpointer user_data) { GtkFilmView *film_view; film_view = user_data; - gtk_list_store_set (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (film_view->tree))), &film_view->iter, - 3, NULL, - 4, NULL, - -1); + gtk_list_store_set (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (film_view->tree))), + &film_view->iter, 3, NULL, 4, NULL, -1); return; } -void gtk_film_view_icon_delete_film (gpointer user_data) +void +gtk_film_view_icon_delete_film (gpointer user_data) { - gchar *txt; - gchar *title; - GdkColor colors[2]; + gchar *txt; + gchar *title; + GdkColor colors[2]; GtkFilmView *film_view; film_view = user_data; @@ -69,14 +69,11 @@ add_statusbar (txt); g_free (title); g_free (txt); - if ( options_global_read->update_list_delete == 1 ) + if (options_global_read->update_list_delete == 1) gtk_signal_emit_by_name (GTK_OBJECT (Sort_button), "pressed"); else - gtk_list_store_set (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (film_view->tree))), &film_view->iter, - 2, "a", - 3, &colors[1], - 4, &colors[0], - -1); + gtk_list_store_set (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (film_view->tree))), + &film_view->iter, 2, "a", 3, &colors[1], 4, &colors[0], -1); gtk_film_view_icon_close (NULL, NULL, film_view); @@ -85,12 +82,12 @@ -gboolean gtk_film_view_icon_modify (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) +gboolean +gtk_film_view_icon_modify (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { - GtkWidget *modify; - gchar *str; - gchar *title; - GdkColor colors[2]; + GtkWidget *modify; + gchar *str; + GdkColor colors[2]; GtkFilmView *film_view; film_view = user_data; @@ -107,19 +104,18 @@ 4, &colors[0], -1); - title = db_get_title (film_view->id); - str = g_strdup_printf ("%s: %s", _("Modify film"), title); + str = g_strdup_printf ("%s: %s", _("Modify film"), film_view->title); add_statusbar (str); g_free (str); - modify = create_window_select_add_modify (1, film_view->id, title, GTK_TREE_VIEW(film_view->tree), film_view->iter); - g_free (title); + modify = create_window_select_add_modify (1, film_view->id, film_view->title, GTK_TREE_VIEW (film_view->tree), film_view->iter); gtk_widget_show (modify); return FALSE; } -gboolean gtk_film_view_icon_export (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) +gboolean +gtk_film_view_icon_export (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { GtkFilmView *film_view; @@ -130,11 +126,11 @@ return FALSE; } -gboolean gtk_film_view_icon_remove (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) +gboolean +gtk_film_view_icon_remove (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { - GdkColor colors[2]; - gchar *txt; - gchar *title; + GdkColor colors[2]; + gchar *txt; GtkFilmView *film_view; film_view = user_data; @@ -146,19 +142,16 @@ colors[1].green = 65535; colors[1].blue = 61000; - title = db_get_title (film_view->id); - txt = g_strdup_printf ("%s: %s", _("Sure to delete"), title); - g_free (title); - gtk_list_store_set (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (film_view->tree))), &film_view->iter, - 3, &colors[1], - 4, &colors[0], - -1); + txt = g_strdup_printf ("%s: %s", _("Sure to delete"), film_view->title); + gtk_list_store_set (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (film_view->tree))), + &film_view->iter, 3, &colors[1], 4, &colors[0], -1); create_Choose_win (film_view, film_view, txt, gtk_film_view_icon_delete_film, gtk_film_view_icon_restore_color); return FALSE; } -gboolean gtk_film_view_icon_print (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) +gboolean +gtk_film_view_icon_print (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { GtkWidget *dia; @@ -169,7 +162,8 @@ return FALSE; } -gboolean gtk_film_view_icon_print_preview (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) +gboolean +gtk_film_view_icon_print_preview (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { GtkWidget *dia; @@ -180,34 +174,39 @@ return FALSE; } -gboolean gtk_film_view_icon_close (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) +gboolean +gtk_film_view_icon_close (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { GtkFilmView *film_view; - gboolean running; + gboolean running; film_view = user_data; running = film_view->running; - gtk_widget_destroy(GTK_WIDGET(film_view->window)); + gtk_widget_destroy (GTK_WIDGET (film_view->window)); if (film_view->id != NULL) g_free (film_view->id); + if (film_view->title != NULL) + g_free (film_view->title); g_free (film_view); - if (running == FALSE) - gtk_main_quit(); + if (running == FALSE) + gtk_main_quit (); return FALSE; } -gboolean gtk_film_view_icon_go_fullscreen (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) +gboolean +gtk_film_view_icon_go_fullscreen (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { gint state; + gint size_y; GtkFilmView *film_view; film_view = user_data; - state = gdk_window_get_state(film_view->window->window); + state = gdk_window_get_state (film_view->window->window); switch (state) { case (0): @@ -215,13 +214,17 @@ case (GDK_WINDOW_STATE_ICONIFIED): case (GDK_WINDOW_STATE_MAXIMIZED): case (GDK_WINDOW_STATE_STICKY): - gtk_window_fullscreen (GTK_WINDOW(film_view->window)); -// gtk_widget_set_size_request (ipc->last_element, max_x-55, -// max_y-ipc->extention_height+ipc->last_element_ysize-ipc->title_ysize); + gtk_window_fullscreen (GTK_WINDOW (film_view->window)); + if (film_view->text_fs_grow != NULL) + { + size_y = film_view->text_fs_size_y + film_view->text_fs_size_y_grow; + gtk_widget_set_size_request (film_view->text_fs_grow, film_view->text_fs_size_x, size_y); + } break; default: - gtk_window_unfullscreen (GTK_WINDOW(film_view->window)); -// gtk_widget_set_size_request (ipc->last_element, max_x-55, ipc->last_element_ysize); + gtk_window_unfullscreen (GTK_WINDOW (film_view->window)); + if (film_view->text_fs_grow != NULL) + gtk_widget_set_size_request (film_view->text_fs_grow, film_view->text_fs_size_x, film_view->text_fs_size_y); break; } Index: film_view_cal.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_cal.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- film_view_cal.h 23 May 2003 07:43:31 -0000 1.1 +++ film_view_cal.h 24 May 2003 11:51:18 -0000 1.2 @@ -19,9 +19,6 @@ */ /* - * Controllare export - * Controllare remove - * Controllare modify * Aggiungere import */ Index: film_view_func.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_func.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- film_view_func.c 23 May 2003 07:43:31 -0000 1.1 +++ film_view_func.c 24 May 2003 11:51:19 -0000 1.2 @@ -62,7 +62,7 @@ return ret; } -void gtk_film_view_new_show_all (gboolean running, gchar *id, gpointer *film_info) +void gtk_film_view_new_show_all (gboolean running, gchar *id, gpointer *film_info, GtkWidget *tree, GtkTreeIter iter) { GtkFilmView *film_view; GtkFilmViewString *film_string; @@ -81,7 +81,7 @@ film = (Film_info *)film_info; txt = g_strdup_printf ("MVideo: %s: %s", _("Film view"), film->film->title); - film_view = gtk_film_view_new (running, txt, id); + film_view = gtk_film_view_new (running, txt, id, tree, iter); g_free (txt); gtk_film_view_add_top_title (film_view, film->film->title); @@ -196,8 +196,10 @@ gtk_film_view_add_film_stars (film_view, _("Stars"), atoi (film->format->stars)); - gtk_film_view_add_film_text (film_view, _("Story"), film->notes->trama); - gtk_film_view_add_film_text (film_view, _("Notes"), film->notes->notes); + gtk_film_view_add_hline (film_view); + + gtk_film_view_add_film_text (film_view, _("Story"), film->notes->trama, 0.5); + gtk_film_view_add_film_text (film_view, _("Notes"), film->notes->notes, 1); gtk_film_view_show (film_view); Index: film_view_func.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_func.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- film_view_func.h 23 May 2003 07:43:31 -0000 1.1 +++ film_view_func.h 24 May 2003 11:51:19 -0000 1.2 @@ -20,8 +20,8 @@ /* * Gestire copertina passata per struct - * possibilità di settare quali icone attivare + * possibilità di settare quali icone attivare!! attenzione al tree = NULL!!! */ GString *gtk_film_view_substiute_char (gchar * entries, gchar *entry, gchar *new); -void gtk_film_view_new_show_all (gboolean running, gchar *id, gpointer *film_info); +void gtk_film_view_new_show_all (gboolean running, gchar *id, gpointer *film_info, GtkWidget *tree, GtkTreeIter iter); Index: film_view_wid.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_wid.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- film_view_wid.c 23 May 2003 07:43:31 -0000 1.1 +++ film_view_wid.c 24 May 2003 11:51:19 -0000 1.2 @@ -30,11 +30,39 @@ #define NONE PACKAGE_PIXMAPS_DIR "/none.png" #define STAR PACKAGE_PIXMAPS_DIR "/star.xpm" #define BLANK_STAR PACKAGE_PIXMAPS_DIR "/blank_star.xpm" +#define SPACE_BF_PIC 10 +#define TEXT_MIN_SIZE_Y 60 +#define SPACE_WM_BORDER_WIDTH 60 +#define SPACE_WM_BORDER_HEIGHT 130 #define SPACE_BW_LINES 7 GtkWidget *gtk_film_view_icon_new (gchar * icon, gpointer func, gpointer data, GtkWidget * window); gboolean gtk_film_view_icon_enter_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); gboolean gtk_film_view_icon_leave_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); +gboolean gtk_film_view_quit (GtkWidget *widget, GdkEvent * event, gpointer user_data); + +gboolean +gtk_film_view_quit (GtkWidget *widget, GdkEvent * event, gpointer user_data) +{ + GtkFilmView *film_view; + gboolean running; + + film_view = user_data; + running = film_view->running; + + gtk_widget_destroy (GTK_WIDGET (film_view->window)); + + if (film_view->id != NULL) + g_free (film_view->id); + if (film_view->title != NULL) + g_free (film_view->title); + g_free (film_view); + + if (running == FALSE) + gtk_main_quit (); + + return FALSE; +} gboolean gtk_film_view_icon_enter_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) @@ -84,7 +112,7 @@ GtkFilmView * -gtk_film_view_new (gboolean running, gchar * title, gchar * id) +gtk_film_view_new (gboolean running, gchar * title, gchar * id, GtkWidget *tree, GtkTreeIter iter) { GtkWidget *window; GtkWidget *scrolledwindow; @@ -121,8 +149,7 @@ scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow); gtk_box_pack_start (GTK_BOX (vbox), scrolledwindow, TRUE, TRUE, 0); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow), 10); viewport = gtk_viewport_new (NULL, NULL); @@ -138,17 +165,23 @@ gtk_widget_show (central); gtk_container_add (GTK_CONTAINER (viewport), central); + gtk_signal_connect (GTK_OBJECT (window), "delete_event", G_CALLBACK (gtk_film_view_quit), film_view); + gtk_window_maximize (GTK_WINDOW (window)); film_view->window = window; film_view->top = top; film_view->central = central; film_view->max_x = gdk_screen_width () - 5; + film_view->max_y = gdk_screen_height (); film_view->icon_xpos = film_view->max_x - 10; film_view->central_current_y = 5; film_view->running = running; - film_view->id = NULL; - film_view->tree = NULL; + film_view->id = g_strdup(id); + film_view->title = g_strdup(title); + film_view->tree = tree; + film_view->iter = iter; + film_view->text_fs_grow = NULL; return film_view; } @@ -173,7 +206,8 @@ layout = gtk_label_get_layout (GTK_LABEL (label)); pango_layout_get_pixel_extents (layout, NULL, &extents); gtk_widget_set_size_request (film_view->top, -1, extents.height + 15); -// film_view->title_ysize = extents.height + 55; + + return; } void @@ -207,33 +241,22 @@ switch (type) { case (FILM_VIEW_ICON_CLOSE): - eventbox = - gtk_film_view_icon_new ("gtk-close", gtk_film_view_icon_close, film_view, - film_view->window); + eventbox = gtk_film_view_icon_new ("gtk-close", gtk_film_view_icon_close, film_view, film_view->window); break; case (FILM_VIEW_ICON_PRINT): - eventbox = - gtk_film_view_icon_new ("gtk-print", gtk_film_view_icon_print, NULL, film_view->window); + eventbox = gtk_film_view_icon_new ("gtk-print", gtk_film_view_icon_print, NULL, film_view->window); break; case (FILM_VIEW_ICON_PRINT_PREVIEW): - eventbox = - gtk_film_view_icon_new ("gtk-print-preview", gtk_film_view_icon_print_preview, NULL, - film_view->window); + eventbox = gtk_film_view_icon_new ("gtk-print-preview", gtk_film_view_icon_print_preview, NULL, film_view->window); break; case (FILM_VIEW_ICON_SETUP): - eventbox = - gtk_film_view_icon_new ("gtk-properties", gtk_film_view_icon_modify, film_view, - film_view->window); + eventbox = gtk_film_view_icon_new ("gtk-properties", gtk_film_view_icon_modify, film_view, film_view->window); break; case (FILM_VIEW_ICON_EXPORT): - eventbox = - gtk_film_view_icon_new ("gtk-go-down", gtk_film_view_icon_export, film_view, - film_view->window); + eventbox = gtk_film_view_icon_new ("gtk-go-down", gtk_film_view_icon_export, film_view, film_view->window); break; case (FILM_VIEW_ICON_REMOVE): - eventbox = - gtk_film_view_icon_new ("gtk-remove", gtk_film_view_icon_remove, film_view, - film_view->window); + eventbox = gtk_film_view_icon_new ("gtk-remove", gtk_film_view_icon_remove, film_view, film_view->window); break; case (FILM_VIEW_ICON_NEXT): eventbox = gtk_film_view_icon_new ("gtk-go-forward", NULL, NULL, film_view->window); @@ -242,9 +265,7 @@ eventbox = gtk_film_view_icon_new ("gtk-go-back", NULL, NULL, film_view->window); break; case (FILM_VIEW_ICON_FULLSCREEN): - eventbox = - gtk_film_view_icon_new ("gtk-zoom-fit", gtk_film_view_icon_go_fullscreen, film_view, - film_view->window); + eventbox = gtk_film_view_icon_new ("gtk-zoom-fit", gtk_film_view_icon_go_fullscreen, film_view, film_view->window); break; default: return FALSE; @@ -291,9 +312,9 @@ gdk_pixbuf_unref (image_pix); film_view->pic_ysize = YSize + 5; - film_view->pic_xsize = XSize + 50; + film_view->pic_xsize = XSize + SPACE_WM_BORDER_WIDTH; - gtk_fixed_put (GTK_FIXED (film_view->central), image, film_view->max_x - XSize - 50, 5); + gtk_fixed_put (GTK_FIXED (film_view->central), image, film_view->max_x - XSize - SPACE_WM_BORDER_WIDTH, 5); } void @@ -326,8 +347,7 @@ if ((current_x + extents.width < film_view->max_x - film_view->pic_xsize && film_view->central_current_y < film_view->pic_ysize) - || (current_x + extents.width < film_view->max_x - && film_view->central_current_y > film_view->pic_ysize)) + || (current_x + extents.width < film_view->max_x && film_view->central_current_y > film_view->pic_ysize)) gtk_fixed_put (GTK_FIXED (film_view->central), label, current_x, film_view->central_current_y); else { @@ -345,10 +365,9 @@ plus_y = extents.height * 0.20; /* Go here if string is longer than max screen width or max screen width - picture width */ - if ((current_x + extents.width > film_view->max_x - film_view->pic_xsize - 5 + if ((current_x + extents.width > film_view->max_x - film_view->pic_xsize - SPACE_BF_PIC && film_view->central_current_y < film_view->pic_ysize) - || (current_x + extents.width > film_view->max_x - 5 - && film_view->central_current_y > film_view->pic_ysize)) + || (current_x + extents.width > film_view->max_x - SPACE_BF_PIC && film_view->central_current_y > film_view->pic_ysize)) { gfloat i; gfloat c; @@ -363,13 +382,13 @@ /* current height is lowern than pic height */ if (film_view->central_current_y < film_view->pic_ysize) { - c = film_view->max_x - film_view->pic_xsize - current_x - 5; + c = film_view->max_x - film_view->pic_xsize - current_x - SPACE_BF_PIC; i = c / extents.width; d = i * strlen (film_string->txt) - 1; } else { - c = film_view->max_x - 50 - current_x - 5; + c = film_view->max_x - 50 - current_x - SPACE_BF_PIC; i = c / extents.width; d = i * strlen (film_string->txt) - 1; } @@ -381,7 +400,7 @@ current = d + 1; /* Recalculate params to fit from WIDTH_START to end - pic width */ - c = film_view->max_x - film_view->pic_xsize - current_x - 25; + c = film_view->max_x - film_view->pic_xsize - 25 - SPACE_BF_PIC; i = c / extents.width; d = i * strlen (film_string->txt); @@ -399,10 +418,9 @@ * Recalculate params to fit from current_x to end * ONLY if current height is greater than pic height */ - if (film_view->central_current_y > film_view->pic_ysize - && c != film_view->max_x - 50 - current_x - 20) + if (film_view->central_current_y > film_view->pic_ysize && c != film_view->max_x - 50 - current_x - 20) { - c = film_view->max_x - 50 - current_x - 20; + c = film_view->max_x - SPACE_WM_BORDER_WIDTH - current_x - 20; i = c / extents.width; d = i * strlen (film_string->txt); } @@ -463,7 +481,7 @@ } void -gtk_film_view_add_film_text (GtkFilmView * film_view, gchar * name, gchar * txt) +gtk_film_view_add_film_text (GtkFilmView * film_view, gchar * name, gchar * txt, gfloat dimension) { GtkWidget *scrolledwindow; GtkWidget *text; @@ -472,6 +490,8 @@ PangoLayout *layout; PangoRectangle extents; GdkColor blue = { 0, 62000, 62000, 65535 }; + gint size_y; + GtkRequisition req; label = gtk_label_new (""); tmp = g_strdup_printf ("<span color=\"red\"><big><b>%s:</b></big></span>", name); @@ -486,22 +506,9 @@ scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_fixed_put (GTK_FIXED (film_view->central), scrolledwindow, 5, film_view->central_current_y); -/* if ((max_y - *height_start) / 2 > 80) - { - gtk_widget_set_size_request (scrolledwindow, max_x - 55, (max_y - *height_start) / 2.5); - *last_element_ysize = (max_y - *height_start) / 2.5; - *height_start += 9 + (max_y - *height_start) / 2.5; - } - else - { - gtk_widget_set_size_request (scrolledwindow, max_x - 55, 80); - *last_element_ysize = 80; - *height_start += 89; - } -*/ + text = gtk_text_view_new (); gtk_widget_show (text); gtk_container_add (GTK_CONTAINER (scrolledwindow), text); @@ -512,9 +519,23 @@ gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)), txt, -1); - gtk_widget_set_size_request (scrolledwindow, film_view->max_x - 55, 40); - - film_view->central_current_y += 40 + SPACE_BW_LINES; + if (dimension <= 1.0) + { + gtk_widget_size_request (film_view->top, &req); + size_y = (int) ((film_view->max_y - film_view->central_current_y - req.height - SPACE_WM_BORDER_HEIGHT) * dimension); + } + else + size_y = dimension; + if (size_y <= TEXT_MIN_SIZE_Y) + size_y = TEXT_MIN_SIZE_Y; + gtk_widget_set_size_request (scrolledwindow, film_view->max_x - SPACE_WM_BORDER_WIDTH - 5, size_y); + + film_view->central_current_y += size_y + SPACE_BW_LINES; + + film_view->text_fs_grow = scrolledwindow; + film_view->text_fs_size_y = size_y; + film_view->text_fs_size_y_grow = SPACE_WM_BORDER_HEIGHT * dimension - 40; + film_view->text_fs_size_x = film_view->max_x - SPACE_WM_BORDER_WIDTH - 5; return; } @@ -560,15 +581,13 @@ { image = gtk_image_new_from_pixbuf (star); gtk_widget_show (image); - gtk_fixed_put (GTK_FIXED (film_view->central), image, width_start + i * 25, - film_view->central_current_y + plus_y); + gtk_fixed_put (GTK_FIXED (film_view->central), image, width_start + i * 25, film_view->central_current_y + plus_y); } for (; i != 10; i++) { image = gtk_image_new_from_pixbuf (blank_star); gtk_widget_show (image); - gtk_fixed_put (GTK_FIXED (film_view->central), image, width_start + i * 25, - film_view->central_current_y + plus_y); + gtk_fixed_put (GTK_FIXED (film_view->central), image, width_start + i * 25, film_view->central_current_y + plus_y); } gdk_pixbuf_unref (star); @@ -577,4 +596,24 @@ film_view->central_current_y += extents.height + SPACE_BW_LINES; return; +} +void gtk_film_view_add_hline (GtkFilmView *film_view) +{ + GtkWidget *viewport; + GdkColor black = { 0, 0, 0, 0 }; + + film_view->central_current_y += 2; + + viewport = gtk_viewport_new (NULL, NULL); + gtk_widget_show (viewport); + gtk_widget_modify_bg (viewport, 0, &black); + gtk_widget_modify_bg (viewport, 1, &black); + gtk_widget_modify_bg (viewport, 2, &black); + gtk_widget_modify_bg (viewport, 3, &black); + gtk_widget_modify_bg (viewport, 4, &black); + gtk_widget_set_size_request (viewport, film_view->max_x - SPACE_WM_BORDER_WIDTH - 5, 2); + + gtk_fixed_put (GTK_FIXED (film_view->central), viewport, 5, film_view->central_current_y); + + film_view->central_current_y += 1 + SPACE_BW_LINES; } Index: film_view_wid.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/film_view_wid.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- film_view_wid.h 23 May 2003 07:43:31 -0000 1.1 +++ film_view_wid.h 24 May 2003 11:51:19 -0000 1.2 @@ -19,10 +19,6 @@ */ /* - * Ogni tanto il testo va sopra l'immagine -> controllare - * Controllare tutte le funzioni delle icone - * Sistema per la gestione delle dimensioni delle text - * magari permettere di settare la dimensione fissa e in percentuale? * Migliorare la gestione delle dimensioni * Aggiungere tooltips */ @@ -48,6 +44,11 @@ GtkWidget *window; GtkWidget *central; + GtkWidget *text_fs_grow; + gint text_fs_size_y; + gint text_fs_size_y_grow; + gint text_fs_size_x; + gint icon_xpos; gint pic_xsize; @@ -56,10 +57,12 @@ gint central_current_y; gint max_x; + gint max_y; gboolean running; gchar *id; + gchar *title; GtkWidget *tree; GtkTreeIter iter; }; @@ -69,7 +72,7 @@ gchar *txt; }; -GtkFilmView *gtk_film_view_new (gboolean running, gchar *title, gchar *id); +GtkFilmView *gtk_film_view_new (gboolean running, gchar *title, gchar *id, GtkWidget *tree, GtkTreeIter iter); void gtk_film_view_set_infos (GtkFilmView *film_view, GtkWidget *tree, GtkTreeIter iter); void gtk_film_view_show (GtkFilmView *film_view); void gtk_film_view_set_wmclass (GtkFilmView *film_view, gchar * wmclass_name, gchar * wmclass_class); @@ -80,5 +83,7 @@ void gtk_film_view_add_film_pic (GtkFilmView *film_view, GdkPixbuf *image_pix); void gtk_film_view_add_film_string (GtkFilmView *film_view, GList *strings); -void gtk_film_view_add_film_text (GtkFilmView *film_view, gchar *name, gchar *txt); +void gtk_film_view_add_film_text (GtkFilmView *film_view, gchar *name, gchar *txt, gfloat dimension); void gtk_film_view_add_film_stars (GtkFilmView *film_view, gchar *name, gint num); + +void gtk_film_view_add_hline (GtkFilmView *film_view); Index: search_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/search_cal.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- search_cal.c 23 May 2003 07:43:31 -0000 1.23 +++ search_cal.c 24 May 2003 11:51:19 -0000 1.24 @@ -1074,7 +1074,7 @@ } else if (event->type == GDK_2BUTTON_PRESS && event->button == 1) { - gtk_film_view_new_show_all (TRUE, id, NULL); + gtk_film_view_new_show_all (TRUE, id, NULL, widget, iter); } if (id != NULL) Index: setup_win.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/setup_win.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- setup_win.c 23 May 2003 07:43:31 -0000 1.35 +++ setup_win.c 24 May 2003 11:51:19 -0000 1.36 @@ -591,6 +591,8 @@ Setup_global_ipc *setup_ipc; GtkSetup *setup; GtkSetupText *setup_text_advanced; + GtkSetupText *setup_text_general; + GtkSetupText *setup_text_platform; setup = gtk_setup_new (700, 500, _("Welcome to MVideo Setup")); gtk_setup_set_wmclass (setup, "MVideo: Preferencies", "MVideo"); @@ -610,20 +612,24 @@ databases_setup (setup_ipc); export_setup (setup_ipc); + setup_text_general = gtk_setup_add_menu_text (setup, _("General")); + gtk_setup_add_menu_entry (setup, _("General"), gdk_pixbuf_new_from_file (CONFIG_ICON, NULL), - setup_ipc->general->vbox, NULL); + setup_ipc->general->vbox, setup_text_general ); gtk_setup_add_menu_entry (setup, _("User"), gdk_pixbuf_new_from_file (USER_ICON, NULL), setup_ipc->user->vbox, - NULL); + setup_text_general ); + + setup_text_platform = gtk_setup_add_menu_text (setup, _("Platform")); gtk_setup_add_menu_entry (setup, _("Printer"), gdk_pixbuf_new_from_file (PRINTER_ICON, NULL), - setup_ipc->printer->vbox, NULL); + setup_ipc->printer->vbox, setup_text_platform); gtk_setup_add_menu_entry (setup, _("Sound"), gdk_pixbuf_new_from_file (SOUND_ICON, NULL), - setup_ipc->sound->vbox, NULL); + setup_ipc->sound->vbox, setup_text_platform); gtk_setup_add_menu_entry (setup, _("Database"), gdk_pixbuf_new_from_file (DAT_ICON, NULL), - setup_ipc->databases->vbox, NULL); + setup_ipc->databases->vbox, setup_text_platform); setup_text_advanced = gtk_setup_add_menu_text (setup, _("Advanced")); Index: title_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/title_cal.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- title_cal.c 23 May 2003 07:43:31 -0000 1.11 +++ title_cal.c 24 May 2003 11:51:19 -0000 1.12 @@ -275,7 +275,7 @@ } else if (event->type == GDK_2BUTTON_PRESS && event->button == 1 && selection != NULL) { - gtk_film_view_new_show_all (TRUE, id, NULL); + gtk_film_view_new_show_all (TRUE, id, NULL, widget, iter); } if (id != NULL) |
From: Luca R. <lit...@us...> - 2003-05-24 11:51:21
|
Update of /cvsroot/mvideo/MVideo/po In directory sc8-pr-cvs1:/tmp/cvs-serv30944/po Modified Files: POTFILES.in it.po mvideo.pot Log Message: Finished new film viewer Index: POTFILES.in =================================================================== RCS file: /cvsroot/mvideo/MVideo/po/POTFILES.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- POTFILES.in 24 Feb 2003 19:49:28 -0000 1.14 +++ POTFILES.in 24 May 2003 11:51:18 -0000 1.15 @@ -17,10 +17,6 @@ src/select_win.h src/select_cal.h src/select_cal.c -src/select_view_win.c -src/select_view_win.h -src/select_view_cal.h -src/select_view_cal.c src/help_win.c src/help_win.h src/help_cal.c @@ -60,3 +56,9 @@ src/project_setup_cal.c src/project_setup_cal.h src/main.c +src/film_view_wid.c +src/film_view_wid.h +src/film_view_cal.c +src/film_view_cal.h +src/setup_wid.h +src/setup_wid.c Index: it.po =================================================================== RCS file: /cvsroot/mvideo/MVideo/po/it.po,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- it.po 17 May 2003 17:56:17 -0000 1.54 +++ it.po 24 May 2003 11:51:18 -0000 1.55 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: MVideo\n" -"POT-Creation-Date: 2003-05-17 19:56+0200\n" -"PO-Revision-Date: 2003-05-17 19:57--100\n" +"POT-Creation-Date: 2003-05-23 09:56+0200\n" +"PO-Revision-Date: 2003-05-23 09:56--100\n" "Last-Translator: Luca Roccia <lit...@us...>\n" "Language-Team: Italian <lit...@us...>\n" "MIME-Version: 1.0\n" @@ -21,8 +21,7 @@ [...1215 lines suppressed...] -#: src/project_setup_cal.c:101 -msgid "MVideo: Collection: Preferces" -msgstr "\"MVideo: Collezione: Preferenze" - -#: src/project_setup_cal.c:136 +#: src/project_setup_cal.c:60 msgid "Don't use \"/\"" msgstr "Non utilizzate \"/\"" -#: src/project_setup_cal.c:141 -#: src/project_setup_cal.c:240 +#: src/project_setup_cal.c:65 src/project_setup_cal.c:158 msgid "NEW" msgstr "NUOVO" -#: src/project_setup_cal.c:154 +#: src/project_setup_cal.c:76 msgid "There is another entry with that name" msgstr "C'è già un elemento con quel nome" - Index: mvideo.pot =================================================================== RCS file: /cvsroot/mvideo/MVideo/po/mvideo.pot,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- mvideo.pot 17 May 2003 17:56:17 -0000 1.51 +++ mvideo.pot 24 May 2003 11:51:18 -0000 1.52 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-05-17 19:56+0200\n" +"POT-Creation-Date: 2003-05-23 09:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -77,22 +77,21 @@ #: src/callbacks.c:54 src/callbacks.c:69 src/select_win.c:146 #: src/interface.c:184 src/interface.c:326 src/interface.c:333 #: src/interface.c:374 src/interface.c:381 src/interface.c:720 -#: src/setup_win.c:641 src/search_cal.c:776 src/search_cal.c:965 -#: src/title_cal.c:408 src/eximport.c:568 +#: src/setup_win.c:348 src/search_cal.c:776 src/search_cal.c:965 +#: src/title_cal.c:379 src/eximport.c:568 msgid "Title" msgstr "" #: src/callbacks.c:56 src/callbacks.c:71 src/db.c:635 src/select_win.c:296 -#: src/select_view_win.c:675 src/interface.c:327 src/interface.c:375 -#: src/interface.c:738 src/setup_win.c:698 src/search_cal.c:818 -#: src/eximport.c:1418 src/project_setup_win.c:155 +#: src/interface.c:327 src/interface.c:375 src/interface.c:738 +#: src/setup_win.c:398 src/search_cal.c:818 src/eximport.c:1413 +#: src/project_setup_win.c:124 msgid "Genre" msgstr "" #: src/callbacks.c:58 src/callbacks.c:73 src/db.c:642 src/select_win.c:180 -#: src/select_view_win.c:669 src/interface.c:328 src/interface.c:376 -#: src/interface.c:744 src/setup_win.c:658 src/search_cal.c:788 -#: src/eximport.c:1408 +#: src/interface.c:328 src/interface.c:376 src/interface.c:744 +#: src/setup_win.c:363 src/search_cal.c:788 src/eximport.c:1403 msgid "Director" msgstr "" @@ -113,14 +112,13 @@ msgstr "" #. End notebook -#: src/generic_win.c:174 src/select_win.c:554 src/select_view_win.c:147 -#: src/print_win.c:129 src/first_setup_win.c:371 src/project_menu.c:208 +#: src/generic_win.c:174 src/select_win.c:554 src/print_win.c:129 +#: src/first_setup_win.c:371 src/project_menu.c:208 msgid "Close" msgstr "" #: src/generic_win.c:240 src/generic_win.c:242 src/generic_win.c:271 #: src/generic_win.c:322 src/generic_win.c:420 src/project_menu.c:141 -#: src/project_setup_win.c:251 msgid "Collection" msgstr "" @@ -128,16 +126,16 @@ msgid "Open" msgstr "" -#: src/generic_win.c:242 src/select_view_win.c:200 +#: src/generic_win.c:242 msgid "Delete" msgstr "" -#: src/generic_win.c:322 src/eximport.c:836 +#: src/generic_win.c:322 src/eximport.c:831 msgid "Choose" msgstr "" -#: src/generic_win.c:374 src/eximport.c:1465 src/eximport.c:1566 -#: src/eximport.c:1603 +#: src/generic_win.c:374 src/eximport.c:1460 src/eximport.c:1561 +#: src/eximport.c:1598 msgid "Select file" msgstr "" @@ -169,39 +167,39 @@ msgid "About" msgstr "" -#: src/support.c:96 src/select_view_win.c:367 +#: src/support.c:96 msgid "Unable to create config file" msgstr "" -#: src/support.c:448 +#: src/support.c:446 msgid "Usage" msgstr "" -#: src/support.c:448 +#: src/support.c:446 msgid "print this screen" msgstr "" -#: src/support.c:448 +#: src/support.c:446 msgid "print option's help. Do --help help to know more" msgstr "" -#: src/support.c:449 +#: src/support.c:446 msgid "print MVideo version" msgstr "" -#: src/support.c:450 +#: src/support.c:446 msgid "run setup" msgstr "" -#: src/support.c:450 +#: src/support.c:446 msgid "run first setup" msgstr "" -#: src/support.c:450 +#: src/support.c:446 msgid "open an archive" msgstr "" -#: src/support.c:456 +#: src/support.c:453 msgid "" "print a short description of what a command can do or not. Supported " "commands:\n" @@ -210,19 +208,19 @@ "\topen" msgstr "" -#: src/support.c:459 +#: src/support.c:456 msgid "any previous configuration will be deleted and a new one will be saved" msgstr "" -#: src/support.c:462 +#: src/support.c:459 msgid "Open an archive \"[File]\" without the need to run all MVideo" msgstr "" -#: src/support.c:464 +#: src/support.c:461 msgid "Command not found" msgstr "" -#: src/support.c:523 +#: src/support.c:517 msgid "" "Your collection is old\n" "You need to upgrade to use this version of MVideo\n" @@ -237,10 +235,9 @@ msgid "Directors" msgstr "" -#: src/db.c:648 src/select_win.c:339 src/select_view_win.c:680 -#: src/select_view_win.c:687 src/interface.c:329 src/interface.c:377 -#: src/interface.c:732 src/setup_win.c:682 src/search_cal.c:806 -#: src/eximport.c:1414 +#: src/db.c:648 src/select_win.c:339 src/interface.c:329 src/interface.c:377 +#: src/interface.c:732 src/setup_win.c:384 src/search_cal.c:806 +#: src/eximport.c:1409 msgid "Year" msgstr "" @@ -249,7 +246,7 @@ msgstr "" #. First column -#: src/db.c:654 src/title_cal.c:398 +#: src/db.c:654 src/title_cal.c:372 msgid "Number" msgstr "" @@ -272,8 +269,7 @@ msgid "Not available" msgstr "" -#: src/db.c:910 src/select_win.c:455 src/setup_win.c:216 src/setup_cal.c:212 -#: src/setup_cal.c:213 +#: src/db.c:910 src/select_win.c:455 src/setup_win.c:615 src/setup_win.c:617 msgid "General" msgstr "" @@ -281,9 +277,8 @@ msgid "Films" msgstr "" -#: src/db.c:910 src/select_win.c:487 src/select_win.c:507 -#: src/select_view_win.c:743 src/interface.c:188 src/interface.c:623 -#: src/setup_win.c:778 src/eximport.c:1440 +#: src/db.c:910 src/select_win.c:487 src/select_win.c:507 src/interface.c:188 +#: src/interface.c:623 src/setup_win.c:468 src/eximport.c:1435 msgid "Notes" msgstr "" @@ -311,8 +306,7 @@ msgid "Name" msgstr "" -#: src/db.c:913 src/setup_win.c:227 src/setup_win.c:878 src/setup_cal.c:217 -#: src/setup_cal.c:218 +#: src/db.c:913 src/setup_win.c:554 src/setup_win.c:620 msgid "User" msgstr "" @@ -340,21 +334,20 @@ msgid "Server version" msgstr "" -#: src/db.c:916 src/first_setup_win.c:140 src/setup_win.c:566 +#: src/db.c:916 src/first_setup_win.c:140 src/setup_win.c:279 msgid "Host" msgstr "" -#: src/db.c:1197 src/select_cal.c:358 src/select_view_win.c:570 +#: src/db.c:1197 src/select_cal.c:358 msgid "Error" msgstr "" -#: src/db.c:1197 src/select_cal.c:358 src/select_view_win.c:570 +#: src/db.c:1197 src/select_cal.c:358 msgid "There isn't any film with that id" msgstr "" -#: src/select_win.c:101 src/select_win.c:594 src/select_view_win.c:188 -#: src/interface.c:581 src/notes_cal.c:55 src/search_cal.c:1036 -#: src/title_cal.c:326 +#: src/select_win.c:101 src/select_win.c:594 src/interface.c:581 +#: src/notes_cal.c:55 src/search_cal.c:1036 src/title_cal.c:303 msgid "Modify" msgstr "" @@ -362,28 +355,28 @@ msgid "MVideo: Add" msgstr "" -#: src/select_win.c:158 src/select_view_win.c:667 src/interface.c:726 -#: src/setup_win.c:650 src/search_cal.c:782 src/eximport.c:1406 +#: src/select_win.c:158 src/interface.c:726 src/setup_win.c:356 +#: src/search_cal.c:782 src/eximport.c:1401 msgid "Original title" msgstr "" -#: src/select_win.c:197 src/select_view_win.c:671 src/interface.c:756 -#: src/setup_win.c:666 src/search_cal.c:794 src/eximport.c:1410 +#: src/select_win.c:197 src/interface.c:756 src/setup_win.c:370 +#: src/search_cal.c:794 src/eximport.c:1405 msgid "Producer" msgstr "" -#: src/select_win.c:209 src/select_view_win.c:700 src/interface.c:750 -#: src/setup_win.c:674 src/search_cal.c:800 src/eximport.c:1412 +#: src/select_win.c:209 src/interface.c:750 src/setup_win.c:377 +#: src/search_cal.c:800 src/eximport.c:1407 msgid "Actors" msgstr "" -#: src/select_win.c:231 src/select_view_win.c:673 src/interface.c:762 -#: src/setup_win.c:706 src/search_cal.c:842 src/eximport.c:1420 +#: src/select_win.c:231 src/interface.c:762 src/setup_win.c:405 +#: src/search_cal.c:842 src/eximport.c:1415 msgid "Distributor" msgstr "" -#: src/select_win.c:248 src/select_view_win.c:703 src/interface.c:768 -#: src/setup_win.c:762 src/search_cal.c:866 src/eximport.c:1435 +#: src/select_win.c:248 src/interface.c:768 src/setup_win.c:454 +#: src/search_cal.c:866 src/eximport.c:1430 msgid "Stars" msgstr "" @@ -391,13 +384,13 @@ msgid "Leave \"-1\" to not search stars" msgstr "" -#: src/select_win.c:275 src/select_view_win.c:706 src/interface.c:839 -#: src/setup_win.c:730 src/search_cal.c:860 src/project_setup_win.c:173 +#: src/select_win.c:275 src/interface.c:839 src/setup_win.c:426 +#: src/search_cal.c:860 src/project_setup_win.c:136 msgid "Language" msgstr "" -#: src/select_win.c:322 src/select_view_win.c:677 src/interface.c:814 -#: src/setup_win.c:714 src/search_cal.c:848 src/eximport.c:1422 +#: src/select_win.c:322 src/interface.c:814 src/setup_win.c:412 +#: src/search_cal.c:848 src/eximport.c:1417 msgid "Country" msgstr "" @@ -405,41 +398,36 @@ msgid "Leave \"1900\" to not search year" msgstr "" -#: src/select_win.c:359 src/select_view_win.c:691 src/select_view_win.c:697 -#: src/interface.c:802 src/setup_win.c:690 src/search_cal.c:812 -#: src/eximport.c:1416 +#: src/select_win.c:359 src/interface.c:802 src/setup_win.c:391 +#: src/search_cal.c:812 src/eximport.c:1411 msgid "Time" msgstr "" -#: src/select_win.c:381 src/select_view_win.c:718 src/interface.c:774 -#: src/search_cal.c:824 src/eximport.c:1425 src/project_setup_win.c:161 +#: src/select_win.c:381 src/interface.c:774 src/search_cal.c:824 +#: src/eximport.c:1420 src/project_setup_win.c:128 msgid "Format" msgstr "" -#: src/select_win.c:403 src/select_view_win.c:721 src/select_view_win.c:727 -#: src/interface.c:904 src/search_cal.c:830 src/eximport.c:1429 -#: src/project_setup_win.c:167 +#: src/select_win.c:403 src/interface.c:904 src/search_cal.c:830 +#: src/eximport.c:1424 src/project_setup_win.c:132 msgid "Audio" msgstr "" -#: src/select_win.c:425 src/select_view_win.c:709 src/select_view_win.c:715 -#: src/interface.c:934 src/setup_win.c:746 src/search_cal.c:836 -#: src/eximport.c:1431 +#: src/select_win.c:425 src/interface.c:934 src/setup_win.c:440 +#: src/search_cal.c:836 src/eximport.c:1426 msgid "Quality" msgstr "" -#: src/select_win.c:442 src/select_view_win.c:731 src/select_view_win.c:737 -#: src/interface.c:921 src/setup_win.c:754 src/search_cal.c:854 -#: src/eximport.c:1433 +#: src/select_win.c:442 src/interface.c:921 src/setup_win.c:447 +#: src/search_cal.c:854 src/eximport.c:1428 msgid "CDs" msgstr "" -#: src/select_win.c:467 src/select_view_win.c:742 src/setup_win.c:770 -#: src/eximport.c:1438 +#: src/select_win.c:467 src/setup_win.c:461 src/eximport.c:1433 msgid "Story" msgstr "" -#: src/select_win.c:547 src/setup_win.c:786 +#: src/select_win.c:547 src/setup_win.c:475 msgid "Picture" msgstr "" @@ -466,7 +454,7 @@ msgid "Leave 1900 to not memorize any year" msgstr "" -#: src/select_win.c:583 src/setup_win.c:1047 +#: src/select_win.c:583 src/setup_win.c:650 msgid "Save" msgstr "" @@ -530,66 +518,6 @@ msgid "Modified" msgstr "" -#. GtkWidget *print; -#: src/select_view_win.c:164 src/select_view_cal.c:186 src/print_win.c:92 -#: src/print_win.c:100 src/search_cal.c:1215 src/title_cal.c:214 -#: src/project_menu.c:64 -msgid "Print" -msgstr "" - -#: src/select_view_win.c:170 -msgid "Print preview" -msgstr "" - -#: src/select_view_win.c:194 src/setup_win.c:277 src/setup_cal.c:232 -#: src/setup_cal.c:233 src/search_cal.c:1043 src/title_cal.c:334 -#: src/eximport.c:1537 src/project_menu.c:163 -msgid "Export" -msgstr "" - -#: src/select_view_win.c:217 -msgid "Show next" -msgstr "" - -#: src/select_view_win.c:223 -msgid "Show prev" -msgstr "" - -#: src/select_view_win.c:240 -msgid "Go fullscreen" -msgstr "" - -#: src/select_view_win.c:365 -msgid "Cannont create or write file" -msgstr "" - -#: src/select_view_win.c:366 -msgid "Please check permissions" -msgstr "" - -#: src/select_view_win.c:588 -msgid "View" -msgstr "" - -#: src/select_view_cal.c:66 src/search_cal.c:1124 src/title_cal.c:135 -msgid "Deleted film" -msgstr "" - -#: src/select_view_cal.c:172 src/search_cal.c:1187 src/title_cal.c:175 -msgid "Modify film" -msgstr "" - -#. GtkWidget *print; -#: src/select_view_cal.c:197 src/print_win.c:108 src/print_win.c:116 -#: src/search_cal.c:1225 src/title_cal.c:228 src/project_menu.c:79 -msgid "Preview" -msgstr "" - -#: src/select_view_cal.c:230 src/notes_cal.c:141 src/search_cal.c:1158 -#: src/title_cal.c:101 -msgid "Sure to delete" -msgstr "" - #: src/help_win.c:82 msgid "Argument" msgstr "" @@ -602,6 +530,18 @@ msgid "List" msgstr "" +#. GtkWidget *print; +#: src/print_win.c:92 src/print_win.c:100 src/search_cal.c:1212 +#: src/title_cal.c:199 src/project_menu.c:64 src/film_view_cal.c:165 +msgid "Print" +msgstr "" + +#. GtkWidget *print; +#: src/print_win.c:108 src/print_win.c:116 src/search_cal.c:1222 +#: src/title_cal.c:212 src/project_menu.c:79 src/film_view_cal.c:176 +msgid "Preview" +msgstr "" + #: src/interface.c:90 msgid "File" msgstr "" @@ -646,7 +586,7 @@ msgid "Identifier" msgstr "" -#: src/interface.c:606 src/setup_win.c:1099 +#: src/interface.c:606 src/setup_win.c:684 msgid "Cancel" msgstr "" @@ -707,7 +647,7 @@ msgid "User name" msgstr "" -#: src/first_setup_win.c:128 src/setup_win.c:882 +#: src/first_setup_win.c:128 src/setup_win.c:557 msgid "Password" msgstr "" @@ -799,106 +739,105 @@ msgid "Created default database" msgstr "" -#: src/setup_win.c:237 src/setup_cal.c:222 src/setup_cal.c:223 -msgid "Printer" -msgstr "" - -#: src/setup_win.c:248 src/setup_cal.c:227 src/setup_cal.c:228 -msgid "Sound" -msgstr "" - -#: src/setup_win.c:258 src/setup_cal.c:237 src/setup_cal.c:238 -msgid "Databases" -msgstr "" - -#: src/setup_win.c:268 -msgid "Advanced" -msgstr "" - -#: src/setup_win.c:314 +#: src/setup_win.c:75 msgid "Pixmaps" msgstr "" -#: src/setup_win.c:336 +#: src/setup_win.c:90 msgid "Logo" msgstr "" -#: src/setup_win.c:340 +#: src/setup_win.c:93 msgid "Show start logo" msgstr "" -#: src/setup_win.c:351 +#: src/setup_win.c:101 msgid "Update main list" msgstr "" -#: src/setup_win.c:360 +#: src/setup_win.c:107 msgid "on adding a title" msgstr "" -#: src/setup_win.c:369 +#: src/setup_win.c:114 msgid "on modifying a title" msgstr "" -#: src/setup_win.c:378 +#: src/setup_win.c:121 msgid "on deleteing a title" msgstr "" -#: src/setup_win.c:471 +#: src/setup_win.c:199 msgid "Play sound" msgstr "" -#: src/setup_win.c:482 +#: src/setup_win.c:207 msgid "Files" msgstr "" -#: src/setup_win.c:552 src/setup_win.c:864 +#: src/setup_win.c:269 src/setup_win.c:544 msgid "Settings" msgstr "" -#: src/setup_win.c:570 +#: src/setup_win.c:282 msgid "Default collection" msgstr "" -#: src/setup_win.c:625 +#: src/setup_win.c:332 msgid "Txt options" msgstr "" -#: src/setup_win.c:722 +#: src/setup_win.c:419 msgid "Video format" msgstr "" -#: src/setup_win.c:738 +#: src/setup_win.c:433 msgid "Audio format" msgstr "" -#: src/setup_win.c:794 +#: src/setup_win.c:482 msgid "export in UTF-8" msgstr "" -#: src/setup_win.c:886 +#: src/setup_win.c:560 msgid "Confirmation" msgstr "" -#: src/setup_win.c:947 src/setup_win.c:995 src/project_menu.c:190 -#: src/project_setup_win.c:251 src/project_setup_win.c:301 -msgid "Preferences" +#: src/setup_win.c:597 src/project_setup_win.c:169 +msgid "Welcome to MVideo Setup" msgstr "" -#: src/setup_win.c:1003 -msgid "Welcome to MVideo Setup" +#: src/setup_win.c:623 +msgid "Platform" msgstr "" -#: src/setup_win.c:1073 -msgid "Apply" +#: src/setup_win.c:625 +msgid "Printer" msgstr "" -#: src/setup_cal.c:106 -msgid "Password not changed: password doesn't match with confirm" +#: src/setup_win.c:628 +msgid "Sound" +msgstr "" + +#: src/setup_win.c:631 +msgid "Database" +msgstr "" + +#: src/setup_win.c:634 +msgid "Advanced" +msgstr "" + +#: src/setup_win.c:636 src/search_cal.c:1043 src/title_cal.c:310 +#: src/eximport.c:1532 src/project_menu.c:163 +msgid "Export" +msgstr "" + +#: src/setup_win.c:667 +msgid "Apply" msgstr "" -#: src/setup_cal.c:213 src/setup_cal.c:218 src/setup_cal.c:223 -#: src/setup_cal.c:228 src/setup_cal.c:233 src/setup_cal.c:238 -msgid "MVideo: Preferences" +#: src/setup_cal.c:61 +msgid "Password not changed: password doesn't match with confirm" msgstr "" #: src/generic_funcs.c:48 @@ -907,19 +846,24 @@ "Are you sure to quit?" msgstr "" -#: src/about_cal.c:403 +#: src/notes_cal.c:141 src/search_cal.c:1155 src/title_cal.c:98 +#: src/film_view_cal.c:150 +msgid "Sure to delete" +msgstr "" + +#: src/about_cal.c:402 msgid "<big><b>was brought</b></big>" msgstr "" -#: src/about_cal.c:420 +#: src/about_cal.c:419 msgid "<big><b>to you by:</b></big>" msgstr "" -#: src/about_cal.c:729 +#: src/about_cal.c:718 msgid "<big><b>And many more ...</b></big>" msgstr "" -#: src/about_cal.c:754 +#: src/about_cal.c:743 msgid "<big><b>Copyright Luca Roccia</b></big>" msgstr "" @@ -983,7 +927,15 @@ msgid "Search duplicates" msgstr "" -#: src/title_cal.c:73 +#: src/search_cal.c:1121 src/title_cal.c:129 src/film_view_cal.c:68 +msgid "Deleted film" +msgstr "" + +#: src/search_cal.c:1184 src/title_cal.c:165 src/film_view_cal.c:111 +msgid "Modify film" +msgstr "" + +#: src/title_cal.c:70 msgid "Add title" msgstr "" @@ -1039,73 +991,73 @@ msgid "Importing" msgstr "" -#: src/eximport.c:680 src/eximport.c:836 src/project_menu.c:172 +#: src/eximport.c:677 src/eximport.c:831 src/project_menu.c:172 msgid "Import" msgstr "" -#: src/eximport.c:717 src/eximport.c:913 +#: src/eximport.c:714 src/eximport.c:908 msgid "Cannot open file" msgstr "" -#: src/eximport.c:849 +#: src/eximport.c:844 msgid "Poster yet owned" msgstr "" -#: src/eximport.c:855 +#: src/eximport.c:850 msgid "Overwrite" msgstr "" -#: src/eximport.c:857 +#: src/eximport.c:852 msgid "Rename" msgstr "" -#: src/eximport.c:859 +#: src/eximport.c:854 msgid "No image" msgstr "" -#: src/eximport.c:861 +#: src/eximport.c:856 msgid "Use local" msgstr "" -#: src/eximport.c:868 +#: src/eximport.c:863 msgid "Don't ask any more" msgstr "" -#: src/eximport.c:926 +#: src/eximport.c:921 msgid "Archive version not supported or not an MVideo archive" msgstr "" -#: src/eximport.c:990 src/eximport.c:1000 +#: src/eximport.c:985 src/eximport.c:995 msgid "Export list" msgstr "" -#: src/eximport.c:990 +#: src/eximport.c:985 msgid "Progress bar" msgstr "" -#: src/eximport.c:1044 +#: src/eximport.c:1039 msgid "" "File exist\n" "Do you want to overwrite?" msgstr "" -#: src/eximport.c:1073 src/eximport.c:1158 +#: src/eximport.c:1068 src/eximport.c:1153 msgid "Cannot write to file" msgstr "" -#: src/eximport.c:1120 src/eximport.c:1195 +#: src/eximport.c:1115 src/eximport.c:1190 msgid "Added title" msgstr "" -#: src/eximport.c:1427 +#: src/eximport.c:1422 msgid "Lang" msgstr "" -#: src/eximport.c:1491 +#: src/eximport.c:1486 msgid "Save file like:" msgstr "" -#: src/eximport.c:1545 +#: src/eximport.c:1540 msgid "Export all" msgstr "" @@ -1119,34 +1071,29 @@ "Please check your settings" msgstr "" -#: src/project_setup_win.c:85 src/project_setup_win.c:106 -#: src/project_setup_win.c:127 src/project_setup_win.c:148 +#: src/project_menu.c:190 +msgid "Preferences" +msgstr "" + +#: src/project_setup_win.c:71 src/project_setup_win.c:87 +#: src/project_setup_win.c:103 src/project_setup_win.c:119 msgid "Entry" msgstr "" -#: src/project_setup_win.c:212 src/project_setup_cal.c:100 -#: src/project_setup_cal.c:101 +#: src/project_setup_win.c:174 msgid "" "Auto\n" "completions" msgstr "" -#: src/project_setup_win.c:309 -msgid "Welcome to MVideo Collection Setup" -msgstr "" - -#: src/project_setup_cal.c:101 -msgid "MVideo: Collection: Preferces" -msgstr "" - -#: src/project_setup_cal.c:136 +#: src/project_setup_cal.c:60 msgid "Don't use \"/\"" msgstr "" -#: src/project_setup_cal.c:141 src/project_setup_cal.c:240 +#: src/project_setup_cal.c:65 src/project_setup_cal.c:158 msgid "NEW" msgstr "" -#: src/project_setup_cal.c:154 +#: src/project_setup_cal.c:76 msgid "There is another entry with that name" msgstr "" |
From: Luca R. <lit...@us...> - 2003-05-23 07:45:25
|
Update of /cvsroot/mvideo/MVideo/src In directory sc8-pr-cvs1:/tmp/cvs-serv4857/src Added Files: setup_wid.c setup_wid.h Log Message: Major core enhanchement --- NEW FILE: setup_wid.c --- /* * MVideo, setup_wid.c * * Copyright (C) 2002-2003, Luca Roccia <lit...@us...> * * This program 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 program 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 program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <gtk/gtk.h> #include "setup_wid.h" #define SETUP_ARROW_DOWN "/home/little_rock/mvideo/MVideo/pixmaps/setup_arrow_down.png" #define BLINK_TIMES 15 #define BLINK_STEP 800 typedef struct _GtkSetupBlinkColor GtkSetupBlinkColor; struct _GtkSetupBlinkColor { int setup_blink_times; GtkWidget *widget; }; gboolean gtk_setup_menu_enter_notify_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); gboolean gtk_setup_menu_enter_notify_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); gboolean gtk_setup_menu_text_press_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); gboolean gtk_setup_menu_entry_press_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); gboolean gtk_setup_menu_entry_blink (gpointer data); gboolean gtk_setup_menu_enter_notify_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { GdkCursor *cursor; cursor = gdk_cursor_new (GDK_HAND2); gdk_window_set_cursor (GTK_WIDGET (user_data)->window, cursor); gdk_cursor_unref (cursor); return FALSE; } gboolean gtk_setup_menu_leave_notify_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { gdk_window_set_cursor (GTK_WIDGET (user_data)->window, NULL); return FALSE; } gboolean gtk_setup_menu_entry_blink (gpointer data) { GdkColor color; GdkColor light_blue = { 0, 10000, 10000, 65535 }; int position; GtkSetupBlinkColor *blink_color; blink_color = data; position = BLINK_TIMES - blink_color->setup_blink_times; color.pixel = 0; color.red = 65535 - (BLINK_STEP * position); color.green = 65535 - (BLINK_STEP * position); color.blue = 65535; gtk_widget_modify_bg (blink_color->widget, 0, &color); gtk_widget_modify_bg (blink_color->widget, 1, &color); gtk_widget_modify_bg (blink_color->widget, 2, &color); gtk_widget_modify_bg (blink_color->widget, 3, &color); gtk_widget_modify_bg (blink_color->widget, 4, &color); if (blink_color->setup_blink_times-- > 0) return TRUE; else { gtk_viewport_set_shadow_type (GTK_VIEWPORT (blink_color->widget->parent), GTK_SHADOW_ETCHED_IN); gtk_widget_modify_bg (blink_color->widget->parent, 0, &light_blue); gtk_widget_modify_bg (blink_color->widget->parent, 1, &light_blue); gtk_widget_modify_bg (blink_color->widget->parent, 2, &light_blue); gtk_widget_modify_bg (blink_color->widget->parent, 3, &light_blue); gtk_widget_modify_bg (blink_color->widget->parent, 4, &light_blue); g_free (blink_color); return FALSE; } } gboolean gtk_setup_menu_entry_press_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { GtkSetup *setup; GdkColor white = { 0, 65535, 65535, 65535 }; GtkSetupBlinkColor *blink_color; GtkSetupEntry *setup_entry; GList *list; setup = user_data; if (setup->old != widget) { blink_color = (GtkSetupBlinkColor *) g_malloc (sizeof (GtkSetupBlinkColor)); blink_color->setup_blink_times = BLINK_TIMES; blink_color->widget = widget; if (setup->timeout_entry != 0) gtk_timeout_remove (setup->timeout_entry); setup->timeout_entry = gtk_timeout_add (40, gtk_setup_menu_entry_blink, blink_color); if (setup->old != NULL) { gtk_widget_modify_bg (setup->old, 0, &white); gtk_widget_modify_bg (setup->old, 1, &white); gtk_widget_modify_bg (setup->old, 2, &white); gtk_widget_modify_bg (setup->old, 3, &white); gtk_widget_modify_bg (setup->old, 4, &white); gtk_viewport_set_shadow_type (GTK_VIEWPORT (setup->old->parent), GTK_SHADOW_NONE); gtk_widget_modify_bg (setup->old->parent, 0, &white); gtk_widget_modify_bg (setup->old->parent, 1, &white); gtk_widget_modify_bg (setup->old->parent, 2, &white); gtk_widget_modify_bg (setup->old->parent, 3, &white); gtk_widget_modify_bg (setup->old->parent, 4, &white); } gtk_widget_hide (setup->label); list = setup->entries; while (list != NULL) { setup_entry = list->data; if (setup_entry->eventbox == widget) gtk_widget_show_all (setup_entry->reference); else if (setup_entry->eventbox == setup->old) gtk_widget_hide_all (setup_entry->reference); list = list->next; } setup->old = widget; } return FALSE; } gboolean gtk_setup_menu_text_press_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { GtkSetupText *setup_text; setup_text = user_data; if (setup_text->active == TRUE) { gtk_widget_hide_all (setup_text->vbox); setup_text->active = FALSE; } else { gtk_widget_show_all (setup_text->vbox); setup_text->active = TRUE; } return FALSE; } GtkSetup * gtk_setup_new (gint xsize, gint ysize, gchar * welcome_msg) { GtkSetup *setup; GtkWidget *window; GtkWidget *vbox; GtkWidget *scrolledwindow; GtkWidget *label; GtkWidget *frame; GtkWidget *hpaned; GtkWidget *menu; GtkWidget *reference; GtkWidget *viewport; GdkColor white = { 0, 65535, 65535, 65535 }; setup = (GtkSetup *) g_malloc (sizeof (GtkSetup)); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); if (xsize != 0 && ysize != 0) gtk_widget_set_size_request (window, xsize, ysize); vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox); gtk_container_add (GTK_CONTAINER (window), vbox); hpaned = gtk_hpaned_new (); gtk_widget_show (hpaned); gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow); gtk_paned_pack1 (GTK_PANED (hpaned), scrolledwindow, FALSE, FALSE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); viewport = gtk_viewport_new (NULL, NULL); gtk_widget_show (viewport); gtk_container_add (GTK_CONTAINER (scrolledwindow), viewport); gtk_widget_modify_bg (viewport, 0, &white); gtk_widget_modify_bg (viewport, 1, &white); gtk_widget_modify_bg (viewport, 2, &white); gtk_widget_modify_bg (viewport, 3, &white); gtk_widget_modify_bg (viewport, 4, &white); menu = gtk_vbox_new (FALSE, 5); gtk_widget_show (menu); gtk_container_add (GTK_CONTAINER (viewport), menu); frame = gtk_frame_new (NULL); gtk_widget_show (frame); gtk_paned_pack2 (GTK_PANED (hpaned), frame, TRUE, TRUE); reference = gtk_vbox_new (FALSE, 0); gtk_widget_show (reference); gtk_container_add (GTK_CONTAINER (frame), reference); label = gtk_label_new (welcome_msg); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (reference), label, TRUE, TRUE, 0); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); setup->menu = menu; setup->bar = hpaned; setup->reference = reference; setup->bottom = NULL; setup->window = window; setup->main_vbox = vbox; setup->label = label; setup->entries = NULL; setup->texts = NULL; return setup; } void gtk_setup_show (GtkSetup * setup) { gtk_widget_show (setup->window); return; } void gtk_setup_set_title (GtkSetup * setup, gchar * title) { gtk_window_set_title (GTK_WINDOW (setup->window), title); return; } void gtk_setup_set_wmclass (GtkSetup * setup, gchar * wmclass_name, gchar * wmclass_class) { gtk_window_set_wmclass (GTK_WINDOW (setup->window), wmclass_name, wmclass_class); return; } void gtk_setup_add_bottom (GtkSetup * setup, GtkWidget * element) { if (setup->bottom == NULL) { GtkWidget *bottom; bottom = gtk_hbox_new (FALSE, 10); gtk_widget_show (bottom); gtk_box_pack_start (GTK_BOX (setup->main_vbox), bottom, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (bottom), 8); setup->bottom = bottom; } gtk_box_pack_start (GTK_BOX (setup->bottom), element, TRUE, TRUE, 0); return; } void gtk_setup_add_menu_entry (GtkSetup * setup, gchar * name, GdkPixbuf * pixbuf, GtkWidget * reference, GtkSetupText *text) { GtkSetupEntry *entry; GtkWidget *label; GdkColor blue = { 0, 0, 0, 65535 }; GdkColor white = { 0, 65535, 65535, 65535 }; GtkWidget *alignment; GtkWidget *viewport; GtkWidget *vbox; GtkWidget *image; GtkWidget *eventbox; PangoLayout *layout; PangoRectangle extents; entry = (GtkSetupEntry *) g_malloc (sizeof (GtkSetupEntry)); alignment = gtk_alignment_new (0.5, 0.5, 0, 0); viewport = gtk_viewport_new (NULL, NULL); gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE); gtk_widget_show (viewport); gtk_container_add (GTK_CONTAINER (alignment), viewport); gtk_widget_modify_bg (viewport, 0, &white); gtk_widget_modify_bg (viewport, 1, &white); gtk_widget_modify_bg (viewport, 2, &white); gtk_widget_modify_bg (viewport, 3, &white); gtk_widget_modify_bg (viewport, 4, &white); eventbox = gtk_event_box_new (); gtk_container_add (GTK_CONTAINER (viewport), eventbox); gtk_widget_show (eventbox); gtk_widget_modify_bg (eventbox, 0, &white); gtk_widget_modify_bg (eventbox, 1, &white); gtk_widget_modify_bg (eventbox, 2, &white); gtk_widget_modify_bg (eventbox, 3, &white); gtk_widget_modify_bg (eventbox, 4, &white); vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); gtk_widget_show (vbox); gtk_container_add (GTK_CONTAINER (eventbox), vbox); image = gtk_image_new_from_pixbuf (pixbuf); gtk_widget_show (image); gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 0); label = gtk_label_new (name); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); gtk_widget_modify_fg (label, 0, &blue); gtk_widget_modify_fg (label, 1, &blue); gtk_widget_modify_fg (label, 2, &blue); gtk_widget_modify_fg (label, 3, &blue); gtk_widget_modify_fg (label, 4, &blue); layout = gtk_label_get_layout (GTK_LABEL (label)); pango_layout_get_pixel_extents (layout, NULL, &extents); gtk_widget_set_size_request (alignment, extents.width, -1); gtk_widget_show (alignment); if (text == NULL) gtk_box_pack_start (GTK_BOX (setup->menu), alignment, FALSE, FALSE, 0); else gtk_box_pack_start (GTK_BOX (text->vbox), alignment, FALSE, FALSE, 0); if (extents.width > (gtk_paned_get_position (GTK_PANED (setup->bar)) - 30)) gtk_paned_set_position (GTK_PANED (setup->bar), extents.width + 30); g_signal_connect (eventbox, "enter_notify_event", G_CALLBACK (gtk_setup_menu_enter_notify_event), setup->window); g_signal_connect (eventbox, "leave_notify_event", G_CALLBACK (gtk_setup_menu_leave_notify_event), setup->window); g_signal_connect (eventbox, "button_press_event", G_CALLBACK (gtk_setup_menu_entry_press_event), setup); gtk_box_pack_start (GTK_BOX (setup->reference), reference, TRUE, TRUE, 0); entry->reference = reference; entry->label = label; entry->image = GTK_IMAGE(image); entry->eventbox = eventbox; setup->entries = g_list_append (setup->entries, entry); return; } GtkSetupText * gtk_setup_add_menu_text (GtkSetup * setup, gchar * name) { GtkSetupText *text; GtkWidget *viewport_2; GtkWidget *hbox; GtkWidget *label; GdkColor blue = { 0, 0, 0, 65535 }; GdkColor white = { 0, 65535, 65535, 65535 }; GtkWidget *alignment; GtkWidget *viewport; GtkWidget *vbox; GtkWidget *vbox_entries; GtkWidget *strob_left; GtkWidget *strob_right; GtkWidget *eventbox; PangoLayout *layout; PangoRectangle extents; text = (GtkSetupText *) g_malloc (sizeof (GtkSetupText)); alignment = gtk_alignment_new (0.5, 0.5, 0, 0); viewport = gtk_viewport_new (NULL, NULL); gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE); gtk_widget_show (viewport); gtk_container_add (GTK_CONTAINER (alignment), viewport); gtk_widget_modify_bg (viewport, 0, &white); gtk_widget_modify_bg (viewport, 1, &white); gtk_widget_modify_bg (viewport, 2, &white); gtk_widget_modify_bg (viewport, 3, &white); gtk_widget_modify_bg (viewport, 4, &white); vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); gtk_widget_show (vbox); gtk_container_add (GTK_CONTAINER (viewport), vbox); viewport_2 = gtk_viewport_new (NULL, NULL); gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport_2), GTK_SHADOW_NONE); gtk_widget_show (viewport_2); gtk_box_pack_start (GTK_BOX (vbox), viewport_2, FALSE, FALSE, 0); gtk_widget_modify_bg (viewport_2, 0, &blue); gtk_widget_modify_bg (viewport_2, 1, &blue); gtk_widget_modify_bg (viewport_2, 2, &blue); gtk_widget_modify_bg (viewport_2, 3, &blue); gtk_widget_modify_bg (viewport_2, 4, &blue); hbox = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); strob_left = gtk_image_new_from_file (SETUP_ARROW_DOWN); gtk_widget_show (strob_left); gtk_box_pack_start (GTK_BOX (hbox), strob_left, FALSE, FALSE, 0); eventbox = gtk_event_box_new (); gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 5); gtk_widget_show (eventbox); gtk_widget_modify_bg (eventbox, 0, &white); gtk_widget_modify_bg (eventbox, 1, &white); gtk_widget_modify_bg (eventbox, 2, &white); gtk_widget_modify_bg (eventbox, 3, &white); gtk_widget_modify_bg (eventbox, 4, &white); label = gtk_label_new (name); gtk_widget_show (label); gtk_container_add (GTK_CONTAINER (eventbox), label); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); strob_right = gtk_image_new_from_file (SETUP_ARROW_DOWN); gtk_widget_show (strob_right); gtk_box_pack_start (GTK_BOX (hbox), strob_right, FALSE, FALSE, 0); viewport_2 = gtk_viewport_new (NULL, NULL); gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport_2), GTK_SHADOW_NONE); gtk_widget_show (viewport_2); gtk_box_pack_start (GTK_BOX (vbox), viewport_2, FALSE, FALSE, 0); gtk_widget_modify_bg (viewport_2, 0, &blue); gtk_widget_modify_bg (viewport_2, 1, &blue); gtk_widget_modify_bg (viewport_2, 2, &blue); gtk_widget_modify_bg (viewport_2, 3, &blue); gtk_widget_modify_bg (viewport_2, 4, &blue); layout = gtk_label_get_layout (GTK_LABEL (label)); pango_layout_get_pixel_extents (layout, NULL, &extents); gtk_widget_set_size_request (alignment, extents.width, -1); gtk_widget_show (alignment); gtk_box_pack_start (GTK_BOX (setup->menu), alignment, FALSE, FALSE, 0); if (extents.width > (gtk_paned_get_position (GTK_PANED (setup->bar)) - 70)) gtk_paned_set_position (GTK_PANED (setup->bar), extents.width + 70); vbox_entries = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (setup->menu), vbox_entries, FALSE, FALSE, 0); g_signal_connect (eventbox, "enter_notify_event", G_CALLBACK (gtk_setup_menu_enter_notify_event), setup->window); g_signal_connect (eventbox, "leave_notify_event", G_CALLBACK (gtk_setup_menu_leave_notify_event), setup->window); g_signal_connect (eventbox, "button_press_event", G_CALLBACK (gtk_setup_menu_text_press_event), text); text->label = label; text->vbox = vbox_entries; text->strob_left = GTK_IMAGE(strob_left); text->strob_right = GTK_IMAGE(strob_right); text->active = FALSE; setup->texts = g_list_append (setup->texts, text); return text; } void gtk_setup_menu_entry_set_label (GtkSetupEntry * entry, gchar * name) { gtk_label_set_text (GTK_LABEL (entry->label), name); return; } void gtk_setup_menu_entry_set_image (GtkSetupEntry * entry, GdkPixbuf * image) { gtk_image_set_from_pixbuf (GTK_IMAGE (entry->image), image); return; } void gtk_setup_menu_text_set_label (GtkSetupText * text, gchar * name) { gtk_label_set_text (GTK_LABEL (text->label), name); return; } void gtk_setup_bar_set_rsize (GtkSetup * setup, gint rsize) { gtk_paned_set_position (GTK_PANED (setup->bar), rsize); return; } void gtk_setup_quit (GtkSetup * setup) { GList *list; list = setup->entries; while (list != NULL) { g_free (list->data); list = list->next; } list = setup->texts; while (list != NULL) { g_free (list->data); list = list->next; } g_free (setup); return; } GtkWidget * gtk_setup_get_window (GtkSetup * setup) { return setup->window; } --- NEW FILE: setup_wid.h --- /* * MVideo, setup_wid.h * * Copyright (C) 2002-2003, Luca Roccia <lit...@us...> * * This program 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 program 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 program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * Aggiungere effetto di slide * Aggiungere gli strobes * Possibilità di settare il BLINK_TIMES per fade, 0->no effetto * Possibilità di settare il colore finale per fade * Il colore finale di fade deve essere indipendente dal BLINK_TIMES * Aggiungere tooltips */ typedef struct _GtkSetup GtkSetup; typedef struct _GtkSetupText GtkSetupText; typedef struct _GtkSetupEntry GtkSetupEntry; struct _GtkSetup { GtkWidget *menu; GtkWidget *bar; GtkWidget *reference; GtkWidget *bottom; GtkWidget *window; GtkWidget *old; GtkWidget *label; GtkWidget *main_vbox; gint timeout_entry; GList *entries; GList *texts; }; struct _GtkSetupText { gint timeout_text; gboolean active; GtkWidget *vbox; GtkWidget *label; GtkImage *strob_left; GtkImage *strob_right; }; struct _GtkSetupEntry { GtkWidget *reference; GtkWidget *label; GtkImage *image; GtkWidget *eventbox; }; /* Create a new setup window */ GtkSetup *gtk_setup_new (gint xsize, gint ysize, gchar * welcome_msg); void gtk_setup_show (GtkSetup * setup); void gtk_setup_quit (GtkSetup * setup); void gtk_setup_set_title (GtkSetup * setup, gchar * title); void gtk_setup_set_wmclass (GtkSetup * setup, gchar * wmclass_name, gchar * wmclass_class); /* Add something, usually a control button (save, apply...) to bottom of setup window*/ void gtk_setup_add_bottom (GtkSetup * setup, GtkWidget * element); /* Add an entry to menu */ void gtk_setup_add_menu_entry (GtkSetup * setup, gchar * name, GdkPixbuf * pixbuf, GtkWidget * reference, GtkSetupText *text); /*Add a text entry */ GtkSetupText *gtk_setup_add_menu_text (GtkSetup * setup, gchar * name); void gtk_setup_menu_entry_set_label (GtkSetupEntry * entry, gchar * name); void gtk_setup_menu_entry_set_image (GtkSetupEntry * entry, GdkPixbuf * image); void gtk_setup_menu_text_set_label (GtkSetupText * entry, gchar * name); void gtk_setup_bar_set_rsize (GtkSetup * setup, gint rsize); GtkWidget *gtk_setup_get_window (GtkSetup * setup); |
Update of /cvsroot/mvideo/MVideo/src In directory sc8-pr-cvs1:/tmp/cvs-serv3921/src Modified Files: Makefile.am eximport.c main.c project_setup_cal.c project_setup_cal.h project_setup_win.c search_cal.c setup_cal.c setup_cal.h setup_win.c setup_win.h support.c title_cal.c Added Files: film_view_cal.c film_view_cal.h film_view_func.c film_view_func.h film_view_wid.c film_view_wid.h Removed Files: select_view_cal.c select_view_cal.h select_view_win.c select_view_win.h Log Message: Major core enhanchement --- NEW FILE: film_view_cal.c --- /* * MVideo, film_view_cal.c * * Copyright (C) 2002-2003, Luca Roccia <lit...@us...> * * This program 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 program 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 program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif #include <gtk/gtk.h> #include "film_view_wid.h" #include "generic_win.h" #include "select_win.h" #include "support.h" #include "db.h" #include "trade.h" void gtk_film_view_icon_delete_film (gpointer user_data); void gtk_film_view_icon_restore_color (gpointer user_data); void gtk_film_view_icon_restore_color (gpointer user_data) { GtkFilmView *film_view; film_view = user_data; gtk_list_store_set (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (film_view->tree))), &film_view->iter, 3, NULL, 4, NULL, -1); return; } void gtk_film_view_icon_delete_film (gpointer user_data) { gchar *txt; gchar *title; GdkColor colors[2]; GtkFilmView *film_view; film_view = user_data; colors[0].red = 30000; colors[0].green = 30000; colors[0].blue = 30000; colors[1].red = 00000; colors[1].green = 00000; colors[1].blue = 00000; title = db_get_title (film_view->id); db_delete_table (film_view->id); txt = g_strdup_printf ("%s: %s", _("Deleted film"), title); add_statusbar (txt); g_free (title); g_free (txt); if ( options_global_read->update_list_delete == 1 ) gtk_signal_emit_by_name (GTK_OBJECT (Sort_button), "pressed"); else gtk_list_store_set (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (film_view->tree))), &film_view->iter, 2, "a", 3, &colors[1], 4, &colors[0], -1); gtk_film_view_icon_close (NULL, NULL, film_view); return; } gboolean gtk_film_view_icon_modify (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) { GtkWidget *modify; gchar *str; gchar *title; GdkColor colors[2]; GtkFilmView *film_view; film_view = user_data; colors[0].red = 65535; colors[0].green = 11000; colors[0].blue = 11000; colors[1].red = 65535; colors[1].green = 51000; colors[1].blue = 41000; gtk_list_store_set (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (film_view->tree))), &film_view->iter, 3, &colors[1], 4, &colors[0], -1); title = db_get_title (film_view->id); str = g_strdup_printf ("%s: %s", _("Modify film"), title); add_statusbar (str); g_free (str); modify = create_window_select_add_modify (1, film_view->id, title, GTK_TREE_VIEW(film_view->tree), film_view->iter); g_free (title); gtk_widget_show (modify); return FALSE; } gboolean gtk_film_view_icon_export (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) { GtkFilmView *film_view; film_view = user_data; export_title (film_view->id); return FALSE; } gboolean gtk_film_view_icon_remove (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) { GdkColor colors[2]; gchar *txt; gchar *title; GtkFilmView *film_view; film_view = user_data; colors[0].red = 7000; colors[0].green = 33000; colors[0].blue = 7000; colors[1].red = 61000; colors[1].green = 65535; colors[1].blue = 61000; title = db_get_title (film_view->id); txt = g_strdup_printf ("%s: %s", _("Sure to delete"), title); g_free (title); gtk_list_store_set (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (film_view->tree))), &film_view->iter, 3, &colors[1], 4, &colors[0], -1); create_Choose_win (film_view, film_view, txt, gtk_film_view_icon_delete_film, gtk_film_view_icon_restore_color); return FALSE; } gboolean gtk_film_view_icon_print (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) { GtkWidget *dia; add_statusbar (_("Print")); dia = create_Dialog_win ("Print\n\nFunction partially implemented", DIALOG_WARNING); gtk_widget_show (dia); return FALSE; } gboolean gtk_film_view_icon_print_preview (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) { GtkWidget *dia; add_statusbar (_("Preview")); dia = create_Dialog_win ("Preview\n\nFunction partially implemented", DIALOG_WARNING); gtk_widget_show (dia); return FALSE; } gboolean gtk_film_view_icon_close (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) { GtkFilmView *film_view; gboolean running; film_view = user_data; running = film_view->running; gtk_widget_destroy(GTK_WIDGET(film_view->window)); if (film_view->id != NULL) g_free (film_view->id); g_free (film_view); if (running == FALSE) gtk_main_quit(); return FALSE; } gboolean gtk_film_view_icon_go_fullscreen (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) { gint state; GtkFilmView *film_view; film_view = user_data; state = gdk_window_get_state(film_view->window->window); switch (state) { case (0): case (GDK_WINDOW_STATE_WITHDRAWN): case (GDK_WINDOW_STATE_ICONIFIED): case (GDK_WINDOW_STATE_MAXIMIZED): case (GDK_WINDOW_STATE_STICKY): gtk_window_fullscreen (GTK_WINDOW(film_view->window)); // gtk_widget_set_size_request (ipc->last_element, max_x-55, // max_y-ipc->extention_height+ipc->last_element_ysize-ipc->title_ysize); break; default: gtk_window_unfullscreen (GTK_WINDOW(film_view->window)); // gtk_widget_set_size_request (ipc->last_element, max_x-55, ipc->last_element_ysize); break; } return FALSE; } --- NEW FILE: film_view_cal.h --- /* * MVideo, film_view_cal.h * * Copyright (C) 2002-2003, Luca Roccia <lit...@us...> * * This program 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 program 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 program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * Controllare export * Controllare remove * Controllare modify * Aggiungere import */ gboolean gtk_film_view_icon_go_fullscreen (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); gboolean gtk_film_view_icon_close (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); gboolean gtk_film_view_icon_print (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); gboolean gtk_film_view_icon_print_preview (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); gboolean gtk_film_view_icon_export (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); gboolean gtk_film_view_icon_remove (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); gboolean gtk_film_view_icon_modify (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); --- NEW FILE: film_view_func.c --- /* * MVideo, film_view_func.c * * Copyright (C) 2002-2003, Luca Roccia <lit...@us...> * * This program 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 program 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 program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif #include <gtk/gtk.h> #include "film_view_wid.h" #include "db.h" #include "support.h" GString *gtk_film_view_substiute_char (gchar *entries, gchar *old, gchar *new) { int i; GString *ret; ret = NULL; if (strchr (entries, (int)old[0]) == NULL) ret = g_string_new (entries); else { int c; gchar *entry; for (i = 0, c = 0; i < strlen (entries); i++) if (entries[i] == old[0]) c++; entry = g_strdup ((gchar *) strtok (entries, old)); ret = g_string_new (entry); g_free (entry); for (; c != 1; c--) { entry = g_strdup ((gchar *) strtok (NULL, old)); g_string_append_printf (ret, "%s%s", new, entry); g_free (entry); } entry = g_strdup ((gchar *) strtok (NULL, old)); g_string_append_printf (ret, "%s%s", new, entry); g_free (entry); } return ret; } void gtk_film_view_new_show_all (gboolean running, gchar *id, gpointer *film_info) { GtkFilmView *film_view; GtkFilmViewString *film_string; GtkFilmViewString *film_string_2; GtkFilmViewString *film_string_3; GList *list; gchar *entry; gchar *txt; Film_info *film; GdkPixbuf *pixbuf; GString *string; if (film_info == NULL) film = db_get_film_info (id); else film = (Film_info *)film_info; txt = g_strdup_printf ("MVideo: %s: %s", _("Film view"), film->film->title); film_view = gtk_film_view_new (running, txt, id); g_free (txt); gtk_film_view_add_top_title (film_view, film->film->title); gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_CLOSE, NULL); gtk_film_view_add_top_bar (film_view); gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_PRINT, NULL); gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_PRINT_PREVIEW, NULL); gtk_film_view_add_top_bar (film_view); gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_EXPORT, NULL); gtk_film_view_add_top_bar (film_view); gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_SETUP, NULL); gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_REMOVE, NULL); gtk_film_view_add_top_bar (film_view); gtk_film_view_add_top_icon (film_view, FILM_VIEW_ICON_FULLSCREEN, NULL); if (film->film->pic != NULL) pixbuf = gdk_pixbuf_new_from_file (film->film->pic, NULL); else pixbuf = NULL; gtk_film_view_add_film_pic (film_view, pixbuf); list = NULL; film_string = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string->txt = g_strdup (film->film->original_title); film_string->entry = g_strdup (_("Original title")); list = g_list_append (list, film_string); gtk_film_view_add_film_string (film_view, list); string = gtk_film_view_substiute_char (film->film->director, "/", ", "); list = NULL; film_string = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string->txt = g_strdup (string->str); film_string->entry = g_strdup (_("Director")); list = g_list_append (list, film_string); gtk_film_view_add_film_string (film_view, list); g_string_free (string, TRUE); string = gtk_film_view_substiute_char (film->film->producer, "/", ", "); list = NULL; film_string = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string->txt = g_strdup (string->str); film_string->entry = g_strdup (_("Producer")); list = g_list_append (list, film_string); gtk_film_view_add_film_string (film_view, list); g_string_free (string, TRUE); string = gtk_film_view_substiute_char (film->film->distributor, "/", ", "); list = NULL; film_string = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string->txt = g_strdup (string->str); film_string->entry = g_strdup (_("Distributor")); list = g_list_append (list, film_string); gtk_film_view_add_film_string (film_view, list); g_string_free (string, TRUE); list = NULL; film_string = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string->txt = g_strdup (film->film->genre); film_string->entry = g_strdup (_("Genre")); list = g_list_append (list, film_string); gtk_film_view_add_film_string (film_view, list); list = NULL; film_string = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string->txt = g_strdup (film->film->country); film_string->entry = g_strdup (_("Country")); list = g_list_append (list, film_string); film_string_2 = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string_2->txt = g_strdup (film->film->year); film_string_2->entry = g_strdup (_("Year")); list = g_list_append (list, film_string_2); film_string_3 = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string_3->txt = g_strdup (film->film->time); film_string_3->entry = g_strdup (_("Time")); list = g_list_append (list, film_string_3); gtk_film_view_add_film_string (film_view, list); string = gtk_film_view_substiute_char (film->film->actors, "/", ", "); list = NULL; film_string = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string->txt = g_strdup (string->str); film_string->entry = g_strdup (_("Actors")); list = g_list_append (list, film_string); gtk_film_view_add_film_string (film_view, list); g_string_free (string, TRUE); list = NULL; film_string = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string->txt = g_strdup (film->format->language); film_string->entry = g_strdup (_("Language")); list = g_list_append (list, film_string); film_string_2 = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string_2->txt = g_strdup (film->format->quality); film_string_2->entry = g_strdup (_("Quality")); list = g_list_append (list, film_string_2); gtk_film_view_add_film_string (film_view, list); list = NULL; film_string = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string->txt = g_strdup (film->format->video); film_string->entry = g_strdup (_("Video")); list = g_list_append (list, film_string); film_string_2 = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string_2->txt = g_strdup (film->format->audio); film_string_2->entry = g_strdup (_("Audio")); list = g_list_append (list, film_string_2); film_string_3 = (GtkFilmViewString *) g_malloc (sizeof (GtkFilmViewString)); film_string_3->txt = g_strdup (film->format->cds); film_string_3->entry = g_strdup (_("CDs")); list = g_list_append (list, film_string_3); gtk_film_view_add_film_string (film_view, list); gtk_film_view_add_film_stars (film_view, _("Stars"), atoi (film->format->stars)); gtk_film_view_add_film_text (film_view, _("Story"), film->notes->trama); gtk_film_view_add_film_text (film_view, _("Notes"), film->notes->notes); gtk_film_view_show (film_view); db_free_film_infos (film); } --- NEW FILE: film_view_func.h --- /* * MVideo, film_view_func.h * * Copyright (C) 2002-2003, Luca Roccia <lit...@us...> * * This program 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 program 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 program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * Gestire copertina passata per struct * possibilità di settare quali icone attivare */ GString *gtk_film_view_substiute_char (gchar * entries, gchar *entry, gchar *new); void gtk_film_view_new_show_all (gboolean running, gchar *id, gpointer *film_info); --- NEW FILE: film_view_wid.c --- /* * MVideo, film_view_wid.c * * Copyright (C) 2002-2003, Luca Roccia <lit...@us...> * * This program 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 program 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 program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif #include <gtk/gtk.h> #include "film_view_wid.h" #include "film_view_cal.h" #define NONE PACKAGE_PIXMAPS_DIR "/none.png" #define STAR PACKAGE_PIXMAPS_DIR "/star.xpm" #define BLANK_STAR PACKAGE_PIXMAPS_DIR "/blank_star.xpm" #define SPACE_BW_LINES 7 GtkWidget *gtk_film_view_icon_new (gchar * icon, gpointer func, gpointer data, GtkWidget * window); gboolean gtk_film_view_icon_enter_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); gboolean gtk_film_view_icon_leave_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data); gboolean gtk_film_view_icon_enter_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { GdkCursor *cursor; cursor = gdk_cursor_new (GDK_HAND2); gdk_window_set_cursor (GTK_WIDGET (user_data)->window, cursor); gdk_cursor_unref (cursor); return FALSE; } gboolean gtk_film_view_icon_leave_event (GtkWidget * widget, GdkEventCrossing * event, gpointer user_data) { gdk_window_set_cursor (GTK_WIDGET (user_data)->window, NULL); return FALSE; } GtkWidget * gtk_film_view_icon_new (gchar * icon, gpointer func, gpointer data, GtkWidget * window) { GtkWidget *image; GtkWidget *eventbox; GdkColor grey = { 0, 55535, 55535, 55535 }; eventbox = gtk_event_box_new (); gtk_widget_modify_bg (eventbox, 0, &grey); gtk_widget_modify_bg (eventbox, 1, &grey); gtk_widget_modify_bg (eventbox, 2, &grey); gtk_widget_modify_bg (eventbox, 3, &grey); gtk_widget_modify_bg (eventbox, 4, &grey); g_signal_connect (eventbox, "enter_notify_event", G_CALLBACK (gtk_film_view_icon_enter_event), window); g_signal_connect (eventbox, "leave_notify_event", G_CALLBACK (gtk_film_view_icon_leave_event), window); if (func != NULL) g_signal_connect (eventbox, "button_press_event", G_CALLBACK (func), data); image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (eventbox), image); gtk_widget_show (image); return eventbox; } GtkFilmView * gtk_film_view_new (gboolean running, gchar * title, gchar * id) { GtkWidget *window; GtkWidget *scrolledwindow; GtkWidget *viewport; GtkWidget *vbox; GtkWidget *central; GdkColor white = { 0, 65535, 65535, 65535 }; GdkColor grey = { 0, 55535, 55535, 55535 }; GtkWidget *top; GtkFilmView *film_view; film_view = (GtkFilmView *) g_malloc (sizeof (GtkFilmView)); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), title); vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox); gtk_container_add (GTK_CONTAINER (window), vbox); viewport = gtk_viewport_new (NULL, NULL); gtk_widget_show (viewport); gtk_box_pack_start (GTK_BOX (vbox), viewport, FALSE, FALSE, 0); gtk_widget_modify_bg (viewport, 0, &grey); gtk_widget_modify_bg (viewport, 1, &grey); gtk_widget_modify_bg (viewport, 2, &grey); gtk_widget_modify_bg (viewport, 3, &grey); gtk_widget_modify_bg (viewport, 4, &grey); top = gtk_fixed_new (); gtk_widget_show (top); gtk_container_add (GTK_CONTAINER (viewport), top); scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow); gtk_box_pack_start (GTK_BOX (vbox), scrolledwindow, TRUE, TRUE, 0); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow), 10); viewport = gtk_viewport_new (NULL, NULL); gtk_widget_show (viewport); gtk_container_add (GTK_CONTAINER (scrolledwindow), viewport); gtk_widget_modify_bg (viewport, 0, &white); gtk_widget_modify_bg (viewport, 1, &white); gtk_widget_modify_bg (viewport, 2, &white); gtk_widget_modify_bg (viewport, 3, &white); gtk_widget_modify_bg (viewport, 4, &white); central = gtk_fixed_new (); gtk_widget_show (central); gtk_container_add (GTK_CONTAINER (viewport), central); gtk_window_maximize (GTK_WINDOW (window)); film_view->window = window; film_view->top = top; film_view->central = central; film_view->max_x = gdk_screen_width () - 5; film_view->icon_xpos = film_view->max_x - 10; film_view->central_current_y = 5; film_view->running = running; film_view->id = NULL; film_view->tree = NULL; return film_view; } void gtk_film_view_add_top_title (GtkFilmView * film_view, gchar * title) { GtkWidget *label; PangoLayout *layout; PangoRectangle extents; gchar *tmp; label = gtk_label_new (""); tmp = g_strdup_printf ("<big><b>%s</b></big>", title); gtk_label_set_markup (GTK_LABEL (label), (tmp)); g_free (tmp); gtk_widget_show (label); gtk_fixed_put (GTK_FIXED (film_view->top), label, 10, 5); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); layout = gtk_label_get_layout (GTK_LABEL (label)); pango_layout_get_pixel_extents (layout, NULL, &extents); gtk_widget_set_size_request (film_view->top, -1, extents.height + 15); // film_view->title_ysize = extents.height + 55; } void gtk_film_view_add_top_bar (GtkFilmView * film_view) { GtkWidget *viewport; GdkColor black = { 0, 0, 0, 0 }; film_view->icon_xpos -= 1; viewport = gtk_viewport_new (NULL, NULL); gtk_widget_show (viewport); gtk_widget_set_size_request (viewport, 1, 20); gtk_fixed_put (GTK_FIXED (film_view->top), viewport, film_view->icon_xpos, 10); gtk_widget_modify_bg (viewport, 0, &black); gtk_widget_modify_bg (viewport, 1, &black); gtk_widget_modify_bg (viewport, 2, &black); gtk_widget_modify_bg (viewport, 3, &black); gtk_widget_modify_bg (viewport, 4, &black); film_view->icon_xpos -= 5; return; } gboolean gtk_film_view_add_top_icon (GtkFilmView * film_view, gint type, gpointer data) { GtkWidget *eventbox; switch (type) { case (FILM_VIEW_ICON_CLOSE): eventbox = gtk_film_view_icon_new ("gtk-close", gtk_film_view_icon_close, film_view, film_view->window); break; case (FILM_VIEW_ICON_PRINT): eventbox = gtk_film_view_icon_new ("gtk-print", gtk_film_view_icon_print, NULL, film_view->window); break; case (FILM_VIEW_ICON_PRINT_PREVIEW): eventbox = gtk_film_view_icon_new ("gtk-print-preview", gtk_film_view_icon_print_preview, NULL, film_view->window); break; case (FILM_VIEW_ICON_SETUP): eventbox = gtk_film_view_icon_new ("gtk-properties", gtk_film_view_icon_modify, film_view, film_view->window); break; case (FILM_VIEW_ICON_EXPORT): eventbox = gtk_film_view_icon_new ("gtk-go-down", gtk_film_view_icon_export, film_view, film_view->window); break; case (FILM_VIEW_ICON_REMOVE): eventbox = gtk_film_view_icon_new ("gtk-remove", gtk_film_view_icon_remove, film_view, film_view->window); break; case (FILM_VIEW_ICON_NEXT): eventbox = gtk_film_view_icon_new ("gtk-go-forward", NULL, NULL, film_view->window); break; case (FILM_VIEW_ICON_PREV): eventbox = gtk_film_view_icon_new ("gtk-go-back", NULL, NULL, film_view->window); break; case (FILM_VIEW_ICON_FULLSCREEN): eventbox = gtk_film_view_icon_new ("gtk-zoom-fit", gtk_film_view_icon_go_fullscreen, film_view, film_view->window); break; default: return FALSE; } film_view->icon_xpos -= 28; gtk_fixed_put (GTK_FIXED (film_view->top), eventbox, film_view->icon_xpos, 10); gtk_widget_show (eventbox); film_view->icon_xpos -= 5; return TRUE; } void gtk_film_view_add_film_pic (GtkFilmView * film_view, GdkPixbuf * image_pix) { GtkWidget *image; gint XSize; gint YSize; if (image_pix == NULL) image_pix = gdk_pixbuf_new_from_file (NONE, NULL); XSize = gdk_pixbuf_get_width (image_pix); YSize = gdk_pixbuf_get_height (image_pix); if (XSize > 200 || YSize > 250) { double ratio; GdkPixbuf *newimage; if (XSize >= YSize) ratio = (double) XSize / 200; else ratio = (double) YSize / 250; XSize = (double) XSize / ratio; YSize = (double) YSize / ratio; newimage = gdk_pixbuf_scale_simple (image_pix, XSize, YSize, GDK_INTERP_BILINEAR); gdk_pixbuf_unref (image_pix); image_pix = newimage; } image = gtk_image_new_from_pixbuf (image_pix); gtk_widget_show (image); gdk_pixbuf_unref (image_pix); film_view->pic_ysize = YSize + 5; film_view->pic_xsize = XSize + 50; gtk_fixed_put (GTK_FIXED (film_view->central), image, film_view->max_x - XSize - 50, 5); } void gtk_film_view_add_film_string (GtkFilmView * film_view, GList * strings) { GtkWidget *label; gchar *txt; PangoLayout *layout; PangoRectangle extents; gint current_x; gint plus_y; GList *list; GtkFilmViewString *film_string; list = strings; current_x = 5; while (list != NULL) { film_string = list->data; label = gtk_label_new (""); txt = g_strdup_printf ("<span color=\"red\"><big><b>%s:</b></big></span> ", film_string->entry); gtk_label_set_markup (GTK_LABEL (label), (txt)); g_free (txt); gtk_widget_show (label); layout = gtk_label_get_layout (GTK_LABEL (label)); pango_layout_get_pixel_extents (layout, NULL, &extents); if ((current_x + extents.width < film_view->max_x - film_view->pic_xsize && film_view->central_current_y < film_view->pic_ysize) || (current_x + extents.width < film_view->max_x && film_view->central_current_y > film_view->pic_ysize)) gtk_fixed_put (GTK_FIXED (film_view->central), label, current_x, film_view->central_current_y); else { current_x = 5; film_view->central_current_y += extents.width + 3; gtk_fixed_put (GTK_FIXED (film_view->central), label, current_x, film_view->central_current_y); } current_x += extents.width + 1; label = gtk_label_new (film_string->txt); layout = gtk_label_get_layout (GTK_LABEL (label)); pango_layout_set_text (layout, film_string->txt, strlen (film_string->txt)); pango_layout_get_pixel_extents (layout, NULL, &extents); plus_y = extents.height * 0.20; /* Go here if string is longer than max screen width or max screen width - picture width */ if ((current_x + extents.width > film_view->max_x - film_view->pic_xsize - 5 && film_view->central_current_y < film_view->pic_ysize) || (current_x + extents.width > film_view->max_x - 5 && film_view->central_current_y > film_view->pic_ysize)) { gfloat i; gfloat c; gint d; gint tot; gint e; gint current; gchar *txt; txt = (gchar *) g_malloc ((strlen (film_string->txt)) * sizeof (gchar)); /* current height is lowern than pic height */ if (film_view->central_current_y < film_view->pic_ysize) { c = film_view->max_x - film_view->pic_xsize - current_x - 5; i = c / extents.width; d = i * strlen (film_string->txt) - 1; } else { c = film_view->max_x - 50 - current_x - 5; i = c / extents.width; d = i * strlen (film_string->txt) - 1; } tot = d; /* First string */ strncpy (txt, film_string->txt, d + 1); txt[d + 1] = '\0'; current = d + 1; /* Recalculate params to fit from WIDTH_START to end - pic width */ c = film_view->max_x - film_view->pic_xsize - current_x - 25; i = c / extents.width; d = i * strlen (film_string->txt); while (tot != strlen (film_string->txt)) { /* Print string */ label = gtk_label_new (txt); gtk_widget_show (label); gtk_fixed_put (GTK_FIXED (film_view->central), label, current_x, film_view->central_current_y + plus_y); /* Recalculate height for next string */ film_view->central_current_y += extents.height; current_x = 25; /* * Recalculate params to fit from current_x to end * ONLY if current height is greater than pic height */ if (film_view->central_current_y > film_view->pic_ysize && c != film_view->max_x - 50 - current_x - 20) { c = film_view->max_x - 50 - current_x - 20; i = c / extents.width; d = i * strlen (film_string->txt); } if (tot + d > strlen (film_string->txt)) d = strlen (film_string->txt) - tot; tot += d; for (e = current, current = 0; current != d; current++, e++) txt[current] = film_string->txt[e]; txt[current] = '\0'; current = e; } txt[d] = '\0'; label = gtk_label_new (txt); gtk_widget_show (label); gtk_fixed_put (GTK_FIXED (film_view->central), label, current_x, film_view->central_current_y + plus_y); g_free (txt); layout = gtk_label_get_layout (GTK_LABEL (label)); pango_layout_get_pixel_extents (layout, NULL, &extents); } else { label = gtk_label_new (film_string->txt); gtk_widget_show (label); gtk_fixed_put (GTK_FIXED (film_view->central), label, current_x, film_view->central_current_y + plus_y); layout = gtk_label_get_layout (GTK_LABEL (label)); pango_layout_get_pixel_extents (layout, NULL, &extents); } current_x += extents.width + 20; list = list->next; } list = strings; while (list != NULL) { film_string = list->data; g_free (film_string->txt); g_free (film_string->entry); list = list->next; } g_list_free (strings); film_view->central_current_y += extents.height + SPACE_BW_LINES; return; } void gtk_film_view_show (GtkFilmView * film_view) { gtk_widget_show (film_view->window); return; } void gtk_film_view_add_film_text (GtkFilmView * film_view, gchar * name, gchar * txt) { GtkWidget *scrolledwindow; GtkWidget *text; GtkWidget *label; gchar *tmp; PangoLayout *layout; PangoRectangle extents; GdkColor blue = { 0, 62000, 62000, 65535 }; label = gtk_label_new (""); tmp = g_strdup_printf ("<span color=\"red\"><big><b>%s:</b></big></span>", name); gtk_label_set_markup (GTK_LABEL (label), (tmp)); g_free (tmp); gtk_widget_show (label); gtk_fixed_put (GTK_FIXED (film_view->central), label, 5, film_view->central_current_y); layout = gtk_label_get_layout (GTK_LABEL (label)); pango_layout_get_pixel_extents (layout, NULL, &extents); film_view->central_current_y += extents.height + 1; scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_fixed_put (GTK_FIXED (film_view->central), scrolledwindow, 5, film_view->central_current_y); /* if ((max_y - *height_start) / 2 > 80) { gtk_widget_set_size_request (scrolledwindow, max_x - 55, (max_y - *height_start) / 2.5); *last_element_ysize = (max_y - *height_start) / 2.5; *height_start += 9 + (max_y - *height_start) / 2.5; } else { gtk_widget_set_size_request (scrolledwindow, max_x - 55, 80); *last_element_ysize = 80; *height_start += 89; } */ text = gtk_text_view_new (); gtk_widget_show (text); gtk_container_add (GTK_CONTAINER (scrolledwindow), text); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text), GTK_WRAP_WORD); gtk_text_view_set_editable (GTK_TEXT_VIEW (text), FALSE); gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text), FALSE); gtk_widget_modify_base (text, 0, &blue); gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)), txt, -1); gtk_widget_set_size_request (scrolledwindow, film_view->max_x - 55, 40); film_view->central_current_y += 40 + SPACE_BW_LINES; return; } void gtk_film_view_set_wmclass (GtkFilmView * film_view, gchar * wmclass_name, gchar * wmclass_class) { gtk_window_set_wmclass (GTK_WINDOW (film_view->window), wmclass_name, wmclass_class); return; } void gtk_film_view_add_film_stars (GtkFilmView * film_view, gchar * name, gint num) { GdkPixbuf *star; GdkPixbuf *blank_star; GtkWidget *image; GtkWidget *label; PangoLayout *layout; PangoRectangle extents; gchar *txt; gint i; gint plus_y; gint width_start; star = gdk_pixbuf_new_from_file (STAR, NULL); blank_star = gdk_pixbuf_new_from_file (BLANK_STAR, NULL); label = gtk_label_new (""); txt = g_strdup_printf ("<span color=\"red\"><big><b>%s:</b></big></span> ", name); gtk_label_set_markup (GTK_LABEL (label), (txt)); g_free (txt); gtk_widget_show (label); gtk_fixed_put (GTK_FIXED (film_view->central), label, 5, film_view->central_current_y); layout = gtk_label_get_layout (GTK_LABEL (label)); pango_layout_get_pixel_extents (layout, NULL, &extents); plus_y = extents.height * 0.2; width_start = 2 + extents.width; for (i = 0; i != num; i++) { image = gtk_image_new_from_pixbuf (star); gtk_widget_show (image); gtk_fixed_put (GTK_FIXED (film_view->central), image, width_start + i * 25, film_view->central_current_y + plus_y); } for (; i != 10; i++) { image = gtk_image_new_from_pixbuf (blank_star); gtk_widget_show (image); gtk_fixed_put (GTK_FIXED (film_view->central), image, width_start + i * 25, film_view->central_current_y + plus_y); } gdk_pixbuf_unref (star); gdk_pixbuf_unref (blank_star); film_view->central_current_y += extents.height + SPACE_BW_LINES; return; } --- NEW FILE: film_view_wid.h --- /* * MVideo, film_view_win.h * * Copyright (C) 2002-2003, Luca Roccia <lit...@us...> * * This program 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 program 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 program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* * Ogni tanto il testo va sopra l'immagine -> controllare * Controllare tutte le funzioni delle icone * Sistema per la gestione delle dimensioni delle text * magari permettere di settare la dimensione fissa e in percentuale? * Migliorare la gestione delle dimensioni * Aggiungere tooltips */ typedef struct _GtkFilmView GtkFilmView; typedef struct _GtkFilmViewString GtkFilmViewString; enum { FILM_VIEW_ICON_CLOSE, FILM_VIEW_ICON_PRINT, FILM_VIEW_ICON_PRINT_PREVIEW, FILM_VIEW_ICON_SETUP, FILM_VIEW_ICON_EXPORT, FILM_VIEW_ICON_REMOVE, FILM_VIEW_ICON_NEXT, FILM_VIEW_ICON_PREV, FILM_VIEW_ICON_FULLSCREEN }; struct _GtkFilmView { GtkWidget *top; GtkWidget *window; GtkWidget *central; gint icon_xpos; gint pic_xsize; gint pic_ysize; gint central_current_y; gint max_x; gboolean running; gchar *id; GtkWidget *tree; GtkTreeIter iter; }; struct _GtkFilmViewString { gchar *entry; gchar *txt; }; GtkFilmView *gtk_film_view_new (gboolean running, gchar *title, gchar *id); void gtk_film_view_set_infos (GtkFilmView *film_view, GtkWidget *tree, GtkTreeIter iter); void gtk_film_view_show (GtkFilmView *film_view); void gtk_film_view_set_wmclass (GtkFilmView *film_view, gchar * wmclass_name, gchar * wmclass_class); gboolean gtk_film_view_add_top_icon (GtkFilmView *film_view, gint type, gpointer data); void gtk_film_view_add_top_icon_bar (GtkFilmView *film_view); void gtk_film_view_add_top_title (GtkFilmView *film_view, gchar *title); void gtk_film_view_add_film_pic (GtkFilmView *film_view, GdkPixbuf *image_pix); void gtk_film_view_add_film_string (GtkFilmView *film_view, GList *strings); void gtk_film_view_add_film_text (GtkFilmView *film_view, gchar *name, gchar *txt); void gtk_film_view_add_film_stars (GtkFilmView *film_view, gchar *name, gint num); Index: Makefile.am =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/Makefile.am,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- Makefile.am 24 Feb 2003 19:49:30 -0000 1.30 +++ Makefile.am 23 May 2003 07:43:31 -0000 1.31 @@ -28,10 +28,6 @@ select_win.h\ select_cal.h\ select_cal.c\ - select_view_win.c\ - select_view_win.h\ - select_view_cal.h\ - select_view_cal.c\ help_win.c\ help_win.h\ help_cal.c\ @@ -48,6 +44,8 @@ first_setup_cal.h\ setup_win.h\ setup_win.c\ + setup_wid.h\ + setup_wid.c\ setup_cal.h\ setup_cal.c\ generic_funcs.h\ @@ -70,6 +68,12 @@ project_setup_win.h\ project_setup_cal.c\ project_setup_cal.h\ + film_view_wid.c\ + film_view_wid.h\ + film_view_cal.c\ + film_view_cal.h\ + film_view_func.c\ + film_view_func.h\ main.c mvideo_LDFLAGS = Index: eximport.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/eximport.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- eximport.c 17 May 2003 13:29:01 -0000 1.16 +++ eximport.c 23 May 2003 07:43:31 -0000 1.17 @@ -35,7 +35,7 @@ #include "support.h" #include "generic_win.h" #include "generic_funcs.h" -#include "select_view_win.h" +#include "film_view_func.h" #include "db.h" #include "trade.h" #include "eximport.h" @@ -659,14 +659,11 @@ if (event->type == GDK_2BUTTON_PRESS && event->button == 1 && selection != NULL) { - GtkWidget *view; GtkTreeIter iter; gzseek (zfd, position, SEEK_SET); struct_file = open_read_format_file (zfd); - view = create_window_select_view ("z", NULL, iter, struct_file->film, TRUE, FALSE, struct_file->pic, - struct_file->size); - gtk_widget_show (view); + gtk_film_view_new_show_all (TRUE, NULL, (gpointer)struct_file->film); } if (event->type == GDK_BUTTON_PRESS && event->button == 3 && selection != NULL) { @@ -701,7 +698,7 @@ } void -open_file (gchar * file, gboolean running, MVipc * mvipc_main) +open_file (gchar * file, gboolean running, MVipc *mvipc_main) { gzFile zfd; gchar tmp[5]; @@ -726,14 +723,12 @@ if (tot_num == 1) { - GtkWidget *view; GtkTreeIter iter; export_read_file *struct_file; struct_file = open_read_format_file (zfd); - view = create_window_select_view ("z", NULL, iter, struct_file->film, running, TRUE, struct_file->pic, - struct_file->size); - gtk_widget_show (view); + + gtk_film_view_new_show_all (running, NULL, (gpointer)struct_file->film); if (struct_file->pic != NULL) g_free (struct_file->pic); g_free (struct_file); Index: main.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/main.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- main.c 6 May 2003 08:05:52 -0000 1.27 +++ main.c 23 May 2003 07:43:31 -0000 1.28 @@ -54,9 +54,9 @@ start (void) { if (db_connect () == 0) - create_Choose_win (0, NULL, - "Unable to connect to database\nPlease check your settings\nWant to run setup now?", - (gpointer)create_window_setup, (gpointer)exit); + create_Choose_win (0, NULL, + "Unable to connect to database\nPlease check your settings\nWant to run setup now?", + (gpointer) create_window_setup, (gpointer) exit); else { GtkWidget *Main; @@ -90,11 +90,11 @@ #endif i = read_args (argc, argv); - if (i==READ_OPTS_EXIT) + if (i == READ_OPTS_EXIT) return 0; gtk_init (&argc, &argv); g_thread_init (NULL); - audio_init(); + audio_init (); project_opened = FALSE; @@ -108,7 +108,7 @@ g_list_free (icons); } - if ( read_options () == 0) + if (read_options () == 0) { GtkWidget *Firstrun; @@ -120,29 +120,29 @@ } else { - GtkWidget *Firstrun; - - switch (i) - { - case (READ_OPTS_START): - if ( options_global_read->show_logo == 1) - { - Logo = create_Logo_win (); - gtk_widget_show (Logo); - gtk_timeout_add (3000, quit_logo, Logo); - } - start(); - play_generic_audio (AUDIO_INTRO, FALSE); - break; - case (READ_OPTS_SETUP): - create_window_setup(0); - break; - case (READ_OPTS_FIRST_SETUP): - Firstrun = create_firstsetup_window (); - gtk_widget_show (Firstrun); - break; - case (READ_OPTS_OPEN): - open_titles (argv[2], NULL); + GtkWidget *Firstrun; + + switch (i) + { + case (READ_OPTS_START): + if (options_global_read->show_logo == 1) + { + Logo = create_Logo_win (); + gtk_widget_show (Logo); + gtk_timeout_add (3000, quit_logo, Logo); + } + start (); + play_generic_audio (AUDIO_INTRO, FALSE); + break; + case (READ_OPTS_SETUP): + create_window_setup (0); + break; + case (READ_OPTS_FIRST_SETUP): + Firstrun = create_firstsetup_window (); + gtk_widget_show (Firstrun); + break; + case (READ_OPTS_OPEN): + open_titles (argv[2], NULL); } } Index: project_setup_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/project_setup_cal.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project_setup_cal.c 17 May 2003 13:29:01 -0000 1.6 +++ project_setup_cal.c 23 May 2003 07:43:31 -0000 1.7 @@ -27,109 +27,33 @@ #include "support.h" #include "generic_win.h" -#include "setup_win.h" +#include "setup_wid.h" #include "db.h" #include "project_setup_cal.h" -#define BLINK_TIMES 7 - -static GtkWidget *menu_select_old_widget = NULL; - -void project_auto_create_menu (gboolean selection, GdkEventButton *event, - gpointer user_data, GtkTreeView *tree); +void project_auto_create_menu (gboolean selection, GdkEventButton * event, gpointer user_data, GtkTreeView * tree); void on_project_auto_delete_activate (GtkMenuItem * togglebutton, gpointer user_data); void on_project_auto_add_activate (GtkMenuItem * togglebutton, gpointer user_data); -gboolean project_setup_blink (gpointer data); - -static int project_setup_blink_timeout = 0; -short int project_setup_blink_times; - -gboolean project_setup_blink (gpointer data) -{ - GdkColor color; - GdkColor light_blue = { 0, 10000, 10000, 65535 }; - GtkWidget *widget; - static int red = (int)(10135/BLINK_TIMES); - static int green = (int)(11135/BLINK_TIMES); - int position; - - widget = data; - - position = BLINK_TIMES-project_setup_blink_times; - color.pixel=0; - color.red=65535-(red*position); - color.green=65535-(green*position); - color.blue=65535; - - gtk_widget_modify_bg (widget, 0, &color); - gtk_widget_modify_bg (widget, 1, &color); - gtk_widget_modify_bg (widget, 2, &color); - gtk_widget_modify_bg (widget, 3, &color); - gtk_widget_modify_bg (widget, 4, &color); - - if (project_setup_blink_times-- > 0) - return TRUE; - else - { - gtk_viewport_set_shadow_type (GTK_VIEWPORT(widget->parent), GTK_SHADOW_ETCHED_IN); - gtk_widget_modify_bg (widget->parent, 0, &light_blue); - gtk_widget_modify_bg (widget->parent, 1, &light_blue); - gtk_widget_modify_bg (widget->parent, 2, &light_blue); - gtk_widget_modify_bg (widget->parent, 3, &light_blue); - gtk_widget_modify_bg (widget->parent, 4, &light_blue); - project_setup_blink_timeout = 20; - return FALSE; - } -} - -void -project_take_an_action (gint type, gpointer user_data) -{ - gchar *title_win_new; - Project_ipc *project_ipc; - - project_ipc = user_data; - - gtk_widget_hide (project_ipc->label); - gtk_widget_hide_all (project_ipc->auto_comp); - - switch (type) - { - case (PROJECT_SETUP_AUTO): - gtk_frame_set_label (GTK_FRAME (project_ipc->frame), _("Auto\ncompletions")); - title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Collection: Preferces"), _("Auto\ncompletions")); - gtk_widget_show_all (project_ipc->auto_comp); - break; - default: - break; - } - gtk_window_set_title (GTK_WINDOW (project_ipc->win), title_win_new); - g_free (title_win_new); -} - void -project_auto_edited (GtkCellRendererText * cell, gchar * path_string, - gchar * identifier, gpointer user_data) +project_auto_edited (GtkCellRendererText * cell, gchar * path_string, gchar * identifier, gpointer user_data) { GtkTreeSelection *selection; - GtkTreeIter iter; - GtkTreeModel *model; - GtkWidget *tree; - int type; - gchar *txt; - int ret; + GtkTreeIter iter; + GtkTreeModel *model; + GtkWidget *tree; + int type; + gchar *txt; + int ret; tree = user_data; - type = (int) g_object_get_data (G_OBJECT(tree), "type"); + type = (int) g_object_get_data (G_OBJECT (tree), "type"); model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree)); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree)); if (gtk_tree_selection_get_selected (selection, &model, &iter) == TRUE) { - gtk_tree_model_get (model, &iter, - 0, &txt, - -1); + gtk_tree_model_get (model, &iter, 0, &txt, -1); if (strchr (identifier, '/') != NULL) { GtkWidget *dia; @@ -144,10 +68,8 @@ return; else ret = db_modify_autos (txt, identifier, type); - if ( ret == 1) - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - 0, identifier, - -1); + if (ret == 1) + gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, identifier, -1); else { GtkWidget *dia; @@ -159,20 +81,19 @@ } int -on_project_auto_treeview_list_right_click_event (GtkWidget * widget, - GdkEventButton * event, gpointer user_data) +on_project_auto_treeview_list_right_click_event (GtkWidget * widget, GdkEventButton * event, gpointer user_data) { GtkTreeSelection *selection; - GtkTreePath *path; - GtkTreeIter iter; - GtkTreeModel *model; + GtkTreePath *path; + GtkTreeIter iter; + GtkTreeModel *model; model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), event->x, event->y, &path, NULL, NULL, NULL) != 0) { if (gtk_tree_model_get_iter (GTK_TREE_MODEL (gtk_tree_view_get_model - (GTK_TREE_VIEW (widget))), &iter, path) != 0) + (GTK_TREE_VIEW (widget))), &iter, path) != 0) { gtk_tree_path_free (path); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); @@ -195,8 +116,7 @@ } void -project_auto_create_menu (gboolean selection, - GdkEventButton * event, gpointer user_data, GtkTreeView *tree) +project_auto_create_menu (gboolean selection, GdkEventButton * event, gpointer user_data, GtkTreeView * tree) { GtkWidget *popup_menu; GtkWidget *mnu_2; @@ -213,10 +133,8 @@ gtk_menu_item_deselect (GTK_MENU_ITEM (mnu_6)); - gtk_signal_connect (GTK_OBJECT (mnu_2), "activate", - GTK_SIGNAL_FUNC (on_project_auto_delete_activate), tree); - gtk_signal_connect (GTK_OBJECT (mnu_6), "activate", - GTK_SIGNAL_FUNC (on_project_auto_add_activate), tree); + gtk_signal_connect (GTK_OBJECT (mnu_2), "activate", GTK_SIGNAL_FUNC (on_project_auto_delete_activate), tree); + gtk_signal_connect (GTK_OBJECT (mnu_6), "activate", GTK_SIGNAL_FUNC (on_project_auto_add_activate), tree); gtk_widget_show_all (popup_menu); if (event != NULL) @@ -227,33 +145,32 @@ return; } + void on_project_auto_add_activate (GtkMenuItem * togglebutton, gpointer user_data) { GtkTreeIter iter; - GtkWidget *tree; + GtkWidget *tree; tree = user_data; gtk_list_store_append (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (tree))), &iter); - gtk_list_store_set (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (tree))), &iter, - 0, _("NEW"), - -1); + gtk_list_store_set (GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (tree))), &iter, 0, _("NEW"), -1); } void on_project_auto_delete_activate (GtkMenuItem * togglebutton, gpointer user_data) { GtkTreeSelection *selection; - GtkTreeIter iter; - GtkTreeModel *model; - int type; - gchar *txt; + GtkTreeIter iter; + GtkTreeModel *model; + int type; + gchar *txt; - type = (int) g_object_get_data (G_OBJECT(user_data), "type"); + type = (int) g_object_get_data (G_OBJECT (user_data), "type"); model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data)); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (user_data)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (user_data)); if (gtk_tree_selection_get_selected (selection, &model, &iter) == TRUE) { gtk_tree_model_get (model, &iter, 0, &txt, -1); @@ -264,16 +181,15 @@ } gboolean -Project_quit (GtkWidget *widget, GdkEvent * event, gpointer user_data) +Project_quit (GtkWidget * widget, GdkEvent * event, gpointer user_data) { Project_ipc *project_ipc; + GtkSetup *setup; project_ipc = user_data; - gtk_widget_destroy (project_ipc->win); + setup = project_ipc->setup; + gtk_setup_quit (setup); g_free (project_ipc); - - menu_select_old_widget = NULL; - project_setup_blink_timeout = 0; return FALSE; } Index: project_setup_cal.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/project_setup_cal.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- project_setup_cal.h 17 May 2003 13:29:01 -0000 1.2 +++ project_setup_cal.h 23 May 2003 07:43:31 -0000 1.3 @@ -22,18 +22,10 @@ struct _Project_ipc { - GtkWidget *win; - GtkWidget *vbox; - GtkWidget *frame; - - GtkWidget *label; GtkWidget *auto_comp; + gpointer setup; }; -void project_auto_edited (GtkCellRendererText *cell, gchar *path_string, - gchar *identifier, gpointer user_data); -int on_project_auto_treeview_list_right_click_event (GtkWidget * widget, - GdkEventButton * event, gpointer user_data); -gboolean Project_quit (GtkWidget *widget, GdkEvent * event, gpointer user_data); - -void project_take_an_action (gint type, gpointer user_data); +void project_auto_edited (GtkCellRendererText * cell, gchar * path_string, gchar * identifier, gpointer user_data); +int on_project_auto_treeview_list_right_click_event (GtkWidget * widget, GdkEventButton * event, gpointer user_data); +gboolean Project_quit (GtkWidget * widget, GdkEvent * event, gpointer user_data); Index: project_setup_win.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/project_setup_win.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project_setup_win.c 17 May 2003 13:29:01 -0000 1.6 +++ project_setup_win.c 23 May 2003 07:43:31 -0000 1.7 @@ -26,32 +26,25 @@ #include <string.h> #include "support.h" -#include "setup_win.h" +#include "setup_wid.h" #include "db.h" #include "project_setup_cal.h" #include "trade.h" #define AUTO_ICON PACKAGE_PIXMAPS_DIR "/auto_comp.png" -#define GLADE_HOOKUP_OBJECT(component,widget,name) \ - gtk_object_set_data_full (GTK_OBJECT (component), name, \ - gtk_widget_ref (widget), (GtkDestroyNotify) gtk_widget_unref) - -#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \ - gtk_object_set_data (GTK_OBJECT (component), name, widget) - -void auto_project (Project_ipc *project_ipc); +void auto_project (Project_ipc * project_ipc); void -auto_project (Project_ipc *project_ipc) +auto_project (Project_ipc * project_ipc) { - GtkWidget *vbox; - GtkWidget *label; - GtkWidget *notebook; - GtkWidget *scrolledwindow; - GtkListStore *store; + GtkWidget *vbox; + GtkWidget *label; + GtkWidget *notebook; + GtkWidget *scrolledwindow; + GtkListStore *store; GtkTreeViewColumn *column; - GtkCellRenderer *renderer; + GtkCellRenderer *renderer; GtkWidget *Genre_treeview_list; GtkWidget *Format_treeview_list; @@ -59,122 +52,90 @@ GtkWidget *Lang_treeview_list; vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (project_ipc->vbox), vbox, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); - GLADE_HOOKUP_OBJECT (project_ipc->win, vbox, "vbox"); notebook = gtk_notebook_new (); - gtk_widget_show (notebook); gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0); - GLADE_HOOKUP_OBJECT (project_ipc->win, notebook, "notebook"); /* Genre */ scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_container_add (GTK_CONTAINER (notebook), scrolledwindow); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_show (scrolledwindow); - GLADE_HOOKUP_OBJECT (project_ipc->win, scrolledwindow, "scrolledwindow"); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); store = gtk_list_store_new (1, G_TYPE_STRING); Genre_treeview_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); g_object_set_data (G_OBJECT (Genre_treeview_list), "type", (gpointer) AUTO_GENRE); renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); - g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (project_auto_edited), - Genre_treeview_list); + g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (project_auto_edited), Genre_treeview_list); column = gtk_tree_view_column_new_with_attributes (_("Entry"), renderer, "text", 0, NULL); gtk_tree_view_column_set_alignment (column, 0.5); gtk_tree_view_append_column (GTK_TREE_VIEW (Genre_treeview_list), column); gtk_container_add (GTK_CONTAINER (scrolledwindow), Genre_treeview_list); - gtk_widget_show (Genre_treeview_list); - GLADE_HOOKUP_OBJECT (project_ipc->win, Genre_treeview_list, "Genre_treeview_list"); /* Format */ scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_container_add (GTK_CONTAINER (notebook), scrolledwindow); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_show (scrolledwindow); - GLADE_HOOKUP_OBJECT (project_ipc->win, scrolledwindow, "scrolledwindow"); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); store = gtk_list_store_new (1, G_TYPE_STRING); Format_treeview_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); g_object_set_data (G_OBJECT (Format_treeview_list), "type", (gpointer) AUTO_FORMAT); renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); - g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (project_auto_edited), - Format_treeview_list); + g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (project_auto_edited), Format_treeview_list); column = gtk_tree_view_column_new_with_attributes (_("Entry"), renderer, "text", 0, NULL); gtk_tree_view_column_set_alignment (column, 0.5); gtk_tree_view_append_column (GTK_TREE_VIEW (Format_treeview_list), column); gtk_container_add (GTK_CONTAINER (scrolledwindow), Format_treeview_list); - gtk_widget_show (Format_treeview_list); - GLADE_HOOKUP_OBJECT (project_ipc->win, Format_treeview_list, "Format_treeview_list"); /* Audio */ scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_container_add (GTK_CONTAINER (notebook), scrolledwindow); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_show (scrolledwindow); - GLADE_HOOKUP_OBJECT (project_ipc->win, scrolledwindow, "scrolledwindow"); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); store = gtk_list_store_new (1, G_TYPE_STRING); Audio_treeview_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); g_object_set_data (G_OBJECT (Audio_treeview_list), "type", (gpointer) AUTO_AUDIO); renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); - g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (project_auto_edited), - Audio_treeview_list); + g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (project_auto_edited), Audio_treeview_list); column = gtk_tree_view_column_new_with_attributes (_("Entry"), renderer, "text", 0, NULL); gtk_tree_view_column_set_alignment (column, 0.5); gtk_tree_view_append_column (GTK_TREE_VIEW (Audio_treeview_list), column); gtk_container_add (GTK_CONTAINER (scrolledwindow), Audio_treeview_list); - gtk_widget_show (Audio_treeview_list); - GLADE_HOOKUP_OBJECT (project_ipc->win, Audio_treeview_list, "Audio_treeview_list"); /* Language */ scrolledwindow = gtk_scrolled_window_new (NULL, NULL); gtk_container_add (GTK_CONTAINER (notebook), scrolledwindow); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_show (scrolledwindow); - GLADE_HOOKUP_OBJECT (project_ipc->win, scrolledwindow, "scrolledwindow"); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); store = gtk_list_store_new (1, G_TYPE_STRING); Lang_treeview_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); g_object_set_data (G_OBJECT (Lang_treeview_list), "type", (gpointer) AUTO_LANGUAGE); renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); - g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (project_auto_edited), - Lang_treeview_list); + g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (project_auto_edited), Lang_treeview_list); column = gtk_tree_view_column_new_with_attributes (_("Entry"), renderer, "text", 0, NULL); gtk_tree_view_column_set_alignment (column, 0.5); gtk_tree_view_append_column (GTK_TREE_VIEW (Lang_treeview_list), column); gtk_container_add (GTK_CONTAINER (scrolledwindow), Lang_treeview_list); - gtk_widget_show (Lang_treeview_list); - GLADE_HOOKUP_OBJECT (project_ipc->win, Lang_treeview_list, "Lang_treeview_list"); label = gtk_label_new (_("Genre")); - gtk_widget_show(label); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), - gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0), label); - GLADE_HOOKUP_OBJECT (project_ipc->win, label, "label"); + gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0), label); label = gtk_label_new (_("Format")); - gtk_widget_show(label); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), - gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1), label); - GLADE_HOOKUP_OBJECT (project_ipc->win, label, "label"); + gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1), label); label = gtk_label_new (_("Audio")); - gtk_widget_show(label); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), - gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2), label); - GLADE_HOOKUP_OBJECT (project_ipc->win, label, "label"); + gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2), label); label = gtk_label_new (_("Language")); - gtk_widget_show(label); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), - gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 3), label); - GLADE_HOOKUP_OBJECT (project_ipc->win, label, "label"); + gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 3), label); db_get_autos (Genre_treeview_list, AUTO_GENRE); db_get_autos (Format... [truncated message content] |
From: Luca R. <lit...@us...> - 2003-05-23 07:43:34
|
Update of /cvsroot/mvideo/MVideo In directory sc8-pr-cvs1:/tmp/cvs-serv3921 Modified Files: ChangeLog Log Message: Major core enhanchement Index: ChangeLog =================================================================== RCS file: /cvsroot/mvideo/MVideo/ChangeLog,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- ChangeLog 17 May 2003 18:00:21 -0000 1.57 +++ ChangeLog 23 May 2003 07:43:30 -0000 1.58 @@ -5,8 +5,10 @@ ^ Let user choose which entries export in .txt * Miscellaneous: major ^ Added mime types for .mvt (compatible with freedesktop.org) - * Setup: minor - ^ New element: string + * Setup: major + ^ New element: container + * Core: major + ^ Totally rewritten setup and film_view, now they are like widgets 0.4.0 Berserk (6/05/2003) ========================= |
From: Luca R. <lit...@us...> - 2003-05-17 18:00:24
|
Update of /cvsroot/mvideo/MVideo In directory sc8-pr-cvs1:/tmp/cvs-serv22098 Modified Files: ChangeLog Log Message: Last commits before main new release Index: ChangeLog =================================================================== RCS file: /cvsroot/mvideo/MVideo/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ChangeLog 17 May 2003 13:29:01 -0000 1.56 +++ ChangeLog 17 May 2003 18:00:21 -0000 1.57 @@ -1,5 +1,5 @@ -0.4.1 (?) -========= +0.4.1 Arrogance +=============== * Export: minor ^ Option to export in plain txt or in UTF8 ^ Let user choose which entries export in .txt @@ -8,8 +8,8 @@ * Setup: minor ^ New element: string -0.4.0 Berserk -============= +0.4.0 Berserk (6/05/2003) +========================= * Layout: major ^ Fade on setup-bar button press ^ Redesigned film view window |
From: Luca R. <lit...@us...> - 2003-05-17 17:56:21
|
Update of /cvsroot/mvideo/MVideo/src In directory sc8-pr-cvs1:/tmp/cvs-serv18671/src Modified Files: about_cal.c about_cal.h about_win.c Log Message: Last commits before main new release Index: about_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/about_cal.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- about_cal.c 7 May 2003 10:44:33 -0000 1.22 +++ about_cal.c 17 May 2003 17:56:18 -0000 1.23 @@ -64,15 +64,22 @@ void draw_last (void); void draw_copyright (void); void set_pause (void); -gboolean set_faster (gpointer str); -gboolean set_slower (gpointer str); gboolean fade_name (gpointer name); +void set_faster_2 (); +void set_slower_2 (); +void set_start_2 (); + static int top_height; static gint fade_timeout = 0; GAsyncQueue *queue; static int old_title; +static int draw_faster=0; +static int draw_slower=0; +static int draw_start=NAME_TIMEOUT; +gchar draw_str[5]; + void set_pause (void) { @@ -111,67 +118,46 @@ return; } -gboolean -set_start (gpointer user_data) +void +set_start_2 (void) { - static short int timeout = 20; GdkPoint points[3] = { {2, 2}, {10, 10}, {2, 18} }; about_pause = 0; gdk_draw_polygon (pixmap, gc_green, TRUE, points, 3); - if (timeout-- >= 0) - return TRUE; - else - { - draw_timeout = 0; - timeout = 20; - return FALSE; - } + + draw_start--; + + return; } -gboolean -set_faster (gpointer str) +void +set_faster_2 (void) { - static short int timeout = 20; GdkPoint points_1[6] = { {10, 2}, {17, 10}, {10, 18}, {10, 14}, {13, 10}, {10, 6} }; GdkPoint points_2[3] = { {2, 2}, {10, 10}, {2, 18} }; gdk_draw_polygon (pixmap, gc_green, TRUE, points_1, 6); gdk_draw_polygon (pixmap, gc_green, TRUE, points_2, 3); - pango_layout_set_markup (layout, str, -1); + pango_layout_set_markup (layout, draw_str, -1); gdk_draw_layout (pixmap, gc_green, 20, 0, layout); - if (timeout-- >= 0) - return TRUE; - else - { - draw_timeout = 0; - timeout = 20; - g_free (str); - return FALSE; - } + draw_faster--; + + return; } -gboolean -set_slower (gpointer str) +void +set_slower_2 (void) { - static short int timeout = 20; GdkPoint points[3] = { {5, 2}, {13, 10}, {5, 18} }; gdk_draw_polygon (pixmap, gc_green, TRUE, points, 3); gdk_draw_rectangle (pixmap, gc_green, TRUE, 0, 2, 3, 16); - pango_layout_set_markup (layout, str, -1); + pango_layout_set_markup (layout, draw_str, -1); gdk_draw_layout (pixmap, gc_green, 16, 0, layout); - if (timeout-- >= 0) - return TRUE; - else - { - draw_timeout = 0; - timeout = 20; - g_free (str); - return FALSE; - } + draw_slower--; } gboolean @@ -226,6 +212,10 @@ state = DRAWING_INTRO; reset = TRUE; pause_scroll = FALSE; + draw_faster=0; + draw_slower=0; + draw_start=20; + fast_fwd = 0; gdk_gc_unref (gc_blue); gdk_gc_unref (gc_green); gdk_gc_unref (gc_fade); @@ -258,15 +248,16 @@ { if (event->button == 1) { - if (draw_timeout != 0) - gtk_timeout_remove (draw_timeout); if (pause_scroll == FALSE) { + draw_start=0; + draw_faster=0; + draw_slower=0; set_pause (); } else { - draw_timeout = gtk_timeout_add (20, set_start, NULL); + draw_start = NAME_TIMEOUT; pause_scroll = FALSE; } } @@ -277,17 +268,13 @@ void mousewheel_scroll (GtkWidget * widget, GdkEventScroll * event) { - gchar *str = NULL; - if (event->direction == GDK_SCROLL_UP) { - if (draw_timeout != 0) - { - gtk_timeout_remove (draw_timeout); - g_free (str); - } if (fast_fwd == 0 && pause_scroll == FALSE) { + draw_start=0; + draw_faster=0; + draw_slower=0; set_pause (); } else if (fast_fwd > 0 && pause_scroll == FALSE) @@ -295,27 +282,35 @@ fast_fwd--; if (fast_fwd != 0) { - str = g_strdup_printf ("x%d", fast_fwd + 1); - draw_timeout = gtk_timeout_add (20, set_slower, str); + draw_start=0; + draw_faster=0; + sprintf(draw_str, "x%d", fast_fwd + 1); + draw_slower=NAME_TIMEOUT+1<<fast_fwd/2; } else - draw_timeout = gtk_timeout_add (20, set_start, NULL); + { + draw_slower=0; + draw_faster=0; + draw_start=NAME_TIMEOUT; + } } } else if (event->direction == GDK_SCROLL_DOWN) { - if (draw_timeout != 0) - gtk_timeout_remove (draw_timeout); if (pause_scroll == TRUE) { pause_scroll = FALSE; - draw_timeout = gtk_timeout_add (20, set_start, NULL); + draw_slower=0; + draw_faster=0; + draw_start=NAME_TIMEOUT; } else { fast_fwd++; - str = g_strdup_printf ("x%d", fast_fwd + 1); - draw_timeout = gtk_timeout_add (20, set_faster, str); + draw_start=0; + draw_slower=0; + sprintf(draw_str, "x%d", fast_fwd + 1); + draw_faster=NAME_TIMEOUT+1<<fast_fwd/2; } } @@ -635,8 +630,8 @@ gdk_draw_layout (pixmap, area->style->white_gc, (area->allocation.width - extents.width) / 2, current_y--, layout); - gdk_draw_rectangle (pixmap, area->style->black_gc, TRUE, 0, 0, - area->allocation.width, top_height); + gdk_draw_rectangle (pixmap, area->style->black_gc, TRUE, 40, 0, + area->allocation.width-40, top_height); markup = g_strdup ("<big><b>THANKS TO</b></big>"); pango_layout_set_markup (layout, markup, -1); @@ -820,6 +815,12 @@ { gdk_draw_rectangle (pixmap, area->style->black_gc, TRUE, 0, 0, area->allocation.width, area->allocation.height); + if (draw_start != 0) + set_start_2(); + if (draw_faster != 0) + set_faster_2(); + if (draw_slower != 0) + set_slower_2(); switch (state) { case DRAWING_INTRO: Index: about_cal.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/about_cal.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- about_cal.h 7 Feb 2003 09:29:41 -0000 1.7 +++ about_cal.h 17 May 2003 17:56:18 -0000 1.8 @@ -49,7 +49,6 @@ GdkGC *gc_blue; GdkGC *gc_green; GdkGC *gc_fade; -static gint draw_timeout = 0; void shape_pressed (GtkWidget * widget, GdkEventButton * event, gpointer user_data); void shape_motion (GtkWidget * widget, GdkEventMotion * event); @@ -59,4 +58,3 @@ gboolean cb_configure (GtkWidget *widget, GdkEventConfigure *event); gboolean cb_exposed (GtkWidget *widget, GdkEventExpose *event); void play_sound_thread (void); -gboolean set_start (gpointer user_data); Index: about_win.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/about_win.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- about_win.c 7 Feb 2003 09:29:41 -0000 1.12 +++ about_win.c 17 May 2003 17:56:18 -0000 1.13 @@ -120,7 +120,6 @@ about_pause = 0; about_stop = 0; scroll_timer = gtk_timeout_add (20, scroll, NULL); - draw_timeout = gtk_timeout_add (20, set_start, NULL); AboutIpc->update_string_timeout = scroll_timer; |
From: Luca R. <lit...@us...> - 2003-05-17 17:56:21
|
Update of /cvsroot/mvideo/MVideo/po In directory sc8-pr-cvs1:/tmp/cvs-serv18671/po Modified Files: it.po mvideo.pot Log Message: Last commits before main new release Index: it.po =================================================================== RCS file: /cvsroot/mvideo/MVideo/po/it.po,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- it.po 7 May 2003 10:44:33 -0000 1.53 +++ it.po 17 May 2003 17:56:17 -0000 1.54 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: MVideo\n" -"POT-Creation-Date: 2003-05-06 21:47+0200\n" -"PO-Revision-Date: 2003-05-06 10:14--100\n" +"POT-Creation-Date: 2003-05-17 19:56+0200\n" +"PO-Revision-Date: 2003-05-17 19:57--100\n" "Last-Translator: Luca Roccia <lit...@us...>\n" "Language-Team: Italian <lit...@us...>\n" "MIME-Version: 1.0\n" @@ -21,7 +21,8 @@ [...1107 lines suppressed...] +#: src/project_setup_cal.c:101 msgid "MVideo: Collection: Preferces" msgstr "\"MVideo: Collezione: Preferenze" -#: src/project_setup_cal.c:134 +#: src/project_setup_cal.c:136 msgid "Don't use \"/\"" msgstr "Non utilizzate \"/\"" -#: src/project_setup_cal.c:139 src/project_setup_cal.c:238 +#: src/project_setup_cal.c:141 +#: src/project_setup_cal.c:240 msgid "NEW" msgstr "NUOVO" -#: src/project_setup_cal.c:152 +#: src/project_setup_cal.c:154 msgid "There is another entry with that name" msgstr "C'è già un elemento con quel nome" + Index: mvideo.pot =================================================================== RCS file: /cvsroot/mvideo/MVideo/po/mvideo.pot,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- mvideo.pot 7 May 2003 10:44:33 -0000 1.50 +++ mvideo.pot 17 May 2003 17:56:17 -0000 1.51 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-05-06 21:47+0200\n" +"POT-Creation-Date: 2003-05-17 19:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -77,21 +77,22 @@ #: src/callbacks.c:54 src/callbacks.c:69 src/select_win.c:146 #: src/interface.c:184 src/interface.c:326 src/interface.c:333 #: src/interface.c:374 src/interface.c:381 src/interface.c:720 -#: src/search_cal.c:776 src/search_cal.c:965 src/title_cal.c:408 -#: src/eximport.c:568 +#: src/setup_win.c:641 src/search_cal.c:776 src/search_cal.c:965 +#: src/title_cal.c:408 src/eximport.c:568 msgid "Title" msgstr "" #: src/callbacks.c:56 src/callbacks.c:71 src/db.c:635 src/select_win.c:296 #: src/select_view_win.c:675 src/interface.c:327 src/interface.c:375 -#: src/interface.c:738 src/search_cal.c:818 src/eximport.c:1401 -#: src/project_setup_win.c:155 +#: src/interface.c:738 src/setup_win.c:698 src/search_cal.c:818 +#: src/eximport.c:1418 src/project_setup_win.c:155 msgid "Genre" msgstr "" #: src/callbacks.c:58 src/callbacks.c:73 src/db.c:642 src/select_win.c:180 #: src/select_view_win.c:669 src/interface.c:328 src/interface.c:376 -#: src/interface.c:744 src/search_cal.c:788 src/eximport.c:1396 +#: src/interface.c:744 src/setup_win.c:658 src/search_cal.c:788 +#: src/eximport.c:1408 msgid "Director" msgstr "" @@ -135,8 +136,8 @@ msgid "Choose" msgstr "" -#: src/generic_win.c:374 src/eximport.c:1438 src/eximport.c:1539 -#: src/eximport.c:1576 +#: src/generic_win.c:374 src/eximport.c:1465 src/eximport.c:1566 +#: src/eximport.c:1603 msgid "Select file" msgstr "" @@ -168,39 +169,39 @@ msgid "About" msgstr "" -#: src/support.c:75 src/select_view_win.c:367 +#: src/support.c:96 src/select_view_win.c:367 msgid "Unable to create config file" msgstr "" -#: src/support.c:279 +#: src/support.c:448 msgid "Usage" msgstr "" -#: src/support.c:279 +#: src/support.c:448 msgid "print this screen" msgstr "" -#: src/support.c:279 +#: src/support.c:448 msgid "print option's help. Do --help help to know more" msgstr "" -#: src/support.c:280 +#: src/support.c:449 msgid "print MVideo version" msgstr "" -#: src/support.c:281 +#: src/support.c:450 msgid "run setup" msgstr "" -#: src/support.c:281 +#: src/support.c:450 msgid "run first setup" msgstr "" -#: src/support.c:281 +#: src/support.c:450 msgid "open an archive" msgstr "" -#: src/support.c:287 +#: src/support.c:456 msgid "" "print a short description of what a command can do or not. Supported " "commands:\n" @@ -209,19 +210,19 @@ "\topen" msgstr "" -#: src/support.c:290 +#: src/support.c:459 msgid "any previous configuration will be deleted and a new one will be saved" msgstr "" -#: src/support.c:293 +#: src/support.c:462 msgid "Open an archive \"[File]\" without the need to run all MVideo" msgstr "" -#: src/support.c:295 +#: src/support.c:464 msgid "Command not found" msgstr "" -#: src/support.c:354 +#: src/support.c:523 msgid "" "Your collection is old\n" "You need to upgrade to use this version of MVideo\n" @@ -238,7 +239,8 @@ #: src/db.c:648 src/select_win.c:339 src/select_view_win.c:680 #: src/select_view_win.c:687 src/interface.c:329 src/interface.c:377 -#: src/interface.c:732 src/search_cal.c:806 src/eximport.c:1399 +#: src/interface.c:732 src/setup_win.c:682 src/search_cal.c:806 +#: src/eximport.c:1414 msgid "Year" msgstr "" @@ -270,8 +272,8 @@ msgid "Not available" msgstr "" -#: src/db.c:910 src/select_win.c:455 src/setup_win.c:149 src/setup_cal.c:205 -#: src/setup_cal.c:207 src/setup_cal.c:208 +#: src/db.c:910 src/select_win.c:455 src/setup_win.c:216 src/setup_cal.c:212 +#: src/setup_cal.c:213 msgid "General" msgstr "" @@ -281,7 +283,7 @@ #: src/db.c:910 src/select_win.c:487 src/select_win.c:507 #: src/select_view_win.c:743 src/interface.c:188 src/interface.c:623 -#: src/eximport.c:1413 +#: src/setup_win.c:778 src/eximport.c:1440 msgid "Notes" msgstr "" @@ -309,8 +311,8 @@ msgid "Name" msgstr "" -#: src/db.c:913 src/setup_win.c:159 src/setup_win.c:555 src/setup_cal.c:211 -#: src/setup_cal.c:213 src/setup_cal.c:214 +#: src/db.c:913 src/setup_win.c:227 src/setup_win.c:878 src/setup_cal.c:217 +#: src/setup_cal.c:218 msgid "User" msgstr "" @@ -338,7 +340,7 @@ msgid "Server version" msgstr "" -#: src/db.c:916 src/first_setup_win.c:140 src/setup_win.c:480 +#: src/db.c:916 src/first_setup_win.c:140 src/setup_win.c:566 msgid "Host" msgstr "" @@ -361,27 +363,27 @@ msgstr "" #: src/select_win.c:158 src/select_view_win.c:667 src/interface.c:726 -#: src/search_cal.c:782 src/eximport.c:1395 +#: src/setup_win.c:650 src/search_cal.c:782 src/eximport.c:1406 msgid "Original title" msgstr "" #: src/select_win.c:197 src/select_view_win.c:671 src/interface.c:756 -#: src/search_cal.c:794 src/eximport.c:1397 +#: src/setup_win.c:666 src/search_cal.c:794 src/eximport.c:1410 msgid "Producer" msgstr "" #: src/select_win.c:209 src/select_view_win.c:700 src/interface.c:750 -#: src/search_cal.c:800 src/eximport.c:1398 +#: src/setup_win.c:674 src/search_cal.c:800 src/eximport.c:1412 msgid "Actors" msgstr "" #: src/select_win.c:231 src/select_view_win.c:673 src/interface.c:762 -#: src/search_cal.c:842 src/eximport.c:1402 +#: src/setup_win.c:706 src/search_cal.c:842 src/eximport.c:1420 msgid "Distributor" msgstr "" #: src/select_win.c:248 src/select_view_win.c:703 src/interface.c:768 -#: src/search_cal.c:866 src/eximport.c:1410 +#: src/setup_win.c:762 src/search_cal.c:866 src/eximport.c:1435 msgid "Stars" msgstr "" @@ -390,12 +392,12 @@ msgstr "" #: src/select_win.c:275 src/select_view_win.c:706 src/interface.c:839 -#: src/search_cal.c:860 src/project_setup_win.c:173 +#: src/setup_win.c:730 src/search_cal.c:860 src/project_setup_win.c:173 msgid "Language" msgstr "" #: src/select_win.c:322 src/select_view_win.c:677 src/interface.c:814 -#: src/search_cal.c:848 src/eximport.c:1403 +#: src/setup_win.c:714 src/search_cal.c:848 src/eximport.c:1422 msgid "Country" msgstr "" @@ -404,36 +406,40 @@ msgstr "" #: src/select_win.c:359 src/select_view_win.c:691 src/select_view_win.c:697 -#: src/interface.c:802 src/search_cal.c:812 src/eximport.c:1400 +#: src/interface.c:802 src/setup_win.c:690 src/search_cal.c:812 +#: src/eximport.c:1416 msgid "Time" msgstr "" #: src/select_win.c:381 src/select_view_win.c:718 src/interface.c:774 -#: src/search_cal.c:824 src/eximport.c:1405 src/project_setup_win.c:161 +#: src/search_cal.c:824 src/eximport.c:1425 src/project_setup_win.c:161 msgid "Format" msgstr "" #: src/select_win.c:403 src/select_view_win.c:721 src/select_view_win.c:727 -#: src/interface.c:904 src/search_cal.c:830 src/eximport.c:1407 +#: src/interface.c:904 src/search_cal.c:830 src/eximport.c:1429 #: src/project_setup_win.c:167 msgid "Audio" msgstr "" #: src/select_win.c:425 src/select_view_win.c:709 src/select_view_win.c:715 -#: src/interface.c:934 src/search_cal.c:836 src/eximport.c:1408 +#: src/interface.c:934 src/setup_win.c:746 src/search_cal.c:836 +#: src/eximport.c:1431 msgid "Quality" msgstr "" #: src/select_win.c:442 src/select_view_win.c:731 src/select_view_win.c:737 -#: src/interface.c:921 src/search_cal.c:854 src/eximport.c:1409 +#: src/interface.c:921 src/setup_win.c:754 src/search_cal.c:854 +#: src/eximport.c:1433 msgid "CDs" msgstr "" -#: src/select_win.c:467 src/select_view_win.c:742 src/eximport.c:1412 +#: src/select_win.c:467 src/select_view_win.c:742 src/setup_win.c:770 +#: src/eximport.c:1438 msgid "Story" msgstr "" -#: src/select_win.c:547 +#: src/select_win.c:547 src/setup_win.c:786 msgid "Picture" msgstr "" @@ -460,7 +466,7 @@ msgid "Leave 1900 to not memorize any year" msgstr "" -#: src/select_win.c:583 src/setup_win.c:723 +#: src/select_win.c:583 src/setup_win.c:1047 msgid "Save" msgstr "" @@ -535,8 +541,9 @@ msgid "Print preview" msgstr "" -#: src/select_view_win.c:194 src/search_cal.c:1043 src/title_cal.c:334 -#: src/eximport.c:1510 src/project_menu.c:163 +#: src/select_view_win.c:194 src/setup_win.c:277 src/setup_cal.c:232 +#: src/setup_cal.c:233 src/search_cal.c:1043 src/title_cal.c:334 +#: src/eximport.c:1537 src/project_menu.c:163 msgid "Export" msgstr "" @@ -639,7 +646,7 @@ msgid "Identifier" msgstr "" -#: src/interface.c:606 src/setup_win.c:775 +#: src/interface.c:606 src/setup_win.c:1099 msgid "Cancel" msgstr "" @@ -700,7 +707,7 @@ msgid "User name" msgstr "" -#: src/first_setup_win.c:128 src/setup_win.c:559 +#: src/first_setup_win.c:128 src/setup_win.c:882 msgid "Password" msgstr "" @@ -792,87 +799,105 @@ msgid "Created default database" msgstr "" -#: src/setup_win.c:169 src/setup_cal.c:217 src/setup_cal.c:219 -#: src/setup_cal.c:220 +#: src/setup_win.c:237 src/setup_cal.c:222 src/setup_cal.c:223 msgid "Printer" msgstr "" -#: src/setup_win.c:179 src/setup_cal.c:223 src/setup_cal.c:225 -#: src/setup_cal.c:226 +#: src/setup_win.c:248 src/setup_cal.c:227 src/setup_cal.c:228 msgid "Sound" msgstr "" -#: src/setup_win.c:189 src/setup_cal.c:231 src/setup_cal.c:232 +#: src/setup_win.c:258 src/setup_cal.c:237 src/setup_cal.c:238 msgid "Databases" msgstr "" -#: src/setup_win.c:225 +#: src/setup_win.c:268 +msgid "Advanced" +msgstr "" + +#: src/setup_win.c:314 msgid "Pixmaps" msgstr "" -#: src/setup_win.c:247 +#: src/setup_win.c:336 msgid "Logo" msgstr "" -#: src/setup_win.c:251 +#: src/setup_win.c:340 msgid "Show start logo" msgstr "" -#: src/setup_win.c:262 +#: src/setup_win.c:351 msgid "Update main list" msgstr "" -#: src/setup_win.c:271 +#: src/setup_win.c:360 msgid "on adding a title" msgstr "" -#: src/setup_win.c:280 +#: src/setup_win.c:369 msgid "on modifying a title" msgstr "" -#: src/setup_win.c:289 +#: src/setup_win.c:378 msgid "on deleteing a title" msgstr "" -#: src/setup_win.c:385 +#: src/setup_win.c:471 msgid "Play sound" msgstr "" -#: src/setup_win.c:396 +#: src/setup_win.c:482 msgid "Files" msgstr "" -#: src/setup_win.c:466 src/setup_win.c:541 +#: src/setup_win.c:552 src/setup_win.c:864 msgid "Settings" msgstr "" -#: src/setup_win.c:484 +#: src/setup_win.c:570 msgid "Default collection" msgstr "" -#: src/setup_win.c:563 +#: src/setup_win.c:625 +msgid "Txt options" +msgstr "" + +#: src/setup_win.c:722 +msgid "Video format" +msgstr "" + +#: src/setup_win.c:738 +msgid "Audio format" +msgstr "" + +#: src/setup_win.c:794 +msgid "export in UTF-8" +msgstr "" + +#: src/setup_win.c:886 msgid "Confirmation" msgstr "" -#: src/setup_win.c:623 src/setup_win.c:672 src/project_menu.c:190 +#: src/setup_win.c:947 src/setup_win.c:995 src/project_menu.c:190 #: src/project_setup_win.c:251 src/project_setup_win.c:301 msgid "Preferences" msgstr "" -#: src/setup_win.c:680 +#: src/setup_win.c:1003 msgid "Welcome to MVideo Setup" msgstr "" -#: src/setup_win.c:749 +#: src/setup_win.c:1073 msgid "Apply" msgstr "" -#: src/setup_cal.c:107 +#: src/setup_cal.c:106 msgid "Password not changed: password doesn't match with confirm" msgstr "" -#: src/setup_cal.c:208 src/setup_cal.c:214 src/setup_cal.c:220 -#: src/setup_cal.c:226 src/setup_cal.c:232 +#: src/setup_cal.c:213 src/setup_cal.c:218 src/setup_cal.c:223 +#: src/setup_cal.c:228 src/setup_cal.c:233 src/setup_cal.c:238 msgid "MVideo: Preferences" msgstr "" @@ -882,19 +907,19 @@ "Are you sure to quit?" msgstr "" -#: src/about_cal.c:408 +#: src/about_cal.c:403 msgid "<big><b>was brought</b></big>" msgstr "" -#: src/about_cal.c:425 +#: src/about_cal.c:420 msgid "<big><b>to you by:</b></big>" msgstr "" -#: src/about_cal.c:734 +#: src/about_cal.c:729 msgid "<big><b>And many more ...</b></big>" msgstr "" -#: src/about_cal.c:759 +#: src/about_cal.c:754 msgid "<big><b>Copyright Luca Roccia</b></big>" msgstr "" @@ -1064,23 +1089,23 @@ "Do you want to overwrite?" msgstr "" -#: src/eximport.c:1073 src/eximport.c:1157 +#: src/eximport.c:1073 src/eximport.c:1158 msgid "Cannot write to file" msgstr "" -#: src/eximport.c:1120 src/eximport.c:1188 +#: src/eximport.c:1120 src/eximport.c:1195 msgid "Added title" msgstr "" -#: src/eximport.c:1406 +#: src/eximport.c:1427 msgid "Lang" msgstr "" -#: src/eximport.c:1464 +#: src/eximport.c:1491 msgid "Save file like:" msgstr "" -#: src/eximport.c:1518 +#: src/eximport.c:1545 msgid "Export all" msgstr "" @@ -1099,8 +1124,8 @@ msgid "Entry" msgstr "" -#: src/project_setup_win.c:212 src/project_setup_cal.c:97 -#: src/project_setup_cal.c:99 src/project_setup_cal.c:100 +#: src/project_setup_win.c:212 src/project_setup_cal.c:100 +#: src/project_setup_cal.c:101 msgid "" "Auto\n" "completions" @@ -1110,18 +1135,18 @@ msgid "Welcome to MVideo Collection Setup" msgstr "" -#: src/project_setup_cal.c:100 +#: src/project_setup_cal.c:101 msgid "MVideo: Collection: Preferces" msgstr "" -#: src/project_setup_cal.c:134 +#: src/project_setup_cal.c:136 msgid "Don't use \"/\"" msgstr "" -#: src/project_setup_cal.c:139 src/project_setup_cal.c:238 +#: src/project_setup_cal.c:141 src/project_setup_cal.c:240 msgid "NEW" msgstr "" -#: src/project_setup_cal.c:152 +#: src/project_setup_cal.c:154 msgid "There is another entry with that name" msgstr "" |
From: Luca R. <lit...@us...> - 2003-05-17 13:33:01
|
Update of /cvsroot/mvideo/MVideo/pixmaps In directory sc8-pr-cvs1:/tmp/cvs-serv26275 Added Files: export_icon.png setup_arrow_down.png Log Message: Let user select which infos export in txt --- NEW FILE: export_icon.png --- PNG ÿ_°`Á ö(@°¶¶y`Ð= æE¶ hênnn¸Þ+6=þü?<qêÔ©ÿ-ú_XXõ°'ýÎÄÿy`!¨db>dû óÀ UN@,l7@ ýóNx ì2Ü×wÔÀ+ H-( E=(¡AFΨ 9:Pëò (Óbh î¤Æ À®ê4`,ä&¨ÛP[¬d¸¸¸fÁ<*U@dÈ 9ý ó(k7ø° )XûAIسû¯££ó_FFæ ÐÎS@»çq6ûºÜ@¬ AI ¡ú ?dHâº;±Ð¤¢¢+ËÀuþ>Ju6Qé}Ðjõ±VW MÖLÈs MP©ó(SÃÆ8aÅÈC ZYYý¶»^`%Ôáî@lmaräp( --- NEW FILE: setup_arrow_down.png --- PNG ¿èk |
From: Luca R. <lit...@us...> - 2003-05-17 13:29:05
|
Update of /cvsroot/mvideo/MVideo/src In directory sc8-pr-cvs1:/tmp/cvs-serv23233/src Modified Files: eximport.c project_setup_cal.c project_setup_cal.h project_setup_win.c setup_cal.c setup_cal.h setup_win.c setup_win.h support.c trade.h Log Message: Let user select which infos export in txt Index: eximport.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/eximport.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- eximport.c 8 May 2003 15:30:06 -0000 1.15 +++ eximport.c 17 May 2003 13:29:01 -0000 1.16 @@ -1398,26 +1398,46 @@ string = g_string_new (""); if (type==EXPORT_TXT) { - g_string_append_printf (string, "%4d)\t%s\n", current_pos, film->film->title); - g_string_append_printf (string, "\t%s: %s\n", _("Original title"), film->film->original_title); - g_string_append_printf (string, "\t%s: %s\n", _("Director"), film->film->director); - g_string_append_printf (string, "\t%s: %s\n", _("Producer"), film->film->producer); - g_string_append_printf (string, "\t%s: %s\n", _("Actors"), film->film->actors); - g_string_append_printf (string, "\t%s: %s\n", _("Year"), film->film->year); - g_string_append_printf (string, "\t%s: %s\n", _("Time"), film->film->time); - g_string_append_printf (string, "\t%s: %s\n", _("Genre"), film->film->genre); - g_string_append_printf (string, "\t%s: %s\n", _("Distributor"), film->film->distributor); - g_string_append_printf (string, "\t%s: %s\n", _("Country"), film->film->country); + if (options_global_read->export_title) + g_string_append_printf (string, "%4d) %s\n", current_pos, film->film->title); + else + g_string_append_printf (string, "%4d)\n", current_pos); + if (options_global_read->export_otitle) + g_string_append_printf (string, "\t%s: %s\n", _("Original title"), film->film->original_title); + if (options_global_read->export_director) + g_string_append_printf (string, "\t%s: %s\n", _("Director"), film->film->director); + if (options_global_read->export_producer) + g_string_append_printf (string, "\t%s: %s\n", _("Producer"), film->film->producer); + if (options_global_read->export_actors) + g_string_append_printf (string, "\t%s: %s\n", _("Actors"), film->film->actors); + if (options_global_read->export_year) + g_string_append_printf (string, "\t%s: %s\n", _("Year"), film->film->year); + if (options_global_read->export_time) + g_string_append_printf (string, "\t%s: %s\n", _("Time"), film->film->time); + if (options_global_read->export_genre) + g_string_append_printf (string, "\t%s: %s\n", _("Genre"), film->film->genre); + if (options_global_read->export_distributor) + g_string_append_printf (string, "\t%s: %s\n", _("Distributor"), film->film->distributor); + if (options_global_read->export_country) + g_string_append_printf (string, "\t%s: %s\n", _("Country"), film->film->country); - g_string_append_printf (string, "\t%s: %s\n", _("Format"), film->format->video); - g_string_append_printf (string, "\t%s: %s\n", _("Lang"), film->format->language); - g_string_append_printf (string, "\t%s: %s\n", _("Audio"), film->format->audio); - g_string_append_printf (string, "\t%s: %s\n", _("Quality"), film->format->quality); - g_string_append_printf (string, "\t%s: %s\n", _("CDs"), film->format->cds); - g_string_append_printf (string, "\t%s: %s\n", _("Stars"), film->format->stars); + if (options_global_read->export_format) + g_string_append_printf (string, "\t%s: %s\n", _("Format"), film->format->video); + if (options_global_read->export_language) + g_string_append_printf (string, "\t%s: %s\n", _("Lang"), film->format->language); + if (options_global_read->export_audio) + g_string_append_printf (string, "\t%s: %s\n", _("Audio"), film->format->audio); + if (options_global_read->export_quality) + g_string_append_printf (string, "\t%s: %s\n", _("Quality"), film->format->quality); + if (options_global_read->export_cds) + g_string_append_printf (string, "\t%s: %s\n", _("CDs"), film->format->cds); + if (options_global_read->export_stars) + g_string_append_printf (string, "\t%s: %s\n", _("Stars"), film->format->stars); - g_string_append_printf (string, "\t%s: %s\n", _("Story"), film->notes->trama); - g_string_append_printf (string, "\t%s: %s\n", _("Notes"), film->notes->notes); + if (options_global_read->export_story) + g_string_append_printf (string, "\t%s: %s\n", _("Story"), film->notes->trama); + if (options_global_read->export_notes) + g_string_append_printf (string, "\t%s: %s\n", _("Notes"), film->notes->notes); } else g_string_append_printf (string, "%4d)\t%s\n", current_pos, film->film->title); Index: project_setup_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/project_setup_cal.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project_setup_cal.c 26 Feb 2003 23:00:36 -0000 1.5 +++ project_setup_cal.c 17 May 2003 13:29:01 -0000 1.6 @@ -27,6 +27,7 @@ #include "support.h" #include "generic_win.h" +#include "setup_win.h" #include "db.h" #include "project_setup_cal.h" @@ -39,7 +40,6 @@ void on_project_auto_delete_activate (GtkMenuItem * togglebutton, gpointer user_data); void on_project_auto_add_activate (GtkMenuItem * togglebutton, gpointer user_data); -void project_take_an_action (gchar * group, gpointer user_data); gboolean project_setup_blink (gpointer data); static int project_setup_blink_timeout = 0; @@ -84,7 +84,7 @@ } void -project_take_an_action (gchar *group, gpointer user_data) +project_take_an_action (gint type, gpointer user_data) { gchar *title_win_new; Project_ipc *project_ipc; @@ -94,14 +94,16 @@ gtk_widget_hide (project_ipc->label); gtk_widget_hide_all (project_ipc->auto_comp); - if (strcmp (group, _("Auto\ncompletions")) == 0) + switch (type) { - gtk_frame_set_label (GTK_FRAME (project_ipc->frame), _("Auto\ncompletions")); - title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Collection: Preferces"), _("Auto\ncompletions")); - gtk_widget_show_all (project_ipc->auto_comp); + case (PROJECT_SETUP_AUTO): + gtk_frame_set_label (GTK_FRAME (project_ipc->frame), _("Auto\ncompletions")); + title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Collection: Preferces"), _("Auto\ncompletions")); + gtk_widget_show_all (project_ipc->auto_comp); + break; + default: + break; } - else - return; gtk_window_set_title (GTK_WINDOW (project_ipc->win), title_win_new); g_free (title_win_new); } @@ -272,46 +274,6 @@ menu_select_old_widget = NULL; project_setup_blink_timeout = 0; - - return FALSE; -} - -gboolean -on_project_button_press_event (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) -{ - gchar *txt_button; - GdkColor white = { 0, 65535, 65535, 65535 }; - - if ( menu_select_old_widget != widget) - { - if (project_setup_blink_timeout != 0) - gtk_timeout_remove (project_setup_blink_timeout); - project_setup_blink_times = BLINK_TIMES; - project_setup_blink_timeout = gtk_timeout_add (40, project_setup_blink, widget); - - if ( menu_select_old_widget != NULL) - { - gtk_widget_modify_bg (menu_select_old_widget, 0, &white); - gtk_widget_modify_bg (menu_select_old_widget, 1, &white); - gtk_widget_modify_bg (menu_select_old_widget, 2, &white); - gtk_widget_modify_bg (menu_select_old_widget, 3, &white); - gtk_widget_modify_bg (menu_select_old_widget, 4, &white); - - gtk_viewport_set_shadow_type (GTK_VIEWPORT(menu_select_old_widget->parent), - GTK_SHADOW_NONE); - gtk_widget_modify_bg (menu_select_old_widget->parent, 0, &white); - gtk_widget_modify_bg (menu_select_old_widget->parent, 1, &white); - gtk_widget_modify_bg (menu_select_old_widget->parent, 2, &white); - gtk_widget_modify_bg (menu_select_old_widget->parent, 3, &white); - gtk_widget_modify_bg (menu_select_old_widget->parent, 4, &white); - } - - txt_button = g_strdup ((gchar *) g_object_get_data (G_OBJECT (widget), "name")); - project_take_an_action (txt_button, user_data); - g_free (txt_button); - - menu_select_old_widget = widget; - } return FALSE; } Index: project_setup_cal.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/project_setup_cal.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- project_setup_cal.h 14 Feb 2003 15:01:31 -0000 1.1 +++ project_setup_cal.h 17 May 2003 13:29:01 -0000 1.2 @@ -34,6 +34,6 @@ gchar *identifier, gpointer user_data); int on_project_auto_treeview_list_right_click_event (GtkWidget * widget, GdkEventButton * event, gpointer user_data); -gboolean on_project_button_press_event (GtkWidget *widget, GdkEventCrossing *event, - gpointer user_data); gboolean Project_quit (GtkWidget *widget, GdkEvent * event, gpointer user_data); + +void project_take_an_action (gint type, gpointer user_data); Index: project_setup_win.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/project_setup_win.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project_setup_win.c 26 Feb 2003 23:00:38 -0000 1.5 +++ project_setup_win.c 17 May 2003 13:29:01 -0000 1.6 @@ -209,8 +209,8 @@ vbox = gtk_vbox_new (FALSE, 5); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - button_auto = populate_main_list_3 (win, _("Auto\ncompletions"), AUTO_ICON, - user_data, (gpointer)on_project_button_press_event); + button_auto = populate_main_list_4 (win, _("Auto\ncompletions"), PROJECT_SETUP_AUTO, AUTO_ICON, + user_data, (gpointer)project_take_an_action); gtk_widget_show (button_auto); gtk_box_pack_start (GTK_BOX (vbox), button_auto, FALSE, FALSE, 0); GLADE_HOOKUP_OBJECT (win, button_auto, "button_auto"); Index: setup_cal.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/setup_cal.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- setup_cal.c 8 May 2003 15:30:07 -0000 1.25 +++ setup_cal.c 17 May 2003 13:29:01 -0000 1.26 @@ -38,7 +38,6 @@ void free_setup_infos (Setup_global_ipc *setup_ipc); void apply_changes (Setup_global_ipc *setup_ipc); -void take_an_action (gchar *group, gpointer user_data); gboolean setup_blink (gpointer data); static int setup_blink_timeout = 0; @@ -121,31 +120,33 @@ /* General */ g_free (options_global_read->dir_pix); options_global_read->dir_pix = gtk_editable_get_chars (GTK_EDITABLE (setup_ipc->general->pic_dir), 0, -1); - if (setup_ipc->general->show_logo->toggle_button.active) - i = 1; - else - i = 0; - options_global_read->show_logo = i; - if (setup_ipc->general->update_list_add->toggle_button.active) - i = 1; - else - i = 0; - options_global_read->update_list_add = i; - if (setup_ipc->general->update_list_modify->toggle_button.active) - i = 1; - else - i = 0; - options_global_read->update_list_modify = i; - if (setup_ipc->general->update_list_delete->toggle_button.active) - i = 1; - else - i = 0; - options_global_read->update_list_delete = i; - if (setup_ipc->general->export_utf->toggle_button.active) - i = 1; - else - i = 0; - options_global_read->export_utf = i; + + options_global_read->show_logo = setup_ipc->general->show_logo->toggle_button.active ? 1 : 0; + options_global_read->update_list_add = setup_ipc->general->update_list_add->toggle_button.active ? 1 : 0; + options_global_read->update_list_modify = setup_ipc->general->update_list_modify->toggle_button.active ? 1 : 0; + options_global_read->update_list_delete = setup_ipc->general->update_list_delete->toggle_button.active ? 1 : 0; + + /* Export */ + options_global_read->export_utf = setup_ipc->exp->export_utf->toggle_button.active ? 1 : 0; + options_global_read->export_title = setup_ipc->exp->title->toggle_button.active ? TRUE : FALSE; + options_global_read->export_otitle = setup_ipc->exp->otitle->toggle_button.active ? TRUE : FALSE; + options_global_read->export_director = setup_ipc->exp->director->toggle_button.active ? TRUE : FALSE; + options_global_read->export_producer = setup_ipc->exp->producer->toggle_button.active ? TRUE : FALSE; + options_global_read->export_actors = setup_ipc->exp->actors->toggle_button.active ? TRUE : FALSE; + options_global_read->export_year = setup_ipc->exp->year->toggle_button.active ? TRUE : FALSE; + options_global_read->export_time = setup_ipc->exp->time->toggle_button.active ? TRUE : FALSE; + options_global_read->export_genre = setup_ipc->exp->genre->toggle_button.active ? TRUE : FALSE; + options_global_read->export_distributor = setup_ipc->exp->distributor->toggle_button.active ? TRUE : FALSE; + options_global_read->export_country = setup_ipc->exp->country->toggle_button.active ? TRUE : FALSE; + options_global_read->export_format = setup_ipc->exp->format->toggle_button.active ? TRUE : FALSE; + options_global_read->export_language = setup_ipc->exp->language->toggle_button.active ? TRUE : FALSE; + options_global_read->export_audio = setup_ipc->exp->audio->toggle_button.active ? TRUE : FALSE; + options_global_read->export_quality = setup_ipc->exp->quality->toggle_button.active ? TRUE : FALSE; + options_global_read->export_cds = setup_ipc->exp->cds->toggle_button.active ? TRUE : FALSE; + options_global_read->export_stars = setup_ipc->exp->stars->toggle_button.active ? TRUE : FALSE; + options_global_read->export_story = setup_ipc->exp->story->toggle_button.active ? TRUE : FALSE; + options_global_read->export_notes = setup_ipc->exp->notes->toggle_button.active ? TRUE : FALSE; + options_global_read->export_picture = setup_ipc->exp->picture->toggle_button.active ? TRUE : FALSE; /* Sound */ #ifdef __HAVE_AUDIO__ @@ -170,11 +171,7 @@ g_free (options_global_read->sounds[AUDIO_SEARCH]); options_global_read->sounds[AUDIO_SEARCH] = gtk_editable_get_chars (GTK_EDITABLE (setup_ipc->sound->entry_search), 0, -1); - if (setup_ipc->sound->play_sound->toggle_button.active) - i = 1; - else - i = 0; - options_global_read->play_sound = i; + options_global_read->play_sound = setup_ipc->sound->play_sound->toggle_button.active ? 1 : 0; #endif return; @@ -188,13 +185,14 @@ g_free (setup_ipc->databases); g_free (setup_ipc->printer); g_free (setup_ipc->sound); + g_free (setup_ipc->exp); g_free (setup_ipc); return; } void -take_an_action (gchar * group, gpointer user_data) +take_an_action (gint type, gpointer user_data) { gchar *title_win_new; Setup_global_ipc *setup_ipc; @@ -207,35 +205,39 @@ gtk_widget_hide_all (setup_ipc->databases->vbox); gtk_widget_hide_all (setup_ipc->printer->vbox); gtk_widget_hide_all (setup_ipc->sound->vbox); - if (strcmp (group, _("General")) == 0) - { - gtk_frame_set_label (GTK_FRAME (setup_ipc->frame), _("General")); - title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Preferences"), _("General")); - gtk_widget_show_all (setup_ipc->general->vbox); - } - else if (strcmp (group, _("User")) == 0) + gtk_widget_hide_all (setup_ipc->exp->vbox); + switch (type) { - gtk_frame_set_label (GTK_FRAME (setup_ipc->frame), _("User")); - title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Preferences"), _("User")); - gtk_widget_show_all (setup_ipc->user->vbox); - } - else if (strcmp (group, _("Printer")) == 0) - { - gtk_frame_set_label (GTK_FRAME (setup_ipc->frame), _("Printer")); - title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Preferences"), _("Printer")); - gtk_widget_show_all (setup_ipc->printer->vbox); - } - else if (strcmp (group, _("Sound")) == 0) - { - gtk_frame_set_label (GTK_FRAME (setup_ipc->frame), _("Sound")); - title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Preferences"), _("Sound")); - gtk_widget_show_all (setup_ipc->sound->vbox); - } - else - { - gtk_frame_set_label (GTK_FRAME (setup_ipc->frame), _("Databases")); - title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Preferences"), _("Databases")); - gtk_widget_show_all (setup_ipc->databases->vbox); + case (SETUP_GENERAL): + gtk_frame_set_label (GTK_FRAME (setup_ipc->frame), _("General")); + title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Preferences"), _("General")); + gtk_widget_show_all (setup_ipc->general->vbox); + break; + case (SETUP_USER): + gtk_frame_set_label (GTK_FRAME (setup_ipc->frame), _("User")); + title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Preferences"), _("User")); + gtk_widget_show_all (setup_ipc->user->vbox); + break; + case (SETUP_PRINTER): + gtk_frame_set_label (GTK_FRAME (setup_ipc->frame), _("Printer")); + title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Preferences"), _("Printer")); + gtk_widget_show_all (setup_ipc->printer->vbox); + break; + case (SETUP_SOUND): + gtk_frame_set_label (GTK_FRAME (setup_ipc->frame), _("Sound")); + title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Preferences"), _("Sound")); + gtk_widget_show_all (setup_ipc->sound->vbox); + break; + case (SETUP_EXPORT): + gtk_frame_set_label (GTK_FRAME (setup_ipc->frame), _("Export")); + title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Preferences"), _("Export")); + gtk_widget_show_all (setup_ipc->exp->vbox); + break; + default: + gtk_frame_set_label (GTK_FRAME (setup_ipc->frame), _("Databases")); + title_win_new = g_strdup_printf ("%s: %s", _("MVideo: Preferences"), _("Databases")); + gtk_widget_show_all (setup_ipc->databases->vbox); + break; } gtk_window_set_title (GTK_WINDOW (setup_ipc->win), title_win_new); g_free (title_win_new); @@ -244,8 +246,9 @@ gboolean on_button_press_event (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) { - gchar *txt_button; + gint type; GdkColor white = { 0, 65535, 65535, 65535 }; + void *func; if ( menu_select_old_widget != widget) { @@ -271,9 +274,10 @@ gtk_widget_modify_bg (menu_select_old_widget->parent, 4, &white); } - txt_button = g_strdup ((gchar *) g_object_get_data (G_OBJECT (widget), "name")); - take_an_action (txt_button, user_data); - g_free (txt_button); + type = (gint) g_object_get_data (G_OBJECT (widget), "type"); + void (*func) (gint, gpointer) = (gpointer) g_object_get_data (G_OBJECT (widget), "func"); + + func (type, user_data); menu_select_old_widget = widget; } Index: setup_cal.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/setup_cal.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- setup_cal.h 8 May 2003 15:30:07 -0000 1.16 +++ setup_cal.h 17 May 2003 13:29:02 -0000 1.17 @@ -24,6 +24,7 @@ typedef struct _Setup_sound_ipc Setup_sound_ipc; typedef struct _Setup_databases_ipc Setup_databases_ipc; typedef struct _Setup_printer_ipc Setup_printer_ipc; +typedef struct _Setup_export_ipc Setup_export_ipc; struct _Setup_global_ipc { @@ -37,6 +38,7 @@ Setup_databases_ipc *databases; Setup_printer_ipc *printer; Setup_user_ipc *user; + Setup_export_ipc *exp; gint type; }; @@ -48,7 +50,6 @@ GtkCheckButton *update_list_add; GtkCheckButton *update_list_modify; GtkCheckButton *update_list_delete; - GtkCheckButton *export_utf; }; struct _Setup_sound_ipc @@ -73,6 +74,31 @@ GtkEntry *default_database; }; +struct _Setup_export_ipc +{ + GtkWidget *vbox; + GtkCheckButton *title; + GtkCheckButton *otitle; + GtkCheckButton *director; + GtkCheckButton *producer; + GtkCheckButton *actors; + GtkCheckButton *year; + GtkCheckButton *time; + GtkCheckButton *genre; + GtkCheckButton *distributor; + GtkCheckButton *country; + GtkCheckButton *format; + GtkCheckButton *language; + GtkCheckButton *audio; + GtkCheckButton *quality; + GtkCheckButton *cds; + GtkCheckButton *stars; + GtkCheckButton *story; + GtkCheckButton *notes; + GtkCheckButton *picture; + GtkCheckButton *export_utf; +}; + struct _Setup_printer_ipc { GtkWidget *vbox; @@ -98,3 +124,5 @@ gboolean on_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); gboolean on_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); gboolean on_button_press_event (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data); + +void take_an_action (gint type, gpointer user_data); Index: setup_win.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/setup_win.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- setup_win.c 8 May 2003 15:30:07 -0000 1.33 +++ setup_win.c 17 May 2003 13:29:02 -0000 1.34 @@ -28,6 +28,7 @@ #include "support.h" #include "setup_cal.h" +#include "setup_win.h" #include "trade.h" #include "generic_win.h" @@ -43,6 +44,9 @@ #define DAT_ICON PACKAGE_PIXMAPS_DIR "/dat_icon.png" #define PRINTER_ICON PACKAGE_PIXMAPS_DIR "/printer_icon.png" #define SOUND_ICON PACKAGE_PIXMAPS_DIR "/sound_icon.png" +#define EXP_ICON PACKAGE_PIXMAPS_DIR "/export_icon.png" + +#define SETUP_ARROW_DOWN PACKAGE_PIXMAPS_DIR "/setup_arrow_down.png" GtkWidget *main_list (GtkWidget * win, gpointer user_data); void general_setup (Setup_global_ipc * setup_ipc); @@ -50,82 +54,142 @@ void databases_setup (Setup_global_ipc * setup_ipc); void printer_setup (Setup_global_ipc * setup_ipc); void user_setup (Setup_global_ipc * setup_ipc); +void export_setup (Setup_global_ipc * setup_ipc); #ifdef __HAVE_AUDIO__ void sound_setup_entries (Setup_global_ipc * setup_ipc, GtkWidget * entry, int i, gchar * txt, GtkWidget * table); #endif GtkWidget * -populate_main_list_3 (GtkWidget * win, gchar * name, gchar * file, - gpointer user_data, void (*func) (gpointer user_data)) +populate_main_list_4 (GtkWidget * win, gchar * name, gint type, gchar * file, + gpointer user_data, void (*func_action) (gint, gpointer user_data)) { - GtkWidget *eventbox; - GtkWidget *vbox; - GtkWidget *image; GtkWidget *label; GdkColor blue = { 0, 0, 0, 65535 }; GdkColor white = { 0, 65535, 65535, 65535 }; GtkWidget *alignment; GtkWidget *viewport; + GtkWidget *vbox; + GtkWidget *image; PangoLayout *layout; PangoRectangle extents; alignment = gtk_alignment_new (0.5, 0.5, 0, 0); - viewport = gtk_viewport_new (NULL, NULL); - gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE); - gtk_widget_show (viewport); - gtk_container_add (GTK_CONTAINER (alignment), viewport); - GLADE_HOOKUP_OBJECT (win, viewport, "viewport"); - - gtk_widget_modify_bg (viewport, 0, &white); - gtk_widget_modify_bg (viewport, 1, &white); - gtk_widget_modify_bg (viewport, 2, &white); - gtk_widget_modify_bg (viewport, 3, &white); - gtk_widget_modify_bg (viewport, 4, &white); - - eventbox = gtk_event_box_new (); - gtk_container_add (GTK_CONTAINER (viewport), eventbox); - gtk_widget_show (eventbox); - GLADE_HOOKUP_OBJECT (win, eventbox, "eventbox"); - - gtk_widget_modify_bg (eventbox, 0, &white); - gtk_widget_modify_bg (eventbox, 1, &white); - gtk_widget_modify_bg (eventbox, 2, &white); - gtk_widget_modify_bg (eventbox, 3, &white); - gtk_widget_modify_bg (eventbox, 4, &white); - - g_object_set_data (G_OBJECT (eventbox), "name", name); - - vbox = gtk_vbox_new (FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - gtk_widget_show (vbox); - gtk_container_add (GTK_CONTAINER (eventbox), vbox); - GLADE_HOOKUP_OBJECT (win, vbox, "vbox"); - - image = gtk_image_new_from_file (file); - gtk_widget_show (image); - gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 0); - GLADE_HOOKUP_OBJECT (win, image, "image"); - - label = gtk_label_new (name); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); - gtk_widget_modify_fg (label, 0, &blue); - gtk_widget_modify_fg (label, 1, &blue); - gtk_widget_modify_fg (label, 2, &blue); - gtk_widget_modify_fg (label, 3, &blue); - gtk_widget_modify_fg (label, 4, &blue); - GLADE_HOOKUP_OBJECT (win, label, "label"); - layout = gtk_label_get_layout (GTK_LABEL (label)); - pango_layout_get_pixel_extents (layout, NULL, &extents); - - g_signal_connect (eventbox, "button_press_event", G_CALLBACK (func), user_data); - g_signal_connect (eventbox, "enter_notify_event", G_CALLBACK (on_enter_notify_event), win); - g_signal_connect (eventbox, "leave_notify_event", G_CALLBACK (on_leave_notify_event), win); - + if (func_action != NULL) + { + GtkWidget *eventbox; + + viewport = gtk_viewport_new (NULL, NULL); + gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE); + gtk_widget_show (viewport); + gtk_container_add (GTK_CONTAINER (alignment), viewport); + + gtk_widget_modify_bg (viewport, 0, &white); + gtk_widget_modify_bg (viewport, 1, &white); + gtk_widget_modify_bg (viewport, 2, &white); + gtk_widget_modify_bg (viewport, 3, &white); + gtk_widget_modify_bg (viewport, 4, &white); + + eventbox = gtk_event_box_new (); + gtk_container_add (GTK_CONTAINER (viewport), eventbox); + gtk_widget_show (eventbox); + + gtk_widget_modify_bg (eventbox, 0, &white); + gtk_widget_modify_bg (eventbox, 1, &white); + gtk_widget_modify_bg (eventbox, 2, &white); + gtk_widget_modify_bg (eventbox, 3, &white); + gtk_widget_modify_bg (eventbox, 4, &white); + + g_object_set_data (G_OBJECT (eventbox), "type", (gpointer)type); + g_object_set_data (G_OBJECT (eventbox), "func", (gpointer)func_action); + + vbox = gtk_vbox_new (FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); + gtk_widget_show (vbox); + gtk_container_add (GTK_CONTAINER (eventbox), vbox); + + image = gtk_image_new_from_file (file); + gtk_widget_show (image); + gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 0); + + label = gtk_label_new (name); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); + gtk_widget_modify_fg (label, 0, &blue); + gtk_widget_modify_fg (label, 1, &blue); + gtk_widget_modify_fg (label, 2, &blue); + gtk_widget_modify_fg (label, 3, &blue); + gtk_widget_modify_fg (label, 4, &blue); + layout = gtk_label_get_layout (GTK_LABEL (label)); + pango_layout_get_pixel_extents (layout, NULL, &extents); + + g_signal_connect (eventbox, "button_press_event", G_CALLBACK (on_button_press_event), user_data); + g_signal_connect (eventbox, "enter_notify_event", G_CALLBACK (on_enter_notify_event), win); + g_signal_connect (eventbox, "leave_notify_event", G_CALLBACK (on_leave_notify_event), win); + } + else + { + GtkWidget *viewport_2; + GtkWidget *hbox; + + viewport = gtk_viewport_new (NULL, NULL); + gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE); + gtk_widget_show (viewport); + gtk_container_add (GTK_CONTAINER (alignment), viewport); + gtk_widget_modify_bg (viewport, 0, &white); + gtk_widget_modify_bg (viewport, 1, &white); + gtk_widget_modify_bg (viewport, 2, &white); + gtk_widget_modify_bg (viewport, 3, &white); + gtk_widget_modify_bg (viewport, 4, &white); + + vbox = gtk_vbox_new (FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); + gtk_widget_show (vbox); + gtk_container_add (GTK_CONTAINER (viewport), vbox); + + viewport_2 = gtk_viewport_new (NULL, NULL); + gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport_2), GTK_SHADOW_NONE); + gtk_widget_show (viewport_2); + gtk_box_pack_start (GTK_BOX (vbox), viewport_2, FALSE, FALSE, 0); + gtk_widget_modify_bg (viewport_2, 0, &blue); + gtk_widget_modify_bg (viewport_2, 1, &blue); + gtk_widget_modify_bg (viewport_2, 2, &blue); + gtk_widget_modify_bg (viewport_2, 3, &blue); + gtk_widget_modify_bg (viewport_2, 4, &blue); + + hbox = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + + image = gtk_image_new_from_file (SETUP_ARROW_DOWN); + gtk_widget_show (image); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); + + label = gtk_label_new (name); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 5); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); + layout = gtk_label_get_layout (GTK_LABEL (label)); + pango_layout_get_pixel_extents (layout, NULL, &extents); + + image = gtk_image_new_from_file (SETUP_ARROW_DOWN); + gtk_widget_show (image); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); + + viewport_2 = gtk_viewport_new (NULL, NULL); + gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport_2), GTK_SHADOW_NONE); + gtk_widget_show (viewport_2); + gtk_box_pack_start (GTK_BOX (vbox), viewport_2, FALSE, FALSE, 0); + gtk_widget_modify_bg (viewport_2, 0, &blue); + gtk_widget_modify_bg (viewport_2, 1, &blue); + gtk_widget_modify_bg (viewport_2, 2, &blue); + gtk_widget_modify_bg (viewport_2, 3, &blue); + gtk_widget_modify_bg (viewport_2, 4, &blue); + } gtk_widget_set_size_request (alignment, extents.width, -1); + return alignment; } @@ -138,6 +202,8 @@ GtkWidget *button_printer; GtkWidget *button_sound; GtkWidget *button_database; + GtkWidget *button_export; + GtkWidget *label_advanced; gint max_x; gint i; @@ -146,8 +212,9 @@ vbox = gtk_vbox_new (FALSE, 5); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - button_general = populate_main_list_3 (win, _("General"), CONFIG_ICON, - user_data, (gpointer) on_button_press_event); + button_general = + populate_main_list_4 (win, _("General"), SETUP_GENERAL, CONFIG_ICON, user_data, + (gpointer)take_an_action); gtk_widget_show (button_general); gtk_box_pack_start (GTK_BOX (vbox), button_general, FALSE, FALSE, 0); GLADE_HOOKUP_OBJECT (win, button_general, "button_general"); @@ -156,7 +223,9 @@ if (i > max_x) max_x = i; - button_user = populate_main_list_3 (win, _("User"), USER_ICON, user_data, (gpointer) on_button_press_event); + button_user = + populate_main_list_4 (win, _("User"), SETUP_USER, USER_ICON, user_data, + (gpointer)take_an_action); gtk_widget_show (button_user); gtk_box_pack_start (GTK_BOX (vbox), button_user, FALSE, FALSE, 0); GLADE_HOOKUP_OBJECT (win, button_user, "button_user"); @@ -165,8 +234,8 @@ if (i > max_x) max_x = i; - button_printer = populate_main_list_3 (win, _("Printer"), PRINTER_ICON, - user_data, (gpointer) on_button_press_event); + button_printer = populate_main_list_4 (win, _("Printer"), SETUP_PRINTER, PRINTER_ICON, + user_data, (gpointer)take_an_action); gtk_widget_show (button_printer); gtk_box_pack_start (GTK_BOX (vbox), button_printer, FALSE, FALSE, 0); GLADE_HOOKUP_OBJECT (win, button_printer, "button_printer"); @@ -175,7 +244,9 @@ if (i > max_x) max_x = i; - button_sound = populate_main_list_3 (win, _("Sound"), SOUND_ICON, user_data, (gpointer) on_button_press_event); + button_sound = + populate_main_list_4 (win, _("Sound"), SETUP_SOUND, SOUND_ICON, user_data, + (gpointer)take_an_action); gtk_widget_show (button_sound); gtk_box_pack_start (GTK_BOX (vbox), button_sound, FALSE, FALSE, 0); GLADE_HOOKUP_OBJECT (win, button_sound, "button_sound"); @@ -184,8 +255,8 @@ if (i > max_x) max_x = i; - button_database = populate_main_list_3 (win, _("Databases"), DAT_ICON, - user_data, (gpointer) on_button_press_event); + button_database = populate_main_list_4 (win, _("Databases"), SETUP_DATABASE, DAT_ICON, + user_data, (gpointer)take_an_action); gtk_widget_show (button_database); gtk_box_pack_start (GTK_BOX (vbox), button_database, FALSE, FALSE, 0); GLADE_HOOKUP_OBJECT (win, button_database, "button_database"); @@ -194,7 +265,27 @@ if (i > max_x) max_x = i; + label_advanced = populate_main_list_4 (win, _("Advanced"), -1, EXP_ICON, NULL, NULL); + gtk_widget_show (label_advanced); + gtk_box_pack_start (GTK_BOX (vbox), label_advanced, FALSE, FALSE, 0); + gtk_widget_get_size_request (label_advanced, &i, NULL); + i += 25; + if (i > max_x) + max_x = i; + + button_export = + populate_main_list_4 (win, _("Export"), SETUP_EXPORT, EXP_ICON, user_data, + (gpointer)take_an_action); + gtk_widget_show (button_export); + gtk_box_pack_start (GTK_BOX (vbox), button_export, FALSE, FALSE, 0); + GLADE_HOOKUP_OBJECT (win, button_export, "button_export"); + gtk_widget_get_size_request (button_export, &i, NULL); + i += 25; + if (i > max_x) + max_x = i; + gtk_widget_set_size_request (vbox, max_x, -1); + return vbox; } @@ -210,7 +301,6 @@ GtkWidget *update_list_add; GtkWidget *update_list_modify; GtkWidget *update_list_delete; - GtkWidget *export_utf; GtkWidget *entry_pic_dir; GtkWidget *button_change; @@ -297,33 +387,12 @@ gtk_signal_connect (GTK_OBJECT (button_change), "clicked", GTK_SIGNAL_FUNC (on_file_button_change), entry_pic_dir); - frame = gtk_frame_new (NULL); - gtk_widget_show (frame); - gtk_frame_set_label (GTK_FRAME (frame), _("Export")); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 10); - GLADE_HOOKUP_OBJECT (setup_ipc->win, frame, "frame"); - - vbox_frame = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (frame), vbox_frame); - gtk_widget_show (vbox_frame); - GLADE_HOOKUP_OBJECT (setup_ipc->win, vbox_frame, "vbox_frame"); - - export_utf = gtk_check_button_new_with_mnemonic (_("export in UTF-8")); - gtk_widget_show (export_utf); - gtk_box_pack_start (GTK_BOX (vbox_frame), export_utf, FALSE, FALSE, 0); - if (options_global_read->export_utf == 1) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (export_utf), TRUE); - else - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (export_utf), FALSE); - GLADE_HOOKUP_OBJECT (setup_ipc->win, export_utf, "export_utf"); - setup_ipc->general->vbox = vbox; setup_ipc->general->pic_dir = GTK_ENTRY (entry_pic_dir); setup_ipc->general->show_logo = GTK_CHECK_BUTTON (show_logo); setup_ipc->general->update_list_add = GTK_CHECK_BUTTON (update_list_add); setup_ipc->general->update_list_modify = GTK_CHECK_BUTTON (update_list_modify); setup_ipc->general->update_list_delete = GTK_CHECK_BUTTON (update_list_delete); - setup_ipc->general->export_utf = GTK_CHECK_BUTTON (export_utf); } #ifdef __HAVE_AUDIO__ @@ -518,6 +587,243 @@ } void +export_setup (Setup_global_ipc * setup_ipc) +{ + GtkWidget *vbox; + GtkWidget *title; + GtkWidget *otitle; + GtkWidget *director; + GtkWidget *producer; + GtkWidget *actors; + GtkWidget *year; + GtkWidget *time; + GtkWidget *genre; + GtkWidget *distributor; + GtkWidget *country; + GtkWidget *format; + GtkWidget *language; + GtkWidget *audio; + GtkWidget *quality; + GtkWidget *cds; + GtkWidget *stars; + GtkWidget *story; + GtkWidget *notes; + GtkWidget *picture; + GtkWidget *frame; + GtkWidget *hbox; + GtkWidget *vbox_2; + GtkWidget *vbox_3; + GtkWidget *vbox_4; + GtkWidget *export_utf; + + vbox = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (setup_ipc->vbox), vbox, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); + + frame = gtk_frame_new (NULL); + gtk_widget_show (frame); + gtk_frame_set_label (GTK_FRAME (frame), _("Txt options")); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); + + hbox = gtk_hbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (frame), hbox); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 8); + + vbox_2 = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), vbox_2, FALSE, FALSE, 0); + + vbox_3 = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), vbox_3, FALSE, FALSE, 20); + + vbox_4 = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), vbox_4, FALSE, FALSE, 0); + + title = gtk_check_button_new_with_mnemonic (_("Title")); + gtk_widget_show (title); + gtk_box_pack_start (GTK_BOX (vbox_2), title, FALSE, FALSE, 10); + if (options_global_read->export_title == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (title), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (title), FALSE); + + + otitle = gtk_check_button_new_with_mnemonic (_("Original title")); + gtk_widget_show (otitle); + gtk_box_pack_start (GTK_BOX (vbox_2), otitle, FALSE, FALSE, 10); + if (options_global_read->export_otitle == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (otitle), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (otitle), FALSE); + + director = gtk_check_button_new_with_mnemonic (_("Director")); + gtk_widget_show (director); + gtk_box_pack_start (GTK_BOX (vbox_2), director, FALSE, FALSE, 10); + if (options_global_read->export_director == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (director), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (director), FALSE); + + producer = gtk_check_button_new_with_mnemonic (_("Producer")); + gtk_widget_show (producer); + gtk_box_pack_start (GTK_BOX (vbox_2), producer, FALSE, FALSE, 10); + if (options_global_read->export_producer == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (producer), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (producer), FALSE); + + actors = gtk_check_button_new_with_mnemonic (_("Actors")); + gtk_widget_show (actors); + gtk_box_pack_start (GTK_BOX (vbox_2), actors, FALSE, FALSE, 10); + if (options_global_read->export_actors == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (actors), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (actors), FALSE); + + year = gtk_check_button_new_with_mnemonic (_("Year")); + gtk_widget_show (year); + gtk_box_pack_start (GTK_BOX (vbox_2), year, FALSE, FALSE, 10); + if (options_global_read->export_year == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (year), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (year), FALSE); + + time = gtk_check_button_new_with_mnemonic (_("Time")); + gtk_widget_show (time); + gtk_box_pack_start (GTK_BOX (vbox_3), time, FALSE, FALSE, 10); + if (options_global_read->export_time == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (time), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (time), FALSE); + + genre = gtk_check_button_new_with_mnemonic (_("Genre")); + gtk_widget_show (genre); + gtk_box_pack_start (GTK_BOX (vbox_3), genre, FALSE, FALSE, 10); + if (options_global_read->export_genre == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (genre), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (genre), FALSE); + + distributor = gtk_check_button_new_with_mnemonic (_("Distributor")); + gtk_widget_show (distributor); + gtk_box_pack_start (GTK_BOX (vbox_3), distributor, FALSE, FALSE, 10); + if (options_global_read->export_distributor == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (distributor), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (distributor), FALSE); + + country = gtk_check_button_new_with_mnemonic (_("Country")); + gtk_widget_show (country); + gtk_box_pack_start (GTK_BOX (vbox_3), country, FALSE, FALSE, 10); + if (options_global_read->export_country == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (country), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (country), FALSE); + + format = gtk_check_button_new_with_mnemonic (_("Video format")); + gtk_widget_show (format); + gtk_box_pack_start (GTK_BOX (vbox_3), format, FALSE, FALSE, 10); + if (options_global_read->export_format == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (format), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (format), FALSE); + + language = gtk_check_button_new_with_mnemonic (_("Language")); + gtk_widget_show (language); + gtk_box_pack_start (GTK_BOX (vbox_3), language, FALSE, FALSE, 10); + if (options_global_read->export_language == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (language), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (language), FALSE); + + audio = gtk_check_button_new_with_mnemonic (_("Audio format")); + gtk_widget_show (audio); + gtk_box_pack_start (GTK_BOX (vbox_4), audio, FALSE, FALSE, 10); + if (options_global_read->export_audio == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (audio), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (audio), FALSE); + + quality = gtk_check_button_new_with_mnemonic (_("Quality")); + gtk_widget_show (quality); + gtk_box_pack_start (GTK_BOX (vbox_4), quality, FALSE, FALSE, 10); + if (options_global_read->export_quality == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (quality), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (quality), FALSE); + + cds = gtk_check_button_new_with_mnemonic (_("CDs")); + gtk_widget_show (cds); + gtk_box_pack_start (GTK_BOX (vbox_4), cds, FALSE, FALSE, 10); + if (options_global_read->export_cds == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cds), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cds), FALSE); + + stars = gtk_check_button_new_with_mnemonic (_("Stars")); + gtk_widget_show (stars); + gtk_box_pack_start (GTK_BOX (vbox_4), stars, FALSE, FALSE, 10); + if (options_global_read->export_stars == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (stars), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (stars), FALSE); + + story = gtk_check_button_new_with_mnemonic (_("Story")); + gtk_widget_show (story); + gtk_box_pack_start (GTK_BOX (vbox_4), story, FALSE, FALSE, 10); + if (options_global_read->export_story == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (story), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (story), FALSE); + + notes = gtk_check_button_new_with_mnemonic (_("Notes")); + gtk_widget_show (notes); + gtk_box_pack_start (GTK_BOX (vbox_4), notes, FALSE, FALSE, 10); + if (options_global_read->export_notes == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (notes), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (notes), FALSE); + + picture = gtk_check_button_new_with_mnemonic (_("Picture")); + gtk_widget_show (picture); + gtk_box_pack_start (GTK_BOX (vbox_4), picture, FALSE, FALSE, 10); + if (options_global_read->export_picture == TRUE) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (picture), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (picture), FALSE); + + export_utf = gtk_check_button_new_with_mnemonic (_("export in UTF-8")); + gtk_widget_show (export_utf); + gtk_box_pack_start (GTK_BOX (vbox), export_utf, FALSE, FALSE, 0); + if (options_global_read->export_utf == 1) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (export_utf), TRUE); + else + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (export_utf), FALSE); + GLADE_HOOKUP_OBJECT (setup_ipc->win, export_utf, "export_utf"); + + setup_ipc->exp->vbox = vbox; + setup_ipc->exp->title = GTK_CHECK_BUTTON (title); + setup_ipc->exp->otitle = GTK_CHECK_BUTTON (otitle); + setup_ipc->exp->director = GTK_CHECK_BUTTON (director); + setup_ipc->exp->producer = GTK_CHECK_BUTTON (producer); + setup_ipc->exp->actors = GTK_CHECK_BUTTON (actors); + setup_ipc->exp->year = GTK_CHECK_BUTTON (year); + setup_ipc->exp->time = GTK_CHECK_BUTTON (time); + setup_ipc->exp->genre = GTK_CHECK_BUTTON (genre); + setup_ipc->exp->distributor = GTK_CHECK_BUTTON (distributor); + setup_ipc->exp->country = GTK_CHECK_BUTTON (country); + setup_ipc->exp->format = GTK_CHECK_BUTTON (format); + setup_ipc->exp->language = GTK_CHECK_BUTTON (language); + setup_ipc->exp->audio = GTK_CHECK_BUTTON (audio); + setup_ipc->exp->quality = GTK_CHECK_BUTTON (quality); + setup_ipc->exp->cds = GTK_CHECK_BUTTON (cds); + setup_ipc->exp->stars = GTK_CHECK_BUTTON (stars); + setup_ipc->exp->story = GTK_CHECK_BUTTON (story); + setup_ipc->exp->notes = GTK_CHECK_BUTTON (notes); + setup_ipc->exp->picture = GTK_CHECK_BUTTON (picture); + setup_ipc->exp->export_utf = GTK_CHECK_BUTTON (export_utf); +} + +void printer_setup (Setup_global_ipc * setup_ipc) { GtkWidget *vbox; @@ -635,6 +941,7 @@ setup_ipc->databases = (Setup_databases_ipc *) g_malloc (sizeof (Setup_databases_ipc)); setup_ipc->printer = (Setup_printer_ipc *) g_malloc (sizeof (Setup_printer_ipc)); setup_ipc->sound = (Setup_sound_ipc *) g_malloc (sizeof (Setup_sound_ipc)); + setup_ipc->exp = (Setup_export_ipc *) g_malloc (sizeof (Setup_export_ipc)); Pref_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); title = g_strdup_printf ("MVideo: %s", _("Preferences")); @@ -680,7 +987,7 @@ gtk_container_add (GTK_CONTAINER (viewport), textview_main); GLADE_HOOKUP_OBJECT (Pref_window, textview_main, "textview_main"); gtk_widget_get_size_request (textview_main, &i, NULL); - gtk_paned_set_position (GTK_PANED (hpaned), i + 10); + gtk_paned_set_position (GTK_PANED (hpaned), i + 30); frame = gtk_frame_new (NULL); gtk_widget_show (frame); @@ -709,6 +1016,7 @@ sound_setup (setup_ipc); printer_setup (setup_ipc); databases_setup (setup_ipc); + export_setup (setup_ipc); hbox_buttons = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox_buttons); Index: setup_win.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/setup_win.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- setup_win.h 7 Feb 2003 09:29:42 -0000 1.7 +++ setup_win.h 17 May 2003 13:29:02 -0000 1.8 @@ -17,8 +17,20 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +enum { + SETUP_GENERAL, + SETUP_SOUND, + SETUP_DATABASE, + SETUP_PRINTER, + SETUP_USER, + SETUP_EXPORT +}; + +enum { + PROJECT_SETUP_AUTO +}; + void create_window_setup (int type); -GtkWidget *populate_main_list_3 (GtkWidget *win, gchar *name, gchar *file, - gpointer user_data, void (*func)(GtkWidget *widget, GdkEventCrossing *event, - gpointer user_data)); +GtkWidget *populate_main_list_4 (GtkWidget * win, gchar * name, gint type, gchar * file, + gpointer user_data, void (*func_action) (gint, gpointer user_data)); Index: support.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/support.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- support.c 10 May 2003 16:36:51 -0000 1.30 +++ support.c 17 May 2003 13:29:02 -0000 1.31 @@ -22,8 +22,9 @@ # include <config.h> #endif -#define CONFIG_VER 2 +//#define CONFIG_VER 2 #define DATABASE_VER 3 +#define CONFIG_VER 'a' #include <gtk/gtk.h> #include <stdio.h> @@ -58,6 +59,25 @@ options_global_read->update_list_modify = 0; options_global_read->update_list_delete = 0; options_global_read->export_utf = 1; + options_global_read-> export_title=TRUE; + options_global_read-> export_otitle=TRUE; + options_global_read-> export_director=TRUE; + options_global_read-> export_producer=TRUE; + options_global_read-> export_actors=TRUE; + options_global_read-> export_year=TRUE; + options_global_read-> export_time=TRUE; + options_global_read-> export_genre=TRUE; + options_global_read-> export_distributor=TRUE; + options_global_read-> export_country=TRUE; + options_global_read-> export_format=TRUE; + options_global_read-> export_language=TRUE; + options_global_read-> export_audio=TRUE; + options_global_read-> export_quality=TRUE; + options_global_read-> export_cds=TRUE; + options_global_read-> export_stars=TRUE; + options_global_read-> export_story=TRUE; + options_global_read-> export_notes=TRUE; + options_global_read-> export_picture=FALSE; } void @@ -101,7 +121,26 @@ fprintf (fp, "Update_list_add: %d\n", options_global_read->update_list_add); fprintf (fp, "Update_list_modify: %d\n", options_global_read->update_list_modify); fprintf (fp, "Update_list_delete: %d\n", options_global_read->update_list_delete); + fprintf (fp, "Export_UTF: %d\n", options_global_read->export_utf); + fprintf (fp, "EActors: %d\n", options_global_read->export_actors); + fprintf (fp, "EAudio: %d\n", options_global_read->export_audio); + fprintf (fp, "ECds: %d\n", options_global_read->export_cds); + fprintf (fp, "ECountry: %d\n", options_global_read->export_country); + fprintf (fp, "EDirector: %d\n", options_global_read->export_director); + fprintf (fp, "EDistributor: %d\n", options_global_read->export_distributor); + fprintf (fp, "EFormat: %d\n", options_global_read->export_format); + fprintf (fp, "EGenre: %d\n", options_global_read->export_genre); + fprintf (fp, "ELanguage: %d\n", options_global_read->export_language); + fprintf (fp, "ENotes: %d\n", options_global_read->export_notes); + fprintf (fp, "EOtitle: %d\n", options_global_read->export_otitle); + fprintf (fp, "EPicture: %d\n", options_global_read->export_picture); + fprintf (fp, "EProducer: %d\n", options_global_read->export_producer); + fprintf (fp, "EStars: %d\n", options_global_read->export_stars); + fprintf (fp, "EStory: %d\n", options_global_read->export_story); + fprintf (fp, "ETime: %d\n", options_global_read->export_time); + fprintf (fp, "ETitle: %d\n", options_global_read->export_title); + fprintf (fp, "EYear: %d\n", options_global_read->export_year); fclose (fp); return; @@ -133,17 +172,137 @@ switch (tmp[0]) { case ('D'): - if (!strcmp (tmp, "Export_UTF:")) + if (!strcmp (tmp, "Def_Dat:")) { fscanf (fp, "%s", tmp); - options_global_read->export_utf = atoi (tmp); + options_global_read->def_dat = strdup (tmp); } break; case ('E'): - if (!strcmp (tmp, "Def_Dat:")) + if (!strcmp (tmp, "Export_UTF:")) { fscanf (fp, "%s", tmp); - options_global_read->def_dat = strdup (tmp); + options_global_read->export_utf = atoi (tmp); + } + else + { + switch (tmp[1]) + { + case ('A'): + if (!strcmp (tmp, "EActors:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_actors = atoi (tmp); + } + else if (!strcmp (tmp, "EAudio:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_audio = atoi (tmp); + } + break; + case ('C'): + if (!strcmp (tmp, "ECds:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_cds = atoi (tmp); + } + else if (!strcmp (tmp, "ECountry:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_country = atoi (tmp); + } + break; + case ('D'): + if (!strcmp (tmp, "EDirector:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_director = atoi (tmp); + } + else if (!strcmp (tmp, "EDistributor:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_distributor = atoi (tmp); + } + break; + case ('E'): + if (!strcmp (tmp, "EFormat:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_format = atoi (tmp); + } + break; + case ('G'): + if (!strcmp (tmp, "EGenre:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_genre = atoi (tmp); + } + break; + case ('L'): + if (!strcmp (tmp, "ELanguage:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_language = atoi (tmp); + } + break; + case ('N'): + if (!strcmp (tmp, "ENotes:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_notes = atoi (tmp); + } + break; + case ('O'): + if (!strcmp (tmp, "EOtitle:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_otitle = atoi (tmp); + } + break; + case ('P'): + if (!strcmp (tmp, "EPicture:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_picture = atoi (tmp); + } + else if (!strcmp (tmp, "EProducer:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_producer = atoi (tmp); + } + break; + case ('S'): + if (!strcmp (tmp, "EStars:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_stars = atoi (tmp); + } + else if (!strcmp (tmp, "EStory:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_story = atoi (tmp); + } + break; + case ('T'): + if (!strcmp (tmp, "ETime:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_time = atoi (tmp); + } + else if (!strcmp (tmp, "ETitle:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_title = atoi (tmp); + } + break; + case ('Y'): + if (!strcmp (tmp, "EYear:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_year = atoi (tmp); + } + break; + } } break; case ('P'): @@ -240,9 +399,7 @@ fclose (fp); if (version < CONFIG_VER); - { write_options (); - } return 1; } Index: trade.h =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/trade.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- trade.h 8 May 2003 15:30:08 -0000 1.31 +++ trade.h 17 May 2003 13:29:02 -0000 1.32 @@ -97,6 +97,25 @@ int update_list_modify; int update_list_delete; int export_utf; + gboolean export_title; + gboolean export_otitle; + gboolean export_director; + gboolean export_producer; + gboolean export_actors; + gboolean export_year; + gboolean export_time; + gboolean export_genre; + gboolean export_distributor; + gboolean export_country; + gboolean export_format; + gboolean export_language; + gboolean export_audio; + gboolean export_quality; + gboolean export_cds; + gboolean export_stars; + gboolean export_story; + gboolean export_notes; + gboolean export_picture; }; options_global *options_global_read; |
From: Luca R. <lit...@us...> - 2003-05-17 13:29:04
|
Update of /cvsroot/mvideo/MVideo In directory sc8-pr-cvs1:/tmp/cvs-serv23233 Modified Files: ChangeLog TODO Log Message: Let user select which infos export in txt Index: ChangeLog =================================================================== RCS file: /cvsroot/mvideo/MVideo/ChangeLog,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- ChangeLog 10 May 2003 16:36:51 -0000 1.55 +++ ChangeLog 17 May 2003 13:29:01 -0000 1.56 @@ -1,9 +1,12 @@ 0.4.1 (?) ========= * Export: minor - ^ Option to export in plain txt or in UTF8 [DONE] + ^ Option to export in plain txt or in UTF8 + ^ Let user choose which entries export in .txt * Miscellaneous: major ^ Added mime types for .mvt (compatible with freedesktop.org) + * Setup: minor + ^ New element: string 0.4.0 Berserk ============= Index: TODO =================================================================== RCS file: /cvsroot/mvideo/MVideo/TODO,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- TODO 8 May 2003 15:30:06 -0000 1.58 +++ TODO 17 May 2003 13:29:01 -0000 1.59 @@ -1,7 +1,7 @@ TODO for 0.4.1 ============== * Export: - ^ Let user choose which entries export in .txt + ^ Let user choose which entries export in .txt [DONE] ^ Option to export in plain txt or in UTF8 [DONE] TODO for 0.4.2 |
From: Luca R. <lit...@us...> - 2003-05-17 13:29:04
|
Update of /cvsroot/mvideo/MVideo/pixmaps In directory sc8-pr-cvs1:/tmp/cvs-serv23233/pixmaps Modified Files: Makefile.am Log Message: Let user select which infos export in txt Index: Makefile.am =================================================================== RCS file: /cvsroot/mvideo/MVideo/pixmaps/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile.am 5 Feb 2003 12:47:57 -0000 1.12 +++ Makefile.am 17 May 2003 13:29:01 -0000 1.13 @@ -11,6 +11,8 @@ dat_icon.png\ printer_icon.png\ auto_comp.png\ + setup_arrow_down.png\ + export_icon.png\ sound_icon.png mvideo_logodir = $(datadir)/pixmaps @@ -18,4 +20,3 @@ mvideo.png EXTRA_DIST = $(mvideo_pixmaps_DATA) - |
From: Luca R. <lit...@us...> - 2003-05-10 16:45:54
|
Update of /cvsroot/mvideo/MVideo In directory sc8-pr-cvs1:/tmp/cvs-serv23406 Added Files: mvideo.applications mvideo.keys mvideo.mime mvideo.xml Log Message: Added mime types for .mvt (compatible with freedesktop.org) --- NEW FILE: mvideo.applications --- mvideo command=/home/little_rock/mvideo/MVideo.cvs/src/mvideo -o name=MVideo can_open_multiple_files=false expects_uris=false requires_terminal=false mime_types=application/x-mvideo --- NEW FILE: mvideo.keys --- application/mvideo icon_filename=mvideo short_list_application_ids_for_novice_user_level=mvideo short_list_application_ids_for_intermediate_user_level=mvideo short_list_application_ids_for_advanced_user_level=mvideo --- NEW FILE: mvideo.mime --- application/mvideo ext: mvt --- NEW FILE: mvideo.xml --- <?xml version="1.0" ?> <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> <mime-type type="application/mvideo"> <comment>MVideo archive</comment> <comment xml:lang="it">Archivio per MVideo</comment> <glob pattern="*.mvt"/> </mime-type> </mime-info> |
From: Luca R. <lit...@us...> - 2003-05-10 16:36:54
|
Update of /cvsroot/mvideo/MVideo/src In directory sc8-pr-cvs1:/tmp/cvs-serv19801/src Modified Files: support.c Log Message: Added mime types for .mvt (compatible with freedesktop.org) Index: support.c =================================================================== RCS file: /cvsroot/mvideo/MVideo/src/support.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- support.c 8 May 2003 15:30:07 -0000 1.29 +++ support.c 10 May 2003 16:36:51 -0000 1.30 @@ -133,6 +133,13 @@ switch (tmp[0]) { case ('D'): + if (!strcmp (tmp, "Export_UTF:")) + { + fscanf (fp, "%s", tmp); + options_global_read->export_utf = atoi (tmp); + } + break; + case ('E'): if (!strcmp (tmp, "Def_Dat:")) { fscanf (fp, "%s", tmp); |