* Add setup option to hide main menu entry (Thanks to Alf Fahland, for summit a patch)

* Fix some compiler warnings
* Remove pregenerated header from i18n files and set proper owner, if known

1 files changed, 8 insertions, 0 deletions

diff --git a/setup-image.c b/setup-image.c
index 5d6cae2..5f1f7d0 100644
--- a/setup-image.c
+++ b/setup-image.c
@@ -59,6 +59,8 @@ cImageSetup::cImageSetup(void)
 
   m_nBorderHeight = 16;
   m_nBorderWidth = 16;
+  
+  m_bHideMenu = false;
 }
 
 #define ParseInteger(szTitle,nValue,nMin,nMax) \
@@ -80,6 +82,7 @@ bool cImageSetup::SetupParse(const char *szName, const char *szValue)
   else ParseInteger("ShowNumbers",   m_bShowNumbers,0,1)
   else ParseInteger("LiveAudio",     m_bLiveAudio,0,1)
   else ParseInteger("Housekeeping",  m_bHousekeeping,0,1)
+  else ParseInteger("HideMainMenu",  m_bHideMenu,0,1)
   else if(!strcasecmp(szName, "TempDir")) {
         strn0cpy(m_szTempDir,szValue,sizeof(m_szTempDir));
   }
@@ -100,6 +103,7 @@ void cMenuSetupImage::Store(void)
   SetupStore("Housekeeping",            ImageSetup.m_bHousekeeping);
   SetupStore("BorderHeight",            ImageSetup.m_nBorderHeight);
   SetupStore("BorderWidth",             ImageSetup.m_nBorderWidth);
+  SetupStore("HideMainMenu",            ImageSetup.m_bHideMenu);
 }
 
 cMenuSetupImage::cMenuSetupImage(void)
@@ -107,6 +111,10 @@ cMenuSetupImage::cMenuSetupImage(void)
 {
   SetSection(tr("Image"));
 
+  Add(new cMenuEditBoolItem(tr("Hide main menu entry"),                    
+          &m_tmpSetup.m_bHideMenu,    
+          tr("no"), tr("yes")));
+
   Add(new cMenuEditBoolItem(tr("Slide show"),                    
         &m_tmpSetup.m_bSlideShow,    
         tr("no"), tr("yes")));