Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4436] trunk/plugins/VeraControl
|
From: <Ba...@us...> - 2012-02-02 20:07:18
|
Revision: 4436
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4436&view=rev
Author: BartEv
Date: 2012-02-02 20:07:07 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
version 0.9.0.3
- Show device status of selected item also on main screen,
- Added the ability to show devices automatically when selecting a new room (= extra config option)
- bug fix: wrong scene dialog was shown in DefautWide skin
Modified Paths:
--------------
trunk/plugins/VeraControl/DeviceSystem.cs
trunk/plugins/VeraControl/DialogDeviceControl.cs
trunk/plugins/VeraControl/DialogSceneControl.cs
trunk/plugins/VeraControl/VeraCommunication.cs
trunk/plugins/VeraControl/VeraControl.cs
trunk/plugins/VeraControl/VeraSetupForm.Designer.cs
trunk/plugins/VeraControl/VeraSetupForm.cs
trunk/plugins/VeraControl/releases/VeraControl.xmp2
trunk/plugins/VeraControl/releases/update.xml
trunk/plugins/VeraControl/skin/Default/VeraControl.xml
trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml
Added Paths:
-----------
trunk/plugins/VeraControl/releases/VeraControl_v0.9.0.3.mpe1
Modified: trunk/plugins/VeraControl/DeviceSystem.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceSystem.cs 2012-02-02 11:43:11 UTC (rev 4435)
+++ trunk/plugins/VeraControl/DeviceSystem.cs 2012-02-02 20:07:07 UTC (rev 4436)
@@ -80,6 +80,14 @@
{
_fullReload = true;
}
+
+ public bool FullReloadWaitingAndClearFlag()
+ {
+ // Invoking this method will clear the update ready flag -> so caller need to handle the update
+ bool b = fullReload;
+ ClearFullReloadFlag();
+ return b;
+ }
public bool fullReload
{
get { return _fullReload; }
Modified: trunk/plugins/VeraControl/DialogDeviceControl.cs
===================================================================
--- trunk/plugins/VeraControl/DialogDeviceControl.cs 2012-02-02 11:43:11 UTC (rev 4435)
+++ trunk/plugins/VeraControl/DialogDeviceControl.cs 2012-02-02 20:07:07 UTC (rev 4436)
@@ -77,14 +77,16 @@
return Load(GUIGraphicsContext.Skin + @"\VeraDialogDeviceControl.xml");
}
- public void InitDialog(string headerText, DeviceGeneric dev)
+ public void ShowDialog(string headerText, DeviceGeneric dev)
{
+ Reset();
//LoadSkin();
AllocResources();
InitControls();
_lblHeading.Label = headerText;
_myDev = dev;
+
//Clean up the old camUpdateThread (if not finished yet)
if (_camUpdater != null)
{
@@ -121,6 +123,7 @@
_imgLogo.Visibility = System.Windows.Visibility.Hidden;
StartCamImageUpdater(((DeviceCam)dev).imgUrl);
}
+ DoModal(GUIWindowManager.ActiveWindow);
}
public void UpdateStatus()
Modified: trunk/plugins/VeraControl/DialogSceneControl.cs
===================================================================
--- trunk/plugins/VeraControl/DialogSceneControl.cs 2012-02-02 11:43:11 UTC (rev 4435)
+++ trunk/plugins/VeraControl/DialogSceneControl.cs 2012-02-02 20:07:07 UTC (rev 4436)
@@ -51,8 +51,9 @@
return Load(GUIGraphicsContext.Skin + @"\VeraDialogSceneControl.xml");
}
- public void InitDialog(string headerText, Scene scene)
+ public void ShowDialog(string headerText, Scene scene)
{
+ Reset();
//LoadSkin();
AllocResources();
InitControls();
@@ -61,6 +62,7 @@
_myScene = scene;
UpdateStatus();
+ DoModal(GUIWindowManager.ActiveWindow);
}
public void UpdateStatus()
Modified: trunk/plugins/VeraControl/VeraCommunication.cs
===================================================================
--- trunk/plugins/VeraControl/VeraCommunication.cs 2012-02-02 11:43:11 UTC (rev 4435)
+++ trunk/plugins/VeraControl/VeraCommunication.cs 2012-02-02 20:07:07 UTC (rev 4436)
@@ -360,11 +360,11 @@
else
{
ParseUpdateInfo(e.Result);
- // WebClient wc = new WebClient();
- // if (_status.system.dataversion == "0")
- // {
- //ParseUpdateInfo( wc.DownloadString(@"C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\testdata\text.xml"));
- // }
+// WebClient wc = new WebClient();
+// if (_status.system.dataversion == "0")
+// {
+// ParseUpdateInfo( wc.DownloadString(@"C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\testdata\text.xml"));
+// }
}
}
@@ -407,6 +407,7 @@
{
// We have a full refresh -> Clear all lists (to get clear of removed devices/scenes/catgories/rooms/etc...)
_status.ClearAllLists();
+
}
// Process Sections
@@ -568,7 +569,6 @@
_status.devices.Add(new DeviceSprinkler(xn));
break;
}
- /* Falltrough */
_status.devices.Add(new DeviceGeneric(xn));
break;
}
Modified: trunk/plugins/VeraControl/VeraControl.cs
===================================================================
--- trunk/plugins/VeraControl/VeraControl.cs 2012-02-02 11:43:11 UTC (rev 4435)
+++ trunk/plugins/VeraControl/VeraControl.cs 2012-02-02 20:07:07 UTC (rev 4436)
@@ -81,30 +81,34 @@
/// </summary>
public class VeraControl : GUIInternalWindow, ISetupForm
{
- [SkinControlAttribute(10)] protected GUILabelControl _title = null;
- [SkinControl(20)] protected GUISpinButton _catList = null;
- [SkinControl(40)] protected GUIListControl _leftList = null;
- [SkinControl(50)] protected GUIListControl _rightList = null;
- [SkinControl(60)] protected GUIButtonControl _actionButton = null;
- [SkinControl(70)] protected GUIToggleButtonControl _actionTriggerButton = null;
+ [SkinControlAttribute(10)] protected GUILabelControl _title = null;
+ [SkinControl(20)] protected GUISpinButton _catList = null;
+ [SkinControl(40)] protected GUIListControl _leftList = null;
+ [SkinControl(50)] protected GUIListControl _rightList = null;
+ [SkinControl(60)] protected GUIButtonControl _actionButton = null;
+ [SkinControl(70)] protected GUIToggleButtonControl _actionTriggerButton = null;
- [SkinControl(30)] protected GUIImage _cmtImage = null;
- [SkinControlAttribute(31)] protected GUILabelControl _comment = null;
+ [SkinControl(30)] protected GUIImage _systemStatusImage = null;
+ [SkinControlAttribute(31)] protected GUILabelControl _systemStatusText = null;
+ [SkinControl(32)] protected GUIImage _deviceStatusImage = null;
+ [SkinControlAttribute(33)] protected GUILabelControl _deviceStatusText = null;
- const int ALL = Int16.MaxValue;
- const int NO_SCENE_SELECTED = Int16.MaxValue;
+ const int ALL = Int16.MaxValue;
+ const int NO_SCENE_SELECTED = Int16.MaxValue;
+ private int _pluginID = 1972;
+ private VeraCommunication _vera = VeraCommunication.Instance;
- private int _pluginID = 1972;
- private VeraCommunication _vera = VeraCommunication.Instance;
- private int _selectedRoom = ALL;
- private int _selectedCategory = ALL;
- public Actiontrigger _lastAction = Actiontrigger.LAST_ACTIONTRIGGER;
- private VeraHelper _helper = new VeraHelper();
+ private int _selectedRoom = ALL;
+ private int _selectedCategory = ALL;
+ public Actiontrigger _lastAction = Actiontrigger.LAST_ACTIONTRIGGER;
+ private VeraHelper _helper = new VeraHelper();
+ private int _lastSelectedItemId = 0;
- public bool _enableSceneTrigger = false;
- private bool _lastUpdateFailed = false;
- private string _titleTxt = "Micasa Verde - Vera control";
+ public bool _enableSceneTrigger = false;
+ private bool _autoSelectRoom = true;
+ private bool _lastUpdateFailed = false;
+ private string _titleTxt = "Micasa Verde - Vera control";
public VeraControl()
{
@@ -201,7 +205,8 @@
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.MPSettings())
{
- _enableSceneTrigger = xmlreader.GetValueAsBool("veracontroller", "enableSceneTrigger", false);
+ _enableSceneTrigger = xmlreader.GetValueAsBool("veracontroller", "enableSceneTrigger", false);
+ _autoSelectRoom = xmlreader.GetValueAsBool("veracontroller", "AutoSelectRoom", true);
}
GUIWindowManager.OnNewAction += new OnActionHandler(OnNewAction);
@@ -223,6 +228,7 @@
handleActionTriggers(Actiontrigger.MP_START_UP);
}
}).Start();
+
return Load(GUIGraphicsContext.Skin+@"\VeraControl.xml");
}
@@ -305,10 +311,16 @@
{
switch(action.wID)
{
+ case Action.ActionType.ACTION_MOUSE_MOVE:
+ break;
+
case Action.ActionType.ACTION_CONTEXT_MENU:
case Action.ActionType.ACTION_SHOW_INFO:
showInfoDialog();
break;
+
+ default:
+ break;
}
}
}
@@ -510,13 +522,32 @@
_vera.UpdateCurrentStatus();
refreshNow();
+ // Auto update right side list
+ if (_autoSelectRoom && (_selectedRoom != _leftList.SelectedListItem.ItemId))
+ {
+ OnLeftlistCrtl(_leftList);
+ }
+
base.Render(timePassed);
}
public void refreshNow()
{
- if (_vera.NewScreenUpdateWaitingAndClearFlag())
+ int selectedItem = 0;
+ if (_rightList.SelectedListItem != null)
+ { // Prevent Eception in case we have an empty room
+ selectedItem = _rightList.SelectedListItem.ItemId;
+ }
+ else if (_lastSelectedItemId != 0)
{
+ // Clear message if we have an empty list for the first time
+ setDeviceStatus(DevState.NONE, "");
+ }
+ bool newSelectedItem = (selectedItem != _lastSelectedItemId) && (selectedItem != 0);
+ _lastSelectedItemId = selectedItem;
+
+ if (_vera.NewScreenUpdateWaitingAndClearFlag() || newSelectedItem)
+ {
// update system status
if (_vera.status.system.NewScreenUpdateWaitingAndClearFlag())
{
@@ -524,7 +555,7 @@
}
// if full reload has been found rebuild lists
- if (_vera.status.system.fullReload ) {
+ if (_vera.status.system.FullReloadWaitingAndClearFlag() ) {
listRooms(_selectedCategory, _selectedRoom);
if (_selectedRoom == ALL) {
listScenes(ALL);
@@ -540,7 +571,7 @@
if (item.ItemId > 0)
{ // ItemId > 0 so we have a device
DeviceGeneric dev = _vera.status.GetDeviceById(item.ItemId);
- if (dev.NewScreenUpdateWaitingAndClearFlag())
+ if (dev.NewScreenUpdateWaitingAndClearFlag() || (newSelectedItem && _lastSelectedItemId == item.ItemId))
{
fillinDeviceInfo(item, dev);
}
@@ -548,7 +579,7 @@
else
{ // ItemId < 0 so we have a scene
Scene scene = _vera.status.GetSceneById((item.ItemId * -1));
- if (scene.NewScreenUpdateWaitingAndClearFlag())
+ if (scene.NewScreenUpdateWaitingAndClearFlag() || (newSelectedItem && _lastSelectedItemId == item.ItemId))
{
fillinSceneInfo(item, scene);
}
@@ -583,17 +614,31 @@
private void setSystemStatus()
{
if (_vera.status.system.state != DevState.NONE) {
- _cmtImage.Dispose();
- _cmtImage.SetFileName(_helper.GetStateImage(_vera.status.system.state));
- _cmtImage.KeepAspectRatio = true;
- _cmtImage.Visibility = System.Windows.Visibility.Visible;
- _cmtImage.AllocResources();
+ _systemStatusImage.Dispose();
+ _systemStatusImage.SetFileName(_helper.GetStateImage(_vera.status.system.state));
+ _systemStatusImage.KeepAspectRatio = true;
+ _systemStatusImage.Visibility = System.Windows.Visibility.Visible;
+ _systemStatusImage.AllocResources();
} else{
- _cmtImage.Visibility = System.Windows.Visibility.Hidden;
+ _systemStatusImage.Visibility = System.Windows.Visibility.Hidden;
}
- _comment.Label = _vera.status.system.comment;
-
+ _systemStatusText.Label = _vera.status.system.comment;
}
+
+ private void setDeviceStatus(DevState state, string text)
+ {
+ if (state != DevState.NONE) {
+ _deviceStatusImage.Dispose();
+ _deviceStatusImage.SetFileName(_helper.GetStateImage(state));
+ _deviceStatusImage.KeepAspectRatio = true;
+ _deviceStatusImage.Visibility = System.Windows.Visibility.Visible;
+ _deviceStatusImage.AllocResources();
+ } else{
+ _deviceStatusImage.Visibility = System.Windows.Visibility.Hidden;
+ }
+ _deviceStatusText.Label = text;
+ }
+
private void listCategories()
{
@@ -689,6 +734,11 @@
item.ThumbnailImage = "Vera\\" + scene.GetIconName() + ".png";
Utils.SetDefaultIcons(item);
+
+ if (_lastSelectedItemId == (scene.id * -1))
+ {
+ setDeviceStatus(scene.commstate, scene.comment);
+ }
}
private void listDevices(int selectedRoom)
@@ -720,6 +770,11 @@
item.ThumbnailImage = "Vera\\" + dev.GetIconName() + ".png";
Utils.SetDefaultIcons(item);
+
+ if (_lastSelectedItemId == dev.id)
+ {
+ setDeviceStatus(dev.commstate, dev.comment);
+ }
}
private void OnLeftlistCrtl(GUIListControl control)
@@ -775,16 +830,15 @@
break;
case Action.ActionType.ACTION_SELECT_ITEM:
- DialogSceneControl dlg = (DialogSceneControl)GUIWindowManager.GetWindow((int)1975);
- dlg.InitDialog("Scene control", scene);
- dlg.DoModal(GUIWindowManager.ActiveWindow);
+ DialogSceneControl sceneDlg = (DialogSceneControl)GUIWindowManager.GetWindow((int)1975);
+ sceneDlg.ShowDialog("Scene control", scene);
break;
}
}
}
else
{ // We have a device as selected item
- DeviceGeneric dev = _vera.status.GetDeviceById(control.SelectedListItem.ItemId);
+ DeviceGeneric dev = _vera.status.GetDeviceById(control.SelectedListItem.ItemId);
switch (actionType)
{
@@ -807,9 +861,8 @@
break;
case Action.ActionType.ACTION_SELECT_ITEM:
- DialogDeviceControl dlg = (DialogDeviceControl)GUIWindowManager.GetWindow((int)1973);
- dlg.InitDialog(_vera.status.GetRoomById(dev.room).name, dev);
- dlg.DoModal(GUIWindowManager.ActiveWindow);
+ DialogDeviceControl deviceDlg = (DialogDeviceControl)GUIWindowManager.GetWindow((int)1973);
+ deviceDlg.ShowDialog(_vera.status.GetRoomById(dev.room).name, dev);
break;
}
}
@@ -875,7 +928,7 @@
"When navigating through the right side menu the following RC keys are available:\n" +
" [Play] will run the selected scene\n" +
" [Next]/[Prev] will switch off/on the selected device\n" +
- " [Fwd] / [Rew] will decrease/increase the level of the selected devive\n" +
+ " [Fwd] / [Rwd] will decrease/increase the level of the selected devive\n" +
" [i] show this info panel");
dlg.DoModal(GUIWindowManager.ActiveWindow);
}
Modified: trunk/plugins/VeraControl/VeraSetupForm.Designer.cs
===================================================================
--- trunk/plugins/VeraControl/VeraSetupForm.Designer.cs 2012-02-02 11:43:11 UTC (rev 4435)
+++ trunk/plugins/VeraControl/VeraSetupForm.Designer.cs 2012-02-02 20:07:07 UTC (rev 4436)
@@ -48,6 +48,7 @@
this.portnumber = new System.Windows.Forms.TextBox();
this.refreshdelay = new System.Windows.Forms.TextBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.autoSelectRoom = new System.Windows.Forms.CheckBox();
this.enableSceneTrigger = new System.Windows.Forms.CheckBox();
this.label1 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
@@ -57,7 +58,7 @@
// btnOK
//
this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.btnOK.Location = new System.Drawing.Point(31, 297);
+ this.btnOK.Location = new System.Drawing.Point(31, 345);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(75, 23);
this.btnOK.TabIndex = 12;
@@ -69,7 +70,7 @@
//
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Location = new System.Drawing.Point(231, 297);
+ this.btnCancel.Location = new System.Drawing.Point(231, 345);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.TabIndex = 13;
@@ -273,16 +274,28 @@
//
// groupBox2
//
+ this.groupBox2.Controls.Add(this.autoSelectRoom);
this.groupBox2.Controls.Add(this.enableSceneTrigger);
this.groupBox2.Controls.Add(this.refreshdelay);
this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Location = new System.Drawing.Point(12, 203);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(309, 82);
+ this.groupBox2.Size = new System.Drawing.Size(309, 110);
this.groupBox2.TabIndex = 8;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Plug in settings";
//
+ // autoSelectRoom
+ //
+ this.autoSelectRoom.Checked = true;
+ this.autoSelectRoom.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.autoSelectRoom.Location = new System.Drawing.Point(20, 77);
+ this.autoSelectRoom.Name = "autoSelectRoom";
+ this.autoSelectRoom.Size = new System.Drawing.Size(270, 24);
+ this.autoSelectRoom.TabIndex = 12;
+ this.autoSelectRoom.Text = "Show devices in selected room immediately";
+ this.autoSelectRoom.UseVisualStyleBackColor = true;
+ //
// enableSceneTrigger
//
this.enableSceneTrigger.Location = new System.Drawing.Point(20, 47);
@@ -307,7 +320,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
- this.ClientSize = new System.Drawing.Size(332, 332);
+ this.ClientSize = new System.Drawing.Size(332, 380);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.btnCancel);
@@ -322,6 +335,7 @@
this.groupBox2.PerformLayout();
this.ResumeLayout(false);
}
+ private System.Windows.Forms.CheckBox autoSelectRoom;
private System.Windows.Forms.Button buttonFind;
private System.Windows.Forms.RadioButton radioLocal;
private System.Windows.Forms.RadioButton radioRemote;
Modified: trunk/plugins/VeraControl/VeraSetupForm.cs
===================================================================
--- trunk/plugins/VeraControl/VeraSetupForm.cs 2012-02-02 11:43:11 UTC (rev 4435)
+++ trunk/plugins/VeraControl/VeraSetupForm.cs 2012-02-02 20:07:07 UTC (rev 4436)
@@ -47,10 +47,11 @@
{
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.MPSettings())
{
- IPaddress.Text = xmlreader.GetValueAsString("veracontroller", "ipaddress", "127.0.0.1");
- portnumber.Text = xmlreader.GetValueAsString("veracontroller", "portnumber", " 3480");
- refreshdelay.Text = xmlreader.GetValueAsString("veracontroller", "maxrefreshdelay", "60");
- enableSceneTrigger.Checked = xmlreader.GetValueAsBool("veracontroller", "enableSceneTrigger", false);
+ IPaddress.Text = xmlreader.GetValueAsString("veracontroller", "ipaddress", "127.0.0.1");
+ portnumber.Text = xmlreader.GetValueAsString("veracontroller", "portnumber", "3480");
+ refreshdelay.Text = xmlreader.GetValueAsString("veracontroller", "maxrefreshdelay", "60");
+ enableSceneTrigger.Checked = xmlreader.GetValueAsBool("veracontroller", "enableSceneTrigger", false);
+ autoSelectRoom.Checked = xmlreader.GetValueAsBool("veracontroller", "AutoSelectRoom", true);
radioRemote.Checked = xmlreader.GetValueAsBool("veracontroller", "remoteConnected", false);
radioLocal.Checked = !radioRemote.Checked;
@@ -67,16 +68,17 @@
{
using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.MPSettings())
{
- xmlWriter.SetValue("veracontroller", "ipaddress", IPaddress.Text);
- xmlWriter.SetValue("veracontroller", "portnumber", portnumber.Text);
- xmlWriter.SetValue("veracontroller", "maxrefreshdelay", refreshdelay.Text);
+ xmlWriter.SetValue("veracontroller", "ipaddress", IPaddress.Text);
+ xmlWriter.SetValue("veracontroller", "portnumber", portnumber.Text);
+ xmlWriter.SetValue("veracontroller", "maxrefreshdelay", refreshdelay.Text);
xmlWriter.SetValueAsBool("veracontroller", "enableSceneTrigger", enableSceneTrigger.Checked);
+ xmlWriter.SetValueAsBool("veracontroller", "AutoSelectRoom", autoSelectRoom.Checked);
xmlWriter.SetValueAsBool("veracontroller", "remoteConnected", radioRemote.Checked);
- xmlWriter.SetValue("veracontroller", "miosusername", Username.Text);
- xmlWriter.SetValue("veracontroller", "miospassword", Password.Text);
- xmlWriter.SetValue("veracontroller", "serialnumber", SerialNumber.Text);
+ xmlWriter.SetValue("veracontroller", "miosusername", Username.Text);
+ xmlWriter.SetValue("veracontroller", "miospassword", Password.Text);
+ xmlWriter.SetValue("veracontroller", "serialnumber", SerialNumber.Text);
}
}
Modified: trunk/plugins/VeraControl/releases/VeraControl.xmp2
===================================================================
--- trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-02-02 11:43:11 UTC (rev 4435)
+++ trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-02-02 20:07:07 UTC (rev 4436)
@@ -62,7 +62,7 @@
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName>..\skin\Default\VeraDialogSceneControl.xml</LocalFileName>
+ <LocalFileName>..\skin\DefaultWide\VeraDialogSceneControl.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{cced0cd3-b45e-4cf1-af86-d268fa728b06}-VeraDialogSceneControl.xml</ZipFileName>
<DestinationFilename>%Skin%\DefaultWide\VeraDialogSceneControl.xml</DestinationFilename>
</FileItem>
@@ -865,7 +865,7 @@
<Major>0</Major>
<Minor>9</Minor>
<Build>0</Build>
- <Revision>2</Revision>
+ <Revision>3</Revision>
</Version>
<ExtensionDescription>Control your Vera controller from MediaPortal.
@@ -885,37 +885,53 @@
- Vera 2 v1.1.1267
+ - Vera 2 v1.1.1362
+
- Vera 2 v1.5.255
-
-
-
-
-
-
-
-
-
-
</ExtensionDescription>
<VersionDescription>[9.0.0.1]
+
- Real time Vera status update
+
-Threated communication (no-screen-lockups)
+
- IP Cam support
+
- Improved error handling
+
- Improved Cam image updater
+
- Clean up code (coding standard complience)
+
- Supports remote connection (via fwd1.mios.com)
+
- New image set
+
- Improved config screen (Vera-box look)
+
- first: stable release
-[9.0.0.2]
+
+
+[0.9.0.2]
+
- Added a help screen (! button = context menu)
-- Added RC commands to control devices/scenes without the need of opening the dialog</VersionDescription>
+
+- Added RC commands to control devices/scenes without the need of opening the dialog
+
+
+
+[0.9.0.3]
+
+ - Show device status of selected item also on main screen,
+
+ - Added the ability to show devices automatically when selecting a new room (= extra config option)
+
+ - bug fix: wrong scene dialog was shown in DefautWide skin</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/VeraControl_v0.9.0.2.mpe1</OnlineLocation>
- <ReleaseDate>2012-01-28T22:51:05</ReleaseDate>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/VeraControl_v0.9.0.3.mpe1</OnlineLocation>
+ <ReleaseDate>2012-01-30T22:51:05</ReleaseDate>
<Tags>home automation,
z-wave,
micasaverde,
@@ -1007,10 +1023,17 @@
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName>..\skin\Default\VeraDialogSceneControl.xml</LocalFileName>
+ <LocalFileName>..\skin\DefaultWide\VeraDialogSceneControl.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{cced0cd3-b45e-4cf1-af86-d268fa728b06}-VeraDialogSceneControl.xml</ZipFileName>
<DestinationFilename>%Skin%\DefaultWide\VeraDialogSceneControl.xml</DestinationFilename>
</FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Default\VeraDialogSceneControl.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{77a408e1-11da-4375-83bb-6b197c362f88}-VeraDialogSceneControl.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Default\VeraDialogSceneControl.xml</DestinationFilename>
+ </FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
Added: trunk/plugins/VeraControl/releases/VeraControl_v0.9.0.3.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/VeraControl/releases/VeraControl_v0.9.0.3.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/VeraControl/releases/update.xml
===================================================================
--- trunk/plugins/VeraControl/releases/update.xml 2012-02-02 11:43:11 UTC (rev 4435)
+++ trunk/plugins/VeraControl/releases/update.xml 2012-02-02 20:07:07 UTC (rev 4436)
@@ -1177,5 +1177,152 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="IconsDefault">
+ <DisplayName>IconsDefault</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>IconsDefault</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="IconsDefaultWide">
+ <DisplayName>IconsDefaultWide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>IconsDefaultWide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="VeraControl.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
+ <DesignedForVersion>1.1.6.27644</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Vera Controller</Name>
+ <Id>ebb6b1af-6fb9-44e5-a859-9d32ffe20a9e</Id>
+ <Author>Bart Eversdijk</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/micasaverde-vera-controller</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/plugin-micasaverde-vera-controller-104337/</ForumPage>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/update.xml</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>9</Minor>
+ <Build>0</Build>
+ <Revision>3</Revision>
+ </Version>
+ <ExtensionDescription>Control your Vera controller from MediaPortal.
+
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtains automatically when MediaPortal starts a movie...
+
+Vera is a Z-wave home automation controller from MicasaVerde.
+
+This version is tested with:
+ - Vera 1 v1.1.1338
+ - Vera 2 v1.1.1267
+ - Vera 2 v1.1.1362
+ - Vera 2 v1.5.255
+</ExtensionDescription>
+ <VersionDescription> - Show device status of selected item also on main screen,
+ - Added the ability to show devices automatically when selecting a new room (= extra config option)
+ - bug fix: wrong scene dialog was shown in DefautWide skin</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/VeraControl_v0.9.0.3.mpe1</OnlineLocation>
+ <ReleaseDate>2012-02-02T22:51:05</ReleaseDate>
+ <Tags>home automation,
+z-wave,
+micasaverde,
+vera</Tags>
+ <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\releases\VeraControl_v0.9.0.3.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
Modified: trunk/plugins/VeraControl/skin/Default/VeraControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Default/VeraControl.xml 2012-02-02 11:43:11 UTC (rev 4435)
+++ trunk/plugins/VeraControl/skin/Default/VeraControl.xml 2012-02-02 20:07:07 UTC (rev 4436)
@@ -47,6 +47,27 @@
<textcolor>90FFFFFF</textcolor>
</control>
+ <control>
+ <type>image</type>
+ <id>32</id>
+ <posX>300</posX>
+ <posY>500</posY>
+ <width>20</width>
+ <height>20</height>
+ <texture></texture>
+ <visible>no</visible>
+ </control>
+
+ <control>
+ <description>commment label</description>
+ <type>label</type>
+ <id>33</id>
+ <posX>320</posX>
+ <posY>500</posY>
+ <label>comment</label>
+ <font>font13</font>
+ <textcolor>90FFFFFF</textcolor>
+ </control>
<control>
Modified: trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml 2012-02-02 11:43:11 UTC (rev 4435)
+++ trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml 2012-02-02 20:07:07 UTC (rev 4436)
@@ -46,6 +46,28 @@
<font>font11</font>
<textcolor>90FFFFFF</textcolor>
</control>
+
+ <control>
+ <type>image</type>
+ <id>32</id>
+ <posX>600</posX>
+ <posY>610</posY>
+ <width>30</width>
+ <height>30</height>
+ <texture></texture>
+ <visible>no</visible>
+ </control>
+
+ <control>
+ <description>commment label</description>
+ <type>label</type>
+ <id>33</id>
+ <posX>640</posX>
+ <posY>610</posY>
+ <label>comment</label>
+ <font>font11</font>
+ <textcolor>90FFFFFF</textcolor>
+ </control>
<control>
<type>button</type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
