Diff of /trunk/src/main.c

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

revision 192 by harbaum, Tue Jul 7 11:07:11 2009 UTC revision 195 by harbaum, Wed Jul 8 08:51:02 2009 UTC
# Line 74  static void main_ui_enable(appdata_t *ap Line 74  static void main_ui_enable(appdata_t *ap
74    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
75    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
76    
77    #ifdef ZOOM_BUTTONS
78      gtk_widget_set_sensitive(appdata->btn_zoom_in, osm_valid);
79      gtk_widget_set_sensitive(appdata->btn_zoom_out, osm_valid);
80    #endif
81    
82    if(!project_valid)    if(!project_valid)
83      statusbar_set(appdata, _("Please load or create a project"), FALSE);      statusbar_set(appdata, _("Please load or create a project"), FALSE);
84  }  }
# Line 1280  int main(int argc, char *argv[]) { Line 1285  int main(int argc, char *argv[]) {
1285    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
1286  #endif  #endif
1287    
1288    #ifdef ZOOM_BUTTONS
1289      GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);
1290    
1291      gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));
1292    
1293      /* ---- add zoom in button right of statusbar ---- */
1294      appdata.btn_zoom_in = gtk_button_new();
1295      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),
1296                           gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
1297      g_signal_connect(appdata.btn_zoom_in, "clicked", G_CALLBACK(cb_menu_zoomin), &appdata);
1298      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);
1299    
1300      /* ---- add zoom out button right of statusbar ---- */
1301      appdata.btn_zoom_out = gtk_button_new();
1302      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),
1303                           gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
1304      g_signal_connect(appdata.btn_zoom_out, "clicked", G_CALLBACK(cb_menu_zoomout), &appdata);
1305      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);
1306    
1307    
1308      gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);
1309    #else
1310    gtk_box_pack_start(GTK_BOX(vbox), statusbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), statusbar_new(&appdata), FALSE, FALSE, 0);
1311    #endif
1312    
1313  #ifndef PORTRAIT  #ifndef PORTRAIT
1314    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);
Legend:
Removed from v.192  
changed lines
  Added in v.195