diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs index c238c0fa..f97360ae 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/MapModel.cs @@ -6,7 +6,7 @@ // 24.06.2013 //---------------------------------------------------------------------- namespace CampusAppWP8.Model.Campusmap -{ +{ using System; using System.Collections.Generic; using System.Windows; @@ -43,7 +43,7 @@ namespace CampusAppWP8.Model.Campusmap #endregion - #region Events + #region Events /// /// Delegate for MapInfo @@ -145,6 +145,7 @@ namespace CampusAppWP8.Model.Campusmap { x = this.RefPoint.X + this.MapImageOffsetX + x; y = this.RefPoint.Y + this.MapImageOffsetY - y; + return new Point(x, y); } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml index e52a35e5..4dc52a98 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml @@ -24,8 +24,7 @@ - - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs index 3f8e5308..45285d91 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs @@ -484,7 +484,7 @@ namespace CampusAppWP8.Pages.Campusmap private void SearchPlaceByNFC_Click(object sender, EventArgs e) { MessageBoxes.ShowMainModelInfoMessageBox(AppResources.ScarNfc_Search); - this.ProgressBar.Visibility = Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.device.StopSubscribingForMessage(this.ndefId); this.ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); } @@ -563,11 +563,11 @@ namespace CampusAppWP8.Pages.Campusmap if (this.Dispatcher != null) { - this.Dispatcher.BeginInvoke(new Action(() => this.ProgressBar.Visibility = Visibility.Collapsed)); + this.Dispatcher.BeginInvoke(new Action(() => this.DefHeader.ProgressVisibility = Visibility.Collapsed)); } else { - this.ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler); @@ -647,6 +647,23 @@ namespace CampusAppWP8.Pages.Campusmap MapScroller.UpdateLayout(); if (scroll) { + if (scrollPoint.X > this.campusMap.ImageWidth) + { + scrollPoint.X = this.campusMap.ImageWidth; + } + else if (scrollPoint.X < 0) + { + scrollPoint.X = 0; + } + + if (scrollPoint.Y > this.campusMap.ImageHeight) + { + scrollPoint.Y = this.campusMap.ImageHeight; + } + else if (scrollPoint.Y < 0) + { + scrollPoint.Y = 0; + } MapScroller.ScrollToVerticalOffset(scrollPoint.Y); MapScroller.ScrollToHorizontalOffset(scrollPoint.X); } @@ -666,7 +683,7 @@ namespace CampusAppWP8.Pages.Campusmap /// (Optional) the scroll. private void ShowCurrentPositionDispatcher(bool scroll = true) { - ProgressBar.Visibility = Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; Thread thread = new Thread(delegate() { this.ShowCurrentPosition(scroll); }); thread.Start(); @@ -693,11 +710,11 @@ namespace CampusAppWP8.Pages.Campusmap { if (this.Dispatcher != null) { - this.Dispatcher.BeginInvoke(new Action(() => this.ProgressBar.Visibility = Visibility.Collapsed)); + this.Dispatcher.BeginInvoke(new Action(() => this.DefHeader.ProgressVisibility = Visibility.Collapsed)); } else { - this.ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } } } @@ -716,7 +733,7 @@ namespace CampusAppWP8.Pages.Campusmap MessageBoxes.ShowMainModelInfoMessageBox(AppResources.MsgBox_NoLocation); } - this.ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } else { @@ -741,7 +758,7 @@ namespace CampusAppWP8.Pages.Campusmap } this.AddPin(x, y, type, scroll); - ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml index ca48717b..12d47a20 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml @@ -24,8 +24,7 @@ - - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml.cs index 9e77af84..7205a010 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/RoomListPage.xaml.cs @@ -317,7 +317,7 @@ namespace CampusAppWP8.Pages.Campusmap this.buildingMap = new BuildingMapModel(this.building.Building.PlaceId); this.buildingMap.ShowMapInfos += new CBMainMapModel.MapInfos(this.ShowMapInfo); - this.Header.HeaderName = AppResources.CampusMapApp_RoomListTitle + " (" + this.building.Building.GetInformationsValue(Constants.PisInformationName_ShortName) + ")"; + this.DefHeader.HeaderName = AppResources.CampusMapApp_RoomListTitle + " (" + this.building.Building.GetInformationsValue(Constants.PisInformationName_ShortName) + ")"; double y = this.building.Building.GeoRefPoint.Latitude; double x = this.building.Building.GeoRefPoint.Longitude; diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs index 3b9c9b3e..2a3626f3 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs @@ -108,6 +108,11 @@ namespace CampusAppWP8.Pages.Events protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } } /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs index ec6c2600..033b6549 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs @@ -25,7 +25,7 @@ namespace CampusAppWP8.Pages.Events /// public partial class EventPage : PhoneApplicationPage { - #region Method + #region Memeber /// /// To checking if the feed source is already set or not. @@ -92,6 +92,12 @@ namespace CampusAppWP8.Pages.Events protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } + this.DefHeader.ProgressVisibility = Visibility.Visible; if (this.isNewInstance) diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml index cdc12571..5536c1d4 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml @@ -22,8 +22,7 @@ - - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs index f0a6a0e6..337b65d8 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs @@ -41,6 +41,7 @@ namespace CampusAppWP8.Pages.Exams this.BachelorItem.Header = CampusAppWPortalLib8.Resources.AppResources.Degree_Bachelor; this.MasterItem.Header = CampusAppWPortalLib8.Resources.AppResources.Degree_Master; this.DiplomItem.Header = CampusAppWPortalLib8.Resources.AppResources.Degree_Diploma; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.InitializeFeed(); } @@ -56,12 +57,12 @@ namespace CampusAppWP8.Pages.Exams protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + if (this.feed == null) { this.InitializeFeed(); } - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; this.feed.LoadData(Utilities.GetLoadModus()); } @@ -102,14 +103,14 @@ namespace CampusAppWP8.Pages.Exams private void FeedIsReady() { this.SetupExamList(); - this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// Executes the PDF reader operation. /// Stubbfel, 03.09.2013. private void LaunchPDFReader() { - this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; this.file.SaveAndLaunchFile(); } @@ -181,7 +182,7 @@ namespace CampusAppWP8.Pages.Exams private void FeedIsFailFile() { MessageBoxResult result = MessageBoxes.ShowMainModelErrorMessageBox(AppResources.MsgBox_ErrorMainModelLoadFile); - this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// Event handler. Called by Button for click events. @@ -216,7 +217,7 @@ namespace CampusAppWP8.Pages.Exams this.file.OnFailedWeb += new ExamFile.OnFailed(this.FeedIsFailWeb); this.file.OnFailedFile += new ExamFile.OnFailed(this.FeedIsFailFile); this.file.LoadData(); - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs index 06fb6f77..b4962976 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs @@ -64,8 +64,13 @@ namespace CampusAppWP8.Pages.Links { base.OnNavigatedTo(e); + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } + this.InitializeFeeds(); - //this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.loadingFeeds = 2; this.commonLinkFeed.LoadData(Utilities.GetLoadModus()); @@ -207,7 +212,6 @@ namespace CampusAppWP8.Pages.Links this.loadingFeeds--; if (this.loadingFeeds < 1) { - //this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; this.DefHeader.ProgressVisibility = Visibility.Collapsed; } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml index 3472e14e..07850aa1 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml @@ -8,6 +8,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:lui="clr-namespace:CampusAppWP8.Utility.Lui.Button" xmlns:header="clr-namespace:CampusAppWP8.Utility.Lui.Header" + xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit" mc:Ignorable="d" FontFamily="{StaticResource PhoneFontFamilyNormal}" FontSize="{StaticResource PhoneFontSizeNormal}" @@ -22,8 +23,7 @@ - - + @@ -57,6 +57,12 @@ + + + + + + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs index 4a97aaf3..2f0ddf64 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs @@ -85,6 +85,8 @@ namespace CampusAppWP8.Pages.Mensa { menuItem3.Text = CampusAppWPortalLib8.Resources.AppResources.Campus_SFBMain; } + + this.DefHeader.ProgressVisibility = Visibility.Visible; } #endregion @@ -100,7 +102,11 @@ namespace CampusAppWP8.Pages.Mensa protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } this.InitializeFeed(); } @@ -204,7 +210,7 @@ namespace CampusAppWP8.Pages.Mensa private void FeedIsReady() { this.SetupMensaPivot(); - this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// @@ -222,7 +228,7 @@ namespace CampusAppWP8.Pages.Mensa private void FeedIsFailFile() { MessageBoxResult result = MessageBoxes.ShowMainModelErrorMessageBox(AppResources.MsgBox_ErrorMainModelLoadFile); - this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// @@ -230,7 +236,7 @@ namespace CampusAppWP8.Pages.Mensa /// private void SetupMensaPivot() { - this.Header.HeaderName = AppResources.MensaApp_Title + ": " + this.feed.Title; + this.DefHeader.HeaderName = AppResources.MensaApp_Title + ": " + this.feed.Title; this.CreatesMealIcons(); this.feed.Model.SetHolidayCaption(AppResources.MensaApp_CloseMensa); this.MensaPivot.ItemsSource = this.feed.Model.Menus; @@ -323,7 +329,7 @@ namespace CampusAppWP8.Pages.Mensa /// event args private void MensaForceUpdate_Click(object sender, EventArgs e) { - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.forceLoad = true; this.InitializeFeed(); this.refreshed = true; @@ -335,7 +341,7 @@ namespace CampusAppWP8.Pages.Mensa /// Event information. private void ApplicationBarMenuItem_Click(object sender, EventArgs e) { - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.CB_MAIN); } @@ -345,7 +351,7 @@ namespace CampusAppWP8.Pages.Mensa /// Event information. private void ApplicationBarMenuItem2_Click(object sender, EventArgs e) { - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.CB_SOUTH); } @@ -355,7 +361,7 @@ namespace CampusAppWP8.Pages.Mensa /// Event information. private void ApplicationBarMenuItem3_Click(object sender, EventArgs e) { - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.SFB_MAIN); } @@ -378,6 +384,17 @@ namespace CampusAppWP8.Pages.Mensa #endregion + private void MenuItem_Click(object sender, RoutedEventArgs e) + { + FrameworkElement frameelement = sender as FrameworkElement; + if (frameelement == null) + { + + } + string copyText = frameelement.Tag.ToString() + " (" + AppResources.Setting_UserCampus + " " + this.feed.Title + ")"; + Clipboard.SetText(copyText); + } + #endregion } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs index 30f12bb0..9939d43f 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs @@ -104,6 +104,11 @@ namespace CampusAppWP8.Pages.News protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } } /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs index 7739fd17..e51eda33 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs @@ -80,6 +80,12 @@ namespace CampusAppWP8.Pages.News protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } + this.DefHeader.ProgressVisibility = Visibility.Visible; if (this.isNewInstance) diff --git a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs index e1978021..57561fe5 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs @@ -71,12 +71,12 @@ namespace CampusAppWP8.Pages.Openinghours protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); - /* - if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) - { - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; - } - */ + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } + if (this.isNewInstance) { if ((this.feed == null) || (this.feed.Model == null)) diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml index 9f99be66..74ae667d 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml @@ -24,8 +24,7 @@ - - + @@ -35,7 +34,7 @@ - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs index 2eb35a0c..3f4837d3 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs @@ -59,7 +59,7 @@ namespace CampusAppWP8.Pages.Person this.api = new PersonSearchApi(); this.api.OnLoaded += new PersonSearchApi.OnIO(this.ApiIsReady); this.api.OnFailedLoad += new PersonSearchApi.OnFailed(this.ApiIsFail); - this.ProgressBar.Visibility = System.Windows.Visibility.Visible; + this.DefHeader.ProgressVisibility = Visibility.Visible; List parameterList = this.CreateUrlParameter(query); this.api.SetUriParams(parameterList); this.api.LoadData(); @@ -81,7 +81,7 @@ namespace CampusAppWP8.Pages.Person private void ApiIsFail() { MessageBoxResult result = MessageBoxes.ShowMainModelErrorMessageBox(AppResources.MsgBox_ErrorMainModelLoad); - this.ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// API is ready. @@ -89,7 +89,7 @@ namespace CampusAppWP8.Pages.Person private void ApiIsReady() { this.SetupResultBox(); - this.ProgressBar.Visibility = Visibility.Collapsed; + this.DefHeader.ProgressVisibility = Visibility.Collapsed; } /// Sets up the result box. diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml index 7a3c07a2..f4a8f0e0 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml @@ -25,7 +25,7 @@ - + @@ -39,11 +39,23 @@ - + + + + + + + + + + + + @@ -83,11 +95,27 @@ - + + + + + + + + + + + + + + + + @@ -126,14 +154,15 @@ - - - - + + + + + - + @@ -152,14 +181,15 @@ - + - - + + - + + @@ -174,8 +204,19 @@ - - + + + + + + + + + + + + + @@ -187,8 +228,7 @@ - - + @@ -200,25 +240,9 @@ - - - - - - - - - - - - - - - - - + - - diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs index fb4dfb53..ed26c602 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs @@ -32,6 +32,8 @@ namespace CampusAppWP8.Pages /// List of initialise courses. private CourseFeed initCourseList; + private PageOrientation prevOrientation; + #endregion #region Constructor @@ -42,6 +44,7 @@ namespace CampusAppWP8.Pages public StartPage() { this.InitializeComponent(); + ApplicationBarMenuItem menuItem1 = ApplicationBar.MenuItems[0] as ApplicationBarMenuItem; ApplicationBarMenuItem menuItem2 = ApplicationBar.MenuItems[1] as ApplicationBarMenuItem; ApplicationBarMenuItem menuItem3 = ApplicationBar.MenuItems[2] as ApplicationBarMenuItem; @@ -112,6 +115,14 @@ namespace CampusAppWP8.Pages protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + if (this.Orientation.Equals(PageOrientation.PortraitUp)|| this.Orientation.Equals(PageOrientation.PortraitDown) || this.Orientation.Equals(PageOrientation.Portrait)) + { + this.prevOrientation = PageOrientation.Portrait; + } + else + { + this.prevOrientation = PageOrientation.Landscape; + } } #endregion @@ -133,23 +144,36 @@ namespace CampusAppWP8.Pages private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e) { // Switch the placement of the buttons based on an orientation change. - if (this.Orientation == PageOrientation.LandscapeLeft) + if (this.Orientation.Equals(PageOrientation.LandscapeLeft)) { this.ContentPanel.Margin = new Thickness(24, -24, 76, 0); this.AppTitle.Margin = new Thickness(12, 17, 0, 28); - this.MoveGridToLandscape(); + if (!this.prevOrientation.Equals(PageOrientation.Landscape)) + { + this.MoveGridToLandscape(); + this.prevOrientation = PageOrientation.Landscape; + } } - else if (this.Orientation == PageOrientation.LandscapeRight) + else if (this.Orientation.Equals(PageOrientation.LandscapeRight)) { this.ContentPanel.Margin = new Thickness(76, -24, 24, 0); this.AppTitle.Margin = new Thickness(64, 17, 0, 28); - this.MoveGridToLandscape(); + if (!this.prevOrientation.Equals(PageOrientation.Landscape)) + { + this.MoveGridToLandscape(); + this.prevOrientation = PageOrientation.Landscape; + } } else { this.ContentPanel.Margin = new Thickness(12, 0, 12, 12); this.AppTitle.Margin = new Thickness(12, 17, 0, 28); - this.MoveToPortrait(); + + if (!this.prevOrientation.Equals(PageOrientation.Portrait)) + { + this.MoveToPortrait(); + this.prevOrientation = PageOrientation.Portrait; + } } } @@ -157,18 +181,19 @@ namespace CampusAppWP8.Pages /// Stubbfel, 27.08.2013. private void MoveToPortrait() { - bool test = this.Row0.Children.Remove(this.OpenHoursAppButton); - if (!test) + if (!this.Row0.Children.Contains(this.MailAppButton) + && !this.Row1.Children.Contains(this.OpenHoursAppButton) + && !this.Row2.Children.Contains(this.LinkAppButton)) { return; } + this.Row0.Children.Remove(this.MailAppButton); + this.Row3.Children.Add(this.MailAppButton); + this.MailAppButton.SetValue(Grid.ColumnProperty, 0); + this.Row1.Children.Remove(this.OpenHoursAppButton); this.Row3.Children.Add(this.OpenHoursAppButton); - this.OpenHoursAppButton.SetValue(Grid.ColumnProperty, 0); - - this.Row1.Children.Remove(this.OSAAppButton); - this.Row3.Children.Add(this.OSAAppButton); - this.OSAAppButton.SetValue(Grid.ColumnProperty, 1); + this.OpenHoursAppButton.SetValue(Grid.ColumnProperty, 1); this.Row2.Children.Remove(this.LinkAppButton); this.Row3.Children.Add(this.LinkAppButton); @@ -179,18 +204,20 @@ namespace CampusAppWP8.Pages /// Stubbfel, 27.08.2013. private void MoveGridToLandscape() { - bool test = this.Row3.Children.Remove(this.OpenHoursAppButton); - if (!test) + if (!this.Row3.Children.Contains(this.MailAppButton) + && !this.Row3.Children.Contains(this.OpenHoursAppButton) + && !this.Row3.Children.Contains(this.LinkAppButton)) { return; } - this.Row0.Children.Add(this.OpenHoursAppButton); - this.OpenHoursAppButton.SetValue(Grid.ColumnProperty, 3); + this.Row3.Children.Remove(this.MailAppButton); + this.Row0.Children.Add(this.MailAppButton); ; + this.MailAppButton.SetValue(Grid.ColumnProperty, 3); - this.Row3.Children.Remove(this.OSAAppButton); - this.Row1.Children.Add(this.OSAAppButton); - this.OSAAppButton.SetValue(Grid.ColumnProperty, 3); + this.Row3.Children.Remove(this.OpenHoursAppButton); + this.Row1.Children.Add(this.OpenHoursAppButton); + this.OpenHoursAppButton.SetValue(Grid.ColumnProperty, 3); this.Row3.Children.Remove(this.LinkAppButton); this.Row2.Children.Add(this.LinkAppButton); diff --git a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs index 836f5852..a1ea39e0 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs @@ -54,6 +54,12 @@ namespace CampusAppWP8.Pages.StudentCouncil protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); + + if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight)) + { + ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default; + } + if (this.feed == null) { this.InitializeFeed(); diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index fca0e004..d07b1785 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -159,6 +159,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Essenbeschreibung kopieren ähnelt. + /// + public static string ContextMenu_MealCopy { + get { + return ResourceManager.GetString("ContextMenu_MealCopy", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Auf Startseite ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index 59e53447..062333af 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -455,4 +455,7 @@ Ebeneauswahl + + Essenbeschreibung kopieren + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs index 306dcf2b..1bf54a22 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs @@ -19,6 +19,7 @@ namespace CampusAppWP8.Utility using Microsoft.Phone.Net.NetworkInformation; using CampusAppWPortalLib8.Utility; using CampusAppWPortalLib8.Model; + using Microsoft.Phone.Shell; /// /// Collection of utility functions.