[BACK]Return to gtk_menu.c CVS log [TXT] [DIR] Up to [RetroPC.NET] / np2 / x11 / gtk2

Diff for /np2/x11/gtk2/gtk_menu.c between versions 1.9 and 1.12

version 1.9, 2007/01/24 14:09:32 version 1.12, 2008/03/13 16:27:39
Line 79  static void cb_reset(GtkAction *action,  Line 79  static void cb_reset(GtkAction *action, 
 static void cb_sasiopen(GtkAction *action, gpointer user_data);  static void cb_sasiopen(GtkAction *action, gpointer user_data);
 static void cb_sasiremove(GtkAction *action, gpointer user_data);  static void cb_sasiremove(GtkAction *action, gpointer user_data);
 #endif  #endif
   #if defined(SUPPORT_STATSAVE)
   static void cb_statsave(GtkAction *action, gpointer user_data);
   static void cb_statload(GtkAction *action, gpointer user_data);
   #endif
   
 static void cb_dialog(GtkAction *action, gpointer user_data);  static void cb_dialog(GtkAction *action, gpointer user_data);
 static void cb_radio(GtkRadioAction *action, GtkRadioAction *current, gpointer user_data);  static void cb_radio(GtkRadioAction *action, GtkRadioAction *current, gpointer user_data);
Line 91  static GtkActionEntry menu_entries[] = { Line 95  static GtkActionEntry menu_entries[] = {
 { "ScreenMenu",   NULL, "Screen",   NULL, NULL, NULL },  { "ScreenMenu",   NULL, "Screen",   NULL, NULL, NULL },
 { "DeviceMenu",   NULL, "Device",   NULL, NULL, NULL },  { "DeviceMenu",   NULL, "Device",   NULL, NULL, NULL },
 { "OtherMenu",    NULL, "Other",    NULL, NULL, NULL },  { "OtherMenu",    NULL, "Other",    NULL, NULL, NULL },
   { "StatMenu",     NULL, "Stat",     NULL, NULL, NULL },
   
 /* Submenu */  /* Submenu */
 { "Drive1Menu",   NULL, "Drive_1",   NULL, NULL, NULL },  { "Drive1Menu",   NULL, "Drive_1",   NULL, NULL, NULL },
Line 147  static GtkActionEntry menu_entries[] = { Line 152  static GtkActionEntry menu_entries[] = {
 { "serialopt",   NULL, "Se_rial option...", NULL, NULL, G_CALLBACK(cb_dialog) },  { "serialopt",   NULL, "Se_rial option...", NULL, NULL, G_CALLBACK(cb_dialog) },
 { "soundopt",    NULL, "So_und option...",  NULL, NULL, G_CALLBACK(cb_dialog) },  { "soundopt",    NULL, "So_und option...",  NULL, NULL, G_CALLBACK(cb_dialog) },
 { "reset",       NULL, "_Reset",            NULL, NULL, G_CALLBACK(cb_reset) },  { "reset",       NULL, "_Reset",            NULL, NULL, G_CALLBACK(cb_reset) },
   #if defined(SUPPORT_STATSAVE)
   { "stat00save",  NULL, "Save 0",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat01save",  NULL, "Save 1",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat02save",  NULL, "Save 2",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat03save",  NULL, "Save 3",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat04save",  NULL, "Save 4",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat05save",  NULL, "Save 5",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat06save",  NULL, "Save 6",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat07save",  NULL, "Save 7",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat08save",  NULL, "Save 8",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat09save",  NULL, "Save 9",            NULL, NULL, G_CALLBACK(cb_statsave), },
   { "stat00load",  NULL, "Load 0",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat01load",  NULL, "Load 1",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat02load",  NULL, "Load 2",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat03load",  NULL, "Load 3",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat04load",  NULL, "Load 4",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat05load",  NULL, "Load 5",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat06load",  NULL, "Load 6",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat07load",  NULL, "Load 7",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat08load",  NULL, "Load 8",            NULL, NULL, G_CALLBACK(cb_statload), },
   { "stat09load",  NULL, "Load 9",            NULL, NULL, G_CALLBACK(cb_statload), },
   #endif
 };  };
 static const guint n_menu_entries = G_N_ELEMENTS(menu_entries);  static const guint n_menu_entries = G_N_ELEMENTS(menu_entries);
   
Line 357  static const gchar *ui_info = Line 384  static const gchar *ui_info =
 "   <menuitem action='1/2 frame'/>\n"  "   <menuitem action='1/2 frame'/>\n"
 "   <menuitem action='1/3 frame'/>\n"  "   <menuitem action='1/3 frame'/>\n"
 "   <menuitem action='1/4 frame'/>\n"  "   <menuitem action='1/4 frame'/>\n"
   #if defined(SUPPORT_SCREENSIZE)
 "   <separator/>\n"  "   <separator/>\n"
 "   <menu name='Size' action='ScrnSizeMenu'>\n"  "   <menu name='Size' action='ScrnSizeMenu'>\n"
 "    <menuitem action='320x200'/>\n"  "    <menuitem action='320x200'/>\n"
Line 366  static const gchar *ui_info = Line 394  static const gchar *ui_info =
 "    <menuitem action='960x600'/>\n"  "    <menuitem action='960x600'/>\n"
 "    <menuitem action='1280x800'/>\n"  "    <menuitem action='1280x800'/>\n"
 "   </menu>\n"  "   </menu>\n"
   #endif
 "   <separator/>\n"  "   <separator/>\n"
 "   <menuitem action='screenopt'/>\n"  "   <menuitem action='screenopt'/>\n"
 "  </menu>\n"  "  </menu>\n"
Line 439  static const gchar *ui_info = Line 468  static const gchar *ui_info =
 "   <separator/>\n"  "   <separator/>\n"
 "   <menuitem action='about'/>\n"  "   <menuitem action='about'/>\n"
 "  </menu>\n"  "  </menu>\n"
   #if defined(SUPPORT_STATSAVE)
   "  <menu name='Stat' action='StatMenu'>\n"
   "   <menuitem action='stat00save'/>\n"
   "   <menuitem action='stat01save'/>\n"
   "   <menuitem action='stat02save'/>\n"
   "   <menuitem action='stat03save'/>\n"
   "   <menuitem action='stat04save'/>\n"
   "   <menuitem action='stat05save'/>\n"
   "   <menuitem action='stat06save'/>\n"
   "   <menuitem action='stat07save'/>\n"
   "   <menuitem action='stat08save'/>\n"
   "   <menuitem action='stat09save'/>\n"
   "   <separator/>\n"
   "   <menuitem action='stat00load'/>\n"
   "   <menuitem action='stat01load'/>\n"
   "   <menuitem action='stat02load'/>\n"
   "   <menuitem action='stat03load'/>\n"
   "   <menuitem action='stat04load'/>\n"
   "   <menuitem action='stat05load'/>\n"
   "   <menuitem action='stat06load'/>\n"
   "   <menuitem action='stat07load'/>\n"
   "   <menuitem action='stat08load'/>\n"
   "   <menuitem action='stat09load'/>\n"
   "  </menu>\n"
   #endif
 " </menubar>\n"  " </menubar>\n"
 "</ui>\n";  "</ui>\n";
   
Line 547  cb_bmpsave(GtkAction *action, gpointer u Line 601  cb_bmpsave(GtkAction *action, gpointer u
   
         g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);          g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
         gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);          gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
           if (strlen(bmpfilefolder) == 0) {
                   g_strlcpy(bmpfilefolder, modulefile, sizeof(bmpfilefolder));
                   file_cutname(bmpfilefolder);
           }
         utf8 = g_filename_to_utf8(bmpfilefolder, -1, NULL, NULL, NULL);          utf8 = g_filename_to_utf8(bmpfilefolder, -1, NULL, NULL, NULL);
         if (utf8) {          if (utf8) {
                 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), utf8);                  gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8);
                 g_free(utf8);                  g_free(utf8);
         }          }
   
Line 834  cb_ataopen(GtkAction *action, gpointer u Line 892  cb_ataopen(GtkAction *action, gpointer u
         filter = gtk_file_filter_new();          filter = gtk_file_filter_new();
         if (filter) {          if (filter) {
                 gtk_file_filter_set_name(filter, "IDE disk image files");                  gtk_file_filter_set_name(filter, "IDE disk image files");
                   gtk_file_filter_add_pattern(filter, "*.[tT][hH][dD]");
                   gtk_file_filter_add_pattern(filter, "*.[hH][dD][iI]");
                 gtk_file_filter_add_pattern(filter, "*.[nN][hH][dD]");                  gtk_file_filter_add_pattern(filter, "*.[nN][hH][dD]");
                 gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);                  gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
         }          }
Line 1019  cb_newdisk(GtkAction *action, gpointer u Line 1079  cb_newdisk(GtkAction *action, gpointer u
   
         g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);          g_object_set(G_OBJECT(dialog), "show-hidden", TRUE, NULL);
         gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);          gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
           if (strlen(fddfolder) == 0) {
                   g_strlcpy(fddfolder, modulefile, sizeof(fddfolder));
                   file_cutname(fddfolder);
           }
         utf8 = g_filename_to_utf8(fddfolder, -1, NULL, NULL, NULL);          utf8 = g_filename_to_utf8(fddfolder, -1, NULL, NULL, NULL);
         if (utf8) {          if (utf8) {
                 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), utf8);                  gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), utf8);
Line 1225  cb_sasiremove(GtkAction *action, gpointe Line 1289  cb_sasiremove(GtkAction *action, gpointe
 }  }
 #endif  /* !SUPPORT_IDEIO */  #endif  /* !SUPPORT_IDEIO */
   
   #if defined(SUPPORT_STATSAVE)
   static void
   cb_statsave(GtkAction *action, gpointer user_data)
   {
           const gchar *name = gtk_action_get_name(GTK_ACTION(action));
           char ext[4];
           guint n;
   
           UNUSED(user_data);
   
           /* name = "stat??save" */
           if ((strlen(name) >= 6)
            && (g_ascii_isdigit(name[4]))
            && (g_ascii_isdigit(name[5]))) {
                   n = g_ascii_digit_value(name[4]) * 10;
                   n += g_ascii_digit_value(name[5]);
                   g_snprintf(ext, sizeof(ext), np2flagext, n);
                   flagsave(ext);
           }
   }
   
   static void
   cb_statload(GtkAction *action, gpointer user_data)
   {
           const gchar *name = gtk_action_get_name(GTK_ACTION(action));
           char ext[4];
           guint n;
   
           UNUSED(user_data);
   
           /* name = "stat??load" */
           if ((strlen(name) >= 6)
            && (g_ascii_isdigit(name[4]))
            && (g_ascii_isdigit(name[5]))) {
                   n = g_ascii_digit_value(name[4]) * 10;
                   n += g_ascii_digit_value(name[5]);
                   g_snprintf(ext, sizeof(ext), np2flagext, n);
                   flagload(ext, "Status Load", TRUE);
           }
   }
   #endif
   
 static void  static void
 cb_dialog(GtkAction *action, gpointer user_data)  cb_dialog(GtkAction *action, gpointer user_data)
 {  {
Removed from v.1.9  
changed lines
  Added in v.1.12

RetroPC.NET-CVS <cvs@retropc.net>