Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-12-20 23:46:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,428 Commits 12 Branches 48 Tags 186 MiB
459565423a
Commit Graph

324 Commits

Author SHA1 Message Date
Mihaela Stoica
9aaba04d37 CA-150413: Pre-select current edition in Assign license dialog 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2014-10-31 12:14:01 +00:00
Mihaela Stoica
218f2007e3 CP-10079: Implement new licensing requirements in XenCenter 
Changes to the License Manager dialog:
- Summary panel: show smaller icons for warning and information messages
- Summary panel: show license entitlements for all Creedence hosts (not eligible for support, eligible for support, enterprise features enabled, etc)
- for free Creedence or Clearwater hosts, the license status is Free (it used to be Expired for ClearwaterOrGreater)
and the text displayed is "Unlicensed" for Creedence and "Unsupported" for Clearwater;
the warning message is "Not eligible for support" (instead of "Your support and maintenance has expired")

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2014-10-28 17:02:55 +00:00
Mihaela Stoica
571ed9241a CP-10079: Implement new licensing requirements in XenCenter 
- new license types
- new options in the license manager

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2014-10-28 16:42:27 +00:00
vetrivelc
6e2e1a214d Iteration_002 translation check-ins 2014-10-14 21:41:41 +05:30
Gabor Apati-Nagy
34644d17aa Merge pull request #237 from xenserver/xs64bit 
Xs64bit
 2014-10-01 17:32:33 +01:00
Stephen Turner
0ea098dab6 Merge pull request #225 from GaborApatiNagy/CA-147190 
CA-147190: XenCenter About dialog references Marathon
 2014-09-29 17:43:39 +01:00
Gabor Apati-Nagy
c47420f5d5 CA-147190: XenCenter About dialog references Marathon 
-Enabling auto-sizing on the TableLayoutPanel and on the Window itself. This will keep the spacing between the UI elements correct.
 2014-09-29 17:01:01 +01:00
Gabor Apati-Nagy
d17c2b93f3 CA-147190: XenCenter About dialog references Marathon: 
-Changes following the code review: To minimize the distance between the OK button and the "View Legal Notices" link, the latter has been aligned to the Bottom-Left and the height of its container row has been set to 100% instead of Auto.
 2014-09-29 13:45:50 +01:00
Mihaela Stoica
38f7fd7809 CA-146711: Edit GPU Placement policy button should open Pool properties dialog at the GPU page 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2014-09-29 13:14:05 +01:00
Gabor Apati-Nagy
cfc6d5966c CA-147190: XenCenter About dialog references Marathon 
-Updated legal notices in About dialog and Legal Notices dialog

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2014-09-26 11:17:53 +01:00
Gabor Apati-Nagy
466dd48c2f Merge pull request #220 from xenserver/xs64bit 
Merging xs64bit into Creedence-ln
 2014-09-22 16:45:58 +01:00
Gabor Apati-Nagy
c068c56a23 CA-139588: Uncaught exception in License Manager 2014-09-22 15:38:01 +01:00
Gabor Apati-Nagy
01ba7e04da CA-145686: (Fix for) Deadlock in license manager 
Revert "CA-139588: Try to prevent Index was out of range exception by invoking on the event thread"

This reverts commit eeb86b7956.
 2014-09-22 13:53:54 +01:00
vetrivelc
2ab95c7899 CreedenceLN: Updated the language resource files 
New translation checki-ns and language file additions
 2014-09-18 15:03:24 +05:30
Hui Zhang
53e15ecd73 CA-143869: ZH-CN: Buttons are truncated on Workload Balancing Configuration 
Fix the display issues of Chinese version XenCenter/WLB:
When WLB Configuration Dialog size is changing,
1. OK and Cancel buttons are truncated,
2. OK and Cancel buttons do not keep at the bottom/right corner of the dialog.

Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
 2014-08-19 09:42:03 +08:00
Hui Zhang
51fa464e33 CA-142045: Buttons are truncated on Workload Balancing Configuration for New Pool wizard. 
Fix the display issues when WLB Configuration Dialog size is changing:
1. OK and Cancel buttons are truncated.
2. OK and Cancel buttons do not keep at the bottom/right corner of the dialog.
3. The height of the SplitContainer does not track the change of the height of the dialog.

Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
 2014-08-18 14:53:36 +08:00
