From 41780b5c35b2f6fd40f9d8f6eb04186684d1da0a Mon Sep 17 00:00:00 2001 From: stubbfel Date: Mon, 25 Nov 2013 18:43:36 +0100 Subject: [PATCH] finish #282 --- CampusAppWP8/CampusAppWP8/App.xaml | 1 + CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 5 + .../Model/Setting/MensaSetting.cs | 38 +++++ .../Pages/Setting/AppSettingPage.xaml | 97 ++++++++---- .../Pages/Setting/AppSettingPage.xaml.cs | 53 ++++++- .../Pages/Setting/FunctionSettingPage.xaml | 148 ++++++++++++++---- .../Pages/Setting/FunctionSettingPage.xaml.cs | 82 ++++++++-- .../Pages/Setting/UserProfil.xaml | 6 + .../Pages/Setting/UserProfil.xaml.cs | 10 ++ .../CampusAppWP8/Pages/StartPage.xaml.cs | 2 - .../Resources/AppResources.Designer.cs | 47 +++++- .../CampusAppWP8/Resources/AppResources.resx | 17 +- .../CampusAppWP8/Resources/Constants.resx | 11 +- .../Resources/Constants1.Designer.cs | 81 +++++----- CampusAppWP8/CampusAppWP8/Settings.cs | 6 + CampusAppWP8/CampusAppWP8/Styles/Labels.xaml | 13 ++ .../Lui/Button/ResetSettingButtonAppBar.cs | 43 +++++ .../Utility/Lui/Button/ToDefaultButton.cs | 5 +- .../Utility/CampusListPickerItemListModel.cs | 13 +- .../Resources/AppResources.Designer.cs | 9 ++ .../Resources/AppResources.resx | 3 + 21 files changed, 564 insertions(+), 126 deletions(-) create mode 100644 CampusAppWP8/CampusAppWP8/Styles/Labels.xaml create mode 100644 CampusAppWP8/CampusAppWP8/Utility/Lui/Button/ResetSettingButtonAppBar.cs diff --git a/CampusAppWP8/CampusAppWP8/App.xaml b/CampusAppWP8/CampusAppWP8/App.xaml index a4aef1d3..1d6fd99b 100644 --- a/CampusAppWP8/CampusAppWP8/App.xaml +++ b/CampusAppWP8/CampusAppWP8/App.xaml @@ -12,6 +12,7 @@ + diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 284780aa..0fbc7b96 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -260,6 +260,7 @@ + DefaultHeader.xaml @@ -541,6 +542,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + MSBuild:Compile Designer diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/MensaSetting.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/MensaSetting.cs index 8092d939..7bd45f60 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Setting/MensaSetting.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Setting/MensaSetting.cs @@ -9,6 +9,7 @@ namespace CampusAppWP8.Model.Setting { using CampusAppWP8.Resources; +using CampusAppWPortalLib8.Model.Settings; /// A mensa setting. /// Stubbfel, 25.11.2013. @@ -31,6 +32,42 @@ namespace CampusAppWP8.Model.Setting } } + /// Gets or sets the default mensa. + /// The default mensa. + public Campus DefaultMensa + { + get + { + return App.LoadFromAppState(Constants.Setting_Mensa_DefaultCampus); + } + + set + { + App.SaveToAppState(Constants.Setting_Mensa_DefaultCampus, value); + } + } + + /// Gets or sets the selected mensa. + /// The selected mensa. + public Campus SelectedMensa + { + get + { + Campus mensa = App.LoadFromAppState(Constants.Setting_Mensa_DefaultCampus); + if (mensa == Campus.UserSettingCampus) + { + mensa = Settings.UserProfil.DefaultCampus; + } + return mensa; + } + + set + { + App.SaveToAppState(Constants.Setting_Mensa_DefaultCampus, value); + } + } + + #endregion #region method @@ -41,6 +78,7 @@ namespace CampusAppWP8.Model.Setting { // set Deploynumber this.AtomMensaSelection = true; + this.DefaultMensa = Campus.UserSettingCampus; } #endregion } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml index b0a5ca68..6762f89b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml @@ -39,13 +39,11 @@ - + - - - + @@ -53,52 +51,91 @@ + + + + + + + + - + - - - - - - - + + + + + + + + + + + + - - - - - + + + + - - - - - + + + + - - - - + + + + + + + + + + + + + - + + + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs index 246694da..cd6422bf 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs @@ -8,6 +8,7 @@ //----------------------------------------------------------------------- namespace CampusAppWP8.Pages.Setting { + using System; using System.Windows.Navigation; using CampusAppWP8.Resources; using Microsoft.Phone.Controls; @@ -15,7 +16,7 @@ namespace CampusAppWP8.Pages.Setting /// Class for the AppSettingPage. /// Stubbfel, 15.10.2013. /// - public partial class AppSettingPage : PhoneApplicationPage + public partial class AppSettingPage : PhoneApplicationPage, IRefreshingPage { #region Constructor @@ -24,14 +25,25 @@ namespace CampusAppWP8.Pages.Setting public AppSettingPage() { this.InitializeComponent(); - this.GeoWatchToggle.IsChecked = Settings.AppSetting.LocatingSetting.GeoWatchEnable; - this.OnlyWiFiToggle.IsChecked = Settings.AppSetting.NetworkSetting.OnlyWifi; + this.LoadSettings(); } #endregion #region Method + #region public + + /// Refresh page. + /// Stubbfel, 25.11.2013. + /// + public void RefreshPage() + { + this.LoadSettings(); + } + #endregion + + #region protected /// Override the OnNavigatedTo method. /// Stubbfel, 15.10.2013. /// @@ -40,7 +52,6 @@ namespace CampusAppWP8.Pages.Setting base.OnNavigatedTo(e); string functionIndex; - if (NavigationMode.New != e.NavigationMode && NavigationContext.QueryString.TryGetValue(Constants.Param_FunctionSetting_Index, out functionIndex)) { int oldIndex = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_GeneralSettingPageIndex); @@ -55,8 +66,7 @@ namespace CampusAppWP8.Pages.Setting { if (NavigationMode.Back == e.NavigationMode) { - Settings.AppSetting.LocatingSetting.GeoWatchEnable = GeoWatchToggle.IsChecked.Value; - Settings.AppSetting.NetworkSetting.OnlyWifi = OnlyWiFiToggle.IsChecked.Value; + this.SaveSettings(); App.SaveToIsolatedStorage(Constants.IsolatedStorage_GeneralSettingPageIndex, 0); } else @@ -66,5 +76,36 @@ namespace CampusAppWP8.Pages.Setting } #endregion + + #region private + /// Loads the settings. + /// Stubbfel, 25.11.2013. + private void LoadSettings() + { + this.GeoWatchToggle.IsChecked = Settings.AppSetting.LocatingSetting.GeoWatchEnable; + this.OnlyWiFiToggle.IsChecked = Settings.AppSetting.NetworkSetting.OnlyWifi; + } + + /// Saves the settings. + /// Stubbfel, 25.11.2013. + private void SaveSettings() + { + Settings.AppSetting.LocatingSetting.GeoWatchEnable = GeoWatchToggle.IsChecked.Value; + Settings.AppSetting.NetworkSetting.OnlyWifi = OnlyWiFiToggle.IsChecked.Value; + } + + /// Event handler. Called by ResetSettingButtonAppBar for click events. + /// Stubbfel, 25.11.2013. + /// Source of the event. + /// Event information. + private void ResetSettingButtonAppBar_Click(object sender, EventArgs e) + { + Settings.AppSetting.SetSettingToDefault(); + this.LoadSettings(); + } + + #endregion + + #endregion } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml index 703441f0..964d3ef6 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml @@ -30,7 +30,7 @@ Name="DefHeader" HeaderName="{Binding Path=LocalizedResources.Setting_Function, Source={StaticResource LocalizedStrings}}"/> - + @@ -38,53 +38,137 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs index c4fa9c1f..b1956ad7 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs @@ -14,15 +14,19 @@ namespace CampusAppWP8.Pages.Setting using CampusAppWP8.Model.Setting; using CampusAppWP8.Resources; using Microsoft.Phone.Controls; + using CampusAppWPortalLib8.Model.Utility; /// A function setting page. /// Stubbfel, 25.11.2013. /// - public partial class FunctionSettingPage : PhoneApplicationPage + public partial class FunctionSettingPage : PhoneApplicationPage, IRefreshingPage { #region Member /// The TagHandler model. private TagHandlerListPickerItemListModel taghandlerModel; + + /// List of campus. + private CampusListPickerItemListModel campusList; #endregion #region Constructor @@ -32,18 +36,24 @@ namespace CampusAppWP8.Pages.Setting public FunctionSettingPage() { this.InitializeComponent(); - this.taghandlerModel = new TagHandlerListPickerItemListModel(); - this.TagHandler.ItemsSource = this.taghandlerModel.List; - int tagselIndex = this.taghandlerModel.GetIndexOrDefault(Settings.AppSetting.FunctionSettings.TagSetting.TagDefaultHandler.ToString()); - this.TagHandler.SelectedIndex = tagselIndex; - - this.AtomMensaToggle.IsChecked = Settings.AppSetting.FunctionSettings.MensaSetting.AtomMensaSelection; + this.LoadSettings(); } #endregion #region Methods + #region public + + /// Refresh page. + /// Stubbfel, 25.11.2013. + /// + public void RefreshPage() + { + this.LoadSettings(); + } + #endregion + #region protected /// Override the OnNavigatedTo method. @@ -71,8 +81,8 @@ namespace CampusAppWP8.Pages.Setting /// protected override void OnNavigatedFrom(NavigationEventArgs e) { - Settings.AppSetting.FunctionSettings.TagSetting.TagDefaultHandler = (CampusAppWP8.Model.Setting.BTUTagDefaultHandler)Enum.Parse(typeof(CampusAppWP8.Model.Setting.BTUTagDefaultHandler), ((CampusAppWPortalLib8.Model.Utility.ListPickerItemModel)this.TagHandler.SelectedItem).Value); - Settings.AppSetting.FunctionSettings.MensaSetting.AtomMensaSelection = this.AtomMensaToggle.IsChecked.Value; + base.OnNavigatedFrom(e); + this.SaveSettings(); if (NavigationMode.Back == e.NavigationMode) { @@ -113,6 +123,60 @@ namespace CampusAppWP8.Pages.Setting this.SettingFunctionPivot.SelectedIndex = 0; } + /// Loads the settings. + /// Stubbfel, 25.11.2013. + private void LoadSettings() + { + if (this.taghandlerModel == null) + { + this.taghandlerModel = new TagHandlerListPickerItemListModel(); + this.TagHandler.ItemsSource = this.taghandlerModel.List; + } + + int tagselIndex = this.taghandlerModel.GetIndexOrDefault(Settings.AppSetting.FunctionSettings.TagSetting.TagDefaultHandler.ToString()); + this.TagHandler.SelectedIndex = tagselIndex; + + this.AtomMensaToggle.IsChecked = Settings.AppSetting.FunctionSettings.MensaSetting.AtomMensaSelection; + + if (this.campusList == null) + { + this.campusList = new CampusListPickerItemListModel(true); + this.Mensa.ItemsSource = campusList.List; + } + this.Mensa.SelectedIndex = campusList.GetIndexOrDefault(((int)Settings.AppSetting.FunctionSettings.MensaSetting.DefaultMensa).ToString()); + + } + + /// Saves the settings. + /// Stubbfel, 25.11.2013. + private void SaveSettings() + { + Settings.AppSetting.FunctionSettings.TagSetting.TagDefaultHandler = (CampusAppWP8.Model.Setting.BTUTagDefaultHandler)Enum.Parse(typeof(CampusAppWP8.Model.Setting.BTUTagDefaultHandler), ((CampusAppWPortalLib8.Model.Utility.ListPickerItemModel)this.TagHandler.SelectedItem).Value); + Settings.AppSetting.FunctionSettings.MensaSetting.AtomMensaSelection = this.AtomMensaToggle.IsChecked.Value; + Settings.AppSetting.FunctionSettings.MensaSetting.DefaultMensa = (CampusAppWPortalLib8.Model.Settings.Campus)Enum.Parse(typeof(CampusAppWPortalLib8.Model.Settings.Campus), ((ListPickerItemModel)this.Mensa.SelectedItem).Value); + } + + + /// + /// Event handler. Called by SettingFunctionPivot for selection changed events. + /// + /// Stubbfel, 25.11.2013. + /// Source of the event. + /// Selection changed event information. + private void SettingFunctionPivot_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e) + { + this.SaveSettings(); + } + + /// Event handler. Called by ResetSettingButtonAppBar for click events. + /// Stubbfel, 25.11.2013. + /// Source of the event. + /// Event information. + private void ResetSettingButtonAppBar_Click(object sender, EventArgs e) + { + Settings.AppSetting.FunctionSettings.SetSettingToDefault(); + this.LoadSettings(); + } #endregion #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml index f92c9a07..5c6dcc7f 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml @@ -8,6 +8,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit" xmlns:header="clr-namespace:CampusAppWP8.Utility.Lui.Header" + xmlns:lui="clr-namespace:CampusAppWP8.Utility.Lui.Button" FontFamily="{StaticResource PhoneFontFamilyNormal}" FontSize="{StaticResource PhoneFontSizeNormal}" Foreground="{StaticResource PhoneForegroundBrush}" @@ -154,4 +155,9 @@ + + + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs index 95dcd530..ef77dba2 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs @@ -115,6 +115,16 @@ namespace CampusAppWP8.Pages.Setting } } + /// Event handler. Called by ResetSettingButtonAppBar for click events. + /// Stubbfel, 25.11.2013. + /// Source of the event. + /// Event information. + private void ResetSettingButtonAppBar_Click(object sender, EventArgs e) + { + Settings.UserProfil.SetSettingToDefault(); + this.LoadListPicker(); + } + #endregion #endregion diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs index 79081ac9..8f103089 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs @@ -66,9 +66,7 @@ namespace CampusAppWP8.Pages Settings.SetSettingToDefault(); this.ShowOptIns(); Settings.AppSetting.InitApp = true; - } - Settings.SetSettingToDefault("APPSETTING"); } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index 933f65e5..034721f2 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -1131,6 +1131,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die zurück-setzen ähnelt. + /// + public static string ResetBtn { + get { + return ResourceManager.GetString("ResetBtn", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die LeftToRight ähnelt. /// @@ -1230,6 +1239,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Darstellung ähnelt. + /// + public static string Setting_Display_Short { + get { + return ResourceManager.GetString("Setting_Display_Short", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Funktionseinstellungen ähnelt. /// @@ -1239,6 +1257,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Funktionen ähnelt. + /// + public static string Setting_Function_Short { + get { + return ResourceManager.GetString("Setting_Function_Short", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Allgemeine Einstellungen ähnelt. /// @@ -1249,7 +1276,7 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die Ort. & Netzw. ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Ort. & Netz ähnelt. /// public static string Setting_GeneralNetwork { get { @@ -1266,6 +1293,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Mensa ähnelt. + /// + public static string Setting_Mensa { + get { + return ResourceManager.GetString("Setting_Mensa", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Sonstige Einstellungen ähnelt. /// @@ -1383,6 +1419,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Einstellung zurücksetzen ähnelt. + /// + public static string SettingToDefault { + get { + return ResourceManager.GetString("SettingToDefault", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die klein ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index 371bc0db..711c1ded 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -639,7 +639,7 @@ Funktionseinstellungen - Ort. & Netzw. + Ort. & Netz Sonstige Einstellungen @@ -647,4 +647,19 @@ BTU-Tag + + zurück-setzen + + + Einstellung zurücksetzen + + + Darstellung + + + Funktionen + + + Mensa + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index 7d604fab..5f02e256 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -660,19 +660,22 @@ Appsetting_Networksetting - + Appsetting_Functionsetting - + Appsetting_Functionsetting_Mensasetting - + Appsetting_Functionsetting_Tagsetting - + Appsetting_Functionsetting_TimeTablesetting Setting + + MensaDefaultCampus + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index f54a77c0..4b3fe01c 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -1392,6 +1392,42 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die Appsetting_Functionsetting ähnelt. + /// + public static string Setting_AppSetting_FunctionSetting_Enum { + get { + return ResourceManager.GetString("Setting_AppSetting_FunctionSetting_Enum", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Appsetting_Functionsetting_Mensasetting ähnelt. + /// + public static string Setting_AppSetting_FunctionSetting_MensaSetting_Enum { + get { + return ResourceManager.GetString("Setting_AppSetting_FunctionSetting_MensaSetting_Enum", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Appsetting_Functionsetting_Tagsetting ähnelt. + /// + public static string Setting_AppSetting_FunctionSetting_TagSetting_Enum { + get { + return ResourceManager.GetString("Setting_AppSetting_FunctionSetting_TagSetting_Enum", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Appsetting_Functionsetting_TimeTablesetting ähnelt. + /// + public static string Setting_AppSetting_FunctionSetting_TimeTableSetting_Enum { + get { + return ResourceManager.GetString("Setting_AppSetting_FunctionSetting_TimeTableSetting_Enum", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Appsetting_Locatingsetting ähnelt. /// @@ -1410,42 +1446,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Appsetting_Functionsetting ähnelt. - /// - public static string Setting_ApSetting_FunctionSetting_Enum { - get { - return ResourceManager.GetString("Setting_ApSetting_FunctionSetting_Enum", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Appsetting_Functionsetting_Mensasetting ähnelt. - /// - public static string Setting_ApSetting_FunctionSetting_MensaSetting_Enum { - get { - return ResourceManager.GetString("Setting_ApSetting_FunctionSetting_MensaSetting_Enum", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Appsetting_Functionsetting_Tagsetting ähnelt. - /// - public static string Setting_ApSetting_FunctionSetting_TagSetting_Enum { - get { - return ResourceManager.GetString("Setting_ApSetting_FunctionSetting_TagSetting_Enum", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Appsetting_Functionsetting_TimeTablesetting ähnelt. - /// - public static string Setting_ApSetting_FunctionSetting_TimeTableSetting_Enum { - get { - return ResourceManager.GetString("Setting_ApSetting_FunctionSetting_TimeTableSetting_Enum", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die 767 ähnelt. /// @@ -1473,6 +1473,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die MensaDefaultCampus ähnelt. + /// + public static string Setting_Mensa_DefaultCampus { + get { + return ResourceManager.GetString("Setting_Mensa_DefaultCampus", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die UserSetting ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Settings.cs b/CampusAppWP8/CampusAppWP8/Settings.cs index 2f4dac9a..1731e7b2 100644 --- a/CampusAppWP8/CampusAppWP8/Settings.cs +++ b/CampusAppWP8/CampusAppWP8/Settings.cs @@ -96,9 +96,15 @@ namespace CampusAppWP8 AppSetting.FunctionSettings.SetSettingToDefault(); break; case SettingType.Appsetting_Locatingsetting: + + // spezial case AppSetting.LocatingSetting.SetSettingToDefault(); + AppSetting.NetworkSetting.SetSettingToDefault(); break; case SettingType.Appsetting_Networksetting: + + // spezial case + AppSetting.LocatingSetting.SetSettingToDefault(); AppSetting.NetworkSetting.SetSettingToDefault(); break; case SettingType.Appsetting_Functionsetting_Mensasetting: diff --git a/CampusAppWP8/CampusAppWP8/Styles/Labels.xaml b/CampusAppWP8/CampusAppWP8/Styles/Labels.xaml new file mode 100644 index 00000000..99c12003 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Styles/Labels.xaml @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/ResetSettingButtonAppBar.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/ResetSettingButtonAppBar.cs new file mode 100644 index 00000000..1e31b756 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/ResetSettingButtonAppBar.cs @@ -0,0 +1,43 @@ +//----------------------------------------------------------------------- +// +// The MIT License (MIT). Copyright (c) 2013 BTU/IIT. +// +// Stubbfel +// 15.10.2013 +// Implements the update button application bar class +//----------------------------------------------------------------------- +namespace CampusAppWP8.Utility.Lui.Button +{ + using System; + using CampusAppWP8.Resources; + using Microsoft.Phone.Shell; + + /// This class create an Button which start the Email-Client. + /// Stubbfel, 15.10.2013. + /// + public class ResetSettingButtonAppBar : ApplicationBarIconButton + { + #region Members + + /// IconUri of the Button. + private static Uri iconUri = new Uri(Icons.Link, UriKind.Relative); + + /// Text of the Button. + private static string text = AppResources.ResetBtn; + + #endregion + + #region Constructors + + /// Initializes a new instance of the class. + /// Stubbfel, 15.10.2013. + public ResetSettingButtonAppBar() + : base() + { + this.IconUri = ResetSettingButtonAppBar.iconUri; + this.Text = ResetSettingButtonAppBar.text; + } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/ToDefaultButton.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/ToDefaultButton.cs index b858e467..f75ad7eb 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/ToDefaultButton.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/ToDefaultButton.cs @@ -12,8 +12,9 @@ namespace CampusAppWP8.Utility.Lui.Button using System.Windows; using System.Windows.Controls; using System.Windows.Media.Imaging; - using CampusAppWP8.Resources; using CampusAppWP8.Pages.Setting; + using CampusAppWP8.Resources; + /// Add person button. /// Stubbfel, 12.09.2013. @@ -67,7 +68,7 @@ namespace CampusAppWP8.Utility.Lui.Button { Settings.SetSettingToDefault(this.SettingType.ToString()); Page page = App.RootFrame.Content as Page; - if (page.GetType().IsAssignableFrom(typeof(IRefreshingPage))) + if (typeof(IRefreshingPage).IsInstanceOfType(page)) { ((IRefreshingPage)page).RefreshPage(); } diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs index 87d175ac..810cd1be 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs @@ -21,10 +21,11 @@ namespace CampusAppWPortalLib8.Model.Utility /// Initializes a new instance of the class. /// /// Stubbfel, 15.10.2013. - public CampusListPickerItemListModel() + /// (Optional) the user settings. + public CampusListPickerItemListModel(bool userSettings = false) : base() { - this.LoadList(); + this.LoadList(userSettings); } #endregion @@ -33,9 +34,15 @@ namespace CampusAppWPortalLib8.Model.Utility /// Overrides the LoadList-Method /// Stubbfel, 15.10.2013. + /// (Optional) the user settings. /// - protected override void LoadList() + protected void LoadList(bool userSettings = false) { + if (userSettings) + { + this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.UserSettingCampus).ToString(), AppResources.Campus_UserSetting); + } + this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.CB_MAIN).ToString(), AppResources.Campus_CBMain)); this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.CB_NORTH).ToString(), AppResources.Campus_CBNorth)); this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.CB_SOUTH).ToString(), AppResources.Campus_CBSouth)); diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs index c607563d..be12509b 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs @@ -97,6 +97,15 @@ namespace CampusAppWPortalLib8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die wie in Profileinstellungen ähnelt. + /// + public static string Campus_UserSetting { + get { + return ResourceManager.GetString("Campus_UserSetting", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Bachelor ähnelt. /// diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx index 475cb1d9..80d424b6 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx @@ -129,6 +129,9 @@ Senftenberg + + wie in Profileinstellungen + Bachelor