jj 22.09 calendar

This commit is contained in:
JenneJ
2016-09-22 17:11:38 +02:00
parent 980a20435c
commit 30aca1d125
6 changed files with 69 additions and 54 deletions

View File

@@ -1,4 +1,5 @@
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraScheduler.SchedulerControl, DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@@ -27,7 +27,7 @@ Partial Class frmCalendar
Dim TimeRuler2 As DevExpress.XtraScheduler.TimeRuler = New DevExpress.XtraScheduler.TimeRuler() Dim TimeRuler2 As DevExpress.XtraScheduler.TimeRuler = New DevExpress.XtraScheduler.TimeRuler()
Dim TimeRuler3 As DevExpress.XtraScheduler.TimeRuler = New DevExpress.XtraScheduler.TimeRuler() Dim TimeRuler3 As DevExpress.XtraScheduler.TimeRuler = New DevExpress.XtraScheduler.TimeRuler()
Me.SchedulerControl1 = New DevExpress.XtraScheduler.SchedulerControl() Me.SchedulerControl1 = New DevExpress.XtraScheduler.SchedulerControl()
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.ribbonCalendar = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.SwitchToDayViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToDayViewItem() Me.SwitchToDayViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToDayViewItem()
Me.SwitchToWorkWeekViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToWorkWeekViewItem() Me.SwitchToWorkWeekViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToWorkWeekViewItem()
Me.SwitchToWeekViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToWeekViewItem() Me.SwitchToWeekViewItem1 = New DevExpress.XtraScheduler.UI.SwitchToWeekViewItem()
@@ -66,10 +66,10 @@ Partial Class frmCalendar
Me.GroupByDateItem1 = New DevExpress.XtraScheduler.UI.GroupByDateItem() Me.GroupByDateItem1 = New DevExpress.XtraScheduler.UI.GroupByDateItem()
Me.GroupByResourceItem1 = New DevExpress.XtraScheduler.UI.GroupByResourceItem() Me.GroupByResourceItem1 = New DevExpress.XtraScheduler.UI.GroupByResourceItem()
Me.CalendarToolsRibbonPageCategory1 = New DevExpress.XtraScheduler.UI.CalendarToolsRibbonPageCategory() Me.CalendarToolsRibbonPageCategory1 = New DevExpress.XtraScheduler.UI.CalendarToolsRibbonPageCategory()
Me.AppointmentRibbonPage1 = New DevExpress.XtraScheduler.UI.AppointmentRibbonPage() Me.pageAppointment = New DevExpress.XtraScheduler.UI.AppointmentRibbonPage()
Me.ActionsRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.ActionsRibbonPageGroup() Me.ActionsRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.ActionsRibbonPageGroup()
Me.OptionsRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.OptionsRibbonPageGroup() Me.OptionsRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.OptionsRibbonPageGroup()
Me.HomeRibbonPage1 = New DevExpress.XtraScheduler.UI.HomeRibbonPage() Me.pageCalendar = New DevExpress.XtraScheduler.UI.HomeRibbonPage()
Me.AppointmentRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.AppointmentRibbonPageGroup() Me.AppointmentRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.AppointmentRibbonPageGroup()
Me.NavigatorRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.NavigatorRibbonPageGroup() Me.NavigatorRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.NavigatorRibbonPageGroup()
Me.ArrangeRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.ArrangeRibbonPageGroup() Me.ArrangeRibbonPageGroup1 = New DevExpress.XtraScheduler.UI.ArrangeRibbonPageGroup()
@@ -82,7 +82,7 @@ Partial Class frmCalendar
Me.TBPMO_RESOURCESTableAdapter = New DD_Record_Organiser.DD_DMSDataSetCalendarTableAdapters.TBPMO_RESOURCESTableAdapter() Me.TBPMO_RESOURCESTableAdapter = New DD_Record_Organiser.DD_DMSDataSetCalendarTableAdapters.TBPMO_RESOURCESTableAdapter()
Me.SchedulerBarController1 = New DevExpress.XtraScheduler.UI.SchedulerBarController() Me.SchedulerBarController1 = New DevExpress.XtraScheduler.UI.SchedulerBarController()
CType(Me.SchedulerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SchedulerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ribbonCalendar, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RepositoryItemSpinEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemSpinEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RepositoryItemDuration1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemDuration1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SchedulerStorage1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SchedulerStorage1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -95,10 +95,10 @@ Partial Class frmCalendar
'SchedulerControl1 'SchedulerControl1
' '
Me.SchedulerControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.SchedulerControl1.Dock = System.Windows.Forms.DockStyle.Fill
Me.SchedulerControl1.Location = New System.Drawing.Point(0, 142) Me.SchedulerControl1.Location = New System.Drawing.Point(0, 140)
Me.SchedulerControl1.MenuManager = Me.RibbonControl1 Me.SchedulerControl1.MenuManager = Me.ribbonCalendar
Me.SchedulerControl1.Name = "SchedulerControl1" Me.SchedulerControl1.Name = "SchedulerControl1"
Me.SchedulerControl1.Size = New System.Drawing.Size(926, 455) Me.SchedulerControl1.Size = New System.Drawing.Size(926, 457)
Me.SchedulerControl1.Start = New Date(2014, 12, 23, 0, 0, 0, 0) Me.SchedulerControl1.Start = New Date(2014, 12, 23, 0, 0, 0, 0)
Me.SchedulerControl1.Storage = Me.SchedulerStorage1 Me.SchedulerControl1.Storage = Me.SchedulerStorage1
Me.SchedulerControl1.TabIndex = 0 Me.SchedulerControl1.TabIndex = 0
@@ -108,17 +108,17 @@ Partial Class frmCalendar
Me.SchedulerControl1.Views.FullWeekView.TimeRulers.Add(TimeRuler2) Me.SchedulerControl1.Views.FullWeekView.TimeRulers.Add(TimeRuler2)
Me.SchedulerControl1.Views.WorkWeekView.TimeRulers.Add(TimeRuler3) Me.SchedulerControl1.Views.WorkWeekView.TimeRulers.Add(TimeRuler3)
' '
'RibbonControl1 'ribbonCalendar
' '
Me.RibbonControl1.ExpandCollapseItem.Id = 0 Me.ribbonCalendar.ExpandCollapseItem.Id = 0
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.SwitchToDayViewItem1, Me.SwitchToWorkWeekViewItem1, Me.SwitchToWeekViewItem1, Me.SwitchToFullWeekViewItem1, Me.SwitchToMonthViewItem1, Me.SwitchToTimelineViewItem1, Me.SwitchToGanttViewItem1, Me.SwitchTimeScalesItem1, Me.ChangeScaleWidthItem1, Me.SwitchTimeScalesCaptionItem1, Me.SwitchCompressWeekendItem1, Me.SwitchShowWorkTimeOnlyItem1, Me.SwitchCellsAutoHeightItem1, Me.ChangeSnapToCellsUIItem1, Me.EditAppointmentQueryItem1, Me.EditOccurrenceUICommandItem1, Me.EditSeriesUICommandItem1, Me.DeleteAppointmentsItem1, Me.DeleteOccurrenceItem1, Me.DeleteSeriesItem1, Me.SplitAppointmentItem1, Me.ChangeAppointmentStatusItem1, Me.ChangeAppointmentLabelItem1, Me.ToggleRecurrenceItem1, Me.ChangeAppointmentReminderItem1, Me.NewAppointmentItem1, Me.NewRecurringAppointmentItem1, Me.NavigateViewBackwardItem1, Me.NavigateViewForwardItem1, Me.GotoTodayItem1, Me.ViewZoomInItem1, Me.ViewZoomOutItem1, Me.GroupByNoneItem1, Me.GroupByDateItem1, Me.GroupByResourceItem1}) Me.ribbonCalendar.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonCalendar.ExpandCollapseItem, Me.SwitchToDayViewItem1, Me.SwitchToWorkWeekViewItem1, Me.SwitchToWeekViewItem1, Me.SwitchToFullWeekViewItem1, Me.SwitchToMonthViewItem1, Me.SwitchToTimelineViewItem1, Me.SwitchToGanttViewItem1, Me.SwitchTimeScalesItem1, Me.ChangeScaleWidthItem1, Me.SwitchTimeScalesCaptionItem1, Me.SwitchCompressWeekendItem1, Me.SwitchShowWorkTimeOnlyItem1, Me.SwitchCellsAutoHeightItem1, Me.ChangeSnapToCellsUIItem1, Me.EditAppointmentQueryItem1, Me.EditOccurrenceUICommandItem1, Me.EditSeriesUICommandItem1, Me.DeleteAppointmentsItem1, Me.DeleteOccurrenceItem1, Me.DeleteSeriesItem1, Me.SplitAppointmentItem1, Me.ChangeAppointmentStatusItem1, Me.ChangeAppointmentLabelItem1, Me.ToggleRecurrenceItem1, Me.ChangeAppointmentReminderItem1, Me.NewAppointmentItem1, Me.NewRecurringAppointmentItem1, Me.NavigateViewBackwardItem1, Me.NavigateViewForwardItem1, Me.GotoTodayItem1, Me.ViewZoomInItem1, Me.ViewZoomOutItem1, Me.GroupByNoneItem1, Me.GroupByDateItem1, Me.GroupByResourceItem1})
Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) Me.ribbonCalendar.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl1.MaxItemId = 1 Me.ribbonCalendar.MaxItemId = 1
Me.RibbonControl1.Name = "RibbonControl1" Me.ribbonCalendar.Name = "ribbonCalendar"
Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.CalendarToolsRibbonPageCategory1}) Me.ribbonCalendar.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.CalendarToolsRibbonPageCategory1})
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.HomeRibbonPage1}) Me.ribbonCalendar.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.pageCalendar})
Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemSpinEdit1, Me.RepositoryItemDuration1}) Me.ribbonCalendar.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemSpinEdit1, Me.RepositoryItemDuration1})
Me.RibbonControl1.Size = New System.Drawing.Size(926, 142) Me.ribbonCalendar.Size = New System.Drawing.Size(926, 140)
' '
'SwitchToDayViewItem1 'SwitchToDayViewItem1
' '
@@ -268,6 +268,7 @@ Partial Class frmCalendar
Me.RepositoryItemDuration1.AllowNullInput = DevExpress.Utils.DefaultBoolean.[False] Me.RepositoryItemDuration1.AllowNullInput = DevExpress.Utils.DefaultBoolean.[False]
Me.RepositoryItemDuration1.AutoHeight = False Me.RepositoryItemDuration1.AutoHeight = False
Me.RepositoryItemDuration1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.RepositoryItemDuration1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
Me.RepositoryItemDuration1.DisabledStateText = Nothing
Me.RepositoryItemDuration1.Name = "RepositoryItemDuration1" Me.RepositoryItemDuration1.Name = "RepositoryItemDuration1"
Me.RepositoryItemDuration1.NullValuePromptShowForEmptyValue = True Me.RepositoryItemDuration1.NullValuePromptShowForEmptyValue = True
Me.RepositoryItemDuration1.ShowEmptyItem = True Me.RepositoryItemDuration1.ShowEmptyItem = True
@@ -327,14 +328,14 @@ Partial Class frmCalendar
' '
Me.CalendarToolsRibbonPageCategory1.Control = Me.SchedulerControl1 Me.CalendarToolsRibbonPageCategory1.Control = Me.SchedulerControl1
Me.CalendarToolsRibbonPageCategory1.Name = "CalendarToolsRibbonPageCategory1" Me.CalendarToolsRibbonPageCategory1.Name = "CalendarToolsRibbonPageCategory1"
Me.CalendarToolsRibbonPageCategory1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.AppointmentRibbonPage1}) Me.CalendarToolsRibbonPageCategory1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.pageAppointment})
Me.CalendarToolsRibbonPageCategory1.Visible = False Me.CalendarToolsRibbonPageCategory1.Visible = False
' '
'AppointmentRibbonPage1 'pageAppointment
' '
Me.AppointmentRibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.ActionsRibbonPageGroup1, Me.OptionsRibbonPageGroup1}) Me.pageAppointment.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.ActionsRibbonPageGroup1, Me.OptionsRibbonPageGroup1})
Me.AppointmentRibbonPage1.Name = "AppointmentRibbonPage1" Me.pageAppointment.Name = "pageAppointment"
Me.AppointmentRibbonPage1.Visible = False Me.pageAppointment.Visible = False
' '
'ActionsRibbonPageGroup1 'ActionsRibbonPageGroup1
' '
@@ -351,10 +352,11 @@ Partial Class frmCalendar
Me.OptionsRibbonPageGroup1.ItemLinks.Add(Me.ChangeAppointmentReminderItem1) Me.OptionsRibbonPageGroup1.ItemLinks.Add(Me.ChangeAppointmentReminderItem1)
Me.OptionsRibbonPageGroup1.Name = "OptionsRibbonPageGroup1" Me.OptionsRibbonPageGroup1.Name = "OptionsRibbonPageGroup1"
' '
'HomeRibbonPage1 'pageCalendar
' '
Me.HomeRibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.AppointmentRibbonPageGroup1, Me.NavigatorRibbonPageGroup1, Me.ArrangeRibbonPageGroup1, Me.GroupByRibbonPageGroup1}) Me.pageCalendar.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.AppointmentRibbonPageGroup1, Me.NavigatorRibbonPageGroup1, Me.ArrangeRibbonPageGroup1, Me.GroupByRibbonPageGroup1})
Me.HomeRibbonPage1.Name = "HomeRibbonPage1" Me.pageCalendar.Name = "pageCalendar"
Me.pageCalendar.Text = "Kalender"
' '
'AppointmentRibbonPageGroup1 'AppointmentRibbonPageGroup1
' '
@@ -481,11 +483,11 @@ Partial Class frmCalendar
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(926, 597) Me.ClientSize = New System.Drawing.Size(926, 597)
Me.Controls.Add(Me.SchedulerControl1) Me.Controls.Add(Me.SchedulerControl1)
Me.Controls.Add(Me.RibbonControl1) Me.Controls.Add(Me.ribbonCalendar)
Me.Name = "frmCalendar" Me.Name = "frmCalendar"
Me.Text = "Kalender Ansicht - Brainpool" Me.Text = "Kalender Ansicht - Brainpool"
CType(Me.SchedulerControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SchedulerControl1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ribbonCalendar, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.RepositoryItemSpinEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemSpinEdit1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.RepositoryItemDuration1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemDuration1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.SchedulerStorage1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SchedulerStorage1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -504,7 +506,7 @@ Partial Class frmCalendar
Friend WithEvents TBPMO_APPOINTMENTSTableAdapter As DD_Record_Organiser.DD_DMSDataSetCalendarTableAdapters.TBPMO_APPOINTMENTSTableAdapter Friend WithEvents TBPMO_APPOINTMENTSTableAdapter As DD_Record_Organiser.DD_DMSDataSetCalendarTableAdapters.TBPMO_APPOINTMENTSTableAdapter
Friend WithEvents TBPMORESOURCESBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPMORESOURCESBindingSource As System.Windows.Forms.BindingSource
Friend WithEvents TBPMO_RESOURCESTableAdapter As DD_Record_Organiser.DD_DMSDataSetCalendarTableAdapters.TBPMO_RESOURCESTableAdapter Friend WithEvents TBPMO_RESOURCESTableAdapter As DD_Record_Organiser.DD_DMSDataSetCalendarTableAdapters.TBPMO_RESOURCESTableAdapter
Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents ribbonCalendar As DevExpress.XtraBars.Ribbon.RibbonControl
Friend WithEvents SwitchToDayViewItem1 As DevExpress.XtraScheduler.UI.SwitchToDayViewItem Friend WithEvents SwitchToDayViewItem1 As DevExpress.XtraScheduler.UI.SwitchToDayViewItem
Friend WithEvents SwitchToWorkWeekViewItem1 As DevExpress.XtraScheduler.UI.SwitchToWorkWeekViewItem Friend WithEvents SwitchToWorkWeekViewItem1 As DevExpress.XtraScheduler.UI.SwitchToWorkWeekViewItem
Friend WithEvents SwitchToWeekViewItem1 As DevExpress.XtraScheduler.UI.SwitchToWeekViewItem Friend WithEvents SwitchToWeekViewItem1 As DevExpress.XtraScheduler.UI.SwitchToWeekViewItem
@@ -534,7 +536,7 @@ Partial Class frmCalendar
Friend WithEvents ChangeAppointmentReminderItem1 As DevExpress.XtraScheduler.UI.ChangeAppointmentReminderItem Friend WithEvents ChangeAppointmentReminderItem1 As DevExpress.XtraScheduler.UI.ChangeAppointmentReminderItem
Friend WithEvents RepositoryItemDuration1 As DevExpress.XtraScheduler.UI.RepositoryItemDuration Friend WithEvents RepositoryItemDuration1 As DevExpress.XtraScheduler.UI.RepositoryItemDuration
Friend WithEvents CalendarToolsRibbonPageCategory1 As DevExpress.XtraScheduler.UI.CalendarToolsRibbonPageCategory Friend WithEvents CalendarToolsRibbonPageCategory1 As DevExpress.XtraScheduler.UI.CalendarToolsRibbonPageCategory
Friend WithEvents AppointmentRibbonPage1 As DevExpress.XtraScheduler.UI.AppointmentRibbonPage Friend WithEvents pageAppointment As DevExpress.XtraScheduler.UI.AppointmentRibbonPage
Friend WithEvents ActionsRibbonPageGroup1 As DevExpress.XtraScheduler.UI.ActionsRibbonPageGroup Friend WithEvents ActionsRibbonPageGroup1 As DevExpress.XtraScheduler.UI.ActionsRibbonPageGroup
Friend WithEvents OptionsRibbonPageGroup1 As DevExpress.XtraScheduler.UI.OptionsRibbonPageGroup Friend WithEvents OptionsRibbonPageGroup1 As DevExpress.XtraScheduler.UI.OptionsRibbonPageGroup
Friend WithEvents NewAppointmentItem1 As DevExpress.XtraScheduler.UI.NewAppointmentItem Friend WithEvents NewAppointmentItem1 As DevExpress.XtraScheduler.UI.NewAppointmentItem
@@ -547,7 +549,7 @@ Partial Class frmCalendar
Friend WithEvents GroupByNoneItem1 As DevExpress.XtraScheduler.UI.GroupByNoneItem Friend WithEvents GroupByNoneItem1 As DevExpress.XtraScheduler.UI.GroupByNoneItem
Friend WithEvents GroupByDateItem1 As DevExpress.XtraScheduler.UI.GroupByDateItem Friend WithEvents GroupByDateItem1 As DevExpress.XtraScheduler.UI.GroupByDateItem
Friend WithEvents GroupByResourceItem1 As DevExpress.XtraScheduler.UI.GroupByResourceItem Friend WithEvents GroupByResourceItem1 As DevExpress.XtraScheduler.UI.GroupByResourceItem
Friend WithEvents HomeRibbonPage1 As DevExpress.XtraScheduler.UI.HomeRibbonPage Friend WithEvents pageCalendar As DevExpress.XtraScheduler.UI.HomeRibbonPage
Friend WithEvents AppointmentRibbonPageGroup1 As DevExpress.XtraScheduler.UI.AppointmentRibbonPageGroup Friend WithEvents AppointmentRibbonPageGroup1 As DevExpress.XtraScheduler.UI.AppointmentRibbonPageGroup
Friend WithEvents NavigatorRibbonPageGroup1 As DevExpress.XtraScheduler.UI.NavigatorRibbonPageGroup Friend WithEvents NavigatorRibbonPageGroup1 As DevExpress.XtraScheduler.UI.NavigatorRibbonPageGroup
Friend WithEvents ArrangeRibbonPageGroup1 As DevExpress.XtraScheduler.UI.ArrangeRibbonPageGroup Friend WithEvents ArrangeRibbonPageGroup1 As DevExpress.XtraScheduler.UI.ArrangeRibbonPageGroup

View File

@@ -60,7 +60,7 @@
Try Try
SchedulerControl1.RestoreLayoutFromXml(XMLPath) SchedulerControl1.RestoreLayoutFromXml(XMLPath)
Catch notFoundEx As System.IO.FileNotFoundException Catch notFoundEx As System.IO.FileNotFoundException
MsgBox("Das Kalender Layout konnte nicht gefunden werden. Es wird beim Schließen der Form angelegt.", MsgBoxStyle.Information) 'MsgBox("Das Kalender Layout konnte nicht gefunden werden. Es wird beim Schließen der Form angelegt.", MsgBoxStyle.Information)
Catch ex As Exception Catch ex As Exception
MsgBox("Das Kalender Layout konnte nicht geladen werden:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Das Kalender Layout konnte nicht geladen werden:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try End Try

View File

@@ -22,18 +22,19 @@ Partial Class frmMain
'Das Bearbeiten mit dem Code-Editor ist nicht möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
Me.NotifyIcon = New System.Windows.Forms.NotifyIcon() Me.NotifyIcon = New System.Windows.Forms.NotifyIcon(Me.components)
Me.cmsSystray = New System.Windows.Forms.ContextMenuStrip() Me.cmsSystray = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ADDIBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ADDIBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.CockpitAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CockpitAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.TimerTasks = New System.Windows.Forms.Timer() Me.TimerTasks = New System.Windows.Forms.Timer(Me.components)
Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource() Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
Me.ribbonMain = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.ribbonMain = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu() Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
Me.itemInfo = New DevExpress.XtraBars.BarButtonItem() Me.itemInfo = New DevExpress.XtraBars.BarButtonItem()
Me.itemSettings = New DevExpress.XtraBars.BarButtonItem() Me.itemSettings = New DevExpress.XtraBars.BarButtonItem()
Me.itemExit = New DevExpress.XtraBars.BarButtonItem() Me.itemExit = New DevExpress.XtraBars.BarButtonItem()
@@ -65,6 +66,7 @@ Partial Class frmMain
Me.BarButtonItem21 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem21 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem22 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem22 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
Me.pageHome = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.pageHome = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.groupQuickAccessForm = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.groupQuickAccessForm = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -76,11 +78,10 @@ Partial Class frmMain
Me.RibbonPageGroupMenue = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupMenue = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
Me.DefaultLookAndFeel1 = New DevExpress.LookAndFeel.DefaultLookAndFeel() Me.DefaultLookAndFeel1 = New DevExpress.LookAndFeel.DefaultLookAndFeel(Me.components)
Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem()
Me.TimerClose3Minutes = New System.Windows.Forms.Timer() Me.TimerClose3Minutes = New System.Windows.Forms.Timer(Me.components)
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
Me.cmsSystray.SuspendLayout() Me.cmsSystray.SuspendLayout()
CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -432,6 +433,12 @@ Partial Class frmMain
Me.BarButtonItem8.Id = 44 Me.BarButtonItem8.Id = 44
Me.BarButtonItem8.Name = "BarButtonItem8" Me.BarButtonItem8.Name = "BarButtonItem8"
' '
'BarButtonItem9
'
resources.ApplyResources(Me.BarButtonItem9, "BarButtonItem9")
Me.BarButtonItem9.Id = 45
Me.BarButtonItem9.Name = "BarButtonItem9"
'
'pageHome 'pageHome
' '
Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccessForm}) Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccessForm})
@@ -545,12 +552,6 @@ Partial Class frmMain
Me.RibbonPageGroup3.Name = "RibbonPageGroup3" Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
' '
'BarButtonItem9
'
resources.ApplyResources(Me.BarButtonItem9, "BarButtonItem9")
Me.BarButtonItem9.Id = 45
Me.BarButtonItem9.Name = "BarButtonItem9"
'
'frmMain 'frmMain
' '
Me.Appearance.BackColor = CType(resources.GetObject("frmMain.Appearance.BackColor"), System.Drawing.Color) Me.Appearance.BackColor = CType(resources.GetObject("frmMain.Appearance.BackColor"), System.Drawing.Color)