Gabor Apati-Nagy
fd9b88a2f4 CA-141168: EN: Improvement: Textbox lines seem overlap in "Set Maser Password" and "Change Master Password" dialog. 
-Modified layout to avoid overlapping and dynamic movement of input fields/buttons when an error message is being displayed.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2014-08-07 12:05:59 +01:00
Mihaela Stoica
cb7dcc81f4 CA-136173: Getting several notifications for one user-level action (e.g. Updating network operation creates 4 entries in the Notifications/Events view) 
- Set the pool details in the action to allow proper filtering by location on the Events page
- Also, when possible, set the Host property: when setting the SR in the action, we also set the Host to SR.Home

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2014-07-21 11:40:26 +01:00
Mihaela Stoica
3c051654d6 CA-136173: Getting several notifications for one user-level action (e.g. Updating network operation creates 4 entries in the Notifications/Events view) 
-  Suppress reporting of success and failure for sub-actions:
The suppress history flag is set when the action is created and if is false (by default) the action is added to the history (the Events list).
In order to suppress history for the subactions, we need change all actions used in Edit pages so their constructor can set the SuppressHistory flag and then use these constructors with suppressHistory = true on all the implementations of IEditPage.SaveSettings() where an action is created
(then we need to remember to do the same everytime we introduce a new page and / or "save" action).

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2014-07-21 11:19:04 +01:00
Gabor Apati-Nagy
205ffe16d9 CA-116005: validation of the SN mask doesn't appear to be working correctly on the last two values of the mask. 
-New IPv4 subnet mask validator added.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2014-07-11 11:41:38 +01:00
Mihaela Stoica
eeb86b7956 CA-139588: Try to prevent Index was out of range exception by invoking on the event thread 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2014-07-09 14:55:19 +01:00
Mihaela Stoica
8e19193a2a CA-137470: Fixed unhandled exception raised by pressing space key on gridview of License Manager. 
- Added a 'refresh grid' parameter to UpdateRow() which indicates if a sort and refresh of the grid is necessary.
- A sort and refresh is not needed when the user selects a server by pressing the space key or by mouse, but it is needed when the information displayed has changed, for example when the license has changed.
- Also solved a possible null reference exception in CheckableDataGridViewController.ReplaceStoredRow(), by returning -1 if the index is not within the rows range.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2014-07-04 11:10:46 +01:00
Mihaela Stoica
b8531be374 CP-8120 Rolling Pool Upgrade wizard: add precheck for vCPU configuration. 
- Renamed “Checking can evacuate host status” precheck group to “Checking VM migration status”
- Prechecks page – check that all VMs have valid vCPU settings (i.e. number of vCPUs is a multiple of number of cores per socket).
- This check is included in the ‘Checking VM migration status” group
- If a VM has invalid vCPU settings, the precheck will display the problem with a solution to “Fix vCPU configuration” which opens the VM Properties dialog on the CPU page.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2014-06-06 13:50:13 +01:00
Gabor Apati-Nagy
12d1a53c44 Merge pull request #46 from Zhengchai/cp-7527 
CP-7527: Restore WLB for Creedence XenCenter changes.
 2014-04-30 13:25:39 +01:00
zheng chai
e10125fbce CP-7527: Restore WLB for Creedence XenCenter changes. 
Signed-off-by: zheng chai <zheng.chai@citrix.com>
 2014-04-22 19:14:53 +08:00
