[abgeschlossen] Entwurf: IDE Menü

Kreuzuebersetzer, Diskussion über Änderungen im Tuxbox-CDK und Tuxbox-CVS
Innuendo
Einsteiger
Einsteiger
Beiträge: 281
Registriert: Mittwoch 8. Dezember 2004, 21:45

Beitrag von Innuendo »

updated:
hdd_menu_source

Innu
mb405
Tuxboxer
Tuxboxer
Beiträge: 2331
Registriert: Donnerstag 24. März 2005, 21:52

Beitrag von mb405 »

die letzte source läuft jetz bei mir ohne grobe fehler.

kannst dur dir nochmal ansehen, warum man manchmal nicht aus dem menü rauskommt ?

harddisk setup->erweiterte einstellungen->zurück->zurück
mit dem letzten zurück sollte man doch rauskommen. ist aber nicht so sondern man landet wieder in hdd hauptmenü. balken steht auf erweiterte einstellunen. ein weiteres zurück und man ist dann raus.
Innuendo
Einsteiger
Einsteiger
Beiträge: 281
Registriert: Mittwoch 8. Dezember 2004, 21:45

Beitrag von Innuendo »

@mb405

probier mal folgendes:

Code: Alles auswählen

else if(actionKey == "extras") 
{
	if (parent)
		parent->hide();
	Advanced();
	return res;
}
Innu
dbt
Administrator
Beiträge: 2675
Registriert: Donnerstag 28. September 2006, 19:18

Beitrag von dbt »

Weil ich gerade dabei bin... :wink: (hoffe, dass das so passt)
Hier ein Patch um:
data/locale/deutsch.locale
data/locale/english.locale
src/neutrino.cpp
src/gui/Makefile.am
src/system/locals.h
src/system/locals_intern.h
in einem Rutsch zu patchen.

patch nach ...apps/tuxbox/neutrino kopieren
anwenden:
patch -p1 < hddmenu_2007-04-12_21-19.diff

ide_setup.cpp, ide_setup.h aus innus Paket nach src/gui kopieren

Ich denke mal, dass noch etwas mehr Feedback drinn sein sollte. Bei mir läuft das bisher.
Innuendo
Einsteiger
Einsteiger
Beiträge: 281
Registriert: Mittwoch 8. Dezember 2004, 21:45

Beitrag von Innuendo »

danke@dbt

ich hab das mainmenü bei mir ein bisschen verschoben:
Sprachen nach Frab und Theme verschoben und IDE ins Main - Shortcuts angepasst.

Code: Alles auswählen

Index: apps/tuxbox/neutrino/data/locale/deutsch.locale
===================================================================
RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/data/locale/deutsch.locale,v
retrieving revision 1.414
diff -u -r1.414 deutsch.locale
--- a/apps/tuxbox/neutrino/data/locale/deutsch.locale	11 Apr 2007 20:50:23 -0000	1.414
+++ b/apps/tuxbox/neutrino/data/locale/deutsch.locale	12 Apr 2007 19:55:45 -0000
@@ -527,7 +527,7 @@
 mainmenu.sleeptimer SleepTimer
 mainmenu.tvmode TV-Modus
 mainsettings.audio Audio
-mainsettings.colors Farben / Themes / Schrift
+mainsettings.colors Sprachen / Farben / Themes / Schrift
 mainsettings.driver Treiber- und Bootoptionen
 mainsettings.head Einstellungen
 mainsettings.keybinding Tasten Einstellungen
Index: apps/tuxbox/neutrino/src/neutrino.cpp
===================================================================
RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/neutrino.cpp,v
retrieving revision 1.849
diff -u -r1.849 neutrino.cpp
--- a/apps/tuxbox/neutrino/src/neutrino.cpp	9 Apr 2007 20:20:34 -0000	1.849
+++ b/apps/tuxbox/neutrino/src/neutrino.cpp	12 Apr 2007 19:55:55 -0000
@@ -111,6 +111,12 @@
#include "gui/audioplayer.h"
#include "gui/imageinfo.h"

+#define ENABLE_IDE 1 
+#if ENABLE_IDE
+#include "gui/ide_setup.h"
+#endif
+
+
 #if HAVE_DVB_API_VERSION >= 3
 #include "gui/movieplayer.h"
 #endif
@@ -1767,10 +1773,14 @@
 	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_NETWORK   , true, NULL, &networkSettings  , NULL, CRCInput::RC_4));
 	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_RECORDING , true, NULL, &recordingSettings, NULL, CRCInput::RC_5));
 	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_STREAMING , true, NULL, &streamingSettings, NULL, CRCInput::RC_6));
-	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_LANGUAGE  , true, NULL, &languageSettings , NULL, CRCInput::RC_7));
-	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_COLORS    , true, NULL, &colorSettings    , NULL, CRCInput::RC_8));
-	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_LCD       , true, NULL, &lcdSettings      , NULL, CRCInput::RC_9));
-	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_KEYBINDING, true, NULL, &keySettings      , NULL, CRCInput::RC_0));
+	//mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_LANGUAGE  , true, NULL, &languageSettings , NULL, CRCInput::RC_7));
+	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_COLORS    , true, NULL, &colorSettings    , NULL, CRCInput::RC_7));
+	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_LCD       , true, NULL, &lcdSettings      , NULL, CRCInput::RC_8));
+	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_KEYBINDING, true, NULL, &keySettings      , NULL, CRCInput::RC_9));
+
+#if ENABLE_IDE
+	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_HDD, true, NULL, new IdeConfWidget(), NULL, CRCInput::RC_0));
+#endif
 	mainSettings.addItem(new CMenuForwarder(LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL , true, NULL, &audiopl_picSettings   , NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
 	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_DRIVER    , true, NULL, &driverSettings   , NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
 	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_MISC      , true, NULL, &miscSettings     , NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW ));
@@ -3002,11 +3012,14 @@
 	fontSettings.addItem(new CMenuForwarder(LOCALE_OPTIONS_DEFAULT, true, NULL, this, font_sizes_groups[5].actionkey));
 }
 
-void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fontSettings )
+void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fontSettings, CMenuWidget &languageSettings )
 {
 	colorSettings.addItem(GenericMenuSeparator);
 	colorSettings.addItem(GenericMenuBack);
 	colorSettings.addItem(GenericMenuSeparatorLine);
+	
+	colorSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_LANGUAGE  , true, NULL, &languageSettings , NULL ));
+	colorSettings.addItem(GenericMenuSeparatorLine);
 
 	CMenuWidget *colorSettings_Themes = new CMenuWidget(LOCALE_COLORTHEMEMENU_HEAD, NEUTRINO_ICON_SETTINGS);
 	InitColorThemesSettings(*colorSettings_Themes);