View File

@@ -2080,7 +2080,7 @@ Konfiguration</value>
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>212</value> <value>132</value>
</metadata> </metadata>
<data name="frmMain.Appearance.BackColor" type="System.Drawing.Color, System.Drawing"> <data name="frmMain.Appearance.BackColor" type="System.Drawing.Color, System.Drawing">
<value>White</value> <value>White</value>
@@ -3229,6 +3229,12 @@ Konfiguration</value>
<data name="&gt;&gt;BarButtonItem8.Type" xml:space="preserve"> <data name="&gt;&gt;BarButtonItem8.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;BarButtonItem9.Name" xml:space="preserve">
<value>BarButtonItem9</value>
</data>
<data name="&gt;&gt;BarButtonItem9.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;pageHome.Name" xml:space="preserve"> <data name="&gt;&gt;pageHome.Name" xml:space="preserve">
<value>pageHome</value> <value>pageHome</value>
</data> </data>
@@ -3313,12 +3319,6 @@ Konfiguration</value>
<data name="&gt;&gt;RibbonPageGroup3.Type" xml:space="preserve"> <data name="&gt;&gt;RibbonPageGroup3.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;BarButtonItem9.Name" xml:space="preserve">
<value>BarButtonItem9</value>
</data>
<data name="&gt;&gt;BarButtonItem9.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>frmMain</value> <value>frmMain</value>
</data> </data>

View File

@@ -771,4 +771,15 @@ Public Class frmMain
frm.MdiParent = MAIN_FORM frm.MdiParent = MAIN_FORM
frm.Show() frm.Show()
End Sub End Sub
Private Sub ribbonMain_Merge(sender As Object, e As RibbonMergeEventArgs) Handles ribbonMain.Merge
'TODO: ribbonMain.Pages enhtält immer noch nicht die pageCalendar >:(
If e.MergedChild.Name = "ribbonCalendar" Then
For Each page As RibbonPage In Me.ribbonMain.Pages
If page.Name = "pageCalendar" Then
Me.ribbonMain.SelectedPage = page
End If
Next
End If
End Sub
End Class End Class