Stephen Turner
75bb8fa8f0 [CA-115256] Add null check as suggested by code review 2014-04-16 09:13:20 +01:00
Stephen Turner
75464110de Improvement to check-in for [CA-115256]: remove unused dependency 2014-04-15 17:49:03 +01:00
Stephen Turner
5d722be866 Improvement to check-in for [CA-115256]: move logic out of the display into the LicenseRow 2014-04-15 17:46:56 +01:00
Stephen Turner
afbfbaf803 [CA-115256] Don't show the Buy Licenses link for pre-Clearwater servers 2014-04-15 17:07:21 +01:00
Konstantina Chremmou
f0cf20ec43 CA-127510: Reworked the logic of differentiating between tasks started by this instance 
of XenCenter and tasks started from outside and cancelling the former when exiting
or disconnecting from the pool.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2014-03-11 14:30:01 +00:00
Konstantina Chremmou
d26bbaf8da CA-95786: Corrections to previous commit - show both the marketing name and the version on XenCenter's About box. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2014-02-18 17:38:11 +00:00
Konstantina Chremmou
de2ad77970 CA-95786: Show product microversion in XenCenter's About box (taken from XenServer 
unless manually overridden in XenCenter). Renamed field.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2014-02-18 14:53:00 +00:00
Konstantina Chremmou
f5bee7102c Refactored MainWindow to derive from IMainWindow rather than implement a field deriving 
from this interface.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2014-01-22 12:39:32 +00:00
Konstantina Chremmou
6e4c39ac96 CA-123576: Also reconstruct the plugin menu items when a plugin is enabled/disabled. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2014-01-02 09:10:57 +00:00
Konstantina Chremmou
b3fc67a4d8 CA-123576: Step 1 - stop toggling the enabled state of the Windows menu item when non-modal forms are launched. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-12-30 14:47:01 +00:00
Konstantina Chremmou
a5c89e429b CA-85971: Removed method selecting control in tab by name. Retained ability only for the Name, Description and Iqn TexBox on the GeneralEditPage; in one of the other cases it didn't make a difference, in another (LogDestinationEditPage) it was causing a bug and in yet another (BootOptionsEditPage) the controls had already been renamed. Also some positioning changes. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-12-30 13:01:00 +00:00
Konstantina Chremmou
3b25591d71 CA-85971: Removed method selecting tab by name. Made all pages of VerticallyTabbedDialog private. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-12-22 17:17:04 +00:00
Konstantina Chremmou
d335372575 CA-85971: Removed method selecting tab by index. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-12-22 15:28:00 +00:00
Konstantina Chremmou
c411df3426 Converted British spelling to American. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-12-13 13:51:16 +00:00
Konstantina Chremmou
1c3ecc281b CA-122834 Don't show GPU tab for non-vGPU servers 
Also GPU page on Pool properties dialogs should not be shown for non vGPU pools.
# HG changeset patch
# User Mihaela Stoica <Mihaela.Stoica@citrix.com>
# Date 1385743406 0
#      Fri Nov 29 16:43:26 2013 +0000
# Node ID e28f9921a0a17efb1e3a8d185acf18b5b6e116b1
# Parent  59229250db34dd4cc1f34fbdab055467a1570f87

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-12-11 10:45:28 +00:00
Konstantina Chremmou
5d04edae99 CP-6093: The Window menu item on the top MainWindow menu should be disabled when 
no forms are open. Since there is no event notifying about the Application.OpenForms
changing, created a new base class for all XenCenter dialogs and wizards with a
static event to which the main windw can subscribe.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-11-23 16:03:21 +00:00
Konstantina Chremmou
649f86bc1d Unregister registered CollectionChanged event on disposal. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-11-23 12:01:54 +00:00
Konstantina Chremmou
22ec1d9ac5 CP-6093: Redesign of the CloseXenCenterWarningDialog to use the same controls as 
the events page. This renders the old custom history controls obsolete, hence
removed them. Moved ActionBase extension methods to XenAdmin.Core namespace.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-11-23 11:59:49 +00:00
Konstantina Chremmou
0d7c6eb5f4 CP-6215: Do not allow HA for vGPU VMs. 
# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1384333341 0
#      Wed Nov 13 09:02:21 2013 +0000
# Node ID 8f10c3e041ebb2295f0692fcc6d733e7654906d0
# Parent  2f55fef6f39ab916f2ab8604926621aeb6dfc41c

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-11-14 12:38:00 +00:00
Konstantina Chremmou
402e2458ce CP-6382: Added GPU page to the Pool properties dialog (PR-1675) 
# HG changeset patch
# User Mihaela Stoica <Mihaela.Stoica@citrix.com>
# Date 1381486465 -3600
#      Fri Oct 11 11:14:25 2013 +0100
# Node ID ae162fb56bac4f1c2f7cc4c47b640a6933ea6deb
# Parent  48644db7dcf80d93efb9d6e86e982b95894cbd9d

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-11-14 10:35:48 +00:00
Gabor Apati-Nagy
cb572c86dc [CP-4950]: CAR-100: Report whether running in 32- or 64-bit mode 2013-11-13 17:56:23 +00:00
Konstantina Chremmou
99abced1fb Merge branch 'master' of git://hg.uk.xensource.com/carbon/trunk/xenadmin 2013-11-01 09:32:21 +00:00
Konstantina Chremmou
3fd296fbec CA-105791: Step 3 - Changed the action links colour and added underlining. I did 
this by susbstituting the FlickerFreeListBox with a DataGridView, which also fixes
the selection bug, plus we don't have to do custom drawing or costly string
measurements. This change will also aid the fix of CA-20870.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-11-01 09:27:28 +00:00
Konstantina Chremmou
d50181638f CA-105791: Step 2 - Removed virtual member call from constructor. Populate VMs 
list when the dialog is shown rather than constructed. Somc code tidy.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-11-01 09:27:19 +00:00
Konstantina Chremmou
a64cf267e6 CA-105791: Step 1 - Move the event handlers of the actions run from the base class 
DialogWithProgress to the derived classes EvacuateHostDialog and RepairSRDialog;
leave in the base class only the code updating the common controls.
 2013-11-01 09:27:08 +00:00
