Diff of /trunk/src/main.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 244 by harbaum, Fri Jul 24 19:24:07 2009 UTC revision 245 by harbaum, Sun Jul 26 18:54:07 2009 UTC
# Line 53  void main_ui_enable(appdata_t *appdata) Line 53  void main_ui_enable(appdata_t *appdata)
53    char *str = NULL;    char *str = NULL;
54  #ifdef USE_HILDON  #ifdef USE_HILDON
55    if(project_valid)    if(project_valid)
56      str = g_markup_printf_escaped("OSM2Go - <b>%s</b>",      str = g_markup_printf_escaped("<b>%s</b> - OSM2Go",
57                                    appdata->project->name);                                    appdata->project->name);
58    else    else
59      str = g_markup_printf_escaped("OSM2Go");      str = g_markup_printf_escaped("OSM2Go");
# Line 61  void main_ui_enable(appdata_t *appdata) Line 61  void main_ui_enable(appdata_t *appdata)
61    hildon_window_set_markup(HILDON_WINDOW(appdata->window), str);    hildon_window_set_markup(HILDON_WINDOW(appdata->window), str);
62  #else  #else
63    if(project_valid)    if(project_valid)
64      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);      str = g_strdup_printf("%s - OSM2Go", appdata->project->name);
65    else    else
66      str = g_strdup_printf("OSM2Go");      str = g_strdup_printf("OSM2Go");
67    
# Line 889  void menu_create(appdata_t *appdata) { Line 889  void menu_create(appdata_t *appdata) {
889    
890  #endif //USE_HILDON  #endif //USE_HILDON
891  }  }
892    
893    void menu_cleanup(appdata_t *appdata) { }
894    
895  #else // !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)  #else // !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
896    
897  void submenu_entry(appdata_t *appdata, HildonAppMenu *menu,  void submenu_entry(appdata_t *appdata, HildonAppMenu *menu,
# Line 955  static GtkWidget *app_menu_create(appdat Line 958  static GtkWidget *app_menu_create(appdat
958                               menu_entries->activate_cb, appdata);                               menu_entries->activate_cb, appdata);
959      }      }
960    
961        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
962        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
963    
964      /* offset to GtkWidget pointer was given -> store pointer */      /* offset to GtkWidget pointer was given -> store pointer */
965      if(menu_entries->offset)      if(menu_entries->offset)
966        *(GtkWidget**)(((void*)appdata)+menu_entries->offset) = button;        *(GtkWidget**)(((void*)appdata)+menu_entries->offset) = button;
# Line 1045  static GtkWidget *app_submenu_create(app Line 1051  static GtkWidget *app_submenu_create(app
1051    
1052        g_signal_connect(button, "clicked",        g_signal_connect(button, "clicked",
1053                         menu_entries->activate_cb, appdata);                         menu_entries->activate_cb, appdata);
1054    
1055          hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1056          hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1057      } else {      } else {
1058        button = hildon_check_button_new(HILDON_SIZE_AUTO);        button = hildon_check_button_new(HILDON_SIZE_AUTO);
1059        gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));        gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
# Line 1058  static GtkWidget *app_submenu_create(app Line 1067  static GtkWidget *app_submenu_create(app
1067    
1068        g_signal_connect(button, "toggled",        g_signal_connect(button, "toggled",
1069                         menu_entries->activate_cb, appdata);                         menu_entries->activate_cb, appdata);
1070    
1071          gtk_button_set_alignment(GTK_BUTTON(button), 0.5, 0.5);
1072      }      }
1073    
1074      /* offset to GtkWidget pointer was given -> store pointer */      /* offset to GtkWidget pointer was given -> store pointer */
Legend:
Removed from v.244  
changed lines
  Added in v.245