@@ -3059,7 +3072,7 @@
 {
 	colorSettings_menuColors.addItem(GenericMenuSeparator);
 	colorSettings_menuColors.addItem(GenericMenuBack);
-
+	
 	CColorChooser* chHeadcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND_HEAD, &g_settings.menu_Head_red, &g_settings.menu_Head_green, &g_settings.menu_Head_blue,
 																  &g_settings.menu_Head_alpha, colorSetupNotifier);
 	CColorChooser* chHeadTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR_HEAD, &g_settings.menu_Head_Text_red, &g_settings.menu_Head_Text_green, &g_settings.menu_Head_Text_blue,
@@ -4300,7 +4313,7 @@
 	InitFontSettings(fontSettings);
 
 	//color Setup
-	InitColorSettings(colorSettings, fontSettings);
+	InitColorSettings(colorSettings, fontSettings, languageSettings);
 
 	//LCD Setup
 	InitLcdSettings(lcdSettings);
Index: apps/tuxbox/neutrino/src/neutrino.h
===================================================================
RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/neutrino.h,v
retrieving revision 1.186
diff -u -r1.186 neutrino.h
--- a/apps/tuxbox/neutrino/src/neutrino.h	18 Mar 2007 12:47:25 -0000	1.186
+++ b/apps/tuxbox/neutrino/src/neutrino.h	12 Apr 2007 19:55:56 -0000
@@ -178,7 +178,7 @@
 		void InitServiceSettings(CMenuWidget &, CMenuWidget &);
 		void InitColorSettingsMenuColors(CMenuWidget &);
 		void InitAudioSettings(CMenuWidget &audioSettings, CAudioSetupNotifier* audioSetupNotifier);
-		void InitColorSettings(CMenuWidget &, CMenuWidget &);
+		void InitColorSettings(CMenuWidget &, CMenuWidget &, CMenuWidget &);
 		void InitLanguageSettings(CMenuWidget &);
 		void InitColorThemesSettings(CMenuWidget &);
 		void InitColorSettingsStatusBarColors(CMenuWidget &colorSettings_menuColors);
Index: apps/tuxbox/neutrino/src/gui/Makefile.am
===================================================================
RCS file: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/Makefile.am,v
retrieving revision 1.37
diff -u -r1.37 Makefile.am
--- a/apps/tuxbox/neutrino/src/gui/Makefile.am	21 Jan 2006 15:45:51 -0000	1.37
+++ b/apps/tuxbox/neutrino/src/gui/Makefile.am	12 Apr 2007 19:55:56 -0000
@@ -23,7 +23,7 @@
 	timeosd.cpp epgplus.cpp epg_menu.cpp \
 	streaminfo2.cpp plugins.cpp imageinfo.cpp \
 	audio_select.cpp \
-	moviebrowser.cpp movieinfo.cpp
+	moviebrowser.cpp movieinfo.cpp ide_setup.cpp
 #	experimental_menu.cpp
 #	ch_mosaic.cpp
 

innu
PT-1
Moderator english
Beiträge: 2458
Registriert: Donnerstag 20. Dezember 2001, 00:00

Beitrag von PT-1 »

@Innu oder anyone ;-)

Inno's Download geht nicht ..
Innuendo
Einsteiger
Einsteiger
Beiträge: 281
Registriert: Mittwoch 8. Dezember 2004, 21:45

Beitrag von Innuendo »

PT-1 hat geschrieben:@Innu oder anyone ;-)

Inno's Download geht nicht ..
der kostenlose s4.gmc.to ist leider mal wieder off.
hast du noch ein bisl platz für das kleine rar bei dir über?

innu
jmittelst
Tuxboxer
Tuxboxer
Beiträge: 6044
Registriert: Montag 17. November 2003, 06:48

Beitrag von jmittelst »

Innu: http://ulc.tuxbox-cvs.sourceforge.net - da ist immer Platz für Code etc.
Ansonsten: Ich hab auch immer ein paar MB Platz. Sowohl schnell (bis 2 MB) als auch langsam für grössere Dateien.

cu
Jens
PT-1
Moderator english
Beiträge: 2458
Registriert: Donnerstag 20. Dezember 2001, 00:00

Beitrag von PT-1 »

@Inno

PM

@JMittelst

Warst du schneller ;-)
jmittelst
Tuxboxer
Tuxboxer
Beiträge: 6044
Registriert: Montag 17. November 2003, 06:48

Beitrag von jmittelst »

Ist doch kein Rennen hier ;)

cu
Jens
Innuendo
Einsteiger
Einsteiger
Beiträge: 281
Registriert: Mittwoch 8. Dezember 2004, 21:45

Beitrag von Innuendo »

finde beim tuxbox-upload kein button zum registrieren - sieht mit IE auch fürchterlich aus. das rar file hab ich an PT-1 geschickt.

wird man auf dem upload freigeschaltet oder ... ? :gruebel:
PT-1
Moderator english
Beiträge: 2458
Registriert: Donnerstag 20. Dezember 2001, 00:00

Beitrag von PT-1 »

Und da ist es ;-)

http://www.pt-1.net/hdd/hdd.rar

oder hier

http://www.pt-1.net/hdd/hdd.zip

weil mein Ubuntu irgendwie kein rar will.. :gruebel:

Und die kompletten Dateien von Inno:

http://www.pt-1.net/hdd/hdd_komplett.zip oder http://www.pt-1.net/hdd/hdd_komplett.rar
Zuletzt geändert von PT-1 am Mittwoch 17. Dezember 2008, 15:08, insgesamt 2-mal geändert.
jmittelst
Tuxboxer
Tuxboxer
Beiträge: 6044
Registriert: Montag 17. November 2003, 06:48

Beitrag von jmittelst »

PT-1
Moderator english
Beiträge: 2458
Registriert: Donnerstag 20. Dezember 2001, 00:00

Beitrag von PT-1 »

Das rar&zip enhaelt nun nur die 2 Dateien (hatte vorher das komplette Rar von Inno hochgeladen)
PT-1
Moderator english
Beiträge: 2458
Registriert: Donnerstag 20. Dezember 2001, 00:00

Beitrag von PT-1 »

@DBT or Inno :cry:

Code: Alles auswählen

Reversed (or previously applied) patch detected!  Assume -R? [n] r
Apply anyway? [n] y
Hunk #1 FAILED at 410.
Hunk #2 FAILED at 594.
2 out of 2 hunks FAILED -- saving rejects to file data/locale/deutsch.locale.rej
patching file data/locale/english.locale
Reversed (or previously applied) patch detected!  Assume -R? [n] y
Hunk #1 succeeded at 530 (offset 2 lines).
patching file src/neutrino.cpp
Reversed (or previously applied) patch detected!  Assume -R? [n] y
Hunk #1 succeeded at 119 (offset 1 line).
Hunk #2 succeeded at 1760 (offset 2 lines).
patching file src/gui/Makefile.am
Hunk #1 FAILED at 23.
1 out of 1 hunk FAILED -- saving rejects to file src/gui/Makefile.am.rej
patching file src/system/locals.h
Reversed (or previously applied) patch detected!  Assume -R? [n] y
Hunk #1 succeeded at 436 (offset 1 line).
Hunk #2 succeeded at 557 (offset 2 lines).
patching file src/system/locals_intern.h
Reversed (or previously applied) patch detected!  Assume -R? [n] y
Hunk #1 succeeded at 436 (offset 1 line).
Hunk #2 succeeded at 557 (offset 2 lines).