Gabor Apati-Nagy
97bba30f0a [CA-107921] Fixed: "Connect to Server" windows is displayed continuously with message "Synchronizing with <Host name> " even though server is connected. 2013-10-28 11:04:41 +00:00
Konstantina Chremmou
fd284e57af CP-6093: Removed mentions of the logs tab and the updates manager from XenCenter. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-10-08 14:51:39 +01:00
Konstantina Chremmou
64e14bbc63 CP-6267: Stop jumping to the Events window when an action has started. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-10-08 11:03:29 +01:00
Konstantina Chremmou
165ceaaefe CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1378451961 -19800
# Node ID cb7aab1ca88e76ca253a588935fad659ae794600
# Parent  1259116a56bc4aca1ea23612066e5f7257e6c1d0
Reverted the row span value change in VMProtectionPoliciesDialog.zh-CN.resx file.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:49:45 +01:00
Konstantina Chremmou
122f29da73 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1378449941 -19800
# Node ID 1259116a56bc4aca1ea23612066e5f7257e6c1d0
# Parent  27b9287295ba345825b17de509397e79bbb61962
Fix: CA-112233

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:49:18 +01:00
Konstantina Chremmou
853f9841fc CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1378365378 -19800
# Node ID b9b474904f50fa662b81340026322a863050dff1
# Parent  84e0784265b85b45b7052739c814204225d845fa
Fix: CA-114381

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:48:16 +01:00
Konstantina Chremmou
8b65117322 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1378311085 -19800
# Node ID 84e0784265b85b45b7052739c814204225d845fa
# Parent  24332b319e417873881b4e262e9ffa01687ea1dc
Bug Fix:CA-111776

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:47:03 +01:00
Konstantina Chremmou
1a90ae5c90 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1378298988 -19800
# Node ID 24332b319e417873881b4e262e9ffa01687ea1dc
# Parent  28eb1719f7f648773bd707c3cb81bb537d8f78d8
Fix:CA-114532,CA-114330

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:46:38 +01:00
Konstantina Chremmou
706d158c42 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1378122578 -3600
# Node ID 28eb1719f7f648773bd707c3cb81bb537d8f78d8
# Parent  931d568b9b0f00809b9acbe31462423dfaf8a8d4
CA-113230: Improvements of previous fix.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:46:04 +01:00
Konstantina Chremmou
1905077b29 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1377611382 -19800
# Node ID 48b8a4b6552228aeda9558d89249b5a30d0f7c9e
# Parent  b7339ed67dfc5a8cfba84c6fc2bc9f1c15a14317
Bug Fix:CA-114206,CA-114480,CA-114330,CA-112444

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:44:14 +01:00
Konstantina Chremmou
82b8c9b2c7 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1377176239 -19800
# Node ID 7a067ac0c37be286f06c3091379b33f668d31c62
# Parent  efafac7f89d00524a5787a5a227a4aecec0b34cf
Bug Fix:CA-114326,CA-114330.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:42:25 +01:00
Konstantina Chremmou
3260c375f2 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1377167722 -19800
# Node ID efafac7f89d00524a5787a5a227a4aecec0b34cf
# Parent  583abe3dc86764b07314ae86d4feb48a89c6a7e1
Bug Fix:CA-114276,CA-114332,CA-114330,CA-114266.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:41:59 +01:00
Konstantina Chremmou
864eeb48ee CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1377071789 -19800
# Node ID 5bd4ebbd0553c160917192dd4546bb19a2a5a64d
# Parent  e305aa4ddfecb3337cffb43bc711d9b580c79e1f
Bug Fix:CA-114276,CA-114264

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:40:02 +01:00
Konstantina Chremmou
98e124a98e CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1377019978 -3600
# Node ID 7674677d207c53d4a1207a88d0f1aa82c68b22fe
# Parent  a1940814a129b5fd75703a5aa541783a73b7cca5
CA-112234: Layout corrections on the LicenseManager. Increased dialog height in
the SC version to avoid control overlappin on the Summary panel.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:39:02 +01:00
Konstantina Chremmou
36e5225039 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1377010279 -19800
# Node ID 8827fad5e2fb3efa68cccb5eafb06262e41007c3
# Parent  f8171c407fc0e9a16b92c1937ff9dd334348c08e
Bug Fix:CA-112444,CA-113425

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:37:13 +01:00
Konstantina Chremmou
8a5c5f95ff CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1377011213 -3600
# Node ID a1940814a129b5fd75703a5aa541783a73b7cca5
# Parent  46350c8ef9df37a0c41d7a7245438948d261504b
No need to set UseCompatibleTextRendering to true.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:36:40 +01:00
Konstantina Chremmou
3283ca4737 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1377010165 -3600
# Node ID 46350c8ef9df37a0c41d7a7245438948d261504b
# Parent  a1c6bcf2b4d3119cff54d87fb97bd2491c9d8f67
CA-112226: Ellipsization should use TextRenderer.MeasureText (GDI) rather than
Graphics.MeasureString (GDI+) since the controls use the default UseCompatibleTextRendering
value (false).

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:35:57 +01:00
Konstantina Chremmou
3640bfa712 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1377001301 -3600
# Node ID f8171c407fc0e9a16b92c1937ff9dd334348c08e
# Parent  cc0505085de1e5f19326e13d74ec5542ce006080
CA-112444: Some layout corrections.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:29:34 +01:00
Konstantina Chremmou
585908c1d0 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1376977735 -19800
# Node ID cc0505085de1e5f19326e13d74ec5542ce006080
# Parent  f358f7080569520d5a984a3a3543130c81c42b8b
Bug Fix:CA-113230,CA-113426,CA-113698

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:26:39 +01:00
Konstantina Chremmou
76a6aecb25 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1376924917 -3600
# Node ID f358f7080569520d5a984a3a3543130c81c42b8b
# Parent  d2220b2b5c232e6f070c02d82a9a6283595eebf0
CA-113230: Removed unused field.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:25:46 +01:00
Konstantina Chremmou
5273d67c0b CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1376923571 -3600
# Node ID d2220b2b5c232e6f070c02d82a9a6283595eebf0
# Parent  4ccecd98746c40c5b1850f28c3e557e803102939
CA-113230: Fixed issue where surrogate characters were not displayed properly on
the DeleteVM dialog (this was actually a microsoft bug). Also some refactoring and
button text improvement.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:25:02 +01:00
Konstantina Chremmou
b3d2cecf89 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1376915592 -3600
# Node ID 4ccecd98746c40c5b1850f28c3e557e803102939
# Parent  cc14bc84973e1dd7e07ee6d90a2bac2cdd7baf79
[CA-112396], [CA-112304], [CA-112241]: Increased the width of the middle column
of the ActionProgressDialog TableLayoutPanel by 40px to reduce occurrance of text
wrapping. Ellipsized pool name in the GetHeartbeatSRsAction.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:23:49 +01:00
Konstantina Chremmou
1abb402310 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1376637316 -19800
# Node ID cc14bc84973e1dd7e07ee6d90a2bac2cdd7baf79
# Parent  09d7eccae36185bb28a96903abca52aaa7ae5c26
Bug Fix: 113310

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:21:18 +01:00
Konstantina Chremmou
708051d399 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1376481946 -19800
# Node ID 09d7eccae36185bb28a96903abca52aaa7ae5c26
# Parent  f7a7a388679077777e7086571604863e34654d51
Bug Fix: 113698,113428,113311

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:20:32 +01:00
Konstantina Chremmou
3717cc1817 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1376046486 -19800
# Node ID df304b7a463735221fa111e4419f8ebf53611931
# Parent  a4613d9afc3a6008fba2a24f52fd53f2e91745a0
Bug Fix:112934,112444

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:18:26 +01:00
Konstantina Chremmou
e7548fe295 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1375977452 -19800
# Node ID a4613d9afc3a6008fba2a24f52fd53f2e91745a0
# Parent  d0a3fa6db59fcaea186f0909053866153d15d450
Bug Fix:112928,113311,112305

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:17:55 +01:00
Konstantina Chremmou
e06d2610ba CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1375792166 -3600
# Node ID 2f3f7203b7a8c8c8d470534c0cf6554b9bf75a39
# Parent  6c08708f799c879557426b1aba48063b7ee9f877
CA-112444: Removed the ability to have link areas in the label of the ThreeButton
dialog because it's not always working for languages other than English. It was
used only in one place anyway, therefore I provided a dedicated dialog.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 14:12:26 +01:00
Konstantina Chremmou
6f0104339e CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1375791454 -19800
# Node ID e5697fcba4e354046b3a181fb867c53d5ddcd94e
# Parent  8a941396ee976c87a2cbe211fe66170e356deeef
Bug Fix:112812

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 13:46:42 +01:00
Konstantina Chremmou
af24a34960 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1375784114 -19800
# Node ID 871c9e41b225a3c4e70540c5b3c5cd4101b83a10
# Parent  2b2e4280a62dab1018daea93de8ef444c4753fb0
Bug Fix: 113215,112925,112768,112766

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 13:45:09 +01:00
Konstantina Chremmou
50892f4601 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1375444497 -19800
# Node ID 2b2e4280a62dab1018daea93de8ef444c4753fb0
# Parent  0bd7c8e13bdbcda6f95dfa4616c9621ee32857d5
Bug Fix: 112927,112924

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 13:44:11 +01:00
Konstantina Chremmou
39392e6aec CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1375369840 -19800
# Node ID 0bd7c8e13bdbcda6f95dfa4616c9621ee32857d5
# Parent  85e97db6b94e3b8b55d1a06747a1f1b63c58277f
SC T9N Changes + Bug Fix :111776,111806,111874,111226,112233,112234

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 13:35:33 +01:00
Konstantina Chremmou
c6ae267fff CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1375289918 -19800
# Node ID 85e97db6b94e3b8b55d1a06747a1f1b63c58277f
# Parent  03b31ee8090131b635555c48605138f2aa0699db
BUg Fix : 111755,111762,111776,111873,111874

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 13:33:45 +01:00
Konstantina Chremmou
029b0bf53a CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1375177700 -19800
# Node ID 75a7918d6b1d562204ef408b74ee695f30cbfaa1
# Parent  a8743cea5fe20ce335abbecb4fb78f3237bed508
Bug Fix

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 13:31:24 +01:00
Konstantina Chremmou
cf0ae529ec CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1374659962 -19800
# Node ID a8743cea5fe20ce335abbecb4fb78f3237bed508
# Parent  7637337aa47ba6eb2b401ce7f7f852d398c19852
Language Build Truncation Bug fixes

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 13:27:55 +01:00
Konstantina Chremmou
22098bb757 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1374503232 -19800
# Node ID 90776ba30a9e56cb3c07d32066c6a0dd0ad638de
# Parent  755b1cdd3b8340b677fd505b439710115697461f
Fix for Bugs#CA-111874,CA-111873

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 13:24:48 +01:00
Konstantina Chremmou
a437f4c630 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1374488169 -19800
# Node ID 755b1cdd3b8340b677fd505b439710115697461f
# Parent  f600c04441cfccca80a82c2aeca47c220c7428db
Bug fix : CA-111760,CA-111753.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 13:23:28 +01:00
Konstantina Chremmou
7b66b3a6f5 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1374148735 -19800
# Node ID cd999f68c24b4f1391e9a2012c4b0466910045c6
# Parent  a1e482150cd280292f10f7ce14666b70066da2fe
Reverted changes (to fix build break for now)

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 13:19:14 +01:00
Konstantina Chremmou
040b7b753a CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1374146320 -19800
# Node ID a1e482150cd280292f10f7ce14666b70066da2fe
# Parent  614c77268e5ff614a7b3bb56f177d2080ffa65ad
Checking in Fix for Bug#CA-111771,CA-111762,CA-111781,CA-111782.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 13:18:22 +01:00
Konstantina Chremmou
2c184b3ef1 CP-6317: Importing from branch clearwater-ln. 
# HG changeset patch
# User vetrivelc <vetrivel.chinnasamy@citrix.com>
# Date 1373384864 -19800
# Node ID 8604c77f3fcf5215b1ae962220cd75be01f21d4c
# Parent  4f3d46c46536366498a79ace2220051eb89b329c
Checking in Localization Changes

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-26 13:00:28 +01:00
Konstantina Chremmou
6e9e053dea CA-115431: Disable the "apply activation key" MenuItem and show a reason if there 
are more than one hosts selected.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-24 15:58:33 +01:00
Konstantina Chremmou
1d56b72a76 CA-112233: Fixed layout issues causing text truncations on the VMPP dialog. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-23 12:17:59 +01:00
Konstantina Chremmou
9388bf3c65 CA-115434: Fixed buton text truncation. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-23 09:45:30 +01:00
Konstantina Chremmou
44aed3cb7b CA-115257: Handle the LinkLabel.LinkClicked event instead of LinkLabel.Click so 
the LinkLabelcan be accessible by using both the mouse and the keyboard.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-09-12 00:06:43 +01:00
Konstantina Chremmou
4634f38be9 PluginOptions page aesthetics and grammar: fixed gridview borders; show different 
text on the page button depending on the number (1 vs many) of the plugins available.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-08-30 15:27:24 +01:00
Konstantina Chremmou
b04020dcac CP-5751: Moved the Alerts dialog and the Updates manager to the TabPages folder 
(because soon they will become tab pages).

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-08-29 11:14:12 +01:00
Konstantina Chremmou
a134e1bb86 CA-113430: Importing from clearwater-lcm-staging: corrected the calculation of 
the time remaining to the licence expiry date.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-08-28 15:11:12 +01:00
Konstantina Chremmou
59539af921 CA-95272: Fixed several memory leaks coming from undisposed pens and brushes. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-08-16 17:43:57 +01:00
Konstantina Chremmou
b54b30a150 CA-103290: When the alert filters are on enable the use to choose whetehr they want 
to export all or only the shown alerts (functionality similar to the DismissAll button).

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-08-14 17:12:39 +01:00
Konstantina Chremmou
6cbea8adcc CA-103347: Improved the messages on the confirmation dialogs for the "Dismiss All" 
alerts operations (when filters are on/off). Corrected button enabled state.
Other minor code improvements.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-08-14 16:59:25 +01:00
Konstantina Chremmou
86c6950aeb CP-5750: Implemented event filtering by status, location and date. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-08-13 10:15:52 +01:00
Konstantina Chremmou
62586ef89c CP-5750: Removed ActionType; the actions should be categorised by status (in progress, 
succeeded, failed; cancelled at the moment counts as failed, we may need to distinguish
in future). As a consequence the filter checkboxes from the top of the Log tab
were removed and some temporary changes were made to the drawing of action rows
(the controls will change completely in a subsequent commit).

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-08-09 17:20:38 +01:00
Konstantina Chremmou
077cb17deb CP-5750: Changed the declaration for the ActionBase events Completed, Changed and 
NewAction to use the Action<ActionBase> delegate instead of EventHandler. Thus
there is no need to fire them with Empty or null EventArgs and on several occasions
we avoid casting objects in the event handlers.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-08-09 17:20:33 +01:00
Konstantina Chremmou
58e9b1c822 CA-113431: Display a warning when a pool has a mixture of free hosts with license 
expiry dates that are more than 30 days apart (not ideal, but safest solution for
the case of a mixture of free and free but expiring soon hosts.)

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-08-09 17:18:15 +01:00
Konstantina Chremmou
35226d65dd CA-113319: LicenseManager was showing confusing licensing information. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-08-09 17:17:24 +01:00
Konstantina Chremmou
accf445584 CA-112931: Fixed issue where the "Activate Free XenServer” button was disabled 
when selecting multiple hosts on the Licence manager.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2013-08-05 17:46:05 +01:00
Adrian Jachacy
edce7529f6 CA-109273: [DELL-194] Throws exception if Download & Install used on host in maintenance mode. 
1. Added additional check to DownloadAndInstall method in ManageUpdatesDialog.cs: will proceed to the prechecks page in the Install Update Wizard only when there are selected servers on the previous page.
2. Modified code to allow hotfix installation when the host is in maintenance mode; however the host cannot be upgraded when in maintenance mode.
3. Modified test to reflect changes described above.

