Menu
▾
▴
morphix-cvs — A list for all cvs commits done, to easily keep track of development
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(23) |
Nov
(20) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(43) |
Feb
(31) |
Mar
(99) |
Apr
(57) |
May
(82) |
Jun
(73) |
Jul
(123) |
Aug
(634) |
Sep
(588) |
Oct
(264) |
Nov
(217) |
Dec
(179) |
| 2005 |
Jan
(262) |
Feb
(273) |
Mar
(164) |
Apr
(88) |
May
(23) |
Jun
(10) |
Jul
(8) |
Aug
(19) |
Sep
(112) |
Oct
(57) |
Nov
(71) |
Dec
(6) |
| 2006 |
Jan
(14) |
Feb
(48) |
Mar
(56) |
Apr
(21) |
May
(77) |
Jun
(46) |
Jul
(47) |
Aug
(27) |
Sep
(18) |
Oct
(16) |
Nov
(4) |
Dec
(18) |
| 2007 |
Jan
(2) |
Feb
(6) |
Mar
(2) |
Apr
(27) |
May
(13) |
Jun
(27) |
Jul
(20) |
Aug
(3) |
Sep
(3) |
Oct
(23) |
Nov
(21) |
Dec
(6) |
| 2008 |
Jan
(7) |
Feb
(3) |
Mar
(4) |
Apr
(8) |
May
(3) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(11) |
Feb
(1) |
Mar
(8) |
Apr
|
May
|
Jun
(4) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <ale...@us...> - 2004-03-03 00:01:05
|
Update of /cvsroot/morphix/mcp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1638/src Modified Files: callbacks.c dirtree.c dirtree.h iconviewer.c iconviewer.h interface.c Log Message: added treeview (nearly forgot about dirtree, thanks Tiago! =) treeview only expands when there are subdirectories with .directory entries. However, if treeview expands other directories will also be shown. But this is for another day... Icons are automatically resized, selection-blue-stuff-size depends on the size of the text, iconviewer is now dependant on it's Drawingarea size instead of the MainWindow size... Yeah, it's late and this cvs log is way too long. But MCP is looking fine! Honest! Just don't look at the code! =) PS. resizing still isn't enabled. Maybe division between tree and iconviewer should be moveable? Bah, sleep... Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/callbacks.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** callbacks.c 2 Mar 2004 17:09:11 -0000 1.14 --- callbacks.c 2 Mar 2004 23:41:05 -0000 1.15 *************** *** 78,81 **** --- 78,100 ---- } + void expand_treeview() { + GtkWidget *treeview = lookup_widget(MainWindow,"treeview1"); + GtkWidget *scrolledwindow = lookup_widget(MainWindow,"scrolledwindow1"); + GtkWidget *separator = lookup_widget(MainWindow,"vseparator1"); + gtk_widget_show(treeview); + gtk_widget_show(scrolledwindow); + gtk_widget_show(separator); + dirtree_new(treeview,get_panel_path(),FALSE,FALSE,NULL); + gtk_widget_set_size_request(treeview,100,100); + gtk_widget_set_size_request(scrolledwindow,100,100); + } + + void hide_treeview() { + GtkWidget *treeview = lookup_widget(MainWindow,"scrolledwindow1"); + GtkWidget *separator = lookup_widget(MainWindow,"vseparator1"); + gtk_widget_hide(treeview); + gtk_widget_hide(separator); + } + *************** *** 85,89 **** { GtkWidget *da = lookup_widget(MainWindow,"MainDrawingArea"); ! iv_add(get_panel_path(),da); } --- 104,116 ---- { GtkWidget *da = lookup_widget(MainWindow,"MainDrawingArea"); ! if (iv_add(get_panel_path(),da)) { ! // directory items found, expand treeview ! expand_treeview(); ! iv_redraw(da); ! } ! else { ! // don't use treeview, hide widgets ! hide_treeview(); ! } } Index: dirtree.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/dirtree.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** dirtree.c 2 Mar 2004 17:09:11 -0000 1.7 --- dirtree.c 2 Mar 2004 23:41:05 -0000 1.8 *************** *** 302,308 **** * base, when it's invalid */ ! GtkWidget* dirtree_new (gchar* base, gboolean show_hidden, gboolean include_base, GdkPixbuf* default_icon) { - GtkWidget* tree = gtk_tree_view_new(); base = g_strdup(base); if(base[strlen(base) - 1] == '/') { --- 302,307 ---- * base, when it's invalid */ ! void dirtree_new (GtkWidget *tree,gchar* base, gboolean show_hidden, gboolean include_base, GdkPixbuf* default_icon) { base = g_strdup(base); if(base[strlen(base) - 1] == '/') { Index: dirtree.h =================================================================== RCS file: /cvsroot/morphix/mcp/src/dirtree.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dirtree.h 6 Sep 2003 01:51:10 -0000 1.3 --- dirtree.h 2 Mar 2004 23:41:05 -0000 1.4 *************** *** 45,49 **** * Creates a new dirtree object */ ! GtkWidget* dirtree_new (gchar* base, gboolean show_hidden, gboolean include_base, GdkPixbuf *icon); --- 45,49 ---- * Creates a new dirtree object */ ! void dirtree_new (GtkWidget *treeview,gchar* base, gboolean show_hidden, gboolean include_base, GdkPixbuf *icon); Index: iconviewer.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/iconviewer.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** iconviewer.c 2 Mar 2004 19:31:47 -0000 1.6 --- iconviewer.c 2 Mar 2004 23:41:05 -0000 1.7 *************** *** 17,26 **** --- 17,33 ---- gchar *tip; gchar *iconpath; + gchar *dirname; } item_struct; + enum { + NAME_COLUMN, + N_COLUMNS + }; + extern GtkWidget *MainWindow; /* globals */ GList *items; + GList *dir_items; int iconviewer_height; int iconviewer_width; *************** *** 34,38 **** int top_border = 5; int side_border = 5; ! int box_width = 120; int box_height = 84; int icon_width = MAX_ICON_WIDTH; --- 41,45 ---- int top_border = 5; int side_border = 5; ! int box_width = 84; int box_height = 84; int icon_width = MAX_ICON_WIDTH; *************** *** 61,64 **** --- 68,72 ---- if(item->command) g_free(item->command); if(item->iconpath) g_free(item->iconpath); + if(item->dirname) g_free(item->dirname); g_free(item); } *************** *** 83,86 **** --- 91,97 ---- newitem->iconpath = g_strdup(item->iconpath); newitem->command = g_strdup(item->command); + if (item->dirname != NULL) { + newitem->dirname = g_strdup(item->dirname); + } if (item->selected == TRUE) newitem->selected = TRUE; *************** *** 142,149 **** */ ! GList* get_items(gchar *dir_str) { GDir *dir = g_dir_open(dir_str, 0 , NULL); ! char *file, *val = NULL, *tmp = NULL; GList *list = NULL; --- 153,160 ---- */ ! GList* get_items(gchar *dir_str, gboolean dirs) { GDir *dir = g_dir_open(dir_str, 0 , NULL); ! char *file, *file2, *val = NULL, *tmp = NULL; GList *list = NULL; *************** *** 154,159 **** --- 165,226 ---- while((file = (char *)g_dir_read_name(dir)) != NULL) { + if (strcmp(file,".directory") == 0) { + // we don't want to read .directories, + // they are for a level higher. + // maybe customize the viewer somewhat? + // dirtree already has a function to + // read this though. Bah... + continue; + } + gchar *dirstr = g_strdup(file); file = g_strconcat(dir_str, file, NULL); + // to get a list of directories in said directory with a .directory file + if (g_file_test(file,G_FILE_TEST_IS_DIR) && dirs) { + GDir *dir2 = g_dir_open(file,0,NULL); + GnomeDesktopFile *df2; + while ((file2 = (char *)g_dir_read_name(dir2)) != NULL) { + + if (strcmp(file2,".directory") != 0) { + continue; + } + file2 = g_strconcat("/",file2); + file2 = g_strconcat(file,file2); + df2 = gnome_desktop_file_load(file2,NULL); + if (!df2) continue; // FREE DAMNIT! FIXME! *shrug* + gnome_desktop_file_get_string(df2, "Desktop Entry", "Type", &val); + if (strcmp(val,"Directory") != 0) { + // no dir? + g_free(file2); + gnome_desktop_file_free(df2); + continue; + } + else { + item = (item_struct *) g_malloc0(sizeof(item_struct)); + gnome_desktop_file_get_string(df2, "Desktop Entry", "Name", &val); + item->name = val; + gnome_desktop_file_get_string(df2, "Desktop Entry", "Comment", &val); + item->tip = val; + if(gnome_desktop_file_get_string(df2, "Desktop Entry", "Icon", &val)) { + tmp = iv_find_icon(val); + g_free(val); + item->iconpath = tmp; + } else { + item->iconpath = g_strdup(""); + } + item->dirname = g_strdup(dirstr); + } + list = g_list_append(list, icon_copy(item)); + g_free(file2); + icon_item_free(item); + gnome_desktop_file_free(df2); + } + g_dir_close(dir2); + g_free(file); + g_free(dirstr); + continue; + } + g_free(dirstr); + if (dirs) continue; // Now get the data from the file df = gnome_desktop_file_load(file, NULL); *************** *** 174,181 **** } if(item->name == NULL || ! item->tip == NULL || ! item->command == NULL || ! item->iconpath == NULL) { ! debug("File didn't contain all the required fields: %s\n", file); } else { // add new item to the list --- 241,248 ---- } if(item->name == NULL || ! item->tip == NULL || ! item->command == NULL || ! item->iconpath == NULL) { ! debug("File didn't contain all the required fields: %s\n", file); } else { // add new item to the list *************** *** 183,187 **** } icon_item_free(item); ! gnome_desktop_file_free(df); } else { debug("Failed opening file: %s\n", file); --- 250,254 ---- } icon_item_free(item); ! gnome_desktop_file_free(df); } else { debug("Failed opening file: %s\n", file); *************** *** 193,200 **** } - gint minimum_width() { - return 300; // lame - } - /* redraw the icons on the drawingarea --- 260,263 ---- *************** *** 226,230 **** context = gtk_widget_get_pango_context(da); fontd = pango_font_description_from_string("8"); ! gtk_window_get_size(GTK_WINDOW(MainWindow),&width,&height); iv_set_width(width); iv_set_height(height); --- 289,293 ---- context = gtk_widget_get_pango_context(da); fontd = pango_font_description_from_string("8"); ! gdk_drawable_get_size(da->window,&width,&height); iv_set_width(width); iv_set_height(height); *************** *** 255,262 **** pango_layout_set_alignment(layout,PANGO_ALIGN_CENTER); pango_layout_set_wrap(layout,PANGO_WRAP_WORD); ! pango_layout_set_width(layout,box_width); ! pango_layout_set_justify(layout,TRUE); pango_layout_set_markup(layout,buf,-1); //pango_layout_set_spacing(layout,0); if (item->selected == TRUE) { GdkColor color; --- 318,327 ---- pango_layout_set_alignment(layout,PANGO_ALIGN_CENTER); pango_layout_set_wrap(layout,PANGO_WRAP_WORD); ! pango_layout_set_width(layout,box_width*1000); // don't understand this, Pango uses some weird kind of 1000th-smaller units. Took me a while to figure this out, spelled crap for wordwrapping :) pango_layout_set_markup(layout,buf,-1); //pango_layout_set_spacing(layout,0); + int w,h; + pango_layout_get_pixel_size(layout,&w,&h); + w = pango_layout_get_width(layout) / 1000; if (item->selected == TRUE) { GdkColor color; *************** *** 264,283 **** color.blue = 44288; color.green = 25856; ! int circle_width = 30; gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&color); /* top right */ ! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + box_width - circle_width,y_coord + text_from_top + circle_width / 2,circle_width,circle_width,64 * 0,64 * 90); /* bottom left */ ! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord + box_height - circle_width,circle_width,circle_width,64 * 180,64 * 90); /* bottom right */ ! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + box_width - circle_width,y_coord + box_height - circle_width,circle_width,circle_width,64 * 270,64 * 90); ! /* top left */ ! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord + text_from_top + circle_width / 2,circle_width,circle_width,64 * 90,64 * 90); ! /* center */ ! gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord + text_from_top + circle_width,box_width,box_height - text_from_top - circle_width - circle_width / 2); ! /* top */ ! gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + circle_width / 2,y_coord + text_from_top + circle_width / 2,box_width - circle_width,circle_width / 2); ! /* bottom */ ! gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + circle_width / 2,y_coord + box_height - circle_width / 2,box_width - circle_width, circle_width / 2); } else { --- 329,351 ---- color.blue = 44288; color.green = 25856; ! int circle_width = 10; ! int temp_box_height = h; ! int temp_box_width = w; gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&color); + /* center */ + gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord + 32,w,h); + /* top right */ ! gdk_draw_rectangle(pixmap,da->style->bg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + box_width - circle_width / 2,y_coord + 32,circle_width / 2, circle_width / 2); ! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord - circle_width + box_width,y_coord+32,circle_width,circle_width,0,64 * 90); ! /* top left */ ! gdk_draw_rectangle(pixmap,da->style->bg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord + 32,circle_width / 2, circle_width / 2); ! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord+32,circle_width,circle_width,64 * 90 , 64 * 90); /* bottom left */ ! gdk_draw_rectangle(pixmap,da->style->bg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord + 32 + h - circle_width / 2,circle_width / 2, circle_width / 2); ! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord+32+h - circle_width,circle_width,circle_width,64 * 180 , 64 * 90); /* bottom right */ ! gdk_draw_rectangle(pixmap,da->style->bg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + box_width - circle_width / 2, y_coord + 32 + h - circle_width / 2,circle_width / 2, circle_width / 2); ! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + box_width - circle_width, y_coord+32+h - circle_width,circle_width,circle_width,64 * 270 , 64 * 90); } else { *************** *** 285,292 **** } - printf("layout width: %d\n",pango_layout_get_width(layout)); gdk_draw_pixbuf(pixmap,NULL,item->pixbuf,0,0,x_coord + (box_width - icon_width) / 2,y_coord + icon_from_top,-1,-1,GDK_RGB_DITHER_NORMAL,0,0); ! gdk_draw_layout(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],x_coord+box_width / 2,y_coord+text_from_top,layout); nr_x++; --- 353,359 ---- } gdk_draw_pixbuf(pixmap,NULL,item->pixbuf,0,0,x_coord + (box_width - icon_width) / 2,y_coord + icon_from_top,-1,-1,GDK_RGB_DITHER_NORMAL,0,0); ! gdk_draw_layout(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],x_coord,y_coord+text_from_top,layout); nr_x++; *************** *** 307,347 **** void iv_set_height(int height) { iconviewer_height = height; } /* open the directory, and draw the icons in the drawingarea */ ! void iv_add(gchar *pathname, GtkWidget *drawingarea) { gint i; GList *item_list = NULL; ! item_struct *item = NULL; ! GError *error = NULL; ! item_list = get_items(pathname); if (item_list == NULL) return; GList *ptr = item_list; while (ptr != NULL) { ! item = (item_struct *)ptr->data; ! if (item->iconpath == NULL) { ! fprintf(stderr,"Pixbuf path not set!\n"); ! return; ! } ! GdkPixbuf *pix = gdk_pixbuf_new_from_file (item->iconpath,&error); ! if (pix == NULL) { ! fprintf(stderr,"Couldn't find icon %s\n",item->iconpath); ! } ! else { ! if (gdk_pixbuf_get_width(pix) > MAX_ICON_WIDTH || gdk_pixbuf_get_height(pix) > MAX_ICON_HEIGHT) { ! pix = gdk_pixbuf_scale_simple(pix,MAX_ICON_WIDTH,MAX_ICON_HEIGHT,GDK_INTERP_BILINEAR); ! } ! } ! item->pixbuf = pix; ptr = ptr->next; } items = item_list; ! gtk_widget_realize(drawingarea); iv_redraw(drawingarea); gtk_widget_add_events(drawingarea,GDK_BUTTON_PRESS_MASK); ! return; } --- 374,430 ---- void iv_set_height(int height) { iconviewer_height = height; } + void iv_set_icon(GList *ptr) { + item_struct *item = NULL; + GError *error = NULL; + item = (item_struct *)ptr->data; + if (item->iconpath == NULL) { + fprintf(stderr,"Pixbuf path not set!\n"); + return; + } + GdkPixbuf *pix = gdk_pixbuf_new_from_file (item->iconpath,&error); + if (pix == NULL) { + fprintf(stderr,"Couldn't find icon %s\n",item->iconpath); + } + else { + if (gdk_pixbuf_get_width(pix) > MAX_ICON_WIDTH || gdk_pixbuf_get_height(pix) > MAX_ICON_HEIGHT) { + pix = gdk_pixbuf_scale_simple(pix,MAX_ICON_WIDTH,MAX_ICON_HEIGHT,GDK_INTERP_BILINEAR); + } + } + item->pixbuf = pix; + } + /* open the directory, and draw the icons in the drawingarea + returns if there were directories added with a .directory + item. */ ! gboolean iv_add(gchar *pathname, GtkWidget *drawingarea) { gint i; GList *item_list = NULL; ! GList *dir_list = NULL; ! item_list = get_items(pathname, FALSE); ! dir_list = get_items(pathname, TRUE); if (item_list == NULL) return; GList *ptr = item_list; while (ptr != NULL) { ! iv_set_icon(ptr); ! ptr = ptr->next; ! } ! ptr = dir_list; ! while (ptr != NULL) { ! iv_set_icon(ptr); ptr = ptr->next; } items = item_list; ! dir_items = dir_list; gtk_widget_realize(drawingarea); iv_redraw(drawingarea); gtk_widget_add_events(drawingarea,GDK_BUTTON_PRESS_MASK); ! if (dir_list) { ! return TRUE; ! } ! return FALSE; } Index: iconviewer.h =================================================================== RCS file: /cvsroot/morphix/mcp/src/iconviewer.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** iconviewer.h 2 Mar 2004 17:09:11 -0000 1.4 --- iconviewer.h 2 Mar 2004 23:41:05 -0000 1.5 *************** *** 4,9 **** GdkPixbuf *iv_get_image(); void iv_redraw(GtkWidget *da); ! void iv_add(gchar *pathname, GtkWidget *da); gchar *iv_find_icon(gchar *iconpath); int iv_get_width(); --- 4,10 ---- GdkPixbuf *iv_get_image(); void iv_redraw(GtkWidget *da); ! gboolean iv_add(gchar *pathname, GtkWidget *da); gchar *iv_find_icon(gchar *iconpath); + void iv_add_directory_list(GtkWidget *treeview); int iv_get_width(); Index: interface.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/interface.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** interface.c 2 Mar 2004 19:31:47 -0000 1.3 --- interface.c 2 Mar 2004 23:41:05 -0000 1.4 *************** *** 32,35 **** --- 32,39 ---- GtkWidget *MainWindow; GtkWidget *vbox1; + GtkWidget *hbox1; + GtkWidget *scrolledwindow1; + GtkWidget *treeview1; + GtkWidget *vseparator1; GtkWidget *MainDrawingArea; GtkWidget *statusbar1; *************** *** 46,52 **** gtk_container_add (GTK_CONTAINER (MainWindow), vbox1); MainDrawingArea = gtk_drawing_area_new (); gtk_widget_show (MainDrawingArea); ! gtk_box_pack_start (GTK_BOX (vbox1), MainDrawingArea, TRUE, TRUE, 0); statusbar1 = gtk_statusbar_new (); --- 50,73 ---- gtk_container_add (GTK_CONTAINER (MainWindow), vbox1); + hbox1 = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox1); + gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0); + + scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); + gtk_box_pack_start (GTK_BOX (hbox1), scrolledwindow1, FALSE, FALSE, 0); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + treeview1 = gtk_tree_view_new (); + gtk_widget_show (treeview1); + gtk_container_add (GTK_CONTAINER (scrolledwindow1), treeview1); + gtk_widget_set_size_request (treeview1, 100, -1); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview1), FALSE); + + vseparator1 = gtk_vseparator_new (); + gtk_box_pack_start (GTK_BOX (hbox1), vseparator1, FALSE, FALSE, 5); + MainDrawingArea = gtk_drawing_area_new (); gtk_widget_show (MainDrawingArea); ! gtk_box_pack_start (GTK_BOX (hbox1), MainDrawingArea, TRUE, TRUE, 0); statusbar1 = gtk_statusbar_new (); *************** *** 79,82 **** --- 100,107 ---- GLADE_HOOKUP_OBJECT_NO_REF (MainWindow, MainWindow, "MainWindow"); GLADE_HOOKUP_OBJECT (MainWindow, vbox1, "vbox1"); + GLADE_HOOKUP_OBJECT (MainWindow, hbox1, "hbox1"); + GLADE_HOOKUP_OBJECT (MainWindow, scrolledwindow1, "scrolledwindow1"); + GLADE_HOOKUP_OBJECT (MainWindow, treeview1, "treeview1"); + GLADE_HOOKUP_OBJECT (MainWindow, vseparator1, "vseparator1"); GLADE_HOOKUP_OBJECT (MainWindow, MainDrawingArea, "MainDrawingArea"); GLADE_HOOKUP_OBJECT (MainWindow, statusbar1, "statusbar1"); |
|
From: <ale...@us...> - 2004-03-02 19:51:44
|
Update of /cvsroot/morphix/mcp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9638 Modified Files: Makefile Makefile.in iconviewer.c Added Files: interface.c interface.h Log Message: blah, tiago _will_ hate me... Index: Makefile =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 2 Mar 2004 17:09:11 -0000 1.4 --- Makefile 2 Mar 2004 19:31:47 -0000 1.5 *************** *** 1,5 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.7.9 from Makefile.am. ! # src/Makefile. Generated from Makefile.in by configure. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 12,55 **** - SHELL = /bin/sh srcdir = . top_srcdir = .. - prefix = /usr/local - exec_prefix = ${prefix} - - bindir = ${exec_prefix}/bin - sbindir = ${exec_prefix}/sbin - libexecdir = ${exec_prefix}/libexec - datadir = ${prefix}/share - sysconfdir = ${prefix}/etc - sharedstatedir = ${prefix}/com - localstatedir = ${prefix}/var - libdir = ${exec_prefix}/lib - infodir = ${prefix}/info - mandir = ${prefix}/man - includedir = ${prefix}/include - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/mcp pkglibdir = $(libdir)/mcp pkgincludedir = $(includedir)/mcp - top_builddir = .. ! ACLOCAL = aclocal-1.4 ! AUTOCONF = autoconf ! AUTOMAKE = automake-1.4 ! AUTOHEADER = autoheader ! INSTALL = /usr/bin/install -c ! INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = ${INSTALL} -m 644 ! INSTALL_SCRIPT = ${INSTALL} ! transform = s,x,x, ! NORMAL_INSTALL = : PRE_INSTALL = : --- 14,33 ---- srcdir = . top_srcdir = .. pkgdatadir = $(datadir)/mcp pkglibdir = $(libdir)/mcp pkgincludedir = $(includedir)/mcp top_builddir = .. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = /usr/bin/install -c ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 58,81 **** PRE_UNINSTALL = : POST_UNINSTALL = : ! host_alias = ! host_triplet = @host@ CATALOGS = CATOBJEXT = .gmo CC = gcc DATADIRNAME = share GETTEXT_PACKAGE = mcp GMOFILES = GMSGFMT = /usr/bin/msgfmt ! HAVE_LIB = @HAVE_LIB@ INSTOBJEXT = .mo INTLLIBS = ! LIB = @LIB@ ! LTLIB = @LTLIB@ MAINT = MAKEINFO = makeinfo MKINSTALLDIRS = ./mkinstalldirs PACKAGE = mcp PACKAGE_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include PACKAGE_LIBS = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 PKG_CONFIG = /usr/bin/pkg-config POFILES = --- 36,92 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! ACLOCAL = aclocal-1.7 ! AMDEP_FALSE = # ! AMDEP_TRUE = ! AMTAR = tar ! AUTOCONF = autoconf ! AUTOHEADER = autoheader ! AUTOMAKE = automake-1.7 ! AWK = mawk CATALOGS = CATOBJEXT = .gmo CC = gcc + CCDEPMODE = depmode=gcc3 + CFLAGS = -g -O2 + CPP = gcc -E + CPPFLAGS = + CYGPATH_W = echo DATADIRNAME = share + DEFS = -DHAVE_CONFIG_H + DEPDIR = .deps + ECHO_C = + ECHO_N = -n + ECHO_T = + EGREP = grep -E + EXEEXT = GETTEXT_PACKAGE = mcp GMOFILES = GMSGFMT = /usr/bin/msgfmt ! INSTALL_DATA = ${INSTALL} -m 644 ! INSTALL_PROGRAM = ${INSTALL} ! INSTALL_SCRIPT = ${INSTALL} ! INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s INSTOBJEXT = .mo INTLLIBS = ! LDFLAGS = ! LIBOBJS = ! LIBS = ! LTLIBOBJS = MAINT = + MAINTAINER_MODE_FALSE = # + MAINTAINER_MODE_TRUE = MAKEINFO = makeinfo MKINSTALLDIRS = ./mkinstalldirs + MSGFMT = /usr/bin/msgfmt + OBJEXT = o PACKAGE = mcp + PACKAGE_BUGREPORT = PACKAGE_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include PACKAGE_LIBS = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 + PACKAGE_NAME = + PACKAGE_STRING = + PACKAGE_TARNAME = + PACKAGE_VERSION = + PATH_SEPARATOR = : PKG_CONFIG = /usr/bin/pkg-config POFILES = *************** *** 83,155 **** PO_IN_DATADIR_FALSE = PO_IN_DATADIR_TRUE = USE_NLS = yes VERSION = 0.1 ! INCLUDES = -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include bin_PROGRAMS = mcp ! mcp_SOURCES = main.c support.c support.h callbacks.c callbacks.h desktop_file.c desktop_file.h dirtree.c dirtree.h iconviewer.c iconviewer.h interface.c interface.h mcp_LDADD = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 $(INTLLIBS) -L/usr/lib -lz -lpthread -lm mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! PROGRAMS = $(bin_PROGRAMS) ! DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I.. ! CPPFLAGS = ! LDFLAGS = ! LIBS = ! mcp_OBJECTS = main.o support.o callbacks.o desktop_file.o dirtree.o \ ! iconviewer.o interface.o ! mcp_DEPENDENCIES = ! mcp_LDFLAGS = ! CFLAGS = -g -O2 ! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = Makefile.am Makefile.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! ! TAR = tar ! GZIP_ENV = --best ! DEP_FILES = .deps/callbacks.P .deps/desktop_file.P .deps/dirtree.P \ ! .deps/iconviewer.P .deps/interface.P .deps/main.P .deps/support.P SOURCES = $(mcp_SOURCES) - OBJECTS = $(mcp_OBJECTS) - - all: all-redirect - .SUFFIXES: - .SUFFIXES: .S .c .o .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - - mostlyclean-binPROGRAMS: - - clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ! distclean-binPROGRAMS: ! ! maintainer-clean-binPROGRAMS: install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ! $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done --- 94,199 ---- PO_IN_DATADIR_FALSE = PO_IN_DATADIR_TRUE = + SET_MAKE = + SHELL = /bin/sh + STRIP = USE_NLS = yes VERSION = 0.1 + XGETTEXT = /usr/bin/xgettext + ac_ct_CC = gcc + ac_ct_STRIP = + am__fastdepCC_FALSE = # + am__fastdepCC_TRUE = + am__include = include + am__leading_dot = . + am__quote = + bindir = ${exec_prefix}/bin + build_alias = + datadir = ${prefix}/share + exec_prefix = ${prefix} + host_alias = + includedir = ${prefix}/include + infodir = ${prefix}/info + install_sh = /root/morphix/mcp/install-sh + libdir = ${exec_prefix}/lib + libexecdir = ${exec_prefix}/libexec + localstatedir = ${prefix}/var + mandir = ${prefix}/man + oldincludedir = /usr/include + prefix = /usr/local + program_transform_name = s,x,x, + sbindir = ${exec_prefix}/sbin + sharedstatedir = ${prefix}/com + sysconfdir = ${prefix}/etc + target_alias = ! INCLUDES = \ ! -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ ! -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ ! -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include bin_PROGRAMS = mcp ! mcp_SOURCES = \ ! main.c \ ! support.c support.h \ ! callbacks.c callbacks.h \ ! desktop_file.c desktop_file.h \ ! dirtree.c dirtree.h \ ! iconviewer.c iconviewer.h \ ! interface.c interface.h mcp_LDADD = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 $(INTLLIBS) -L/usr/lib -lz -lpthread -lm + subdir = src + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! bin_PROGRAMS = mcp$(EXEEXT) ! PROGRAMS = $(bin_PROGRAMS) + am_mcp_OBJECTS = main.$(OBJEXT) support.$(OBJEXT) callbacks.$(OBJEXT) \ + desktop_file.$(OBJEXT) dirtree.$(OBJEXT) iconviewer.$(OBJEXT) \ + interface.$(OBJEXT) + mcp_OBJECTS = $(am_mcp_OBJECTS) + mcp_DEPENDENCIES = + mcp_LDFLAGS = ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! DEP_FILES = ./$(DEPDIR)/callbacks.Po \ ! ./$(DEPDIR)/desktop_file.Po ./$(DEPDIR)/dirtree.Po \ ! ./$(DEPDIR)/iconviewer.Po ./$(DEPDIR)/interface.Po \ ! ./$(DEPDIR)/main.Po ./$(DEPDIR)/support.Po ! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! DIST_SOURCES = $(mcp_SOURCES) ! DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(mcp_SOURCES) ! all: all-am + .SUFFIXES: + .SUFFIXES: .c .o .obj + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ! if test -f $$p \ ! ; then \ ! f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ else :; fi; \ done *************** *** 157,292 **** uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! list='$(bin_PROGRAMS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done ! .s.o: ! $(COMPILE) -c $< ! ! .S.o: ! $(COMPILE) -c $< mostlyclean-compile: ! -rm -f *.o core *.core ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! mcp: $(mcp_OBJECTS) $(mcp_DEPENDENCIES) ! @rm -f mcp ! $(LINK) $(mcp_LDFLAGS) $(mcp_OBJECTS) $(mcp_LDADD) $(LIBS) tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) ! mostlyclean-tags: ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! ! maintainer-clean-tags: ! ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = src distdir: $(DISTFILES) ! here=`cd $(top_builddir) && pwd`; \ ! top_distdir=`cd $(top_distdir) && pwd`; \ ! distdir=`cd $(distdir) && pwd`; \ ! cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - - DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) - - -include $(DEP_FILES) - - mostlyclean-depend: - - clean-depend: - - distclean-depend: - -rm -rf .deps - - maintainer-clean-depend: - - %.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - - %.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: install-binPROGRAMS ! install-exec: install-exec-am ! install-data-am: install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-am - uninstall-am: uninstall-binPROGRAMS - uninstall: uninstall-am - all-am: Makefile $(PROGRAMS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) - mostlyclean-generic: --- 201,358 ---- uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ! rm -f $(DESTDIR)$(bindir)/$$f; \ done ! clean-binPROGRAMS: ! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ! mcp$(EXEEXT): $(mcp_OBJECTS) $(mcp_DEPENDENCIES) ! @rm -f mcp$(EXEEXT) ! $(LINK) $(mcp_LDFLAGS) $(mcp_OBJECTS) $(mcp_LDADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! include ./$(DEPDIR)/callbacks.Po ! include ./$(DEPDIR)/desktop_file.Po ! include ./$(DEPDIR)/dirtree.Po ! include ./$(DEPDIR)/iconviewer.Po ! include ./$(DEPDIR)/interface.Po ! include ./$(DEPDIR)/main.Po ! include ./$(DEPDIR)/support.Po ! .c.o: ! if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ! else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! fi ! # source='$<' object='$@' libtool=no \ ! # depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ ! # $(CCDEPMODE) $(depcomp) \ ! # $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ! ! .c.obj: ! if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ! else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! fi ! # source='$<' object='$@' libtool=no \ ! # depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ ! # $(CCDEPMODE) $(depcomp) \ ! # $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ! uninstall-info-am: ! ! ETAGS = etags ! ETAGSFLAGS = ! ! CTAGS = ctags ! CTAGSFLAGS = tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ctags: CTAGS ! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) ! install: install-am ! install-exec: install-exec-am install-data: install-data-am + uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: *************** *** 294,337 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ ! mostlyclean-tags mostlyclean-depend mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ ! clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ ! distclean-depend distclean-generic clean-am ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-binPROGRAMS \ ! maintainer-clean-compile maintainer-clean-tags \ ! maintainer-clean-depend maintainer-clean-generic \ ! distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ ! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ! distclean-depend clean-depend maintainer-clean-depend info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 360,425 ---- distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am ! distclean: distclean-am ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! info-am: ! ! install-data-am: ! ! install-exec-am: install-binPROGRAMS ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic ! ! pdf: pdf-am ! ! pdf-am: + ps: ps-am + + ps-am: + + uninstall-am: uninstall-binPROGRAMS uninstall-info-am + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic ctags distclean distclean-compile \ + distclean-generic distclean-tags distdir dvi dvi-am info \ + info-am install install-am install-binPROGRAMS install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: Makefile.in =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 2 Mar 2004 17:09:11 -0000 1.4 --- Makefile.in 2 Mar 2004 19:31:47 -0000 1.5 *************** *** 1,5 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.7.9 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 11,55 **** # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : --- 13,33 ---- # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 58,81 **** PRE_UNINSTALL = : POST_UNINSTALL = : ! host_alias = @host_alias@ ! host_triplet = @host@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! HAVE_LIB = @HAVE_LIB@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ ! LIB = @LIB@ ! LTLIB = @LTLIB@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ PACKAGE = @PACKAGE@ PACKAGE_CFLAGS = @PACKAGE_CFLAGS@ PACKAGE_LIBS = @PACKAGE_LIBS@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ --- 36,92 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ ! AWK = @AWK@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ ! LDFLAGS = @LDFLAGS@ ! LIBOBJS = @LIBOBJS@ ! LIBS = @LIBS@ ! LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_CFLAGS = @PACKAGE_CFLAGS@ PACKAGE_LIBS = @PACKAGE_LIBS@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ *************** *** 83,155 **** PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ ! INCLUDES = -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" @PACKAGE_CFLAGS@ bin_PROGRAMS = mcp ! mcp_SOURCES = main.c support.c support.h callbacks.c callbacks.h desktop_file.c desktop_file.h dirtree.c dirtree.h iconviewer.c iconviewer.h interface.c interface.h mcp_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -L/usr/lib -lz -lpthread -lm mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! PROGRAMS = $(bin_PROGRAMS) ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ ! mcp_OBJECTS = main.o support.o callbacks.o desktop_file.o dirtree.o \ ! iconviewer.o interface.o ! mcp_DEPENDENCIES = ! mcp_LDFLAGS = ! CFLAGS = @CFLAGS@ ! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = Makefile.am Makefile.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! ! TAR = tar ! GZIP_ENV = --best ! DEP_FILES = .deps/callbacks.P .deps/desktop_file.P .deps/dirtree.P \ ! .deps/iconviewer.P .deps/interface.P .deps/main.P .deps/support.P SOURCES = $(mcp_SOURCES) - OBJECTS = $(mcp_OBJECTS) - - all: all-redirect - .SUFFIXES: - .SUFFIXES: .S .c .o .s - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - ! mostlyclean-binPROGRAMS: ! ! clean-binPROGRAMS: ! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ! ! distclean-binPROGRAMS: ! ! maintainer-clean-binPROGRAMS: install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ! $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done --- 94,199 ---- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ + XGETTEXT = @XGETTEXT@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ + bindir = @bindir@ + build_alias = @build_alias@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host_alias = @host_alias@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + oldincludedir = @oldincludedir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ! INCLUDES = \ ! -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ ! -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ ! @PACKAGE_CFLAGS@ bin_PROGRAMS = mcp ! mcp_SOURCES = \ ! main.c \ ! support.c support.h \ ! callbacks.c callbacks.h \ ! desktop_file.c desktop_file.h \ ! dirtree.c dirtree.h \ ! iconviewer.c iconviewer.h \ ! interface.c interface.h mcp_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -L/usr/lib -lz -lpthread -lm + subdir = src + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! bin_PROGRAMS = mcp$(EXEEXT) ! PROGRAMS = $(bin_PROGRAMS) + am_mcp_OBJECTS = main.$(OBJEXT) support.$(OBJEXT) callbacks.$(OBJEXT) \ + desktop_file.$(OBJEXT) dirtree.$(OBJEXT) iconviewer.$(OBJEXT) \ + interface.$(OBJEXT) + mcp_OBJECTS = $(am_mcp_OBJECTS) + mcp_DEPENDENCIES = + mcp_LDFLAGS = ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = $(SHELL) $(top_srcdir)/depcomp ! am__depfiles_maybe = depfiles ! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/callbacks.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/desktop_file.Po ./$(DEPDIR)/dirtree.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/iconviewer.Po ./$(DEPDIR)/interface.Po \ ! @AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/support.Po ! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! DIST_SOURCES = $(mcp_SOURCES) ! DIST_COMMON = $(srcdir)/Makefile.in Makefile.am SOURCES = $(mcp_SOURCES) ! all: all-am + .SUFFIXES: + .SUFFIXES: .c .o .obj + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ! if test -f $$p \ ! ; then \ ! f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ else :; fi; \ done *************** *** 157,292 **** uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! list='$(bin_PROGRAMS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done ! .s.o: ! $(COMPILE) -c $< ! ! .S.o: ! $(COMPILE) -c $< mostlyclean-compile: ! -rm -f *.o core *.core ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! mcp: $(mcp_OBJECTS) $(mcp_DEPENDENCIES) ! @rm -f mcp ! $(LINK) $(mcp_LDFLAGS) $(mcp_OBJECTS) $(mcp_LDADD) $(LIBS) tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) ! mostlyclean-tags: ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! ! maintainer-clean-tags: ! ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = src distdir: $(DISTFILES) ! here=`cd $(top_builddir) && pwd`; \ ! top_distdir=`cd $(top_distdir) && pwd`; \ ! distdir=`cd $(distdir) && pwd`; \ ! cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - - DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) - - -include $(DEP_FILES) - - mostlyclean-depend: - - clean-depend: - - distclean-depend: - -rm -rf .deps - - maintainer-clean-depend: - - %.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - - %.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: install-binPROGRAMS ! install-exec: install-exec-am ! install-data-am: install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-am - uninstall-am: uninstall-binPROGRAMS - uninstall: uninstall-am - all-am: Makefile $(PROGRAMS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) - mostlyclean-generic: --- 201,358 ---- uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ! rm -f $(DESTDIR)$(bindir)/$$f; \ done ! clean-binPROGRAMS: ! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ! mcp$(EXEEXT): $(mcp_OBJECTS) $(mcp_DEPENDENCIES) ! @rm -f mcp$(EXEEXT) ! $(LINK) $(mcp_LDFLAGS) $(mcp_OBJECTS) $(mcp_LDADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/desktop_file.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirtree.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconviewer.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/support.Po@am__quote@ ! .c.o: ! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCC_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ! ! .c.obj: ! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ! @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ! @am__fastdepCC_TRUE@ fi ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ! uninstall-info-am: ! ! ETAGS = etags ! ETAGSFLAGS = ! ! CTAGS = ctags ! CTAGSFLAGS = tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ctags: CTAGS ! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) ! install: install-am ! install-exec: install-exec-am install-data: install-data-am + uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: *************** *** 294,337 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ ! mostlyclean-tags mostlyclean-depend mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ ! clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ ! distclean-depend distclean-generic clean-am ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-binPROGRAMS \ ! maintainer-clean-compile maintainer-clean-tags \ ! maintainer-clean-depend maintainer-clean-generic \ ! distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ ! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ! distclean-depend clean-depend maintainer-clean-depend info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 360,425 ---- distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am ! distclean: distclean-am ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! info-am: ! ! install-data-am: ! ! install-exec-am: install-binPROGRAMS ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + maintainer-clean-am: distclean-am maintainer-clean-generic ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic ! ! pdf: pdf-am ! ! pdf-am: + ps: ps-am + + ps-am: + + uninstall-am: uninstall-binPROGRAMS uninstall-info-am + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic ctags distclean distclean-compile \ + distclean-generic distclean-tags distdir dvi dvi-am info \ + info-am install install-am install-binPROGRAMS install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: iconviewer.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/iconviewer.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** iconviewer.c 2 Mar 2004 17:09:11 -0000 1.5 --- iconviewer.c 2 Mar 2004 19:31:47 -0000 1.6 *************** *** 252,256 **** layout = pango_layout_new(context); sprintf(buf,"<span foreground=\"black\">%127s</span>",item->name); - pango_layout_set_markup(layout,buf,-1); pango_layout_set_font_description(layout,fontd); pango_layout_set_alignment(layout,PANGO_ALIGN_CENTER); --- 252,255 ---- *************** *** 258,261 **** --- 257,261 ---- pango_layout_set_width(layout,box_width); pango_layout_set_justify(layout,TRUE); + pango_layout_set_markup(layout,buf,-1); //pango_layout_set_spacing(layout,0); if (item->selected == TRUE) { |
Update of /cvsroot/morphix/mcp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7307/src Modified Files: Makefile Makefile.am Makefile.in callbacks.c callbacks.h dirtree.c iconviewer.c iconviewer.h main.c Log Message: added iconviewer-widget (sortof), resizing still doesn't work (disabled). added directory of .desktop files for MCP, .directory support not yet included into widget. Nope Tiago doesn't kill me for this... Index: Makefile =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 5 Sep 2003 12:16:16 -0000 1.3 --- Makefile 2 Mar 2004 17:09:11 -0000 1.4 *************** *** 91,95 **** bin_PROGRAMS = mcp ! mcp_SOURCES = main.c support.c support.h callbacks.c callbacks.h desktop_file.c desktop_file.h dirtree.c dirtree.h iconviewer.c iconviewer.h --- 91,95 ---- bin_PROGRAMS = mcp ! mcp_SOURCES = main.c support.c support.h callbacks.c callbacks.h desktop_file.c desktop_file.h dirtree.c dirtree.h iconviewer.c iconviewer.h interface.c interface.h *************** *** 106,110 **** LIBS = mcp_OBJECTS = main.o support.o callbacks.o desktop_file.o dirtree.o \ ! iconviewer.o mcp_DEPENDENCIES = mcp_LDFLAGS = --- 106,110 ---- LIBS = mcp_OBJECTS = main.o support.o callbacks.o desktop_file.o dirtree.o \ ! iconviewer.o interface.o mcp_DEPENDENCIES = mcp_LDFLAGS = *************** *** 121,125 **** GZIP_ENV = --best DEP_FILES = .deps/callbacks.P .deps/desktop_file.P .deps/dirtree.P \ ! .deps/iconviewer.P .deps/main.P .deps/support.P SOURCES = $(mcp_SOURCES) OBJECTS = $(mcp_OBJECTS) --- 121,125 ---- GZIP_ENV = --best DEP_FILES = .deps/callbacks.P .deps/desktop_file.P .deps/dirtree.P \ ! .deps/iconviewer.P .deps/interface.P .deps/main.P .deps/support.P SOURCES = $(mcp_SOURCES) OBJECTS = $(mcp_OBJECTS) Index: Makefile.am =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 5 Sep 2003 12:16:16 -0000 1.3 --- Makefile.am 2 Mar 2004 17:09:11 -0000 1.4 *************** *** 14,18 **** desktop_file.c desktop_file.h \ dirtree.c dirtree.h \ ! iconviewer.c iconviewer.h mcp_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -L/usr/lib -lz -lpthread -lm --- 14,19 ---- desktop_file.c desktop_file.h \ dirtree.c dirtree.h \ ! iconviewer.c iconviewer.h \ ! interface.c interface.h mcp_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -L/usr/lib -lz -lpthread -lm Index: Makefile.in =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 5 Sep 2003 12:16:16 -0000 1.3 --- Makefile.in 2 Mar 2004 17:09:11 -0000 1.4 *************** *** 91,95 **** bin_PROGRAMS = mcp ! mcp_SOURCES = main.c support.c support.h callbacks.c callbacks.h desktop_file.c desktop_file.h dirtree.c dirtree.h iconviewer.c iconviewer.h --- 91,95 ---- bin_PROGRAMS = mcp ! mcp_SOURCES = main.c support.c support.h callbacks.c callbacks.h desktop_file.c desktop_file.h dirtree.c dirtree.h iconviewer.c iconviewer.h interface.c interface.h *************** *** 106,110 **** LIBS = @LIBS@ mcp_OBJECTS = main.o support.o callbacks.o desktop_file.o dirtree.o \ ! iconviewer.o mcp_DEPENDENCIES = mcp_LDFLAGS = --- 106,110 ---- LIBS = @LIBS@ mcp_OBJECTS = main.o support.o callbacks.o desktop_file.o dirtree.o \ ! iconviewer.o interface.o mcp_DEPENDENCIES = mcp_LDFLAGS = *************** *** 121,125 **** GZIP_ENV = --best DEP_FILES = .deps/callbacks.P .deps/desktop_file.P .deps/dirtree.P \ ! .deps/iconviewer.P .deps/main.P .deps/support.P SOURCES = $(mcp_SOURCES) OBJECTS = $(mcp_OBJECTS) --- 121,125 ---- GZIP_ENV = --best DEP_FILES = .deps/callbacks.P .deps/desktop_file.P .deps/dirtree.P \ ! .deps/iconviewer.P .deps/interface.P .deps/main.P .deps/support.P SOURCES = $(mcp_SOURCES) OBJECTS = $(mcp_OBJECTS) Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/callbacks.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** callbacks.c 27 Sep 2003 21:31:44 -0000 1.13 --- callbacks.c 2 Mar 2004 17:09:11 -0000 1.14 *************** *** 13,18 **** #include "iconviewer.h" gint debug_switch = 1; ! GtkWidget *iv; int debug(const char *fmt, ...) { --- 13,20 ---- #include "iconviewer.h" + extern GtkWidget *MainWindow; + gint debug_switch = 1; ! gchar *base_path; int debug(const char *fmt, ...) { *************** *** 41,89 **** filename = tmp; printf("You've selected %s\n", filename); ! iconviewer_refresh(iv, filename); g_free(filename); } } ! GtkWidget* control_panel_new(gchar* base) ! { ! GtkWidget *wndMain, *tblMain, *vbRoot, *tree, *paneRoot, *scroll; ! GtkTreeSelection *select; ! // Setup the window ! wndMain = gtk_window_new(GTK_WINDOW_TOPLEVEL); ! gtk_widget_set_size_request(wndMain, 450, 450); ! ! g_signal_connect ((gpointer) wndMain, "destroy", ! G_CALLBACK (gtk_main_quit), ! NULL); ! gtk_window_set_title(GTK_WINDOW(wndMain), "Morphix Configuration Panel"); ! paneRoot = gtk_hpaned_new(); ! gtk_container_add (GTK_CONTAINER (wndMain), paneRoot); ! ! // Setup the tree panel ! tree = dirtree_new(base, FALSE, FALSE, gdk_pixbuf_new_from_file(find_icon("../test/Harddisk.png"), NULL)); ! scroll = gtk_scrolled_window_new(NULL, NULL); ! gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ! gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), tree); ! ! select = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree)); ! gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE); ! g_signal_connect (G_OBJECT (select), "changed", ! G_CALLBACK (changed_dir), ! NULL); ! gtk_paned_add1(GTK_PANED(paneRoot), scroll); ! gtk_widget_set_size_request(scroll, 220, -1); ! // Setup the icon panel ! tblMain = iconviewer_new(); ! scroll = gtk_scrolled_window_new(NULL, NULL); ! gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ! gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), tblMain); ! iv = tblMain; ! gtk_widget_show_all(tblMain); ! gtk_paned_add2(GTK_PANED(paneRoot), scroll); ! gtk_widget_set_size_request(tree, 220, -1); ! return wndMain; } --- 43,67 ---- filename = tmp; printf("You've selected %s\n", filename); ! // iconviewer_refresh(iv, filename); g_free(filename); } } ! void set_panel_path(gchar *base) { ! base_path = g_strdup(base); ! } ! gchar *get_panel_path() { ! return base_path; ! } ! void free_panel_path() { ! g_free(base_path); ! } ! ! void control_panel_new(gchar* base) ! { ! set_panel_path(base); ! gtk_widget_show(MainWindow); } *************** *** 97,102 **** dir = g_strdup(dir_str); ! gtk_widget_show_all(control_panel_new(dir_str)); } --- 75,147 ---- dir = g_strdup(dir_str); ! control_panel_new(dir_str); } + + void + on_MainWindow_show (GtkWidget *widget, + gpointer user_data) + { + GtkWidget *da = lookup_widget(MainWindow,"MainDrawingArea"); + iv_add(get_panel_path(),da); + } + + + gboolean + on_MainDrawingArea_button_press_event (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) + { + iv_button_press_callback(widget,event,user_data); + iv_redraw(widget); + return FALSE; + } + + + gboolean + on_MainDrawingArea_expose_event (GtkWidget *widget, + GdkEventExpose *event, + gpointer user_data) + { + guchar *pixels; + int rowstride; + int width, height; + gtk_window_get_size(GTK_WINDOW(MainWindow),&width,&height); + GdkPixbuf *image = iv_get_image(); + if (image == NULL) + return FALSE; + + rowstride = gdk_pixbuf_get_rowstride(image); + pixels = gdk_pixbuf_get_pixels (image) + rowstride * event->area.y + + event->area.x * 3; + gdk_draw_rgb_image_dithalign (widget->window, + widget->style->black_gc, + event->area.x, event->area.y, + event->area.width, event->area.height, + GDK_RGB_DITHER_NORMAL,pixels,rowstride,0,0); + + return FALSE; + } + + gboolean + on_MainDrawingArea_key_press_event (GtkWidget *widget, + GdkEventKey *event, + gpointer user_data) {} + + + gboolean + on_MainWindow_configure_event (GtkWidget *widget, + GdkEventConfigure *event, + gpointer user_data) + { + /* printf("Configure event! old_width: %d old_height: %d new_width: %d new height: %d\n", + iv_get_width(),iv_get_height(),event->width,event->height); */ + if (event->width != iv_get_width() || event->height != iv_get_height()) { + GtkWidget *da = lookup_widget(MainWindow,"MainDrawingArea"); + /* printf("Redrawing iconviewer after configure event\n"); */ + iv_redraw(da); + } + return FALSE; + } + Index: callbacks.h =================================================================== RCS file: /cvsroot/morphix/mcp/src/callbacks.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** callbacks.h 5 Sep 2003 12:16:16 -0000 1.3 --- callbacks.h 2 Mar 2004 17:09:11 -0000 1.4 *************** *** 1,5 **** #include <gtk/gtk.h> ! GtkWidget* control_panel_new(gchar* base_dir); void --- 1,5 ---- #include <gtk/gtk.h> ! void control_panel_new(gchar* base_dir); void *************** *** 12,63 **** gpointer user_data); - void - on_drawingarea1_drag_begin (GtkWidget *widget, - GdkDragContext *drag_context, - gpointer user_data); - - void - on_drawingarea1_drag_end (GtkWidget *widget, - GdkDragContext *drag_context, - gpointer user_data); - gboolean ! on_drawingarea1_drag_drop (GtkWidget *widget, ! GdkDragContext *drag_context, ! gint x, ! gint y, ! guint time, gpointer user_data); gboolean ! on_drawingarea1_drag_motion (GtkWidget *widget, ! GdkDragContext *drag_context, ! gint x, ! gint y, ! guint time, gpointer user_data); void ! on_drawingarea1_drag_leave (GtkWidget *widget, ! GdkDragContext *drag_context, ! guint time, gpointer user_data); gboolean ! on_drawingarea1_key_press_event (GtkWidget *widget, ! GdkEventKey *event, gpointer user_data); ! void ! on_drawingarea1_show (GtkWidget *widget, gpointer user_data); gboolean ! on_drawingarea1_button_release_event (GtkWidget *widget, ! GdkEventButton *event, gpointer user_data); - gboolean ! on_MainDrawingArea_expose_event (GtkWidget *widget, ! GdkEventExpose *event, gpointer user_data); --- 12,45 ---- gpointer user_data); gboolean ! on_drawingarea1_key_press_event (GtkWidget *widget, ! GdkEventKey *event, gpointer user_data); gboolean ! on_MainDrawingArea_expose_event (GtkWidget *widget, ! GdkEventExpose *event, gpointer user_data); void ! on_MainWindow_show (GtkWidget *widget, gpointer user_data); gboolean ! on_MainDrawingArea_button_press_event (GtkWidget *widget, ! GdkEventButton *event, gpointer user_data); ! gboolean ! on_MainDrawingArea_expose_event (GtkWidget *widget, ! GdkEventExpose *event, gpointer user_data); gboolean ! on_MainDrawingArea_key_press_event (GtkWidget *widget, ! GdkEventKey *event, gpointer user_data); gboolean ! on_MainWindow_configure_event (GtkWidget *widget, ! GdkEventConfigure *event, gpointer user_data); Index: dirtree.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/dirtree.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dirtree.c 7 Sep 2003 13:27:24 -0000 1.6 --- dirtree.c 2 Mar 2004 17:09:11 -0000 1.7 *************** *** 118,122 **** } else { //TODO: error details ! tmp = find_icon(icon); g_free(icon); icon = tmp; --- 118,122 ---- } else { //TODO: error details ! tmp = iv_find_icon(icon); g_free(icon); icon = tmp; Index: iconviewer.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/iconviewer.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** iconviewer.c 7 Sep 2003 13:27:24 -0000 1.4 --- iconviewer.c 2 Mar 2004 17:09:11 -0000 1.5 *************** *** 9,40 **** #include <string.h> #include <stdlib.h> typedef struct { ! // GdkPixbuf *pixbuf; ! // gint boxx; ! // gint boxy; ! // gint boxwidth; ! // gint boxheight; gchar *command; gchar *name; - // gint namex; - // gint namey; - // gint namexmax; gchar *tip; gchar *iconpath; - // gint iconx; - // gint icony; - // gint iconwidth; - // gint iconheight; } item_struct; ! void icon_item_free(item_struct *item) ! { ! if(item) { ! if(item->name) g_free(item->name); ! if(item->tip) g_free(item->tip); ! if(item->command) g_free(item->command); ! if(item->iconpath) g_free(item->iconpath); ! g_free(item); ! } } --- 9,46 ---- #include <string.h> #include <stdlib.h> + typedef struct { ! GdkPixbuf *pixbuf; ! gboolean selected; gchar *command; gchar *name; gchar *tip; gchar *iconpath; } item_struct; ! extern GtkWidget *MainWindow; ! ! /* globals */ ! GList *items; ! int iconviewer_height; ! int iconviewer_width; ! ! #define MAX_ICON_WIDTH 32 ! #define MAX_ICON_HEIGHT 32 ! ! GdkPixbuf *image; ! ! /* GDK_WINDOW coord helpers */ ! int top_border = 5; ! int side_border = 5; ! int box_width = 120; ! int box_height = 84; ! int icon_width = MAX_ICON_WIDTH; ! int icon_height = MAX_ICON_HEIGHT; ! int icon_from_top = 0; ! int text_from_top = 20; ! ! GdkPixbuf *iv_get_image() { ! return image; } *************** *** 48,51 **** --- 54,67 ---- } + void icon_item_free(item_struct *item) + { + if(item) { + if(item->name) g_free(item->name); + if(item->tip) g_free(item->tip); + if(item->command) g_free(item->command); + if(item->iconpath) g_free(item->iconpath); + g_free(item); + } + } void on_icon_click(GtkButton *button, gpointer user_data) *************** *** 60,86 **** } ! ! GtkWidget* icon_new(item_struct *item) { ! GtkWidget *eb, *vb, *lbl, *img; ! GtkTooltips *tooltips = gtk_tooltips_new (); ! GnomeDesktopFile *icon; ! gchar *file; ! ! eb = gtk_button_new(); ! gtk_tooltips_set_tip (tooltips, eb, item->tip, NULL); ! ! vb = gtk_vbox_new(FALSE, 2); ! lbl = gtk_label_new(item->name); ! img = gtk_image_new_from_file(item->iconpath); ! ! gtk_box_pack_start_defaults(GTK_BOX(vb), img); ! gtk_box_pack_start_defaults(GTK_BOX(vb), lbl); ! ! g_signal_connect((gpointer) eb, "clicked", G_CALLBACK(on_icon_click), NULL); ! g_object_set_data(G_OBJECT(eb), "command", g_strdup(item->command)); ! gtk_container_add(GTK_CONTAINER(eb), vb); ! gtk_button_set_relief(GTK_BUTTON(eb), GTK_RELIEF_NONE); ! ! return eb; } --- 76,92 ---- } ! item_struct* icon_copy(item_struct *item) { ! item_struct *newitem; ! newitem = g_malloc0(sizeof(item_struct)); ! newitem->name = g_strdup(item->name); ! newitem->tip = g_strup(item->tip); ! newitem->iconpath = g_strdup(item->iconpath); ! newitem->command = g_strdup(item->command); ! if (item->selected == TRUE) ! newitem->selected = TRUE; ! //if (item->pixbuf != NULL) ! // hmm ! //newitem->pixbuf = g_object_copy(item->pixbuf); ! return newitem; } *************** *** 90,94 **** * @post: ret != NULL */ ! gchar *find_icon(gchar *iconpath) { FILE *f; --- 96,100 ---- * @post: ret != NULL */ ! gchar *iv_find_icon(gchar *iconpath) { FILE *f; *************** *** 102,105 **** --- 108,112 ---- // but it's the way it works with gnome (and in kde too, i guess) list = g_list_append(NULL, g_strdup("/usr/share/icons/Default/48x48/apps/")); + list = g_list_append(list, g_strdup("/usr/share/icons/")); list = g_list_append(list, g_strdup("/usr/share/icons/hicolor/48x48/apps/")); list = g_list_append(list, g_strdup("/usr/share/pixmaps/")); *************** *** 131,134 **** --- 138,144 ---- } + /* + read files in the path, return as a list of items + */ GList* get_items(gchar *dir_str) *************** *** 137,141 **** char *file, *val = NULL, *tmp = NULL; - GList *list = NULL; item_struct *item; --- 147,150 ---- *************** *** 150,154 **** df = gnome_desktop_file_load(file, NULL); if (df != NULL) { ! item = (item_struct *) g_malloc(sizeof(item_struct)); gnome_desktop_file_get_string(df, "Desktop Entry", "Name", &val); item->name = val; --- 159,163 ---- df = gnome_desktop_file_load(file, NULL); if (df != NULL) { ! item = (item_struct *) g_malloc0(sizeof(item_struct)); gnome_desktop_file_get_string(df, "Desktop Entry", "Name", &val); item->name = val; *************** *** 158,162 **** item->command = val; if(gnome_desktop_file_get_string(df, "Desktop Entry", "Icon", &val)) { ! tmp = find_icon(val); g_free(val); item->iconpath = tmp; --- 167,171 ---- item->command = val; if(gnome_desktop_file_get_string(df, "Desktop Entry", "Icon", &val)) { ! tmp = iv_find_icon(val); g_free(val); item->iconpath = tmp; *************** *** 171,175 **** } else { // add new item to the list ! list = g_list_append(list, icon_new(item)); } icon_item_free(item); --- 180,184 ---- } else { // add new item to the list ! list = g_list_append(list, icon_copy(item)); } icon_item_free(item); *************** *** 184,242 **** } ! void iconviewer_clear(GtkWidget *iconviewer) { ! GList *entry = gtk_container_get_children(GTK_CONTAINER(iconviewer)); ! GtkWidget *widget; ! while( entry != NULL) { ! widget = GTK_WIDGET(entry->data); ! // remove and free the resources ! gtk_container_remove(GTK_CONTAINER(iconviewer), widget); ! // remove allocated command string ! g_free(g_object_get_data(G_OBJECT(widget), "command")); ! gtk_widget_destroy(widget); ! ! entry = entry->next; ! } ! g_list_free(entry); } ! void iconviewer_refresh(GtkWidget *iconviewer, gchar* newbase) ! { ! GList *entry; ! GtkWidget *widget; ! int icon_count, max_row, x, y; ! iconviewer_clear(iconviewer); ! // get the list of icons ! entry = get_items(newbase); ! icon_count = g_list_length(entry); ! max_row = (int) sqrt(icon_count); ! if(icon_count - max_row * max_row) ! max_row++; ! ! if(max_row) { ! gtk_table_resize (GTK_TABLE(iconviewer), max_row , max_row); ! for(x = 0; x < max_row; x++) { ! for(y = 0; y < max_row; y++) { ! widget = GTK_WIDGET(entry->data); ! gtk_table_attach_defaults (GTK_TABLE (iconviewer), widget, y, y + 1, x, x + 1); ! entry = entry->next; ! if(entry == NULL) break; ! } ! if(entry == NULL) break; } ! gtk_widget_show_all(iconviewer); } ! } ! GtkWidget* iconviewer_new(void) ! { ! GtkWidget *tblMain; ! tblMain = gtk_table_new (1 , 1, FALSE); ! gtk_container_set_border_width (GTK_CONTAINER (tblMain), 20); ! // iconviewer_refresh(tblMain, base); ! return tblMain; } --- 193,416 ---- } ! gint minimum_width() { ! return 300; // lame } ! /* ! redraw the icons on the drawingarea ! this could use a diagram to clear it up :) ! */ ! void iv_redraw(GtkWidget *da) { ! ! int nr_x = 0; ! int nr_y = 0; ! int i, width, height; ! ! PangoContext *context; ! PangoLayout *layout; ! PangoFontDescription *fontd; ! PangoAttrList *attrlist; ! ! GdkColor colorfg, colorbg; ! GdkPixmap *pixmap; ! colorfg.red = 0; ! colorfg.green = 0; ! colorfg.blue = 0; ! colorbg.red = 65535; ! colorbg.green = 65535; ! colorbg.blue = 65535; ! ! attrlist = pango_attr_list_new(); ! /* Thanks to chen shengqi for noting this in gtk-app-devel */ ! context = gtk_widget_get_pango_context(da); ! fontd = pango_font_description_from_string("8"); ! gtk_window_get_size(GTK_WINDOW(MainWindow),&width,&height); ! iv_set_width(width); ! iv_set_height(height); ! // gdk_window_get_geometry(da,NULL,NULL,&width,&height,NULL); ! ! pixmap = gdk_pixmap_new(da->window,width,height,-1); ! ! gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&colorfg); ! gtk_widget_modify_bg(da,GTK_STATE_NORMAL,&colorbg); ! ! gdk_draw_rectangle(pixmap,da->style->bg_gc[GTK_WIDGET_STATE(da)],TRUE,0,0,width,height); ! GList *ptr = items; ! while (ptr != NULL) { ! item_struct *item = (item_struct *)ptr->data; ! int x_coord = side_border + (nr_x * box_width + nr_x * side_border); ! int y_coord = top_border + (nr_y * box_height + nr_y * top_border); ! gchar buf[128]; ! if (x_coord + side_border * 2 + box_width > width) { ! nr_x = 0; ! nr_y++; ! } ! x_coord = side_border + (nr_x * box_width + nr_x * side_border); ! y_coord = top_border + (nr_y * box_height + nr_y * top_border); ! ! layout = pango_layout_new(context); ! sprintf(buf,"<span foreground=\"black\">%127s</span>",item->name); ! pango_layout_set_markup(layout,buf,-1); ! pango_layout_set_font_description(layout,fontd); ! pango_layout_set_alignment(layout,PANGO_ALIGN_CENTER); ! pango_layout_set_wrap(layout,PANGO_WRAP_WORD); ! pango_layout_set_width(layout,box_width); ! pango_layout_set_justify(layout,TRUE); ! //pango_layout_set_spacing(layout,0); ! if (item->selected == TRUE) { ! GdkColor color; ! color.red = 16896; ! color.blue = 44288; ! color.green = 25856; ! int circle_width = 30; ! gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&color); ! /* top right */ ! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + box_width - circle_width,y_coord + text_from_top + circle_width / 2,circle_width,circle_width,64 * 0,64 * 90); ! /* bottom left */ ! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord + box_height - circle_width,circle_width,circle_width,64 * 180,64 * 90); ! /* bottom right */ ! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + box_width - circle_width,y_coord + box_height - circle_width,circle_width,circle_width,64 * 270,64 * 90); ! /* top left */ ! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord + text_from_top + circle_width / 2,circle_width,circle_width,64 * 90,64 * 90); ! /* center */ ! gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord + text_from_top + circle_width,box_width,box_height - text_from_top - circle_width - circle_width / 2); ! /* top */ ! gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + circle_width / 2,y_coord + text_from_top + circle_width / 2,box_width - circle_width,circle_width / 2); ! /* bottom */ ! gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + circle_width / 2,y_coord + box_height - circle_width / 2,box_width - circle_width, circle_width / 2); } + else { + gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&colorfg); + } + + printf("layout width: %d\n",pango_layout_get_width(layout)); + gdk_draw_pixbuf(pixmap,NULL,item->pixbuf,0,0,x_coord + (box_width - icon_width) / 2,y_coord + icon_from_top,-1,-1,GDK_RGB_DITHER_NORMAL,0,0); ! gdk_draw_layout(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],x_coord+box_width / 2,y_coord+text_from_top,layout); ! ! nr_x++; ! ptr = ptr->next; ! /* Looks scary, but it seems to work... */ } ! image = gdk_pixbuf_get_from_drawable(NULL, pixmap, NULL, 0,0,0,0,width,height); ! gdk_draw_drawable(da->window,gdk_gc_new(pixmap),pixmap,0,0,0,0,width,height); } ! /* ! returns or sets the allocatable size of the widget ! */ ! ! int iv_get_width() { return iconviewer_width; } ! int iv_get_height() { return iconviewer_height; } ! void iv_set_width(int width) { iconviewer_width = width; } ! void iv_set_height(int height) { iconviewer_height = height; } ! ! /* ! open the directory, and draw the icons in the drawingarea ! */ ! ! void iv_add(gchar *pathname, GtkWidget *drawingarea) { ! gint i; ! GList *item_list = NULL; ! item_struct *item = NULL; ! GError *error = NULL; ! item_list = get_items(pathname); ! if (item_list == NULL) ! return; ! GList *ptr = item_list; ! while (ptr != NULL) { ! item = (item_struct *)ptr->data; ! if (item->iconpath == NULL) { ! fprintf(stderr,"Pixbuf path not set!\n"); ! return; ! } ! GdkPixbuf *pix = gdk_pixbuf_new_from_file (item->iconpath,&error); ! if (pix == NULL) { ! fprintf(stderr,"Couldn't find icon %s\n",item->iconpath); ! } ! else { ! if (gdk_pixbuf_get_width(pix) > MAX_ICON_WIDTH || gdk_pixbuf_get_height(pix) > MAX_ICON_HEIGHT) { ! pix = gdk_pixbuf_scale_simple(pix,MAX_ICON_WIDTH,MAX_ICON_HEIGHT,GDK_INTERP_BILINEAR); ! } ! } ! item->pixbuf = pix; ! ptr = ptr->next; ! } ! items = item_list; ! ! gtk_widget_realize(drawingarea); ! iv_redraw(drawingarea); ! gtk_widget_add_events(drawingarea,GDK_BUTTON_PRESS_MASK); ! return; } + /* + set the message of the statusbar + */ + + void set_statusbar(gchar *str) { + GtkWidget *status = lookup_widget(MainWindow,"statusbar1"); + if (status) { + gtk_statusbar_pop(GTK_STATUSBAR(status),0); + gtk_statusbar_push(GTK_STATUSBAR(status),gtk_statusbar_get_context_id(GTK_STATUSBAR(status),str),str); + } + } + void iv_button_press_callback(GtkWidget *widget, GdkEventButton *event, gpointer data) { + if (event->type == GDK_BUTTON_PRESS || event->type == GDK_2BUTTON_PRESS) { + GtkWidget *drawingarea = lookup_widget(MainWindow,"MainDrawingArea"); + + gint width, height; + gdk_window_get_geometry(drawingarea->window,NULL,NULL,&width,&height,NULL); + + gint i; + int nr_x = 0; + int nr_y = 0; + + GList *ptr = items; + while (ptr != NULL) { + item_struct *item = (item_struct *)ptr->data; + item->selected = FALSE; + ptr = ptr->next; + } + ptr = items; + while (ptr != NULL) { + item_struct *item = (item_struct *)ptr->data; + int x_coord = side_border + (nr_x * box_width + nr_x * side_border); + int y_coord = top_border + (nr_y * box_height + nr_y * top_border); + + if (x_coord + side_border * 2 + box_width > width) { + nr_x = 0; + nr_y++; + } + x_coord = side_border + (nr_x * box_width + nr_x * side_border); + y_coord = top_border + (nr_y * box_height + nr_y * top_border); + + if (event->x > x_coord && + event->x < x_coord + box_width && + event->y > y_coord && + event->y < y_coord + box_height) { + if (event->type == GDK_2BUTTON_PRESS) { + + gchar *string = g_strdup_printf("Starting: %s",item->command); + set_statusbar(string); + g_free(string); + + if (!ExecuteAsyncCommand(item->command)) { + string = g_strdup_printf("%s could not be executed"); + set_statusbar(string); + g_free(string); + } + } + else { + item->selected = TRUE; + } + break; + } + + nr_x++; + ptr = ptr->next; + } + } + } Index: iconviewer.h =================================================================== RCS file: /cvsroot/morphix/mcp/src/iconviewer.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** iconviewer.h 7 Sep 2003 13:27:24 -0000 1.3 --- iconviewer.h 2 Mar 2004 17:09:11 -0000 1.4 *************** *** 1,4 **** #include <gtk/gtk.h> ! void iconviewer_refresh(GtkWidget *iconviewer, gchar* newbase); ! GtkWidget* iconviewer_new(void); ! gchar *find_icon(gchar *iconpath); --- 1,15 ---- + #ifndef ICONVIEWER_H + #define ICONVIEWER_H #include <gtk/gtk.h> ! GdkPixbuf *iv_get_image(); ! void iv_redraw(GtkWidget *da); ! void iv_add(gchar *pathname, GtkWidget *da); ! gchar *iv_find_icon(gchar *iconpath); ! ! int iv_get_width(); ! int iv_get_height(); ! void iv_set_width(int width); ! void iv_set_height(int height); ! ! void iv_button_press_callback(GtkWidget *widget, GdkEventButton *event, gpointer data); ! #endif // ICONVIEWER_H Index: main.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** main.c 3 Sep 2003 00:52:24 -0000 1.4 --- main.c 2 Mar 2004 17:09:11 -0000 1.5 *************** *** 1,7 **** - /* - * Initial main.c file generated by Glade. Edit as required. - * Glade will not overwrite this file. - */ - #ifdef HAVE_CONFIG_H # include <config.h> --- 1,2 ---- *************** *** 9,13 **** #include <gtk/gtk.h> ! #include "callbacks.h" #include "support.h" --- 4,8 ---- #include <gtk/gtk.h> ! #include "interface.h" #include "callbacks.h" #include "support.h" *************** *** 29,37 **** add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps"); ! /* ! * The following code was added by Glade to create one of each component ! * (except popup menus), just so that you see something after building ! * the project. Delete any components that you don't want shown initially. ! */ if (argc == 2) { load_control_panel(argv[1]); --- 24,28 ---- add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps"); ! MainWindow = create_MainWindow(); if (argc == 2) { load_control_panel(argv[1]); *************** *** 40,43 **** --- 31,35 ---- load_control_panel("./"); } + gtk_widget_show(MainWindow); gtk_main (); return 0; |
|
From: <ale...@us...> - 2004-03-02 17:29:03
|
Update of /cvsroot/morphix/mcp/src/.deps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7307/src/.deps Modified Files: main.P Log Message: added iconviewer-widget (sortof), resizing still doesn't work (disabled). added directory of .desktop files for MCP, .directory support not yet included into widget. Nope Tiago doesn't kill me for this... Index: main.P =================================================================== RCS file: /cvsroot/morphix/mcp/src/.deps/main.P,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.P 2 Sep 2003 21:29:41 -0000 1.2 --- main.P 2 Mar 2004 17:09:11 -0000 1.3 *************** *** 252,257 **** /usr/include/gtk-2.0/gtk/gtkvruler.h \ /usr/include/gtk-2.0/gtk/gtkvscale.h \ ! /usr/include/gtk-2.0/gtk/gtkvseparator.h callbacks.h support.h \ ! /usr/include/libintl.h /usr/include/locale.h /usr/include/bits/locale.h main.c : ../config.h : --- 252,258 ---- /usr/include/gtk-2.0/gtk/gtkvruler.h \ /usr/include/gtk-2.0/gtk/gtkvscale.h \ ! /usr/include/gtk-2.0/gtk/gtkvseparator.h interface.h callbacks.h \ ! support.h /usr/include/libintl.h /usr/include/locale.h \ ! /usr/include/bits/locale.h main.c : ../config.h : *************** *** 541,544 **** --- 542,546 ---- /usr/include/gtk-2.0/gtk/gtkvscale.h : /usr/include/gtk-2.0/gtk/gtkvseparator.h : + interface.h : callbacks.h : support.h : |
|
From: <ale...@us...> - 2004-03-02 17:29:01
|
Update of /cvsroot/morphix/mcp/data/main-mcp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7307/data/main-mcp Added Files: datetimeconf.desktop keybconf.desktop langconf.desktop morphixinstaller.desktop networkconf.desktop partitionmorpher.desktop synaptic.desktop xconf.desktop xterm.desktop Log Message: added iconviewer-widget (sortof), resizing still doesn't work (disabled). added directory of .desktop files for MCP, .directory support not yet included into widget. Nope Tiago doesn't kill me for this... --- NEW FILE: datetimeconf.desktop --- [Desktop Entry] Name=Date and Time settings Comment=Set the date, time and/or timezone Exec=datetimeconf Icon=/usr/share/mcp/pixmaps/Datetime.png --- NEW FILE: keybconf.desktop --- [Desktop Entry] Name=Keyboard Settings Comment=Helps you change your selected keyboard layout Exec=keybconf Icon=/usr/share/mcp/pixmaps/Keyboard.png --- NEW FILE: langconf.desktop --- [Desktop Entry] Name=Language settings Comment=Set your current locale Exec=langconf Icon=/usr/share/mcp/pixmaps/Localeconf.png --- NEW FILE: morphixinstaller.desktop --- [Desktop Entry] Name=Install to harddisk Comment=Copy Morphix to the harddisk for usage without the livecd Exec=morphixinstaller Icon=/usr/share/mcp/pixmaps/Harddisk.png --- NEW FILE: networkconf.desktop --- [Desktop Entry] Name=Network Settings Comment=Helps you set your network and wifi settings Exec=networkconf Icon=/usr/share/mcp/pixmaps/Networking.png --- NEW FILE: partitionmorpher.desktop --- [Desktop Entry] Name=Partition Morpher Comment=Helps you partition your harddisk Exec=partitionmorpher Icon=/usr/share/mcp/pixmaps/PM.png --- NEW FILE: synaptic.desktop --- [Desktop Entry] Name=Add/Remove Software Comment=Use the packagemanager to change the software on your install Exec=synaptic Icon=/usr/share/mcp/pixmaps/Synaptic.png --- NEW FILE: xconf.desktop --- [Desktop Entry] Name=Display Settings Comment=Helps you set your X settings Exec=xconf Icon=/usr/share/mcp/pixmaps/Monitor.png --- NEW FILE: xterm.desktop --- [Desktop Entry] Name=Root terminal Comment=Open a root terminal Exec=sudo xterm Icon=/usr/share/mcp/pixmaps/BabyTuxTerm.png |
|
From: <ale...@us...> - 2004-03-02 17:29:01
|
Update of /cvsroot/morphix/mcp/pixmaps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7307/pixmaps Added Files: BabyTuxTerm.png Datetime.png Harddisk.png Keyboard.png Localeconf.png Monitor.png Networking.png PM.png Speaker.png Synaptic.png mcp.png Log Message: added iconviewer-widget (sortof), resizing still doesn't work (disabled). added directory of .desktop files for MCP, .directory support not yet included into widget. Nope Tiago doesn't kill me for this... --- NEW FILE: BabyTuxTerm.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Datetime.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Harddisk.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Keyboard.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Localeconf.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Monitor.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Networking.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: PM.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Speaker.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Synaptic.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mcp.png --- (This appears to be a binary file; contents omitted.) |
|
From: <ale...@us...> - 2004-03-02 17:28:57
|
Update of /cvsroot/morphix/mcp/autom4te.cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7307/autom4te.cache Modified Files: output.0 requests traces.0 Log Message: added iconviewer-widget (sortof), resizing still doesn't work (disabled). added directory of .desktop files for MCP, .directory support not yet included into widget. Nope Tiago doesn't kill me for this... Index: output.0 =================================================================== RCS file: /cvsroot/morphix/mcp/autom4te.cache/output.0,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** output.0 5 Sep 2003 12:16:16 -0000 1.2 --- output.0 2 Mar 2004 17:09:10 -0000 1.3 *************** *** 1,8 **** @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. ! @%:@ Generated by GNU Autoconf 2.57. @%:@ ! @%:@ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 ! @%:@ Free Software Foundation, Inc. @%:@ This configure script is free software; the Free Software Foundation @%:@ gives unlimited permission to copy, distribute and modify it. --- 1,7 ---- @%:@! /bin/sh [...3018 lines suppressed...] ! case $ac_abs_builddir in ! .) ac_abs_srcdir=$ac_srcdir;; ! *) ! case $ac_srcdir in ! .) ac_abs_srcdir=$ac_abs_builddir;; ! [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; ! esac;; ! esac ! case $ac_abs_builddir in ! .) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ! case $ac_top_srcdir in ! .) ac_abs_top_srcdir=$ac_abs_builddir;; ! [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; ! esac;; ! esac Index: requests =================================================================== RCS file: /cvsroot/morphix/mcp/autom4te.cache/requests,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** requests 1 Sep 2003 19:25:40 -0000 1.1.1.1 --- requests 2 Mar 2004 17:09:10 -0000 1.2 *************** *** 1,3 **** ! # This file was created by autom4te. # It contains the lists of macros which have been traced. # It can be safely removed. --- 1,3 ---- ! # This file was generated by Autom4te Wed Nov 19 23:55:15 PST 2003. # It contains the lists of macros which have been traced. # It can be safely removed. *************** *** 17,20 **** --- 17,21 ---- { 'm4_pattern_forbid' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, 'AC_TYPE_OFF_T' => 1, 'AC_C_VOLATILE' => 1, *************** *** 33,40 **** --- 34,43 ---- 'AC_CHECK_HEADERS' => 1, 'AC_FUNC_STRNLEN' => 1, + 'm4_sinclude' => 1, 'AC_PROG_CXX' => 1, 'AC_PATH_X' => 1, 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1, 'AC_PROG_AWK' => 1, + '_m4_warn' => 1, 'AC_HEADER_STDC' => 1, 'AC_HEADER_MAJOR' => 1, *************** *** 48,51 **** --- 51,55 ---- 'AC_CONFIG_AUX_DIR' => 1, 'AC_PROG_MAKE_SET' => 1, + 'sinclude' => 1, 'm4_pattern_allow' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, *************** *** 71,74 **** --- 75,79 ---- 'AC_FUNC_REALLOC' => 1, 'AC_TYPE_SIZE_T' => 1, + 'AC_CONFIG_LINKS' => 1, 'AC_CHECK_TYPES' => 1, 'AC_CHECK_MEMBERS' => 1, *************** *** 88,93 **** 'AC_PROG_INSTALL' => 1, 'AM_GNU_GETTEXT' => 1, - 'AC_FUNC_OBSTACK' => 1, 'AC_CHECK_LIB' => 1, 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_GETGROUPS' => 1, --- 93,98 ---- 'AC_PROG_INSTALL' => 1, 'AM_GNU_GETTEXT' => 1, 'AC_CHECK_LIB' => 1, + 'AC_FUNC_OBSTACK' => 1, 'AC_FUNC_MALLOC' => 1, 'AC_FUNC_GETGROUPS' => 1, *************** *** 107,111 **** 'AC_CHECK_FUNCS' => 1 } ! ], 'Request' ) ); --- 112,116 ---- 'AC_CHECK_FUNCS' => 1 } ! ], 'Autom4te::Request' ) ); Index: traces.0 =================================================================== RCS file: /cvsroot/morphix/mcp/autom4te.cache/traces.0,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** traces.0 1 Sep 2003 19:25:42 -0000 1.1.1.1 --- traces.0 2 Mar 2004 17:09:10 -0000 1.2 *************** *** 74,77 **** --- 74,86 ---- m4trace:configure.in:4: -1- AC_SUBST([SET_MAKE]) m4trace:configure.in:5: -1- AC_CONFIG_HEADERS([config.h]) + m4trace:configure.in:5: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. + You should run autoupdate.], [autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from... + aclocal.m4:975: AM_CONFIG_HEADER is expanded from... + configure.in:5: the top level]) + m4trace:configure.in:5: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete. + You should run autoupdate.], [autoconf/status.m4:321: _AC_OUTPUT_COMMANDS_CNT is expanded from... + autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from... + aclocal.m4:975: AM_CONFIG_HEADER is expanded from... + configure.in:5: the top level]) m4trace:configure.in:6: -1- AM_MAINTAINER_MODE m4trace:configure.in:6: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) *************** *** 106,109 **** --- 115,123 ---- m4trace:configure.in:9: -1- AC_SUBST([CC]) m4trace:configure.in:9: -1- AC_SUBST([ac_ct_CC]) + m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. + You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from... + autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... + aclocal.m4:1123: AM_PROG_CC_STDC is expanded from... + configure.in:10: the top level]) m4trace:configure.in:11: -1- AC_HEADER_STDC m4trace:configure.in:11: -1- AC_PROG_CPP *************** *** 126,130 **** #undef HAVE_LOCALE_H]) m4trace:configure.in:24: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ! inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default]) m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H]) --- 140,144 ---- #undef HAVE_LOCALE_H]) m4trace:configure.in:24: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ! inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default]) m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H]) *************** *** 145,152 **** --- 159,183 ---- m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H]) + m4trace:configure.in:24: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. + You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... + autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... + autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... + aclocal.m4:1238: GLIB_LC_MESSAGES is expanded from... + aclocal.m4:1533: GLIB_GNU_GETTEXT is expanded from... + aclocal.m4:1562: AM_GLIB_GNU_GETTEXT is expanded from... + configure.in:24: the top level]) m4trace:configure.in:24: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES]) m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_LC_MESSAGES], [/* Define if your <locale.h> file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES]) m4trace:configure.in:24: -1- AC_SUBST([USE_NLS]) + m4trace:configure.in:24: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. + You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... + autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... + autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... + autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from... + aclocal.m4:1450: GLIB_WITH_NLS is expanded from... + aclocal.m4:1533: GLIB_GNU_GETTEXT is expanded from... + aclocal.m4:1562: AM_GLIB_GNU_GETTEXT is expanded from... + configure.in:24: the top level]) m4trace:configure.in:24: -1- AC_CHECK_FUNCS([bind_textdomain_codeset]) m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ *************** *** 169,175 **** --- 200,219 ---- m4trace:configure.in:24: -1- AC_SUBST([GMSGFMT], [$ac_cv_path_GMSGFMT]) m4trace:configure.in:24: -1- AC_SUBST([XGETTEXT]) + m4trace:configure.in:24: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. + You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from... + autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from... + aclocal.m4:1450: GLIB_WITH_NLS is expanded from... + aclocal.m4:1533: GLIB_GNU_GETTEXT is expanded from... + aclocal.m4:1562: AM_GLIB_GNU_GETTEXT is expanded from... + configure.in:24: the top level]) m4trace:configure.in:24: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS]) m4trace:configure.in:24: -1- AH_OUTPUT([ENABLE_NLS], [/* always defined to indicate that i18n is enabled */ #undef ENABLE_NLS]) + m4trace:configure.in:24: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. + You should run autoupdate.], [autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from... + aclocal.m4:1450: GLIB_WITH_NLS is expanded from... + aclocal.m4:1533: GLIB_GNU_GETTEXT is expanded from... + aclocal.m4:1562: AM_GLIB_GNU_GETTEXT is expanded from... + configure.in:24: the top level]) m4trace:configure.in:24: -1- AC_SUBST([CATALOGS]) m4trace:configure.in:24: -1- AC_SUBST([CATOBJEXT]) *************** *** 188,191 **** --- 232,237 ---- po/Makefile.in ]) + m4trace:configure.in:30: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments. + You should run autoupdate.], []) m4trace:configure.in:30: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) m4trace:configure.in:30: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) |
|
From: <ale...@us...> - 2004-03-02 17:28:57
|
Update of /cvsroot/morphix/mcp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7307 Modified Files: config.log mcp.glade translation Log Message: added iconviewer-widget (sortof), resizing still doesn't work (disabled). added directory of .desktop files for MCP, .directory support not yet included into widget. Nope Tiago doesn't kill me for this... Index: config.log =================================================================== RCS file: /cvsroot/morphix/mcp/config.log,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.log 5 Sep 2003 12:16:14 -0000 1.2 --- config.log 2 Mar 2004 17:09:10 -0000 1.3 *************** *** 551,552 **** --- 551,610 ---- configure: exit 0 + + ## ---------------------- ## + ## Running config.status. ## + ## ---------------------- ## + + This file was extended by config.status, which was + generated by GNU Autoconf 2.57. Invocation command line was + + CONFIG_FILES = src/Makefile + CONFIG_HEADERS = + CONFIG_LINKS = + CONFIG_COMMANDS = + $ ./config.status + + on myBox + + config.status:661: creating src/Makefile + config.status:984: executing default-1 commands + config.status:984: executing default-2 commands + + ## ---------------------- ## + ## Running config.status. ## + ## ---------------------- ## + + This file was extended by config.status, which was + generated by GNU Autoconf 2.57. Invocation command line was + + CONFIG_FILES = + CONFIG_HEADERS = config.h + CONFIG_LINKS = + CONFIG_COMMANDS = + $ ./config.status + + on myBox + + config.status:765: creating config.h + config.status:884: config.h is unchanged + config.status:984: executing default-1 commands + config.status:984: executing default-2 commands + + ## ---------------------- ## + ## Running config.status. ## + ## ---------------------- ## + + This file was extended by config.status, which was + generated by GNU Autoconf 2.57. Invocation command line was + + CONFIG_FILES = po/Makefile.in + CONFIG_HEADERS = + CONFIG_LINKS = + CONFIG_COMMANDS = + $ ./config.status + + on myBox + + config.status:661: creating po/Makefile.in + config.status:984: executing default-1 commands + config.status:984: executing default-2 commands Index: mcp.glade =================================================================== RCS file: /cvsroot/morphix/mcp/mcp.glade,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** mcp.glade 1 Sep 2003 19:25:15 -0000 1.1.1.1 --- mcp.glade 2 Mar 2004 17:09:10 -0000 1.2 *************** *** 6,12 **** <widget class="GtkWindow" id="MainWindow"> <property name="width_request">400</property> ! <property name="height_request">250</property> <property name="visible">True</property> ! <property name="title" translatable="yes">Morphix Configuration Panel</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> --- 6,12 ---- <widget class="GtkWindow" id="MainWindow"> <property name="width_request">400</property> ! <property name="height_request">350</property> <property name="visible">True</property> ! <property name="title" translatable="yes">Morphix Control Panel</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> *************** *** 14,21 **** <property name="default_width">400</property> <property name="default_height">250</property> ! <property name="resizable">True</property> <property name="destroy_with_parent">True</property> <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sun, 29 Jun 2003 22:05:39 GMT"/> ! <signal name="show" handler="on_window1_show" last_modification_time="Sun, 29 Jun 2003 13:42:55 GMT"/> <child> --- 14,22 ---- <property name="default_width">400</property> <property name="default_height">250</property> ! <property name="resizable">False</property> <property name="destroy_with_parent">True</property> <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sun, 29 Jun 2003 22:05:39 GMT"/> ! <signal name="show" handler="on_MainWindow_show" last_modification_time="Tue, 17 Feb 2004 16:48:37 GMT"/> ! <signal name="configure_event" handler="on_MainWindow_configure_event" last_modification_time="Fri, 27 Feb 2004 17:02:53 GMT"/> <child> *************** *** 28,42 **** <widget class="GtkDrawingArea" id="MainDrawingArea"> <property name="visible">True</property> - <signal name="button_press_event" handler="on_drawingarea1_button_press_event" last_modification_time="Sun, 29 Jun 2003 13:40:51 GMT"/> - <signal name="drag_begin" handler="on_drawingarea1_drag_begin" last_modification_time="Sun, 29 Jun 2003 13:41:06 GMT"/> - <signal name="drag_end" handler="on_drawingarea1_drag_end" last_modification_time="Sun, 29 Jun 2003 13:41:13 GMT"/> - <signal name="drag_drop" handler="on_drawingarea1_drag_drop" last_modification_time="Sun, 29 Jun 2003 13:41:21 GMT"/> - <signal name="drag_motion" handler="on_drawingarea1_drag_motion" last_modification_time="Sun, 29 Jun 2003 13:41:28 GMT"/> - <signal name="drag_leave" handler="on_drawingarea1_drag_leave" last_modification_time="Sun, 29 Jun 2003 13:41:34 GMT"/> - <signal name="key_press_event" handler="on_drawingarea1_key_press_event" last_modification_time="Sun, 29 Jun 2003 13:41:45 GMT"/> - <signal name="show" handler="on_drawingarea1_show" last_modification_time="Sun, 29 Jun 2003 13:42:02 GMT"/> <signal name="destroy_event" handler="gtk_main_quit" last_modification_time="Sun, 29 Jun 2003 13:42:10 GMT"/> ! <signal name="button_release_event" handler="on_drawingarea1_button_release_event" last_modification_time="Sun, 29 Jun 2003 13:42:29 GMT"/> ! <signal name="expose_event" handler="on_MainDrawingArea_expose_event" last_modification_time="Sun, 29 Jun 2003 17:07:59 GMT"/> </widget> <packing> --- 29,36 ---- <widget class="GtkDrawingArea" id="MainDrawingArea"> <property name="visible">True</property> <signal name="destroy_event" handler="gtk_main_quit" last_modification_time="Sun, 29 Jun 2003 13:42:10 GMT"/> ! <signal name="button_press_event" handler="on_MainDrawingArea_button_press_event" last_modification_time="Tue, 17 Feb 2004 16:54:32 GMT"/> ! <signal name="expose_event" handler="on_MainDrawingArea_expose_event" last_modification_time="Tue, 17 Feb 2004 16:54:48 GMT"/> ! <signal name="key_press_event" handler="on_MainDrawingArea_key_press_event" last_modification_time="Thu, 19 Feb 2004 10:05:00 GMT"/> </widget> <packing> Index: translation =================================================================== RCS file: /cvsroot/morphix/mcp/translation,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** translation 1 Sep 2003 19:25:17 -0000 1.1.1.1 --- translation 2 Mar 2004 17:09:10 -0000 1.2 *************** *** 5,7 **** */ ! gchar *s = N_("Morphix Configuration Panel"); --- 5,7 ---- */ ! gchar *s = N_("Morphix Control Panel"); |
|
From: <ale...@us...> - 2004-03-02 17:26:55
|
Update of /cvsroot/morphix/mcp/data/main-mcp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7261/data/main-mcp Log Message: Directory /cvsroot/morphix/mcp/data/main-mcp added to the repository |
|
From: <ale...@us...> - 2004-03-02 17:26:40
|
Update of /cvsroot/morphix/mcp/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7179/data Log Message: Directory /cvsroot/morphix/mcp/data added to the repository |
|
From: <ale...@us...> - 2004-03-02 17:26:19
|
Update of /cvsroot/morphix/mcp/pixmaps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7141/pixmaps Log Message: Directory /cvsroot/morphix/mcp/pixmaps added to the repository |
|
From: <ale...@us...> - 2004-03-02 14:13:56
|
Update of /cvsroot/morphix/morph-scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30496 Modified Files: install2mainmod Log Message: added safety check for $MODDIR, added deluser for morph user, extra output Index: install2mainmod =================================================================== RCS file: /cvsroot/morphix/morph-scripts/install2mainmod,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** install2mainmod 29 Feb 2004 23:32:01 -0000 1.1 --- install2mainmod 2 Mar 2004 13:54:16 -0000 1.2 *************** *** 35,38 **** --- 35,47 ---- MODDIR=`mktemp -d i2m.XXXXXX` + if [ -z "$MODDIR" ]; then + echo "MODDIR not set, aborting to avoid chaos..." + exit 1 + fi + + if [ "$MODDIR" -eq "" ]; then + echo "MODDIR is equal to empty string, aborting to avoid chaos..." + exit 1 + fi mkdir $MODDIR/MorphixCD *************** *** 47,50 **** --- 56,63 ---- mkdir $MODDIR/root mkdir $MODDIR/tmp + + # These are the bootscripts for the module + # Not much more than placeholders if there weren't any, + # if there were then just copy and use the old 'uns if [ -e /morphix ]; then cp -af /morphix $MODDIR/ *************** *** 60,66 **** --- 73,82 ---- echo "This mainmodule has been auto-generated by install2mainmod" >> $MODDIR/morphix/main_module fi + + # Copy the contents of the filesystem into the temporary directory cp -af /bin $MODDIR/ cp -af /etc $MODDIR/ cp -af /lib $MODDIR/ + # Remove the kernel modules: these come from the base module rm -rf $MODDIR/lib/modules/* cp -af /sbin $MODDIR/ *************** *** 69,72 **** --- 85,89 ---- # applying libGL patch + # this is messy, but necessary for libGL to work. It's placed back at boottime mkdir $MODDIR/usr/lib/backup mv $MODDIR/usr/lib/libGL.* $MODDIR/usr/lib/backup *************** *** 79,82 **** --- 96,103 ---- mv $MODDIR/usr/X11R6/lib/modules/extensions/libglx.a $MODDIR/usr/X11R6/lib/modules/extensions/backup/ + # If the morph user exists, we should remove it + # It's made at boottime from the contents of /etc/skel in the mainmod + chroot $MODDIR deluser --remove-all-files morph + echo "Done creating the uncompressed livecd in $MODDIR" echo "You now have the possibility to make manual changes" *************** *** 95,98 **** --- 116,120 ---- echo "Compressing complete" echo "Your module is available as $DESTMOD" + echo "Your uncompressed module is available as $MODDIR, you may safely remove it" echo "Have a nice day, and happy morphing!" echo \ No newline at end of file |
|
From: <ale...@us...> - 2004-03-01 00:48:04
|
Update of /cvsroot/morphix/scripts-base/grub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1476/grub Log Message: Directory /cvsroot/morphix/scripts-base/grub added to the repository |
|
From: <ale...@us...> - 2004-02-29 23:50:27
|
Update of /cvsroot/morphix/morph-scripts/mountmodule-1.0/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22276/mountmodule-1.0/debian Modified Files: rules Log Message: adding install2mainmod (converts a normal install to a mainmodule, pretty untested), small fixes to isomorph and minimod-gen Index: rules =================================================================== RCS file: /cvsroot/morphix/morph-scripts/mountmodule-1.0/debian/rules,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rules 20 Feb 2004 00:18:42 -0000 1.2 --- rules 29 Feb 2004 23:32:01 -0000 1.3 *************** *** 5,40 **** # Uncomment this to turn on verbose mode. ! #export DH_VERBOSE=1 ! ! ! ! ! CFLAGS = -Wall -g ! ! ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ! CFLAGS += -O0 ! else ! CFLAGS += -O2 ! endif ! ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) ! INSTALL_PROGRAM += -s ! endif configure: configure-stamp configure-stamp: dh_testdir - # Add here commands to configure the package. touch configure-stamp - build: build-stamp build-stamp: configure-stamp dh_testdir - - # Add here commands to compile the package. - #/usr/bin/docbook-to-man debian/mountmodule.sgml > mountmodule.1 - touch build-stamp --- 5,20 ---- # Uncomment this to turn on verbose mode. ! export DH_VERBOSE=1 configure: configure-stamp configure-stamp: dh_testdir touch configure-stamp build: build-stamp build-stamp: configure-stamp dh_testdir touch build-stamp *************** *** 44,49 **** rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. - dh_clean --- 24,27 ---- *************** *** 55,61 **** # Add here commands to install the package into debian/mountmodule. ! mv $(CURDIR)/debian/tmp $(CURDIR)/debian/mountmodule ! cp $(CURDIR)/mount_module $(CURDIR)/debian/mountmodule/usr/sbin/ ! # Build architecture-independent files here. --- 33,37 ---- # Add here commands to install the package into debian/mountmodule. ! install $(CURDIR)/src/mount_module $(CURDIR)/debian/mountmodule/usr/sbin # Build architecture-independent files here. |
|
From: <ale...@us...> - 2004-02-29 23:50:27
|
Update of /cvsroot/morphix/morph-scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22276 Modified Files: isomorph.pl minimod-gen.pl Added Files: install2mainmod Log Message: adding install2mainmod (converts a normal install to a mainmodule, pretty untested), small fixes to isomorph and minimod-gen --- NEW FILE: install2mainmod --- #!/bin/sh # Generate a Morphix mainmodule from the current installed linux # # Copyright Alex de Landgraaf, 2004 <alextreme at xs4all dot nl> # licensed under the GNU GPL v2, see www.gnu.org for details # With thanks to the makers of the ABS guide # Usage: install2mainmod [/tmp/destination.mod] if [ $# -ne 0 ]; then if [ -e "$1" ]; then echo "File already exists, please choose a different destination" exit 1 fi if [ "$1" -eq "-h" -o $1 -eq "--help" ]; then echo "Builds a mainmodule from your current install" echo "Note that you need enough freespace and RAM" echo " Usage: install2mainmod [/tmp/destination.mod]" exit 1 fi fi if [ -n "$1" ]; then DESTMOD=$1 else DESTMOD="/tmp/MorphixMain-generated.mod" fi echo "Ready to start mainmodule generating from current installed Linux" echo "Press enter to continue, Ctrl-C to abort" read echo echo "Copying files, please wait..." MODDIR=`mktemp -d i2m.XXXXXX` mkdir $MODDIR/MorphixCD mkdir $MODDIR/boot mkdir $MODDIR/cdrom mkdir $MODDIR/cdrom1 mkdir $MODDIR/dev mkdir $MODDIR/floppy mkdir $MODDIR/home mkdir $MODDIR/mnt mkdir $MODDIR/proc mkdir $MODDIR/root mkdir $MODDIR/tmp if [ -e /morphix ]; then cp -af /morphix $MODDIR/ else NOMORPHDIR=yes mkdir $MODDIR/morphix echo "#!/bin/sh" >> $MODDIR/morphix/loadmod.sh echo "echo \"Chrooting to MainModule\"" >> $MODDIR/morphix/loadmod.sh echo "chroot /mnt/main sh /morphix/init.sh" >> $MODDIR/morphix/loadmod.sh echo "#!/bin/sh" >> $MODDIR/morphix/init.sh echo "# Put stuff to load at boottime here" >> $MODDIR/morphix/init.sh echo "MyLivecd" >> $MODDIR/morphix/main_module echo "This mainmodule has been auto-generated by install2mainmod" >> $MODDIR/morphix/main_module fi cp -af /bin $MODDIR/ cp -af /etc $MODDIR/ cp -af /lib $MODDIR/ rm -rf $MODDIR/lib/modules/* cp -af /sbin $MODDIR/ cp -af /usr $MODDIR/ cp -af /var $MODDIR/ # applying libGL patch mkdir $MODDIR/usr/lib/backup mv $MODDIR/usr/lib/libGL.* $MODDIR/usr/lib/backup mkdir $MODDIR/usr/X11R6/lib/backup mv $MODDIR/usr/X11R6/lib/libGL.* $MODDIR/usr/X11R6/lib/backup/ mkdir $MODDIR/usr/X11R6/lib/modules/extensions/backup mv $MODDIR/usr/X11R6/lib/modules/extensions/libGLcore.a $MODDIR/usr/X11R6/lib/modules/extensions/backup/ mv $MODDIR/usr/X11R6/lib/modules/extensions/libglx.a $MODDIR/usr/X11R6/lib/modules/extensions/backup/ echo "Done creating the uncompressed livecd in $MODDIR" echo "You now have the possibility to make manual changes" if [ -n "$NOMORPHDIR" ]; then echo "As your system didn't have a /morphix directory, I made one for you" echo "However, you'll have to manually edit the $MODDIR/morphix/init.sh script" echo "in order for anything to load at boottime." echo "See www.morphix.org for examples" fi echo "Press enter to continue and compress the filesystem, press Ctrl-C to abort" read `mkisofs -R -U -V "Morphix" -P "Morphix" -hide-rr-moved -cache-inodes -no-bak -pad $MODDIR | nice -5 create_compressed_fs - 65536 > $DESTMOD` echo echo "Compressing complete" echo "Your module is available as $DESTMOD" echo "Have a nice day, and happy morphing!" echo Index: isomorph.pl =================================================================== RCS file: /cvsroot/morphix/morph-scripts/isomorph.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** isomorph.pl 12 Jun 2003 22:39:13 -0000 1.1.1.1 --- isomorph.pl 29 Feb 2004 23:32:01 -0000 1.2 *************** *** 131,135 **** } if ($mode eq "add-mini") { ! if ( -e $main) { system("cp $mini $newmountpoint/minimod/"); } else { isodie("Minimodule not found!"); } --- 131,135 ---- } if ($mode eq "add-mini") { ! if ( -e $mini) { system("cp $mini $newmountpoint/minimod/"); } else { isodie("Minimodule not found!"); } Index: minimod-gen.pl =================================================================== RCS file: /cvsroot/morphix/morph-scripts/minimod-gen.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** minimod-gen.pl 6 Dec 2003 15:49:55 -0000 1.4 --- minimod-gen.pl 29 Feb 2004 23:32:01 -0000 1.5 *************** *** 36,40 **** our @localfilelist; # option 5: homedir ! our $homedir; if ($> != 0) { --- 36,40 ---- our @localfilelist; # option 5: homedir ! our $homedir = ""; if ($> != 0) { *************** *** 304,308 **** print "All packages in this list will be downloaded from your apt\n"; print "mirror in /etc/apt/sources.list and unpacked into a minimod\n"; ! print "Make sure you have apt-get update && apt-get upgrade ed your system\n"; print "> "; chomp($src = <STDIN>); --- 304,308 ---- print "All packages in this list will be downloaded from your apt\n"; print "mirror in /etc/apt/sources.list and unpacked into a minimod\n"; ! print "Make sure you updated using dselect beforehand, please note only ftp repositories are used atm\n"; print "> "; chomp($src = <STDIN>); *************** *** 369,372 **** --- 369,375 ---- next; } + if ($line eq "") { + next; + } @stuff = $line =~ /^deb ftp:\/\/(\S+) (\S+)/g; print @stuff; *************** *** 635,640 **** print OUT "cp -r \"\$1\"/homedir/.[a-zA-Z]* /home/morph/\n"; print OUT "cp -r \"\$1\"/homedir/* /home/morph\n"; ! print OUT "cp -r \"\$1\"/homedir/.[a-zA-Z]* /etc/skel/\n"; ! print OUT "cp -r \"\$1\"/homedir/* /etc/skel\n"; print OUT "chown -R morph.users /home/morph\n"; } --- 638,642 ---- print OUT "cp -r \"\$1\"/homedir/.[a-zA-Z]* /home/morph/\n"; print OUT "cp -r \"\$1\"/homedir/* /home/morph\n"; ! print OUT "mount --bind \"\$1\"/homedir /etc/skel\n"; print OUT "chown -R morph.users /home/morph\n"; } |
|
From: <ale...@us...> - 2004-02-29 16:14:30
|
Update of /cvsroot/morphix/morphixinstaller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26734 Modified Files: configure.in Log Message: adding ml to configure Index: configure.in =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.in 10 Jan 2004 12:25:18 -0000 1.4 --- configure.in 29 Feb 2004 15:56:19 -0000 1.5 *************** *** 38,42 **** dnl Add the languages which your application supports here. dnl Please keep them in alphabetical order ! ALL_LINGUAS="es fr" AM_GLIB_GNU_GETTEXT --- 38,42 ---- dnl Add the languages which your application supports here. dnl Please keep them in alphabetical order ! ALL_LINGUAS="es fr ml" AM_GLIB_GNU_GETTEXT |
|
From: <ale...@us...> - 2004-02-29 16:00:01
|
Update of /cvsroot/morphix/morphixinstaller/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23860 Added Files: ui.c ui.h Log Message: moved gtk-specific, non-callback stuff to new files --- NEW FILE: ui.c --- /* Copyright (C) 2004 Alex de Landgraaf <ale...@xs...> 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 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif #include <gtk/gtk.h> #include "callbacks.h" #include "interface.h" #include "support.h" #include "installer.h" #include "instlib.h" #include "ui.h" #define _XOPEN_SOURCE #include <unistd.h> #include <stdio.h> #include <dirent.h> extern GtkWidget *StartScreen; extern GtkWidget *ErrorMessage; extern GtkWidget *SelectHarddisk; extern GtkWidget *SelectSwap; extern GtkWidget *NoPart; extern GtkWidget *SelectRoot; extern GtkWidget *SmallRoot; extern GtkWidget *NoRoot; extern GtkWidget *SelectFS; extern GtkWidget *DoFilesystem; extern GtkWidget *DoInstall; extern GtkWidget *EnterHost; extern GtkWidget *EnterRoot; extern GtkWidget *EnterUser; extern GtkWidget *SelectBoot; extern GtkWidget *EndScreen; extern GtkWidget *DoSwap; extern GtkWidget *ErrorLabel; extern GtkWidget *HelpDialog; extern GtkWidget *SelectPartExpert; extern gint global_cdrom_size; /* timeout function for the progress bars */ gboolean progress_timeout(gpointer data) { GtkWidget *pbar = data; if (data == NULL) return FALSE; gtk_progress_bar_pulse(GTK_PROGRESS_BAR(pbar)); while (g_main_iteration(FALSE)); if (timeout == 1) { return FALSE; } return TRUE; } /* timeout function for the installing-process */ gboolean progress_timeout_size(gpointer data) { GtkWidget *pbar = data; gchar str_per[5]; if (data == NULL) return FALSE; gint curr_rootpart_size = GetPartUsedSize(GetSelectedRoot()); gdouble fraction = GetCurrentPercentage(global_cdrom_size,curr_rootpart_size); updateInstallLabel(curr_rootpart_size,(gint)global_cdrom_size); gint percentage = (fraction * 100); sprintf(str_per,"%3d%%",percentage); gtk_progress_bar_set_text(GTK_PROGRESS_BAR(pbar),str_per); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pbar),fraction); while (g_main_iteration(FALSE)); if (timeout == 1) { return FALSE; } return TRUE; } void do_install_process() { GThread *thread; if (!g_thread_supported ()) g_thread_init (NULL); // make the swap partition if(swapon) { DoSwap = create_DoSwap (); gtk_widget_show (DoSwap); gtk_widget_hide(SelectRoot); timeout = 0; while (g_main_iteration(FALSE)); swap_done = FALSE; thread = g_thread_create((GThreadFunc)MakeSwap,NULL,TRUE,NULL); while(swap_done == FALSE) { while (g_main_iteration(FALSE)); } g_thread_join(thread); timeout = 1; // build the filesystem et all DoFilesystem = create_DoFilesystem (); gtk_widget_show (DoFilesystem); gtk_widget_hide(DoSwap); timeout = 0; while (g_main_iteration(FALSE)); root_done = FALSE; thread = g_thread_create((GThreadFunc)MakeRoot,NULL,TRUE,NULL); while(root_done == FALSE) { while (g_main_iteration(FALSE)); } g_thread_join(thread); timeout = 1; } else { DoFilesystem = create_DoFilesystem (); gtk_widget_show (DoFilesystem); gtk_widget_hide(SelectRoot); timeout = 0; while (g_main_iteration(FALSE)); root_done = FALSE; thread = g_thread_create((GThreadFunc)MakeRoot,NULL,TRUE,NULL); while(root_done == FALSE) { while (g_main_iteration(FALSE)); } g_thread_join(thread); timeout = 1; } // install (well, copy) all files DoInstall = create_DoInstall (); gtk_widget_show (DoInstall); gtk_widget_hide(DoFilesystem); timeout = 0; while (g_main_iteration(FALSE)); install_done = FALSE; thread = g_thread_create((GThreadFunc)BuildRoot,NULL,TRUE,NULL); while(install_done == FALSE) { while (g_main_iteration(FALSE)); } // done with install, join our threads and continue with // the configuration process or inform user about failing install // TODO: // if there are 0 free space now installing cannot continue g_thread_join(thread); timeout = 1; if (cmdlineargs.hostname_set == TRUE) { SetupEtcFiles(cmdlineargs.hostname); EnterRoot = create_EnterRoot (); gtk_widget_show (EnterRoot); gtk_widget_hide(EnterHost); } else { EnterHost = create_EnterHost (); gtk_widget_hide(DoInstall); gtk_widget_show (EnterHost); } } void ShowError(gchar *error) { error_msg = error; ErrorMessage = create_ErrorMessage (); gtk_widget_show (ErrorMessage); } void SetupPartitionerList() { GtkWidget *optionmenu = lookup_widget(SelectHarddisk,"optionmenupartitioners"); GtkWidget *menu = gtk_menu_new(); GtkWidget *item; GList *list = GetPartitionerListNames(TRUE); GList *ptr = list; gtk_option_menu_remove_menu(GTK_OPTION_MENU(optionmenu)); while(ptr != NULL) { item = gtk_menu_item_new_with_label(ptr->data); gtk_widget_show(item); gtk_menu_shell_append(GTK_MENU_SHELL(menu),item); ptr = ptr->next; } gtk_option_menu_set_menu(GTK_OPTION_MENU(optionmenu),menu); FreeStringList(list); } void updateInstallLabel(gint current, gint total) { GtkWidget *labelInstallprocess = lookup_widget(DoInstall,"labelInstallprocess"); if (current > total) { current = total - 1; } gchar *label_str = g_strdup_printf("%dMiB from a total of approx. %dMiB have been copied\n",current,total); gtk_label_set_text(GTK_LABEL(labelInstallprocess),label_str); g_free(label_str); } --- NEW FILE: ui.h --- /* Copyright (C) 2004 Alex de Landgraaf <ale...@xs...> 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 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef UI_H_INSTALLER #define UI_H_INSTALLER #include <gtk/gtk.h> /* TODO: - No Root Partition dialog - Error labels for not-enough-space, catch errors from user/password/grub */ extern GtkWidget *HelpDialog; gboolean progress_timeout(gpointer data); gboolean progress_timeout_size(gpointer data); void updateInstallLabel(gint current, gint total); void SetupPartitionerList(); void ShowError(gchar *error); void do_install_process(); #endif |
Update of /cvsroot/morphix/scripts-main/kde32/init.d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11052 Added Files: X11-shutdown X11-start X11-wait basemodule console drm groups hostname shutdown sudoers Log Message: * initial release --- NEW FILE: X11-shutdown --- # X-server shut down . /morphix/include.sh for i in $XSERVER; do killall -TERM $i 2> /dev/null && echo "X-Server shut down." && break done --- NEW FILE: X11-start --- # Prepare and start X11 . /morphix/include.sh if [ -z "$(getbootparam wm)" ]; then WINDOWMANAGER=/etc/gdm/Sessions/KDE else WINDOWMANAGER="$(getbootparam wm)" fi if [ -e /tmp/background.png ]; then BGIMAGE=/tmp/background.png else BGIMAGE=/morphix/background.png fi echo "xsetbg -fullscreen $BGIMAGE && idesk &" >> /etc/X11/xinit/xinitrc echo "xsetbg -fullscreen $BGIMAGE && idesk &" >> /home/$USER/.xinitrc echo "xsetbg -fullscreen $BGIMAGE && idesk &" >> /home/$USER/.xsession echo "exec $WINDOWMANAGER" >> /etc/X11/xinit/xinitrc echo "exec $WINDOWMANAGER" >> /home/$USER/.xinitrc echo "exec $WINDOWMANAGER" >> /home/$USER/.xsession echo "starting x11" su -c "exec /usr/bin/X11/startx" - $USER --- NEW FILE: X11-wait --- # wait until X is locked . /morphix/include.sh for i in 1 2 3 4 5 6 7 8 9 10 do if [ -f /tmp/.X0-lock ]; then break sleep 1 fi done --- NEW FILE: basemodule --- # load the config's generated by our basemodule . /morphix/include.sh XMODULE="" [ -f /etc/sysconfig/xserver ] && . /etc/sysconfig/xserver [ -f /etc/sysconfig/morphix-all ] && . /etc/sysconfig/morphix-all [ -f /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard [ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n export LANG COUNTRY CHARSET [ -f /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard # Set default keyboard before interactive setup [ -n "$KEYTABLE" ] && loadkeys -q $KEYTABLE [ -n "$CONSOLEFONT" ] && consolechars -f $CONSOLEFONT echo "MainModule loaded" --- NEW FILE: console --- # Setting up our handy-dandy console-shells, thanks to popular demand... # ripped from Knopper's knoppix-autoconfig . /morphix/include.sh while true; do /bin/bash >/dev/tty2 2>&1 </dev/tty2; done & while true; do /bin/bash >/dev/tty3 2>&1 </dev/tty3; done & while true; do /bin/bash >/dev/tty4 2>&1 </dev/tty4; done & while true; do /bin/bash >/dev/tty5 2>&1 </dev/tty5; done & while true; do /bin/bash >/dev/tty6 2>&1 </dev/tty6; done & --- NEW FILE: drm --- # Try to find and load a drm module for this graphics card # ripped from Knopper's xsession . /morphix/include.sh if [ -n "$XMODULE" ]; then for i in /lib/modules/*/kernel/drivers/char/drm/*; do case "$i" in *$XMODULE*) modprobe $XMODULE;; esac done fi --- NEW FILE: groups --- # We want to add user to some special groups ... just for fun of it # (and because it was requested for GNUstep livecd) . /morphix/include.sh GROUPS="cdrom audio video" for group in $GROUPS do adduser $USER $GROUP done --- NEW FILE: hostname --- # Morphix hijacks hostname so we set it again here :) . /morphix/include.sh if [ "$USER" != "morph" ]; then echo "Setting hostname to $USER" hostname $USER fi --- NEW FILE: shutdown --- # Everything is finished .. should reboot like Knoppix does . /morphix/include.sh echo "Rebooting... (disabled, just to be sure, for now)" echo "Use reboot or halt to shutdown your computer" #exec reboot --- NEW FILE: sudoers --- # Set sudo if it is installed and not already configured for current user . /morphix/include.sh if [ -e /etc/sudoers ]; then if grep -q $USER /etc/sudoers then echo -e "\n $USER ALL=NOPASSWD: ALL \n" >> /etc/sudoers fi fi |
Update of /cvsroot/morphix/scripts-main/kde32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10329 Added Files: background.png boot-menu.b debguin.png include.sh init.sh loadmod.sh main_module strip-apt Log Message: * initial release --- NEW FILE: background.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: boot-menu.b --- (This appears to be a binary file; contents omitted.) --- NEW FILE: debguin.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: include.sh --- #! /bin/bash # You shouldn't need to change anything below this line PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:." CMDLINE="$(cat /proc/cmdline)" stringinstring(){ case "$2" in *$1*) return 0;; esac return 1 } getbootparam(){ stringinstring " $1=" "$CMDLINE" || return 1 result="${CMDLINE##*$1=}" result="${result%%[ ]*}" echo "$result" return 0 } USER="$(getbootparam username)" --- NEW FILE: init.sh --- #! /bin/bash for file in /morphix/rc.m/* do echo "Running $file" $file start done --- NEW FILE: loadmod.sh --- #!/bin/sh # Minimodule loading has been moved to the base module, # so now all this script does is execute the init.sh script in the # chroot-fs that's all ready for use... echo "Chrooting to MainModule" chroot /mnt/main sh /morphix/init.sh # --- NEW FILE: main_module --- LightGUI A MainModule including X, icewm, and a host of Gtk/X applications, useful for everyday use. --- NEW FILE: strip-apt --- #!/bin/sh rm var/lib/apt/lists/* rm var/lib/dpkg/available* rm var/lib/dpkg/*-old rm var/cache/apt/available rm var/cache/apt/*.bin rm var/cache/apt/archives/partial/* rm var/cache/apt/archives/* rm var/cache/debconf/*-old touch var/lib/dpkg/available |
|
From: <gan...@us...> - 2004-02-28 22:18:47
|
Update of /cvsroot/morphix/scripts-main/kde32/sysconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10230/sysconfig Log Message: Directory /cvsroot/morphix/scripts-main/kde32/sysconfig added to the repository |
|
From: <gan...@us...> - 2004-02-28 22:18:47
|
Update of /cvsroot/morphix/scripts-main/kde32/init.d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10230/init.d Log Message: Directory /cvsroot/morphix/scripts-main/kde32/init.d added to the repository |
|
From: <gan...@us...> - 2004-02-28 22:18:47
|
Update of /cvsroot/morphix/scripts-main/kde32/rc.m In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10230/rc.m Log Message: Directory /cvsroot/morphix/scripts-main/kde32/rc.m added to the repository |
|
From: <gan...@us...> - 2004-02-28 22:18:45
|
Update of /cvsroot/morphix/scripts-main/kde32/gtkinstaller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10230/gtkinstaller Log Message: Directory /cvsroot/morphix/scripts-main/kde32/gtkinstaller added to the repository |
|
From: <gan...@us...> - 2004-02-28 22:16:18
|
Update of /cvsroot/morphix/scripts-main/kde32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9686/kde32 Log Message: Directory /cvsroot/morphix/scripts-main/kde32 added to the repository |
|
From: <ale...@us...> - 2004-02-28 01:47:09
|
Update of /cvsroot/morphix/morphixinstaller/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30265 Added Files: ml.po Log Message: adding sajith's malayalam(?) translation --- NEW FILE: ml.po --- # Morphix Maplayalam. # Copyright (C) FSF-India # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <gn...@gn...>, 2003. # msgid "" msgstr "Project-Id-Version: Morphix Installer\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2003-12-27 16:39+0100\n" "PO-Revision-Date: 2003-12-28 14:MI+ZONE\n" "Last-Translator: Sajith VK <saj...@fr...>\n" "Language-Team: MALAYALAM <ml...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: UTF-8\n" #: ../src/interface.c:46 ../src/interface.c:212 ../src/interface.c:350 #: ../src/interface.c:476 ../src/interface.c:602 ../src/interface.c:838 #: ../src/interface.c:932 ../src/interface.c:1049 ../src/interface.c:1316 #: ../src/interface.c:1431 ../src/interface.c:1581 ../src/interface.c:1747 #: ../src/interface.c:1934 msgid "Morphix Install" msgstr "à´®àµà´°àµà´«à´¿à´àµà´¸àµ à´¸à´à´¸àµà´¥à´¾à´ªà´¨à´" #: ../src/interface.c:69 msgid "Welcome to the Morphix Installation\n" "\n" "Please note that this installer is still under construction, Alex de " "Landgraaf and \n" "Morphix.org take no responsibility for any damage done!\n" "\n" "This installation will copy Morphix onto your harddisk and " "optionally set up a bootloader. If done incorrectly, you could lose " "data. If you have any doubt about an option, take a look in the help " "or on the website first!\n" "\n" "\n" "\n" msgstr "à´®àµà´°àµà´«à´¿à´àµà´¸àµ à´¸à´à´¸à´¥à´¾à´ªà´¨à´¤àµà´¤à´¿à´²àµà´àµà´àµ à´¸àµà´µà´¾à´à´¤à´\n" "\n" "à´¸àµà´àµà´·à´¿à´àµà´àµà´!, à´ à´ªàµà´°àµà´àµà´°à´¾à´ à´à´ªàµà´ªàµà´´àµà´ നിരàµà´®àµà´®à´¾à´£à´¾à´µà´¸àµà´¥à´¯à´¿à´²à´¾à´£âàµ. \n" "à´®àµà´°àµà´«à´¿à´àµâസൠസàµà´µà´¤à´¨àµà´¤àµà´°à´¸àµà´«àµà´±àµà´±àµâà´µàµà´¯à´°àµ à´ªàµà´°à´¸àµà´¥à´¾à´¨à´®àµ à´à´¤àµà´ªà´¯àµà´à´¿à´àµà´àµà´¨àµà´¨à´¤àµà´®àµà´²à´®àµà´³àµà´³ à´à´°àµ à´ªàµà´°à´¶àµà´¨à´àµà´à´³àµà´àµà´àµà´\n" "à´à´¤àµà´¤à´°à´µà´¾à´¦à´¿à´¯à´²àµà´².!" "\n" "\n" "\n" #: ../src/interface.c:133 ../src/interface.c:2061 msgid "Installation Error" msgstr "à´¸à´à´¸àµà´¥à´¾à´ªà´¨à´¤àµà´¤à´¿à´²àµ പിശà´àµ" #: ../src/interface.c:145 msgid "An error has occured. \n" "Below you can see the console output of the command that\n" "caused the error.\n" "\n" "Please go to www.morphix.org, and place a bugreport,\n" "the installer will now exit." msgstr "à´à´°àµ പിശà´àµ à´¸à´à´à´µà´¿à´àµà´àµ\n" "പിശà´àµ à´à´£àµà´à´¾à´àµà´à´¿à´¯ à´ªàµà´°àµà´àµà´°à´¾à´®à´¿à´¨àµà´±àµ വിശദവിവരà´àµà´à´³àµ താഴൠà´àµà´àµà´àµà´àµà´¨àµà´¨àµ \n" "\n" "ദയവായി à´®àµà´°àµà´«à´¿à´àµà´¸à´¿à´¨àµà´±àµ à´µàµà´¬àµâà´ªàµà´à´¿à´²àµ à´à´°àµ à´¬à´àµà´àµâവിവരണഠനലàµà´àµà´\n" "à´¸à´à´¸àµà´¥à´¾à´ªà´¨à´ à´à´µà´¿à´àµà´µà´àµà´àµ നിരàµà´¤àµà´¤àµà´¨àµà´¨àµ" #: ../src/interface.c:231 msgid "Harddisk selection\n" "\n" "Step:\n" "1 of 7" msgstr "ഹാരàµà´¡à´¿à´¸àµà´àµ തിരà´àµà´àµà´àµà´àµà´àµà´\n" "\n" "à´à´àµà´à´:\n" "1/7" #: ../src/interface.c:249 msgid "Please select your harddisk,\n" "this will launch a Linux partitioning tool.\n" "\n" "Make sure you have at least one Linux and one swap partition\n" msgstr "ദയവായി താà´àµà´à´³àµà´àµ ഹാരàµà´¡à´¿à´¸àµà´àµ തിരà´àµà´àµà´àµà´àµà´àµà´\n" "à´àµà´¨àµ/ലിനà´àµà´¸à´¿à´²àµ à´à´¾à´àµà´à´°à´£ à´à´ªà´¾à´§à´¿ à´¤àµà´±à´àµà´à´ªàµà´ªàµà´àµà´.\n" "\n" "à´à´°àµ ലിനà´àµà´¸àµ à´à´¾à´à´µàµà´ à´à´°àµ à´¸àµà´µà´¾à´ªàµà´ªàµ à´à´¾à´à´µàµà´ à´à´àµà´à´¿à´²àµà´ à´à´£àµà´àµ à´à´¨àµà´¨àµ à´à´±à´ªàµà´ªàµ വരàµà´¤àµà´¤àµà´\n" #: ../src/interface.c:263 msgid "A list of harddisks, choose the one you want to install Morphix on" msgstr "ഹാരàµà´¡à´¿à´¸àµà´àµ à´à´¾à´à´àµà´à´³àµà´àµ à´à´°àµ à´ªà´àµà´à´¿à´, നിà´àµà´à´³àµ à´®àµà´°àµà´«à´¿à´àµà´¸àµ à´¸à´à´¸àµà´¥à´¾à´ªà´¿à´àµà´à´¾à´¨àµ à´à´àµà´°à´¹à´¿à´àµà´àµà´¨àµà´¨ ഹാരàµà´¡à´¿à´¸àµà´àµ à´à´¾à´à´ തിരà´àµà´àµà´àµà´àµà´àµà´" #: ../src/interface.c:266 msgid "Please note that all changes done during\n" "partitioning are final!" msgstr "à´à´¾à´àµà´à´°à´£à´¤àµà´¤à´¿à´¨à´¿à´àµ വരàµà´¤àµà´¤àµà´¨àµà´¨ à´à´²àµà´²à´¾ മാറàµà´±à´àµà´à´³àµà´ à´ à´¨àµà´¤à´¿à´®à´®à´¾à´£âàµ\n" "à´¶àµà´°à´¦àµà´¦à´¿à´àµà´àµ à´àµà´à´¾à´°àµà´¯à´ à´àµà´¯àµà´¯àµà´" #: ../src/interface.c:369 msgid "Swap selection\n" "\n" "Step:\n" "2 of 7" msgstr "à´¸àµà´µà´¾à´ªàµà´ªàµ à´à´¾à´à´ തിരà´àµà´àµà´àµà´àµà´àµà´\n" "\n" "à´à´àµà´à´:\n" "2/7" #: ../src/interface.c:387 msgid "Please select a swap partition (recommended),\n" "or select to use none:\n" msgstr "à´¸àµà´µà´¾à´ªàµà´ªàµ à´à´¾à´à´ തിരà´àµà´àµà´àµà´àµà´àµà´.\n" "à´à´µà´¶àµà´¯à´®àµà´àµà´à´¿à´²àµ à´¸àµà´µà´¾à´ªàµà´ªàµ à´µàµà´£àµà´ à´à´¨àµà´¨àµà´ പറയാà´. à´¸àµà´µà´¾à´ªàµà´ªàµ à´à´²àµà´²àµà´àµà´à´¿à´²àµ à´à´®àµà´ªàµà´¯àµà´àµà´à´±à´¿à´¨àµà´±àµ à´ªàµà´°à´µâà´°àµà´¤àµà´¤à´¨à´àµà´·à´®à´¤ à´àµà´±à´¯àµà´\n" #: ../src/interface.c:401 msgid "A list of the detected swap partitions, use back if you want to make " "additional changes to your harddisk" msgstr "à´¸àµà´µà´¯à´ à´à´£àµà´àµà´¤àµà´¤à´¿à´¯ à´¸àµà´µà´¾à´ªàµà´ªàµ à´à´¾à´à´àµà´à´³àµà´àµ à´à´°àµ à´ªà´àµà´à´¿à´ തനàµà´¨à´¿à´°à´¿à´àµà´àµà´¨àµà´¨àµ. ഹാരàµà´¡à´¿à´¸àµà´à´¿à´²àµ à´àµà´àµà´¤à´²àµ മാറàµà´±à´àµà´à´³àµ " "à´à´µà´¶àµà´¯à´®à´¾à´£âൠà´à´àµà´à´¿à´²àµ à´ªàµà´±à´à´¿à´²àµ à´®àµà´àµà´àµ à´à´ªà´¯àµà´à´¿à´àµà´àµà´" #: ../src/interface.c:500 msgid "5%" msgstr "5%" #: ../src/interface.c:514 ../src/interface.c:969 msgid "Couldn't find a Linux partition\n" "on the selected harddisk.\n" "\n" "Please go back and select a different harddisk\n" "or add a Linux partition to the harddisk.\n" msgstr "നിà´àµà´à´³àµ തിരà´àµà´àµà´àµà´¤àµà´¤ ഹാരàµà´¡à´¿à´¸àµà´à´¿à´²àµ \n" "à´à´±àµà´± ലിനà´àµà´¸àµ à´à´¾à´à´µàµà´ à´à´²àµà´²\n" "\n" "à´ªàµà´±à´à´¿à´²àµ à´ªàµà´¯à´¿ മറàµà´±àµà´°àµ ഹാരàµà´¡à´¿à´¸àµà´àµ തിരà´àµà´àµà´àµà´àµà´àµà´à´¯àµ \n" "ഠഹാരàµà´¡à´¿à´¸àµà´à´¿à´²àµà´àµà´àµ ലിനà´àµà´¸àµ à´à´¾à´à´àµà´à´³àµ à´àµà´°àµà´àµà´àµà´à´¯àµ à´àµà´¯àµà´¯àµà´\n" #: ../src/interface.c:621 msgid "Rootpartition selection\n" "\n" "Step:\n" "3 of 7" msgstr "à´®àµà´àµà´¯ à´à´¾à´à´ തിരà´àµà´àµà´àµà´àµà´àµà´\n" "\n" "à´¸àµâà´àµà´ªàµà´ªàµ:\n" "3/7" #: ../src/interface.c:639 msgid "Please select your root Linux partition:\n" "\n" "All data on the selected partition will be lost!\n" msgstr "ദയവായി താà´àµà´à´³àµà´àµ à´®àµà´àµà´¯ à´à´¾à´à´ തിരà´àµà´àµà´àµà´àµà´àµà´:\n" "\n" "തിരà´àµà´àµà´àµà´àµà´àµà´¨àµà´¨ à´à´¾à´à´¤àµà´¤à´¿à´²àµ à´®àµà´´àµà´µà´¨àµ വിവരà´àµà´à´³àµà´ നഷàµà´à´ªàµà´ªàµà´àµà´ !\n" #: ../src/interface.c:654 msgid "A list of available partitions to install Morphix on. Choose back if " "you want to go back and repartition your harddisk" msgstr "à´®àµà´°àµà´«à´¿à´àµà´¸àµ à´à´¨àµà´¸àµà´±àµà´±à´¾à´³àµ à´àµà´¯àµà´¯à´¾à´¨àµ പറàµà´±àµà´¨àµà´¨ à´à´¾à´à´àµà´à´³àµà´àµ à´ªà´àµà´à´¿à´ തനàµà´¨à´¿à´°à´¿à´àµà´àµà´¨àµà´¨àµ." "ഹാരàµà´¡à´¿à´¸àµà´àµ à´ªàµà´¨à´°àµâവിà´à´à´¿à´àµà´à´£à´®àµà´àµà´à´¿à´²àµ à´ªàµà´±à´à´¿à´²àµ à´ªàµà´àµà´" #: ../src/interface.c:656 ../src/interface.c:1086 msgid "Please select the filesystem type,\n" "the recommended setting has been selected:\n" msgstr "ഫയലàµà´¸à´¿à´¸àµà´±àµà´±à´ തരഠതിരâà´àµà´àµà´àµà´àµà´àµà´\n" "നിരàµâà´¦àµà´¦àµà´¶à´¿à´àµà´à´ªàµà´ªà´à´¾à´µàµà´¨àµà´¨ à´¸à´àµà´àµà´à´°à´àµà´à´³à´¾à´£âൠà´à´ªàµà´ªàµà´³àµ തിരà´àµà´àµà´àµà´¤àµà´¤à´¿à´°à´¿à´àµà´àµà´¨àµà´¨à´¤àµ:\n" #: ../src/interface.c:666 ../src/interface.c:1095 msgid "A list of available filesystems, if you are unsure choose the " "default \"ext3\"" msgstr "à´²à´àµà´¯à´®à´¾à´¯ ഫയലàµà´¸à´¿à´¸àµà´±àµà´±à´àµà´à´³àµà´àµ à´à´°àµ à´ªà´àµà´à´¿à´ തനàµà´¨à´¿à´°à´¿à´àµà´àµà´¨àµà´¨àµ. à´à´¤àµ തിരà´àµà´àµà´àµà´àµà´à´£à´®àµà´¨àµà´¨àµ ഠറിയിലàµà´² à´à´àµà´à´¿à´²àµ" "\"ext3\" തനàµà´¨àµ തിരà´àµà´àµà´àµà´àµà´àµà´" #: ../src/interface.c:670 ../src/interface.c:1099 msgid "Ext 2 - Standard Linux Filesystem" msgstr "Ext 2 - ലിനà´àµà´¸à´¿à´²àµ പഴയ ഫയലàµà´¸à´¿à´¸àµà´±àµà´±à´" #: ../src/interface.c:678 ../src/interface.c:1107 msgid "Ext 3 - Journaling File System" msgstr "Ext 3 - ലിനà´àµà´¸à´¿à´²àµ à´ªàµà´¤à´¿à´¯ ഫയലàµà´¸à´¿à´¸àµà´±àµà´±à´" #: ../src/interface.c:686 ../src/interface.c:1115 msgid "ReiserFS - Journaling File System" msgstr "ReiserFS - à´±àµà´¯à´¿à´¸âരൠഫയലàµà´¸à´¿à´¸àµà´±àµà´±à´" #: ../src/interface.c:694 ../src/interface.c:1123 msgid "XFS - Journaling File System" msgstr "XFS - à´à´àµà´¸àµ à´à´«àµ à´à´¸àµ ഫയലàµà´¸à´¿à´¸àµà´±àµà´±à´" #: ../src/interface.c:720 ../src/interface.c:2233 msgid "Expert: Add additional partitions" msgstr "വിദà´àµà´§âà´°àµ: à´àµà´àµà´¤à´²àµ à´à´¾à´à´àµà´à´³àµ à´àµà´°àµà´àµà´àµà´" #: ../src/interface.c:725 ../src/interface.c:1133 msgid "Next all changes will be made to your system.\n" "Please make sure that you have entered all\n" "information correctly, if you have any doubt\n" "please go back and correct your settings!" msgstr "à´ à´àµà´¤àµà´¤à´ªà´à´¿à´¯à´¾à´¯à´¿ à´à´²àµà´²à´¾ മാറàµà´±à´àµà´à´³àµà´ നിà´àµà´à´³àµà´àµ à´µàµà´¯àµà´¹à´¤àµà´¤à´¿à´²àµ വരàµà´¤àµà´¤àµà´.\n" "ദയവായി നിà´àµà´à´³àµ നലàµà´à´¿à´¯ വിവരà´àµà´à´³àµà´²àµà´²à´¾à´ ശരിയാണàµà´¨àµà´¨àµ à´à´±à´ªàµà´ªàµà´µà´°àµà´¤àµà´¤àµà´\n" "à´à´¨àµà´¤àµà´àµà´à´¿à´²àµà´ à´¸à´à´¶à´¯à´®àµà´£àµà´àµà´àµà´à´¿à´²àµ à´ªàµà´±à´à´¿à´²àµ à´ªàµà´¯à´¿ à´ à´µ ശരിà´àµà´à´¾à´µàµà´¨àµà´¨à´¤à´¾à´£âàµ\n" "à´à´²àµà´²à´¾à´ ശരിയാണàµà´àµà´à´¿à´²àµ à´®àµà´¨àµà´¨àµà´àµà´àµà´ªàµà´à´¾à´!" #: ../src/interface.c:869 msgid "The selected rootpartition is smaller\n" "than we recommend, make sure the \n" "partition is bigger than X MB" msgstr "നിà´àµà´à´³àµ തിരà´àµà´àµà´àµà´¤àµà´¤à´¿à´°à´¿à´àµà´àµà´¨àµà´¨ à´®àµà´àµà´¯à´à´¾à´à´ à´à´µà´¶àµà´¯à´®à´¾à´¯à´¤à´¿à´²àµà´ \n" "à´àµà´±àµà´¤à´¾à´£âൠദയവായി നിà´àµà´à´³àµ തിരà´àµà´àµà´àµà´¤àµà´¤ à´à´¾à´à´ XMB യിലàµà´\n" "വലàµà´¤à´¾à´£àµà´¨àµà´¨àµ à´à´±à´ªàµà´ªàµà´µà´°àµà´¤àµà´¤àµà´" #: ../src/interface.c:955 msgid "10%" msgstr "10%" #: ../src/interface.c:1068 msgid "Filesystem selection\n" "\n" "Step:\n" "4 of 8" msgstr "ഫയലàµà´¸à´¿à´¸àµà´±àµà´±à´ തിരà´àµà´àµà´àµà´àµà´à´²àµ\n" "\n" "à´à´àµà´à´:\n" "4/8" #: ../src/interface.c:1222 ../src/interface.c:1262 ../src/interface.c:2018 msgid "Processing..." msgstr "à´ªàµà´°à´µâà´°àµà´¤àµà´¤à´¿à´àµà´àµà´àµà´£àµà´à´¿à´°à´¿à´àµà´àµà´¨àµà´¨àµ" #: ../src/interface.c:1232 msgid "Creating filesystem, please wait..." msgstr "ഫയലàµà´¸à´¿à´¸àµà´±àµà´±à´ നിരàµà´®àµà´®à´¿à´àµà´àµà´àµà´£àµà´à´¿à´°à´¿à´àµà´àµà´¨àµà´¨àµ,à´à´¾à´¤àµà´¤à´¿à´°à´¿à´àµà´àµà´...." #: ../src/interface.c:1272 msgid "Copying files to harddisk...\n" "\n" "This may take anywhere from 5 to 20 minutes, depending on your " "hardware" msgstr "à´°à´à´¨à´à´³àµ ഹാരàµà´¡à´¿à´¸àµà´à´¿à´²àµà´àµà´àµ à´ªà´âà´°àµà´¤àµà´¤à´¿à´àµà´£àµà´à´¿à´°à´¿à´àµà´àµà´¨àµà´¨àµ.\n" "\n" "നിà´àµà´à´³àµà´àµ ഹാരàµà´¡àµâà´µàµà´¯à´±à´¿à´¨à´¨àµà´¸à´°à´¿à´àµà´àµ à´à´¤àµ 5 à´®àµà´¤à´²àµ 20 മിനàµà´àµà´àµ വരൠà´à´àµà´àµà´à´¾à´" #: ../src/interface.c:1335 msgid "Configure\n" "Hostname\n" "\n" "Step:\n" "4 of 7" msgstr "à´µàµà´¯àµà´¹à´¨à´¾à´®à´\n" "à´¸à´àµà´àµà´à´°à´¿à´àµà´àµà´\n" "\n" ":\n" "4/7" #: ../src/interface.c:1353 msgid "Morphix has succesfully been installed to harddisk\n" "\n" "Please enter a hostname for your computer:\n" msgstr "à´®àµà´°àµà´«à´¿à´àµà´¸àµ വിà´à´¯à´à´à´°à´®à´¾à´¯à´¿ നിà´àµà´à´³àµà´àµ ഹാരàµà´¡à´¿à´¸àµà´à´¿à´²àµ à´¸à´à´¸àµà´¥à´¾à´ªà´¿à´àµà´à´ªàµà´ªàµà´àµà´àµ\n" "\n" "താà´àµà´à´³àµà´àµ à´µàµà´¯àµà´¹à´¤àµà´¤à´¿à´¨àµà´±àµ à´ªàµâà´°âൠà´àµà´°àµà´àµà´àµà´:\n" "\n" #: ../src/interface.c:1362 msgid "A hostname is used to identify your computer. You may choose " "anything as a name" msgstr "à´µàµà´¯àµà´¹à´¨à´¾à´®à´ താà´àµà´à´³àµà´àµ à´à´®àµà´ªàµà´¯àµà´àµà´à´±à´¿à´¨àµ തിരിà´àµà´à´±à´¿à´¯à´¾à´¨à´¾à´£âൠà´à´ªà´¯àµà´à´¿à´àµà´àµà´¨àµà´¨à´¤àµ" "à´µàµà´¯àµà´¹à´¨à´¾à´®à´®à´¾à´¯à´¿ താà´àµà´à´³àµà´àµà´àµ à´à´¨àµà´¤àµ à´ªàµà´°àµà´ നലàµà´à´¾à´µàµà´¨àµà´¨à´¤à´¾à´£âàµ" #: ../src/interface.c:1363 msgid "myBox" msgstr "mybox" #: ../src/interface.c:1450 msgid "Configure\n" "Rootaccount\n" "\n" "Step:\n" "5 of 7" msgstr "à´®àµà´àµà´¯ à´ à´àµà´£àµà´àµ\n" "à´¸à´àµà´àµà´à´°à´¿à´àµà´àµà´\n" "\n" ":\n" "5/7" #: ../src/interface.c:1468 msgid "Please enter and re-enter a\n" " password for the root account\n" "\n" "This password must be at least \n" "5 characters in length!\n" "\n" "Note: this is the equivalent of the\n" " system administrator, don't forget it!" msgstr "ദയവായി താà´àµà´à´³àµà´àµ à´®àµà´àµà´¯ à´ à´àµà´£àµà´à´¿à´¨àµà´±àµ à´ à´à´¯à´¾à´³à´µà´¾à´àµà´¯à´\n" "à´°à´£àµà´àµ à´ªàµà´°à´¾à´µà´¶àµà´¯à´ നലàµà´àµà´\n" "\n" "à´ à´à´¯à´¾à´³à´µà´¾à´àµà´¯à´¤àµà´¤à´¿à´²àµ 5 à´ à´àµà´·à´°à´àµà´à´³àµà´àµà´à´¿à´²àµà´ à´µàµà´£à´\n" "à´à´¨àµà´¨à´¤àµ à´¶àµà´°à´¦àµà´§à´¿à´àµà´àµà´\n" "\n" "à´ à´ à´à´¯à´¾à´³à´µà´¾à´àµà´¯à´ à´µàµà´¯àµà´¹à´ªà´¾à´²à´à´¨àµà´±àµà´¤à´¾à´£âàµ\n" "à´à´¨àµà´¨à´¤à´¿à´¨à´¾à´²àµ à´à´¤àµ à´à´°àµà´à´¾à´°à´£à´µà´¶à´¾à´²àµà´ മറà´àµà´à´°àµà´¤àµ!" #: ../src/interface.c:1474 msgid "Root Password:" msgstr "à´®àµà´àµà´¯ à´ à´àµà´£àµà´à´¿à´¨àµà´±àµ à´ à´à´¯à´¾à´³à´µà´¾à´àµà´¯à´:" #: ../src/interface.c:1484 msgid "Root Password (yes, again):" msgstr "à´®àµà´àµà´¯ à´ à´àµà´£àµà´à´¿à´¨àµà´±àµ à´ à´à´¯à´¾à´³à´µà´¾à´àµà´¯à´(à´à´°à´¿à´àµà´à´²àµà´àµà´àµà´à´¿):" #: ../src/interface.c:1600 msgid "Configure\n" "Useraccount\n" "\n" "Step:\n" "6 of 7" msgstr "à´à´ªà´¯àµà´àµà´¤àµ à´ à´àµà´£àµà´àµ\n" "à´¸à´àµà´àµà´à´°à´¿à´àµà´àµà´\n" "\n" ":\n" "6/7" #: ../src/interface.c:1618 msgid "Please enter a name for your default user.\n" "\n" "Again, enter and re-enter the users password" msgstr "à´¸àµà´µà´¤àµà´¯àµà´³àµà´³ à´à´ªà´¯àµà´àµà´¤à´¾à´µà´¿à´¨àµà´±àµ നാമഠà´àµà´°àµà´àµà´àµà´\n" "à´°à´£àµà´àµ à´ªàµà´°à´¾à´µà´¶àµà´¯à´ à´ à´à´¯à´¾à´³ വാà´àµà´¯à´µàµà´ à´àµà´°àµà´àµà´àµà´°" #: ../src/interface.c:1625 msgid "Username:" msgstr "à´à´ªà´¯àµà´àµà´¤àµà´¨à´¾à´®à´" #: ../src/interface.c:1633 msgid "This name will be used for the first user, keep it short and simple" msgstr "à´ à´ªàµâà´°âൠà´à´¦àµà´¯ à´à´ªà´¯àµà´àµà´¤à´¾à´µà´¿à´¨âൠà´à´ªà´¯àµà´à´¿à´àµà´àµà´. à´à´´à´¿à´¯àµà´¨àµà´¨à´¤àµà´° à´àµà´±àµà´¤à´¾à´¯à´¿à´°à´¿à´àµà´à´¾à´¨àµ à´¶àµà´°à´¦àµà´§à´¿à´àµà´àµà´" #: ../src/interface.c:1634 msgid "morph" msgstr "morph" #: ../src/interface.c:1636 msgid "Password (twice)" msgstr "à´ à´à´¯à´¾à´³ വാà´àµà´¯à´ (à´°à´£àµà´àµ à´ªàµà´°à´¾à´µà´¶àµà´¯à´)" #: ../src/interface.c:1766 msgid "Configure\n" "Bootloader\n" "\n" "Step:\n" "7 of 7" msgstr "à´¬àµà´àµà´àµ à´²àµà´¡âരൠ\n" "à´¸à´àµà´àµà´à´°à´£à´\n" "\n" "7/7" #: ../src/interface.c:1784 msgid "Do you want to set up the bootloader LILO?\n" "\n" "De-selecting this will not make Morphix bootable, but please note " "that installing LILO\n" "might make other operating systems unaccessable.\n" "\n" "Also select if you want to make a boot floppy." msgstr "താà´àµà´à´³àµà´àµà´àµ ലിലൠബàµà´àµà´àµ à´²àµà´¡âരൠസà´àµà´àµà´à´°à´¿à´àµà´à´£àµ?\n" "\n" "à´à´¤àµ തിരà´àµà´àµà´àµà´àµà´à´¾à´¤à´¿à´°àµà´¨àµà´¨à´¾à´²àµ à´®àµà´°àµà´«à´¿à´àµà´¸àµ à´¬àµà´àµà´àµ à´àµà´¯àµà´¯à´¾à´¨àµ à´à´´à´¿à´¯à´¾à´¤à´¾à´µàµà´" "തിരà´àµà´àµà´àµà´àµà´àµà´®àµà´ªàµà´³àµ മറàµà´±àµ à´à´ªàµà´ªà´±àµà´±àµà´±à´¿à´à´àµ സിസàµà´±àµà´±à´àµà´à´³àµ à´²à´àµà´¯à´®à´²àµà´²à´¾à´¤à´¾à´µà´¾à´\n" "\n" "താà´àµà´à´³àµà´àµà´àµ à´¬àµà´àµà´àµ à´«àµâà´³àµà´ªàµà´ªà´¿ à´µàµà´£àµ à´à´¨àµà´¨àµà´ തിരà´àµà´àµà´àµà´àµà´àµà´" #: ../src/interface.c:1794 msgid "Set up LILO on MBR (removes other bootloaders!)" msgstr "ലിലàµà´¯àµ MBR ലൠസà´àµà´àµà´à´°à´¿à´àµà´àµà´ (മറàµà´±àµà´²àµà´²à´¾ à´¬àµà´àµà´àµ à´²àµà´¡à´±àµà´à´³àµà´ à´¨àµà´àµà´à´ à´àµà´¯àµà´¯à´ªàµà´ªàµà´àµà´!)" #: ../src/interface.c:1797 msgid "If you have other operating systems, this might make them " "unavailable. Take care when using this option" msgstr "നിà´àµà´à´³àµà´àµà´àµ മറàµà´±àµ à´à´ªàµà´ªà´±àµà´±àµà´±à´¿à´à´àµ സിസàµà´±àµà´±à´àµà´à´³àµ à´à´£àµà´àµà´àµà´à´¿à´²àµ à´à´¤àµ ഠവയൠലà´àµà´¯à´®à´²àµà´²à´¾à´¤à´¾à´àµà´àµà´" "à´ à´¸àµà´âà´°àµà´¯à´ à´à´ªà´¯àµà´à´¿à´àµà´àµà´®àµà´ªàµà´³àµ à´¸àµà´àµà´·à´¿à´àµà´àµà´" #: ../src/interface.c:1810 msgid "You have multiple harddisks, please choose the requested harddisk " "that the MBR will be changed of. The default is the first harddisk" msgstr "നിà´àµà´à´³àµà´àµà´àµ à´à´¨àµà´¨à´¿à´²àµ à´àµà´àµà´¤à´²àµ ഹാരàµà´¡à´¿à´¸àµà´àµà´à´³àµ à´à´£àµà´àµ. à´à´¤àµ ഹാരàµà´¡à´¿à´¸àµà´à´¿à´¨àµà´±àµ MBR à´à´£âൠമാറàµà´±àµà´£àµà´à´¤àµà´¨àµà´¨àµ" "തിരà´àµà´àµà´àµà´àµà´àµà´. à´¸àµà´µà´¤àµ à´à´¦àµà´¯à´¤àµà´¤àµ ഹാരàµà´¡à´¿à´¸àµà´à´¾à´¯à´¿à´°à´¿à´àµà´àµà´ തിരà´àµà´àµà´àµà´àµà´àµà´" #: ../src/interface.c:1817 msgid "Set up LILO on root partition of the harddisk" msgstr "ലിലàµà´¯àµ ഹാരàµà´¡à´¿à´¸àµà´à´¿à´¨àµà´±àµ à´®àµà´àµà´¯ à´à´¾à´à´¤àµà´¤àµ à´¸à´àµà´àµà´à´°à´¿à´àµà´àµà´" #: ../src/interface.c:1820 msgid "Useful when there are multiple operating systems on your PC, but you " "might have to consult their documentation to make Morphix bootable" msgstr "നിà´àµà´à´³à´àµ à´µàµà´¯àµà´¹à´¤àµà´¤à´¿à´²àµ à´à´¨àµà´¨à´¿à´²à´§à´¿à´à´ à´à´ªàµà´ªà´±àµà´±àµà´±à´¿à´à´àµ സിസàµà´±àµà´±à´àµà´à´³àµ à´à´£àµà´àµà´àµà´à´¿à´²àµ " "à´®àµà´°àµà´«à´¿à´àµà´¸àµ à´¬àµà´àµà´àµ à´àµà´¯àµà´¯à´¿à´àµà´à´¾à´¨àµ ഠവയàµà´àµ സഹായതാളàµà´à´³àµ സനàµà´¦âà´°àµà´¶à´¿à´àµà´àµà´" #: ../src/interface.c:1824 msgid "Set up LILO on boot partition of the harddisk" msgstr "ലിലàµà´¯àµ à´¬àµà´àµà´àµ à´à´¾à´à´¤àµà´¤àµ à´¸à´àµà´àµà´à´°à´¿à´àµà´àµà´" #: ../src/interface.c:1829 msgid "Don't install LILO" msgstr "ലിലൠà´à´¨àµà´¸àµà´±àµà´±à´¾à´³àµ à´àµà´¯àµà´¯àµà´£àµà´" #: ../src/interface.c:1832 msgid "This will not make Morphix bootable. Use this when you already have " "LILO or GRUB installed, and know how to modify it" msgstr "à´à´¤àµ à´®àµà´°àµà´«à´¿à´àµà´¸à´¿à´¨àµ à´¬àµà´àµà´àµ à´àµà´¯àµà´¯à´¾à´¨àµ à´à´´à´¿à´¯à´¾à´¤àµà´¤ ഠവസàµà´¥à´¯à´¿à´²à´¾à´àµà´àµà´" "ലിലൠഠഥവാ à´àµà´°à´¬àµ à´¸à´à´¸àµà´¥à´¾à´ªà´¿à´àµà´à´¿à´àµà´àµà´£àµà´àµ à´à´¨àµà´¨àµ à´à´±à´ªàµà´ªàµà´£àµà´àµà´àµà´à´¿à´²àµ മാതàµà´°à´ à´à´¤àµà´ªà´¯àµà´à´¿à´àµà´àµà´" #: ../src/interface.c:1840 msgid "Animate the LILO bootscreen" msgstr "LILO à´¬àµà´àµà´àµ à´¸àµà´àµà´°àµà´¨àµ à´à´²à´¿à´ªàµà´ªà´¿à´àµà´àµà´" #: ../src/interface.c:1842 msgid "Makes your LILO fun to watch, great for showing off your new system " "to the kids and women who wouldn't care less" msgstr "നിà´àµà´à´³àµà´àµ ലിലàµà´µà´¿à´¨àµ à´°à´¸à´à´°à´®à´¾à´àµà´àµà´. നിà´àµà´à´³àµà´àµ à´ªàµà´¤à´¿à´¯ à´µàµà´¯àµà´¹à´ à´¸àµà´¤àµà´°àµà´à´³àµà´àµà´àµà´ à´àµà´àµà´à´¿à´à´³àµà´àµà´àµà´ " "à´ªàµà´²àµà´ à´à´·àµà´à´ªàµà´ªàµà´àµà´¨àµà´¨ വിധതàµà´¤à´¿à´¨à´¾à´àµà´àµà´" #: ../src/interface.c:1849 msgid "Make a boot floppy (Not yet implemented)" msgstr "à´¬àµà´àµà´àµ à´«àµâà´³àµà´ªàµà´ªà´¿ നിരàµà´®àµà´®à´¿à´àµà´àµà´ (à´à´ªàµà´ªàµà´´àµà´ à´²à´àµà´¯à´®à´²àµà´²)" #: ../src/interface.c:1853 msgid "You can download a bootfloppy for the Morphix CD on the website, a " "rescuedisk will be ready in a later release" msgstr "à´µàµà´¬àµ à´ªàµà´à´¿à´²àµ നിനàµà´¨àµà´ നിà´àµà´à´³àµà´àµà´àµ à´®àµà´°àµà´«à´¿à´àµà´¸àµ സിഡിയàµà´àµà´àµ à´µàµà´£àµà´à´¿à´¯àµà´³àµà´³ à´¬àµà´àµà´àµ à´«àµâà´³àµà´ªàµà´ªà´¿ à´à´±à´àµà´àµà´®à´¤à´¿ à´àµà´¯àµà´¯à´¾à´" #: ../src/interface.c:1965 msgid "Congratulations, \n" "you have succesfully installed Morphix to your harddisk!\n" "\n" "\n" "Have fun, and if you have any comments don't be a stranger, contact " "us via www.morphix.org!" msgstr "à´ à´à´¿à´¨à´¨àµà´¦à´¨àµà´àµà´à´³àµ! \n" "താà´àµà´à´³àµ വിà´à´¯à´à´°à´®à´¾à´¯à´¿ à´®àµà´°àµà´«à´¿à´àµà´¸àµ à´¸à´à´¸àµà´¥à´¾à´ªà´¿à´àµà´à´¿à´°à´¿à´àµà´àµà´¨àµà´¨àµ!\n" "\n" "\n" "നിà´àµà´à´³àµà´àµà´àµ à´à´¨àµà´¤àµà´àµà´à´¿à´²àµà´ നിരàµâà´¦àµà´¦àµà´¶à´àµà´à´³àµà´£àµà´àµà´àµà´à´¿à´²àµ ഠപരിà´à´¿à´¤à´°àµ à´ªàµà´²àµ മാറി നിലàµâà´àµà´£àµà´." "www.morphix.org à´²àµà´àµ à´à´àµà´à´³àµ ബനàµà´§à´ªàµà´ªàµà´à´¾à´!" #: ../src/interface.c:2028 msgid "Creating Swap partition..." msgstr "à´¸àµà´µà´¾à´ªàµà´ªàµ à´à´¾à´à´ നിരàµà´®àµà´®à´¿à´àµà´àµà´¨àµà´¨àµ........" #: ../src/interface.c:2073 msgid "An error has occured. \n" msgstr "à´à´°àµ പിശà´àµ à´¸à´à´à´µà´¿à´àµà´àµ\n" #: ../src/interface.c:2125 msgid "Installer Help" msgstr "à´¸à´à´¸àµà´¥à´¾à´ªà´¨ സഹായà´" #: ../src/interface.c:2156 msgid "Welcome to the Morphix Installer Help!\n" "Each step has a short summery here, that might help you out on " "making a choice. If you really aren't sure, drop by on our website " "and ask away! If people can't find their way around here we'd like " "to hear it, as this installer was made for even the most newest " "users to be able to install a working Morphix/Debian system...\n" "\n" "Step 1: Harddisk selection\n" "\n" "Here you must select the harddisk on which you want Morphix to be " "installed. Try to identify your harddisk on the size if you have " "multiple disks. If you only have one, well, then you won't have a " "lot to choose...\n" "\n" "When you click 'Forward', a partition tool will be started. This is " "a daunting task for new users now, we're working on a easy " "replacement. Try to make a Linux and a Linux swap partition. Note " "that the former must be about twice the size of the module used. The " "latter should be about 256MB.\n" "\n" "Step 2: Swap selection\n" "\n" "If you have created a swap partition in Step 1, you can select it " "here. You can also do without swap, and things will probably work " "normal, but we advise making a swap partition anyway. \n" "\n" "Step 3: Root partition selection\n" "\n" "Select the partition where you want to install Morphix on. After " "Step 1 you should have made a Linux partition, if you did you can " "select it here. If you didn't, go back to Step 1 and try again. You " "really need one!\n" "\n" "Step 4: Filesystem selection\n" "\n" "Select the appropriate filesystem. If you don't care about this, " "take the default, \"ext3\".\n" "\n" "- ext2: the 'save and sure' filesystem, tried and tested for years " "in the Linux community. However, you need to neatly unmount this " "filesystem, and it needs periodic checking. \n" "\n" "- ext3: ext2 but with journaling. This keeps track of every change " "that takes place, so if you accidently pull the plug (or Matty " "does), you just plug it back in and it will quickly sort out any " "errors on your disk\n" "\n" "- reiserfs: better in some ways, worse in others. Does have less " "tools and isn't compatible with ext2 or ext3. It's your " "filesystem...\n" "\n" "- xfs: the journaling filesystem from SGI. High-quality, high-speed. " "For the real pro's. If you are reading this, you most likely don't " "want to use it. \n" "\n" "Step 5: Configuring Hostname\n" "\n" "There isn't much to say about this. Give your PC a name. Any name. " "We don't care. Honest. \n" "\n" "Step 6: Configuring Root account\n" "\n" "The Root account is the system administrator. He can do anything. " "You generally shouldn't use this account, unless you really have to. " "You can break stuff as root, really. Think up a password thats " "pretty long, write it down and put it somewhere far away. \n" "\n" "Step 7: Configuring User account\n" "\n" "This is your every-day user. Depending on which module you are " "installing, you might or might not have to log in every time you " "boot your computer. Also, don't use a 30-letter password for this " "user. Be lazy, and keep both username and password relativly short. " "You'll enter them a lot.\n" "\n" "Step 8: Configuring Bootloader\n" "\n" "To start Morphix from a harddisk, your system needs to find it " "first. The easiest way is to install LILO (Linux Loader) to your MBR " "(Master Boot Record). If you have multiple disks, install it to your " "first disk. If you have multiple operating systems, these might or " "might not succesfully be detected and added to a boot menu. " "Currently working on making this work a lot better, but we're not " "there yet. If you want to be safe, try option 2 or 3 to install LILO " "to the partition or not at all. You will have to check on the other " "bootloader in order to boot Morphix at all though.\n" "\n" "The Animated LILO bootscreen is pretty pretty. At least, we like it. " "We might put our logo on it, or have a more 'serious' bootscreen, " "but for now we're happy with a few crazy penguins walking around " "everywhere. We like it, you don't have to.\n" "\n" "The bootfloppy hasn't been implemented. Sorry, working on it!" msgstr "à´®àµà´°àµà´«à´¿à´àµà´¸àµ à´¸à´à´¸àµà´¥à´¾à´ªà´¨ സഹായിയിലàµà´àµà´àµ à´¸àµà´µà´¾à´à´¤à´!\n" "Each step has a short summery here, that might help you out on " "making a choice. If you really aren't sure, drop by on our website " "and ask away! If people can't find their way around here we'd like " "to hear it, as this installer was made for even the most newest " "users to be able to install a working Morphix/Debian system...\n" "\n" "Step 1: Harddisk selection\n" "\n" "Here you must select the harddisk on which you want Morphix to be " "installed. Try to identify your harddisk on the size if you have " "multiple disks. If you only have one, well, then you won't have a " "lot to choose...\n" "\n" "When you click 'Forward', a partition tool will be started. This is " "a daunting task for new users now, we're working on a easy " "replacement. Try to make a Linux and a Linux swap partition. Note " "that the former must be about twice the size of the module used. The " "latter should be about 256MB.\n" "\n" "Step 2: Swap selection\n" "\n" "If you have created a swap partition in Step 1, you can select it " "here. You can also do without swap, and things will probably work " "normal, but we advise making a swap partition anyway. \n" "\n" "Step 3: Root partition selection\n" "\n" "Select the partition where you want to install Morphix on. After " "Step 1 you should have made a Linux partition, if you did you can " "select it here. If you didn't, go back to Step 1 and try again. You " "really need one!\n" "\n" "Step 4: Filesystem selection\n" "\n" "Select the appropriate filesystem. If you don't care about this, " "take the default, \"ext3\".\n" "\n" "- ext2: the 'save and sure' filesystem, tried and tested for years " "in the Linux community. However, you need to neatly unmount this " "filesystem, and it needs periodic checking. \n" "\n" "- ext3: ext2 but with journaling. This keeps track of every change " "that takes place, so if you accidently pull the plug (or Matty " "does), you just plug it back in and it will quickly sort out any " "errors on your disk\n" "\n" "- reiserfs: better in some ways, worse in others. Does have less " "tools and isn't compatible with ext2 or ext3. It's your " "filesystem...\n" "\n" "- xfs: the journaling filesystem from SGI. High-quality, high-speed. " "For the real pro's. If you are reading this, you most likely don't " "want to use it. \n" "\n" "Step 5: Configuring Hostname\n" "\n" "There isn't much to say about this. Give your PC a name. Any name. " "We don't care. Honest. \n" "\n" "Step 6: Configuring Root account\n" "\n" "The Root account is the system administrator. He can do anything. " "You generally shouldn't use this account, unless you really have to. " "You can break stuff as root, really. Think up a password thats " "pretty long, write it down and put it somewhere far away. \n" "\n" "Step 7: Configuring User account\n" "\n" "This is your every-day user. Depending on which module you are " "installing, you might or might not have to log in every time you " "boot your computer. Also, don't use a 30-letter password for this " "user. Be lazy, and keep both username and password relativly short. " "You'll enter them a lot.\n" "\n" "Step 8: Configuring Bootloader\n" "\n" "To start Morphix from a harddisk, your system needs to find it " "first. The easiest way is to install LILO (Linux Loader) to your MBR " "(Master Boot Record). If you have multiple disks, install it to your " "first disk. If you have multiple operating systems, these might or " "might not succesfully be detected and added to a boot menu. " "Currently working on making this work a lot better, but we're not " "there yet. If you want to be safe, try option 2 or 3 to install LILO " "to the partition or not at all. You will have to check on the other " "bootloader in order to boot Morphix at all though.\n" "\n" "The Animated LILO bootscreen is pretty pretty. At least, we like it. " "We might put our logo on it, or have a more 'serious' bootscreen, " "but for now we're happy with a few crazy penguins walking around " "everywhere. We like it, you don't have to.\n" "\n" "The bootfloppy hasn't been implemented. Sorry, working on it!" #: ../src/interface.c:2242 msgid "Here, you can choose a number of extra partitions to install to.\n" "These partitions will be mounted to the newly created filesystem " "before copying. You may opt not to create a filesystem on the " "partition, or to only add it to your fstab and not to copy any files " "onto it. \n" "Please note that this is an experimental feature!" msgstr "à´à´µà´¿à´àµ, à´¸à´à´¸àµà´¥à´¾à´ªà´¿à´àµà´à´¾à´¨àµ à´µàµà´£àµà´à´¿ à´àµà´àµà´¤à´²àµ à´à´¾à´à´àµà´à´³àµ തിരà´àµà´àµà´àµà´àµà´à´¾à´µàµà´¨àµà´¨à´¤à´¾à´£âàµ.\n" "à´°à´à´¨à´à´³àµ à´ªà´âà´°àµà´¤àµà´¤àµà´¨àµà´¨à´¤à´¿à´¨àµ à´®àµà´¨àµà´ªàµ à´ªàµà´¤àµà´¤à´¾à´¯à´¿ നിരàµà´®àµà´®à´¿à´àµà´àµà´¨àµà´¨ ഫയലàµà´¸à´¿à´¸àµà´±àµà´±à´¤àµà´¤à´¿à´²àµ à´ à´à´¾à´à´àµà´à´³àµ à´®àµà´£àµà´àµ à´àµà´¯àµà´¯à´ªàµà´ªàµà´àµà´" "à´ à´à´¾à´à´àµà´à´³à´¿à´²àµ à´ªàµà´¤à´¿à´¯ ഫയലàµà´¸à´¿à´¸àµà´±àµà´±à´ നിരàµà´®àµà´®à´¿à´àµà´à´£àµ à´à´¨àµà´¨àµ നിà´àµà´à´³àµà´àµà´àµ à´¤àµà´°àµà´®à´¾à´¨à´¿à´àµà´à´¾à´.\n" "à´ à´¸àµà´à´°àµà´¯à´ പരàµà´àµà´·à´£à´¾à´à´¿à´¸àµà´¥à´¾à´²à´¤àµà´¤à´¿à´¨à´¾à´£âൠà´à´³àµâà´ªàµà´ªàµà´àµà´¤àµà´¤à´¿à´¯à´¿à´àµà´àµà´³àµà´³à´¤àµ à´à´¨àµà´¨à´¤àµ à´¶àµà´°à´¦àµà´¦à´¿à´àµà´àµà´" #: ../src/interface.c:2299 ../src/interface.c:2305 ../src/interface.c:2311 #: ../src/interface.c:2317 msgid "Create new filesystem" msgstr "à´ªàµà´¤à´¿à´¯ ഫയലàµà´¸à´¿à´¸àµà´±àµà´±à´ നിരàµà´®àµà´®à´¿à´àµà´àµà´" #: ../src/interface.c:2323 ../src/interface.c:2329 ../src/interface.c:2335 #: ../src/interface.c:2341 msgid "Add only to fstab" msgstr "fstab à´²àµà´àµà´àµ മാതàµà´°à´ à´àµà´°àµà´àµà´àµà´" #: ../src/interface.c:2354 ../src/interface.c:2372 ../src/interface.c:2390 #: ../src/interface.c:2407 msgid "/home" msgstr "/home" #: ../src/interface.c:2355 ../src/interface.c:2371 ../src/interface.c:2391 #: ../src/interface.c:2408 msgid "/boot" msgstr "/boot" #: ../src/interface.c:2356 ../src/interface.c:2373 ../src/interface.c:2389 #: ../src/interface.c:2409 msgid "/usr" msgstr "/usr" #: ../src/interface.c:2357 ../src/interface.c:2374 ../src/interface.c:2392 #: ../src/interface.c:2406 msgid "/var" msgstr "/var" #: ../src/support.c:90 ../src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "%s à´à´¿à´¤àµà´° à´°à´à´¨ à´à´£àµà´àµà´¤àµà´¤à´¾à´®à´¾à´¯à´¿à´²àµà´²" |
1 message has been excluded from this view by a project administrator.
