PDA

View Full Version : [diff] new IDE menu



pt-1
08-04-2007, 10:20 AM
Now supports up to 4 partitions (1st one is swap 128MB)

and the 3 others can each have a different filesystem

http://innuendo.s4.gmc.to/hdd_menu.JPG

-->diff<-- (http://innuendo.s4.gmc.to/hdd.rar)

Speedy2206
08-04-2007, 02:03 PM
@pt-1,
Does the author of this menu ever release true diffs or just the .cpp and .h files? I'm after the locals.h, locals_intern.h and settings.h files which are all required to enable this to work proprely. Last time I had to go through the entire cpp file, manually add the LOCALE bits to both locals.h and locals_intern.h, and then GUESS the types of the variables that should be in settings.h. It would help alot if you could obtain those 3 files from the author :)

nitr8
08-04-2007, 02:06 PM
i started doing that but cant be assed.

speedy can u jump online please?

--me

Speedy2206
08-04-2007, 05:47 PM
3 hours and 40 minutes later I have FINALLY managed to do some PROPER diffs for this. Its been driving me ******* mad so I hope its of use to someone!!

- Rewritten into full english
- Tidied up
- FIXED ide_setup.cpp

Some info:
1. If you have already incorporated the old IDE menu into your image then dont bother trying to replace it with this one - its slightly buggier and it would be quicker to just add this to a fresh compile.

2. I highly doubt that this will work with UKCVS diffs. You'll need to do the manual edit to Makefile.am and neutrino.cpp as with the old version if you want everything to work well together.

3. The authors "latest" screenshot is wrong and doesnt tally up
4. The authors "ide_setup.cpp" was partially broken.
5. The authors locale file was completely messed up.
6. I'm stressed :(

But enjoy this anyway and if you use it then let us know.

pt-1
09-04-2007, 10:08 AM
http://innuendo.s4.gmc.to/ehdd.JPG

He added some more features to the Enhanced menu ;-)

@Speedy

THX for the work and maybe you have a chance to post your diffs here:
dbox2 / linux :: Thema anzeigen - Entwurf: IDE Men? (http://tuxbox-forum.dreambox-fan.de/forum/viewtopic.php?p=329705#329705)

I am still out and about and only back in the uk at the end of the week

pt-1
12-04-2007, 05:28 PM
Latest file is now -->here<-- (http://innuendo.s4.gmc.to/hdd.rar)

Speedy2206
12-04-2007, 05:37 PM
Latest file is now -->here<-- (http://innuendo.s4.gmc.to/hdd.rar)

Are there any enhancements or new features in this version? ;)

nitr8
12-04-2007, 05:50 PM
speedy also a lot of fixes :)

-me

pt-1
12-04-2007, 09:34 PM
looks like dbt done the work already

To view links or images in this forum your post count must be 1 or greater. You currently have 0 posts. patches:

data/locale/deutsch.locale
data/locale/english.locale
src/neutrino.cpp
src/gui/Makefile.am
src/system/locals.h
src/system/locals_intern.h


copy th diff into apps/tuxbox/neutrino

patch -p1 < hddmenu_2007-04-12_21-19.diff

copy ide_setup.cpp, ide_setup.h from innus Paket into src/gui

Some answer from Inno
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_GENER AL , 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(GenericMenuSepara tor);
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

bobsylas
13-04-2007, 12:37 AM
Doesnt work for me :sad:

pt-1
13-04-2007, 07:43 AM
A bit more details please ..

did you do this
copy ide_setup.cpp, ide_setup.h from innus Paket into src/gui
?

http://innuendo.s4.gmc.to/hdd.rar

nitr8
13-04-2007, 08:29 AM
Doesnt work for me :sad:

works fine!

--me

pt-1
13-04-2007, 09:01 AM
As Inno's original Link made Problems:

To view links or images in this forum your post count must be 1 or greater. You currently have 0 posts. or in zip (as my Ubuntu did not like the rar)

To view links or images in this forum your post count must be 1 or greater. You currently have 0 posts. use the 2 files included in the Archive here:

tuxbox-cvs/apps/tuxbox/neutrino/src/gui


Complete original files:
To view links or images in this forum your post count must be 1 or greater. You currently have 0 posts. or http://www.njlworld.com/~pt1/hdd/hdd_komplett.zip

bobsylas
13-04-2007, 12:20 PM
A bit more details please ..
did you do this
?
http://innuendo.s4.gmc.to/hdd.rar

Sorry m8
I coppied the ide_setup.cpp & ide_setup.h to src/gui
when I apply the diff I get errors
also coppied locals_intern.h & locals.h to src/system


ubuntu@ubuntu:~/tuxbox-cvs/apps/tuxbox/neutrino$ patch -p1 < hddmenu_2007-04-12_21-19.diff
(Stripping trailing CRs from patch.)
patching file data/locale/deutsch.locale
(Stripping trailing CRs from patch.)
patching file data/locale/english.locale
(Stripping trailing CRs from patch.)
patching file src/neutrino.cpp
(Stripping trailing CRs from patch.)
patching file src/gui/Makefile.am
(Stripping trailing CRs from patch.)
patching file src/system/locals.h
Hunk #1 FAILED at 435.
Hunk #2 FAILED at 619.
2 out of 2 hunks FAILED -- saving rejects to file src/system/locals.h.rej
(Stripping trailing CRs from patch.)
patching file src/system/locals_intern.h
Hunk #1 FAILED at 435.
Hunk #2 FAILED at 619.
2 out of 2 hunks FAILED -- saving rejects to file src/system/locals_intern.h.rejubuntu@ubuntu:~/tuxbox-cvs/apps/tuxbox/neutrino$

nitr8
13-04-2007, 12:55 PM
don't bother with these diff's they missing stuff anyways see this:
http://world-of-digital.com/forums/f139/ide-knobs-15244.html#post84000

--me