Code: Alles auswählen

neutrino.o(.text+0x4184): In function `CNeutrinoApp::InitMainMenu(CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&, CMenuWidget&)':
: undefined reference to `IdeConfWidget::IdeConfWidget()'
collect2: ld returned 1 exit status
make[4]: *** [neutrino] Error 1
make[4]: Leaving directory `/home/ubuntu/pt-1/tuxbox-cvs/apps/tuxbox/neutrino/src'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/home/ubuntu/pt-1/tuxbox-cvs/apps/tuxbox/neutrino/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/ubuntu/pt-1/tuxbox-cvs/apps/tuxbox/neutrino'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/ubuntu/pt-1/tuxbox-cvs/apps/tuxbox/neutrino'
make: *** [/home/ubuntu/pt-1/dbox2/cdkflash/root-neutrino] Error 2
dbt
Administrator
Beiträge: 2675
Registriert: Donnerstag 28. September 2006, 19:18

Beitrag von dbt »

schau mal in die *.rej Files. Dann siehst Du wo was fehlt! Oder poste mal die Files.
PT-1
Moderator english
Beiträge: 2458
Registriert: Donnerstag 20. Dezember 2001, 00:00

Beitrag von PT-1 »

makefile.am.rej

Code: Alles auswählen

***************
*** 23,29 ****
  	timeosd.cpp epgplus.cpp epg_menu.cpp \
  	streaminfo2.cpp plugins.cpp imageinfo.cpp \
  	audio_select.cpp \
- 	moviebrowser.cpp movieinfo.cpp
  #	experimental_menu.cpp
  #	ch_mosaic.cpp
  
--- 23,29 ----
  	timeosd.cpp epgplus.cpp epg_menu.cpp \
  	streaminfo2.cpp plugins.cpp imageinfo.cpp \
  	audio_select.cpp \
+ 	moviebrowser.cpp movieinfo.cpp ide_setup.cpp
  #	experimental_menu.cpp
  #	ch_mosaic.cpp
  
deutsch.locale.rej

Code: Alles auswählen

***************
*** 410,415 ****
  fontsize.menu_title Menu Titel
  gtxalpha.alpha1 Alpha 1
  gtxalpha.alpha2 Alpha 2
  imageinfo.chipset Ihre Chip-Version:
  imageinfo.creator Ersteller:
  imageinfo.cvslevel CVS-Stand:
--- 410,479 ----
  fontsize.menu_title Menu Titel
  gtxalpha.alpha1 Alpha 1
  gtxalpha.alpha2 Alpha 2
+ hddsettings.ide IDE Treiber laden
+ hddsettings.ide.off aus
+ hddsettings.ide.std ein
+ hddsettings.ide.irq6 Benutze IRQ6
+ hddsettings.ide.swap Swap Partition
+ hddsettings.ide.swap.help min. Swapgröße: 16MB - Swap aus: 0
+ hddsettings.ide.swap.std Standard 64 MB
+ hddsettings.ide.samba Sambaserver starten
+ hddsettings.ide.nfs NFS Server starten
+ hddsettings.hdd Harddisk Setup
+ hddsettings.hdd.capacity Kapazität
+ hddsettings.hdd.model Model
+ hddsettings.hdd.free Freier Speicher HDD
+ hddsettings.hdd.freehours Freier Speicher Aufnahmen
+ hddsettings.hdd.cache Write cache HDD
+ hddsettings.hdd.sleep Standby timeout (spindown)
+ hddsettings.hdd.sleep.help 5 SekEinheiten: 1-240 - 30 MinEinheiten: 241-251 
+ hddsettings.hdd.sleep.std Standard 60 (60 * 5 = 300 Sekunden)
+ hddsettings.hdd.fs Auswahl Filesystem
+ hddsettings.hdd.fs.xfs XFS
+ hddsettings.hdd.fs.ext2 EXT2
+ hddsettings.hdd.fs.ext3 EXT3
+ hddsettings.hdd.format HDD formatieren
+ hddsettings.hdd.formatpartition Partition formatieren
+ hddsettings.hdd.check HDD Check
+ hddsettings.hdd.checkpartition Partition Check
+ hddsettings.hdd.format.message Das Formatieren der Festplatte dauert mehrere Minuten\nWollen Sie fortfahren?
+ hddsettings.hdd.formatpartition.message Das Formatieren einer Partition dauert mehrere Minuten\nWollen Sie fortfahren?
+ hddsettings.hdd.savesettings.message Die Einstellungen wurden geändert\nSoll die Festplatte formatiert werden?\nAchtung: Alle Daten auf der Festplatte werden gelöscht!\n
+ hddsettings.hdd.check.message  Das Überprüfen der Festplatte dauert mehrere Minuten\nWollen Sie fortfahren?
+ hddsettings.hdd.checkpartition.message  Das Überprüfen der Partition dauert mehrere Minuten\nWollen Sie fortfahren?
+ hddsettings.hdd.format.info Festplatte wird eingerichtet. Bitte warten ...\nDer Vorgang kann länger dauern
+ hddsettings.hdd.formatpartition.info Das Dateisystem der Partition wird eingerichtet\nBitte warten ...der Vorgang kann länger dauern
+ hddsettings.hdd.format.info1 Berechne Partitionen. Bitte warten ...
+ hddsettings.hdd.check.info Festplatte wird überprüft. Bitte warten ...\nDer Vorgang kann länger dauern
+ hddsettings.hdd.checkpartition.info Partition wird überprüft. Bitte warten ...\nDer Vorgang kann länger dauern
+ hddsettings.hdd.temp HDD Temperatur
+ hddsettings.hdd.temp.message HDDTemp dauert einige Sekunden\nund wird nicht von allen Herstellern unterstützt\nWollen Sie fortfahren?
+ hddsettings.hdd.switch.hdd Wechsel zu MMC
+ hddsettings.hdd.switch.mmc Wechsel zu HDD
+ hddsettings.hdd.infos HDD Informationen
+ hddsettings.advanced Erweiterte Einstellungen
+ hddsettings.target Anschluss HDD
+ hddsettings.target.master Master
+ hddsettings.target.slave Slave
+ hddsettings.partition1 1. Partition
+ hddsettings.partition2 2. Partition
+ hddsettings.partition3 3. Partition
+ hddsettings.partition4 4. Partition
+ hddsettings.partition.none Aus
+ hddsettings.partition.linux Daten
+ hddsettings.partition.swap Swap
+ hddsettings.partition1.size Feste Größe Swappartition in MB
+ hddsettings.partition2.size 2. Partition Größe in MB
+ hddsettings.partition3.size 3. Partition Größe in MB
+ hddsettings.partition4.size 4. Partition Größe in MB
+ hddsettings.partition.help 0 bis max HDD Größe\nkeine Partition anlegen mit 0 MB\n
+ hddsettings.partition.std     
+ hddsettings.partition.hdd.off aus
+ hddsettings.partition.hdd.active Aktiv
+ hddsettings.hdd.part1.info Partition Swap
+ hddsettings.hdd.part2.info Partition Movies
+ hddsettings.hdd.part3.info Partition Pictures and MP3
+ hddsettings.hdd.part4.info Partition EPG
  imageinfo.chipset Ihre Chip-Version:
  imageinfo.creator Ersteller:
  imageinfo.cvslevel CVS-Stand:
***************
*** 530,535 ****
  mainsettings.audio Audio
  mainsettings.colors Farben / Themes / Schrift
  mainsettings.driver Treiber- und Bootoptionen
  mainsettings.head Einstellungen
  mainsettings.keybinding Tasten Einstellungen
  mainsettings.language Sprache
--- 594,600 ----
  mainsettings.audio Audio
  mainsettings.colors Farben / Themes / Schrift
  mainsettings.driver Treiber- und Bootoptionen
+ mainsettings.hdd Harddisk Setup
  mainsettings.head Einstellungen
  mainsettings.keybinding Tasten Einstellungen
  mainsettings.language Sprache

@DBT

VIELEN VIELEN DANK

EDIT: Bin gerade am basteln ;-)

im tuxbox-cvs/apps/tuxbox/neutrino/src/gui/makefile.am habe ich jetzt:

Code: Alles auswählen

audio_select.cpp upnpbrowser.cpp \
	moviebrowser.cpp movieinfo.cpp 
einfach das ide_setup.cpp dahinter gehaengt ;-)
PT-1
Moderator english
Beiträge: 2458
Registriert: Donnerstag 20. Dezember 2001, 00:00

Beitrag von PT-1 »

Jetzt haengt es hier:

Code: Alles auswählen

make[5]: Entering directory `/home/ubuntu/pt-1/tuxbox-cvs/apps/tuxbox/neutrino/src/gui'
if powerpc-tuxbox-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I. -I../.. -I../../daemons -I../../src -I/home/ubuntu/pt-1/dbox2/cdkroot/include/tuxbox -I/home/ubuntu/pt-1/dbox2/cdkroot/include/freetype2 -I/home/ubuntu/pt-1/dbox2/cdkroot/include/tuxbox -I/home/ubuntu/pt-1/dbox2/cdkroot/include/tuxbox -I/home/ubuntu/pt-1/dbox2/cdkroot/include/tuxbox/mpegtools -I/home/ubuntu/pt-1/dbox2/cdkroot/include -I/home/ubuntu/pt-1/tuxbox-cvs/driver/include -I/home/ubuntu/pt-1/dbox2/cdkroot/include/tuxbox/xmltree -I/home/ubuntu/pt-1/dbox2/cdkroot/include/tuxbox/upnpclient -I../../lib  -I/home/ubuntu/pt-1/tuxbox-cvs/driver/dvb/include -I/home/ubuntu/pt-1/tuxbox-cvs/driver/include  -Wall -mcpu=823 -pipe -Os -MT ide_setup.o -MD -MP -MF ".deps/ide_setup.Tpo" -c -o ide_setup.o ide_setup.cpp; \
        then mv -f ".deps/ide_setup.Tpo" ".deps/ide_setup.Po"; else rm -f ".deps/ide_setup.Tpo"; exit 1; fi
