lp://staging/~dangarner/xibo/client-170alpha
- Get this branch:
- bzr branch lp://staging/~dangarner/xibo/client-170alpha
Branch merges
- Xibo Maintainters: Pending requested
-
Diff: 31227 lines (+19569/-9973) (has conflicts)105 files modifiedclient/dotNET/About.Designer.cs (+0/-129)
client/dotNET/About.cs (+0/-63)
client/dotNET/About.resx (+0/-1060)
client/dotNET/BlackList.cs (+0/-210)
client/dotNET/CacheManager.cs (+0/-387)
client/dotNET/Control/Region.cs (+653/-0)
client/dotNET/Control/XiboCefWebBrowser.cs (+115/-0)
client/dotNET/DataSetView.cs (+0/-235)
client/dotNET/Flash.cs (+0/-141)
client/dotNET/Forms/About.Designer.cs (+129/-0)
client/dotNET/Forms/About.cs (+63/-0)
client/dotNET/Forms/About.resx (+1060/-0)
client/dotNET/Forms/OptionForm.Designer.cs (+469/-0)
client/dotNET/Forms/OptionForm.cs (+286/-0)
client/dotNET/Forms/OptionForm.resx (+739/-0)
client/dotNET/HardwareKey.cs (+0/-175)
client/dotNET/Hashes.cs (+0/-124)
client/dotNET/Image.cs (+0/-88)
client/dotNET/KeyStore.cs (+0/-178)
client/dotNET/Log/ClientInfo.cs (+2/-2)
client/dotNET/Log/ClientInfoTraceListener.cs (+6/-6)
client/dotNET/Log/LogMessage.cs (+114/-0)
client/dotNET/Log/StatLog.cs (+333/-0)
client/dotNET/Log/XiboTraceListener.cs (+275/-0)
client/dotNET/LogMessage.cs (+0/-114)
client/dotNET/Logic/ApplicationSettings.cs (+177/-0)
client/dotNET/Logic/BlackList.cs (+210/-0)
client/dotNET/Logic/CacheManager.cs (+387/-0)
client/dotNET/Logic/HardwareKey.cs (+175/-0)
client/dotNET/Logic/Hashes.cs (+124/-0)
client/dotNET/Logic/KeyStore.cs (+178/-0)
client/dotNET/Logic/MediaOption.cs (+101/-0)
client/dotNET/Logic/RegionOptions.cs (+80/-0)
client/dotNET/Logic/RequiredFiles.cs (+448/-0)
client/dotNET/Logic/Schedule.cs (+305/-0)
client/dotNET/Logic/ScheduleManager.cs (+529/-0)
client/dotNET/Logic/ScreenShot.cs (+46/-0)
client/dotNET/MainForm.Designer.cs (+1/-1)
client/dotNET/MainForm.cs (+148/-24)
client/dotNET/Media.cs (+0/-239)
client/dotNET/Media/CefWebMedia.cs (+261/-0)
client/dotNET/Media/Flash.cs (+141/-0)
client/dotNET/Media/IeWebMedia.cs (+253/-0)
client/dotNET/Media/Image.cs (+94/-0)
client/dotNET/Media/Media.cs (+251/-0)
client/dotNET/Media/PowerPoint.cs (+123/-0)
client/dotNET/Media/ShellCommand.cs (+97/-0)
client/dotNET/Media/TemporaryFile.cs (+71/-0)
client/dotNET/Media/TemporaryHtml.cs (+108/-0)
client/dotNET/Media/Video.cs (+156/-0)
client/dotNET/Media/VideoDS.cs (+139/-0)
client/dotNET/Media/VideoPlayer.Designer.cs (+63/-0)
client/dotNET/Media/VideoPlayer.cs (+109/-0)
client/dotNET/Media/VideoPlayer.resx (+131/-0)
client/dotNET/MediaOption.cs (+0/-101)
client/dotNET/OptionForm.Designer.cs (+0/-1076)
client/dotNET/OptionForm.cs (+0/-334)
client/dotNET/OptionForm.resx (+0/-739)
client/dotNET/Program.cs (+113/-39)
client/dotNET/Properties/AssemblyInfo.cs (+4/-4)
client/dotNET/Properties/Resources.Designer.cs (+1/-1)
client/dotNET/Properties/Settings.Designer.cs (+3/-0)
client/dotNET/Properties/Settings.settings (+5/-1)
client/dotNET/Region.cs (+0/-645)
client/dotNET/RegionOptions.cs (+0/-79)
client/dotNET/Rss.cs (+0/-672)
client/dotNET/Schedule.cs (+0/-290)
client/dotNET/ScheduleManager.cs (+0/-512)
client/dotNET/Settings.cs (+0/-47)
client/dotNET/ShellCommand.cs (+0/-97)
client/dotNET/StatLog.cs (+0/-332)
client/dotNET/TemporaryFile.cs (+0/-71)
client/dotNET/TemporaryHtml.cs (+0/-108)
client/dotNET/Video.cs (+0/-156)
client/dotNET/VideoDS.cs (+0/-139)
client/dotNET/VideoPlayer.Designer.cs (+0/-63)
client/dotNET/VideoPlayer.cs (+0/-109)
client/dotNET/VideoPlayer.resx (+0/-131)
client/dotNET/Web References/xmds/Reference.cs (+174/-99)
client/dotNET/Web References/xmds/Reference.map (+1/-1)
client/dotNET/Web References/xmds/xmds.wsdl (+54/-27)
client/dotNET/WindowAnimator.cs (+0/-107)
client/dotNET/XiboClient.csproj (+76/-77)
client/dotNET/XiboTraceListener.cs (+0/-308)
client/dotNET/XmdsAgents/FileAgent.cs (+45/-13)
client/dotNET/XmdsAgents/LibraryAgent.cs (+3/-3)
client/dotNET/XmdsAgents/RegisterAgent.cs (+171/-0)
client/dotNET/XmdsAgents/RequiredFilesAgent.cs (+6/-6)
client/dotNET/XmdsAgents/ScheduleAgent.cs (+4/-4)
client/dotNET/app.config (+5/-0)
client/dotNET/bin/Release/DEFAULT/0.xml (+0/-33)
client/dotNET/bin/Release/XiboClient.exe.config (+0/-145)
client/dotNET/bin/Release/XiboClient.vshost.exe.config (+0/-145)
client/dotNET/bin/x86/Release/cef.log (+9429/-0)
client/dotNET/default.config.xml (+51/-0)
default.pot (+8/-0)
server/config/config.class.php (+12/-2)
server/install.php (+12/-0)
server/install/master/structure.sql (+10/-0)
server/lib/app/pdoconnect.class.php (+11/-1)
server/manual/content/admin/release_notes_1.6.2.php (+162/-76)
server/modules/preview/HtmlTemplateForGetResource.html (+4/-0)
server/modules/preview/html-preview.js (+12/-4)
server/modules/preview/xibo-text-render.js (+31/-0)
server/upgrade.php (+12/-0)
Branch information
Recent revisions
- 360. By Dan Garner
-
[dotnetclient] Fixed logging (removed auto flush and added a manual flush). Added status file.
- 358. By Dan Garner
-
[dotnetclient] Logic for sending a screenshot on a timer. Class for immediate send (intended to use from RF).
- 357. By Dan Garner
-
[dotnetclient] Pulled in new XMDS method. Called it when the layout changes. Added new setting for enable/disable the call.
- 356. By Dan Garner
-
[dotnetclient] Switched config file location back to the user profile - but retained the EXE naming for multiple instances of the application.
- 355. By Dan Garner
-
[dotnetclient] Dedicated media class for powerpoint. Background setting on CefWebMedia.
- 354. By Dan Garner
-
[dotnetclient] Illiminated the white flash for IeWebMedia. Added some notes for a potential solution for CefWebMedia
- 353. By Dan Garner
-
[dotnetclient] CefGlue (working) with minor modification to catch ObjectDisposed exceptions (must be something to do with the way Xibo works).
Havent got transparency working.
Havent got rid of the "white flash".
- 352. By Dan Garner
-
[dotnetclient] A less than elegant move around of some files - unfortuantely BZR doesnt integrate with visual studio so the files look like they have been deleted instead of moved. FeedDotNet has been removed.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/xibo/1.7