XBMC Media Center

Revision: 30677
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30677&view=rev
Author:   jmarshallnz
Date:     2010-05-30 08:19:45 +0000 (Sun, 30 May 2010)

Log Message:
-----------
changed: AddonSettings - better parsing of options for file/folder browse

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 05:31:48 UTC (rev 30676)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:19:45 UTC (rev 30677)
@@ -28,6 +28,7 @@
 #include "GUIDialogOK.h"
 #include "GUIControlGroupList.h"
 #include "Util.h"
+#include "StringUtils.h"
 #include "MediaManager.h"
 #include "GUILabelControl.h"
 #include "GUIRadioButtonControl.h"
@@ -260,8 +261,10 @@
             bool bUseFileDirectories = false;
             if (option)
             {
-              bUseThumbs = (strcmpi(option, "usethumbs") == 0 || strcmpi(option, "usethumbs|treatasfolder") == 0);
-              bUseFileDirectories = (strcmpi(option, "treatasfolder") == 0 || strcmpi(option, "usethumbs|treatasfolder") == 0);
+              vector<CStdString> options;
+              StringUtils::SplitString(option, "|", options);
+              bUseThumbs = find(options.begin(), options.end(), "usethumbs") != options.end();
+              bUseFileDirectories = find(options.begin(), options.end(), "treatasfolder") != options.end();
             }
 
             if (CGUIDialogFileBrowser::ShowAndGetFile(*shares, strMask, ((CGUIButtonControl*) control)->GetLabel(), value))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 30678
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30678&view=rev
Author:   jmarshallnz
Date:     2010-05-30 08:23:42 +0000 (Sun, 30 May 2010)

Log Message:
-----------
changed: AddonSettings - rename types of browser (video/audio/image/executable) to bring into line with plugin categories, thanks to Nuka1195

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:19:45 UTC (rev 30677)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:23:42 UTC (rev 30678)
@@ -191,7 +191,7 @@
               CUtil::URLEncode(value);
           }
         }
-        else if (strcmp(type, "integer") == 0 && CGUIDialogNumeric::ShowAndGetNumber(value, ((CGUIButtonControl*) control)->GetLabel()))
+        else if (strcmp(type, "number") == 0 && CGUIDialogNumeric::ShowAndGetNumber(value, ((CGUIButtonControl*) control)->GetLabel()))
         {
           ((CGUIButtonControl*) control)->SetLabel2(value);
         }
@@ -199,9 +199,9 @@
         {
           ((CGUIButtonControl*) control)->SetLabel2(value);
         }
-        else if (strcmpi(type, "video") == 0 || strcmpi(type, "music") == 0 ||
-          strcmpi(type, "pictures") == 0 || strcmpi(type, "programs") == 0 ||
-          strcmpi(type, "folder") == 0 || strcmpi(type, "files") == 0)
+        else if (strcmpi(type, "audio") == 0 || strcmpi(type, "video") == 0 ||
+          strcmpi(type, "image") == 0 || strcmpi(type, "executable") == 0 ||
+          strcmpi(type, "file") == 0 || strcmpi(type, "folder") == 0)
         {
           // setup the shares
           VECSOURCES *shares = NULL;
@@ -231,7 +231,7 @@
             if (CGUIDialogFileBrowser::ShowAndGetDirectory(*shares, ((CGUIButtonControl*) control)->GetLabel(), value, bWriteOnly))
               ((CGUIButtonControl*) control)->SetLabel2(value);
           }