ide_setup.cpp:142: error: `LOCALE_HDDSETTINGS_IDE_OFF' was not declared in this scope
ide_setup.cpp:143: error: `LOCALE_HDDSETTINGS_IDE_STD' was not declared in this scope
ide_setup.cpp:144: error: `LOCALE_HDDSETTINGS_IDE_IRQ6' was not declared in this scope
ide_setup.cpp:150: error: `LOCALE_HDDSETTINGS_HDD_FS_XFS' was not declared in this scope
ide_setup.cpp:151: error: `LOCALE_HDDSETTINGS_HDD_FS_EXT3' was not declared in this scope
ide_setup.cpp:152: error: `LOCALE_HDDSETTINGS_HDD_FS_EXT2' was not declared in this scope
ide_setup.cpp:158: error: `LOCALE_HDDSETTINGS_TARGET_MASTER' was not declared in this scope
ide_setup.cpp:159: error: `LOCALE_HDDSETTINGS_TARGET_SLAVE' was not declared in this scope
ide_setup.cpp:165: error: `LOCALE_HDDSETTINGS_HDD_OFF' was not declared in this scope
ide_setup.cpp:166: error: `LOCALE_HDDSETTINGS_HDD_ACTIVE' was not declared in this scope
ide_setup.cpp: In member function `virtual int IdeConfWidget::exec(CMenuTarget*, const std::string&)':
ide_setup.cpp:449: error: `LOCALE_HDDSETTINGS_HDD_FORMAT_MESSAGE' undeclared (first use this function)
ide_setup.cpp:449: error: (Each undeclared identifier is reported only once for each function it appears in.)
ide_setup.cpp:463: error: `LOCALE_HDDSETTINGS_HDD_CHECK_MESSAGE' undeclared (first use this function)
ide_setup.cpp:477: error: `LOCALE_HDDSETTINGS_HDD_TEMP_MESSAGE' undeclared (first use this function)
ide_setup.cpp:492: error: `LOCALE_HDDSETTINGS_HDD_FORMATPARTITION_MESSAGE' undeclared (first use this function)
ide_setup.cpp:551: error: `LOCALE_HDDSETTINGS_HDD_CHECKPARTITION_MESSAGE' undeclared (first use this function)
ide_setup.cpp: In member function `bool IdeConfWidget::SaveSettings()':
ide_setup.cpp:727: error: `LOCALE_HDDSETTINGS_HDD_SAVESETTINGS_MESSAGE' undeclared (first use this function)
ide_setup.cpp: In member function `bool IdeConfWidget::Format()':
ide_setup.cpp:943: error: `LOCALE_HDDSETTINGS_HDD' undeclared (first use this function)
ide_setup.cpp:943: error: `LOCALE_HDDSETTINGS_HDD_FORMAT_INFO1' undeclared (first use this function)
ide_setup.cpp:1022: error: `LOCALE_HDDSETTINGS_HDD_FORMAT_INFO' undeclared (first use this function)
ide_setup.cpp: In member function `bool IdeConfWidget::FormatPartition(int)':
ide_setup.cpp:1115: error: `LOCALE_HDDSETTINGS_HDD' undeclared (first use this function)
ide_setup.cpp:1115: error: `LOCALE_HDDSETTINGS_HDD_FORMATPARTITION_INFO' undeclared (first use this function)
ide_setup.cpp: In member function `bool IdeConfWidget::Check(int)':
ide_setup.cpp:1182: error: `LOCALE_HDDSETTINGS_HDD' undeclared (first use this function)
ide_setup.cpp:1182: error: `LOCALE_HDDSETTINGS_HDD_CHECK_INFO' undeclared (first use this function)
ide_setup.cpp:1184: error: `LOCALE_HDDSETTINGS_HDD_CHECKPARTITION_INFO' undeclared (first use this function)
ide_setup.cpp: In member function `void IdeConfWidget::Settings()':
ide_setup.cpp:1298: error: `LOCALE_MAINSETTINGS_HDD' undeclared (first use this function)
ide_setup.cpp:1304: error: `LOCALE_HDDSETTINGS_HDD_INFOS' undeclared (first use this function)
ide_setup.cpp:1306: error: `LOCALE_HDDSETTINGS_HDD_MODEL' undeclared (first use this function)
ide_setup.cpp:1307: error: `LOCALE_HDDSETTINGS_HDD_CAPACITY' undeclared (first use this function)
ide_setup.cpp:1308: error: `LOCALE_HDDSETTINGS_HDD_FREE' undeclared (first use this function)
ide_setup.cpp:1309: error: `LOCALE_HDDSETTINGS_HDD_FREEHOURS' undeclared (first use this function)
ide_setup.cpp:1310: error: `LOCALE_HDDSETTINGS_HDD_TEMP' undeclared (first use this function)
ide_setup.cpp:1312: error: `LOCALE_HDDSETTINGS_IDE' undeclared (first use this function)
ide_setup.cpp:1313: error: `LOCALE_HDDSETTINGS_HDD_FS' undeclared (first use this function)
ide_setup.cpp:1314: error: `LOCALE_HDDSETTINGS_IDE_SWAP' undeclared (first use this function)
ide_setup.cpp:1315: error: `LOCALE_HDDSETTINGS_HDD_CACHE' undeclared (first use this function)
ide_setup.cpp:1316: error: `LOCALE_HDDSETTINGS_HDD_SLEEP' undeclared (first use this function)
ide_setup.cpp:1316: error: `LOCALE_HDDSETTINGS_HDD_SLEEP_HELP' undeclared (first use this function)
ide_setup.cpp:1316: error: `LOCALE_HDDSETTINGS_HDD_SLEEP_STD' undeclared (first use this function)
ide_setup.cpp:1319: error: `LOCALE_HDDSETTINGS_IDE_SAMBA' undeclared (first use this function)
ide_setup.cpp:1320: error: `LOCALE_HDDSETTINGS_IDE_NFS' undeclared (first use this function)
ide_setup.cpp:1322: error: `LOCALE_HDDSETTINGS_ADVANCED' undeclared (first use this function)
ide_setup.cpp:1323: error: `LOCALE_HDDSETTINGS_HDD_FORMAT' undeclared (first use this function)
ide_setup.cpp:1324: error: `LOCALE_HDDSETTINGS_HDD_CHECK' undeclared (first use this function)
ide_setup.cpp: In member function `void IdeConfWidget::Advanced()':
ide_setup.cpp:1337: error: `LOCALE_HDDSETTINGS_ADVANCED' undeclared (first use this function)
ide_setup.cpp:1341: error: `LOCALE_HDDSETTINGS_TARGET' undeclared (first use this function)
ide_setup.cpp:1343: error: `LOCALE_HDDSETTINGS_HDD_CAPACITY' undeclared (first use this function)
ide_setup.cpp:1344: error: `LOCALE_HDDSETTINGS_HDD_PART1_INFO' undeclared (first use this function)
ide_setup.cpp:1345: error: `LOCALE_HDDSETTINGS_PARTITION1' undeclared (first use this function)
ide_setup.cpp:1346: error: `LOCALE_HDDSETTINGS_PARTITION1_SIZE' undeclared (first use this function)
ide_setup.cpp:1347: error: `LOCALE_HDDSETTINGS_HDD_FORMATPARTITION' undeclared (first use this function)
ide_setup.cpp:1348: error: `LOCALE_HDDSETTINGS_HDD_PART2_INFO' undeclared (first use this function)
ide_setup.cpp:1349: error: `LOCALE_HDDSETTINGS_PARTITION2' undeclared (first use this function)
ide_setup.cpp:1350: error: `LOCALE_HDDSETTINGS_PARTITION2_SIZE' undeclared (first use this function)
ide_setup.cpp:1350: error: `LOCALE_HDDSETTINGS_PARTITION_HELP' undeclared (first use this function)
ide_setup.cpp:1350: error: `LOCALE_HDDSETTINGS_PARTITION_STD' undeclared (first use this function)
ide_setup.cpp:1352: error: `LOCALE_HDDSETTINGS_HDD_FS' undeclared (first use this function)
ide_setup.cpp:1354: error: `LOCALE_HDDSETTINGS_HDD_CHECKPARTITION' undeclared (first use this function)
ide_setup.cpp:1355: error: `LOCALE_HDDSETTINGS_HDD_PART3_INFO' undeclared (first use this function)
ide_setup.cpp:1356: error: `LOCALE_HDDSETTINGS_PARTITION3' undeclared (first use this function)
ide_setup.cpp:1357: error: `LOCALE_HDDSETTINGS_PARTITION3_SIZE' undeclared (first use this function)
ide_setup.cpp:1362: error: `LOCALE_HDDSETTINGS_HDD_PART4_INFO' undeclared (first use this function)
ide_setup.cpp:1363: error: `LOCALE_HDDSETTINGS_PARTITION4' undeclared (first use this function)
ide_setup.cpp:1364: error: `LOCALE_HDDSETTINGS_PARTITION4_SIZE' undeclared (first use this function)
make[5]: *** [ide_setup.o] Error 1
make[5]: Leaving directory `/home/ubuntu/pt-1/tuxbox-cvs/apps/tuxbox/neutrino/src/gui'
make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory `/home/ubuntu/pt-1/tuxbox-cvs/apps/tuxbox/neutrino/src/gui'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/home/ubuntu/pt-1/tuxbox-cvs/apps/tuxbox/neutrino/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/ubuntu/pt-1/tuxbox-cvs/apps/tuxbox/neutrino'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/ubuntu/pt-1/tuxbox-cvs/apps/tuxbox/neutrino'
make: *** [/home/ubuntu/pt-1/dbox2/cdkflash/root-neutrino] Error 2

