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-02-24 21:27:55
|
Update of /cvsroot/morphix/networkconf/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23293 Modified Files: Makefile callbacks.c Log Message: added define for interfaces Index: Makefile =================================================================== RCS file: /cvsroot/morphix/networkconf/src/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 2 Feb 2004 01:41:56 -0000 1.6 --- Makefile 24 Feb 2004 21:13:26 -0000 1.7 *************** *** 36,53 **** PRE_UNINSTALL = : POST_UNINSTALL = : ! ACLOCAL = ${SHELL} /root/morphix/networkconf-0.1/missing --run aclocal-1.7 AMDEP_FALSE = # AMDEP_TRUE = ! AMTAR = ${SHELL} /root/morphix/networkconf-0.1/missing --run tar ! AUTOCONF = ${SHELL} /root/morphix/networkconf-0.1/missing --run autoconf ! AUTOHEADER = ${SHELL} /root/morphix/networkconf-0.1/missing --run autoheader ! AUTOMAKE = ${SHELL} /root/morphix/networkconf-0.1/missing --run automake-1.7 ! AWK = mawk CATALOGS = CATOBJEXT = .gmo ! CC = i386-linux-gcc CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 ! CPP = i386-linux-gcc -E CPPFLAGS = CYGPATH_W = echo --- 36,53 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! ACLOCAL = ${SHELL} /home/alex/Projects/networkconf/missing --run aclocal-1.7 AMDEP_FALSE = # AMDEP_TRUE = ! AMTAR = ${SHELL} /home/alex/Projects/networkconf/missing --run tar ! AUTOCONF = ${SHELL} /home/alex/Projects/networkconf/missing --run autoconf ! AUTOHEADER = ${SHELL} /home/alex/Projects/networkconf/missing --run autoheader ! AUTOMAKE = ${SHELL} /home/alex/Projects/networkconf/missing --run automake-1.7 ! AWK = gawk CATALOGS = CATOBJEXT = .gmo ! CC = gcc CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 ! CPP = gcc -E CPPFLAGS = CYGPATH_W = echo *************** *** 73,80 **** LIBS = LTLIBOBJS = ! MAINT = # ! MAINTAINER_MODE_FALSE = ! MAINTAINER_MODE_TRUE = # ! MAKEINFO = ${SHELL} /root/morphix/networkconf-0.1/missing --run makeinfo MKINSTALLDIRS = ./mkinstalldirs MSGFMT = /usr/bin/msgfmt --- 73,80 ---- LIBS = LTLIBOBJS = ! MAINT = ! MAINTAINER_MODE_FALSE = # ! MAINTAINER_MODE_TRUE = ! MAKEINFO = ${SHELL} /home/alex/Projects/networkconf/missing --run makeinfo MKINSTALLDIRS = ./mkinstalldirs MSGFMT = /usr/bin/msgfmt *************** *** 100,104 **** VERSION = 0.1 XGETTEXT = /usr/bin/xgettext ! ac_ct_CC = ac_ct_STRIP = am__fastdepCC_FALSE = # --- 100,104 ---- VERSION = 0.1 XGETTEXT = /usr/bin/xgettext ! ac_ct_CC = gcc ac_ct_STRIP = am__fastdepCC_FALSE = # *************** *** 108,124 **** am__quote = bindir = ${exec_prefix}/bin ! build_alias = i386-linux datadir = ${prefix}/share exec_prefix = ${prefix} ! host_alias = i386-linux includedir = ${prefix}/include ! infodir = ${prefix}/share/info ! install_sh = /root/morphix/networkconf-0.1/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var ! mandir = ${prefix}/share/man oldincludedir = /usr/include ! prefix = /usr program_transform_name = s,x,x, sbindir = ${exec_prefix}/sbin --- 108,124 ---- am__quote = bindir = ${exec_prefix}/bin ! build_alias = datadir = ${prefix}/share exec_prefix = ${prefix} ! host_alias = includedir = ${prefix}/include ! infodir = ${prefix}/info ! install_sh = /home/alex/Projects/networkconf/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 *************** *** 175,182 **** .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) --- 175,182 ---- .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) Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/networkconf/src/callbacks.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** callbacks.c 18 Sep 2003 10:31:17 -0000 1.6 --- callbacks.c 24 Feb 2004 21:13:26 -0000 1.7 *************** *** 20,23 **** --- 20,25 ---- #include "support.h" + #define ETC_INTERFACES "/etc/network/interfaces" + extern GtkWidget *MainDialog; extern GtkWidget *HelpDialog; *************** *** 86,90 **** gchar test2[256]; ! if (!g_file_get_contents("/etc/network/interfaces",&buffer,&buffer_len,NULL)) { printf("Can't find interfaces file\n"); return 0; --- 88,92 ---- gchar test2[256]; ! if (!g_file_get_contents(ETC_INTERFACES,&buffer,&buffer_len,NULL)) { printf("Can't find interfaces file\n"); return 0; *************** *** 281,323 **** GtkWidget *key3 = lookup_widget(MainDialog,"entry13"); ! if (!g_file_get_contents("/etc/network/interfaces",&buffer,&buffer_len,NULL)) { printf("Can't find interfaces file\n"); return; } buffer_array = g_strsplit(buffer,"\n",0); ! fp = fopen("/etc/network/interfaces","w"); for (; buffer_array[i] != NULL; i++) { ! /* switch device to dhcp */ ! /* for each line, check to see if it's the right ethernet card */ ! if (strstr(buffer_array[i],GTK_ENTRY(entry)->text)) { ! /* if it is, check to see which line it is */ ! if (strstr(buffer_array[i],"auto")) { ! /* auto-line found with chosen network device, skip it */ ! continue; ! } ! /*if it doesn't start with auto, it starts with iface */ ! // FIXME -- add mapping support ! if (strstr(buffer_array[i],"iface")) { ! /* iface-line found with chosen network device, skip it, but set done to TRUE. This will skip all next /t's, if available */{ ! done = TRUE; ! continue; /* if found, don't write it to the buffer, instead let networkconf add it */ ! } ! } ! } ! /* if found, continue until you find a next iface/mapping/auto or you've reached EOF */ ! if (done == TRUE) { ! while ( strncmp(buffer_array[i],"iface",5) != 0 && ! strncmp(buffer_array[i],"mapping",7) != 0 && ! strncmp(buffer_array[i],"auto",4) != 0) { ! i++; ! if (buffer_array[i] == NULL) ! break; ! } ! } ! fprintf(fp,"%s\n",buffer_array[i]); } if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio1))) { ! /* we don't care anymore if it was found or not, add it */ fprintf(fp,"auto %s\n",GTK_ENTRY(entry)->text); fprintf(fp,"iface %s inet dhcp\n",GTK_ENTRY(entry)->text); --- 283,325 ---- GtkWidget *key3 = lookup_widget(MainDialog,"entry13"); ! if (!g_file_get_contents(ETC_INTERFACES,&buffer,&buffer_len,NULL)) { printf("Can't find interfaces file\n"); return; } buffer_array = g_strsplit(buffer,"\n",0); ! fp = fopen(ETC_INTERFACES,"w"); for (; buffer_array[i] != NULL; i++) { ! /* switch device to dhcp */ ! /* for each line, check to see if it's the right ethernet card */ ! if (strstr(buffer_array[i],GTK_ENTRY(entry)->text)) { ! /* if it is, check to see which line it is */ ! if (strstr(buffer_array[i],"auto")) { ! /* auto-line found with chosen network device, skip it */ ! continue; ! } ! /*if it doesn't start with auto, it starts with iface */ ! // FIXME -- add mapping support ! if (strstr(buffer_array[i],"iface")) { ! /* iface-line found with chosen network device, skip it, but set done to TRUE. This will skip all next /t's, if available */{ ! done = TRUE; ! continue; /* if found, don't write it to the buffer, instead let networkconf add it */ ! } ! } ! } ! /* if found, continue until you find a next iface/mapping/auto or you've reached EOF */ ! if (done == TRUE) { ! while ( strncmp(buffer_array[i],"iface",5) != 0 && ! strncmp(buffer_array[i],"mapping",7) != 0 && ! strncmp(buffer_array[i],"auto",4) != 0) { ! i++; ! if (buffer_array[i] == NULL) ! break; ! } ! } ! fprintf(fp,"%s\n",buffer_array[i]); } if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio1))) { ! /* we don't care anymore if it was found or not, add it */ fprintf(fp,"auto %s\n",GTK_ENTRY(entry)->text); fprintf(fp,"iface %s inet dhcp\n",GTK_ENTRY(entry)->text); *************** *** 363,369 **** ExecuteCommand(cmdline); } else if (strcmp(GTK_ENTRY(key0)->text,"") != 0) { ! fprintf(fp,"\twlan_ng_key0 %s\n",GTK_ENTRY(key0)->text); ! sprintf(cmdline,"iwconfig %s key %s",GTK_ENTRY(entry)->text,GTK_ENTRY(key0)->text); ! ExecuteCommand(cmdline); } } --- 365,371 ---- ExecuteCommand(cmdline); } else if (strcmp(GTK_ENTRY(key0)->text,"") != 0) { ! fprintf(fp,"\twlan_ng_key0 %s\n",GTK_ENTRY(key0)->text); ! sprintf(cmdline,"iwconfig %s key %s",GTK_ENTRY(entry)->text,GTK_ENTRY(key0)->text); ! ExecuteCommand(cmdline); } } *************** *** 376,380 **** sprintf(cmdline,"dhclient %s",GTK_ENTRY(entry)->text); if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) { ! printf("dhclient couldn't be executed, dhcp failed\n"); } } --- 378,382 ---- sprintf(cmdline,"dhclient %s",GTK_ENTRY(entry)->text); if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) { ! printf("dhclient couldn't be executed, dhcp failed\n"); } } *************** *** 390,479 **** fprintf(fp,"\taddress %s\n",GTK_ENTRY(entry_ip)->text); if (strncmp(GTK_ENTRY(entry_mask)->text,"",1) != 0) { ! fprintf(fp,"\tnetmask %s\n",GTK_ENTRY(entry_mask)->text); } if (strncmp(GTK_ENTRY(entry_bcast)->text,"",1) != 0) { ! fprintf(fp,"\tbroadcast %s\n",GTK_ENTRY(entry_bcast)->text); } if (strncmp(GTK_ENTRY(entry_gw)->text,"",1) != 0) { ! fprintf(fp,"\tgateway %s\n",GTK_ENTRY(entry_gw)->text); } if (current_is_wifi) { ! if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adhoc))) { ! fprintf(fp,"\twireless_mode ad_hoc\n"); ! fprintf(fp,"\twireless_channel %s\n",GTK_ENTRY(channel)->text); ! /* execute iwconfig */ ! sprintf(cmdline,"iwconfig %s mode ad-hoc",GTK_ENTRY(entry)->text); ! ExecuteCommand(cmdline); ! sprintf(cmdline,"iwconfig %s channel %s",GTK_ENTRY(entry)->text,GTK_ENTRY(channel)->text); ! ExecuteCommand(cmdline); ! } ! if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(managed))) { ! sprintf(cmdline,"iwconfig %s mode managed",GTK_ENTRY(entry)->text); ! ExecuteCommand(cmdline); ! fprintf(fp,"\twireless_mode managed\n"); ! if (strcmp(GTK_ENTRY(essid)->text,"") != 0) { ! fprintf(fp,"\twireless_essid %s\n",GTK_ENTRY(essid)->text); ! sprintf(cmdline,"iwconfig %s essid %s",GTK_ENTRY(entry)->text,GTK_ENTRY(essid)->text); ! ExecuteCommand(cmdline); ! } ! } ! if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wep))) { ! fprintf(fp,"\twireless_enc on\n"); ! if (strcmp(GTK_ENTRY(privstring)->text,"") != 0) { ! fprintf(fp,"\twlan_ng_priv_genstr %s\n",GTK_ENTRY(privstring)->text); ! fprintf(fp,"\twlan_ng_priv_key128 false\n"); ! sprintf(cmdline,"iwconfig %s key s:%s",GTK_ENTRY(entry)->text,GTK_ENTRY(privstring)->text); ! ExecuteCommand(cmdline); ! } ! else if (strcmp(GTK_ENTRY(key0)->text,"") != 0 && ! strcmp(GTK_ENTRY(key1)->text,"") != 0 && ! strcmp(GTK_ENTRY(key2)->text,"") != 0 && ! strcmp(GTK_ENTRY(key3)->text,"") != 0) { ! fprintf(fp,"\twlan_ng_key0 %s\n",GTK_ENTRY(key0)->text); ! fprintf(fp,"\twlan_ng_key1 %s\n",GTK_ENTRY(key1)->text); ! fprintf(fp,"\twlan_ng_key2 %s\n",GTK_ENTRY(key2)->text); ! fprintf(fp,"\twlan_ng_key3 %s\n",GTK_ENTRY(key3)->text); ! sprintf(cmdline,"iwconfig %s key %s",GTK_ENTRY(entry)->text,GTK_ENTRY(key0)->text); ! ExecuteCommand(cmdline); ! } else if (strcmp(GTK_ENTRY(key0)->text,"") != 0) { ! fprintf(fp,"\twlan_ng_key0 %s\n",GTK_ENTRY(key0)->text); ! sprintf(cmdline,"iwconfig %s key %s",GTK_ENTRY(entry)->text,GTK_ENTRY(key0)->text); ! ExecuteCommand(cmdline); ! } ! } } ! /* execute ifconfig */ ! sprintf(cmdline,"ifconfig %s %s",GTK_ENTRY(entry)->text, GTK_ENTRY(entry_ip)->text); ! if (strncmp(GTK_ENTRY(entry_mask)->text,"",1) != 0) { ! sprintf(cmdline,"%s netmask %s",cmdline,GTK_ENTRY(entry_mask)->text); ! } ! if (strncmp(GTK_ENTRY(entry_bcast)->text,"",1) != 0) { ! sprintf(cmdline,"%s broadcast %s",cmdline,GTK_ENTRY(entry_bcast)->text); ! } ! sprintf(cmdline,"%s up",cmdline); ! if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) { printf("Ifconfig couldn't be executed\n"); /* error */ ! } ! if (strncmp(GTK_ENTRY(entry_gw)->text,"",1) != 0) { ! sprintf(cmdline,"route add default gw %s",GTK_ENTRY(entry_gw)->text); ! if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) { ! printf("Route couldn't be executed\n"); ! /* error */ ! } ! } ! fclose(fp); ! fp = fopen("/etc/resolv.conf","w"); ! if (strcmp(GTK_ENTRY(entry_dns_1)->text,"") != 0) { ! fprintf(fp,"nameserver %s\n",GTK_ENTRY(entry_dns_1)->text); ! } ! if (strcmp(GTK_ENTRY(entry_dns_2)->text,"") != 0) { ! fprintf(fp,"nameserver %s\n",GTK_ENTRY(entry_dns_2)->text); ! } ! fclose(fp); } g_strfreev (buffer_array); --- 392,481 ---- fprintf(fp,"\taddress %s\n",GTK_ENTRY(entry_ip)->text); if (strncmp(GTK_ENTRY(entry_mask)->text,"",1) != 0) { ! fprintf(fp,"\tnetmask %s\n",GTK_ENTRY(entry_mask)->text); } if (strncmp(GTK_ENTRY(entry_bcast)->text,"",1) != 0) { ! fprintf(fp,"\tbroadcast %s\n",GTK_ENTRY(entry_bcast)->text); } if (strncmp(GTK_ENTRY(entry_gw)->text,"",1) != 0) { ! fprintf(fp,"\tgateway %s\n",GTK_ENTRY(entry_gw)->text); } if (current_is_wifi) { ! if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adhoc))) { ! fprintf(fp,"\twireless_mode ad_hoc\n"); ! fprintf(fp,"\twireless_channel %s\n",GTK_ENTRY(channel)->text); ! /* execute iwconfig */ ! sprintf(cmdline,"iwconfig %s mode ad-hoc",GTK_ENTRY(entry)->text); ! ExecuteCommand(cmdline); ! sprintf(cmdline,"iwconfig %s channel %s",GTK_ENTRY(entry)->text,GTK_ENTRY(channel)->text); ! ExecuteCommand(cmdline); ! } ! if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(managed))) { ! sprintf(cmdline,"iwconfig %s mode managed",GTK_ENTRY(entry)->text); ! ExecuteCommand(cmdline); ! fprintf(fp,"\twireless_mode managed\n"); ! if (strcmp(GTK_ENTRY(essid)->text,"") != 0) { ! fprintf(fp,"\twireless_essid %s\n",GTK_ENTRY(essid)->text); ! sprintf(cmdline,"iwconfig %s essid %s",GTK_ENTRY(entry)->text,GTK_ENTRY(essid)->text); ! ExecuteCommand(cmdline); ! } ! } ! if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wep))) { ! fprintf(fp,"\twireless_enc on\n"); ! if (strcmp(GTK_ENTRY(privstring)->text,"") != 0) { ! fprintf(fp,"\twlan_ng_priv_genstr %s\n",GTK_ENTRY(privstring)->text); ! fprintf(fp,"\twlan_ng_priv_key128 false\n"); ! sprintf(cmdline,"iwconfig %s key s:%s",GTK_ENTRY(entry)->text,GTK_ENTRY(privstring)->text); ! ExecuteCommand(cmdline); ! } ! else if (strcmp(GTK_ENTRY(key0)->text,"") != 0 && ! strcmp(GTK_ENTRY(key1)->text,"") != 0 && ! strcmp(GTK_ENTRY(key2)->text,"") != 0 && ! strcmp(GTK_ENTRY(key3)->text,"") != 0) { ! fprintf(fp,"\twlan_ng_key0 %s\n",GTK_ENTRY(key0)->text); ! fprintf(fp,"\twlan_ng_key1 %s\n",GTK_ENTRY(key1)->text); ! fprintf(fp,"\twlan_ng_key2 %s\n",GTK_ENTRY(key2)->text); ! fprintf(fp,"\twlan_ng_key3 %s\n",GTK_ENTRY(key3)->text); ! sprintf(cmdline,"iwconfig %s key %s",GTK_ENTRY(entry)->text,GTK_ENTRY(key0)->text); ! ExecuteCommand(cmdline); ! } else if (strcmp(GTK_ENTRY(key0)->text,"") != 0) { ! fprintf(fp,"\twlan_ng_key0 %s\n",GTK_ENTRY(key0)->text); ! sprintf(cmdline,"iwconfig %s key %s",GTK_ENTRY(entry)->text,GTK_ENTRY(key0)->text); ! ExecuteCommand(cmdline); ! } ! } } ! /* execute ifconfig */ ! sprintf(cmdline,"ifconfig %s %s",GTK_ENTRY(entry)->text, GTK_ENTRY(entry_ip)->text); ! if (strncmp(GTK_ENTRY(entry_mask)->text,"",1) != 0) { ! sprintf(cmdline,"%s netmask %s",cmdline,GTK_ENTRY(entry_mask)->text); ! } ! if (strncmp(GTK_ENTRY(entry_bcast)->text,"",1) != 0) { ! sprintf(cmdline,"%s broadcast %s",cmdline,GTK_ENTRY(entry_bcast)->text); ! } ! sprintf(cmdline,"%s up",cmdline); ! if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) { printf("Ifconfig couldn't be executed\n"); /* error */ ! } ! if (strncmp(GTK_ENTRY(entry_gw)->text,"",1) != 0) { ! sprintf(cmdline,"route add default gw %s",GTK_ENTRY(entry_gw)->text); ! if (g_spawn_command_line_sync(cmdline,&outbuffer,NULL,&exitstatus,NULL) == FALSE) { ! printf("Route couldn't be executed\n"); ! /* error */ ! } ! } ! fclose(fp); ! fp = fopen("/etc/resolv.conf","w"); ! if (strcmp(GTK_ENTRY(entry_dns_1)->text,"") != 0) { ! fprintf(fp,"nameserver %s\n",GTK_ENTRY(entry_dns_1)->text); ! } ! if (strcmp(GTK_ENTRY(entry_dns_2)->text,"") != 0) { ! fprintf(fp,"nameserver %s\n",GTK_ENTRY(entry_dns_2)->text); ! } ! fclose(fp); } g_strfreev (buffer_array); |
|
From: <ale...@us...> - 2004-02-24 20:38:27
|
Update of /cvsroot/morphix/networkconf/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10973 Modified Files: networkconf.pot Added Files: fr.po Log Message: adding french translation from Ludo --- NEW FILE: fr.po --- # translation of networkconf.po to french # networkconf translation file # Copyright (C) 2004 # Ludovic Grossard <gro...@kd...>, 2004. # msgid "" msgstr "" "Project-Id-Version: networkconf\n" "PO-Revision-Date: 2004-02-24 11:06+0100\n" "Last-Translator: Ludovic Grossard <gro...@kd...>\n" "Language-Team: french <kde...@kd...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0.2\n" #: src/interface.c:92 msgid "Network Configuration" msgstr "Configuration du réseau" #: src/interface.c:115 msgid "Network Adapter:" msgstr "Carte réseau :" #: src/interface.c:135 msgid "Use DHCP Broadcast (Autodetect)" msgstr "Utiliser le DHCP (détection automatique)" #: src/interface.c:141 msgid "Use Static Network Settings (Manual)" msgstr "Utiliser des réglages statiques (manuel)" #: src/interface.c:160 msgid "IP Address: " msgstr "Adresse IP" #: src/interface.c:174 src/interface.c:222 msgid "192.168.0.1" msgstr "192.168.0.1" #: src/interface.c:176 msgid "Subnet Mask: " msgstr "Masque sous-réseau :" #: src/interface.c:190 msgid "255.255.255.0" msgstr "255.255.255.0" #: src/interface.c:192 msgid "Broadcast Address: " msgstr "Adresse de Broadcast :" #: src/interface.c:206 msgid "192.168.0.255" msgstr "192.168.0.255" #: src/interface.c:208 msgid "Default Gateway: " msgstr "Passerelle par défaut :" #: src/interface.c:233 msgid "Nameservers (DNS): " msgstr "Serveurs de noms (DNS) :" #: src/interface.c:263 msgid "WiFi settings" msgstr "Configuration du Wifi" #: src/interface.c:271 msgid "Managed" msgstr "Géré" #: src/interface.c:279 msgid "Ad-hoc" msgstr "Ad-hoc" #: src/interface.c:293 msgid "Channel (for ad-hoc):" msgstr "Canal (pour ad-hoc) :" #: src/interface.c:301 msgid "AP ID (essid):" msgstr "AP ID (essid):" #: src/interface.c:315 msgid "WEP priv string:" msgstr "WEP priv string:" #: src/interface.c:329 msgid "WEP key0:" msgstr "WEP key0:" #: src/interface.c:337 msgid "WEP key1:" msgstr "WEP key1:" #: src/interface.c:345 msgid "WEP key2:" msgstr "WEP key2:" #: src/interface.c:353 msgid "WEP key3:" msgstr "WEP key3:" #: src/interface.c:385 msgid "Use WEP" msgstr "Utiliser WEP" #: src/interface.c:391 msgid "Network Adapter Configuration" msgstr "Configuration de la carte réseau" #: src/interface.c:515 msgid "Network Configuration Help" msgstr "Aide pour la configuration du réseau" #: src/interface.c:531 msgid "" "Network Configuration Help\n" "\n" "- What does this program do?\n" "\n" "With this program, you can configure any network devices that you " "may have in your computer. \n" "\n" "- How do I use it?\n" "\n" "First, select the network adapter. An adapter starting with \"eth\" " "is a normal network device, an adapter starting with \"ppp\" is a " "dialup or *dsl connection\n" "\n" "Second, set the mode that the device will use. With Morphix, all " "devices that have been detected are normally set as DHCP.\n" "\n" "If you want to manually set your settings, select the static " "radiobutton and enter your network adapters information. Only an IP " "address is mandatory:\n" "\n" "IP Address - the address assigned to your computer (192.168.0.1)\n" "\n" "Subnet Mask - defines the local subnet (A/B/C network, " "255.255.255.0)\n" "\n" "Broadcast Address - normally the ip address with the last quart on " "255 (192.168.0.255)\n" "\n" "Gateway - the default route gateway, your (NAT) router/server " "(192.168.0.1)\n" "\n" "Nameservers - The servers supplied by your ISP to translate IP " "addresses to hostnames (www.google.com) " msgstr "" "Aide pour la configuration du réseau\n" "\n" "- Que fait ce programme ?\n" "\n" "Avec ce programme, vous pouvez configurer les périphériques réseaux " "présents dans votre ordinateur. \n" "\n" "- Comment l'utiliser ?\n" "\n" "Tout d'abord, sélectionnez la carte réseau. Une carte commençant par « eth » " "est un périphérique réseau normal, une carte commençant par « ppp » est " "une connexion par modem ou adsl\n" "\n" "Ensuite, choisissez le mode utilisé par le périphérique. Avec Morphix, " "tous les périphériques qui ont été détectés sont normalement configurés " "en dhcp.\n" "\n" "Si vous voulez effectuer vos réglages manuellement, sélectionnez le bouton " "radio « Utiliser des réglages statiques (manuel) » et saisissez vos paramètres " "réseau. Seule l'adresse IP est obligatoire :\n" "\n" "Adresse IP : l'adresse assignée à votre ordinateur (192.168.0.2à \n" "\n" "Masque sous-réseau : définit le sous-réseau local (réseau de classe A, B ou C, " "255.255.255.0)\n" "\n" "Adresse de Broadcast : normalement l'adresse IP avec le dernier nombre égal " "à 255 (192.168.0.255)\n" "\n" "Passerelle : la passerelle par défaut, votre routeur/serveur (NAT) (192.168.0.1)\n" "\n" "Serveurs de noms : les serveurs donnés par votre fournisseur d'accès pour " "traduire les adresses IP en noms d'hôtes (www.google.fr)" #: src/interface.c:563 msgid "window1" msgstr "window1" #: src/interface.c:577 msgid "window2" msgstr "window2" #: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Impossible de trouver le fichier image : %s" Index: networkconf.pot =================================================================== RCS file: /cvsroot/morphix/networkconf/po/networkconf.pot,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** networkconf.pot 23 Feb 2004 16:28:03 -0000 1.1 --- networkconf.pot 24 Feb 2004 20:24:00 -0000 1.2 *************** *** 1,180 **** ! # networkconf translation file ! # Copyright (C) 2004 ! # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. ! # ! #, fuzzy ! msgid "" ! msgstr "" ! "Project-Id-Version: PACKAGE VERSION\n" ! "PO-Revision-Date: 2004-02-23 17:24+0100\n" ! "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" ! "Language-Team: LANGUAGE <LL...@li...>\n" ! "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=CHARSET\n" ! "Content-Transfer-Encoding: 8bit\n" ! ! # SOME DESCRIPTIVE TITLE. ! # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ! # This file is distributed under the same license as the PACKAGE package. ! # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. ! # ! #, fuzzy ! msgid "" ! msgstr "Project-Id-Version: PACKAGE VERSION\n" ! "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2004-02-23 17:22+0100\n" ! "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ! "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" ! "Language-Team: LANGUAGE <LL...@li...>\n" ! "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=CHARSET\n" ! "Content-Transfer-Encoding: 8bit\n" ! ! #: src/interface.c:92 ! msgid "Network Configuration" ! msgstr "" ! ! #: src/interface.c:115 ! msgid "Network Adapter:" ! msgstr "" ! ! #: src/interface.c:135 ! msgid "Use DHCP Broadcast (Autodetect)" ! msgstr "" ! ! #: src/interface.c:141 ! msgid "Use Static Network Settings (Manual)" ! msgstr "" ! ! #: src/interface.c:160 ! msgid "IP Address: " ! msgstr "" ! ! #: src/interface.c:174 src/interface.c:222 ! msgid "192.168.0.1" ! msgstr "" ! ! #: src/interface.c:176 ! msgid "Subnet Mask: " ! msgstr "" ! ! #: src/interface.c:190 ! msgid "255.255.255.0" ! msgstr "" ! ! #: src/interface.c:192 ! msgid "Broadcast Address: " ! msgstr "" ! ! #: src/interface.c:206 ! msgid "192.168.0.255" ! msgstr "" ! ! #: src/interface.c:208 ! msgid "Default Gateway: " ! msgstr "" ! ! #: src/interface.c:233 ! msgid "Nameservers (DNS): " ! msgstr "" ! ! #: src/interface.c:263 ! msgid "WiFi settings" ! msgstr "" ! ! #: src/interface.c:271 ! msgid "Managed" ! msgstr "" ! ! #: src/interface.c:279 ! msgid "Ad-hoc" ! msgstr "" ! ! #: src/interface.c:293 ! msgid "Channel (for ad-hoc):" ! msgstr "" ! ! #: src/interface.c:301 ! msgid "AP ID (essid):" ! msgstr "" ! ! #: src/interface.c:315 ! msgid "WEP priv string:" ! msgstr "" ! ! #: src/interface.c:329 ! msgid "WEP key0:" ! msgstr "" ! ! #: src/interface.c:337 ! msgid "WEP key1:" ! msgstr "" ! ! #: src/interface.c:345 ! msgid "WEP key2:" ! msgstr "" ! ! #: src/interface.c:353 ! msgid "WEP key3:" ! msgstr "" ! ! #: src/interface.c:385 ! msgid "Use WEP" ! msgstr "" ! ! #: src/interface.c:391 ! msgid "Network Adapter Configuration" ! msgstr "" ! ! #: src/interface.c:515 ! msgid "Network Configuration Help" ! msgstr "" ! ! #: src/interface.c:531 ! msgid "Network Configuration Help\n" ! "\n" ! "- What does this program do?\n" ! "\n" ! "With this program, you can configure any network devices that you " ! "may have in your computer. \n" ! "\n" ! "- How do I use it?\n" ! "\n" ! "First, select the network adapter. An adapter starting with \"eth\" " ! "is a normal network device, an adapter starting with \"ppp\" is a " ! "dialup or *dsl connection\n" ! "\n" ! "Second, set the mode that the device will use. With Morphix, all " ! "devices that have been detected are normally set as DHCP.\n" ! "\n" ! "If you want to manually set your settings, select the static " ! "radiobutton and enter your network adapters information. Only an IP " ! "address is mandatory:\n" ! "\n" ! "IP Address - the address assigned to your computer (192.168.0.1)\n" ! "\n" ! "Subnet Mask - defines the local subnet (A/B/C network, " ! "255.255.255.0)\n" ! "\n" ! "Broadcast Address - normally the ip address with the last quart on " ! "255 (192.168.0.255)\n" ! "\n" ! "Gateway - the default route gateway, your (NAT) router/server " ! "(192.168.0.1)\n" ! "\n" ! "Nameservers - The servers supplied by your ISP to translate IP " ! "addresses to hostnames (www.google.com) " ! msgstr "" ! ! #: src/interface.c:563 ! msgid "window1" ! msgstr "" ! ! #: src/interface.c:577 ! msgid "window2" ! msgstr "" ! ! #: src/support.c:90 src/support.c:114 ! #, c-format ! msgid "Couldn't find pixmap file: %s" ! msgstr "" --- 1,163 ---- ! # networkconf translation file ! # Copyright (C) 2004 ! # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. ! # ! #, fuzzy ! msgid "" ! msgstr "" ! "Project-Id-Version: PACKAGE VERSION\n" ! "PO-Revision-Date: 2004-02-23 17:24+0100\n" ! "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" ! "Language-Team: LANGUAGE <LL...@li...>\n" ! "MIME-Version: 1.0\n" ! "Content-Type: text/plain; charset=CHARSET\n" ! "Content-Transfer-Encoding: 8bit\n" ! ! #: src/interface.c:92 ! msgid "Network Configuration" ! msgstr "" ! ! #: src/interface.c:115 ! msgid "Network Adapter:" ! msgstr "" ! ! #: src/interface.c:135 ! msgid "Use DHCP Broadcast (Autodetect)" ! msgstr "" ! ! #: src/interface.c:141 ! msgid "Use Static Network Settings (Manual)" ! msgstr "" ! ! #: src/interface.c:160 ! msgid "IP Address: " ! msgstr "" ! ! #: src/interface.c:174 src/interface.c:222 ! msgid "192.168.0.1" ! msgstr "" ! ! #: src/interface.c:176 ! msgid "Subnet Mask: " ! msgstr "" ! ! #: src/interface.c:190 ! msgid "255.255.255.0" ! msgstr "" ! ! #: src/interface.c:192 ! msgid "Broadcast Address: " ! msgstr "" ! ! #: src/interface.c:206 ! msgid "192.168.0.255" ! msgstr "" ! ! #: src/interface.c:208 ! msgid "Default Gateway: " ! msgstr "" ! ! #: src/interface.c:233 ! msgid "Nameservers (DNS): " ! msgstr "" ! ! #: src/interface.c:263 ! msgid "WiFi settings" ! msgstr "" ! ! #: src/interface.c:271 ! msgid "Managed" ! msgstr "" ! ! #: src/interface.c:279 ! msgid "Ad-hoc" ! msgstr "" ! ! #: src/interface.c:293 ! msgid "Channel (for ad-hoc):" ! msgstr "" ! ! #: src/interface.c:301 ! msgid "AP ID (essid):" ! msgstr "" ! ! #: src/interface.c:315 ! msgid "WEP priv string:" ! msgstr "" ! ! #: src/interface.c:329 ! msgid "WEP key0:" ! msgstr "" ! ! #: src/interface.c:337 ! msgid "WEP key1:" ! msgstr "" ! ! #: src/interface.c:345 ! msgid "WEP key2:" ! msgstr "" ! ! #: src/interface.c:353 ! msgid "WEP key3:" ! msgstr "" ! ! #: src/interface.c:385 ! msgid "Use WEP" ! msgstr "" ! ! #: src/interface.c:391 ! msgid "Network Adapter Configuration" ! msgstr "" ! ! #: src/interface.c:515 ! msgid "Network Configuration Help" ! msgstr "" ! ! #: src/interface.c:531 ! msgid "Network Configuration Help\n" ! "\n" ! "- What does this program do?\n" ! "\n" ! "With this program, you can configure any network devices that you " ! "may have in your computer. \n" ! "\n" ! "- How do I use it?\n" ! "\n" ! "First, select the network adapter. An adapter starting with \"eth\" " ! "is a normal network device, an adapter starting with \"ppp\" is a " ! "dialup or *dsl connection\n" ! "\n" ! "Second, set the mode that the device will use. With Morphix, all " ! "devices that have been detected are normally set as DHCP.\n" ! "\n" ! "If you want to manually set your settings, select the static " ! "radiobutton and enter your network adapters information. Only an IP " ! "address is mandatory:\n" ! "\n" ! "IP Address - the address assigned to your computer (192.168.0.1)\n" ! "\n" ! "Subnet Mask - defines the local subnet (A/B/C network, " ! "255.255.255.0)\n" ! "\n" ! "Broadcast Address - normally the ip address with the last quart on " ! "255 (192.168.0.255)\n" ! "\n" ! "Gateway - the default route gateway, your (NAT) router/server " ! "(192.168.0.1)\n" ! "\n" ! "Nameservers - The servers supplied by your ISP to translate IP " ! "addresses to hostnames (www.google.com) " ! msgstr "" ! ! #: src/interface.c:563 ! msgid "window1" ! msgstr "" ! ! #: src/interface.c:577 ! msgid "window2" ! msgstr "" ! ! #: src/support.c:90 src/support.c:114 ! #, c-format ! msgid "Couldn't find pixmap file: %s" ! msgstr "" |
|
From: <ale...@us...> - 2004-02-23 16:41:36
|
Update of /cvsroot/morphix/networkconf/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20615 Added Files: networkconf.pot Log Message: adding translation --- NEW FILE: networkconf.pot --- # networkconf translation file # Copyright (C) 2004 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "PO-Revision-Date: 2004-02-23 17:24+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-02-23 17:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" #: src/interface.c:92 msgid "Network Configuration" msgstr "" #: src/interface.c:115 msgid "Network Adapter:" msgstr "" #: src/interface.c:135 msgid "Use DHCP Broadcast (Autodetect)" msgstr "" #: src/interface.c:141 msgid "Use Static Network Settings (Manual)" msgstr "" #: src/interface.c:160 msgid "IP Address: " msgstr "" #: src/interface.c:174 src/interface.c:222 msgid "192.168.0.1" msgstr "" #: src/interface.c:176 msgid "Subnet Mask: " msgstr "" #: src/interface.c:190 msgid "255.255.255.0" msgstr "" #: src/interface.c:192 msgid "Broadcast Address: " msgstr "" #: src/interface.c:206 msgid "192.168.0.255" msgstr "" #: src/interface.c:208 msgid "Default Gateway: " msgstr "" #: src/interface.c:233 msgid "Nameservers (DNS): " msgstr "" #: src/interface.c:263 msgid "WiFi settings" msgstr "" #: src/interface.c:271 msgid "Managed" msgstr "" #: src/interface.c:279 msgid "Ad-hoc" msgstr "" #: src/interface.c:293 msgid "Channel (for ad-hoc):" msgstr "" #: src/interface.c:301 msgid "AP ID (essid):" msgstr "" #: src/interface.c:315 msgid "WEP priv string:" msgstr "" #: src/interface.c:329 msgid "WEP key0:" msgstr "" #: src/interface.c:337 msgid "WEP key1:" msgstr "" #: src/interface.c:345 msgid "WEP key2:" msgstr "" #: src/interface.c:353 msgid "WEP key3:" msgstr "" #: src/interface.c:385 msgid "Use WEP" msgstr "" #: src/interface.c:391 msgid "Network Adapter Configuration" msgstr "" #: src/interface.c:515 msgid "Network Configuration Help" msgstr "" #: src/interface.c:531 msgid "Network Configuration Help\n" "\n" "- What does this program do?\n" "\n" "With this program, you can configure any network devices that you " "may have in your computer. \n" "\n" "- How do I use it?\n" "\n" "First, select the network adapter. An adapter starting with \"eth\" " "is a normal network device, an adapter starting with \"ppp\" is a " "dialup or *dsl connection\n" "\n" "Second, set the mode that the device will use. With Morphix, all " "devices that have been detected are normally set as DHCP.\n" "\n" "If you want to manually set your settings, select the static " "radiobutton and enter your network adapters information. Only an IP " "address is mandatory:\n" "\n" "IP Address - the address assigned to your computer (192.168.0.1)\n" "\n" "Subnet Mask - defines the local subnet (A/B/C network, " "255.255.255.0)\n" "\n" "Broadcast Address - normally the ip address with the last quart on " "255 (192.168.0.255)\n" "\n" "Gateway - the default route gateway, your (NAT) router/server " "(192.168.0.1)\n" "\n" "Nameservers - The servers supplied by your ISP to translate IP " "addresses to hostnames (www.google.com) " msgstr "" #: src/interface.c:563 msgid "window1" msgstr "" #: src/interface.c:577 msgid "window2" msgstr "" #: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "" |
|
From: <ale...@us...> - 2004-02-20 00:29:26
|
Update of /cvsroot/morphix/morph-scripts/mountmodule-1.0/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6026/debian Modified Files: rules Log Message: grrr, debian idiosyncracies... Index: rules =================================================================== RCS file: /cvsroot/morphix/morph-scripts/mountmodule-1.0/debian/rules,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rules 20 Feb 2004 00:15:31 -0000 1.1 --- rules 20 Feb 2004 00:18:42 -0000 1.2 *************** *** 55,58 **** --- 55,59 ---- # 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/ |
|
From: <ale...@us...> - 2004-02-20 00:26:14
|
Update of /cvsroot/morphix/morph-scripts/mountmodule-1.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5507 Added Files: mount_module Log Message: adding mount_module, simple script to load different versions of cloop images --- NEW FILE: mount_module --- #!/bin/sh # 2004 (c) Alex de Landgraaf <ale...@xs...> # Simple script to load a module, using either cloopv1 or cloopv2 # mount_module sourcefile.mod destinationdir [loop_number] # Note that normal operation doesn't give output, even if succeeded if [ -z "$1" -o -z "$2" ]; then echo "Simple script to load a module, using either cloopv1 or cloopv2" echo "Usage: mount_module sourcefile.mod destinationdir [loop_number]" echo "If loop_number isn't set, take the first minor nr that doesn't yet have a device node" echo "If it is, use the one set" exit 1 fi LOOPNR="$3" SOURCE="$1" DESTDR="$2" if [ -z "$3" ]; then LOOPNR=0 until [ ! -e "/dev/cloop$LOOPNR" ]; do LOOPNR=$(($LOOPNR+1)) done fi VERSION1=`head -n 2 $SOURCE | grep "V1.0 Format"` VERSION2=`head -n 2 $SOURCE | grep "V2.0 Format"` if [ -n "$VERSION1" ]; then # use secondary MAJORNR mknod /dev/cloop$LOOPNR b 241 $LOOPNR >/dev/null 2>&1 fi if [ -n "$VERSION2" ]; then # use primary MAJORNR mknod /dev/cloop$LOOPNR b 240 $LOOPNR >/dev/null 2>&1 fi if [ -z "$VERSION1" -a -z "$VERSION2" ]; then echo "Module is of an unknown version: can only handle version 1 or 2 modules" exit 1 fi losetup /dev/cloop$LOOPNR $SOURCE >/dev/null 2>&1 if [ ! -d "$DESTDR" ]; then mkdir $DESTDR >/dev/null 2>&1 if [ ! -d "$DESTDR" ]; then echo "Destination is not a directory, and it can't be made, aborting" exit 1 fi fi mount -o ro -t iso9660 /dev/cloop$LOOPNR $DESTDR >/dev/null 2>&1 exit 0 |
|
From: <ale...@us...> - 2004-02-20 00:26:13
|
Update of /cvsroot/morphix/morph-scripts/mountmodule-1.0/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5507/debian Added Files: README.Debian changelog control copyright dirs docs rules Log Message: adding mount_module, simple script to load different versions of cloop images --- NEW FILE: README.Debian --- mountmodule for Debian ---------------------- <possible notes regarding this package - if none, delete this file> -- Omega User <al...@am...>, Fri, 20 Feb 2004 01:10:18 +0100 --- NEW FILE: changelog --- mountmodule (1.0-1) unstable; urgency=low * Initial Release. -- Alex de Landgraaf <al...@am...> Fri, 20 Feb 2004 01:10:18 +0100 --- NEW FILE: control --- Source: mountmodule Section: admin Priority: optional Maintainer: Alex de Landgraaf <al...@am...> Build-Depends: debhelper (>= 4.0.0) Standards-Version: 3.6.0 Package: mountmodule Architecture: any Depends: bash Description: Mounts a Morphix (cloop) module to a desired location Simple script (mount_module) that sets up device nodes, and mounts a cloop image. Supports multiple cloop versions when cloop v1 is compiled using majornr 241, cloop v2 using majornr 240 --- NEW FILE: copyright --- This package was debianized by Alex de Landgraaf <al...@am...> on Fri, 20 Feb 2004 01:10:18 +0100. It was downloaded from http://www.morphix.org Upstream Author(s): Alex de Landgraaf <al...@am...> Copyright: GNU GPL v2, see www.gnu.org for details --- NEW FILE: dirs --- usr/bin usr/sbin --- NEW FILE: docs --- --- NEW FILE: rules --- #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # 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 clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs # Add here commands to install the package into debian/mountmodule. cp $(CURDIR)/mount_module $(CURDIR)/debian/mountmodule/usr/sbin/ # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs dh_installdocs dh_installexamples # dh_install # dh_installmenu # dh_installdebconf # dh_installlogrotate # dh_installemacsen # dh_installpam # dh_installmime # dh_installinit # dh_installcron # dh_installinfo dh_installman dh_link dh_strip dh_compress dh_fixperms # dh_perl # dh_python # dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure |
|
From: <ale...@us...> - 2004-02-20 00:25:12
|
Update of /cvsroot/morphix/morph-scripts/mountmodule-1.0/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5377/debian Log Message: Directory /cvsroot/morphix/morph-scripts/mountmodule-1.0/debian added to the repository |
|
From: <ale...@us...> - 2004-02-20 00:23:45
|
Update of /cvsroot/morphix/morph-scripts/mountmodule-1.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5183/mountmodule-1.0 Log Message: Directory /cvsroot/morphix/morph-scripts/mountmodule-1.0 added to the repository |
|
From: <cog...@us...> - 2004-02-19 12:29:30
|
Update of /cvsroot/morphix/gpppoe-conf/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12039 Modified Files: Makefile speedtouch-pppoe Log Message: Fixed a minor bug in speedtouch drivers' auto detection Index: Makefile =================================================================== RCS file: /cvsroot/morphix/gpppoe-conf/src/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 9 Feb 2004 00:00:52 -0000 1.4 --- Makefile 19 Feb 2004 12:19:11 -0000 1.5 *************** *** 84,88 **** PO_IN_DATADIR_TRUE = USE_NLS = yes ! VERSION = 0.2.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 --- 84,88 ---- PO_IN_DATADIR_TRUE = USE_NLS = yes ! VERSION = 0.3 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 Index: speedtouch-pppoe =================================================================== RCS file: /cvsroot/morphix/gpppoe-conf/src/speedtouch-pppoe,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** speedtouch-pppoe 9 Feb 2004 00:00:52 -0000 1.2 --- speedtouch-pppoe 19 Feb 2004 12:19:11 -0000 1.3 *************** *** 170,174 **** *) ! if which br2684ctl 2> /dev/null > /dev/null || [ -f /lib/modules/`uname -r`/kernel/drivers/usb/speedtch.o ]; then echo "Using kernel driver." export KERNEL="yes" --- 170,174 ---- *) ! if which br2684ctl 2> /dev/null > /dev/null && [ -f /lib/modules/`uname -r`/kernel/drivers/usb/speedtch.o ]; then echo "Using kernel driver." export KERNEL="yes" |
Update of /cvsroot/morphix/morphixinstaller/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4249/src Modified Files: Makefile.am callbacks.c callbacks.h instlib.c instlib.h interface.c interface.h Log Message: added dancing penguin? Index: Makefile.am =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 8 Feb 2004 20:42:53 -0000 1.7 --- Makefile.am 16 Feb 2004 23:42:12 -0000 1.8 *************** *** 6,10 **** @PACKAGE_CFLAGS@ ! bin_PROGRAMS = morphixinstaller morphixinstallercl morphixinstallercl_SOURCES = \ --- 6,10 ---- @PACKAGE_CFLAGS@ ! sbin_PROGRAMS = morphixinstaller morphixinstallercl morphixinstallercl_SOURCES = \ *************** *** 22,26 **** args.c args.h \ installer.h instlib.c instlib.h \ ! cmdline.h cmdline.c morphixinstallercl_LDFLAGS = -pthread --- 22,27 ---- args.c args.h \ installer.h instlib.c instlib.h \ ! cmdline.h cmdline.c \ ! ui.c ui.h morphixinstallercl_LDFLAGS = -pthread Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/callbacks.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** callbacks.c 15 Feb 2004 23:41:51 -0000 1.15 --- callbacks.c 16 Feb 2004 23:42:12 -0000 1.16 *************** *** 26,29 **** --- 26,30 ---- #include "installer.h" #include "instlib.h" + #include "ui.h" #define _XOPEN_SOURCE *************** *** 54,97 **** 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; - gdouble fraction = GetCurrentPercentage(global_cdrom_size,GetPartUsedSize(GetSelectedRoot())); - 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 on_helpbutton_clicked (GtkButton *button, --- 55,59 ---- *************** *** 99,103 **** { ! } --- 61,65 ---- { ! }*/ *************** *** 171,175 **** } - void on_closebuttonNoPart_clicked (GtkButton *button, --- 133,136 ---- *************** *** 179,183 **** } - void on_cancelbuttonRoot_clicked (GtkButton *button, --- 140,143 ---- *************** *** 206,291 **** } - 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 --- 166,169 ---- *************** *** 335,345 **** - void ShowError(gchar *error) { - error_msg = error; - ErrorMessage = create_ErrorMessage (); - gtk_widget_show (ErrorMessage); - - - } void --- 213,216 ---- *************** *** 438,442 **** gtk_widget_show(boot); } ! // if there are more than one harddisk, throw up a combo box so // the user can select the right MBR GList *hdlist = GetHarddiskList(FALSE); --- 309,313 ---- gtk_widget_show(boot); } ! // if there is more than one harddisk, throw up a combo box so // the user can select the right MBR GList *hdlist = GetHarddiskList(FALSE); *************** *** 451,455 **** } - void on_buttonCancelBoot_clicked (GtkButton *button, --- 322,325 ---- *************** *** 460,464 **** } - void on_buttonOkBoot_clicked (GtkWidget *widget, --- 330,333 ---- *************** *** 565,584 **** } ! 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 --- 434,438 ---- } ! void *************** *** 603,652 **** } - - - void - on_ext_2___standard_linux_filesystem1_activate - (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_ext_3___journaling_file_system1_activate - (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_reiserfs___journaling_file_system1_activate - (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_xfs___journaling_file_system1_activate - (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_item1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - void on_SelectSwap_show (GtkWidget *widget, --- 457,460 ---- *************** *** 740,743 **** --- 548,552 ---- GtkWidget *progbar = lookup_widget(widget,"progressbar11"); GtkWidget *image = lookup_widget(widget,"imageInstallProcess"); + GdkPixbufAnimation *anim = gdk_pixbuf_animation_new_from_file(PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/dancingpenguin.gif",NULL); if (anim != NULL) { *************** *** 745,748 **** --- 554,558 ---- } global_cdrom_size = GetCdromSize(); + updateInstallLabel(0,(gint)GetCurrentSize(global_cdrom_size)); timer = g_timeout_add(10000, (GSourceFunc)progress_timeout_size,progbar); } Index: callbacks.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/callbacks.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** callbacks.h 9 Jul 2003 19:26:17 -0000 1.5 --- callbacks.h 16 Feb 2004 23:42:12 -0000 1.6 *************** *** 14,25 **** along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <gtk/gtk.h> extern GtkWidget *HelpDialog; ! void on_helpbutton_clicked (GtkButton *button, gpointer user_data); ! void on_okbuttonStart_clicked (GtkButton *button, --- 14,27 ---- along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + #ifndef CALLBACKS_H + #define CALLBACKS_H #include <gtk/gtk.h> extern GtkWidget *HelpDialog; ! /* void on_helpbutton_clicked (GtkButton *button, gpointer user_data); ! */ void on_okbuttonStart_clicked (GtkButton *button, *************** *** 152,156 **** on_SelectHarddisk_show (GtkWidget *widget, gpointer user_data); ! void on_ext_2___standard_linux_filesystem1_activate --- 154,158 ---- on_SelectHarddisk_show (GtkWidget *widget, gpointer user_data); ! /* void on_ext_2___standard_linux_filesystem1_activate *************** *** 176,180 **** on_item1_activate (GtkMenuItem *menuitem, gpointer user_data); ! void on_SelectSwap_show (GtkWidget *widget, --- 178,182 ---- on_item1_activate (GtkMenuItem *menuitem, gpointer user_data); ! */ void on_SelectSwap_show (GtkWidget *widget, *************** *** 237,238 **** --- 239,242 ---- on_SelectRoot_realize (GtkWidget *widget, gpointer user_data); + + #endif Index: instlib.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** instlib.c 15 Feb 2004 23:41:51 -0000 1.12 --- instlib.c 16 Feb 2004 23:42:12 -0000 1.13 *************** *** 1872,1875 **** --- 1872,1879 ---- */ + gdouble GetCurrentSize(gint cdrom_size) { + return cdrom_size * 2.8; + } + gdouble GetCurrentPercentage(gint cdrom_size, gint curr_rootpart_size) { gdouble perc; Index: instlib.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** instlib.h 15 Feb 2004 23:41:51 -0000 1.6 --- instlib.h 16 Feb 2004 23:42:12 -0000 1.7 *************** *** 272,275 **** --- 272,276 ---- gint GetPartUsedSize(gchar *partition); + gdouble GetCurrentSize(gint cdrom_size); /* Index: interface.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/interface.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** interface.c 15 Feb 2004 23:41:51 -0000 1.13 --- interface.c 16 Feb 2004 23:42:12 -0000 1.14 *************** *** 591,597 **** GTK_WIDGET_SET_FLAGS (closebuttonNoPart, GTK_CAN_DEFAULT); ! g_signal_connect ((gpointer) helpbutton5, "clicked", ! G_CALLBACK (on_helpbutton_clicked), ! NULL); g_signal_connect ((gpointer) closebuttonNoPart, "clicked", G_CALLBACK (on_closebuttonNoPart_clicked), --- 591,597 ---- GTK_WIDGET_SET_FLAGS (closebuttonNoPart, GTK_CAN_DEFAULT); ! g_signal_connect_swapped ((gpointer) helpbutton5, "clicked", ! G_CALLBACK (gtk_widget_show), ! GTK_OBJECT (HelpDialog)); g_signal_connect ((gpointer) closebuttonNoPart, "clicked", G_CALLBACK (on_closebuttonNoPart_clicked), *************** *** 634,644 **** GtkWidget *menu3; GtkWidget *imagemenuitem1; ! GtkWidget *image28; GtkWidget *imagemenuitem2; ! GtkWidget *image29; GtkWidget *imagemenuitem3; ! GtkWidget *image30; GtkWidget *imagemenuitem4; ! GtkWidget *image31; GtkWidget *ExpertButtonRoot; GtkWidget *alignment1; --- 634,644 ---- GtkWidget *menu3; GtkWidget *imagemenuitem1; ! GtkWidget *image34; GtkWidget *imagemenuitem2; ! GtkWidget *image35; GtkWidget *imagemenuitem3; ! GtkWidget *image36; GtkWidget *imagemenuitem4; ! GtkWidget *image37; GtkWidget *ExpertButtonRoot; GtkWidget *alignment1; *************** *** 733,739 **** gtk_container_add (GTK_CONTAINER (menu3), imagemenuitem1); ! image28 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU); ! gtk_widget_show (image28); ! gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (imagemenuitem1), image28); imagemenuitem2 = gtk_image_menu_item_new_with_mnemonic (_("Ext 3 - Journaling File System")); --- 733,739 ---- gtk_container_add (GTK_CONTAINER (menu3), imagemenuitem1); ! image34 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU); ! gtk_widget_show (image34); ! gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (imagemenuitem1), image34); imagemenuitem2 = gtk_image_menu_item_new_with_mnemonic (_("Ext 3 - Journaling File System")); *************** *** 741,747 **** gtk_container_add (GTK_CONTAINER (menu3), imagemenuitem2); ! image29 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU); ! gtk_widget_show (image29); ! gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (imagemenuitem2), image29); imagemenuitem3 = gtk_image_menu_item_new_with_mnemonic (_("ReiserFS - Journaling File System")); --- 741,747 ---- gtk_container_add (GTK_CONTAINER (menu3), imagemenuitem2); ! image35 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU); ! gtk_widget_show (image35); ! gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (imagemenuitem2), image35); imagemenuitem3 = gtk_image_menu_item_new_with_mnemonic (_("ReiserFS - Journaling File System")); *************** *** 749,755 **** gtk_container_add (GTK_CONTAINER (menu3), imagemenuitem3); ! image30 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU); ! gtk_widget_show (image30); ! gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (imagemenuitem3), image30); imagemenuitem4 = gtk_image_menu_item_new_with_mnemonic (_("XFS - Journaling File System")); --- 749,755 ---- gtk_container_add (GTK_CONTAINER (menu3), imagemenuitem3); ! image36 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU); ! gtk_widget_show (image36); ! gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (imagemenuitem3), image36); imagemenuitem4 = gtk_image_menu_item_new_with_mnemonic (_("XFS - Journaling File System")); *************** *** 757,763 **** gtk_container_add (GTK_CONTAINER (menu3), imagemenuitem4); ! image31 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU); ! gtk_widget_show (image31); ! gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (imagemenuitem4), image31); gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenuFS2), menu3); --- 757,763 ---- gtk_container_add (GTK_CONTAINER (menu3), imagemenuitem4); ! image37 = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU); ! gtk_widget_show (image37); ! gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (imagemenuitem4), image37); gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenuFS2), menu3); *************** *** 815,830 **** G_CALLBACK (on_SelectRoot_realize), NULL); - g_signal_connect ((gpointer) imagemenuitem1, "activate", - G_CALLBACK (on_ext_2___standard_linux_filesystem1_activate), - NULL); - g_signal_connect ((gpointer) imagemenuitem2, "activate", - G_CALLBACK (on_ext_3___journaling_file_system1_activate), - NULL); - g_signal_connect ((gpointer) imagemenuitem3, "activate", - G_CALLBACK (on_reiserfs___journaling_file_system1_activate), - NULL); - g_signal_connect ((gpointer) imagemenuitem4, "activate", - G_CALLBACK (on_xfs___journaling_file_system1_activate), - NULL); g_signal_connect ((gpointer) ExpertButtonRoot, "clicked", G_CALLBACK (on_ExpertButtonRoot_clicked), --- 815,818 ---- *************** *** 857,867 **** GLADE_HOOKUP_OBJECT (SelectRoot, menu3, "menu3"); GLADE_HOOKUP_OBJECT (SelectRoot, imagemenuitem1, "imagemenuitem1"); ! GLADE_HOOKUP_OBJECT (SelectRoot, image28, "image28"); GLADE_HOOKUP_OBJECT (SelectRoot, imagemenuitem2, "imagemenuitem2"); ! GLADE_HOOKUP_OBJECT (SelectRoot, image29, "image29"); GLADE_HOOKUP_OBJECT (SelectRoot, imagemenuitem3, "imagemenuitem3"); ! GLADE_HOOKUP_OBJECT (SelectRoot, image30, "image30"); GLADE_HOOKUP_OBJECT (SelectRoot, imagemenuitem4, "imagemenuitem4"); ! GLADE_HOOKUP_OBJECT (SelectRoot, image31, "image31"); GLADE_HOOKUP_OBJECT (SelectRoot, ExpertButtonRoot, "ExpertButtonRoot"); GLADE_HOOKUP_OBJECT (SelectRoot, alignment1, "alignment1"); --- 845,855 ---- GLADE_HOOKUP_OBJECT (SelectRoot, menu3, "menu3"); GLADE_HOOKUP_OBJECT (SelectRoot, imagemenuitem1, "imagemenuitem1"); ! GLADE_HOOKUP_OBJECT (SelectRoot, image34, "image34"); GLADE_HOOKUP_OBJECT (SelectRoot, imagemenuitem2, "imagemenuitem2"); ! GLADE_HOOKUP_OBJECT (SelectRoot, image35, "image35"); GLADE_HOOKUP_OBJECT (SelectRoot, imagemenuitem3, "imagemenuitem3"); ! GLADE_HOOKUP_OBJECT (SelectRoot, image36, "image36"); GLADE_HOOKUP_OBJECT (SelectRoot, imagemenuitem4, "imagemenuitem4"); ! GLADE_HOOKUP_OBJECT (SelectRoot, image37, "image37"); GLADE_HOOKUP_OBJECT (SelectRoot, ExpertButtonRoot, "ExpertButtonRoot"); GLADE_HOOKUP_OBJECT (SelectRoot, alignment1, "alignment1"); *************** *** 974,1070 **** GtkWidget* - create_NoRoot (void) - { - GtkWidget *NoRoot; - GtkWidget *vbox17; - GtkWidget *hbox15; - GtkWidget *vbox18; - GtkWidget *image9; - GtkWidget *vseparator9; - GtkWidget *hbox16; - GtkWidget *vbox19; - GtkWidget *label11; - GtkWidget *hbuttonbox3; - GtkWidget *helpbuttonNoRoot; - GtkWidget *buttonCancelNoRoot; - - NoRoot = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (NoRoot), _("Morphix Install")); - gtk_window_set_position (GTK_WINDOW (NoRoot), GTK_WIN_POS_CENTER); - - vbox17 = GTK_DIALOG (NoRoot)->vbox; - gtk_widget_show (vbox17); - - hbox15 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox15); - gtk_box_pack_start (GTK_BOX (vbox17), hbox15, TRUE, TRUE, 0); - - vbox18 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox18); - gtk_box_pack_start (GTK_BOX (hbox15), vbox18, TRUE, TRUE, 0); - - image9 = create_pixmap (NoRoot, NULL); - gtk_widget_show (image9); - gtk_box_pack_start (GTK_BOX (vbox18), image9, TRUE, TRUE, 0); - - vseparator9 = gtk_vseparator_new (); - gtk_widget_show (vseparator9); - gtk_box_pack_start (GTK_BOX (hbox15), vseparator9, FALSE, FALSE, 0); - - hbox16 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox16); - gtk_box_pack_end (GTK_BOX (hbox15), hbox16, TRUE, FALSE, 0); - - vbox19 = gtk_vbox_new (TRUE, 0); - gtk_widget_show (vbox19); - gtk_box_pack_start (GTK_BOX (hbox16), vbox19, TRUE, TRUE, 0); - - label11 = gtk_label_new (_("Couldn't find a Linux partition\non the selected harddisk.\n\nPlease go back and select a different harddisk\nor add a Linux partition to the harddisk.\n")); - gtk_widget_show (label11); - gtk_box_pack_start (GTK_BOX (vbox19), label11, FALSE, FALSE, 0); - gtk_widget_set_size_request (label11, 400, 200); - gtk_label_set_justify (GTK_LABEL (label11), GTK_JUSTIFY_CENTER); - gtk_label_set_line_wrap (GTK_LABEL (label11), TRUE); - gtk_misc_set_padding (GTK_MISC (label11), 28, 0); - - hbuttonbox3 = GTK_DIALOG (NoRoot)->action_area; - gtk_widget_show (hbuttonbox3); - gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox3), GTK_BUTTONBOX_END); - - helpbuttonNoRoot = gtk_button_new_from_stock ("gtk-help"); - gtk_widget_show (helpbuttonNoRoot); - gtk_dialog_add_action_widget (GTK_DIALOG (NoRoot), helpbuttonNoRoot, GTK_RESPONSE_HELP); - GTK_WIDGET_SET_FLAGS (helpbuttonNoRoot, GTK_CAN_DEFAULT); - - buttonCancelNoRoot = gtk_button_new_from_stock ("gtk-go-back"); - gtk_widget_show (buttonCancelNoRoot); - gtk_dialog_add_action_widget (GTK_DIALOG (NoRoot), buttonCancelNoRoot, GTK_RESPONSE_CLOSE); - GTK_WIDGET_SET_FLAGS (buttonCancelNoRoot, GTK_CAN_DEFAULT); - - g_signal_connect ((gpointer) helpbuttonNoRoot, "clicked", - G_CALLBACK (on_helpbutton_clicked), - NULL); - g_signal_connect ((gpointer) buttonCancelNoRoot, "clicked", - G_CALLBACK (on_buttonCancelNoRoot_clicked), - NULL); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (NoRoot, NoRoot, "NoRoot"); - GLADE_HOOKUP_OBJECT_NO_REF (NoRoot, vbox17, "vbox17"); - GLADE_HOOKUP_OBJECT (NoRoot, hbox15, "hbox15"); - GLADE_HOOKUP_OBJECT (NoRoot, vbox18, "vbox18"); - GLADE_HOOKUP_OBJECT (NoRoot, image9, "image9"); - GLADE_HOOKUP_OBJECT (NoRoot, vseparator9, "vseparator9"); - GLADE_HOOKUP_OBJECT (NoRoot, hbox16, "hbox16"); - GLADE_HOOKUP_OBJECT (NoRoot, vbox19, "vbox19"); - GLADE_HOOKUP_OBJECT (NoRoot, label11, "label11"); - GLADE_HOOKUP_OBJECT_NO_REF (NoRoot, hbuttonbox3, "hbuttonbox3"); - GLADE_HOOKUP_OBJECT (NoRoot, helpbuttonNoRoot, "helpbuttonNoRoot"); - GLADE_HOOKUP_OBJECT (NoRoot, buttonCancelNoRoot, "buttonCancelNoRoot"); - - return NoRoot; - } - - GtkWidget* create_DoFilesystem (void) { --- 962,965 ---- *************** *** 1118,1122 **** GtkWidget *vbox48; GtkWidget *label15; ! GtkWidget *label48; GtkWidget *progressbar11; --- 1013,1017 ---- GtkWidget *vbox48; GtkWidget *label15; ! GtkWidget *labelInstallprocess; GtkWidget *progressbar11; *************** *** 1154,1160 **** gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_CENTER); ! label48 = gtk_label_new (_("XXXXMiB from a total of approx. XXXXMiB have been copied")); ! gtk_widget_show (label48); ! gtk_box_pack_start (GTK_BOX (vbox48), label48, FALSE, FALSE, 0); progressbar11 = gtk_progress_bar_new (); --- 1049,1055 ---- gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_CENTER); ! labelInstallprocess = gtk_label_new (_("XXXXMiB from a total of approx. XXXXMiB have been copied")); ! gtk_widget_show (labelInstallprocess); ! gtk_box_pack_start (GTK_BOX (vbox48), labelInstallprocess, FALSE, FALSE, 0); progressbar11 = gtk_progress_bar_new (); *************** *** 1174,1178 **** GLADE_HOOKUP_OBJECT (DoInstall, vbox48, "vbox48"); GLADE_HOOKUP_OBJECT (DoInstall, label15, "label15"); ! GLADE_HOOKUP_OBJECT (DoInstall, label48, "label48"); GLADE_HOOKUP_OBJECT (DoInstall, progressbar11, "progressbar11"); --- 1069,1073 ---- GLADE_HOOKUP_OBJECT (DoInstall, vbox48, "vbox48"); GLADE_HOOKUP_OBJECT (DoInstall, label15, "label15"); ! GLADE_HOOKUP_OBJECT (DoInstall, labelInstallprocess, "labelInstallprocess"); GLADE_HOOKUP_OBJECT (DoInstall, progressbar11, "progressbar11"); *************** *** 1279,1285 **** GTK_WIDGET_SET_FLAGS (buttonOkHost, GTK_CAN_DEFAULT); ! g_signal_connect ((gpointer) helpbuttonHost, "clicked", ! G_CALLBACK (on_helpbutton_clicked), ! NULL); g_signal_connect_swapped ((gpointer) buttonOkHost, "clicked", G_CALLBACK (on_buttonOkHost_clicked), --- 1174,1180 ---- GTK_WIDGET_SET_FLAGS (buttonOkHost, GTK_CAN_DEFAULT); ! g_signal_connect_swapped ((gpointer) helpbuttonHost, "clicked", ! G_CALLBACK (gtk_widget_show), ! GTK_OBJECT (HelpDialog)); g_signal_connect_swapped ((gpointer) buttonOkHost, "clicked", G_CALLBACK (on_buttonOkHost_clicked), *************** *** 1611,1617 **** GTK_WIDGET_SET_FLAGS (buttonOkUser, GTK_CAN_DEFAULT); ! g_signal_connect ((gpointer) helpbuttonUser, "clicked", ! G_CALLBACK (on_helpbutton_clicked), ! NULL); g_signal_connect ((gpointer) buttonCancelUser, "clicked", G_CALLBACK (on_buttonCancelUser_clicked), --- 1506,1512 ---- GTK_WIDGET_SET_FLAGS (buttonOkUser, GTK_CAN_DEFAULT); ! g_signal_connect_swapped ((gpointer) helpbuttonUser, "clicked", ! G_CALLBACK (gtk_widget_show), ! GTK_OBJECT (HelpDialog)); g_signal_connect ((gpointer) buttonCancelUser, "clicked", G_CALLBACK (on_buttonCancelUser_clicked), *************** *** 2377,2383 **** GTK_WIDGET_SET_FLAGS (okButtonExpert, GTK_CAN_DEFAULT); ! g_signal_connect ((gpointer) helpbutton9, "clicked", ! G_CALLBACK (on_helpbutton_clicked), ! NULL); g_signal_connect ((gpointer) cancelButtonExpert, "clicked", G_CALLBACK (on_cancelButtonExpert_clicked), --- 2272,2278 ---- GTK_WIDGET_SET_FLAGS (okButtonExpert, GTK_CAN_DEFAULT); ! g_signal_connect_swapped ((gpointer) helpbutton9, "clicked", ! G_CALLBACK (gtk_widget_show), ! GTK_OBJECT (HelpDialog)); g_signal_connect ((gpointer) cancelButtonExpert, "clicked", G_CALLBACK (on_cancelButtonExpert_clicked), Index: interface.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/interface.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** interface.h 3 Jan 2004 21:59:57 -0000 1.4 --- interface.h 16 Feb 2004 23:42:12 -0000 1.5 *************** *** 10,14 **** GtkWidget* create_SelectRoot (void); GtkWidget* create_SmallRoot (void); - GtkWidget* create_NoRoot (void); GtkWidget* create_DoFilesystem (void); GtkWidget* create_DoInstall (void); --- 10,13 ---- |
|
From: <ale...@us...> - 2004-02-16 23:50:33
|
Update of /cvsroot/morphix/morphixinstaller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4249 Modified Files: morphixinstaller.glade trans.c Log Message: added dancing penguin? Index: morphixinstaller.glade =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/morphixinstaller.glade,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** morphixinstaller.glade 15 Feb 2004 23:41:51 -0000 1.12 --- morphixinstaller.glade 16 Feb 2004 23:42:12 -0000 1.13 *************** *** 965,969 **** <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-11</property> ! <signal name="clicked" handler="on_helpbutton_clicked" last_modification_time="Fri, 31 Jan 2003 22:48:59 GMT"/> </widget> </child> --- 965,969 ---- <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-11</property> ! <signal name="clicked" handler="gtk_widget_show" object="HelpDialog" last_modification_time="Mon, 16 Feb 2004 09:34:11 GMT"/> </widget> </child> *************** *** 1372,1379 **** <property name="label" translatable="yes">Ext 2 - Standard Linux Filesystem</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_ext_2_-_standard_linux_filesystem1_activate" last_modification_time="Sat, 01 Feb 2003 02:08:10 GMT"/> <child internal-child="image"> ! <widget class="GtkImage" id="image28"> <property name="visible">True</property> <property name="stock">gtk-yes</property> --- 1372,1378 ---- <property name="label" translatable="yes">Ext 2 - Standard Linux Filesystem</property> <property name="use_underline">True</property> <child internal-child="image"> ! <widget class="GtkImage" id="image34"> <property name="visible">True</property> <property name="stock">gtk-yes</property> *************** *** 1393,1400 **** <property name="label" translatable="yes">Ext 3 - Journaling File System</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_ext_3_-_journaling_file_system1_activate" last_modification_time="Sat, 01 Feb 2003 02:08:10 GMT"/> <child internal-child="image"> ! <widget class="GtkImage" id="image29"> <property name="visible">True</property> <property name="stock">gtk-yes</property> --- 1392,1398 ---- <property name="label" translatable="yes">Ext 3 - Journaling File System</property> <property name="use_underline">True</property> <child internal-child="image"> ! <widget class="GtkImage" id="image35"> <property name="visible">True</property> <property name="stock">gtk-yes</property> *************** *** 1414,1421 **** <property name="label" translatable="yes">ReiserFS - Journaling File System</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_reiserfs_-_journaling_file_system1_activate" last_modification_time="Sat, 01 Feb 2003 02:08:10 GMT"/> <child internal-child="image"> ! <widget class="GtkImage" id="image30"> <property name="visible">True</property> <property name="stock">gtk-yes</property> --- 1412,1418 ---- <property name="label" translatable="yes">ReiserFS - Journaling File System</property> <property name="use_underline">True</property> <child internal-child="image"> ! <widget class="GtkImage" id="image36"> <property name="visible">True</property> <property name="stock">gtk-yes</property> *************** *** 1435,1442 **** <property name="label" translatable="yes">XFS - Journaling File System</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_xfs_-_journaling_file_system1_activate" last_modification_time="Sat, 01 Feb 2003 02:08:10 GMT"/> <child internal-child="image"> ! <widget class="GtkImage" id="image31"> <property name="visible">True</property> <property name="stock">gtk-yes</property> --- 1432,1438 ---- <property name="label" translatable="yes">XFS - Journaling File System</property> <property name="use_underline">True</property> <child internal-child="image"> ! <widget class="GtkImage" id="image37"> <property name="visible">True</property> <property name="stock">gtk-yes</property> *************** *** 1752,1928 **** </widget> - <widget class="GtkDialog" id="NoRoot"> - <property name="visible">True</property> - <property name="title" translatable="yes">Morphix Install</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_CENTER</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="has_separator">True</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="vbox17"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="hbuttonbox3"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="helpbuttonNoRoot"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-help</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="response_id">-11</property> - <signal name="clicked" handler="on_helpbutton_clicked" last_modification_time="Fri, 31 Jan 2003 22:58:15 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="buttonCancelNoRoot"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-go-back</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="response_id">-7</property> - <signal name="clicked" handler="on_buttonCancelNoRoot_clicked" last_modification_time="Fri, 31 Jan 2003 22:58:39 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox15"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkVBox" id="vbox18"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkImage" id="image9"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkVSeparator" id="vseparator9"> - <property name="visible">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox16"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkVBox" id="vbox19"> - <property name="visible">True</property> - <property name="homogeneous">True</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="label11"> - <property name="width_request">400</property> - <property name="height_request">200</property> - <property name="visible">True</property> - <property name="label" translatable="yes">Couldn't find a Linux partition - on the selected harddisk. - - Please go back and select a different harddisk - or add a Linux partition to the harddisk. - </property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">28</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> - </widget> - <widget class="GtkWindow" id="DoFilesystem"> <property name="visible">True</property> --- 1748,1751 ---- *************** *** 2061,2065 **** <child> ! <widget class="GtkLabel" id="label48"> <property name="visible">True</property> <property name="label" translatable="yes">XXXXMiB from a total of approx. XXXXMiB have been copied</property> --- 1884,1888 ---- <child> ! <widget class="GtkLabel" id="labelInstallprocess"> <property name="visible">True</property> <property name="label" translatable="yes">XXXXMiB from a total of approx. XXXXMiB have been copied</property> *************** *** 2146,2150 **** <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-11</property> ! <signal name="clicked" handler="on_helpbutton_clicked" last_modification_time="Fri, 31 Jan 2003 23:02:56 GMT"/> </widget> </child> --- 1969,1973 ---- <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-11</property> ! <signal name="clicked" handler="gtk_widget_show" object="HelpDialog" last_modification_time="Mon, 16 Feb 2004 09:34:37 GMT"/> </widget> </child> *************** *** 2718,2722 **** <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-11</property> ! <signal name="clicked" handler="on_helpbutton_clicked" last_modification_time="Fri, 31 Jan 2003 23:03:56 GMT"/> </widget> </child> --- 2541,2545 ---- <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-11</property> ! <signal name="clicked" handler="gtk_widget_show" object="HelpDialog" last_modification_time="Mon, 16 Feb 2004 09:34:57 GMT"/> </widget> </child> *************** *** 4013,4017 **** <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-11</property> ! <signal name="clicked" handler="on_helpbutton_clicked" last_modification_time="Wed, 30 Apr 2003 15:48:33 GMT"/> </widget> </child> --- 3836,3840 ---- <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-11</property> ! <signal name="clicked" handler="gtk_widget_show" object="HelpDialog" last_modification_time="Mon, 16 Feb 2004 09:35:15 GMT"/> </widget> </child> Index: trans.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/trans.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** trans.c 15 Feb 2004 23:41:51 -0000 1.12 --- trans.c 16 Feb 2004 23:42:12 -0000 1.13 *************** *** 87,97 **** "than we recommend, make sure the \n" "partition is bigger than X MB"); - gchar *s = N_("Morphix Install"); - gchar *s = N_("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" - ""); gchar *s = N_("Processing..."); gchar *s = N_("<b>Creating filesystem, please wait...</b>"); --- 87,90 ---- |
|
From: <ale...@us...> - 2004-02-16 00:08:03
|
Update of /cvsroot/morphix/gpppoe-conf/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28563 Modified Files: changelog Log Message: used correct version this time... Index: changelog =================================================================== RCS file: /cvsroot/morphix/gpppoe-conf/debian/changelog,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** changelog 15 Feb 2004 23:53:15 -0000 1.1 --- changelog 16 Feb 2004 00:00:27 -0000 1.2 *************** *** 1,2 **** --- 1,8 ---- + gpppoeconf (0.3) unstable; urgency=low + + * updated version to Tiago's + + -- Alex de Landgraaf <ale...@xs...> Mon, 16 Feb 2004 00:46:59 +0000 + gpppoeconf (0.1-1) unstable; urgency=low |
|
From: <ale...@us...> - 2004-02-16 00:00:50
|
Update of /cvsroot/morphix/gpppoe-conf/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27048/po Modified Files: Makefile Makefile.in Log Message: debianized gpppoeconf Index: Makefile =================================================================== RCS file: /cvsroot/morphix/gpppoe-conf/po/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 23 Nov 2003 22:56:27 -0000 1.3 --- Makefile 15 Feb 2004 23:53:15 -0000 1.4 *************** *** 24,28 **** ! prefix = /usr/local exec_prefix = ${prefix} datadir = ${prefix}/share --- 24,28 ---- ! prefix = /usr exec_prefix = ${prefix} datadir = ${prefix}/share *************** *** 37,41 **** MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs ! CC = gcc GENCAT = @GENCAT@ GMSGFMT = /usr/bin/msgfmt --- 37,41 ---- MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs ! CC = i386-linux-gcc GENCAT = @GENCAT@ GMSGFMT = /usr/bin/msgfmt Index: Makefile.in =================================================================== RCS file: /cvsroot/morphix/gpppoe-conf/po/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 23 Nov 2003 22:56:27 -0000 1.3 --- Makefile.in 15 Feb 2004 23:53:15 -0000 1.4 *************** *** 24,28 **** ! prefix = /usr/local exec_prefix = ${prefix} datadir = ${prefix}/share --- 24,28 ---- ! prefix = /usr exec_prefix = ${prefix} datadir = ${prefix}/share *************** *** 37,41 **** MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs ! CC = gcc GENCAT = @GENCAT@ GMSGFMT = /usr/bin/msgfmt --- 37,41 ---- MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs ! CC = i386-linux-gcc GENCAT = @GENCAT@ GMSGFMT = /usr/bin/msgfmt |
|
From: <ale...@us...> - 2004-02-16 00:00:49
|
Update of /cvsroot/morphix/gpppoe-conf/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27048/debian Added Files: README.Debian changelog control copyright dirs docs gpppoeconf.doc-base.EX manpage.1.ex manpage.sgml.ex postinst.ex postrm.ex preinst.ex prerm.ex rules Log Message: debianized gpppoeconf --- NEW FILE: README.Debian --- gpppoeconf for Debian --------------------- <possible notes regarding this package - if none, delete this file> -- Morphix User <lala@myBox>, Mon, 16 Feb 2004 00:33:16 +0000 --- NEW FILE: changelog --- gpppoeconf (0.1-1) unstable; urgency=low * Initial Release. -- Alex de Landgraaf <ale...@xs...> Mon, 16 Feb 2004 00:33:16 +0000 --- NEW FILE: control --- Source: gpppoeconf Section: net Priority: optional Maintainer: Alex de Landgraaf <ale...@xs...> Build-Depends: debhelper (>= 4.0.0) Standards-Version: 3.6.0 Package: gpppoeconf Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: PPPoe configuration tool UI for setting up pppoe for dsl users. Also includes a speedtouch feature for configuring these usb modems --- NEW FILE: copyright --- This package was debianized by Morphix User <lala@myBox> on Mon, 16 Feb 2004 00:33:16 +0000. It was downloaded from <fill in ftp site> Upstream Author(s): <put author(s) name and email here> Copyright: <Must follow here> --- NEW FILE: dirs --- usr/bin usr/sbin --- NEW FILE: docs --- NEWS README --- NEW FILE: gpppoeconf.doc-base.EX --- Document: gpppoeconf Title: Debian gpppoeconf Manual Author: <insert document author here> Abstract: This manual describes what gpppoeconf is and how it can be used to manage online manuals on Debian systems. Section: unknown Format: debiandoc-sgml Files: /usr/share/doc/gpppoeconf/gpppoeconf.sgml.gz Format: postscript Files: /usr/share/doc/gpppoeconf/gpppoeconf.ps.gz Format: text Files: /usr/share/doc/gpppoeconf/gpppoeconf.text.gz Format: HTML Index: /usr/share/doc/gpppoeconf/html/index.html Files: /usr/share/doc/gpppoeconf/html/*.html --- NEW FILE: manpage.1.ex --- .\" Hey, EMACS: -*- nroff -*- .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) .TH GPPPOECONF SECTION "February 16, 2004" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: .\" .nh disable hyphenation .\" .hy enable hyphenation .\" .ad l left justify .\" .ad b justify to both left and right margins .\" .nf disable filling .\" .fi enable filling .\" .br insert line break .\" .sp <n> insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME gpppoeconf \- program to do something .SH SYNOPSIS .B gpppoeconf .RI [ options ] " files" ... .br .B bar .RI [ options ] " files" ... .SH DESCRIPTION This manual page documents briefly the .B gpppoeconf and .B bar commands. This manual page was written for the Debian distribution because the original program does not have a manual page. Instead, it has documentation in the GNU Info format; see below. .PP .\" TeX users may be more comfortable with the \fB<whatever>\fP and .\" \fI<whatever>\fP escape sequences to invode bold face and italics, .\" respectively. \fBgpppoeconf\fP is a program that... .SH OPTIONS These programs follow the usual GNU command line syntax, with long options starting with two dashes (`-'). A summary of options is included below. For a complete description, see the Info files. .TP .B \-h, \-\-help Show summary of options. .TP .B \-v, \-\-version Show version of program. .SH SEE ALSO .BR bar (1), .BR baz (1). .br The programs are documented fully by .IR "The Rise and Fall of a Fooish Bar" , available via the Info system. .SH AUTHOR This manual page was written by Morphix User <lala@myBox>, for the Debian project (but may be used by others). --- NEW FILE: manpage.sgml.ex --- <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ <!-- Process this file with docbook-to-man to generate an nroff manual page: `docbook-to-man manpage.sgml > manpage.1'. You may view the manual page with: `docbook-to-man manpage.sgml | nroff -man | less'. A typical entry in a Makefile or Makefile.am is: manpage.1: manpage.sgml docbook-to-man $< > $@ The docbook-to-man binary is found in the docbook-to-man package. Please remember that if you create the nroff version in one of the debian/rules file targets (such as build), you will need to include docbook-to-man in your Build-Depends control field. --> <!-- Fill in your name for FIRSTNAME and SURNAME. --> <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>"> <!ENTITY dhsurname "<surname>SURNAME</surname>"> <!-- Please adjust the date whenever revising the manpage. --> <!ENTITY dhdate "<date>February 16, 2004</date>"> <!-- SECTION should be 1-8, maybe w/ subsection other parameters are allowed: see man(7), man(1). --> <!ENTITY dhsection "<manvolnum>SECTION</manvolnum>"> <!ENTITY dhemail "<email>lala@myBox</email>"> <!ENTITY dhusername "Morphix User"> <!ENTITY dhucpackage "<refentrytitle>GPPPOECONF</refentrytitle>"> <!ENTITY dhpackage "gpppoeconf"> <!ENTITY debian "<productname>Debian</productname>"> <!ENTITY gnu "<acronym>GNU</acronym>"> <!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> ]> <refentry> <refentryinfo> <address> &dhemail; </address> <author> &dhfirstname; &dhsurname; </author> <copyright> <year>2003</year> <holder>&dhusername;</holder> </copyright> &dhdate; </refentryinfo> <refmeta> &dhucpackage; &dhsection; </refmeta> <refnamediv> <refname>&dhpackage;</refname> <refpurpose>program to do something</refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> <command>&dhpackage;</command> <arg><option>-e <replaceable>this</replaceable></option></arg> <arg><option>--example <replaceable>that</replaceable></option></arg> </cmdsynopsis> </refsynopsisdiv> <refsect1> <title>DESCRIPTION</title> <para>This manual page documents briefly the <command>&dhpackage;</command> and <command>bar</command> commands.</para> <para>This manual page was written for the &debian; distribution because the original program does not have a manual page. Instead, it has documentation in the &gnu; <application>Info</application> format; see below.</para> <para><command>&dhpackage;</command> is a program that...</para> </refsect1> <refsect1> <title>OPTIONS</title> <para>These programs follow the usual &gnu; command line syntax, with long options starting with two dashes (`-'). A summary of options is included below. For a complete description, see the <application>Info</application> files.</para> <variablelist> <varlistentry> <term><option>-h</option> <option>--help</option> </term> <listitem> <para>Show summary of options.</para> </listitem> </varlistentry> <varlistentry> <term><option>-v</option> <option>--version</option> </term> <listitem> <para>Show version of program.</para> </listitem> </varlistentry> </variablelist> </refsect1> <refsect1> <title>SEE ALSO</title> <para>bar (1), baz (1).</para> <para>The programs are documented fully by <citetitle>The Rise and Fall of a Fooish Bar</citetitle> available via the <application>Info</application> system.</para> </refsect1> <refsect1> <title>AUTHOR</title> <para>This manual page was written by &dhusername; &dhemail; for the &debian; system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the &gnu; General Public License, Version 2 any later version published by the Free Software Foundation. </para> <para> On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. </para> </refsect1> </refentry> <!-- Keep this comment at the end of the file Local variables: mode: sgml sgml-omittag:t sgml-shorttag:t sgml-minimize-attributes:nil sgml-always-quote-attributes:t sgml-indent-step:2 sgml-indent-data:t sgml-parent-document:nil sgml-default-dtd-file:nil sgml-exposed-tags:nil sgml-local-catalogs:nil sgml-local-ecat-files:nil End: --> --- NEW FILE: postinst.ex --- #! /bin/sh # postinst script for gpppoeconf # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> # * <old-postinst> `abort-upgrade' <new version> # * <conflictor's-postinst> `abort-remove' `in-favour' <package> # <new-version> # * <deconfigured's-postinst> `abort-deconfigure' `in-favour' # <failed-install-package> <version> `removing' # <conflicting-package> <version> # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package # # quoting from the policy: # Any necessary prompting should almost always be confined to the # post-installation script, and should be protected with a conditional # so that unnecessary prompting doesn't happen if a package's # installation fails and the `postinst' is called with `abort-upgrade', # `abort-remove' or `abort-deconfigure'. case "$1" in configure) ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 --- NEW FILE: postrm.ex --- #! /bin/sh # postrm script for gpppoeconf # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * <postrm> `remove' # * <postrm> `purge' # * <old-postrm> `upgrade' <new-version> # * <new-postrm> `failed-upgrade' <old-version> # * <new-postrm> `abort-install' # * <new-postrm> `abort-install' <old-version> # * <new-postrm> `abort-upgrade' <old-version> # * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; *) echo "postrm called with unknown argument \`$1'" >&2 exit 1 esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 --- NEW FILE: preinst.ex --- #! /bin/sh # preinst script for gpppoeconf # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * <new-preinst> `install' # * <new-preinst> `install' <old-version> # * <new-preinst> `upgrade' <old-version> # * <old-preinst> `abort-upgrade' <new-version> # # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in install|upgrade) # if [ "$1" = "upgrade" ] # then # start-stop-daemon --stop --quiet --oknodo \ # --pidfile /var/run/gpppoeconf.pid \ # --exec /usr/sbin/gpppoeconf 2>/dev/null || true # fi ;; abort-upgrade) ;; *) echo "preinst called with unknown argument \`$1'" >&2 exit 1 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 --- NEW FILE: prerm.ex --- #! /bin/sh # prerm script for gpppoeconf # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * <prerm> `remove' # * <old-prerm> `upgrade' <new-version> # * <new-prerm> `failed-upgrade' <old-version> # * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> # * <deconfigured's-prerm> `deconfigure' `in-favour' # <package-being-installed> <version> `removing' # <conflicting-package> <version> # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in remove|upgrade|deconfigure) # install-info --quiet --remove /usr/info/gpppoeconf.info.gz ;; failed-upgrade) ;; *) echo "prerm called with unknown argument \`$1'" >&2 exit 1 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 --- NEW FILE: rules --- #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) 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 config.status: configure dh_testdir # Add here commands to configure the package. ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info build: build-stamp build-stamp: config.status dh_testdir # Add here commands to compile the package. $(MAKE) #/usr/bin/docbook-to-man debian/gpppoeconf.sgml > gpppoeconf.1 touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp # Add here commands to clean up after the build process. -$(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs # Add here commands to install the package into debian/gpppoeconf. $(MAKE) install DESTDIR=$(CURDIR)/debian/gpppoeconf # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs ChangeLog dh_installdocs dh_installexamples # dh_install # dh_installmenu # dh_installdebconf # dh_installlogrotate # dh_installemacsen # dh_installpam # dh_installmime # dh_installinit # dh_installcron # dh_installinfo dh_installman dh_link dh_strip dh_compress dh_fixperms # dh_perl # dh_python # dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install |
|
From: <ale...@us...> - 2004-02-15 23:58:07
|
Update of /cvsroot/morphix/gpppoe-conf/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26539/debian Log Message: Directory /cvsroot/morphix/gpppoe-conf/debian added to the repository |
|
From: <ale...@us...> - 2004-02-15 23:50:12
|
Update of /cvsroot/morphix/xconf/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25274/src Modified Files: support.h Log Message: small libxconf cleanups Index: support.h =================================================================== RCS file: /cvsroot/morphix/xconf/src/support.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** support.h 25 Jan 2004 00:25:21 -0000 1.1.1.1 --- support.h 15 Feb 2004 23:42:38 -0000 1.2 *************** *** 50,53 **** --- 50,56 ---- + static gchar* + find_pixmap_file (const gchar *filename); + /* * Private Functions. |
|
From: <ale...@us...> - 2004-02-15 23:49:26
|
Update of /cvsroot/morphix/morphixinstaller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24817 Modified Files: morphixinstaller.glade trans.c Log Message: lots of code cleanups, integrated grub, multiple partitioners (PM/parted/qtparted,cfdisk), GUI cleanups, RAID/SCSI support? (still need to check initrd) this code is still buggy! Index: morphixinstaller.glade =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/morphixinstaller.glade,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** morphixinstaller.glade 3 Jan 2004 21:59:55 -0000 1.11 --- morphixinstaller.glade 15 Feb 2004 23:41:51 -0000 1.12 *************** *** 134,143 **** <property name="height_request">200</property> <property name="visible">True</property> ! <property name="label" translatable="yes">Welcome to the Morphix Installation ! Please note that this installer is still under construction, Alex de Landgraaf and ! Morphix.org take no responsibility for any damage done! ! 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! [...1422 lines suppressed...] 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. ! ! Please note that this is an experimental feature, feedback and experiences are greatly appreciated.</property> <property name="use_underline">False</property> <property name="use_markup">False</property> *************** *** 3805,3810 **** <property name="n_columns">4</property> <property name="homogeneous">False</property> ! <property name="row_spacing">0</property> ! <property name="column_spacing">0</property> <child> --- 4087,4092 ---- <property name="n_columns">4</property> <property name="homogeneous">False</property> ! <property name="row_spacing">4</property> ! <property name="column_spacing">4</property> <child> Index: trans.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/trans.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** trans.c 3 Jan 2004 21:59:57 -0000 1.11 --- trans.c 15 Feb 2004 23:41:51 -0000 1.12 *************** *** 6,15 **** gchar *s = N_("Morphix Install"); ! gchar *s = N_("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" --- 6,17 ---- gchar *s = N_("Morphix Install"); ! gchar *s = N_("<big>Welcome to the Morphix Installer!</big>\n" "\n" ! "Please note that this installer is still under construction\n" ! "Alex de Landgraaf and Morphix.org take no responsibility for any damage done.\n" "\n" ! "This installer 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" ! "<u><b>www.morphix.org</b></u>\n" "\n" "\n" *************** *** 24,49 **** "the installer will now exit."); gchar *s = N_("Morphix Install"); ! gchar *s = N_("Harddisk selection\n" "\n" "Step:\n" "1 of 7"); ! gchar *s = N_("Please select your harddisk,\n" ! "this will launch cfdisk, a partition tool for Linux. \n" ! "It is console-based, but temporary.\n" "\n" ! "Make sure you have at least one Linux and one swap partition\n" ""); gchar *s = N_("A list of harddisks, choose the one you want to install Morphix on"); gchar *s = N_("*"); ! gchar *s = N_("Please note that all changes done during\n" ! "partitioning are final!"); gchar *s = N_("Morphix Install"); ! gchar *s = N_("Swap selection\n" "\n" "Step:\n" "2 of 7"); ! gchar *s = N_("Please select a swap partition (recommended),\n" ! "or select to use none:\n" ""); gchar *s = N_("A list of the detected swap partitions, use back if you want to make additional changes to your harddisk"); gchar *s = N_("*"); --- 26,53 ---- "the installer will now exit."); gchar *s = N_("Morphix Install"); ! gchar *s = N_("<b>Harddisk selection</b>\n" "\n" "Step:\n" "1 of 7"); ! gchar *s = N_("Before Morphix can be installed, you will need to partition your harddisk first.\n" "\n" ! "Make sure you have at least one Linux (2GiB) and one swap partition after partitioning.\n" ""); gchar *s = N_("A list of harddisks, choose the one you want to install Morphix on"); gchar *s = N_("*"); ! gchar *s = N_("Harddisk: "); ! gchar *s = N_("Partitioner: "); ! gchar *s = N_("<b>Please note that all changes done while\n" ! "partitioning are final!</b>"); gchar *s = N_("Morphix Install"); ! gchar *s = N_("<b>Swap selection</b>\n" "\n" "Step:\n" "2 of 7"); ! gchar *s = N_("Your harddisk should now be partitioned correctly.\n" ! "\n" ! "Please select the swap partition you want to use.\n" ""); + gchar *s = N_("Swap partition: "); gchar *s = N_("A list of the detected swap partitions, use back if you want to make additional changes to your harddisk"); gchar *s = N_("*"); *************** *** 56,60 **** ""); gchar *s = N_("Morphix Install"); ! gchar *s = N_("Rootpartition selection\n" "\n" "Step:\n" --- 60,64 ---- ""); gchar *s = N_("Morphix Install"); ! gchar *s = N_("<b>Rootpartition selection</b>\n" "\n" "Step:\n" *************** *** 75,82 **** gchar *s = N_("XFS - Journaling File System"); gchar *s = N_("Expert: Add additional partitions"); ! gchar *s = N_("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!"); gchar *s = N_("Morphix Install"); gchar *s = N_("The selected rootpartition is smaller\n" --- 79,86 ---- gchar *s = N_("XFS - Journaling File System"); gchar *s = N_("Expert: Add additional partitions"); ! gchar *s = N_("Morphix will now be copied onto the harddisk\n" ! "<b>Please make sure that you have entered all\n" ! "information correctly, if you have any doubts\n" ! "please go back and correct your settings!</b>"); gchar *s = N_("Morphix Install"); gchar *s = N_("The selected rootpartition is smaller\n" *************** *** 91,115 **** ""); gchar *s = N_("Processing..."); ! gchar *s = N_("Creating filesystem, please wait..."); gchar *s = N_("Processing..."); ! gchar *s = N_("Copying files to harddisk...\n" ! "\n" ! "This may take anywhere from 5 to 20 minutes, depending on your hardware"); gchar *s = N_("Morphix Install"); ! gchar *s = N_("Configure\n" ! "Hostname\n" "\n" "Step:\n" "4 of 7"); ! gchar *s = N_("Morphix has succesfully been installed to harddisk\n" "\n" "Please enter a hostname for your computer:\n" ""); gchar *s = N_("A hostname is used to identify your computer. You may choose anything as a name"); gchar *s = N_("myBox"); gchar *s = N_("*"); gchar *s = N_("Morphix Install"); ! gchar *s = N_("Configure\n" ! "Rootaccount\n" "\n" "Step:\n" --- 95,120 ---- ""); gchar *s = N_("Processing..."); ! gchar *s = N_("<b>Creating filesystem, please wait...</b>"); gchar *s = N_("Processing..."); ! gchar *s = N_("<b>Copying files to harddisk...</b>"); ! gchar *s = N_("XXXXMiB from a total of approx. XXXXMiB have been copied"); gchar *s = N_("Morphix Install"); ! gchar *s = N_("<b>Configure\n" ! "Hostname</b>\n" "\n" "Step:\n" "4 of 7"); ! gchar *s = N_("Morphix has succesfully \n" ! "been copied onto your harddisk\n" "\n" "Please enter a hostname for your computer:\n" ""); + gchar *s = N_("Hostname: "); gchar *s = N_("A hostname is used to identify your computer. You may choose anything as a name"); gchar *s = N_("myBox"); gchar *s = N_("*"); gchar *s = N_("Morphix Install"); ! gchar *s = N_("<b>Configure\n" ! "Rootaccount</b>\n" "\n" "Step:\n" *************** *** 119,177 **** "\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!"); ! gchar *s = N_("Root Password:"); gchar *s = N_("*"); - gchar *s = N_("Root Password (yes, again):"); gchar *s = N_("*"); gchar *s = N_("Morphix Install"); ! gchar *s = N_("Configure\n" ! "Useraccount\n" "\n" "Step:\n" "6 of 7"); ! gchar *s = N_("Please enter a name for your default user.\n" "\n" "Again, enter and re-enter the users password"); ! gchar *s = N_("Username:"); gchar *s = N_("This name will be used for the first user, keep it short and simple"); gchar *s = N_("morph"); gchar *s = N_("*"); - gchar *s = N_("Password (twice)"); gchar *s = N_("*"); gchar *s = N_("*"); gchar *s = N_("Morphix Install"); ! gchar *s = N_("Configure\n" ! "Bootloader\n" "\n" "Step:\n" "7 of 7"); ! gchar *s = N_("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."); gchar *s = N_("If you have other operating systems, this might make them unavailable. Take care when using this option"); ! gchar *s = N_("Set up LILO on MBR (removes other bootloaders!)"); gchar *s = N_("You have multiple harddisks, please choose the requested harddisk that the MBR will be changed of. The default is the first harddisk"); gchar *s = N_("*"); gchar *s = N_("Useful when there are multiple operating systems on your PC, but you might have to consult their documentation to make Morphix bootable"); ! gchar *s = N_("Set up LILO on root partition of the harddisk"); ! gchar *s = N_("Set up LILO on boot partition of the harddisk"); gchar *s = N_("This will not make Morphix bootable. Use this when you already have LILO or GRUB installed, and know how to modify it"); ! gchar *s = N_("Don't install LILO"); gchar *s = N_("Makes your LILO fun to watch, great for showing off your new system to the kids and women who wouldn't care less"); ! gchar *s = N_("Animate the LILO bootscreen"); gchar *s = N_("You can download a bootfloppy for the Morphix CD on the website, a rescuedisk will be ready in a later release"); ! gchar *s = N_("Make a boot floppy (Not yet implemented)"); gchar *s = N_("Morphix Install"); ! gchar *s = N_("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!"); gchar *s = N_("Processing..."); gchar *s = N_("Creating Swap partition..."); --- 124,183 ---- "\n" "This password must be at least \n" ! "5 characters in length\n" "\n" "Note: this is the equivalent of the\n" ! " system administrator, <b>don't forget it!</b>"); ! gchar *s = N_("Re-enter root user password: "); gchar *s = N_("*"); gchar *s = N_("*"); + gchar *s = N_("Root user password: "); gchar *s = N_("Morphix Install"); ! gchar *s = N_("<b>Configure\n" ! "Useraccount</b>\n" "\n" "Step:\n" "6 of 7"); ! gchar *s = N_("Please enter a name for your default user. This is the name of the account which you use for everyday tasks.\n" "\n" "Again, enter and re-enter the users password"); ! gchar *s = N_("Username: "); gchar *s = N_("This name will be used for the first user, keep it short and simple"); gchar *s = N_("morph"); gchar *s = N_("*"); gchar *s = N_("*"); gchar *s = N_("*"); + gchar *s = N_("User password: "); + gchar *s = N_("Re-enter user password: "); gchar *s = N_("Morphix Install"); ! gchar *s = N_("<b>Configure\n" ! "Bootloader</b>\n" "\n" "Step:\n" "7 of 7"); ! gchar *s = N_("Do you want to set up the GRUB bootloader?\n" "\n" ! "Not installing GRUB will probably leave Morphix unbootable but please note that installing GRUB\n" "might make other operating systems unaccessable.\n" "\n" ! "A menu will be shown at boottime, allowing you to choose which (detected) operating system you would like to use"); gchar *s = N_("If you have other operating systems, this might make them unavailable. Take care when using this option"); ! gchar *s = N_("Install GRUB on MBR (removes other bootloaders!) "); gchar *s = N_("You have multiple harddisks, please choose the requested harddisk that the MBR will be changed of. The default is the first harddisk"); gchar *s = N_("*"); gchar *s = N_("Useful when there are multiple operating systems on your PC, but you might have to consult their documentation to make Morphix bootable"); ! gchar *s = N_("Install GRUB on root partition of the harddisk"); ! gchar *s = N_("Install GRUB on boot partition of the harddisk"); gchar *s = N_("This will not make Morphix bootable. Use this when you already have LILO or GRUB installed, and know how to modify it"); ! gchar *s = N_("Don't install GRUB"); gchar *s = N_("Makes your LILO fun to watch, great for showing off your new system to the kids and women who wouldn't care less"); ! gchar *s = N_("Animate the GRUB bootscreen"); gchar *s = N_("You can download a bootfloppy for the Morphix CD on the website, a rescuedisk will be ready in a later release"); ! gchar *s = N_("Make a boot floppy"); gchar *s = N_("Morphix Install"); ! gchar *s = N_("<big>Congratulations, you have succesfully installed Morphix on your harddisk!</big>\n" "\n" + "After rebooting your computer, you should be able to boot Morphix directly from your harddisk\n" "\n" ! "Have fun and if you have any comments don't be a stranger, contact us via www.morphix.org!"); gchar *s = N_("Processing..."); gchar *s = N_("Creating Swap partition..."); *************** *** 231,235 **** gchar *s = N_("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!"); gchar *s = N_("*"); gchar *s = N_("*"); --- 237,242 ---- gchar *s = N_("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" ! "\n" ! "Please note that this is an experimental feature, feedback and experiences are greatly appreciated."); gchar *s = N_("*"); gchar *s = N_("*"); |
|
From: <ale...@us...> - 2004-02-15 23:49:26
|
Update of /cvsroot/morphix/morphixinstaller/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24817/src Modified Files: callbacks.c cmdline.c instlib.c instlib.h interface.c main.c Log Message: lots of code cleanups, integrated grub, multiple partitioners (PM/parted/qtparted,cfdisk), GUI cleanups, RAID/SCSI support? (still need to check initrd) this code is still buggy! Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/callbacks.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** callbacks.c 26 Oct 2003 22:56:18 -0000 1.14 --- callbacks.c 15 Feb 2004 23:41:51 -0000 1.15 *************** *** 81,85 **** if (data == NULL) return FALSE; ! gdouble fraction = GetCurrentPercentage(global_cdrom_size,GetPartUsedSize(selected_rootpart)); gint percentage = (fraction * 100); sprintf(str_per,"%3d%%",percentage); --- 81,85 ---- if (data == NULL) return FALSE; ! gdouble fraction = GetCurrentPercentage(global_cdrom_size,GetPartUsedSize(GetSelectedRoot())); gint percentage = (fraction * 100); sprintf(str_per,"%3d%%",percentage); *************** *** 118,127 **** gpointer user_data) { ! ! // start cfdisk. this will be replaced once partition morpher gets ! // to be usable debug("selected %s\n",gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(widget)->entry))); ! SaveSelectedHarddisk((gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(widget)->entry))); ! StartXPartitioner(selected_harddisk); SelectSwap = create_SelectSwap (); gtk_widget_show (SelectSwap); --- 118,135 ---- gpointer user_data) { ! GtkWidget *optionmenu = lookup_widget(SelectHarddisk,"optionmenupartitioners"); debug("selected %s\n",gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(widget)->entry))); ! ! GList *hdlist = GetHarddiskList(FALSE); /* don't want fuzzy strings */ ! GList *hdlist_fluffy = GetHarddiskList(TRUE); ! gint itemnr = GetStringInListNr(hdlist_fluffy,(gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(widget)->entry))); ! GList *ptr = GetNthItem(hdlist,itemnr); ! ! UnmountHarddiskPartitions(ptr->data); ! SaveSelectedHarddisk(ptr->data); ! StartPartitioner(GetSelectedHarddisk(),gtk_option_menu_get_history(GTK_OPTION_MENU(optionmenu)),TRUE); ! ! FreeStringList(hdlist); ! FreeStringList(hdlist_fluffy); SelectSwap = create_SelectSwap (); gtk_widget_show (SelectSwap); *************** *** 150,154 **** else { UseSwap(TRUE); ! SaveSelectedSwap((gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(widget)->entry))); } SelectRoot = create_SelectRoot (); --- 158,168 ---- else { UseSwap(TRUE); ! GList *fluffy_swap = GetPartList(TRUE,TRUE); /* fluffy swap list */ ! GList *no_fluffy_swap = GetPartList(TRUE,FALSE); /* not fluffy */ ! int nr = GetStringInListNr(fluffy_swap,(gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(widget)->entry))); ! GList *ptr = GetNthItem(no_fluffy_swap,nr); ! SaveSelectedSwap(ptr->data); ! FreeStringList(fluffy_swap); ! FreeStringList(no_fluffy_swap); } SelectRoot = create_SelectRoot (); *************** *** 280,288 **** { GtkWidget *optionmenu = lookup_widget(SelectRoot,"optionmenuFS2"); // check to see which filesystem was chosen - SaveSelectedRoot((gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(widget)->entry))); - gint sel = gtk_option_menu_get_history(GTK_OPTION_MENU(optionmenu)); - SaveSelectedFilesystemType(sel); --- 294,306 ---- { GtkWidget *optionmenu = lookup_widget(SelectRoot,"optionmenuFS2"); + GList *fluffy_root = GetPartList(FALSE,TRUE); /* fluffy rootpart */ + GList *no_fluffy_root = GetPartList(FALSE,FALSE); /* not fluffy, this one is */ + int nr = GetStringInListNr(fluffy_root,(gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(widget)->entry))); + GList *ptr = GetNthItem(no_fluffy_root,nr); + SaveSelectedRoot(ptr->data); + FreeStringList(fluffy_root); + FreeStringList(no_fluffy_root); // check to see which filesystem was chosen gint sel = gtk_option_menu_get_history(GTK_OPTION_MENU(optionmenu)); SaveSelectedFilesystemType(sel); *************** *** 422,431 **** // if there are more than one harddisk, throw up a combo box so // the user can select the right MBR ! if (harddisk_comp_list->data != NULL && harddisk_list != NULL) { ! gtk_combo_set_popdown_strings(GTK_COMBO(combo),harddisk_comp_list); ! if (harddisk_list->next != NULL) { multiple = TRUE; gtk_widget_show(combo); } } } --- 440,451 ---- // if there are more than one harddisk, throw up a combo box so // the user can select the right MBR ! GList *hdlist = GetHarddiskList(FALSE); ! if (hdlist != NULL) { ! gtk_combo_set_popdown_strings(GTK_COMBO(combo),hdlist); ! if (hdlist->next != NULL) { multiple = TRUE; gtk_widget_show(combo); } + FreeStringList(hdlist); } } *************** *** 462,474 **** ExecPreInstShFile(); - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_CHECK_BUTTON(GTK_RADIO_BUTTON(lilo)))) == TRUE) ! SetupLilo(1); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_CHECK_BUTTON(GTK_RADIO_BUTTON(lilo2)))) == TRUE) ! SetupLilo(2); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_CHECK_BUTTON(GTK_RADIO_BUTTON(lilo3)))) == TRUE) ! SetupLilo(3); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_CHECK_BUTTON(GTK_RADIO_BUTTON(lilo4)))) == TRUE) ! SetupLilo(4); SetupMiscPostInstFiles(); --- 482,493 ---- ExecPreInstShFile(); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_CHECK_BUTTON(GTK_RADIO_BUTTON(lilo)))) == TRUE) ! SetupGrub(1); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_CHECK_BUTTON(GTK_RADIO_BUTTON(lilo2)))) == TRUE) ! SetupGrub(2); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_CHECK_BUTTON(GTK_RADIO_BUTTON(lilo3)))) == TRUE) ! SetupGrub(3); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GTK_CHECK_BUTTON(GTK_RADIO_BUTTON(lilo4)))) == TRUE) ! SetupGrub(4); SetupMiscPostInstFiles(); *************** *** 539,546 **** } - - - - void on_optionmenu1_changed (GtkOptionMenu *optionmenu, --- 558,561 ---- *************** *** 550,553 **** --- 565,584 ---- } + 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 *************** *** 559,563 **** debug("selected %s\n",cmdlineargs.harddisk); SaveSelectedHarddisk(cmdlineargs.harddisk); ! StartXPartitioner(selected_harddisk); SelectSwap = create_SelectSwap (); gtk_widget_show (SelectSwap); --- 590,594 ---- debug("selected %s\n",cmdlineargs.harddisk); SaveSelectedHarddisk(cmdlineargs.harddisk); ! StartPartitioner(GetSelectedHarddisk(),0,TRUE); SelectSwap = create_SelectSwap (); gtk_widget_show (SelectSwap); *************** *** 565,569 **** } else { ! gtk_combo_set_popdown_strings(GTK_COMBO(widget),GetHarddiskList()); } } --- 596,603 ---- } else { ! GList *hdlist = GetHarddiskList(TRUE); ! gtk_combo_set_popdown_strings(GTK_COMBO(widget),hdlist); ! FreeStringList(hdlist); ! SetupPartitionerList(); } } *************** *** 636,640 **** } else { ! gtk_combo_set_popdown_strings(GTK_COMBO(widget),GetSwappartList()); } } --- 670,676 ---- } else { ! GList *swaplist = GetPartList(TRUE,TRUE); /* we want a fluffy swappart list !*/ ! gtk_combo_set_popdown_strings(GTK_COMBO(widget),swaplist); ! //FreeStringList(swaplist); } } *************** *** 656,660 **** GtkWidget *optionmenu = lookup_widget(SelectRoot,"optionmenuFS2"); gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu),1); ! gtk_combo_set_popdown_strings(GTK_COMBO(widget),GetRootpartList()); } } --- 692,698 ---- GtkWidget *optionmenu = lookup_widget(SelectRoot,"optionmenuFS2"); gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu),1); ! GList *list = GetPartList(FALSE,TRUE); /* fluffy rootpart list */ ! gtk_combo_set_popdown_strings(GTK_COMBO(widget),list); ! FreeStringList(list); } } *************** *** 701,704 **** --- 739,747 ---- { GtkWidget *progbar = lookup_widget(widget,"progressbar11"); + GtkWidget *image = lookup_widget(widget,"imageInstallProcess"); + GdkPixbufAnimation *anim = gdk_pixbuf_animation_new_from_file(PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/dancingpenguin.gif",NULL); + if (anim != NULL) { + gtk_image_set_from_animation(GTK_IMAGE(image),anim); + } global_cdrom_size = GetCdromSize(); timer = g_timeout_add(10000, (GSourceFunc)progress_timeout_size,progbar); *************** *** 724,728 **** // set up the help screen. Yes, Matty is a teacher at my university // and he deserves some hard-earned respect ;) ! gtk_image_set_from_file(GTK_IMAGE(image),"/morphix/gtkinstaller/matty.png"); gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview3))),&iter); gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(textview3),&iter,0.0,FALSE,0.0,0.0); --- 767,771 ---- // set up the help screen. Yes, Matty is a teacher at my university // and he deserves some hard-earned respect ;) ! gtk_image_set_from_file(GTK_IMAGE(image),PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/matty.png"); gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview3))),&iter); gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(textview3),&iter,0.0,FALSE,0.0,0.0); *************** *** 743,751 **** gpointer user_data) { // should create only first time when user press expert partitioning if (SelectPartExpert == NULL) { SelectPartExpert = create_SelectPartExpert (); - GtkWidget *expert_selected_wid[MAX_EXPERT_MOUNTS]; expert_selected_wid[0] = lookup_widget(SelectPartExpert,"ComboPart1Expert"); --- 786,802 ---- gpointer user_data) { + GtkWidget *rootcombo = lookup_widget(SelectRoot,"comboRoot"); + // set root partition prior to starting + GList *fluffy_list = GetPartList(FALSE,TRUE); /* fluffy rootpart list */ + GList *non_fluffy_list = GetPartList(FALSE,FALSE); /*non-fluffy rootpart list */ + int nr = GetStringInListNr(fluffy_list,(gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(rootcombo)->entry))); + GList *ptr = GetNthItem(non_fluffy_list,nr); + SaveSelectedRoot(ptr->data); + FreeStringList(fluffy_list); + FreeStringList(non_fluffy_list); // should create only first time when user press expert partitioning if (SelectPartExpert == NULL) { SelectPartExpert = create_SelectPartExpert (); GtkWidget *expert_selected_wid[MAX_EXPERT_MOUNTS]; expert_selected_wid[0] = lookup_widget(SelectPartExpert,"ComboPart1Expert"); *************** *** 759,762 **** --- 810,814 ---- gtk_combo_set_popdown_strings(GTK_COMBO(expert_selected_wid[j]),items); } + FreeStringList(items); } gtk_widget_show (SelectPartExpert); *************** *** 807,811 **** } if (strcmp(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(expert_mounts[i])->entry)),"/boot") == 0) { ! strcpy(selected_bootpart,"GTK_ENTRY(GTK_COMBO(expert_parts[i])->entry)"); boot_selected = TRUE; } --- 859,863 ---- } if (strcmp(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(expert_mounts[i])->entry)),"/boot") == 0) { ! SaveSelectedBoot(GTK_ENTRY(GTK_COMBO(expert_parts[i])->entry)); boot_selected = TRUE; } Index: cmdline.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/cmdline.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cmdline.c 7 Jan 2004 23:12:46 -0000 1.3 --- cmdline.c 15 Feb 2004 23:41:51 -0000 1.4 *************** *** 53,57 **** gchar *ask_rootpart() { ! GList* rplist = (GList *)GetRootpartList(); GList* pointer = rplist; gint i = 1; --- 53,57 ---- gchar *ask_rootpart() { ! GList* rplist = GetPartList(FALSE,FALSE); GList* pointer = rplist; gint i = 1; *************** *** 85,89 **** while (pointer != NULL) { if (choice == i) { ! return pointer->data; } i++; --- 85,91 ---- while (pointer != NULL) { if (choice == i) { ! gchar *pdata = g_strdup(pointer->data); ! FreeStringList(rplist); ! return pdata; } i++; *************** *** 96,100 **** gchar *ask_swappart() { ! GList* splist = (GList *)GetSwappartList(); GList* pointer = splist; gint i = 1; --- 98,102 ---- gchar *ask_swappart() { ! GList* splist = GetPartList(TRUE,FALSE); GList* pointer = splist; gint i = 1; *************** *** 130,134 **** while (pointer != NULL) { if (choice == i) { ! return pointer->data; } i++; --- 132,138 ---- while (pointer != NULL) { if (choice == i) { ! gchar *pdata = g_strdup(pointer->data); ! FreeStringList(splist); ! return pdata; } i++; *************** *** 338,342 **** if (!cmdlineargs.no_partitioning) { if (cmdlineargs.partitioner_set == TRUE) { ! StartAltPartitioner(selected_harddisk,cmdlineargs.partitioner); } else { --- 342,346 ---- if (!cmdlineargs.no_partitioning) { if (cmdlineargs.partitioner_set == TRUE) { ! StartAltPartitioner(GetSelectedHarddisk(),cmdlineargs.partitioner,FALSE); } else { *************** *** 345,349 **** else { printf("Partitioning has been disabled, please exit and use 'cfdisk' if you wish to partition your harddisk...\n"); ! //StartPartitioner(selected_harddisk); } } --- 349,353 ---- else { printf("Partitioning has been disabled, please exit and use 'cfdisk' if you wish to partition your harddisk...\n"); ! //StartPartitioner(selected_harddisk,0,FALSE); } } Index: instlib.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** instlib.c 9 Feb 2004 19:32:33 -0000 1.11 --- instlib.c 15 Feb 2004 23:41:51 -0000 1.12 *************** *** 4,8 **** #include <gtk/gtk.h> #include "installer.h" ! #include "instlib.h" /* --- 4,16 ---- #include <gtk/gtk.h> #include "installer.h" ! #include "instlib.h" ! [...1908 lines suppressed...] /* fixme: check for multiple cdrom's... */ --- 1804,1808 ---- gchar device[64]; gint num_finds = 0; ! num_finds = sscanf(output_array[i],"%63s /cdrom",size); // if (num_finds == 0) { /* fixme: check for multiple cdrom's... */ *************** *** 1526,1530 **** gdouble GetCurrentPercentage(gint cdrom_size, gint curr_rootpart_size) { gdouble perc; ! gdouble unpacked_cdrom_size = cdrom_size; perc = (gdouble)curr_rootpart_size / unpacked_cdrom_size; --- 1874,1878 ---- gdouble GetCurrentPercentage(gint cdrom_size, gint curr_rootpart_size) { gdouble perc; ! gdouble unpacked_cdrom_size = cdrom_size *2.8; // changed back, as we only need an estimate perc = (gdouble)curr_rootpart_size / unpacked_cdrom_size; Index: instlib.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** instlib.h 7 Jan 2004 23:12:46 -0000 1.5 --- instlib.h 15 Feb 2004 23:41:51 -0000 1.6 *************** *** 4,19 **** #include <glib.h> #define REAL_INSTALL #define MAX_EXPERT_MOUNTS 4 ! gchar kernel_version[40]; ! gchar selected_harddisk[40]; ! gchar selected_swappart[40]; ! gchar selected_rootpart[40]; ! gchar selected_bootpart[40]; ! gchar selected_fs[40]; ! gint selected_fs_nr; ! gchar root_parts[40][40]; ! gint root_num; gchar *error_msg; gint timeout; --- 4,43 ---- #include <glib.h> + /* I18n/gettext part */ + #ifdef ENABLE_NLS + # include <libintl.h> + # undef _ + # define _(String) dgettext (PACKAGE, String) + # ifdef gettext_noop + # define N_(String) gettext_noop (String) + # else + # define N_(String) (String) + # endif + #else + # define textdomain(String) (String) + # define gettext(String) (String) + # define dgettext(Domain,Message) (Message) + # define dcgettext(Domain,Message,Type) (Message) + # define bindtextdomain(Domain,Directory) (Domain) + # define _(String) (String) + # define N_(String) (String) + #endif + /* */ + #define REAL_INSTALL #define MAX_EXPERT_MOUNTS 4 + #define MAX_MINIMODULES 64 ! #define GRUB_MENU_LOCATION "/boot/grub/menu.lst" ! #define PROC_CMDLINE "/proc/cmdline" ! #define PROC_PARTITIONS "/proc/partitions" ! #define PROC_MODULES "/proc/modules" ! ! #define CFDISK_PATH "/sbin/cfdisk" ! #define PM_PATH "/usr/sbin/partitionmorpher" ! #define QTPARTED_PATH "/usr/sbin/qtparted" ! #define PARTED_PATH "/sbin/parted" ! ! /* these should be cleaned up or something */ gchar *error_msg; gint timeout; *************** *** 35,42 **** gboolean cpio_passthrough; ! GList *harddisk_list; ! GList *harddisk_comp_list; ! GList *raid_list; ! GList *raid_comp_list; /* --- 59,65 ---- gboolean cpio_passthrough; ! gchar * GetSelectedHarddisk(); ! gchar * GetSelectedSwap(); ! gchar * GetSelectedRoot(); /* *************** *** 47,50 **** --- 70,76 ---- void InitInstallprocess(); + gchar *GetSelectedFilesystemName(); + void FreeInstallProcess(); + /* A nice small function that just executes a command. *************** *** 92,96 **** void SaveSelectedFilesystemType(gint selected); ! void SaveSelectedFilesystemTypeString(gchar *type); /* starts cfdisk using 'harddisk', might be extended in the future --- 118,122 ---- void SaveSelectedFilesystemType(gint selected); ! void SaveSelectedFilesystemTypeString(gchar *filesystem); /* starts cfdisk using 'harddisk', might be extended in the future *************** *** 100,107 **** */ ! void StartPartitioner(gchar *harddisk); ! void StartAltPartitioner(gchar *harddisk,gchar *partitioner); ! void StartXPartitioner(gchar *harddisk); ! void StartXAltPartitioner(gchar *harddisk,gchar *partitioner); --- 126,131 ---- */ ! void StartPartitioner(gchar *harddisk, gint partnr, gboolean xfree86); ! void StartAltPartitioner(gchar *harddisk,gchar *partitioner, gboolean xfree86); *************** *** 159,176 **** /* ! sets up xsession for modules without gdm/kdm/xdm ! X is started as 'username' ! */ ! ! void UseXsessionBoot(gchar *username); ! ! /* ! lilo_mode: 1 - use selected_harddisk MBR 2 - use selected rootpartition ! 3 - don't use lilo 4 - use selected bootpartition */ gboolean SetupLilo(gint lilo_mode); --- 183,194 ---- /* ! lilo_mode/grub_mode 1 - use selected_harddisk MBR 2 - use selected rootpartition ! 3 - don't use lilo/grub 4 - use selected bootpartition */ + gboolean SetupGrub(gint grub_mode); gboolean SetupLilo(gint lilo_mode); *************** *** 200,203 **** --- 218,222 ---- */ + void MakeGrubBootdisk(); void MakeBootdisk(); *************** *** 214,217 **** --- 233,241 ---- GList* GetHarddiskList(); + GList *GetNthItem(GList *list,gint nr); + gint GetStringInListNr(GList *list, gchar *str); + void FreeStringList(GList *list); + GList *GetPartitionerListCommands(gchar *harddisk_str,gboolean xfree86); + GList *GetPartitionerListNames(gboolean xfree86); /* *************** *** 221,227 **** */ ! GList *GetSwappartList(); ! ! GList *GetRootpartList(); /* --- 245,249 ---- */ ! GList *GetPartList(gboolean swap,gboolean fluffy); /* Index: interface.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/interface.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** interface.c 3 Jan 2004 21:59:57 -0000 1.12 --- interface.c 15 Feb 2004 23:41:51 -0000 1.13 *************** *** 67,74 **** gtk_box_pack_start (GTK_BOX (hbox2), vseparator2, FALSE, FALSE, 0); ! label2 = gtk_label_new (_("Welcome to the Morphix Installation\n\nPlease note that this installer is still under construction, Alex de Landgraaf and \nMorphix.org take no responsibility for any damage done!\n\nThis 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")); gtk_widget_show (label2); gtk_box_pack_end (GTK_BOX (hbox2), label2, TRUE, FALSE, 0); gtk_widget_set_size_request (label2, 400, 200); gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label2), TRUE); --- 67,75 ---- gtk_box_pack_start (GTK_BOX (hbox2), vseparator2, FALSE, FALSE, 0); ! label2 = gtk_label_new (_("<big>Welcome to the Morphix Installer!</big>\n\nPlease note that this installer is still under construction\nAlex de Landgraaf and Morphix.org take no responsibility for any damage done.\n\nThis installer 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<u><b>www.morphix.org</b></u>\n\n\n\n")); gtk_widget_show (label2); gtk_box_pack_end (GTK_BOX (hbox2), label2, TRUE, FALSE, 0); gtk_widget_set_size_request (label2, 400, 200); + gtk_label_set_use_markup (GTK_LABEL (label2), TRUE); gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label2), TRUE); *************** *** 199,204 **** --- 200,210 ---- GtkWidget *vbox3; GtkWidget *label4; + GtkWidget *table2; GtkWidget *comboHarddisk; GtkWidget *combo_entry1; + GtkWidget *label45; + GtkWidget *optionmenupartitioners; + GtkWidget *menu4; + GtkWidget *label46; GtkWidget *label44; GtkWidget *dialog_action_area5; *************** *** 231,238 **** gtk_box_pack_start (GTK_BOX (vbox2), image3, TRUE, TRUE, 0); ! label32 = gtk_label_new (_("Harddisk selection\n\nStep:\n1 of 7")); gtk_widget_show (label32); gtk_box_pack_start (GTK_BOX (vbox2), label32, FALSE, FALSE, 0); gtk_widget_set_size_request (label32, 51, -1); gtk_label_set_justify (GTK_LABEL (label32), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label32), TRUE); --- 237,245 ---- gtk_box_pack_start (GTK_BOX (vbox2), image3, TRUE, TRUE, 0); ! label32 = gtk_label_new (_("<b>Harddisk selection</b>\n\nStep:\n1 of 7")); gtk_widget_show (label32); gtk_box_pack_start (GTK_BOX (vbox2), label32, FALSE, FALSE, 0); gtk_widget_set_size_request (label32, 51, -1); + gtk_label_set_use_markup (GTK_LABEL (label32), TRUE); gtk_label_set_justify (GTK_LABEL (label32), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label32), TRUE); *************** *** 250,254 **** gtk_box_pack_start (GTK_BOX (hbox4), vbox3, TRUE, TRUE, 0); ! label4 = gtk_label_new (_("Please select your harddisk,\nthis will launch cfdisk, a partition tool for Linux. \nIt is console-based, but temporary.\n\nMake sure you have at least one Linux and one swap partition\n")); gtk_widget_show (label4); gtk_box_pack_start (GTK_BOX (vbox3), label4, FALSE, FALSE, 0); --- 257,261 ---- gtk_box_pack_start (GTK_BOX (hbox4), vbox3, TRUE, TRUE, 0); ! label4 = gtk_label_new (_("Before Morphix can be installed, you will need to partition your harddisk first.\n\nMake sure you have at least one Linux (2GiB) and one swap partition after partitioning.\n")); gtk_widget_show (label4); gtk_box_pack_start (GTK_BOX (vbox3), label4, FALSE, FALSE, 0); *************** *** 257,265 **** gtk_label_set_line_wrap (GTK_LABEL (label4), TRUE); comboHarddisk = gtk_combo_new (); g_object_set_data (G_OBJECT (GTK_COMBO (comboHarddisk)->popwin), "GladeParentKey", comboHarddisk); gtk_widget_show (comboHarddisk); ! gtk_box_pack_start (GTK_BOX (vbox3), comboHarddisk, FALSE, FALSE, 0); combo_entry1 = GTK_COMBO (comboHarddisk)->entry; --- 264,280 ---- gtk_label_set_line_wrap (GTK_LABEL (label4), TRUE); + table2 = gtk_table_new (2, 2, FALSE); + gtk_widget_show (table2); + gtk_box_pack_start (GTK_BOX (vbox3), table2, FALSE, FALSE, 0); + gtk_table_set_row_spacings (GTK_TABLE (table2), 4); + gtk_table_set_col_spacings (GTK_TABLE (table2), 4); + comboHarddisk = gtk_combo_new (); g_object_set_data (G_OBJECT (GTK_COMBO (comboHarddisk)->popwin), "GladeParentKey", comboHarddisk); gtk_widget_show (comboHarddisk); ! gtk_table_attach (GTK_TABLE (table2), comboHarddisk, 1, 2, 0, 1, ! (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), ! (GtkAttachOptions) (0), 0, 0); combo_entry1 = GTK_COMBO (comboHarddisk)->entry; *************** *** 268,274 **** gtk_editable_set_editable (GTK_EDITABLE (combo_entry1), FALSE); ! label44 = gtk_label_new (_("Please note that all changes done during\npartitioning are final!")); gtk_widget_show (label44); ! gtk_box_pack_start (GTK_BOX (vbox3), label44, TRUE, TRUE, 0); gtk_label_set_justify (GTK_LABEL (label44), GTK_JUSTIFY_CENTER); --- 283,314 ---- gtk_editable_set_editable (GTK_EDITABLE (combo_entry1), FALSE); ! label45 = gtk_label_new (_("Harddisk: ")); ! gtk_widget_show (label45); ! gtk_table_attach (GTK_TABLE (table2), label45, 0, 1, 0, 1, ! (GtkAttachOptions) (GTK_FILL), ! (GtkAttachOptions) (0), 0, 0); ! gtk_misc_set_alignment (GTK_MISC (label45), 0, 0.5); ! ! optionmenupartitioners = gtk_option_menu_new (); ! gtk_widget_show (optionmenupartitioners); ! gtk_table_attach (GTK_TABLE (table2), optionmenupartitioners, 1, 2, 1, 2, ! (GtkAttachOptions) (GTK_FILL), ! (GtkAttachOptions) (0), 0, 0); ! ! menu4 = gtk_menu_new (); ! ! gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenupartitioners), menu4); ! ! label46 = gtk_label_new (_("Partitioner: ")); ! gtk_widget_show (label46); ! gtk_table_attach (GTK_TABLE (table2), label46, 0, 1, 1, 2, ! (GtkAttachOptions) (GTK_FILL), ! (GtkAttachOptions) (0), 0, 0); ! gtk_misc_set_alignment (GTK_MISC (label46), 0, 0.5); ! ! label44 = gtk_label_new (_("<b>Please note that all changes done while\npartitioning are final!</b>")); gtk_widget_show (label44); ! gtk_box_pack_start (GTK_BOX (vbox3), label44, TRUE, FALSE, 0); ! gtk_label_set_use_markup (GTK_LABEL (label44), TRUE); gtk_label_set_justify (GTK_LABEL (label44), GTK_JUSTIFY_CENTER); *************** *** 316,321 **** --- 356,366 ---- GLADE_HOOKUP_OBJECT (SelectHarddisk, vbox3, "vbox3"); GLADE_HOOKUP_OBJECT (SelectHarddisk, label4, "label4"); + GLADE_HOOKUP_OBJECT (SelectHarddisk, table2, "table2"); GLADE_HOOKUP_OBJECT (SelectHarddisk, comboHarddisk, "comboHarddisk"); GLADE_HOOKUP_OBJECT (SelectHarddisk, combo_entry1, "combo_entry1"); + GLADE_HOOKUP_OBJECT (SelectHarddisk, label45, "label45"); + GLADE_HOOKUP_OBJECT (SelectHarddisk, optionmenupartitioners, "optionmenupartitioners"); + GLADE_HOOKUP_OBJECT (SelectHarddisk, menu4, "menu4"); + GLADE_HOOKUP_OBJECT (SelectHarddisk, label46, "label46"); GLADE_HOOKUP_OBJECT (SelectHarddisk, label44, "label44"); GLADE_HOOKUP_OBJECT_NO_REF (SelectHarddisk, dialog_action_area5, "dialog_action_area5"); *************** *** 341,344 **** --- 386,391 ---- GtkWidget *vbox5; GtkWidget *label5; + GtkWidget *hbox34; + GtkWidget *label47; GtkWidget *comboSwap; GtkWidget *combo_entry2; *************** *** 372,379 **** gtk_box_pack_start (GTK_BOX (vbox4), image4, TRUE, TRUE, 0); ! label33 = gtk_label_new (_("Swap selection\n\nStep:\n2 of 7")); gtk_widget_show (label33); gtk_box_pack_start (GTK_BOX (vbox4), label33, FALSE, FALSE, 0); gtk_widget_set_size_request (label33, 51, -1); gtk_label_set_justify (GTK_LABEL (label33), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label33), TRUE); --- 419,427 ---- gtk_box_pack_start (GTK_BOX (vbox4), image4, TRUE, TRUE, 0); ! label33 = gtk_label_new (_("<b>Swap selection</b>\n\nStep:\n2 of 7")); gtk_widget_show (label33); gtk_box_pack_start (GTK_BOX (vbox4), label33, FALSE, FALSE, 0); gtk_widget_set_size_request (label33, 51, -1); + gtk_label_set_use_markup (GTK_LABEL (label33), TRUE); gtk_label_set_justify (GTK_LABEL (label33), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label33), TRUE); *************** *** 391,395 **** gtk_box_pack_start (GTK_BOX (hbox6), vbox5, TRUE, TRUE, 0); ! label5 = gtk_label_new (_("Please select a swap partition (recommended),\nor select to use none:\n")); gtk_widget_show (label5); gtk_box_pack_start (GTK_BOX (vbox5), label5, FALSE, FALSE, 0); --- 439,443 ---- gtk_box_pack_start (GTK_BOX (hbox6), vbox5, TRUE, TRUE, 0); ! label5 = gtk_label_new (_("Your harddisk should now be partitioned correctly.\n\nPlease select the swap partition you want to use.\n")); gtk_widget_show (label5); gtk_box_pack_start (GTK_BOX (vbox5), label5, FALSE, FALSE, 0); *************** *** 398,406 **** gtk_label_set_line_wrap (GTK_LABEL (label5), TRUE); comboSwap = gtk_combo_new (); g_object_set_data (G_OBJECT (GTK_COMBO (comboSwap)->popwin), "GladeParentKey", comboSwap); gtk_widget_show (comboSwap); ! gtk_box_pack_start (GTK_BOX (vbox5), comboSwap, FALSE, FALSE, 0); combo_entry2 = GTK_COMBO (comboSwap)->entry; --- 446,462 ---- gtk_label_set_line_wrap (GTK_LABEL (label5), TRUE); + hbox34 = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox34); + gtk_box_pack_start (GTK_BOX (vbox5), hbox34, FALSE, FALSE, 0); + + label47 = gtk_label_new (_("Swap partition: ")); + gtk_widget_show (label47); + gtk_box_pack_start (GTK_BOX (hbox34), label47, FALSE, FALSE, 0); + comboSwap = gtk_combo_new (); g_object_set_data (G_OBJECT (GTK_COMBO (comboSwap)->popwin), "GladeParentKey", comboSwap); gtk_widget_show (comboSwap); ! gtk_box_pack_start (GTK_BOX (hbox34), comboSwap, TRUE, TRUE, 0); combo_entry2 = GTK_COMBO (comboSwap)->entry; *************** *** 452,455 **** --- 508,513 ---- GLADE_HOOKUP_OBJECT (SelectSwap, vbox5, "vbox5"); GLADE_HOOKUP_OBJECT (SelectSwap, label5, "label5"); + GLADE_HOOKUP_OBJECT (SelectSwap, hbox34, "hbox34"); + GLADE_HOOKUP_OBJECT (SelectSwap, label47, "label47"); GLADE_HOOKUP_OBJECT (SelectSwap, comboSwap, "comboSwap"); GLADE_HOOKUP_OBJECT (SelectSwap, combo_entry2, "combo_entry2"); *************** *** 618,625 **** gtk_box_pack_start (GTK_BOX (vbox8), image6, TRUE, TRUE, 0); ! label34 = gtk_label_new (_("Rootpartition selection\n\nStep:\n3 of 7")); gtk_widget_show (label34); gtk_box_pack_start (GTK_BOX (vbox8), label34, FALSE, FALSE, 0); gtk_widget_set_size_request (label34, 51, -1); gtk_label_set_justify (GTK_LABEL (label34), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label34), TRUE); --- 676,684 ---- gtk_box_pack_start (GTK_BOX (vbox8), image6, TRUE, TRUE, 0); ! label34 = gtk_label_new (_("<b>Rootpartition selection</b>\n\nStep:\n3 of 7")); gtk_widget_show (label34); gtk_box_pack_start (GTK_BOX (vbox8), label34, FALSE, FALSE, 0); gtk_widget_set_size_request (label34, 51, -1); + gtk_label_set_use_markup (GTK_LABEL (label34), TRUE); gtk_label_set_justify (GTK_LABEL (label34), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label34), TRUE); *************** *** 724,731 **** gtk_box_pack_start (GTK_BOX (hbox33), label42, FALSE, FALSE, 0); ! label41 = gtk_label_new (_("Next all changes will be made to your system.\nPlease make sure that you have entered all\ninformation correctly, if you have any doubt\nplease go back and correct your settings!")); gtk_widget_show (label41); gtk_box_pack_start (GTK_BOX (vbox13), label41, FALSE, FALSE, 0); gtk_widget_set_size_request (label41, -1, 100); dialog_action_area8 = GTK_DIALOG (SelectRoot)->action_area; --- 783,791 ---- gtk_box_pack_start (GTK_BOX (hbox33), label42, FALSE, FALSE, 0); ! label41 = gtk_label_new (_("Morphix will now be copied onto the harddisk\n<b>Please make sure that you have entered all\ninformation correctly, if you have any doubts\nplease go back and correct your settings!</b>")); gtk_widget_show (label41); gtk_box_pack_start (GTK_BOX (vbox13), label41, FALSE, FALSE, 0); gtk_widget_set_size_request (label41, -1, 100); + gtk_label_set_use_markup (GTK_LABEL (label41), TRUE); dialog_action_area8 = GTK_DIALOG (SelectRoot)->action_area; *************** *** 1025,1031 **** gtk_container_set_border_width (GTK_CONTAINER (vbox23), 10); ! label14 = gtk_label_new (_("Creating filesystem, please wait...")); gtk_widget_show (label14); gtk_box_pack_start (GTK_BOX (vbox23), label14, TRUE, TRUE, 0); gtk_label_set_justify (GTK_LABEL (label14), GTK_JUSTIFY_CENTER); --- 1085,1092 ---- gtk_container_set_border_width (GTK_CONTAINER (vbox23), 10); ! label14 = gtk_label_new (_("<b>Creating filesystem, please wait...</b>")); gtk_widget_show (label14); gtk_box_pack_start (GTK_BOX (vbox23), label14, TRUE, TRUE, 0); + gtk_label_set_use_markup (GTK_LABEL (label14), TRUE); gtk_label_set_justify (GTK_LABEL (label14), GTK_JUSTIFY_CENTER); *************** *** 1052,1056 **** --- 1113,1122 ---- GtkWidget *DoInstall; GtkWidget *vbox24; + GtkWidget *hbox35; + GtkWidget *imageInstallProcess; + GtkWidget *vseparator18; + GtkWidget *vbox48; GtkWidget *label15; + GtkWidget *label48; GtkWidget *progressbar11; *************** *** 1066,1074 **** gtk_container_set_border_width (GTK_CONTAINER (vbox24), 10); ! label15 = gtk_label_new (_("Copying files to harddisk...\n\nThis may take anywhere from 5 to 20 minutes, depending on your hardware")); gtk_widget_show (label15); ! gtk_box_pack_start (GTK_BOX (vbox24), label15, TRUE, TRUE, 0); gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_CENTER); progressbar11 = gtk_progress_bar_new (); gtk_widget_show (progressbar11); --- 1132,1161 ---- gtk_container_set_border_width (GTK_CONTAINER (vbox24), 10); ! hbox35 = gtk_hbox_new (FALSE, 0); ! gtk_widget_show (hbox35); ! gtk_box_pack_start (GTK_BOX (vbox24), hbox35, TRUE, TRUE, 0); ! ! imageInstallProcess = create_pixmap (DoInstall, NULL); ! gtk_widget_show (imageInstallProcess); ! gtk_box_pack_start (GTK_BOX (hbox35), imageInstallProcess, FALSE, FALSE, 0); ! ! vseparator18 = gtk_vseparator_new (); ! gtk_widget_show (vseparator18); ! gtk_box_pack_start (GTK_BOX (hbox35), vseparator18, FALSE, FALSE, 5); ! ! vbox48 = gtk_vbox_new (FALSE, 0); ! gtk_widget_show (vbox48); ! gtk_box_pack_start (GTK_BOX (hbox35), vbox48, TRUE, TRUE, 0); ! ! label15 = gtk_label_new (_("<b>Copying files to harddisk...</b>")); gtk_widget_show (label15); ! gtk_box_pack_start (GTK_BOX (vbox48), label15, TRUE, TRUE, 0); ! gtk_label_set_use_markup (GTK_LABEL (label15), TRUE); gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_CENTER); + label48 = gtk_label_new (_("XXXXMiB from a total of approx. XXXXMiB have been copied")); + gtk_widget_show (label48); + gtk_box_pack_start (GTK_BOX (vbox48), label48, FALSE, FALSE, 0); + progressbar11 = gtk_progress_bar_new (); gtk_widget_show (progressbar11); *************** *** 1082,1086 **** --- 1169,1178 ---- GLADE_HOOKUP_OBJECT_NO_REF (DoInstall, DoInstall, "DoInstall"); GLADE_HOOKUP_OBJECT (DoInstall, vbox24, "vbox24"); + GLADE_HOOKUP_OBJECT (DoInstall, hbox35, "hbox35"); + GLADE_HOOKUP_OBJECT (DoInstall, imageInstallProcess, "imageInstallProcess"); + GLADE_HOOKUP_OBJECT (DoInstall, vseparator18, "vseparator18"); + GLADE_HOOKUP_OBJECT (DoInstall, vbox48, "vbox48"); GLADE_HOOKUP_OBJECT (DoInstall, label15, "label15"); + GLADE_HOOKUP_OBJECT (DoInstall, label48, "label48"); GLADE_HOOKUP_OBJECT (DoInstall, progressbar11, "progressbar11"); *************** *** 1101,1104 **** --- 1193,1198 ---- GtkWidget *vbox30; GtkWidget *label17; + GtkWidget *hbox36; + GtkWidget *label49; GtkWidget *entryHost; GtkWidget *hbuttonbox6; *************** *** 1130,1137 **** gtk_box_pack_start (GTK_BOX (vbox29), image12, TRUE, TRUE, 0); ! label36 = gtk_label_new (_("Configure\nHostname\n\nStep:\n4 of 7")); gtk_widget_show (label36); gtk_box_pack_start (GTK_BOX (vbox29), label36, FALSE, FALSE, 0); gtk_widget_set_size_request (label36, 51, -1); gtk_label_set_justify (GTK_LABEL (label36), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label36), TRUE); --- 1224,1232 ---- gtk_box_pack_start (GTK_BOX (vbox29), image12, TRUE, TRUE, 0); ! label36 = gtk_label_new (_("<b>Configure\nHostname</b>\n\nStep:\n4 of 7")); gtk_widget_show (label36); gtk_box_pack_start (GTK_BOX (vbox29), label36, FALSE, FALSE, 0); gtk_widget_set_size_request (label36, 51, -1); + gtk_label_set_use_markup (GTK_LABEL (label36), TRUE); gtk_label_set_justify (GTK_LABEL (label36), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label36), TRUE); *************** *** 1149,1153 **** gtk_box_pack_start (GTK_BOX (hbox21), vbox30, TRUE, TRUE, 0); ! label17 = gtk_label_new (_("Morphix has succesfully been installed to harddisk\n\nPlease enter a hostname for your computer:\n")); gtk_widget_show (label17); gtk_box_pack_start (GTK_BOX (vbox30), label17, FALSE, FALSE, 0); --- 1244,1248 ---- gtk_box_pack_start (GTK_BOX (hbox21), vbox30, TRUE, TRUE, 0); ! label17 = gtk_label_new (_("Morphix has succesfully \nbeen copied onto your harddisk\n\nPlease enter a hostname for your computer:\n")); gtk_widget_show (label17); gtk_box_pack_start (GTK_BOX (vbox30), label17, FALSE, FALSE, 0); *************** *** 1156,1162 **** gtk_label_set_line_wrap (GTK_LABEL (label17), TRUE); entryHost = gtk_entry_new (); gtk_widget_show (entryHost); ! gtk_box_pack_start (GTK_BOX (vbox30), entryHost, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, entryHost, _("A hostname is used to identify your computer. You may choose anything as a name"), NULL); gtk_entry_set_text (GTK_ENTRY (entryHost), _("myBox")); --- 1251,1265 ---- gtk_label_set_line_wrap (GTK_LABEL (label17), TRUE); + hbox36 = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox36); + gtk_box_pack_start (GTK_BOX (vbox30), hbox36, FALSE, FALSE, 0); + + label49 = gtk_label_new (_("Hostname: ")); + gtk_widget_show (label49); + gtk_box_pack_start (GTK_BOX (hbox36), label49, FALSE, FALSE, 0); + entryHost = gtk_entry_new (); gtk_widget_show (entryHost); ! gtk_box_pack_start (GTK_BOX (hbox36), entryHost, TRUE, TRUE, 0); gtk_tooltips_set_tip (tooltips, entryHost, _("A hostname is used to identify your computer. You may choose anything as a name"), NULL); gtk_entry_set_text (GTK_ENTRY (entryHost), _("myBox")); *************** *** 1194,1197 **** --- 1297,1302 ---- GLADE_HOOKUP_OBJECT (EnterHost, vbox30, "vbox30"); GLADE_HOOKUP_OBJECT (EnterHost, label17, "label17"); + GLADE_HOOKUP_OBJECT (EnterHost, hbox36, "hbox36"); + GLADE_HOOKUP_OBJECT (EnterHost, label49, "label49"); GLADE_HOOKUP_OBJECT (EnterHost, entryHost, "entryHost"); GLADE_HOOKUP_OBJECT_NO_REF (EnterHost, hbuttonbox6, "hbuttonbox6"); *************** *** 1216,1224 **** GtkWidget *vbox33; GtkWidget *label18; ! GtkWidget *label27; ! GtkWidget *entryRoot1; ! GtkWidget *label28; GtkWidget *entryRoot2; ! GtkWidget *labelRootPassError; GtkWidget *hbuttonbox7; GtkWidget *helpbuttonRootPasswd; --- 1321,1329 ---- GtkWidget *vbox33; GtkWidget *label18; ! GtkWidget *table3; ! GtkWidget *label51; GtkWidget *entryRoot2; ! GtkWidget *entryRoot1; ! GtkWidget *label50; GtkWidget *hbuttonbox7; GtkWidget *helpbuttonRootPasswd; *************** *** 1247,1254 **** gtk_box_pack_start (GTK_BOX (vbox32), image13, TRUE, TRUE, 0); ! label37 = gtk_label_new (_("Configure\nRootaccount\n\nStep:\n5 of 7")); gtk_widget_show (label37); gtk_box_pack_start (GTK_BOX (vbox32), label37, FALSE, FALSE, 0); gtk_widget_set_size_request (label37, 51, -1); gtk_label_set_justify (GTK_LABEL (label37), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label37), TRUE); --- 1352,1360 ---- gtk_box_pack_start (GTK_BOX (vbox32), image13, TRUE, TRUE, 0); ! label37 = gtk_label_new (_("<b>Configure\nRootaccount</b>\n\nStep:\n5 of 7")); gtk_widget_show (label37); gtk_box_pack_start (GTK_BOX (vbox32), label37, FALSE, FALSE, 0); gtk_widget_set_size_request (label37, 51, -1); + gtk_label_set_use_markup (GTK_LABEL (label37), TRUE); gtk_label_set_justify (GTK_LABEL (label37), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label37), TRUE); *************** *** 1266,1299 **** gtk_box_pack_start (GTK_BOX (hbox23), vbox33, TRUE, TRUE, 0); ! label18 = gtk_label_new (_("Please enter and re-enter a\n password for the root account\n\nThis password must be at least \n5 characters in length!\n\nNote: this is the equivalent of the\n system administrator, don't forget it!")); gtk_widget_show (label18); gtk_box_pack_start (GTK_BOX (vbox33), label18, FALSE, FALSE, 0); gtk_widget_set_size_request (label18, 400, 200); gtk_label_set_justify (GTK_LABEL (label18), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label18), TRUE); ! label27 = gtk_label_new (_("Root Password:")); ! gtk_widget_show (label27); ! gtk_box_pack_start (GTK_BOX (vbox33), label27, FALSE, FALSE, 0); ! ! entryRoot1 = gtk_entry_new (); ! gtk_widget_show (entryRoot1); ! gtk_box_pack_start (GTK_BOX (vbox33), entryRoot1, FALSE, FALSE, 10); ! gtk_entry_set_visibility (GTK_ENTRY (entryRoot1), FALSE); ! label28 = gtk_label_new (_("Root Password (yes, again):")); ! gtk_widget_show (label28); ! gtk_box_pack_start (GTK_BOX (vbox33), label28, FALSE, FALSE, 0); entryRoot2 = gtk_entry_new (); gtk_widget_show (entryRoot2); ! gtk_box_pack_start (GTK_BOX (vbox33), entryRoot2, FALSE, FALSE, 10); gtk_entry_set_visibility (GTK_ENTRY (entryRoot2), FALSE); ! labelRootPassError = gtk_label_new (""); ! gtk_widget_show (labelRootPassError); ! gtk_box_pack_start (GTK_BOX (vbox33), labelRootPassError, FALSE, FALSE, 0); ! gtk_label_set_justify (GTK_LABEL (labelRootPassError), GTK_JUSTIFY_CENTER); ! gtk_label_set_line_wrap (GTK_LABEL (labelRootPassError), TRUE); hbuttonbox7 = GTK_DIALOG (EnterRoot)->action_area; --- 1372,1412 ---- gtk_box_pack_start (GTK_BOX (hbox23), vbox33, TRUE, TRUE, 0); ! label18 = gtk_label_new (_("Please enter and re-enter a\n password for the root account\n\nThis password must be at least \n5 characters in length\n\nNote: this is the equivalent of the\n system administrator, <b>don't forget it!</b>")); gtk_widget_show (label18); gtk_box_pack_start (GTK_BOX (vbox33), label18, FALSE, FALSE, 0); gtk_widget_set_size_request (label18, 400, 200); + gtk_label_set_use_markup (GTK_LABEL (label18), TRUE); gtk_label_set_justify (GTK_LABEL (label18), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label18), TRUE); ! table3 = gtk_table_new (2, 2, FALSE); ! gtk_widget_show (table3); ! gtk_box_pack_start (GTK_BOX (vbox33), table3, TRUE, FALSE, 0); ! label51 = gtk_label_new (_("Re-enter root user password: ")); ! gtk_widget_show (label51); ! gtk_table_attach (GTK_TABLE (table3), label51, 0, 1, 1, 2, ! (GtkAttachOptions) (GTK_FILL), ! (GtkAttachOptions) (0), 0, 0); entryRoot2 = gtk_entry_new (); gtk_widget_show (entryRoot2); ! gtk_table_attach (GTK_TABLE (table3), entryRoot2, 1, 2, 1, 2, ! (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), ! (GtkAttachOptions) (0), 0, 0); gtk_entry_set_visibility (GTK_ENTRY (entryRoot2), FALSE); ! entryRoot1 = gtk_entry_new (); ! gtk_widget_show (entryRoot1); ! gtk_table_attach (GTK_TABLE (table3), entryRoot1, 1, 2, 0, 1, ! (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), ! (GtkAttachOptions) (0), 0, 0); ! gtk_entry_set_visibility (GTK_ENTRY (entryRoot1), FALSE); ! ! label50 = gtk_label_new (_("Root user password: ")); ! gtk_widget_show (label50); ! gtk_table_attach (GTK_TABLE (table3), label50, 0, 1, 0, 1, ! (GtkAttachOptions) (GTK_FILL), ! (GtkAttachOptions) (0), 0, 0); hbuttonbox7 = GTK_DIALOG (EnterRoot)->action_area; *************** *** 1337,1345 **** GLADE_HOOKUP_OBJECT (EnterRoot, vbox33, "vbox33"); GLADE_HOOKUP_OBJECT (EnterRoot, label18, "label18"); ! GLADE_HOOKUP_OBJECT (EnterRoot, label27, "label27"); ! GLADE_HOOKUP_OBJECT (EnterRoot, entryRoot1, "entryRoot1"); ! GLADE_HOOKUP_OBJECT (EnterRoot, label28, "label28"); GLADE_HOOKUP_OBJECT (EnterRoot, entryRoot2, "entryRoot2"); ! GLADE_HOOKUP_OBJECT (EnterRoot, labelRootPassError, "labelRootPassError"); GLADE_HOOKUP_OBJECT_NO_REF (EnterRoot, hbuttonbox7, "hbuttonbox7"); GLADE_HOOKUP_OBJECT (EnterRoot, helpbuttonRootPasswd, "helpbuttonRootPasswd"); --- 1450,1458 ---- GLADE_HOOKUP_OBJECT (EnterRoot, vbox33, "vbox33"); GLADE_HOOKUP_OBJECT (EnterRoot, label18, "label18"); ! GLADE_HOOKUP_OBJECT (EnterRoot, table3, "table3"); ! GLADE_HOOKUP_OBJECT (EnterRoot, label51, "label51"); GLADE_HOOKUP_OBJECT (EnterRoot, entryRoot2, "entryRoot2"); ! GLADE_HOOKUP_OBJECT (EnterRoot, entryRoot1, "entryRoot1"); ! GLADE_HOOKUP_OBJECT (EnterRoot, label50, "label50"); GLADE_HOOKUP_OBJECT_NO_REF (EnterRoot, hbuttonbox7, "hbuttonbox7"); GLADE_HOOKUP_OBJECT (EnterRoot, helpbuttonRootPasswd, "helpbuttonRootPasswd"); *************** *** 1363,1371 **** GtkWidget *vbox36; GtkWidget *label19; GtkWidget *label20; GtkWidget *entryUser; ! GtkWidget *label21; GtkWidget *entryUserPass1; GtkWidget *entryUserPass2; GtkWidget *labelUserPassError; GtkWidget *hbuttonbox8; --- 1476,1487 ---- GtkWidget *vbox36; GtkWidget *label19; + GtkWidget *hbox38; GtkWidget *label20; GtkWidget *entryUser; ! GtkWidget *table4; GtkWidget *entryUserPass1; GtkWidget *entryUserPass2; + GtkWidget *label52; + GtkWidget *label53; GtkWidget *labelUserPassError; GtkWidget *hbuttonbox8; *************** *** 1398,1405 **** gtk_box_pack_start (GTK_BOX (vbox35), image14, TRUE, TRUE, 0); ! label38 = gtk_label_new (_("Configure\nUseraccount\n\nStep:\n6 of 7")); gtk_widget_show (label38); gtk_box_pack_start (GTK_BOX (vbox35), label38, FALSE, FALSE, 0); gtk_widget_set_size_request (label38, 51, -1); gtk_label_set_justify (GTK_LABEL (label38), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label38), TRUE); --- 1514,1522 ---- gtk_box_pack_start (GTK_BOX (vbox35), image14, TRUE, TRUE, 0); ! label38 = gtk_label_new (_("<b>Configure\nUseraccount</b>\n\nStep:\n6 of 7")); gtk_widget_show (label38); gtk_box_pack_start (GTK_BOX (vbox35), label38, FALSE, FALSE, 0); gtk_widget_set_size_request (label38, 51, -1); + gtk_label_set_use_markup (GTK_LABEL (label38), TRUE); gtk_label_set_justify (GTK_LABEL (label38), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label38), TRUE); *************** *** 1417,1421 **** gtk_box_pack_start (GTK_BOX (hbox25), vbox36, TRUE, TRUE, 0); ! label19 = gtk_label_new (_("Please enter a name for your default user.\n\nAgain, enter and re-enter the users password")); gtk_widget_show (label19); gtk_box_pack_start (GTK_BOX (vbox36), label19, FALSE, FALSE, 0); --- 1534,1538 ---- gtk_box_pack_start (GTK_BOX (hbox25), vbox36, TRUE, TRUE, 0); ! label19 = gtk_label_new (_("Please enter a name for your default user. This is the name of the account which you use for everyday tasks.\n\nAgain, enter and re-enter the users password")); gtk_widget_show (label19); gtk_box_pack_start (GTK_BOX (vbox36), label19, FALSE, FALSE, 0); *************** *** 1425,1455 **** gtk_misc_set_padding (GTK_MISC (label19), 8, 0); ! label20 = gtk_label_new (_("Username:")); gtk_widget_show (label20); ! gtk_box_pack_start (GTK_BOX (vbox36), label20, FALSE, FALSE, 0); entryUser = gtk_entry_new (); gtk_widget_show (entryUser); ! gtk_box_pack_start (GTK_BOX (vbox36), entryUser, FALSE, FALSE, 22); gtk_tooltips_set_tip (tooltips, entryUser, _("This name will be used for the first user, keep it short and simple"), NULL); gtk_entry_set_text (GTK_ENTRY (entryUser), _("morph")); ! label21 = gtk_label_new (_("Password (twice)")); ! gtk_widget_show (label21); ! gtk_box_pack_start (GTK_BOX (vbox36), label21, FALSE, FALSE, 0); entryUserPass1 = gtk_entry_new (); gtk_widget_show (entryUserPass1); ! gtk_box_pack_start (GTK_BOX (vbox36), entryUserPass1, FALSE, FALSE, 22); gtk_entry_set_visibility (GTK_ENTRY (entryUserPass1), FALSE); entryUserPass2 = gtk_entry_new (); gtk_widget_show (entryUserPass2); ! gtk_box_pack_start (GTK_BOX (vbox36), entryUserPass2, FALSE, FALSE, 0); gtk_entry_set_visibility (GTK_ENTRY (entryUserPass2), FALSE); labelUserPassError = gtk_label_new (""); gtk_widget_show (labelUserPassError); ! gtk_box_pack_start (GTK_BOX (vbox36), labelUserPassError, FALSE, FALSE, 0); hbuttonbox8 = GTK_DIALOG (EnterUser)->action_area; --- 1542,1594 ---- gtk_misc_set_padding (GTK_MISC (label19), 8, 0); ! hbox38 = gtk_hbox_new (FALSE, 0); ! gtk_widget_show (hbox38); ! gtk_box_pack_start (GTK_BOX (vbox36), hbox38, TRUE, FALSE, 0); ! ! label20 = gtk_label_new (_("Username: ")); gtk_widget_show (label20); ! gtk_box_pack_start (GTK_BOX (hbox38), label20, FALSE, FALSE, 0); entryUser = gtk_entry_new (); gtk_widget_show (entryUser); ! gtk_box_pack_start (GTK_BOX (hbox38), entryUser, TRUE, TRUE, 0); gtk_tooltips_set_tip (tooltips, entryUser, _("This name will be used for the first user, keep it short and simple"), NULL); gtk_entry_set_text (GTK_ENTRY (entryUser), _("morph")); ! table4 = gtk_table_new (2, 2, FALSE); ! gtk_widget_show (table4); ! gtk_box_pack_start (GTK_BOX (vbox36), table4, TRUE, FALSE, 22); entryUserPass1 = gtk_entry_new (); gtk_widget_show (entryUserPass1); ! gtk_table_attach (GTK_TABLE (table4), entryUserPass1, 1, 2, 0, 1, ! (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), ! (GtkAttachOptions) (0), 0, 0); gtk_entry_set_visibility (GTK_ENTRY (entryUserPass1), FALSE); entryUserPass2 = gtk_entry_new (); gtk_widget_show (entryUserPass2); ! gtk_table_attach (GTK_TABLE (table4), entryUserPass2, 1, 2, 1, 2, ! (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), ! (GtkAttachOptions) (0), 0, 0); gtk_entry_set_visibility (GTK_ENTRY (entryUserPass2), FALSE); + label52 = gtk_label_new (_("User password: ")); + gtk_widget_show (label52); + gtk_table_attach (GTK_TABLE (table4), label52, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label52), 0, 0.5); + + label53 = gtk_label_new (_("Re-enter user password: ")); + gtk_widget_show (label53); + gtk_table_attach (GTK_TABLE (table4), label53, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label53), 0, 0.5); + labelUserPassError = gtk_label_new (""); gtk_widget_show (labelUserPassError); ! gtk_box_pack_start (GTK_BOX (vbox36), labelUserPassError, TRUE, FALSE, 0); hbuttonbox8 = GTK_DIALOG (EnterUser)->action_area; *************** *** 1493,1501 **** GLADE_HOOKUP_OBJECT (EnterUser, vbox36, "vbox36"); GLADE_HOOKUP_OBJECT (EnterUser, label19, "label19"); GLADE_HOOKUP_OBJECT (EnterUser, label20, "label20"); GLADE_HOOKUP_OBJECT (EnterUser, entryUser, "entryUser"); ! GLADE_HOOKUP_OBJECT (EnterUser, label21, "label21"); GLADE_HOOKUP_OBJECT (EnterUser, entryUserPass1, "entryUserPass1"); GLADE_HOOKUP_OBJECT (EnterUser, entryUserPass2, "entryUserPass2"); GLADE_HOOKUP_OBJECT (EnterUser, labelUserPassError, "labelUserPassError"); GLADE_HOOKUP_OBJECT_NO_REF (EnterUser, hbuttonbox8, "hbuttonbox8"); --- 1632,1643 ---- GLADE_HOOKUP_OBJECT (EnterUser, vbox36, "vbox36"); GLADE_HOOKUP_OBJECT (EnterUser, label19, "label19"); + GLADE_HOOKUP_OBJECT (EnterUser, hbox38, "hbox38"); GLADE_HOOKUP_OBJECT (EnterUser, label20, "label20"); GLADE_HOOKUP_OBJECT (EnterUser, entryUser, "entryUser"); ! GLADE_HOOKUP_OBJECT (EnterUser, table4, "table4"); GLADE_HOOKUP_OBJECT (EnterUser, entryUserPass1, "entryUserPass1"); GLADE_HOOKUP_OBJECT (EnterUser, entryUserPass2, "entryUserPass2"); + GLADE_HOOKUP_OBJECT (EnterUser, label52, "label52"); + GLADE_HOOKUP_OBJECT (EnterUser, label53, "label53"); GLADE_HOOKUP_OBJECT (EnterUser, labelUserPassError, "labelUserPassError"); GLADE_HOOKUP_OBJECT_NO_REF (EnterUser, hbuttonbox8, "hbuttonbox8"); *************** *** 1532,1536 **** GtkWidget *hseparator3; GtkWidget *checkbuttonLILOanimate; - GtkWidget *hseparator1; GtkWidget *checkbuttonBootFloppy; GtkWidget *hbuttonbox9; --- 1674,1677 ---- *************** *** 1563,1570 **** gtk_box_pack_start (GTK_BOX (vbox38), image15, TRUE, TRUE, 0); ! label39 = gtk_label_new (_("Configure\nBootloader\n\nStep:\n7 of 7")); gtk_widget_show (label39); gtk_box_pack_start (GTK_BOX (vbox38), label39, FALSE, FALSE, 0); gtk_widget_set_size_request (label39, 51, -1); gtk_label_set_justify (GTK_LABEL (label39), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label39), TRUE); --- 1704,1712 ---- gtk_box_pack_start (GTK_BOX (vbox38), image15, TRUE, TRUE, 0); ! label39 = gtk_label_new (_("<b>Configure\nBootloader</b>\n\nStep:\n7 of 7")); gtk_widget_show (label39); gtk_box_pack_start (GTK_BOX (vbox38), label39, FALSE, FALSE, 0); gtk_widget_set_size_request (label39, 51, -1); + gtk_label_set_use_markup (GTK_LABEL (label39), TRUE); gtk_label_set_justify (GTK_LABEL (label39), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label39), TRUE); *************** *** 1582,1586 **** gtk_box_pack_start (GTK_BOX (hbox27), vbox39, TRUE, TRUE, 0); ! label22 = gtk_label_new (_("Do you want to set up the bootloader LILO?\n\nDe-selecting this will not make Morphix bootable, but please note that installing LILO\nmight make other operating systems unaccessable.\n\nAlso select if you want to make a boot floppy.")); gtk_widget_show (label22); gtk_box_pack_start (GTK_BOX (vbox39), label22, FALSE, FALSE, 0); --- 1724,1728 ---- gtk_box_pack_start (GTK_BOX (hbox27), vbox39, TRUE, TRUE, 0); ! label22 = gtk_label_new (_("Do you want to set up the GRUB bootloader?\n\nNot installing GRUB will probably leave Morphix unbootable but please note that installing GRUB\nmight make other operating systems unaccessable.\n\nA menu will be shown at boottime, allowing you to choose which (detected) operating system you would like to use")); gtk_widget_show (label22); gtk_box_pack_start (GTK_BOX (vbox39), label22, FALSE, FALSE, 0); *************** *** 1593,1597 **** gtk_box_pack_start (GTK_BOX (vbox39), hbox31, FALSE, FALSE, 0); ! radiobuttonLILO = gtk_radio_button_new_with_mnemonic (NULL, _("Set up LILO on MBR (removes other bootloaders!)")); gtk_widget_show (radiobuttonLILO); gtk_box_pack_start (GTK_BOX (hbox31), radiobuttonLILO, FALSE, FALSE, 0); --- 1735,1739 ---- gtk_box_pack_start (GTK_BOX (vbox39), hbox31, FALSE, FALSE, 0); ! radiobuttonLILO = gtk_radio_button_new_with_mnemonic (NULL, _("Install GRUB on MBR (removes other bootloaders!) ")); gtk_widget_show (radiobuttonLILO); gtk_box_pack_start (GTK_BOX (hbox31), radiobuttonLILO, FALSE, FALSE, 0); *************** *** 1616,1620 **** gtk_box_pack_start (GTK_BOX (vbox39), hbox30, FALSE, FALSE, 0); ! radiobuttonLILO2 = gtk_radio_button_new_with_mnemonic (NULL, _("Set up LILO on root partition of the harddisk")); gtk_widget_show (radiobuttonLILO2); gtk_box_pack_start (GTK_BOX (hbox30), radiobuttonLILO2, FALSE, FALSE, 0); --- 1758,1762 ---- gtk_box_pack_start (GTK_BOX (vbox39), hbox30, FALSE, FALSE, 0); ! radiobuttonLILO2 = gtk_radio_button_new_with_mnemonic (NULL, _("Install GRUB on root partition of the harddisk")); gtk_widget_show (radiobuttonLILO2); gtk_box_pack_start (GTK_BOX (hbox30), radiobuttonLILO2, FALSE, FALSE, 0); *************** *** 1623,1632 **** radiobuttonLILO_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobuttonLILO2)); ! radiobuttonLILO4 = gtk_radio_button_new_with_mnemonic (NULL, _("Set up LILO on boot partition of the harddisk")); gtk_box_pack_start (GTK_BOX (vbox39), radiobuttonLILO4, FALSE, FALSE, 0); gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobuttonLILO4), radiobuttonLILO_group); radiobuttonLILO_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobuttonLILO4)); ! radiobuttonLILO3 = gtk_radio_button_new_with_mnemonic (NULL, _("Don't install LILO")); gtk_widget_show (radiobuttonLILO3); gtk_box_pack_start (GTK_BOX (vbox39), radiobuttonLILO3, FALSE, FALSE, 0); --- 1765,1774 ---- radiobuttonLILO_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobuttonLILO2)); ! radiobuttonLILO4 = gtk_radio_button_new_with_mnemonic (NULL, _("Install GRUB on boot partition of the harddisk")); gtk_box_pack_start (GTK_BOX (vbox39), radiobuttonLILO4, FALSE, FALSE, 0); gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobuttonLILO4), radiobuttonLILO_group); radiobuttonLILO_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobuttonLILO4)); ! radiobuttonLILO3 = gtk_radio_button_new_with_mnemonic (NULL, _("Don't install GRUB")); gtk_widget_show (radiobuttonLILO3); gtk_box_pack_start (GTK_BOX (vbox39), radiobuttonLILO3, FALSE, FALSE, 0); *************** *** 1639,1655 **** gtk_box_pack_start (GTK_BOX (vbox39), hseparator3, FALSE, FALSE, 0); ! checkbuttonLILOanimate = gtk_check_button_new_with_mnemonic (_("Animate the LILO bootscreen")); gtk_box_pack_start (GTK_BOX (vbox39), checkbuttonLILOanimate, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, checkbuttonLILOanimate, _("Makes your LILO fun to watch, great for showing off your new system to the kids and women who wouldn't care less"), NULL); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbuttonLILOanimate), TRUE); ! hseparator1 = gtk_hseparator_new (); ! gtk_widget_show (hseparator1); ! gtk_box_pack_start (GTK_BOX (vbox39), hseparator1, FALSE, FALSE, 0); ! ! checkbuttonBootFloppy = gtk_check_button_new_with_mnemonic (_("Make a boot floppy (Not yet implemented)")); gtk_widget_show (checkbuttonBootFloppy); gtk_box_pack_start (GTK_BOX (vbox39), checkbuttonBootFloppy, FALSE, FALSE, 0); - gtk_widget_set_sensitive (checkbuttonBootFloppy, FALSE); gtk_tooltips_set_tip (tooltips, checkbuttonBootFloppy, _("You can download a bootfloppy for the Morphix CD on the website, a rescuedisk will be ready in a later release"), NULL); --- 1781,1792 ---- gtk_box_pack_start (GTK_BOX (vbox39), hseparator3, FALSE, FALSE, 0); ! checkbuttonLILOanimate = gtk_check_button_new_with_mnemonic (_("Animate the GRUB bootscreen")); gtk_box_pack_start (GTK_BOX (vbox39), checkbuttonLILOanimate, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, checkbuttonLILOanimate, _(... [truncated message content] |
|
From: <ale...@us...> - 2004-02-15 23:49:25
|
Update of /cvsroot/morphix/morphixinstaller/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24817/debian Modified Files: control files Log Message: lots of code cleanups, integrated grub, multiple partitioners (PM/parted/qtparted,cfdisk), GUI cleanups, RAID/SCSI support? (still need to check initrd) this code is still buggy! Index: control =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/debian/control,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** control 3 Jan 2004 14:55:29 -0000 1.1 --- control 15 Feb 2004 23:41:51 -0000 1.2 *************** *** 8,12 **** Package: morphixinstaller Architecture: i386 ! Depends: ${shlibs:Depends}, libc6 (>= 2.3.2-1), libglib2.0-0, libgtk2.0-0, libpango1.0-0 Description: Install-to-harddisk tool for Morphix-based livecds Initially only for Morphix-based livecds, this tool lets users easily --- 8,12 ---- Package: morphixinstaller Architecture: i386 ! Depends: ${shlibs:Depends}, libc6 (>= 2.3.2-1), libglib2.0-0, libgtk2.0-0, libpango1.0-0, partitionmorpher Description: Install-to-harddisk tool for Morphix-based livecds Initially only for Morphix-based livecds, this tool lets users easily Index: files =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/debian/files,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** files 3 Jan 2004 14:55:29 -0000 1.1 --- files 15 Feb 2004 23:41:51 -0000 1.2 *************** *** 1 **** ! morphixinstaller_0.1-1_i386.deb admin optional --- 1 ---- ! morphixinstaller_0.1-2_i386.deb admin optional |
|
From: <ale...@us...> - 2004-01-11 14:40:43
|
Update of /cvsroot/morphix/morphixinstaller In directory sc8-pr-cvs1:/tmp/cvs-serv16612 Modified Files: ChangeLog Log Message: added number of changes these last few days/weeks Index: ChangeLog =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ChangeLog 28 Oct 2003 01:02:40 -0000 1.6 --- ChangeLog 11 Jan 2004 14:40:39 -0000 1.7 *************** *** 1,2 **** --- 1,9 ---- + 2004-01-11 Alex de Landgraaf <ale...@xs...> + * added es and fr translations: + * Sebastian Bassi - es translation + * Ludovic Grossard - fr translation + * added morphixinstallercl, number of source cleanups, should depend only + on glib + 2003-09-28 Mantas Kriauèiûnas <ma...@ak...> * Lots of usefull changes *************** *** 82,84 **** 2003-09-14 Alex de Landgraaf <ale...@xs...> ! Everything up to 0.4, with major restructuring of installer code \ No newline at end of file --- 89,91 ---- 2003-09-14 Alex de Landgraaf <ale...@xs...> ! Everything up to 0.4, with major restructuring of installer code |
Update of /cvsroot/morphix/partitionmorpher/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4540/src
Modified Files:
callbacks.c main.c pm_fswrap.c pm_fswrap.h pm_libparted.c
pm_libparted.h pm_wrap.c ui.c wizard.h
Log Message:
fixed ntfs-resizing, code cleanups
Index: callbacks.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/callbacks.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** callbacks.c 10 Jan 2004 10:25:31 -0000 1.13
--- callbacks.c 11 Jan 2004 13:31:37 -0000 1.14
***************
*** 7,10 ****
--- 7,12 ----
#include <errno.h>
+ #include <string.h>
+ #include <unistd.h>
#include <fcntl.h>
***************
*** 75,79 ****
{
gchar buffer[64];
! GtkObject *adjustment;
GtkWidget *size_label = lookup_widget(CreateWindow,"CreateMaxLabel");
GtkWidget *size_entry = lookup_widget(CreateWindow,"CreateSizeEntry");
--- 77,81 ----
{
gchar buffer[64];
! // GtkObject *adjustment;
GtkWidget *size_label = lookup_widget(CreateWindow,"CreateMaxLabel");
GtkWidget *size_entry = lookup_widget(CreateWindow,"CreateSizeEntry");
***************
*** 297,302 ****
gpointer user_data)
{
- gchar *dev_str;
- GtkWidget *child;
GtkWidget *tree = lookup_widget(MainWindow,"treeview1");
GtkWidget *menu = gtk_menu_new();
--- 299,302 ----
***************
*** 534,541 ****
gchar fs_buffer[64];
PedSector end_sector;
- PedFileSystemType *fs_type;
PedPartitionType part_type;
GtkWidget *size = lookup_widget(CreateWindow,"CreateSizeEntry");
- GtkWidget *optionmenu_partfs = lookup_widget(CreateWindow,"CreateTypeOptionMenu");
GtkWidget *optionmenu_fs = lookup_widget(CreateWindow,"optionmenu4");
GtkWidget *radio_primary_type = lookup_widget(CreateWindow,"CreatePrimaryRadiobutton");
--- 534,539 ----
***************
*** 564,567 ****
--- 562,569 ----
else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio_logical_type)))
part_type = PED_PARTITION_LOGICAL;
+ else {
+ debug("Error: invalid partition type\n");
+ return;
+ }
value = gtk_entry_get_text(GTK_ENTRY(size));
mb_size = (long long)atol(value);
***************
*** 607,613 ****
pm_set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_LBA,1);
} else {
! index = read(stderr_pipe, error_message_buffer, 1000);
! if (index==1000) // Don't over-run the message buffer
! index--;
error_message_buffer[index] = '\0';
unredirect_stderr(saved_fd, stderr_pipe);
--- 609,613 ----
pm_set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_LBA,1);
} else {
! index = read(stderr_pipe, error_message_buffer, 999);
error_message_buffer[index] = '\0';
unredirect_stderr(saved_fd, stderr_pipe);
***************
*** 624,627 ****
--- 624,631 ----
gpointer user_data)
{
+ int saved_fd, stderr_pipe;
+ gchar error_message_buffer[1000];
+ int index;
+
PedSector end_sector;
GtkWidget *entry = lookup_widget(ResizeWindow,"entry2");
***************
*** 634,641 ****
debug("Debug: mbsize: %lld, end: %lld\n",mb_size,end_sector);
/* check if success? */
! do_resize(&devices[selected_device],partinfo[selected_partition].num,
! partinfo[selected_partition].partname,
! (PedSector) partinfo[selected_partition].start,(PedSector) end_sector);
gtk_widget_hide(ResizeWindow);
refresh_devices_and_partitions();
}
--- 638,654 ----
debug("Debug: mbsize: %lld, end: %lld\n",mb_size,end_sector);
/* check if success? */
! redirect_stderr_to_pipe(&saved_fd, &stderr_pipe);
! gboolean success = do_resize(&devices[selected_device],partinfo[selected_partition].num,partinfo[selected_partition].partname,(PedSector) partinfo[selected_partition].start,(PedSector) end_sector);
! if (success) {
! unredirect_stderr(saved_fd, stderr_pipe);
! }
! else {
! index = read(stderr_pipe, error_message_buffer, 999);
! error_message_buffer[index] = '\0';
! unredirect_stderr(saved_fd, stderr_pipe);
! show_error_message(error_message_buffer);
! }
gtk_widget_hide(ResizeWindow);
+ show_normal_cursor( ((GtkWidget*)button)->window );
refresh_devices_and_partitions();
}
***************
*** 646,651 ****
gpointer user_data)
{
show_busy_cursor( ((GtkWidget*)button)->window );
! do_rm(&devices[selected_device],partinfo[selected_partition].num);
gtk_widget_hide(DeleteWindow);
show_normal_cursor( ((GtkWidget*)button)->window );
--- 659,678 ----
gpointer user_data)
{
+ int saved_fd, stderr_pipe;
+ gchar error_message_buffer[1000];
+ int index;
+
+ redirect_stderr_to_pipe(&saved_fd, &stderr_pipe);
show_busy_cursor( ((GtkWidget*)button)->window );
! gboolean success = do_rm(&devices[selected_device],partinfo[selected_partition].num);
! if (success) {
! unredirect_stderr(saved_fd, stderr_pipe);
! }
! else {
! index = read(stderr_pipe, error_message_buffer, 999);
! error_message_buffer[index] = '\0';
! unredirect_stderr(saved_fd, stderr_pipe);
! show_error_message(error_message_buffer);
! }
gtk_widget_hide(DeleteWindow);
show_normal_cursor( ((GtkWidget*)button)->window );
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** main.c 10 Jan 2004 10:25:31 -0000 1.8
--- main.c 11 Jan 2004 13:31:37 -0000 1.9
***************
*** 21,24 ****
--- 21,26 ----
#include <gtk/gtk.h>
+ #include <unistd.h>
+ #include <string.h>
#include "interface.h"
Index: pm_fswrap.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/pm_fswrap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pm_fswrap.c 10 Jan 2004 10:25:31 -0000 1.2
--- pm_fswrap.c 11 Jan 2004 13:31:37 -0000 1.3
***************
*** 21,34 ****
#include <stdio.h>
#include <stdlib.h>
#include <gtk/gtk.h>
#include <parted/parted.h>
#include "pm_libparted.h"
#define MKNTFS_PATH "/usr/sbin/mkntfs"
#define NTFSRESIZE_PATH "/usr/sbin/ntfsresize"
gboolean ExecuteCommand(gchar *command) {
gchar *outbuffer;
- gchar cmdline[256];
gint exitstatus;
--- 21,37 ----
#include <stdio.h>
#include <stdlib.h>
+ #include <sys/stat.h>
#include <gtk/gtk.h>
#include <parted/parted.h>
#include "pm_libparted.h"
+ #include "main.h" /* for debug() */
#define MKNTFS_PATH "/usr/sbin/mkntfs"
+ #define MKEXT3_PATH "/sbin/mkfs.ext3"
+ #define MKXFS_PATH "/sbin/mkfs.xfs"
#define NTFSRESIZE_PATH "/usr/sbin/ntfsresize"
gboolean ExecuteCommand(gchar *command) {
gchar *outbuffer;
gint exitstatus;
***************
*** 42,74 ****
}
! gboolean pm_wrap_mkntfs_available() {
! FILE *fp;
! fp = fopen(MKNTFS_PATH,"r");
! if (fp != NULL) {
! fclose(fp);
return TRUE;
}
return FALSE;
}
gboolean pm_wrap_ntfsresize_available() {
! FILE *fp;
! fp = fopen(NTFSRESIZE_PATH,"r");
! if (fp != NULL) {
! fclose(fp);
! return TRUE;
! }
! return FALSE;
}
! gboolean do_mkntfs(PedDevice **dev, PedPartitionType part_type,
PedSector start, PedSector end) {
-
- gchar cmdline[1024];
PedDisk *disk;
PedPartition *part;
PedConstraint *constraint;
//char *peek_word;
! PedFileSystemType *fs_type = ped_file_system_type_get("ntfs");
disk = ped_disk_new(*dev);
--- 45,90 ----
}
! gboolean pm_wrap_path_available(gchar *path) {
! /* somehow statting doesn't always work FIXME
! struct stat *buf;
! if (stat(path,buf) == -1) {
! return FALSE;
! }
! if (buf->st_mode & S_IXUSR) {
return TRUE;
}
return FALSE;
+ */
+ FILE *fp;
+ fp = fopen(path,"r");
+ if (fp == NULL) {
+ return FALSE;
+ }
+ fclose(fp);
+ return TRUE;
}
+ gboolean pm_wrap_mkntfs_available() {
+ return pm_wrap_path_available(MKNTFS_PATH);
+ }
gboolean pm_wrap_ntfsresize_available() {
! return pm_wrap_path_available(NTFSRESIZE_PATH);
! }
! gboolean pm_wrap_mkext3_available() {
! return pm_wrap_path_available(MKEXT3_PATH);
! }
! gboolean pm_wrap_mkxfs_available() {
! return pm_wrap_path_available(MKXFS_PATH);
}
! gchar *do_mkpartfs_retpart(PedDevice **dev, PedPartitionType part_type,
! gchar *fs_name,
PedSector start, PedSector end) {
PedDisk *disk;
PedPartition *part;
PedConstraint *constraint;
+ gchar *partname;
//char *peek_word;
! PedFileSystemType *fs_type = ped_file_system_type_get(fs_name);
disk = ped_disk_new(*dev);
***************
*** 122,135 ****
}
ped_constraint_destroy(constraint);
! pm_do_mkpart(dev,part_type,start,end);
! sprintf(cmdline,"%s %s",MKNTFS_PATH,ped_partition_get_path(part));
gboolean ret = ExecuteCommand(cmdline);
! free(cmdline);
ped_disk_destroy(disk);
! return TRUE;
}
! gboolean do_ntfsresize(PedDevice **dev, int part_nr, PedSector old_end, gchar *path, PedSector old_start, PedSector end) {
PedDisk *disk;
PedPartition *part;
--- 138,208 ----
}
ped_constraint_destroy(constraint);
! partname = ped_partition_get_path(part);
! ped_disk_destroy(disk);
! return partname;
! }
! gboolean do_mkntfs(PedDevice **dev, PedPartitionType part_type,
! PedSector start, PedSector end) {
!
! gchar cmdline[1024];
! gchar* partname = do_mkpartfs_retpart(dev,part_type,"ntfs",start,end);
!
! sprintf(cmdline,"%s %s",MKNTFS_PATH,partname);
gboolean ret = ExecuteCommand(cmdline);
! return ret;
! }
!
! gboolean do_mkext3(PedDevice **dev, PedPartitionType part_type,
! PedSector start, PedSector end) {
!
! gchar cmdline[1024];
! gchar *partname = do_mkpartfs_retpart(dev,part_type,"ext3",start,end);
!
! sprintf(cmdline,"%s %s",MKEXT3_PATH,partname);
! gboolean ret = ExecuteCommand(cmdline);
! return ret;
! }
!
! gboolean do_mkxfs(PedDevice **dev, PedPartitionType part_type,
! PedSector start, PedSector end) {
!
! gchar cmdline[1024];
! gchar *partname = do_mkpartfs_retpart(dev,part_type,"xfs",start,end);
!
! sprintf(cmdline,"%s -f %s",MKXFS_PATH,partname);
! gboolean ret = ExecuteCommand(cmdline);
! return ret;
! }
!
! gboolean pm_wrap_ntfsresize(PedDevice **dev, int part_nr, gchar *path, PedSector start, PedSector end) {
! PedDisk *disk;
! PedPartition *part;
! gchar cmdline[1024];
! disk = ped_disk_new(*dev);
! if (!disk)
! return FALSE;
! part = ped_disk_get_partition(disk,part_nr);
! if (!part) {
! ped_disk_destroy (disk);
! return FALSE;
! }
! if (!partition_warn_busy(part,path)) {
! ped_disk_destroy (disk);
! return FALSE;
! }
! if (!start || !end) {
! ped_disk_destroy (disk);
! return FALSE;
! }
ped_disk_destroy(disk);
! /* which partition to resize? close disk! */
! long long sector_nr = end - start;
! sprintf(cmdline,"%s -ff -s %lldM %s",NTFSRESIZE_PATH,(sector_nr * 512 / (1024*1024)),path); // -ff? hope i won't have to use this...
! gboolean ret = ExecuteCommand(cmdline);
! return ret;
}
! gboolean do_ntfsresize(PedDevice **dev, int part_nr, PedSector old_end, gchar *path, PedSector start, PedSector new_end) {
PedDisk *disk;
PedPartition *part;
***************
*** 152,174 ****
return FALSE;
}
! if (!old_start || !end) {
ped_disk_destroy (disk);
return FALSE;
}
! if (end < old_end) {
// shrinking
!
! if (!pm_wrap_ntfsresize(dev,part_nr,path,old_start,end)) {
debug("ntfsresizing failed, aborting!\n");
ped_disk_destroy(disk);
return FALSE;
}
! do_resize(dev,part_nr,path,old_start,end);
}
! if (end > old_end) {
// expanding
! do_resize(dev,part_nr,path,old_start,end);
! if (!pm_wrap_ntfsresize(dev,part_nr,path,old_start,end)) {
debug("ntfsresizing failed, aborting!\n");
ped_disk_destroy(disk);
return FALSE;
--- 225,248 ----
return FALSE;
}
! if (!start || !new_end || !old_end) {
ped_disk_destroy (disk);
return FALSE;
}
! ped_disk_destroy(disk);
! if (new_end < old_end) {
// shrinking
! if (!pm_wrap_ntfsresize(dev,part_nr,path,start,new_end)) {
debug("ntfsresizing failed, aborting!\n");
ped_disk_destroy(disk);
return FALSE;
}
! pm_do_resize_part_only(dev,part_nr,path,start,new_end);
}
! if (new_end > old_end) {
// expanding
! pm_do_resize_part_only(dev,part_nr,path,start,new_end);
! if (!pm_wrap_ntfsresize(dev,part_nr,path,start,new_end)) {
debug("ntfsresizing failed, aborting!\n");
+ pm_do_resize_part_only(dev,part_nr,path,start,old_end);
ped_disk_destroy(disk);
return FALSE;
***************
*** 176,206 ****
}
return TRUE;
- }
-
- gboolean pm_wrap_ntfsresize(PedDevice **dev, int part_nr, gchar *path, PedSector start, PedSector end) {
- PedDisk *disk;
- PedFileSystem *fs;
- PedPartition *part;
- gchar cmdline[1024];
- disk = ped_disk_new(*dev);
- if (!disk)
- return FALSE;
- part = ped_disk_get_partition(disk,part_nr);
- if (!part) {
- ped_disk_destroy (disk);
- return FALSE;
- }
- if (!partition_warn_busy(part,path)) {
- ped_disk_destroy (disk);
- return FALSE;
- }
- if (!start || !end) {
- ped_disk_destroy (disk);
- return FALSE;
- }
- /* which partition to resize? close disk! */
- sprintf(cmdline,"%s -ff -s %d",NTFSRESIZE_PATH,(start / (1024*1024) * 512)); // -ff? hope i won't have to use this...
- gboolean ret = ExecuteCommand(cmdline);
- return ret;
}
--- 250,253 ----
Index: pm_fswrap.h
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/pm_fswrap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pm_fswrap.h 10 Jan 2004 10:25:31 -0000 1.2
--- pm_fswrap.h 11 Jan 2004 13:31:37 -0000 1.3
***************
*** 12,14 ****
--- 12,25 ----
PedSector start, PedSector end);
+ gboolean pm_wrap_mkntfs_available();
+ gboolean pm_wrap_ntfsresize_available();
+ gboolean pm_wrap_mkext3_available();
+ gboolean pm_wrap_mkxfs_available();
+ gboolean do_mkxfs(PedDevice **dev, PedPartitionType part_type,
+ PedSector start, PedSector end);
+ gboolean do_mkext3(PedDevice **dev, PedPartitionType part_type,
+ PedSector start, PedSector end);
+ gboolean do_mkntfs(PedDevice **dev, PedPartitionType part_type,
+ PedSector start, PedSector end);
+
#endif // PM_FSWRAP_H
Index: pm_libparted.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/pm_libparted.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pm_libparted.c 10 Jan 2004 10:25:31 -0000 1.10
--- pm_libparted.c 11 Jan 2004 13:31:37 -0000 1.11
***************
*** 25,28 ****
--- 25,30 ----
#include <stdlib.h>
#include <gtk/gtk.h>
+ #include <string.h>
+ #include <unistd.h>
#include <parted/parted.h>
#include <parted/debug.h>
***************
*** 30,33 ****
--- 32,36 ----
#include "support.h"
+ #include "main.h" /* for debug() */
extern GtkWidget * ProgressWindow; // should change this, gtk-independant...
***************
*** 62,66 ****
static void
! init_disk_types ()
{
ped_disk_loop_init (); /* must be last in the probe list */
--- 65,69 ----
static void
! init_disk_types () /* not used yet */
{
ped_disk_loop_init (); /* must be last in the probe list */
***************
*** 117,121 ****
static void
! done_disk_types ()
{
ped_disk_sun_done ();
--- 120,124 ----
static void
! done_disk_types () /* not used yet */
{
ped_disk_sun_done ();
***************
*** 138,141 ****
--- 141,147 ----
static void
+ _timer_handler (PedTimer* timer, void* context);
+
+ static void
display_progress_window()
{
***************
*** 199,203 ****
message[0] &= 0xDF;
}
! sprintf (message, _("%sTime left %.2d:%.2d\n"),
message,
tcontext->predicted_time_left / 60,
--- 205,209 ----
message[0] &= 0xDF;
}
! sprintf (message, _("%sTime left %.2ld:%.2ld\n"),
message,
tcontext->predicted_time_left / 60,
***************
*** 254,258 ****
*/
! gboolean partition_warn_busy (PedPartition *part, gchar *path2) {
/* char *path = ped_partition_get_path (part);
char *path = malloc(strlen(path2)+1);
--- 260,264 ----
*/
! gboolean partition_warn_busy (PedPartition *part, gchar *path2) { /* needs fixing! */
/* char *path = ped_partition_get_path (part);
char *path = malloc(strlen(path2)+1);
***************
*** 356,360 ****
gboolean pm_do_mklabel (PedDevice **dev, PedDiskType *type) {
PedDisk *disk;
- const PedDiskType *def_type = ped_disk_probe(*dev);
ped_exception_fetch_all();
--- 362,365 ----
***************
*** 388,406 ****
gboolean pm_do_mkfs (PedDevice **dev, int part_nr ,gchar *path, PedFileSystemType *type) {
PedDisk *disk;
- PedFileSystemType *def_type = ped_file_system_type_get("ext3");
PedFileSystem *fs;
PedPartition *part;
disk = ped_disk_new (*dev);
! if (!disk || !part) {
ped_disk_destroy (disk);
return FALSE;
}
part = ped_disk_get_partition(disk,part_nr);
if (!partition_warn_busy(part,path)) {
ped_disk_destroy (disk);
return FALSE;
}
!
fs = ped_file_system_create (&part->geom,type,timer);
if (!fs) {
ped_disk_destroy (disk);
--- 393,416 ----
gboolean pm_do_mkfs (PedDevice **dev, int part_nr ,gchar *path, PedFileSystemType *type) {
PedDisk *disk;
PedFileSystem *fs;
PedPartition *part;
+
disk = ped_disk_new (*dev);
! if (!disk || !path) {
ped_disk_destroy (disk);
return FALSE;
}
part = ped_disk_get_partition(disk,part_nr);
+ if (part == NULL) {
+ return FALSE;
+ }
if (!partition_warn_busy(part,path)) {
ped_disk_destroy (disk);
return FALSE;
}
! display_progress_window();
fs = ped_file_system_create (&part->geom,type,timer);
+ gtk_widget_hide(ProgressWindow);
+
if (!fs) {
ped_disk_destroy (disk);
***************
*** 625,630 ****
return FALSE;
}
!
fs_copy = ped_file_system_copy (fs, &part->geom, timer);
if (!fs_copy) {
ped_file_system_close (fs);
--- 635,641 ----
return FALSE;
}
! display_progress_window();
fs_copy = ped_file_system_copy (fs, &part->geom, timer);
+ gtk_widget_hide(ProgressWindow);
if (!fs_copy) {
ped_file_system_close (fs);
***************
*** 702,705 ****
--- 713,720 ----
if (part->type == PED_PARTITION_EXTENDED) {
constraint = ped_constraint_any(*dev);
+ if (constraint == NULL) {
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
if (!ped_disk_set_partition_geom(disk,part,constraint,
new_geom.start, new_geom.end)) {
***************
*** 718,726 ****
fs = ped_file_system_open(&part->geom);
if (!fs) {
- ped_constraint_destroy (constraint);
ped_disk_destroy (disk);
return FALSE;
}
constraint = ped_file_system_get_resize_constraint(fs);
if (!ped_disk_set_partition_geom(disk,part,constraint,
new_geom.start,new_geom.end)) {
--- 733,745 ----
fs = ped_file_system_open(&part->geom);
if (!fs) {
ped_disk_destroy (disk);
return FALSE;
}
constraint = ped_file_system_get_resize_constraint(fs);
+ if (constraint == NULL) {
+ ped_file_system_close (fs);
+ return FALSE;
+ }
+
if (!ped_disk_set_partition_geom(disk,part,constraint,
new_geom.start,new_geom.end)) {
***************
*** 737,740 ****
--- 756,760 ----
return FALSE;
}
+ display_progress_window();
if (!ped_file_system_resize(fs,&part->geom,timer)) {
ped_file_system_close (fs);
***************
*** 743,746 ****
--- 763,767 ----
return FALSE;
}
+ gtk_widget_hide(ProgressWindow);
ped_partition_set_system (part, fs->type);
ped_file_system_close(fs);
***************
*** 753,767 ****
}
! gboolean pm_do_rm(PedDevice **dev, gint num) {
PedDisk *disk;
PedPartition *part;
disk = ped_disk_new(*dev);
! if(!disk)
return FALSE;
if (!part) {
ped_disk_destroy (disk);
return FALSE;
}
part = ped_disk_get_partition(disk,num);
if (ped_partition_is_busy(part)) {
// if (!partition_warn_busy(part, path)) {
--- 774,838 ----
}
! gboolean pm_do_resize_part_only (PedDevice **dev, int part_nr ,gchar *path, PedSector start, PedSector end) {
PedDisk *disk;
+ PedConstraint *constraint;
+ PedGeometry new_geom;
PedPartition *part;
+
disk = ped_disk_new(*dev);
! if (!disk)
return FALSE;
+ part = ped_disk_get_partition(disk,part_nr);
if (!part) {
ped_disk_destroy (disk);
return FALSE;
}
+ if (!partition_warn_busy(part,path)) {
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
+ if (!start || !end) {
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
+ if (!ped_geometry_init (&new_geom, *dev, start, end - start + 1)) {
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
+ constraint = ped_constraint_any(*dev);
+ if (constraint == NULL) {
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
+ if (!ped_disk_set_partition_geom(disk,part,constraint,
+ new_geom.start, new_geom.end)) {
+ ped_constraint_destroy (constraint);
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
+ if (!pm_solution_check_distant (start, end, part->geom.start, part->geom.end)) {
+ ped_constraint_destroy (constraint);
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
+ ped_partition_set_system(part,NULL);
+
+ ped_disk_commit(disk);
+ ped_constraint_destroy(constraint);
+ ped_disk_destroy(disk);
+ return TRUE;
+ }
+
+
+ gboolean pm_do_rm(PedDevice **dev, gint num) {
+ PedDisk *disk;
+ PedPartition *part;
+ disk = ped_disk_new(*dev);
+ if(!disk)
+ return FALSE;
part = ped_disk_get_partition(disk,num);
+ if (part == NULL) {
+ return FALSE;
+ }
if (ped_partition_is_busy(part)) {
// if (!partition_warn_busy(part, path)) {
***************
*** 1026,1031 ****
gint i;
gint flags;
- gint first_flag;
- glong free_space = 0;
gchar buffer[64];
const char *label = NULL;
--- 1097,1100 ----
***************
*** 1169,1174 ****
strncpy(partinfo[i].type_name,ped_partition_type_get_name(part->type),63);
}
-
ped_disk_destroy(disk);
}
--- 1238,1243 ----
strncpy(partinfo[i].type_name,ped_partition_type_get_name(part->type),63);
}
ped_disk_destroy(disk);
+ return TRUE;
}
***************
*** 1320,1323 ****
--- 1389,1394 ----
return dev;
}
+ /*
+ this is broken, silly and stinks
gchar ** pm_get_flag_type_list() {
***************
*** 1334,1337 ****
--- 1405,1410 ----
counter++;
}
+ if (counter == 0)
+ return NULL;
list[counter] = NULL;
return list;
***************
*** 1350,1353 ****
--- 1423,1428 ----
counter++;
}
+ if (counter == 0)
+ return NULL;
list[counter] = NULL;
return list;
***************
*** 1366,1373 ****
counter++;
}
list[counter] = NULL;
return list;
}
!
--- 1441,1450 ----
counter++;
}
+ if (counter == 0)
+ return NULL;
list[counter] = NULL;
return list;
}
! */
Index: pm_libparted.h
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/pm_libparted.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pm_libparted.h 10 Jan 2004 10:25:31 -0000 1.10
--- pm_libparted.h 11 Jan 2004 13:31:37 -0000 1.11
***************
*** 167,170 ****
--- 167,173 ----
PedSector start, PedSector end);
+ gboolean pm_do_resize_part_only (PedDevice **dev, int part_nr,
+ gchar *path, PedSector start, PedSector end);
+
/*
remove the partition num
***************
*** 261,264 ****
--- 264,279 ----
struct partinfo_struct *pm_get_partition_from_partinfo_num(gint num);
+ void pm_get_filesystem_list();
+
+ void pm_select_device(int device_nr);
+
+ void pm_select_update_device(int device_nr);
+
+ gboolean grow_over_small_freespace(PedGeometry *geom, PedDisk *disk);
+
+ gint pm_get_valid_device(char* device_path);
+
+ gboolean partition_warn_busy (PedPartition *part, gchar *path2);
+
/*
adds all devices to the devices-array
***************
*** 273,279 ****
PedDevice *pm_get_next_device(const PedDevice *device);
-
- static void
- _timer_handler (PedTimer* timer, void* context);
#endif // PM_LIBPARTED_H
--- 288,291 ----
Index: pm_wrap.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/pm_wrap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pm_wrap.c 10 Jan 2004 10:26:10 -0000 1.1
--- pm_wrap.c 11 Jan 2004 13:31:37 -0000 1.2
***************
*** 23,26 ****
--- 23,27 ----
#include <stdio.h>
#include <stdlib.h>
+ #include <string.h>
#include <gtk/gtk.h>
#include <parted/parted.h>
***************
*** 28,31 ****
--- 29,33 ----
#include <parted/linux.h>
#include "pm_wrap.h"
+ #include "pm_fswrap.h"
void add_fs_item(gchar *item, gchar *name) {
***************
*** 39,45 ****
add_fs_item("","None");
add_fs_item("","--");
! add_fs_item("ext3","ext3");
add_fs_item("ext2","ext2");
add_fs_item("reiserfs","reiserfs");
add_fs_item("","--");
add_fs_item("linux-swap","Swap");
--- 41,52 ----
add_fs_item("","None");
add_fs_item("","--");
! if (pm_wrap_mkext3_available()) {
! add_fs_item("ext3","ext3");
! }
add_fs_item("ext2","ext2");
add_fs_item("reiserfs","reiserfs");
+ if (pm_wrap_mkxfs_available()) {
+ add_fs_item("xfs","xfs");
+ }
add_fs_item("","--");
add_fs_item("linux-swap","Swap");
***************
*** 51,54 ****
--- 58,62 ----
add_fs_item("ntfs","ntfs");
}
+
return TRUE;
}
***************
*** 70,78 ****
int part_nr,
PedSector start, PedSector end) {
- gint partnr = pm_get_arraynumber_from_partinfo_num(part_nr);
if (strcmp(fs_buffer,"ntfs") == 0) {
/* resize ntfs filesystem instead */
return do_mkntfs(dev,part_type,start,end);
}
return pm_do_mkpartfs(dev,part_type,ped_file_system_type_get(fs_buffer),start,end);
}
--- 78,91 ----
int part_nr,
PedSector start, PedSector end) {
if (strcmp(fs_buffer,"ntfs") == 0) {
/* resize ntfs filesystem instead */
return do_mkntfs(dev,part_type,start,end);
}
+ if (strcmp(fs_buffer,"ext3") == 0) {
+ return do_mkext3(dev,part_type,start,end);
+ }
+ if (strcmp(fs_buffer,"xfs") == 0) {
+ return do_mkxfs(dev,part_type,start,end);
+ }
return pm_do_mkpartfs(dev,part_type,ped_file_system_type_get(fs_buffer),start,end);
}
***************
*** 100,104 ****
if (strcmp(partinfo[partnr].temp_fs_name,"ntfs") == 0) {
/* resize ntfs filesystem instead */
! return do_ntfsresize(&devices[selected_device],partinfo[partnr].num,(PedSector)partinfo[partnr].end,partinfo[partnr].partname,(PedSector) partinfo[partnr].start,(PedSector) end);
}
else {
--- 113,117 ----
if (strcmp(partinfo[partnr].temp_fs_name,"ntfs") == 0) {
/* resize ntfs filesystem instead */
! return do_ntfsresize(&devices[selected_device],partinfo[partnr].num,(PedSector)partinfo[partnr].end,strdup(partinfo[partnr].partname),(PedSector) partinfo[partnr].start,(PedSector) end);
}
else {
Index: ui.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/ui.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ui.c 10 Jan 2004 10:25:31 -0000 1.2
--- ui.c 11 Jan 2004 13:31:37 -0000 1.3
***************
*** 3,6 ****
--- 3,8 ----
#include <errno.h>
+ #include <unistd.h>
+ #include <string.h>
#include <fcntl.h>
***************
*** 187,191 ****
void tree_selection_changed (GtkTreeSelection *selection, gpointer data) {
- GtkWidget *treeview = lookup_widget(MainWindow,"treeview1");
GtkWidget *create_widget = lookup_widget(MainWindow,"CreateButton");
GtkWidget *resize_widget = lookup_widget(MainWindow,"ResizeButton");
--- 189,192 ----
***************
*** 193,197 ****
GtkWidget *move_widget = lookup_widget(MainWindow,"MoveButton");
GtkWidget *convert_widget = lookup_widget(MainWindow,"ConvertButton");
! GtkWidget *refresh_widget = lookup_widget(MainWindow,"RefreshButton");
GtkTreeIter iter;
--- 194,198 ----
GtkWidget *move_widget = lookup_widget(MainWindow,"MoveButton");
GtkWidget *convert_widget = lookup_widget(MainWindow,"ConvertButton");
! /* GtkWidget *refresh_widget = lookup_widget(MainWindow,"RefreshButton"); */
GtkTreeIter iter;
***************
*** 200,205 ****
struct partinfo_struct *partition;
- //selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-
if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
gtk_tree_model_get(model, &iter,PART_NUMBER, &num,-1);
--- 201,204 ----
***************
*** 279,282 ****
--- 278,282 ----
(path));
}
+ return TRUE;
}
/*
***************
*** 471,475 ****
debug("Debug: device %d is: length %d sector %d MB\n",
device,(int)devices[device]->length,selected_device_total_size);
! sprintf(string,"Total size: %d MB",selected_device_total_size);
gtk_label_set_text(GTK_LABEL(sizelabel),string);
}
--- 471,475 ----
debug("Debug: device %d is: length %d sector %d MB\n",
device,(int)devices[device]->length,selected_device_total_size);
! sprintf(string,"Total size: %ld MB",selected_device_total_size);
gtk_label_set_text(GTK_LABEL(sizelabel),string);
}
Index: wizard.h
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/wizard.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wizard.h 10 Jan 2004 10:26:10 -0000 1.1
--- wizard.h 11 Jan 2004 13:31:37 -0000 1.2
***************
*** 11,14 ****
--- 11,15 ----
gboolean check_enough_freespace(int size_mb);
gboolean return_mode_available(int mode_nr);
+ void set_needed_freespace(gint size_mb);
#endif // WIZARD_H_PM
|
|
From: <ale...@us...> - 2004-01-11 13:31:41
|
Update of /cvsroot/morphix/partitionmorpher In directory sc8-pr-cvs1:/tmp/cvs-serv4540 Modified Files: ChangeLog Log Message: fixed ntfs-resizing, code cleanups Index: ChangeLog =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ChangeLog 20 Oct 2003 17:23:34 -0000 1.5 --- ChangeLog 11 Jan 2004 13:31:37 -0000 1.6 *************** *** 1,2 **** --- 1,17 ---- + 2004-01-11 Alex de Landgraaf <ale...@xs...> + * src/callbacks.c: Implemented progress and error dialogs for + resizing and deleting. + * src/pm_wrap.c/h: made wrapper as to enable non-parted commandline + tools, however timer implementing for these has yet to be done + (impossible?). Dynamic filesystem times. Support of using + do_mkpartfs with parted and ntfs/ext3/xfs. Support of do_resize + with parted and ntfs. + * src/pm_fswrap.c/h: all non-parted calls, currently mktfs, mkfs.ext3, + mkfs.xfs, ntfsresize. todo: xfs_grow, resize2fs for ext3 + * src/pm_libparted.c: see callbacks.c, redesigned calling of do_ + functions + * src/ui.c: all non-callback gtk code to be done in here, mainly + old callback.c code + * some glade changes 2003-10-20 Elijah Newren <ne...@ma...> * src/main.c: Workaround a Parted bug. Parted can't call the |
|
From: <ale...@us...> - 2004-01-10 12:25:21
|
Update of /cvsroot/morphix/morphixinstaller In directory sc8-pr-cvs1:/tmp/cvs-serv720 Modified Files: configure.in Log Message: i18n Index: configure.in =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.in 19 Sep 2003 14:34:24 -0000 1.3 --- configure.in 10 Jan 2004 12:25:18 -0000 1.4 *************** *** 38,47 **** dnl Add the languages which your application supports here. dnl Please keep them in alphabetical order ! ALL_LINGUAS="" AM_GLIB_GNU_GETTEXT ! GETTEXT_PACKAGE=installer AC_SUBST(GETTEXT_PACKAGE) ! AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The package name for gettext]) dnl -------- --- 38,47 ---- dnl Add the languages which your application supports here. dnl Please keep them in alphabetical order ! ALL_LINGUAS="es fr" AM_GLIB_GNU_GETTEXT ! GETTEXT_PACKAGE=morphixinstaller AC_SUBST(GETTEXT_PACKAGE) ! AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", morphixinstaller) dnl -------- |
|
From: <ale...@us...> - 2004-01-10 10:26:13
|
Update of /cvsroot/morphix/partitionmorpher/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15621
Added Files:
pm_wrap.c pm_wrap.h wizard.c wizard.h
Log Message:
major restructuring, added wrapper functions for do_functions for integration
with pm_fswrap, dynamic fs types. start on wizard
--- NEW FILE: pm_wrap.c ---
/*
Copyright (C) 2003 Alex de Landgraaf <ale...@xs...>
wrapper for the pm_do functions,
should do actions without worrying about fs types etc
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.
*/
#include "pm_libparted.h"
#include <stdio.h>
#include <stdlib.h>
#include <gtk/gtk.h>
#include <parted/parted.h>
#include <parted/debug.h>
#include <parted/linux.h>
#include "pm_wrap.h"
void add_fs_item(gchar *item, gchar *name) {
strcpy(fs_menu_items[fs_menu_items_count],item);
strcpy(fs_menu_names[fs_menu_items_count],name);
fs_menu_items_count++;
}
gboolean read_fs_items() {
fs_menu_items_count = 0;
add_fs_item("","None");
add_fs_item("","--");
add_fs_item("ext3","ext3");
add_fs_item("ext2","ext2");
add_fs_item("reiserfs","reiserfs");
add_fs_item("","--");
add_fs_item("linux-swap","Swap");
add_fs_item("","--");
add_fs_item("fat16","fat16");
add_fs_item("fat32","fat32");
if (pm_wrap_mkntfs_available()) {
add_fs_item("ntfs","ntfs");
}
return TRUE;
}
gboolean do_mklabel (PedDevice **dev, PedDiskType *type) {
return pm_do_mklabel(dev,type);
}
gboolean do_mkfs (PedDevice **dev, int part_nr ,gchar *path, PedFileSystemType *type) {
return pm_do_mkfs(dev,part_nr,path,type);
}
gboolean do_mkpart (PedDevice **dev,PedPartitionType part_type, PedSector start, PedSector end) {
return pm_do_mkpart(dev,part_type,start,end);
}
gboolean do_mkpartfs (PedDevice **dev, PedPartitionType part_type,
char *fs_buffer,
int part_nr,
PedSector start, PedSector end) {
gint partnr = pm_get_arraynumber_from_partinfo_num(part_nr);
if (strcmp(fs_buffer,"ntfs") == 0) {
/* resize ntfs filesystem instead */
return do_mkntfs(dev,part_type,start,end);
}
return pm_do_mkpartfs(dev,part_type,ped_file_system_type_get(fs_buffer),start,end);
}
gboolean do_move(PedDevice **dev, int part_nr,gchar *path, PedSector start, PedSector end) {
return pm_do_move(dev,part_nr,path,start,end);
}
gboolean do_name(PedDevice **dev,int part_nr, gchar *name) {
return pm_do_name(dev,part_nr,name);
}
gboolean check_resize_possible(int part_nr) {
gint partnr = pm_get_arraynumber_from_partinfo_num(part_nr);
if (strcmp(partinfo[partnr].temp_fs_name,"ntfs") == 0) {
return pm_wrap_ntfsresize_available();
}
if (partinfo[partnr].max_size == 0 && partinfo[partnr].min_size == 0) {
return FALSE;
}
return TRUE;
}
gboolean do_resize (PedDevice **dev, int part_nr ,gchar *path, PedSector start, PedSector end) {
gint partnr = pm_get_arraynumber_from_partinfo_num(part_nr);
if (strcmp(partinfo[partnr].temp_fs_name,"ntfs") == 0) {
/* resize ntfs filesystem instead */
return do_ntfsresize(&devices[selected_device],partinfo[partnr].num,(PedSector)partinfo[partnr].end,partinfo[partnr].partname,(PedSector) partinfo[partnr].start,(PedSector) end);
}
else {
return pm_do_resize(dev,part_nr,path,start,end);
}
}
gboolean do_rm(PedDevice **dev, gint num) {
return pm_do_rm(dev,num);
}
--- NEW FILE: pm_wrap.h ---
#ifndef PM_WRAP_H
#define PM_WRAP_H
#include <parted/parted.h>
#include <gtk/gtk.h>
/*
read in all available makeable filesystems
*/
gboolean read_fs_items();
/*
changes the label of the device
*/
gboolean do_mklabel (PedDevice **dev, PedDiskType *type);
/*
makes a filesystem on part
*/
gboolean do_mkfs (PedDevice **dev, int part_nr,
gchar *path, PedFileSystemType *type);
/*
makes a partition using start and end sectors as guidelines
doesn't make a filesystem
*/
gboolean do_mkpart (PedDevice **dev,PedPartitionType part_type,
PedSector start, PedSector end);
/*
makes a partition using start and end sectors as guidelines
does make a filesystem type fs_type
*/
gboolean do_mkpartfs (PedDevice **dev, PedPartitionType part_type,
char *fs_buffer,
int part_nr,
PedSector start, PedSector end);
/*
move the partition part to start-end
*/
gboolean do_move(PedDevice **dev, int part_nr,
gchar *path,
PedSector start, PedSector end);
/*
change the name of the partition
*/
gboolean do_name(PedDevice **dev,int part_nr,
gchar *name);
/*
checks if resizing is possible, including the wrapper functions
*/
gboolean check_resize_possible(int part_nr);
/*
resize the partition part
to start-end
*/
gboolean do_resize (PedDevice **dev, int part_nr,
gchar *path,
PedSector start, PedSector end);
/*
remove the partition num
*/
gboolean do_rm(PedDevice **dev, gint num);
#endif
--- NEW FILE: wizard.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. */
#include <glib.h>
#include "pm_libparted.h"
/*
#define MODE_FREESPACE 1
#define MODE_RESIZE 2
#define MODE_DESTRUCTIVE 3
*/
gint needed_freespace;
void set_needed_freespace(gint size_mb) {
needed_freespace = size_mb;
}
gboolean apply_mode(gint mode_nr) {
}
gboolean check_enough_freespace(gint size_mb) {
}
gboolean return_mode_available(gint mode_nr) {
}
--- NEW FILE: wizard.h ---
#ifndef WIZARD_H_PM
#define WIZARD_H_PM
#include <glib.h>
#define MODE_FREESPACE 1
#define MODE_RESIZE 2
#define MODE_DESTRUCTIVE 3
gboolean apply_mode(int mode_nr);
gboolean check_enough_freespace(int size_mb);
gboolean return_mode_available(int mode_nr);
#endif // WIZARD_H_PM
|
|
From: <ale...@us...> - 2004-01-10 10:25:36
|
Update of /cvsroot/morphix/partitionmorpher/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15233/src
Modified Files:
Makefile.am callbacks.c callbacks.h interface.c interface.h
main.c pm_fswrap.c pm_fswrap.h pm_libparted.c pm_libparted.h
ui.c ui.h
Log Message:
major restructuring, added wrapper functions for do_functions for integration
with pm_fswrap, dynamic fs types. start on wizard
Index: Makefile.am
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am 2 Jan 2004 15:17:31 -0000 1.2
--- Makefile.am 10 Jan 2004 10:25:31 -0000 1.3
***************
*** 14,18 ****
callbacks.c callbacks.h \
pm_libparted.c pm_libparted.h \
! ui.c ui.h pm_fswrap.c pm_fswrap.h
partitionmorpher_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lparted
--- 14,19 ----
callbacks.c callbacks.h \
pm_libparted.c pm_libparted.h \
! ui.c ui.h pm_fswrap.c pm_fswrap.h pm_wrap.c pm_wrap.h \
! wizard.c wizard.h
partitionmorpher_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lparted
Index: callbacks.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/callbacks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** callbacks.c 2 Jan 2004 15:17:31 -0000 1.12
--- callbacks.c 10 Jan 2004 10:25:31 -0000 1.13
***************
*** 15,18 ****
--- 15,19 ----
#include "pm_libparted.h"
#include "pm_fswrap.h"
+ #include "pm_wrap.h"
#include "ui.h"
***************
*** 50,56 ****
extern GtkWidget *ProgressWindow;
- #define MEGABYTE_SIZE (1024*1024)
- #define MEGABYTE_SECTORS 512
-
enum {
PART_NUMBER,
--- 51,54 ----
***************
*** 81,84 ****
--- 79,85 ----
GtkWidget *size_entry = lookup_widget(CreateWindow,"CreateSizeEntry");
+ read_fs_items(); // need this to set all available filesystems
+ set_create_fs_option_menu(); // set up the option menu
+
sprintf(buffer,"%ld",partinfo[selected_partition].size);
gtk_entry_set_text(GTK_ENTRY(size_entry),buffer);
***************
*** 313,318 ****
}
gtk_option_menu_set_menu(GTK_OPTION_MENU(option),menu);
! get_filesystem_list();
! selected_device = 0;
//ped_device_open(devices[selected_device]);
--- 314,320 ----
}
gtk_option_menu_set_menu(GTK_OPTION_MENU(option),menu);
! pm_get_filesystem_list();
! pm_select_device(0);
! set_callback_partition_list();
//ped_device_open(devices[selected_device]);
***************
*** 392,397 ****
gpointer user_data)
{
! selected_device = gtk_option_menu_get_history(optionmenu);
! scan_partitions(&devices[selected_device]);
update_interface(selected_device);
if (update_partition_list() == FALSE) {
--- 394,399 ----
gpointer user_data)
{
! pm_select_update_device(gtk_option_menu_get_history(optionmenu));
!
update_interface(selected_device);
if (update_partition_list() == FALSE) {
***************
*** 553,605 ****
gint sel = gtk_option_menu_get_history(GTK_OPTION_MENU(optionmenu_fs));
! switch (sel) {
! /* 1 is a line separator and can't be chosen */
! case(0):
! strcpy(fs_buffer,"");
! break;
! case(2):
! strcpy(fs_buffer,"ext3");
! break;
! case(3):
! strcpy(fs_buffer,"ext2");
! break;
! case(4):
! strcpy(fs_buffer,"reiserfs");
! break;
! case(5):
! strcpy(fs_buffer,"xfs");
! break;
! /* 6 is a line separator and can't be chosen */
! case(7):
! strcpy(fs_buffer,"linux-swap");
! break;
!
! /* 8 is a line separator and can't be chosen */
! case(9):
! strcpy(fs_buffer,"hfs");
! break;
! case(10):
! strcpy(fs_buffer,"jfs");
! break;
! case(11):
! strcpy(fs_buffer,"hp-ufs");
! break;
! case(12):
! strcpy(fs_buffer,"sun-ufs");
! break;
! /* 13 is a line separator and can't be chosen */
! case(14):
! strcpy(fs_buffer,"ntfs");
! break;
! case(15):
! strcpy(fs_buffer,"fat32");
! break;
! case(16):
! strcpy(fs_buffer,"fat16");
! break;
! default:
! strcpy(fs_buffer,"ext3");
! break;
! }
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio_primary_type)))
--- 555,560 ----
gint sel = gtk_option_menu_get_history(GTK_OPTION_MENU(optionmenu_fs));
!
! strcpy(fs_buffer,fs_menu_items[sel]);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio_primary_type)))
***************
*** 618,625 ****
end_sector = sector_num + partinfo[selected_partition].start;
! debug("Debug: selectedpartititon: %d\n",selected_partition);
debug("Debug: mbsize: %lld, start: %lld end: %lld\n",mb_size, partinfo[selected_partition].start,end_sector);
- fs_type = ped_file_system_type_get(fs_buffer);
redirect_stderr_to_pipe(&saved_fd, &stderr_pipe);
--- 573,579 ----
end_sector = sector_num + partinfo[selected_partition].start;
! debug("Debug: selectedpartition: %d\n",selected_partition);
debug("Debug: mbsize: %lld, start: %lld end: %lld\n",mb_size, partinfo[selected_partition].start,end_sector);
redirect_stderr_to_pipe(&saved_fd, &stderr_pipe);
***************
*** 632,636 ****
success=do_mkpartfs(&devices[selected_device],
part_type, /* Partition type == PED_PARTITION_PRIMARY */
! fs_type,
partinfo[selected_partition].start,
(PedSector)end_sector);
--- 586,591 ----
success=do_mkpartfs(&devices[selected_device],
part_type, /* Partition type == PED_PARTITION_PRIMARY */
! fs_buffer,
! selected_partition,
partinfo[selected_partition].start,
(PedSector)end_sector);
***************
*** 640,654 ****
unredirect_stderr(saved_fd, stderr_pipe);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_boot_flag)))
! set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_BOOT,1);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_root_flag)))
! set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_ROOT,1);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_hidden_flag)))
! set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_HIDDEN,1);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_raid_flag)))
! set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_RAID,1);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_lvm_flag)))
! set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_LVM,1);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_lba_flag)))
! set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_LBA,1);
} else {
index = read(stderr_pipe, error_message_buffer, 1000);
--- 595,609 ----
unredirect_stderr(saved_fd, stderr_pipe);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_boot_flag)))
! pm_set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_BOOT,1);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_root_flag)))
! pm_set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_ROOT,1);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_hidden_flag)))
! pm_set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_HIDDEN,1);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_raid_flag)))
! pm_set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_RAID,1);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_lvm_flag)))
! pm_set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_LVM,1);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_lba_flag)))
! pm_set_part_flag_state(&devices[selected_device],partinfo[selected_partition].num,PED_PARTITION_LBA,1);
} else {
index = read(stderr_pipe, error_message_buffer, 1000);
***************
*** 678,693 ****
end_sector = sector_num + partinfo[selected_partition].start;
debug("Debug: mbsize: %lld, end: %lld\n",mb_size,end_sector);
!
! if (strcmp(partinfo[selected_partition].temp_fs_name,"ntfs") == 0) {
! do_ntfsresize(&devices[selected_device],partinfo[selected_partition].num,(PedSector)partinfo[selected_partition].end,
! partinfo[selected_partition].partname,
! (PedSector) partinfo[selected_partition].start,(PedSector) end_sector);
! }
! else {
!
! do_resize(&devices[selected_device],partinfo[selected_partition].num,
partinfo[selected_partition].partname,
(PedSector) partinfo[selected_partition].start,(PedSector) end_sector);
- }
gtk_widget_hide(ResizeWindow);
refresh_devices_and_partitions();
--- 633,640 ----
end_sector = sector_num + partinfo[selected_partition].start;
debug("Debug: mbsize: %lld, end: %lld\n",mb_size,end_sector);
! /* check if success? */
! do_resize(&devices[selected_device],partinfo[selected_partition].num,
partinfo[selected_partition].partname,
(PedSector) partinfo[selected_partition].start,(PedSector) end_sector);
gtk_widget_hide(ResizeWindow);
refresh_devices_and_partitions();
***************
*** 960,964 ****
probably a bug when you have free space left...
*/
! if (has_max_primary_partitions(&devices[selected_device])) {
gtk_widget_hide(lookup_widget(CreateWindow,"CreateExtendedRadiobutton"));
gtk_widget_hide(lookup_widget(CreateWindow,"CreatePrimaryRadiobutton"));
--- 907,911 ----
probably a bug when you have free space left...
*/
! if (pm_has_max_primary_partitions(&devices[selected_device])) {
gtk_widget_hide(lookup_widget(CreateWindow,"CreateExtendedRadiobutton"));
gtk_widget_hide(lookup_widget(CreateWindow,"CreatePrimaryRadiobutton"));
***************
*** 978,983 ****
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(CreateWindow,"CreateLogicalRadiobutton")),TRUE);
}
-
-
}
--- 925,928 ----
***************
*** 1047,1049 ****
--- 992,1011 ----
}
+
+
+ void
+ on_helpbutton6_clicked (GtkButton *button,
+ gpointer user_data)
+ {
+
+ }
+
+
+ void
+ on_cancelbutton11_clicked (GtkButton *button,
+ gpointer user_data)
+ {
+
+ }
+
Index: callbacks.h
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/callbacks.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** callbacks.h 19 Oct 2003 00:18:57 -0000 1.5
--- callbacks.h 10 Jan 2004 10:25:31 -0000 1.6
***************
*** 276,277 ****
--- 276,289 ----
on_CreateTypeRadiobutton_clicked (GtkButton *button,
gpointer user_data);
+
+ void
+ on_helpbutton6_clicked (GtkButton *button,
+ gpointer user_data);
+
+ void
+ on_cancelbutton11_clicked (GtkButton *button,
+ gpointer user_data);
+
+ void
+ on_okbutton7_clicked (GtkButton *button,
+ gpointer user_data);
Index: interface.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/interface.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** interface.c 2 Jan 2004 15:17:31 -0000 1.9
--- interface.c 10 Jan 2004 10:25:31 -0000 1.10
***************
*** 291,297 ****
G_CALLBACK (on_MainHarddiskOptionMenu_changed),
NULL);
- g_signal_connect ((gpointer) treeview1, "row_activated",
- G_CALLBACK (on_treeview1_row_activated),
- NULL);
/* Store pointers to all widgets, for use by lookup_widget(). */
--- 291,294 ----
***************
*** 345,358 ****
GtkWidget *optionmenu4;
GtkWidget *menu7;
- GtkWidget *none1;
- GtkWidget *separator6;
- GtkWidget *ext3;
- GtkWidget *ext2;
- GtkWidget *reiserfs1;
- GtkWidget *separator5;
- GtkWidget *swap1;
- GtkWidget *separator8;
- GtkWidget *fat1;
- GtkWidget *fat2;
GtkWidget *label8;
GtkWidget *optionmenu3;
--- 342,345 ----
***************
*** 361,367 ****
GtkWidget *end_of_free_space1;
GtkWidget *label56;
- GtkWidget *label11;
- GtkWidget *label10;
- GtkWidget *CreateMaxLabel;
GtkWidget *label65;
GtkWidget *label66;
--- 348,351 ----
***************
*** 369,379 ****
GtkWidget *label68;
GtkWidget *label69;
- GtkWidget *label70;
GtkWidget *CreateBootFlagCheckbutton;
- GtkWidget *CreateRootFlagCheckbutton;
- GtkWidget *CreateHiddenFlagCheckbutton;
- GtkWidget *CreateRaidFlagCheckbutton;
- GtkWidget *CreateLVMFlagCheckbutton;
- GtkWidget *CreateLBAFlagCheckbutton;
GtkWidget *vbox9;
GtkWidget *CreatePrimaryRadiobutton;
--- 353,357 ----
***************
*** 381,384 ****
--- 359,369 ----
GtkWidget *CreateExtendedRadiobutton;
GtkWidget *CreateLogicalRadiobutton;
+ GtkWidget *CreateHiddenFlagCheckbutton;
+ GtkWidget *CreateRaidFlagCheckbutton;
+ GtkWidget *CreateLVMFlagCheckbutton;
+ GtkWidget *CreateLBAFlagCheckbutton;
+ GtkWidget *label10;
+ GtkWidget *CreateMaxLabel;
+ GtkWidget *label11;
GtkWidget *CreateSizeEntry;
GtkWidget *dialog_action_area1;
***************
*** 415,419 ****
gtk_box_pack_start (GTK_BOX (hbox9), label55, TRUE, TRUE, 0);
! table1 = gtk_table_new (13, 2, FALSE);
gtk_widget_show (table1);
gtk_box_pack_start (GTK_BOX (vbox6), table1, FALSE, FALSE, 0);
--- 400,404 ----
gtk_box_pack_start (GTK_BOX (hbox9), label55, TRUE, TRUE, 0);
! table1 = gtk_table_new (12, 2, FALSE);
gtk_widget_show (table1);
gtk_box_pack_start (GTK_BOX (vbox6), table1, FALSE, FALSE, 0);
***************
*** 438,484 ****
menu7 = gtk_menu_new ();
- none1 = gtk_menu_item_new_with_mnemonic (_("None"));
- gtk_widget_show (none1);
- gtk_container_add (GTK_CONTAINER (menu7), none1);
-
- separator6 = gtk_menu_item_new ();
- gtk_widget_show (separator6);
- gtk_container_add (GTK_CONTAINER (menu7), separator6);
- gtk_widget_set_sensitive (separator6, FALSE);
-
- ext3 = gtk_menu_item_new_with_mnemonic (_("ext3"));
- gtk_widget_show (ext3);
- gtk_container_add (GTK_CONTAINER (menu7), ext3);
-
- ext2 = gtk_menu_item_new_with_mnemonic (_("ext2"));
- gtk_widget_show (ext2);
- gtk_container_add (GTK_CONTAINER (menu7), ext2);
-
- reiserfs1 = gtk_menu_item_new_with_mnemonic (_("reiserfs"));
- gtk_widget_show (reiserfs1);
- gtk_container_add (GTK_CONTAINER (menu7), reiserfs1);
-
- separator5 = gtk_menu_item_new ();
- gtk_widget_show (separator5);
- gtk_container_add (GTK_CONTAINER (menu7), separator5);
- gtk_widget_set_sensitive (separator5, FALSE);
-
- swap1 = gtk_menu_item_new_with_mnemonic (_("Swap"));
- gtk_widget_show (swap1);
- gtk_container_add (GTK_CONTAINER (menu7), swap1);
-
- separator8 = gtk_menu_item_new ();
- gtk_widget_show (separator8);
- gtk_container_add (GTK_CONTAINER (menu7), separator8);
- gtk_widget_set_sensitive (separator8, FALSE);
-
- fat1 = gtk_menu_item_new_with_mnemonic (_("fat32"));
- gtk_widget_show (fat1);
- gtk_container_add (GTK_CONTAINER (menu7), fat1);
-
- fat2 = gtk_menu_item_new_with_mnemonic (_("fat16"));
- gtk_widget_show (fat2);
- gtk_container_add (GTK_CONTAINER (menu7), fat2);
-
gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu4), menu7);
--- 423,426 ----
***************
*** 514,538 ****
gtk_misc_set_alignment (GTK_MISC (label56), 0, 0.5);
- label11 = gtk_label_new (_("Partition Size"));
- gtk_widget_show (label11);
- gtk_table_attach (GTK_TABLE (table1), label11, 0, 1, 12, 13,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label11), 0, 0.5);
-
- label10 = gtk_label_new (_("Max Size:"));
- gtk_widget_show (label10);
- gtk_table_attach (GTK_TABLE (table1), label10, 0, 1, 11, 12,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label10), 0, 0.5);
-
- CreateMaxLabel = gtk_label_new ("");
- gtk_widget_show (CreateMaxLabel);
- gtk_table_attach (GTK_TABLE (table1), CreateMaxLabel, 1, 2, 11, 12,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (CreateMaxLabel), 0, 0.5);
-
label65 = gtk_label_new (_("Flags:"));
gtk_widget_show (label65);
--- 456,459 ----
***************
*** 570,580 ****
gtk_misc_set_alignment (GTK_MISC (label69), 0, 0.5);
- label70 = gtk_label_new ("");
- gtk_widget_show (label70);
- gtk_table_attach (GTK_TABLE (table1), label70, 0, 1, 10, 11,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label70), 0, 0.5);
-
CreateBootFlagCheckbutton = gtk_check_button_new_with_mnemonic (_("Boot Partition"));
gtk_widget_show (CreateBootFlagCheckbutton);
--- 491,494 ----
***************
*** 584,595 ****
gtk_tooltips_set_tip (tooltips, CreateBootFlagCheckbutton, _("Makes the partition bootable on MS-DOS systems"), NULL);
! CreateRootFlagCheckbutton = gtk_check_button_new_with_mnemonic (_("Root Partition"));
! gtk_table_attach (GTK_TABLE (table1), CreateRootFlagCheckbutton, 1, 2, 6, 7,
(GtkAttachOptions) (GTK_FILL),
! (GtkAttachOptions) (0), 0, 0);
CreateHiddenFlagCheckbutton = gtk_check_button_new_with_mnemonic (_("Hidden Partition"));
gtk_widget_show (CreateHiddenFlagCheckbutton);
! gtk_table_attach (GTK_TABLE (table1), CreateHiddenFlagCheckbutton, 1, 2, 7, 8,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
--- 498,530 ----
gtk_tooltips_set_tip (tooltips, CreateBootFlagCheckbutton, _("Makes the partition bootable on MS-DOS systems"), NULL);
! vbox9 = gtk_vbox_new (FALSE, 0);
! gtk_widget_show (vbox9);
! gtk_table_attach (GTK_TABLE (table1), vbox9, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_FILL),
! (GtkAttachOptions) (GTK_FILL), 0, 0);
!
! CreatePrimaryRadiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Primary"));
! gtk_widget_show (CreatePrimaryRadiobutton);
! gtk_box_pack_start (GTK_BOX (vbox9), CreatePrimaryRadiobutton, FALSE, FALSE, 0);
! gtk_radio_button_set_group (GTK_RADIO_BUTTON (CreatePrimaryRadiobutton), CreatePrimaryRadiobutton_group);
! CreatePrimaryRadiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (CreatePrimaryRadiobutton));
!
! CreateExtendedRadiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Extended"));
! gtk_widget_show (CreateExtendedRadiobutton);
! gtk_box_pack_start (GTK_BOX (vbox9), CreateExtendedRadiobutton, FALSE, FALSE, 0);
! gtk_tooltips_set_tip (tooltips, CreateExtendedRadiobutton, _("An Extended partition merely holds Logical partitions."), NULL);
! gtk_radio_button_set_group (GTK_RADIO_BUTTON (CreateExtendedRadiobutton), CreatePrimaryRadiobutton_group);
! CreatePrimaryRadiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (CreateExtendedRadiobutton));
!
! CreateLogicalRadiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Logical"));
! gtk_widget_show (CreateLogicalRadiobutton);
! gtk_box_pack_start (GTK_BOX (vbox9), CreateLogicalRadiobutton, FALSE, FALSE, 0);
! gtk_tooltips_set_tip (tooltips, CreateLogicalRadiobutton, _("You can have any number of Logical partions inside an Extended partition."), NULL);
! gtk_radio_button_set_group (GTK_RADIO_BUTTON (CreateLogicalRadiobutton), CreatePrimaryRadiobutton_group);
! CreatePrimaryRadiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (CreateLogicalRadiobutton));
CreateHiddenFlagCheckbutton = gtk_check_button_new_with_mnemonic (_("Hidden Partition"));
gtk_widget_show (CreateHiddenFlagCheckbutton);
! gtk_table_attach (GTK_TABLE (table1), CreateHiddenFlagCheckbutton, 1, 2, 6, 7,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
***************
*** 598,602 ****
CreateRaidFlagCheckbutton = gtk_check_button_new_with_mnemonic (_("Raid Partition"));
gtk_widget_show (CreateRaidFlagCheckbutton);
! gtk_table_attach (GTK_TABLE (table1), CreateRaidFlagCheckbutton, 1, 2, 8, 9,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
--- 533,537 ----
CreateRaidFlagCheckbutton = gtk_check_button_new_with_mnemonic (_("Raid Partition"));
gtk_widget_show (CreateRaidFlagCheckbutton);
! gtk_table_attach (GTK_TABLE (table1), CreateRaidFlagCheckbutton, 1, 2, 7, 8,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
***************
*** 605,609 ****
CreateLVMFlagCheckbutton = gtk_check_button_new_with_mnemonic (_("LVM Partition"));
gtk_widget_show (CreateLVMFlagCheckbutton);
! gtk_table_attach (GTK_TABLE (table1), CreateLVMFlagCheckbutton, 1, 2, 9, 10,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
--- 540,544 ----
CreateLVMFlagCheckbutton = gtk_check_button_new_with_mnemonic (_("LVM Partition"));
gtk_widget_show (CreateLVMFlagCheckbutton);
! gtk_table_attach (GTK_TABLE (table1), CreateLVMFlagCheckbutton, 1, 2, 8, 9,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
***************
*** 612,649 ****
CreateLBAFlagCheckbutton = gtk_check_button_new_with_mnemonic (_("LBA Partition"));
gtk_widget_show (CreateLBAFlagCheckbutton);
! gtk_table_attach (GTK_TABLE (table1), CreateLBAFlagCheckbutton, 1, 2, 10, 11,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip (tooltips, CreateLBAFlagCheckbutton, _("Tell win32-based systems to use Linear (LBA) mode"), NULL);
! vbox9 = gtk_vbox_new (FALSE, 0);
! gtk_widget_show (vbox9);
! gtk_table_attach (GTK_TABLE (table1), vbox9, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_FILL),
! (GtkAttachOptions) (GTK_FILL), 0, 0);
!
! CreatePrimaryRadiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Primary"));
! gtk_widget_show (CreatePrimaryRadiobutton);
! gtk_box_pack_start (GTK_BOX (vbox9), CreatePrimaryRadiobutton, FALSE, FALSE, 0);
! gtk_radio_button_set_group (GTK_RADIO_BUTTON (CreatePrimaryRadiobutton), CreatePrimaryRadiobutton_group);
! CreatePrimaryRadiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (CreatePrimaryRadiobutton));
! CreateExtendedRadiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Extended"));
! gtk_widget_show (CreateExtendedRadiobutton);
! gtk_box_pack_start (GTK_BOX (vbox9), CreateExtendedRadiobutton, FALSE, FALSE, 0);
! gtk_tooltips_set_tip (tooltips, CreateExtendedRadiobutton, _("An Extended partition merely holds Logical partitions."), NULL);
! gtk_radio_button_set_group (GTK_RADIO_BUTTON (CreateExtendedRadiobutton), CreatePrimaryRadiobutton_group);
! CreatePrimaryRadiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (CreateExtendedRadiobutton));
! CreateLogicalRadiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Logical"));
! gtk_widget_show (CreateLogicalRadiobutton);
! gtk_box_pack_start (GTK_BOX (vbox9), CreateLogicalRadiobutton, FALSE, FALSE, 0);
! gtk_tooltips_set_tip (tooltips, CreateLogicalRadiobutton, _("You can have any number of Logical partions inside an Extended partition."), NULL);
! gtk_radio_button_set_group (GTK_RADIO_BUTTON (CreateLogicalRadiobutton), CreatePrimaryRadiobutton_group);
! CreatePrimaryRadiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (CreateLogicalRadiobutton));
CreateSizeEntry = gtk_entry_new ();
gtk_widget_show (CreateSizeEntry);
! gtk_table_attach (GTK_TABLE (table1), CreateSizeEntry, 1, 2, 12, 13,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
--- 547,579 ----
CreateLBAFlagCheckbutton = gtk_check_button_new_with_mnemonic (_("LBA Partition"));
gtk_widget_show (CreateLBAFlagCheckbutton);
! gtk_table_attach (GTK_TABLE (table1), CreateLBAFlagCheckbutton, 1, 2, 9, 10,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip (tooltips, CreateLBAFlagCheckbutton, _("Tell win32-based systems to use Linear (LBA) mode"), NULL);
! label10 = gtk_label_new (_("Max Size:"));
! gtk_widget_show (label10);
! gtk_table_attach (GTK_TABLE (table1), label10, 0, 1, 10, 11,
(GtkAttachOptions) (GTK_FILL),
! (GtkAttachOptions) (0), 0, 0);
! gtk_misc_set_alignment (GTK_MISC (label10), 0, 0.5);
! CreateMaxLabel = gtk_label_new ("");
! gtk_widget_show (CreateMaxLabel);
! gtk_table_attach (GTK_TABLE (table1), CreateMaxLabel, 1, 2, 10, 11,
! (GtkAttachOptions) (GTK_FILL),
! (GtkAttachOptions) (0), 0, 0);
! gtk_misc_set_alignment (GTK_MISC (CreateMaxLabel), 0, 0.5);
! label11 = gtk_label_new (_("Partition Size"));
! gtk_widget_show (label11);
! gtk_table_attach (GTK_TABLE (table1), label11, 0, 1, 11, 12,
! (GtkAttachOptions) (GTK_FILL),
! (GtkAttachOptions) (0), 0, 0);
! gtk_misc_set_alignment (GTK_MISC (label11), 0, 0.5);
CreateSizeEntry = gtk_entry_new ();
gtk_widget_show (CreateSizeEntry);
! gtk_table_attach (GTK_TABLE (table1), CreateSizeEntry, 1, 2, 11, 12,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
***************
*** 671,695 ****
G_CALLBACK (gtk_widget_hide),
NULL);
- g_signal_connect ((gpointer) none1, "activate",
- G_CALLBACK (on_none1_activate),
- NULL);
- g_signal_connect ((gpointer) ext3, "activate",
- G_CALLBACK (on_ext3_activate),
- NULL);
- g_signal_connect ((gpointer) ext2, "activate",
- G_CALLBACK (on_ext2_activate),
- NULL);
- g_signal_connect ((gpointer) reiserfs1, "activate",
- G_CALLBACK (on_reiserfs1_activate),
- NULL);
- g_signal_connect ((gpointer) swap1, "activate",
- G_CALLBACK (on_swap1_activate),
- NULL);
- g_signal_connect ((gpointer) fat1, "activate",
- G_CALLBACK (on_fat1_activate),
- NULL);
- g_signal_connect ((gpointer) fat2, "activate",
- G_CALLBACK (on_fat2_activate),
- NULL);
g_signal_connect ((gpointer) begin_of_free_space1, "activate",
G_CALLBACK (on_begin_of_free_space1_activate),
--- 601,604 ----
***************
*** 735,748 ****
GLADE_HOOKUP_OBJECT (CreateWindow, optionmenu4, "optionmenu4");
GLADE_HOOKUP_OBJECT (CreateWindow, menu7, "menu7");
- GLADE_HOOKUP_OBJECT (CreateWindow, none1, "none1");
- GLADE_HOOKUP_OBJECT (CreateWindow, separator6, "separator6");
- GLADE_HOOKUP_OBJECT (CreateWindow, ext3, "ext3");
- GLADE_HOOKUP_OBJECT (CreateWindow, ext2, "ext2");
- GLADE_HOOKUP_OBJECT (CreateWindow, reiserfs1, "reiserfs1");
- GLADE_HOOKUP_OBJECT (CreateWindow, separator5, "separator5");
- GLADE_HOOKUP_OBJECT (CreateWindow, swap1, "swap1");
- GLADE_HOOKUP_OBJECT (CreateWindow, separator8, "separator8");
- GLADE_HOOKUP_OBJECT (CreateWindow, fat1, "fat1");
- GLADE_HOOKUP_OBJECT (CreateWindow, fat2, "fat2");
GLADE_HOOKUP_OBJECT (CreateWindow, label8, "label8");
GLADE_HOOKUP_OBJECT (CreateWindow, optionmenu3, "optionmenu3");
--- 644,647 ----
***************
*** 751,757 ****
GLADE_HOOKUP_OBJECT (CreateWindow, end_of_free_space1, "end_of_free_space1");
GLADE_HOOKUP_OBJECT (CreateWindow, label56, "label56");
- GLADE_HOOKUP_OBJECT (CreateWindow, label11, "label11");
- GLADE_HOOKUP_OBJECT (CreateWindow, label10, "label10");
- GLADE_HOOKUP_OBJECT (CreateWindow, CreateMaxLabel, "CreateMaxLabel");
GLADE_HOOKUP_OBJECT (CreateWindow, label65, "label65");
GLADE_HOOKUP_OBJECT (CreateWindow, label66, "label66");
--- 650,653 ----
***************
*** 759,773 ****
GLADE_HOOKUP_OBJECT (CreateWindow, label68, "label68");
GLADE_HOOKUP_OBJECT (CreateWindow, label69, "label69");
- GLADE_HOOKUP_OBJECT (CreateWindow, label70, "label70");
GLADE_HOOKUP_OBJECT (CreateWindow, CreateBootFlagCheckbutton, "CreateBootFlagCheckbutton");
- GLADE_HOOKUP_OBJECT (CreateWindow, CreateRootFlagCheckbutton, "CreateRootFlagCheckbutton");
- GLADE_HOOKUP_OBJECT (CreateWindow, CreateHiddenFlagCheckbutton, "CreateHiddenFlagCheckbutton");
- GLADE_HOOKUP_OBJECT (CreateWindow, CreateRaidFlagCheckbutton, "CreateRaidFlagCheckbutton");
- GLADE_HOOKUP_OBJECT (CreateWindow, CreateLVMFlagCheckbutton, "CreateLVMFlagCheckbutton");
- GLADE_HOOKUP_OBJECT (CreateWindow, CreateLBAFlagCheckbutton, "CreateLBAFlagCheckbutton");
GLADE_HOOKUP_OBJECT (CreateWindow, vbox9, "vbox9");
GLADE_HOOKUP_OBJECT (CreateWindow, CreatePrimaryRadiobutton, "CreatePrimaryRadiobutton");
GLADE_HOOKUP_OBJECT (CreateWindow, CreateExtendedRadiobutton, "CreateExtendedRadiobutton");
GLADE_HOOKUP_OBJECT (CreateWindow, CreateLogicalRadiobutton, "CreateLogicalRadiobutton");
GLADE_HOOKUP_OBJECT (CreateWindow, CreateSizeEntry, "CreateSizeEntry");
GLADE_HOOKUP_OBJECT_NO_REF (CreateWindow, dialog_action_area1, "dialog_action_area1");
--- 655,670 ----
GLADE_HOOKUP_OBJECT (CreateWindow, label68, "label68");
GLADE_HOOKUP_OBJECT (CreateWindow, label69, "label69");
GLADE_HOOKUP_OBJECT (CreateWindow, CreateBootFlagCheckbutton, "CreateBootFlagCheckbutton");
GLADE_HOOKUP_OBJECT (CreateWindow, vbox9, "vbox9");
GLADE_HOOKUP_OBJECT (CreateWindow, CreatePrimaryRadiobutton, "CreatePrimaryRadiobutton");
GLADE_HOOKUP_OBJECT (CreateWindow, CreateExtendedRadiobutton, "CreateExtendedRadiobutton");
GLADE_HOOKUP_OBJECT (CreateWindow, CreateLogicalRadiobutton, "CreateLogicalRadiobutton");
+ GLADE_HOOKUP_OBJECT (CreateWindow, CreateHiddenFlagCheckbutton, "CreateHiddenFlagCheckbutton");
+ GLADE_HOOKUP_OBJECT (CreateWindow, CreateRaidFlagCheckbutton, "CreateRaidFlagCheckbutton");
+ GLADE_HOOKUP_OBJECT (CreateWindow, CreateLVMFlagCheckbutton, "CreateLVMFlagCheckbutton");
+ GLADE_HOOKUP_OBJECT (CreateWindow, CreateLBAFlagCheckbutton, "CreateLBAFlagCheckbutton");
+ GLADE_HOOKUP_OBJECT (CreateWindow, label10, "label10");
+ GLADE_HOOKUP_OBJECT (CreateWindow, CreateMaxLabel, "CreateMaxLabel");
+ GLADE_HOOKUP_OBJECT (CreateWindow, label11, "label11");
GLADE_HOOKUP_OBJECT (CreateWindow, CreateSizeEntry, "CreateSizeEntry");
GLADE_HOOKUP_OBJECT_NO_REF (CreateWindow, dialog_action_area1, "dialog_action_area1");
***************
*** 2080,2083 ****
--- 1977,2158 ----
return ProgressWindow;
+ }
+
+ GtkWidget*
+ create_WizardWindow (void)
+ {
+ GtkWidget *WizardWindow;
+ GtkWidget *dialog_vbox14;
+ GtkWidget *vbox16;
+ GtkWidget *hbox13;
+ GtkWidget *image8;
+ GtkWidget *label78;
+ GtkWidget *hseparator4;
+ GtkWidget *vbox17;
+ GtkWidget *label79;
+ GtkWidget *vboxModes;
+ GtkWidget *vboxFreeSpace;
+ GtkWidget *radiobutton1;
+ GSList *radiobutton1_group = NULL;
+ GtkWidget *label80;
+ GtkWidget *vboxResize;
+ GtkWidget *radiobutton2;
+ GSList *radiobutton2_group = NULL;
+ GtkWidget *label81;
+ GtkWidget *vboxDestructive;
+ GtkWidget *radiobutton3;
+ GSList *radiobutton3_group = NULL;
+ GtkWidget *label82;
+ GtkWidget *dialog_action_area14;
+ GtkWidget *helpbutton6;
+ GtkWidget *cancelbutton11;
+ GtkWidget *okbutton7;
+
+ WizardWindow = gtk_dialog_new ();
+ gtk_window_set_title (GTK_WINDOW (WizardWindow), _("Partition Morpher - Wizard mode"));
+
+ dialog_vbox14 = GTK_DIALOG (WizardWindow)->vbox;
+ gtk_widget_show (dialog_vbox14);
+
+ vbox16 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox16);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox14), vbox16, TRUE, TRUE, 0);
+
+ hbox13 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox13);
+ gtk_box_pack_start (GTK_BOX (vbox16), hbox13, FALSE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox13), 8);
+
+ image8 = gtk_image_new_from_stock ("gtk-dialog-question", GTK_ICON_SIZE_DIALOG);
+ gtk_widget_show (image8);
+ gtk_box_pack_start (GTK_BOX (hbox13), image8, FALSE, FALSE, 0);
+
+ label78 = gtk_label_new (_("Welcome to the Partition Morpher Wizard\nThis tool will allow you to easily partition your harddisk\nto let you install a new Linux distribution (ie. Morphix)"));
+ gtk_widget_show (label78);
+ gtk_box_pack_start (GTK_BOX (hbox13), label78, FALSE, FALSE, 0);
+ gtk_label_set_line_wrap (GTK_LABEL (label78), TRUE);
+
+ hseparator4 = gtk_hseparator_new ();
+ gtk_widget_show (hseparator4);
+ gtk_box_pack_start (GTK_BOX (vbox16), hseparator4, FALSE, FALSE, 0);
+
+ vbox17 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox17);
+ gtk_box_pack_start (GTK_BOX (vbox16), vbox17, TRUE, TRUE, 0);
+
+ label79 = gtk_label_new (_("Detected Partition modes:"));
+ gtk_widget_show (label79);
+ gtk_box_pack_start (GTK_BOX (vbox17), label79, FALSE, FALSE, 0);
+
+ vboxModes = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vboxModes);
+ gtk_box_pack_start (GTK_BOX (vbox17), vboxModes, TRUE, TRUE, 0);
+
+ vboxFreeSpace = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vboxFreeSpace);
+ gtk_box_pack_start (GTK_BOX (vboxModes), vboxFreeSpace, TRUE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (vboxFreeSpace), 8);
+
+ radiobutton1 = gtk_radio_button_new_with_mnemonic (NULL, _("use all free space"));
+ gtk_widget_show (radiobutton1);
+ gtk_box_pack_start (GTK_BOX (vboxFreeSpace), radiobutton1, FALSE, FALSE, 0);
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton1), radiobutton1_group);
+ radiobutton1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton1));
+
+ label80 = gtk_label_new (_("You have enough free space available already to install Morphix without having to resize other partitions. \n<b>This mode will not touch your existing data.</b>"));
+ gtk_widget_show (label80);
+ gtk_box_pack_start (GTK_BOX (vboxFreeSpace), label80, FALSE, FALSE, 0);
+ gtk_label_set_use_markup (GTK_LABEL (label80), TRUE);
+ gtk_label_set_line_wrap (GTK_LABEL (label80), TRUE);
+
+ vboxResize = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vboxResize);
+ gtk_box_pack_start (GTK_BOX (vboxModes), vboxResize, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (vboxResize), 8);
+
+ radiobutton2 = gtk_radio_button_new_with_mnemonic (NULL, _("resize other partitions"));
+ gtk_widget_show (radiobutton2);
+ gtk_box_pack_start (GTK_BOX (vboxResize), radiobutton2, FALSE, FALSE, 0);
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton2), radiobutton2_group);
+ radiobutton2_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton2));
+
+ label81 = gtk_label_new (_("Attempt to resize your current partitions and use the occuring free space to create new Linux partitions for Morphix. If you have ntfs partitions you are advised to defragment these first in Windows(tm). \n<b>You are advised to back up your data first!</b>"));
+ gtk_widget_show (label81);
+ gtk_box_pack_start (GTK_BOX (vboxResize), label81, FALSE, FALSE, 0);
+ gtk_label_set_use_markup (GTK_LABEL (label81), TRUE);
+ gtk_label_set_line_wrap (GTK_LABEL (label81), TRUE);
+
+ vboxDestructive = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vboxDestructive);
+ gtk_box_pack_start (GTK_BOX (vboxModes), vboxDestructive, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (vboxDestructive), 8);
+
+ radiobutton3 = gtk_radio_button_new_with_mnemonic (NULL, _("remove existing partitions"));
+ gtk_widget_show (radiobutton3);
+ gtk_box_pack_start (GTK_BOX (vboxDestructive), radiobutton3, FALSE, FALSE, 0);
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton3), radiobutton3_group);
+ radiobutton3_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton3));
+
+ label82 = gtk_label_new (_("Remove all existing partitions on the selected harddisk and use all the resulting free space to create new Linux partitions for Morphix.\n<b>THIS MODE WILL DELETE ALL YOUR EXISTING DATA!\nYOU HAVE BEEN WARNED!</b>"));
+ gtk_widget_show (label82);
+ gtk_box_pack_start (GTK_BOX (vboxDestructive), label82, FALSE, FALSE, 0);
+ gtk_label_set_use_markup (GTK_LABEL (label82), TRUE);
+ gtk_label_set_line_wrap (GTK_LABEL (label82), TRUE);
+
+ dialog_action_area14 = GTK_DIALOG (WizardWindow)->action_area;
+ gtk_widget_show (dialog_action_area14);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area14), GTK_BUTTONBOX_END);
+
+ helpbutton6 = gtk_button_new_from_stock ("gtk-help");
+ gtk_widget_show (helpbutton6);
+ gtk_dialog_add_action_widget (GTK_DIALOG (WizardWindow), helpbutton6, GTK_RESPONSE_HELP);
+ GTK_WIDGET_SET_FLAGS (helpbutton6, GTK_CAN_DEFAULT);
+
+ cancelbutton11 = gtk_button_new_from_stock ("gtk-go-back");
+ gtk_widget_show (cancelbutton11);
+ gtk_dialog_add_action_widget (GTK_DIALOG (WizardWindow), cancelbutton11, GTK_RESPONSE_CANCEL);
+ GTK_WIDGET_SET_FLAGS (cancelbutton11, GTK_CAN_DEFAULT);
+
+ okbutton7 = gtk_button_new_from_stock ("gtk-ok");
+ gtk_widget_show (okbutton7);
+ gtk_dialog_add_action_widget (GTK_DIALOG (WizardWindow), okbutton7, GTK_RESPONSE_OK);
+ GTK_WIDGET_SET_FLAGS (okbutton7, GTK_CAN_DEFAULT);
+
+ g_signal_connect ((gpointer) helpbutton6, "clicked",
+ G_CALLBACK (on_helpbutton6_clicked),
+ NULL);
+ g_signal_connect ((gpointer) cancelbutton11, "clicked",
+ G_CALLBACK (on_cancelbutton11_clicked),
+ NULL);
+ g_signal_connect ((gpointer) okbutton7, "clicked",
+ G_CALLBACK (on_okbutton7_clicked),
+ NULL);
+
+ /* Store pointers to all widgets, for use by lookup_widget(). */
+ GLADE_HOOKUP_OBJECT_NO_REF (WizardWindow, WizardWindow, "WizardWindow");
+ GLADE_HOOKUP_OBJECT_NO_REF (WizardWindow, dialog_vbox14, "dialog_vbox14");
+ GLADE_HOOKUP_OBJECT (WizardWindow, vbox16, "vbox16");
+ GLADE_HOOKUP_OBJECT (WizardWindow, hbox13, "hbox13");
+ GLADE_HOOKUP_OBJECT (WizardWindow, image8, "image8");
+ GLADE_HOOKUP_OBJECT (WizardWindow, label78, "label78");
+ GLADE_HOOKUP_OBJECT (WizardWindow, hseparator4, "hseparator4");
+ GLADE_HOOKUP_OBJECT (WizardWindow, vbox17, "vbox17");
+ GLADE_HOOKUP_OBJECT (WizardWindow, label79, "label79");
+ GLADE_HOOKUP_OBJECT (WizardWindow, vboxModes, "vboxModes");
+ GLADE_HOOKUP_OBJECT (WizardWindow, vboxFreeSpace, "vboxFreeSpace");
+ GLADE_HOOKUP_OBJECT (WizardWindow, radiobutton1, "radiobutton1");
+ GLADE_HOOKUP_OBJECT (WizardWindow, label80, "label80");
+ GLADE_HOOKUP_OBJECT (WizardWindow, vboxResize, "vboxResize");
+ GLADE_HOOKUP_OBJECT (WizardWindow, radiobutton2, "radiobutton2");
+ GLADE_HOOKUP_OBJECT (WizardWindow, label81, "label81");
+ GLADE_HOOKUP_OBJECT (WizardWindow, vboxDestructive, "vboxDestructive");
+ GLADE_HOOKUP_OBJECT (WizardWindow, radiobutton3, "radiobutton3");
+ GLADE_HOOKUP_OBJECT (WizardWindow, label82, "label82");
+ GLADE_HOOKUP_OBJECT_NO_REF (WizardWindow, dialog_action_area14, "dialog_action_area14");
+ GLADE_HOOKUP_OBJECT (WizardWindow, helpbutton6, "helpbutton6");
+ GLADE_HOOKUP_OBJECT (WizardWindow, cancelbutton11, "cancelbutton11");
+ GLADE_HOOKUP_OBJECT (WizardWindow, okbutton7, "okbutton7");
+
+ return WizardWindow;
}
Index: interface.h
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/interface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** interface.h 19 Oct 2003 00:18:57 -0000 1.3
--- interface.h 10 Jan 2004 10:25:31 -0000 1.4
***************
*** 16,17 ****
--- 16,18 ----
GtkWidget* create_ErrorWindow (void);
GtkWidget* create_ProgressWindow (void);
+ GtkWidget* create_WizardWindow (void);
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** main.c 2 Jan 2004 15:17:31 -0000 1.7
--- main.c 10 Jan 2004 10:25:31 -0000 1.8
***************
*** 1,6 ****
! /*
! * Initial main.c file generated by Glade. Edit as required.
! * Glade will not overwrite this file.
! */
#ifdef HAVE_CONFIG_H
--- 1,18 ----
! /* 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
***************
*** 29,32 ****
--- 41,45 ----
GtkWidget *ErrorWindow;
GtkWidget *ProgressWindow;
+ GtkWidget *WizardWindow;
gboolean CheckRoot() {
***************
*** 54,57 ****
--- 67,73 ----
}
+ void print_help() {
+ printf("Usage\npartitionmorpher [OPTIONS]\n\nOptions:\n-w DRIVE SIZE - start Wizard interface to partition DRIVE to gain minimum space SIZE, which must be > 500MiB, split between root and \n\nIf no options are given, partitionmorpher will start in default (expert) mode\n");
+ }
int
***************
*** 77,81 ****
init_arch();
! scan_devices();
/* Parted has a bug where if stdout is redirected at the
--- 93,97 ----
init_arch();
! pm_scan_devices();
/* Parted has a bug where if stdout is redirected at the
***************
*** 85,88 ****
--- 101,138 ----
dup2(fileno(stderr), fileno(stdout));
+ if (argc == 4) { // have three arguments: -w DRIVE SIZE
+ if (strcmp(argv[1],"-w") == 0) {
+ gint device = pm_get_valid_device(argv[2]);
+ gint size = atoi(argv[3]);
+ if (device < 0) {
+ debug("Error: Invalid drive\n");
+ print_help();
+ return 1;
+ }
+ pm_select_update_device(device);
+ if (size <= 500) {
+ debug("Error: size is too small: %d, minimum of 500 MiB\n",size);
+ print_help();
+ return 1;
+ }
+ if (size > selected_device_total_size) {
+ debug("Error: size is larger than the total available space: %d\n",size);
+ print_help();
+ return 1;
+ }
+ set_needed_freespace(size);
+ // start wizard-interface instead
+ WizardWindow = create_WizardWindow();
+ gtk_widget_show(WizardWindow);
+ gtk_main();
+ return 0;
+ }
+ print_help();
+ return 1;
+ }
+ if (argc > 1) {
+ print_help();
+ return 1;
+ }
MainWindow = create_MainWindow ();
***************
*** 100,114 ****
ErrorWindow = create_ErrorWindow ();
ProgressWindow = create_ProgressWindow ();
-
- /*
- gtk_widget_show (CreateWindow);
-
- gtk_widget_show (ResizeWindow);
-
- gtk_widget_show (ApplyWindow);
-
- gtk_widget_show (RevertWindow);
-
- gtk_widget_show (DialogWindow);*/
gtk_main ();
--- 150,153 ----
Index: pm_fswrap.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/pm_fswrap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pm_fswrap.c 2 Jan 2004 15:17:31 -0000 1.1
--- pm_fswrap.c 10 Jan 2004 10:25:31 -0000 1.2
***************
*** 1,5 ****
/*
! insert more GPL license BS
inspired by qp_fswrap in qtparted
*/
--- 1,20 ----
/*
! Copyright (C) 2003 Alex de Landgraaf <ale...@xs...>
!
inspired by qp_fswrap in qtparted
+
+ 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.
*/
***************
*** 10,15 ****
#include "pm_libparted.h"
! #define MKNTFS_PATH "/usr/bin/mkntfs"
! #define NTFSRESIZE_PATH "/usr/bin/ntfsresize"
gboolean ExecuteCommand(gchar *command) {
--- 25,30 ----
#include "pm_libparted.h"
! #define MKNTFS_PATH "/usr/sbin/mkntfs"
! #define NTFSRESIZE_PATH "/usr/sbin/ntfsresize"
gboolean ExecuteCommand(gchar *command) {
***************
*** 47,50 ****
--- 62,134 ----
}
+ gboolean do_mkntfs(PedDevice **dev, PedPartitionType part_type,
+ PedSector start, PedSector end) {
+
+ gchar cmdline[1024];
+ PedDisk *disk;
+ PedPartition *part;
+ PedConstraint *constraint;
+ //char *peek_word;
+ PedFileSystemType *fs_type = ped_file_system_type_get("ntfs");
+
+ disk = ped_disk_new(*dev);
+ if (!disk)
+ return FALSE;
+ constraint = ped_constraint_any(*dev);
+ if (!constraint) {
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
+ //peek_word = command_line_peek_word();
+ part = ped_partition_new(disk,part_type,fs_type,start,end);
+ if (!part) {
+ ped_constraint_destroy (constraint);
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
+ if (!grow_over_small_freespace(&part->geom,disk)) {
+ ped_partition_destroy (part);
+ ped_constraint_destroy (constraint);
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
+ if (!ped_disk_add_partition(disk,part,constraint)) {
+ ped_partition_destroy (part);
+ ped_constraint_destroy (constraint);
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
+
+ if (!pm_solution_check_distant(start,end,part->geom.start,part->geom.end)) {
+ ped_disk_remove_partition (disk, part);
+ ped_partition_destroy (part);
+ ped_constraint_destroy (constraint);
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
+ /*
+ if (!ped_partition_set_system(part,fs_type)) {
+ ped_partition_destroy (part);
+ ped_constraint_destroy (constraint);
+ ped_disk_destroy (disk);
+ return FALSE;
+ }*/
+
+ if (!ped_disk_commit(disk)) {
+ ped_partition_destroy (part);
+ ped_constraint_destroy (constraint);
+ ped_disk_destroy (disk);
+ return FALSE;
+ }
+ ped_constraint_destroy(constraint);
+ pm_do_mkpart(dev,part_type,start,end);
+
+ sprintf(cmdline,"%s %s",MKNTFS_PATH,ped_partition_get_path(part));
+ gboolean ret = ExecuteCommand(cmdline);
+ free(cmdline);
+ ped_disk_destroy(disk);
+ return TRUE;
+ }
+
gboolean do_ntfsresize(PedDevice **dev, int part_nr, PedSector old_end, gchar *path, PedSector old_start, PedSector end) {
PedDisk *disk;
***************
*** 98,102 ****
PedFileSystem *fs;
PedPartition *part;
! gchar *cmdline;
disk = ped_disk_new(*dev);
if (!disk)
--- 182,186 ----
PedFileSystem *fs;
PedPartition *part;
! gchar cmdline[1024];
disk = ped_disk_new(*dev);
if (!disk)
***************
*** 115,122 ****
return FALSE;
}
! sprintf(cmdline,"%s -ff -s %lld",NTFSRESIZE_PATH,start); // -ff? hope i won't have to use this...
gboolean ret = ExecuteCommand(cmdline);
- free(cmdline);
return ret;
! }
--- 199,208 ----
return FALSE;
}
! /* which partition to resize? close disk! */
! sprintf(cmdline,"%s -ff -s %d",NTFSRESIZE_PATH,(start / (1024*1024) * 512)); // -ff? hope i won't have to use this...
gboolean ret = ExecuteCommand(cmdline);
return ret;
! }
!
!
Index: pm_fswrap.h
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/pm_fswrap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pm_fswrap.h 2 Jan 2004 15:17:31 -0000 1.1
--- pm_fswrap.h 10 Jan 2004 10:25:31 -0000 1.2
***************
*** 9,11 ****
--- 9,14 ----
gboolean do_ntfsresize(PedDevice **dev, int part_nr, PedSector old_end, gchar *path, PedSector start, PedSector end);
+ gboolean do_mkntfs(PedDevice **dev, PedPartitionType part_type,
+ PedSector start, PedSector end);
+
#endif // PM_FSWRAP_H
Index: pm_libparted.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/pm_libparted.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pm_libparted.c 2 Jan 2004 15:17:31 -0000 1.9
--- pm_libparted.c 10 Jan 2004 10:25:31 -0000 1.10
***************
*** 1,7 ****
! /*
! Insert GPL crap here
Do note that I've used (large) parts of parted.c in parted
and qtparted's qp_libparted for this. qp_libparted is in turn largely based on parted.c
Viva la revolution!
*/
--- 1,22 ----
! /*
! Copyright (C) 2003 Alex de Landgraaf <ale...@xs...>
!
Do note that I've used (large) parts of parted.c in parted
and qtparted's qp_libparted for this. qp_libparted is in turn largely based on parted.c
Viva la revolution!
+
+ 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.
*/
***************
*** 16,20 ****
#include "support.h"
! extern GtkWidget * ProgressWindow;
#if ENABLE_NLS
--- 31,35 ----
#include "support.h"
! extern GtkWidget * ProgressWindow; // should change this, gtk-independant...
#if ENABLE_NLS
***************
*** 26,33 ****
#endif /* ENABLE_NLS */
- #define MIN_FREESPACE (1024 * 2) /* 1 MB */
- #define MEGABYTE (1024 * 1024)
- #define MEGABYTE_SECTORS (MEGABYTE / 512)
-
typedef struct {
time_t last_update;
--- 41,44 ----
***************
*** 271,276 ****
}
! static int
! solution_check_distant (PedSector req_start, PedSector req_end,
PedSector soln_start, PedSector soln_end) {
PedSector start_delta = _ped_abs (soln_start - req_start);
--- 282,287 ----
}
! int
! pm_solution_check_distant (PedSector req_start, PedSector req_end,
PedSector soln_start, PedSector soln_end) {
PedSector start_delta = _ped_abs (soln_start - req_start);
***************
*** 343,347 ****
}
! gboolean do_mklabel (PedDevice **dev, PedDiskType *type) {
PedDisk *disk;
const PedDiskType *def_type = ped_disk_probe(*dev);
--- 354,358 ----
}
! gboolean pm_do_mklabel (PedDevice **dev, PedDiskType *type) {
PedDisk *disk;
const PedDiskType *def_type = ped_disk_probe(*dev);
***************
*** 375,379 ****
}
! gboolean do_mkfs (PedDevice **dev, int part_nr ,gchar *path, PedFileSystemType *type) {
PedDisk *disk;
PedFileSystemType *def_type = ped_file_system_type_get("ext3");
--- 386,390 ----
}
! gboolean pm_do_mkfs (PedDevice **dev, int part_nr ,gchar *path, PedFileSystemType *type) {
PedDisk *disk;
PedFileSystemType *def_type = ped_file_system_type_get("ext3");
***************
*** 410,417 ****
}
! gboolean do_mkpart (PedDevice **dev,PedPartitionType part_type, PedSector start, PedSector end) {
PedDisk *disk;
PedPartition *part;
- PedFileSystemType *def_type = ped_file_system_type_get("ext3");
PedConstraint *constraint;
//char *peek_word;
--- 421,427 ----
}
! gboolean pm_do_mkpart (PedDevice **dev,PedPartitionType part_type, PedSector start, PedSector end) {
PedDisk *disk;
PedPartition *part;
PedConstraint *constraint;
//char *peek_word;
***************
*** 446,450 ****
}
! if (!solution_check_distant(start,end,part->geom.start,part->geom.end)) {
ped_disk_remove_partition (disk, part);
ped_partition_destroy (part);
--- 456,460 ----
}
! if (!pm_solution_check_distant(start,end,part->geom.start,part->geom.end)) {
ped_disk_remove_partition (disk, part);
ped_partition_destroy (part);
***************
*** 472,476 ****
}
! gboolean do_mkpartfs (PedDevice **dev, PedPartitionType part_type,
PedFileSystemType *fs_type,
PedSector start, PedSector end) {
--- 482,486 ----
}
! gboolean pm_do_mkpartfs (PedDevice **dev, PedPartitionType part_type,
PedFileSystemType *fs_type,
PedSector start, PedSector end) {
***************
*** 512,516 ****
return FALSE;
}
! if (!solution_check_distant(start,end,part->geom.start,part->geom.end)) {
ped_disk_remove_partition (disk, part);
ped_partition_destroy (part);
--- 522,526 ----
return FALSE;
}
! if (!pm_solution_check_distant(start,end,part->geom.start,part->geom.end)) {
ped_disk_remove_partition (disk, part);
ped_partition_destroy (part);
***************
*** 545,549 ****
}
! gboolean do_move(PedDevice **dev, int part_nr,gchar *path, PedSector start, PedSector end) {
PedDisk *disk;
PedFileSystem *fs;
--- 555,559 ----
}
! gboolean pm_do_move(PedDevice **dev, int part_nr,gchar *path, PedSector start, PedSector end) {
PedDisk *disk;
PedFileSystem *fs;
***************
*** 610,614 ****
return FALSE;
}
! if (!solution_check_distant(start,end,part->geom.start, part->geom.end)) {
ped_file_system_close (fs);
ped_disk_destroy (disk);
--- 620,624 ----
return FALSE;
}
! if (!pm_solution_check_distant(start,end,part->geom.start, part->geom.end)) {
ped_file_system_close (fs);
ped_disk_destroy (disk);
***************
*** 632,639 ****
}
! gboolean do_name(PedDevice **dev,int part_nr, gchar *name) {
PedDisk *disk;
PedPartition *part;
! if (!disk_supports_name (dev)) {
return FALSE;
}
--- 642,649 ----
}
! gboolean pm_do_name(PedDevice **dev,int part_nr, gchar *name) {
PedDisk *disk;
PedPartition *part;
! if (!pm_disk_supports_name (dev)) {
return FALSE;
}
***************
*** 659,663 ****
}
! gboolean do_resize (PedDevice **dev, int part_nr ,gchar *path, PedSector start, PedSector end) {
PedDisk *disk;
PedFileSystem *fs;
--- 669,673 ----
}
! gboolean pm_do_resize (PedDevice **dev, int part_nr ,gchar *path, PedSector start, PedSector end) {
PedDisk *disk;
PedFileSystem *fs;
***************
*** 698,702 ****
return FALSE;
}
! if (!solution_check_distant (start, end, part->geom.start, part->geom.end)) {
ped_constraint_destroy (constraint);
ped_disk_destroy (disk);
--- 708,712 ----
return FALSE;
}
! if (!pm_solution_check_distant (start, end, part->geom.start, part->geom.end)) {
ped_constraint_destroy (constraint);
ped_disk_destroy (disk);
***************
*** 720,724 ****
return FALSE;
}
! if (!solution_check_distant(start,end,part->geom.start,
part->geom.end)) {
ped_file_system_close (fs);
--- 730,734 ----
return FALSE;
}
! if (!pm_solution_check_distant(start,end,part->geom.start,
part->geom.end)) {
ped_file_system_close (fs);
***************
*** 743,747 ****
}
! gboolean do_rm(PedDevice **dev, gint num) {
PedDisk *disk;
PedPartition *part;
--- 753,757 ----
}
! gboolean pm_do_rm(PedDevice **dev, gint num) {
PedDisk *disk;
PedPartition *part;
***************
*** 775,779 ****
}
! gint get_part_flag_state(PedDevice **dev,int part_nr, PedPartitionFlag flag) {
PedDisk *disk;
PedPartition *part;
--- 785,789 ----
}
! gint pm_get_part_flag_state(PedDevice **dev,int part_nr, PedPartitionFlag flag) {
PedDisk *disk;
PedPartition *part;
***************
*** 795,799 ****
! gboolean set_part_flag_state(PedDevice **dev,int part_nr, PedPartitionFlag flag, gint state) {
PedDisk *disk;
PedPartition *part;
--- 805,809 ----
! gboolean pm_set_part_flag_state(PedDevice **dev,int part_nr, PedPartitionFlag flag, gint state) {
PedDisk *disk;
PedPartition *part;
***************
*** 818,822 ****
}
! gchar *get_flag_name(PedPartitionFlag part_flag) {
gchar * buffer;
buffer = malloc(256);
--- 828,832 ----
}
! gchar *pm_get_flag_name(PedPartitionFlag part_flag) {
gchar * buffer;
buffer = malloc(256);
***************
*** 856,864 ****
}*/
! gfloat partition_get_length(PedPartition *part) {
return part->geom.length * 1.0 / MEGABYTE_SECTORS;
}
! gfloat partition_max_resize(PedPartition *part) {
PedFileSystem *fs;
PedConstraint *resize_constraint;
--- 866,874 ----
}*/
! gfloat pm_partition_get_length(PedPartition *part) {
return part->geom.length * 1.0 / MEGABYTE_SECTORS;
}
! gfloat pm_partition_max_resize(PedPartition *part) {
PedFileSystem *fs;
PedConstraint *resize_constraint;
***************
*** 877,881 ****
}
! gfloat partition_min_resize(PedPartition *part) {
PedFileSystem *fs;
PedConstraint *resize_constraint;
--- 887,891 ----
}
! gfloat pm_partition_min_resize(PedPartition *part) {
PedFileSystem *fs;
PedConstraint *resize_constraint;
***************
*** 894,898 ****
}
! gboolean disk_supports_extended (PedDevice **dev) {
PedDisk *disk;
--- 904,908 ----
}
! gboolean pm_disk_supports_extended (PedDevice **dev) {
PedDisk *disk;
***************
*** 909,913 ****
}
! gboolean disk_supports_name (PedDevice **dev) {
PedDisk *disk;
--- 919,923 ----
}
! gboolean pm_disk_supports_name (PedDevice **dev) {
PedDisk *disk;
***************
*** 924,930 ****
}
/* rescuing partitions is left out for now, check parted.c for more info */
! gboolean scan_partitions(PedDevice **dev) {
PedDisk *disk;
PedPartition *part = NULL;
--- 934,954 ----
}
+ gboolean pm_use_partition(PedPartition *part) {
+ if (part == NULL) {
+ /* Non-partition */
+ debug("Debug: Skipping NULL partition\n");
+ return FALSE;
+ }
+ if (part->type & PED_PARTITION_METADATA) {
+ /* metadata, probably partition table */
+ debug("Debug: Not using METADATA partition\n");
+ return FALSE;
+ }
+ return TRUE;
+ }
+
/* rescuing partitions is left out for now, check parted.c for more info */
! gboolean pm_scan_partitions(PedDevice **dev) {
PedDisk *disk;
PedPartition *part = NULL;
***************
*** 942,965 ****
debug("Debug: Last num: %d\n",end);
! do {
! /* if (part == NULL) {
! partitions[part_count] = NULL;
! part_count++;
! part = ped_disk_next_partition(disk,part);
! continue;
! }*/
partitions[part_count] = part;
! debug("Debug: length: %.f\n",partition_get_length(part));
! part_count++;
! part = ped_disk_next_partition(disk,part);
! if (part == NULL)
! break;
! } while (1); // Tanenbaum would have my head for this ;o)
!
ped_disk_destroy (disk);
return TRUE;
}
! gboolean has_max_primary_partitions(PedDevice **device) {
PedDisk *disk;
--- 966,1222 ----
debug("Debug: Last num: %d\n",end);
! for (;part != NULL; part = ped_disk_next_partition(disk,part)) {
partitions[part_count] = part;
! debug("Debug: l...
[truncated message content] |
1 message has been excluded from this view by a project administrator.