Signed-off-by: Adrian Jachacy <Adrian.Jachacy@citrix.com>
 2013-07-25 09:44:52 +01:00
Mihaela Stoica
bec2117a2a CA-110610: It should be possible to apply a free license to a 6.1 or earlier pool if the pool has two or more servers in it. 
- Changed the condition under which we show pool members as individual hosts in the License Manager dialog, from ALL to ANY,
meaning that if any of the pool members can be activated, then we split the pool.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2013-07-22 14:07:47 +01:00
Konstantina Chremmou
171235f201 Merge remote-tracking branch 'origin/master' 2013-07-18 13:57:18 +01:00
Konstantina Chremmou
500fcb9522 CP-5604: Moved right click menu functionality to a separate column on the alerts datagridview. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
 2013-07-18 13:56:40 +01:00
Mihaela Stoica
31fb3218b0 CA-110610: It should be possible to apply a free license to a 6.1 or earlier pool if the pool has two or more servers in it. 
- split the pool members out when they're free, as the activation keys can only be applied to one XenServer host at a time

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2013-07-16 11:46:18 +01:00
Konstantina Chremmou
daa36d206b CP-5604: Removed bottom alert actions ToolStrip since the information is duplicated by the right click menu (and will soon be on a separate DataGridView column).. Minor code tidy. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
 2013-07-15 06:41:54 +01:00