Innuendo
Einsteiger
Einsteiger
Beiträge: 281
Registriert: Mittwoch 8. Dezember 2004, 21:45

Beitrag von Innuendo »

schau mal in deine locals.h, locals_intern.h und deutsch.local
wahrscheinlich hast du die rejects nocht nicht aufgelöst.

dbt hat eine sortierte version der locals als diff eingestellt - wer das sort abgestellt hat, bekommt auf jedenfall ein paar "<<< >>> ===" zeilen.

innu
PT-1
Moderator english
Beiträge: 2458
Registriert: Donnerstag 20. Dezember 2001, 00:00

Beitrag von PT-1 »

OK,

so wie ich gesehen habe gibt es auch noch kein Diff fuer die english.locale

wenn es sinn macht dann uebersetze ich die Kurz und poste wieder ;-)

Ich suche mal
Innuendo
Einsteiger
Einsteiger
Beiträge: 281
Registriert: Mittwoch 8. Dezember 2004, 21:45

Beitrag von Innuendo »

PT-1 hat geschrieben:noch kein Diff fuer die english.locale
die deutsch.locale ist doch schon halb english - verdammter anglizismus ;-)

innu
PT-1
Moderator english
Beiträge: 2458
Registriert: Donnerstag 20. Dezember 2001, 00:00