-          else if (strcmpi(type, "pictures") == 0)
+          else if (strcmpi(type, "image") == 0)
           {
             if (CGUIDialogFileBrowser::ShowAndGetImage(*shares, ((CGUIButtonControl*) control)->GetLabel(), value))
               ((CGUIButtonControl*) control)->SetLabel2(value);
@@ -246,9 +246,9 @@
             {
               if (strcmpi(type, "video") == 0)
                 strMask = g_settings.m_videoExtensions;
-              else if (strcmpi(type, "music") == 0)
+              else if (strcmpi(type, "audio") == 0)
                 strMask = g_settings.m_musicExtensions;
-              else if (strcmpi(type, "programs") == 0)
+              else if (strcmpi(type, "executable") == 0)
 #if defined(_WIN32_WINNT)
                 strMask = ".exe|.bat|.cmd|.py";
 #else
@@ -415,9 +415,9 @@
     if (type)
     {
       if (strcmpi(type, "text") == 0 || strcmpi(type, "ipaddress") == 0 ||
-        strcmpi(type, "integer") == 0 || strcmpi(type, "video") == 0 ||
-        strcmpi(type, "music") == 0 || strcmpi(type, "pictures") == 0 ||
-        strcmpi(type, "folder") == 0 || strcmpi(type, "programs") == 0 ||
+        strcmpi(type, "number") == 0 ||strcmpi(type, "video") == 0 ||
+        strcmpi(type, "audio") == 0 || strcmpi(type, "image") == 0 ||
+        strcmpi(type, "folder") == 0 || strcmpi(type, "executable") == 0 ||
         strcmpi(type, "files") == 0 || strcmpi(type, "action") == 0)
       {
         pControl = new CGUIButtonControl(*pOriginalButton);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 30679
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30679&view=rev
Author:   jmarshallnz
Date:     2010-05-30 08:24:28 +0000 (Sun, 30 May 2010)

Log Message:
-----------
changed: AddonSettings - use the "action" attribute for type="action" settings rather than "default", thanks to Nuka1195

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:23:42 UTC (rev 30678)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:24:28 UTC (rev 30679)
@@ -273,9 +273,10 @@
         }
         else if (strcmpi(type, "action") == 0)
         {
-          if (setting->Attribute("default"))
+          CStdString action = setting->Attribute("action");
+          if (!action.IsEmpty())
           {
-            CStdString action = setting->Attribute("default");
+            // replace $CWD with the url of plugin/script
             action.Replace("$CWD", m_addon->Path());
             if (option)
               bCloseDialog = (strcmpi(option, "close") == 0);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 30680
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30680&view=rev
Author:   jmarshallnz
Date:     2010-05-30 08:25:11 +0000 (Sun, 30 May 2010)

Log Message:
-----------
added: AddonSettings - $AUDIO, $VIDEO, $IMAGE, $EXECUTABLE replacements for built-in audio, video, image and executable extensions for the type="file" setting, thanks to Nuka1195

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:24:28 UTC (rev 30679)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:25:11 UTC (rev 30680)
@@ -241,7 +241,18 @@
             // set the proper mask
             CStdString strMask;
             if (setting->Attribute("mask"))
+            {
               strMask = setting->Attribute("mask");
+              // convert mask qualifiers
+              strMask.Replace("$AUDIO", g_settings.m_musicExtensions);
+              strMask.Replace("$VIDEO", g_settings.m_videoExtensions);
+              strMask.Replace("$IMAGE", g_settings.m_pictureExtensions);
+#if defined(_WIN32_WINNT)
+              strMask.Replace("$EXECUTABLE", ".exe|.bat|.cmd|.py");
+#else
+              strMask.Replace("$EXECUTABLE", "");
+#endif
+            }
             else
             {
               if (strcmpi(type, "video") == 0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 30682
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30682&view=rev
Author:   jmarshallnz
Date:     2010-05-30 08:26:21 +0000 (Sun, 30 May 2010)

Log Message:
-----------
cleanup: AddonSettings - cleaned up value setting/getting

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:25:47 UTC (rev 30681)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:26:21 UTC (rev 30682)
@@ -328,10 +328,7 @@
       switch (control->GetControlType())
       {
         case CGUIControl::GUICONTROL_BUTTON:
-          if (strcmpi(type, "folder") == 0)
-            value.Format("%s", ((CGUIButtonControl*) control)->GetLabel2().c_str());	  
-          else  
-            value = m_buttonValues[id];
+          value = m_buttonValues[id];
           break;
         case CGUIControl::GUICONTROL_RADIO:
           value = ((CGUIRadioButtonControl*) control)->IsSelected() ? "true" : "false";
@@ -702,9 +699,11 @@
       {
         case CGUIControl::GUICONTROL_BUTTON:
           if (setting->Attribute("default") && setting->Attribute("id"))
-            ((CGUIButtonControl*) control)->SetLabel2(setting->Attribute("default"));
-          else
-            ((CGUIButtonControl*) control)->SetLabel2("");
+          {
+            CStdString value = setting->Attribute("default");
+            m_buttonValues[setting->Attribute("id")] = value;
+            ((CGUIButtonControl*) control)->SetLabel2(value);
+          }
           break;
         case CGUIControl::GUICONTROL_RADIO:
           if (setting->Attribute("default"))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 30683
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30683&view=rev
Author:   jmarshallnz
Date:     2010-05-30 08:26:59 +0000 (Sun, 30 May 2010)

Log Message:
-----------
added: AddonSettings - "date" and "time" settings to addon settings, thanks to Nuka1195

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:26:21 UTC (rev 30682)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:26:59 UTC (rev 30683)
@@ -295,6 +295,35 @@
             g_application.getApplicationMessenger().ExecBuiltIn(action);
           }
         }
+        else if (strcmp(type, "date") == 0)
+        {
+          CDateTime date;
+          if (!value.IsEmpty())
+            date.SetFromDBDate(value);
+          SYSTEMTIME timedate;
+          date.GetAsSystemTime(timedate);
+          if(CGUIDialogNumeric::ShowAndGetDate(timedate, label))
+          {
+            date = timedate;
+            value = date.GetAsDBDate();
+            ((CGUIButtonControl*) control)->SetLabel2(value);
+          }
+        }
+        else if (strcmp(type, "time") == 0)
+        {
+          SYSTEMTIME timedate;
+          if (!value.IsEmpty())
+          {
+            // assumes HH:MM
+            timedate.wHour = atoi(value.Left(2));
+            timedate.wMinute = atoi(value.Right(2));
+          }
+          if (CGUIDialogNumeric::ShowAndGetTime(timedate, label))
+          {
+            value.Format("%02d:%02d", timedate.wHour, timedate.wMinute);
+            ((CGUIButtonControl*) control)->SetLabel2(value);
+          }
+        }
         m_buttonValues[id] = value;
         break;
       }
@@ -419,7 +448,8 @@
         strcmpi(type, "number") == 0 ||strcmpi(type, "video") == 0 ||
         strcmpi(type, "audio") == 0 || strcmpi(type, "image") == 0 ||
         strcmpi(type, "folder") == 0 || strcmpi(type, "executable") == 0 ||
-        strcmpi(type, "files") == 0 || strcmpi(type, "action") == 0)
+        strcmpi(type, "files") == 0 || strcmpi(type, "action") == 0 ||
+        strcmpi(type, "date") == 0 || strcmpi(type, "time") == 0)
       {
         pControl = new CGUIButtonControl(*pOriginalButton);
         if (!pControl) return;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 30685
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30685&view=rev
Author:   jmarshallnz
Date:     2010-05-30 08:28:27 +0000 (Sun, 30 May 2010)

Log Message:
-----------
changed: AddonSettings - make the label control for lsep non-optional

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:27:49 UTC (rev 30684)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:28:27 UTC (rev 30685)
@@ -349,35 +349,30 @@
     if (setting->Attribute("id"))
       id = setting->Attribute("id");
     const char *type = setting->Attribute("type");
+    const CGUIControl* control = GetControl(controlId);
 
-    // skip type "lsep", it is not a required control
-    if (strcmpi(type, "lsep") != 0)
+    CStdString value;
+    switch (control->GetControlType())
     {
-      const CGUIControl* control = GetControl(controlId);
-
-      CStdString value;
-      switch (control->GetControlType())
-      {
-        case CGUIControl::GUICONTROL_BUTTON:
-          value = m_buttonValues[id];
-          break;
-        case CGUIControl::GUICONTROL_RADIO:
-          value = ((CGUIRadioButtonControl*) control)->IsSelected() ? "true" : "false";
-          break;
-        case CGUIControl::GUICONTROL_SPINEX:
-          if (strcmpi(type, "fileenum") == 0 || strcmpi(type, "labelenum") == 0)
-            value = ((CGUISpinControlEx*) control)->GetLabel();
-          else
-            value.Format("%i", ((CGUISpinControlEx*) control)->GetValue());
-          break;
-        case CGUIControl::GUICONTROL_SETTINGS_SLIDER:
-          value.Format("%f", ((CGUISettingsSliderControl *)control)->GetFloatValue());
-          break;
-        default:
-          break;
-      }
-      m_addon->UpdateSetting(id, value, type);
+      case CGUIControl::GUICONTROL_BUTTON:
+        value = m_buttonValues[id];
+        break;
+      case CGUIControl::GUICONTROL_RADIO:
+        value = ((CGUIRadioButtonControl*) control)->IsSelected() ? "true" : "false";
+        break;
+      case CGUIControl::GUICONTROL_SPINEX:
+        if (strcmpi(type, "fileenum") == 0 || strcmpi(type, "labelenum") == 0)
+          value = ((CGUISpinControlEx*) control)->GetLabel();
+        else
+          value.Format("%i", ((CGUISpinControlEx*) control)->GetValue());
+        break;
+      case CGUIControl::GUICONTROL_SETTINGS_SLIDER:
+        value.Format("%f", ((CGUISettingsSliderControl *)control)->GetFloatValue());
+        break;
+      default:
+        break;
     }
+    m_addon->UpdateSetting(id, value, type);
     setting = setting->NextSiblingElement("setting");
     controlId++;
   }
@@ -405,15 +400,14 @@
   CGUISettingsSliderControl *pOriginalSlider = (CGUISettingsSliderControl *)GetControl(CONTROL_DEFAULT_SLIDER);
 
   if (!m_addon || !pOriginalSpin || !pOriginalRadioButton || !pOriginalButton || !pOriginalImage
-               || !pOriginalSlider)
+               || !pOriginalLabel || !pOriginalSlider)
     return;
 
   pOriginalSpin->SetVisible(false);
   pOriginalRadioButton->SetVisible(false);
   pOriginalButton->SetVisible(false);
   pOriginalImage->SetVisible(false);
-  if (pOriginalLabel)
-    pOriginalLabel->SetVisible(false);
+  pOriginalLabel->SetVisible(false);
   pOriginalSlider->SetVisible(false);
 
   // clear the category group
@@ -589,13 +583,13 @@
         ((CGUISettingsSliderControl *)pControl)->SetFloatInterval(fInc);
         ((CGUISettingsSliderControl *)pControl)->SetFloatValue((float)atof(m_addon->GetSetting(id)));
       }
-      else if (strcmpi(type, "lsep") == 0 && pOriginalLabel)
+      else if (strcmpi(type, "lsep") == 0)
       {
         pControl = new CGUILabelControl(*pOriginalLabel);
         if (pControl)
           ((CGUILabelControl *)pControl)->SetLabel(label);
       }
-      else if ((strcmpi(type, "sep") == 0 || strcmpi(type, "lsep") == 0) && pOriginalImage)
+      else if (strcmpi(type, "sep") == 0)
         pControl = new CGUIImage(*pOriginalImage);
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 30686
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30686&view=rev
Author:   jmarshallnz
Date:     2010-05-30 08:29:00 +0000 (Sun, 30 May 2010)

Log Message:
-----------
changed: AddonSettings - allow fileenum to include $PROFILE and clean up the code a little, thanks to Nuka1195

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:28:27 UTC (rev 30685)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:29:00 UTC (rev 30686)
@@ -418,9 +418,6 @@
   // set our dialog heading
   SET_CONTROL_LABEL(CONTROL_HEADING_LABEL, m_strHeading);
 
-  // Create our base path, used for type "fileenum" settings
-  CStdString basepath(m_addon->Path());
-
   CGUIControl* pControl = NULL;
   int controlId = CONTROL_START_CONTROL;
   const TiXmlElement *setting = m_addon->GetSettingsXML()->FirstChildElement("setting");
@@ -530,17 +527,22 @@
         if (!pControl) return;
         ((CGUISpinControlEx *)pControl)->SetText(label);
 
-        //find Folders...
+        // Create our base path, used for type "fileenum" settings
+        // replace $PROFILE with the profile path of the plugin/script
+        if (values.Find("$PROFILE") >=0)
+          values.Replace("$PROFILE", m_addon->Profile());
+        else
+          values = CUtil::AddFileToFolder(m_addon->Path(), values);
+
+        // fetch directory
         CFileItemList items;
-        CStdString enumpath;
-        CUtil::AddFileToFolder(basepath, values, enumpath);
         CStdString mask;
         if (setting->Attribute("mask"))
           mask = setting->Attribute("mask");
         if (!mask.IsEmpty())
-          CDirectory::GetDirectory(enumpath, items, mask);
+          CDirectory::GetDirectory(values, items, mask);
         else
-          CDirectory::GetDirectory(enumpath, items);
+          CDirectory::GetDirectory(values, items);
 
         int iItem = 0;
         for (int i = 0; i < items.Size(); ++i)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 30688
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30688&view=rev
Author:   jmarshallnz
Date:     2010-05-30 08:30:23 +0000 (Sun, 30 May 2010)

Log Message:
-----------
changed: AddonSettings - allow value in enum to be used in conditionals, thanks to Nuka1195

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:29:44 UTC (rev 30687)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:30:23 UTC (rev 30688)
@@ -535,6 +535,7 @@
         pControl = new CGUISpinControlEx(*pOriginalSpin);
         if (!pControl) return;
         ((CGUISpinControlEx *)pControl)->SetText(label);
+        ((CGUISpinControlEx *)pControl)->SetFloatValue(1.0f);
 
         // Create our base path, used for type "fileenum" settings
         // replace $PROFILE with the profile path of the plugin/script
@@ -679,7 +680,10 @@
         value = ((CGUIRadioButtonControl*) control2)->IsSelected() ? "true" : "false";
         break;
       case CGUIControl::GUICONTROL_SPINEX:
-        value.Format("%i", ((CGUISpinControlEx*) control2)->GetValue());
+        if (((CGUISpinControlEx*) control2)->GetFloatValue() > 0.0f)
+          value = ((CGUISpinControlEx*) control2)->GetLabel();
+        else
+          value.Format("%i", ((CGUISpinControlEx*) control2)->GetValue());
         break;
       default:
         break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 30689
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30689&view=rev
Author:   jmarshallnz
Date:     2010-05-30 08:31:01 +0000 (Sun, 30 May 2010)

Log Message:
-----------
changed: AddonSettings - save settings if we're closing the settings dialog after launching an action, thanks to Nuka1195

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:30:23 UTC (rev 30688)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-30 08:31:01 UTC (rev 30689)
@@ -78,19 +78,18 @@
       int iControl = message.GetSenderId();
       bool bCloseDialog = false;
 
-      if (iControl == ID_BUTTON_OK)
-      {
-        SaveSettings();
-        Close();
-        return true;
-      }
-      else if (iControl == ID_BUTTON_DEFAULT)
+      if (iControl == ID_BUTTON_DEFAULT)
         SetDefaults();
-      else
+      else if (iControl != ID_BUTTON_OK)
         bCloseDialog = ShowVirtualKeyboard(iControl);
 
-      if (iControl == ID_BUTTON_CANCEL || bCloseDialog)
+      if (iControl == ID_BUTTON_OK || iControl == ID_BUTTON_CANCEL || bCloseDialog)
       {
+        if (iControl == ID_BUTTON_OK || bCloseDialog)
+        {
+          m_bConfirmed = true;
+          SaveSettings();
+        }
         Close();
         return true;
       }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 30705
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30705&view=rev
Author:   jmarshallnz
Date:     2010-05-31 04:38:48 +0000 (Mon, 31 May 2010)

Log Message:
-----------
fixed: Hide the default category button in addon settings.

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-31 04:00:05 UTC (rev 30704)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-05-31 04:38:48 UTC (rev 30705)
@@ -447,6 +447,9 @@
   if (!m_addon)
     return;
 
+  if (originalButton)
+    originalButton->SetVisible(false);
+
   // clear the category group
   FreeSections();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31119
          http://xbmc.svn.sourceforge.net/xbmc/?rev=31119&view=rev
Author:   jmarshallnz
Date:     2010-06-16 01:57:30 +0000 (Wed, 16 Jun 2010)

Log Message:
-----------
changed: files->file for consistency in settings, thanks to Nuka1195.

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-06-16 01:13:48 UTC (rev 31118)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-06-16 01:57:30 UTC (rev 31119)
@@ -545,7 +545,7 @@
         strcmpi(type, "number") == 0 ||strcmpi(type, "video") == 0 ||
         strcmpi(type, "audio") == 0 || strcmpi(type, "image") == 0 ||
         strcmpi(type, "folder") == 0 || strcmpi(type, "executable") == 0 ||
-        strcmpi(type, "files") == 0 || strcmpi(type, "action") == 0 ||
+        strcmpi(type, "file") == 0 || strcmpi(type, "action") == 0 ||
         strcmpi(type, "date") == 0 || strcmpi(type, "time") == 0)
       {
         pControl = new CGUIButtonControl(*pOriginalButton);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31793
          http://xbmc.svn.sourceforge.net/xbmc/?rev=31793&view=rev
Author:   jmarshallnz
Date:     2010-07-14 07:24:51 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
added: Translation of $ID to addon settings - useful for RunScript actions

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-07-14 07:21:21 UTC (rev 31792)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-07-14 07:24:51 UTC (rev 31793)
@@ -359,6 +359,7 @@
           {
             // replace $CWD with the url of plugin/script
             action.Replace("$CWD", m_addon->Path());
+            action.Replace("$ID", m_addon->ID());
             if (option)
               bCloseDialog = (strcmpi(option, "close") == 0);
             g_application.getApplicationMessenger().ExecBuiltIn(action);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 31794
          http://xbmc.svn.sourceforge.net/xbmc/?rev=31794&view=rev
Author:   jmarshallnz
Date:     2010-07-14 07:25:23 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
changed: Set label2 even if no id exists for settings - useful for information based settings that don't need saving, thanks to Nuka1195

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-07-14 07:24:51 UTC (rev 31793)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-07-14 07:25:23 UTC (rev 31794)
@@ -614,6 +614,8 @@
           else
             ((CGUIButtonControl *)pControl)->SetLabel2(value);
         }
+        else
+          ((CGUIButtonControl *)pControl)->SetLabel2(setting->Attribute("default"));
       }
       else if (strcmpi(type, "bool") == 0)
       {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 33242
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33242&view=rev
Author:   jmarshallnz
Date:     2010-08-28 00:43:34 +0000 (Sat, 28 Aug 2010)

Log Message:
-----------
fixed: $HOURS was incorrect.  Thanks to Nuka1195 (part of #9918)

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-08-28 00:32:34 UTC (rev 33241)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-08-28 00:43:34 UTC (rev 33242)
@@ -639,7 +639,7 @@
         {
           for (unsigned int i = 0; i < 24; i++)
           {
-            CDateTime time(0, 0, 0, i, 0, 0);
+            CDateTime time(2000, 1, 1, i, 0, 0);
             valuesVec.push_back(g_infoManager.LocalizeTime(time, TIME_FORMAT_HH_MM_XX));
           }
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 33923
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33923&view=rev
Author:   vdrfan
Date:     2010-09-17 10:41:13 +0000 (Fri, 17 Sep 2010)

Log Message:
-----------
fixed: crash while parsing invalid addon settings (credits spiff)

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-09-17 08:54:10 UTC (rev 33922)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-09-17 10:41:13 UTC (rev 33923)
@@ -928,9 +928,9 @@
       {
         if (value)
           m_settings[id] = value;
-        else if (0 == strcmpi(type, "bool"))
+        else if (type && 0 == strcmpi(type, "bool"))
           m_settings[id] = "false";
-        else if (0 == strcmpi(type, "slider") || 0 == strcmpi(type, "enum"))
+        else if (type && (0 == strcmpi(type, "slider") || 0 == strcmpi(type, "enum")))
           m_settings[id] = "0";
         else
           m_settings[id] = "";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 34878
          http://xbmc.svn.sourceforge.net/xbmc/?rev=34878&view=rev
Author:   vdrfan
Date:     2010-10-20 15:11:45 +0000 (Wed, 20 Oct 2010)

Log Message:
-----------
fixed: #10553 - crash on addon configure

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-10-20 14:49:35 UTC (rev 34877)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-10-20 15:11:45 UTC (rev 34878)
@@ -575,6 +575,9 @@
     CStdString entries;
     if (setting->Attribute("entries"))
       entries = setting->Attribute("entries");
+    CStdString defaultValue;
+    if (setting->Attribute("default"))
+      defaultValue= setting->Attribute("default");
     const char *subsetting = setting->Attribute("subsetting");
     CStdString label = GetString(setting->Attribute("label"), subsetting && 0 == strcmpi(subsetting, "true"));
 
@@ -615,7 +618,7 @@
             ((CGUIButtonControl *)pControl)->SetLabel2(value);
         }
         else
-          ((CGUIButtonControl *)pControl)->SetLabel2(setting->Attribute("default"));
+          ((CGUIButtonControl *)pControl)->SetLabel2(defaultValue);
       }
       else if (strcmpi(type, "bool") == 0)
       {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35056
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35056&view=rev
Author:   spiff_
Date:     2010-10-28 15:47:13 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
changed: always include local drives in add-on settings folder browse dialogs

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-10-28 15:46:11 UTC (rev 35055)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-10-28 15:47:13 UTC (rev 35056)
@@ -288,8 +288,12 @@
             if (!source || strcmpi(source, "local") != 0)
               g_mediaManager.GetNetworkLocations(networkShares);
             localShares.insert(localShares.end(), networkShares.begin(), networkShares.end());
-            shares = &localShares;
           }
+          else // always append local drives
+          {
+            localShares = *shares;
+            g_mediaManager.GetLocalDrives(localShares);
+          }
 
           if (strcmpi(type, "folder") == 0)
           {
@@ -298,12 +302,12 @@
             if (option)
               bWriteOnly = (strcmpi(option, "writeable") == 0);
 
-            if (CGUIDialogFileBrowser::ShowAndGetDirectory(*shares, label, value, bWriteOnly))
+            if (CGUIDialogFileBrowser::ShowAndGetDirectory(localShares, label, value, bWriteOnly))
               ((CGUIButtonControl*) control)->SetLabel2(value);
           }
           else if (strcmpi(type, "image") == 0)
           {
-            if (CGUIDialogFileBrowser::ShowAndGetImage(*shares, label, value))
+            if (CGUIDialogFileBrowser::ShowAndGetImage(localShares, label, value))
               ((CGUIButtonControl*) control)->SetLabel2(value);
           }
           else
@@ -348,7 +352,7 @@
               bUseFileDirectories = find(options.begin(), options.end(), "treatasfolder") != options.end();
             }
 
-            if (CGUIDialogFileBrowser::ShowAndGetFile(*shares, strMask, label, value))
+            if (CGUIDialogFileBrowser::ShowAndGetFile(localShares, strMask, label, value))
               ((CGUIButtonControl*) control)->SetLabel2(value);
           }
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 35536
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35536&view=rev
Author:   jmarshallnz
Date:     2010-11-30 02:55:21 +0000 (Tue, 30 Nov 2010)

Log Message:
-----------
fixed: #10781 - Disallow more than 100 settings per category from addons.

Modified Paths:
--------------
    trunk/xbmc/GUIDialogAddonSettings.cpp

Modified: trunk/xbmc/GUIDialogAddonSettings.cpp
===================================================================
--- trunk/xbmc/GUIDialogAddonSettings.cpp	2010-11-30 02:14:14 UTC (rev 35535)
+++ trunk/xbmc/GUIDialogAddonSettings.cpp	2010-11-30 02:55:21 UTC (rev 35536)
@@ -45,6 +45,7 @@
 #include "Settings.h"
 #include "GUIInfoManager.h"
 #include "GUIDialogSelect.h"
+#include "utils/log.h"
 
 using namespace std;
 using namespace ADDON;
@@ -746,6 +747,11 @@
 
     setting = setting->NextSiblingElement("setting");
     controlId++;
+    if (controlId >= CONTROL_START_SECTION)
+    {
+      CLog::Log(LOGERROR, "%s - cannot have more than %d controls per category - simplify your addon!", __FUNCTION__, CONTROL_START_SECTION - CONTROL_START_SETTING);
+      break;
+    }
   }
   EnableControls();
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.