Konstantina Chremmou
d190b11fa4 CP-5604: Removed dedicated help button from the ManageUpdates dialog; use the base class help button instead. Changed column names on the alert datagridview of the AlertSummary and the ManageUpdates dialogs to match the column headers and facilitate future extraction of code shared by both of them. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
 2013-07-12 11:07:10 +01:00
Konstantina Chremmou
9a6a450cab CP-5604: Merged columns "Name" and "Description" to a single column "Message" on the updates dialog. Added expander column to allow expanding/collapsing rows. Reordered columns. (At the moment there is some duplicate code between the Updates and the Alerts dialog; this will be rectified soon). 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
 2013-07-11 19:09:29 +01:00
Konstantina Chremmou
b9f3aacfbf CP-5604: Converted the "Dismiss All" ToolStripButton on the Alerts dialog to a ToolStripSplitButton with the options to "Dismiss All" or "Dismiss Selected" alerts. Minor code tidy. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
 2013-07-11 18:20:18 +01:00
Konstantina Chremmou
02270b416d CP-5604: Added menu item "Show all" on the location and severity filter. Renamed the "No filter" item to "Show all" on the dates filter. Reordered top ToolStripMenuItems on the AlertSummaryDialog and changed their access hotkeys. Reordered columns on the alerts DataGridView. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
 2013-07-11 17:47:06 +01:00