Beitrag von PT-1 »

english.locale

Code: Alles auswählen

hddsettings.ide Load IDE Driver
hddsettings.ide.off off
hddsettings.ide.std on
hddsettings.ide.irq6 use IRQ6
hddsettings.ide.swap Swap Partition
hddsettings.ide.swap.help min. Swapsize: 16MB - Swap off: 0
hddsettings.ide.swap.std Standard 64 MB
hddsettings.ide.samba start Sambaserver
hddsettings.ide.nfs start NFS Server
hddsettings.hdd Harddisk Setup
hddsettings.hdd.capacity Capacity
hddsettings.hdd.model Model
hddsettings.hdd.free Free Size HDD
hddsettings.hdd.freehours Free Size Recording
hddsettings.hdd.cache Write cache HDD
hddsettings.hdd.sleep Standby timeout (spindown)
hddsettings.hdd.sleep.help 5 SecUnits: 1-240 - 30 MinUnits: 241-251 
hddsettings.hdd.sleep.std Standard 60 (60 * 5 = 300 Seconds)
hddsettings.hdd.fs Selection Filesystem
hddsettings.hdd.fs.xfs XFS
hddsettings.hdd.fs.ext2 EXT2
hddsettings.hdd.fs.ext3 EXT3
hddsettings.hdd.format format HDD
hddsettings.hdd.formatpartition format Partition
hddsettings.hdd.check HDD Check
hddsettings.hdd.checkpartition Partition Check
hddsettings.hdd.format.message To format the HDD can take up a few minutes\nDo you want to continue?
hddsettings.hdd.formatpartition.message To format a Partition can take up a few minutes\nDo you want to continue?
hddsettings.hdd.savesettings.message The settings have been changed\nDo you want to format the HDD now?\nAttention: All data will be lost!\n
hddsettings.hdd.check.message  To check the HDD can take up a few minutes\nDo you want to continue?
hddsettings.hdd.checkpartition.message  To check a Partition can take up a few minutes\nDo you want to continue?
hddsettings.hdd.format.info The HDD is being formatted. please wait ...\nThis can take a little while
hddsettings.hdd.formatpartition.info The Filesystem of the Partition is now being set\nPlease wait ...This can take a little while
hddsettings.hdd.format.info1 Calculate Partitionen. Please wait ...
hddsettings.hdd.check.info HDD is being checked. Please wait ...\nThis can take a little while
hddsettings.hdd.checkpartition.info Partition is being checked. Please wait ...\nThis can take a little while
hddsettings.hdd.temp HDD Temperatur
hddsettings.hdd.temp.message HDDTemp takes a few seconds\nand is not supported by all manufacturers\nContinue?
hddsettings.hdd.switch.hdd Swap to MMC
hddsettings.hdd.switch.mmc Swap to HDD
hddsettings.hdd.infos HDD Informationens
hddsettings.advanced Enhanced Settings
hddsettings.target Connection HDD
hddsettings.target.master Master
hddsettings.target.slave Slave
hddsettings.partition1 1. Partition
hddsettings.partition2 2. Partition
hddsettings.partition3 3. Partition
hddsettings.partition4 4. Partition
hddsettings.partition.none Off
hddsettings.partition.linux Data
hddsettings.partition.swap Swap
hddsettings.partition1.size Fixed size Swappartition in MB
hddsettings.partition2.size 2. Partition size in MB
hddsettings.partition3.size 3. Partition size in MB
hddsettings.partition4.size 4. Partition size in MB
hddsettings.partition.help 0 use max HDD size\nset no Partition via size 0 MB\n
hddsettings.partition.std     
hddsettings.partition.hdd.off off
hddsettings.partition.hdd.active Activ
hddsettings.hdd.part1.info Partition Swap
hddsettings.hdd.part2.info Partition Movies
hddsettings.hdd.part3.info Partition Pictures and MP3
hddsettings.hdd.part4.info Partition EPG

Nachtrag: 13:10

Habe jetzt also manuell in tuxbox/apps/tuxbox/neutrino/src/system/locals.h und tuxbox/apps/tuxbox/neutrino/src/system/locals_intern.h noch die von oben reklamierten locales and der richtigen Stelle hinzugefuegt bekomme aber immer noch den obigen Fehler wenn ich ein Make flash-neutrino-jffs2-all via Newmake mache ...
AudioSlyer
Erleuchteter
Erleuchteter
Beiträge: 450
Registriert: Sonntag 28. Juli 2002, 01:18

Beitrag von AudioSlyer »

du musst nur das hddmenu_2007-04-12_21-19.diff adden, damm sollten die LOCALES gesetzt sein.

Schau Seite 4 das Posting von dbt an
nitr8
Einsteiger
Einsteiger
Beiträge: 102
Registriert: Freitag 29. Dezember 2006, 10:44

Beitrag von nitr8 »

this works 100%

$cd tuxbox-cvs
$wget http://www.njlworld.com/~pt1/hdd/hdd.rar
$unrar e hdd.rar
$mv ide_setup.* apps/tuxbox/neutrino/src/gui/
Edit the following and add whatever is in bold if something is in italic that means you need to append something to the line.

apps/tuxbox/neutrino/data/locale/english.locale
mainsettings.driver driver and boot options
mainsettings.hdd Internal IDE
mainsettings.head Settings

gtxalpha.alpha2 Alpha 2
hddsettings.advanced Enhanced Settings
hddsettings.hdd Harddisk Setup
hddsettings.hdd.active Active
hddsettings.hdd.cache Write cache HDD
hddsettings.hdd.capacity Capacity
hddsettings.hdd.check HDD Check
hddsettings.hdd.check.info HDD is being checked. Please wait ...\nThis can take a little while
hddsettings.hdd.check.message To check the HDD can take up a few minutes\nDo you want to continue?
hddsettings.hdd.checkpartition Partition Check
hddsettings.hdd.checkpartition.info Partition is being checked. Please wait ...\nThis can take a little while
hddsettings.hdd.checkpartition.message To check a Partition can take up a few minutes\nDo you want to continue?
hddsettings.hdd.format format HDD
hddsettings.hdd.format.info The HDD is being formatted. please wait ...\nThis can take a little while
hddsettings.hdd.format.info1 Calculate Partitionen. Please wait ...
hddsettings.hdd.format.message To format the HDD can take up a few minutes\nDo you want to continue?
hddsettings.hdd.formatpartition format Partition
hddsettings.hdd.formatpartition.info The Filesystem of the Partition is now being set\nPlease wait ...This can take a little while
hddsettings.hdd.formatpartition.message To format a Partition can take up a few minutes\nDo you want to continue?
hddsettings.hdd.free Free Size HDD
hddsettings.hdd.freehours Free Size Recording
hddsettings.hdd.fs Selection Filesystem
hddsettings.hdd.fs.ext2 EXT2
hddsettings.hdd.fs.ext3 EXT3
hddsettings.hdd.fs.xfs XFS
hddsettings.hdd.infos HDD Informationens
hddsettings.hdd.model Model
hddsettings.hdd.off Off
hddsettings.hdd.part1.info Partition Swap
hddsettings.hdd.part2.info Partition Movies
hddsettings.hdd.part3.info Partition Pictures and MP3
hddsettings.hdd.part4.info Partition EPG
hddsettings.hdd.savesettings.message The settings have been changed\nDo you want to format the HDD now?\nAttention: All data will be lost!\n
hddsettings.hdd.sleep Standby timeout (spindown)
hddsettings.hdd.sleep.help 5 SecUnits: 1-240 - 30 MinUnits: 241-251
hddsettings.hdd.sleep.std Standard 60 (60 * 5 = 300 Seconds)
hddsettings.hdd.switch.hdd Swap to MMC
hddsettings.hdd.switch.mmc Swap to HDD
hddsettings.hdd.temp HDD Temperatur
hddsettings.hdd.temp.message HDDTemp takes a few seconds\nand is not supported by all manufacturers\nContinue?
hddsettings.ide Load IDE Driver
hddsettings.ide.irq6 use IRQ6
hddsettings.ide.nfs start NFS Server
hddsettings.ide.off off
hddsettings.ide.samba start Sambaserver
hddsettings.ide.std on
hddsettings.ide.swap Swap Partition
hddsettings.ide.swap.help min. Swapsize: 16MB - Swap off: 0
hddsettings.ide.swap.std Standard 64 MB
hddsettings.partition.hdd.active Activ
hddsettings.partition.hdd.off off
hddsettings.partition.help 0 use max HDD size\nset no Partition via size 0 MB\n
hddsettings.partition.linux Data
hddsettings.partition.none Off
hddsettings.partition.std
hddsettings.partition.swap Swap
hddsettings.partition1 1. Partition
hddsettings.partition1.size Fixed size Swappartition in MB
hddsettings.partition2 2. Partition
hddsettings.partition2.size 2. Partition size in MB
hddsettings.partition3 3. Partition
hddsettings.partition3.size 3. Partition size in MB
hddsettings.partition4 4. Partition
hddsettings.partition4.size 4. Partition size in MB
hddsettings.target Connection HDD
hddsettings.target.master Master
hddsettings.target.slave Slave

imageinfo.chipset your chipset:
apps/tuxbox/neutrino/src/neutrino.cpp
#include "gui/motorcontrol.h"
#include "gui/ide_setup.h"

mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
mainSettings.addItem(GenericMenuSeparatorLine);
/* IDE Menu */
mainSettings.addItem(new CMenuForwarder(LOCALE_HDDSETTINGS_HDD, true, NULL, new IdeConfWidget(), NULL));
apps/tuxbox/neutrino/src/gui/Makefile.am
replace
moviebrowser.cpp movieinfo.cpp

with
moviebrowser.cpp movieinfo.cpp ide_setup.cpp
apps/tuxbox/neutrino/src/system/locals.h
LOCALE_MAINSETTINGS_DRIVER,
LOCALE_MAINSETTINGS_HDD,
LOCALE_MAINSETTINGS_HEAD,

LOCALE_GTXALPHA_ALPHA2,
LOCALE_HDDSETTINGS_ADVANCED,
LOCALE_HDDSETTINGS_HDD,
LOCALE_HDDSETTINGS_HDD_ACTIVE,
LOCALE_HDDSETTINGS_HDD_CACHE,
LOCALE_HDDSETTINGS_HDD_CAPACITY,
LOCALE_HDDSETTINGS_HDD_CHECK,
LOCALE_HDDSETTINGS_HDD_CHECK_INFO,
LOCALE_HDDSETTINGS_HDD_CHECK_MESSAGE,
LOCALE_HDDSETTINGS_HDD_CHECKPARTITION,
LOCALE_HDDSETTINGS_HDD_CHECKPARTITION_INFO,
LOCALE_HDDSETTINGS_HDD_CHECKPARTITION_MESSAGE,
LOCALE_HDDSETTINGS_HDD_FORMAT,
LOCALE_HDDSETTINGS_HDD_FORMAT_INFO,
LOCALE_HDDSETTINGS_HDD_FORMAT_INFO1,
LOCALE_HDDSETTINGS_HDD_FORMAT_MESSAGE,
LOCALE_HDDSETTINGS_HDD_FORMATPARTITION,
LOCALE_HDDSETTINGS_HDD_FORMATPARTITION_INFO,
LOCALE_HDDSETTINGS_HDD_FORMATPARTITION_MESSAGE,
LOCALE_HDDSETTINGS_HDD_FREE,
LOCALE_HDDSETTINGS_HDD_FREEHOURS,
LOCALE_HDDSETTINGS_HDD_FS,
LOCALE_HDDSETTINGS_HDD_FS_EXT2,
LOCALE_HDDSETTINGS_HDD_FS_EXT3,
LOCALE_HDDSETTINGS_HDD_FS_XFS,
LOCALE_HDDSETTINGS_HDD_INFOS,
LOCALE_HDDSETTINGS_HDD_MODEL,
LOCALE_HDDSETTINGS_HDD_OFF,
LOCALE_HDDSETTINGS_HDD_PART1_INFO,
LOCALE_HDDSETTINGS_HDD_PART2_INFO,
LOCALE_HDDSETTINGS_HDD_PART3_INFO,
LOCALE_HDDSETTINGS_HDD_PART4_INFO,
LOCALE_HDDSETTINGS_HDD_SAVESETTINGS_MESSAGE,
LOCALE_HDDSETTINGS_HDD_SLEEP,
LOCALE_HDDSETTINGS_HDD_SLEEP_HELP,
LOCALE_HDDSETTINGS_HDD_SLEEP_STD,
LOCALE_HDDSETTINGS_HDD_SWITCH_HDD,
LOCALE_HDDSETTINGS_HDD_SWITCH_MMC,
LOCALE_HDDSETTINGS_HDD_TEMP,
LOCALE_HDDSETTINGS_HDD_TEMP_MESSAGE,
LOCALE_HDDSETTINGS_IDE,
LOCALE_HDDSETTINGS_IDE_IRQ6,
LOCALE_HDDSETTINGS_IDE_NFS,
LOCALE_HDDSETTINGS_IDE_OFF,
LOCALE_HDDSETTINGS_IDE_SAMBA,
LOCALE_HDDSETTINGS_IDE_STD,
LOCALE_HDDSETTINGS_IDE_SWAP,
LOCALE_HDDSETTINGS_IDE_SWAP_HELP,
LOCALE_HDDSETTINGS_IDE_SWAP_STD,
LOCALE_HDDSETTINGS_PARTITION_HDD_ACTIVE,
LOCALE_HDDSETTINGS_PARTITION_HDD_OFF,
LOCALE_HDDSETTINGS_PARTITION_HELP,
LOCALE_HDDSETTINGS_PARTITION_LINUX,
LOCALE_HDDSETTINGS_PARTITION_NONE,
LOCALE_HDDSETTINGS_PARTITION_STD,
LOCALE_HDDSETTINGS_PARTITION_SWAP,
LOCALE_HDDSETTINGS_PARTITION1,
LOCALE_HDDSETTINGS_PARTITION1_SIZE,
LOCALE_HDDSETTINGS_PARTITION2,
LOCALE_HDDSETTINGS_PARTITION2_SIZE,
LOCALE_HDDSETTINGS_PARTITION3,
LOCALE_HDDSETTINGS_PARTITION3_SIZE,
LOCALE_HDDSETTINGS_PARTITION4,
LOCALE_HDDSETTINGS_PARTITION4_SIZE,
LOCALE_HDDSETTINGS_TARGET,
LOCALE_HDDSETTINGS_TARGET_MASTER,
LOCALE_HDDSETTINGS_TARGET_SLAVE,