Konstantina Chremmou
039c3dd6c8 PR-1537: Moved the 'Filter by Severity' ToolStripDropDownButton from the Alerts dialog to a separate class so it can be used elsewhere. Added new 'Filter by Status' ToolStripDropDownButton. Register one more event with the FilterLocationToolStripDropDownButton. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
 2013-07-03 13:00:24 +01:00
Konstantina Chremmou
86234b2121 PR-1537: Moved duplicate alert comparison code from the AlertSummary and the ManageUpdates dialogs to the Alert class. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
 2013-07-03 12:00:00 +01:00
Konstantina Chremmou
8a7476c9c7 PR-1537: Added new virtual property Name to the Alert class. Removed time info from the Description of the XenCenterUpdate-, XenServerPatch- and XenServerUpdateAlert (not needed because it is shown on a separate column on the alert lists). 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
 2013-07-03 11:28:10 +01:00
Konstantina Chremmou
41ac4c6ea2 PR-1537: Added label on the alerts dialog to indicate whether filters are on/off. Removed icons from the toolstrip buttons to reduce clutter. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
 2013-07-03 11:10:21 +01:00
Konstantina Chremmou
b2132132cd PR-1537: Moved the 'Filter by Location' ToolStripDropDownButton from the Alerts dialog to a separate class so it can be used elsewhere. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
 2013-07-02 19:06:11 +01:00
Konstantina Chremmou
6e01c9a8cd PR-1537: Moved the 'Filter by Date' ToolStripDropDownButton from the Alerts dialog to a separate class so it can be used elsewhere. 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
 2013-07-02 18:31:48 +01:00
Mihaela Stoica
978c9679c3 CA-107923: Display the correct pool license edition in License Manager and 
in the General Tab.

When master and slave(s) are licensed with different editions, the pool
license edition is not the master's edition, but the lowest license in the
pool.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2013-07-01 14:03:35 +01:00
Mihaela Stoica
4d638c4f65 CA-109483: Show correct licence status in the Licence manager for licensed XenServer hosts version 6.1.0 and earlier 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2013-06-27 14:40:11 +01:00
Mihaela Stoica
bd36a85bff CP-4816: Initial commit to git repo 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2013-06-24 12:41:48 +01:00