LOCALE_IMAGEINFO_CHIPSET,
apps/tuxbox/neutrino/src/system/locals_intern.h
"mainsettings.driver",
"mainsettings.hdd",
"mainsettings.head",

"gtxalpha.alpha2",
"hddsettings.advanced",
"hddsettings.hdd",
"hddsettings.hdd.active",
"hddsettings.hdd.cache",
"hddsettings.hdd.capacity",
"hddsettings.hdd.check",
"hddsettings.hdd.check.info",
"hddsettings.hdd.check.message",
"hddsettings.hdd.checkpartition",
"hddsettings.hdd.checkpartition.info",
"hddsettings.hdd.checkpartition.message",
"hddsettings.hdd.format",
"hddsettings.hdd.format.info",
"hddsettings.hdd.format.info1",
"hddsettings.hdd.format.message",
"hddsettings.hdd.formatpartition",
"hddsettings.hdd.formatpartition.info",
"hddsettings.hdd.formatpartition.message",
"hddsettings.hdd.free",
"hddsettings.hdd.freehours",
"hddsettings.hdd.fs",
"hddsettings.hdd.fs.ext2",
"hddsettings.hdd.fs.ext3",
"hddsettings.hdd.fs.xfs",
"hddsettings.hdd.infos",
"hddsettings.hdd.model",
"hddsettings.hdd.off",
"hddsettings.hdd.part1.info",
"hddsettings.hdd.part2.info",
"hddsettings.hdd.part3.info",
"hddsettings.hdd.part4.info",
"hddsettings.hdd.savesettings.message",
"hddsettings.hdd.sleep",
"hddsettings.hdd.sleep.help",
"hddsettings.hdd.sleep.std",
"hddsettings.hdd.switch.hdd",
"hddsettings.hdd.switch.mmc",
"hddsettings.hdd.temp",
"hddsettings.hdd.temp.message",
"hddsettings.ide",
"hddsettings.ide.irq6",
"hddsettings.ide.nfs",
"hddsettings.ide.off",
"hddsettings.ide.samba",
"hddsettings.ide.std",
"hddsettings.ide.swap",
"hddsettings.ide.swap.help",
"hddsettings.ide.swap.std",
"hddsettings.partition.hdd.active",
"hddsettings.partition.hdd.off",
"hddsettings.partition.help",
"hddsettings.partition.linux",
"hddsettings.partition.none",
"hddsettings.partition.std",
"hddsettings.partition.swap",
"hddsettings.partition1",
"hddsettings.partition1.size",
"hddsettings.partition2",
"hddsettings.partition2.size",
"hddsettings.partition3",
"hddsettings.partition3.size",
"hddsettings.partition4",
"hddsettings.partition4.size",
"hddsettings.target",
"hddsettings.target.master",
"hddsettings.target.slave",

"imageinfo.chipset",
make -C apps/tuxbox/neutrino/ clean
cd cdk
make neutrino
-me
Innuendo
Einsteiger
Einsteiger
Beiträge: 281
Registriert: Mittwoch 8. Dezember 2004, 21:45

Beitrag von Innuendo »

ich habe eine kleine korrektur gemacht

http://tuxbox-upload.wittnet.de//index. ... ory=Diffs&

bitte bei bereits eingerichteten hdds einmal ins menü gehen und einstellungen speichern auswählen. dadurch wird die config neu gespeichert.

ausserdem habe ich ins rar file meine scripte mit eingepackt. diese kommen nach /var/tuxbox/config. der eintrag für die rcS steht im kopf der cpp datei. da mich ein paar user gefragt haben: die mountpoints müssen selber erstellt werden. ohne mountpoints kann keine partittion bereitgestelllt werden. wie die benannt werden, ist jedem selbst überlassen. die scripte müssen entsprechend angepasst werden.

ich habe es für ein testimage folgendermaßen gemacht:

im cdk/makefile.am habe ich mir ein eigenes target erstellt:

Code: Alles auswählen

flash-neutrino-all: flash-neutrino ..... flash-innu .... flash-lib
ein eigenes target für den krams hat den vorteil, dass bei cvs änderungen seltener rejects auftreten. man kann es aber auch in ein vorhandenes mit einpacken.

Code: Alles auswählen

flash-innu: $(flashprefix)/.part_innu

$(flashprefix)/.part_innu: $(flashprefix)/.flash
	$(INSTALL) -d $(flashprefix)/root/mmc
	$(INSTALL) -d $(flashprefix)/root/hdd
	$(INSTALL) -d $(flashprefix)/root/hdd/filme
	$(INSTALL) -d $(flashprefix)/root/hdd/daten
	$(INSTALL) -d $(flashprefix)/root/hdd/bilder-mp3
	ln -sf /hdd $(flashprefix)/root/mnt/hdd
	ln -sf /hdd/filme $(flashprefix)/root/mnt/filme
	ln -sf /hdd/bilder-mp3 $(flashprefix)/root/mnt/bilder-mp3
	ln -sf /hdd/daten $(flashprefix)/root/mnt/daten
	ln -sf /mmc $(flashprefix)/root/mnt/mmc

	@touch $@
wer das neu einfügt sollte autogen und configure ausführen. gibt wahrscheinlich wieder schönere oder bessere lösungen.

innu

p.s.: bitte das alte hdd.zip im ulc löschen