diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index 891e313e..7f9fa3ca 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -137,6 +137,9 @@
+
+ FunctionSettingPage.xaml
+
Appointment.xaml
@@ -484,6 +487,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
index 67797334..4a95b0de 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml
@@ -9,6 +9,7 @@
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"
+ xmlns:page="clr-namespace:CampusAppWP8.Utility.Lui.Page"
FontFamily="{StaticResource PhoneFontFamilyNormal}"
FontSize="{StaticResource PhoneFontSizeNormal}"
Foreground="{StaticResource PhoneForegroundBrush}"
@@ -25,48 +26,79 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 3527c4a9..cc241977 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs
@@ -8,9 +8,7 @@
//-----------------------------------------------------------------------
namespace CampusAppWP8.Pages.Setting
{
- using System;
- using System.Windows.Navigation;
- using CampusAppWP8.Model.Setting;
+ using System.Windows.Navigation;
using Microsoft.Phone.Controls;
/// Class for the AppSettingPage.
@@ -18,10 +16,6 @@ namespace CampusAppWP8.Pages.Setting
///
public partial class AppSettingPage : PhoneApplicationPage
{
- #region Member
- /// The TagHandler model.
- private TagHandlerListPickerItemListModel taghandlerModel;
- #endregion
#region Constructor
/// Initializes a new instance of the class.
@@ -31,10 +25,6 @@ namespace CampusAppWP8.Pages.Setting
this.InitializeComponent();
this.GeoWatchToggle.IsChecked = Settings.AppSetting.GeoWatchEnable;
this.OnlyWiFiToggle.IsChecked = Settings.AppSetting.OnlyWifi;
- this.taghandlerModel = new TagHandlerListPickerItemListModel();
- this.TagHandler.ItemsSource = this.taghandlerModel.List;
- int tagselIndex = this.taghandlerModel.GetIndexOrDefault(Settings.AppSetting.TagDefaultHandler.ToString());
- this.TagHandler.SelectedIndex = tagselIndex;
}
#endregion
@@ -50,7 +40,6 @@ namespace CampusAppWP8.Pages.Setting
{
Settings.AppSetting.GeoWatchEnable = GeoWatchToggle.IsChecked.Value;
Settings.AppSetting.OnlyWifi = OnlyWiFiToggle.IsChecked.Value;
- Settings.AppSetting.TagDefaultHandler = (CampusAppWP8.Model.Setting.BTUTagDefaultHandler)Enum.Parse(typeof(CampusAppWP8.Model.Setting.BTUTagDefaultHandler), ((CampusAppWPortalLib8.Model.Utility.ListPickerItemModel)this.TagHandler.SelectedItem).Value);
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml
new file mode 100644
index 00000000..76b584f7
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs
new file mode 100644
index 00000000..98cedb3f
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/FunctionSettingPage.xaml.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Navigation;
+using Microsoft.Phone.Controls;
+using Microsoft.Phone.Shell;
+using CampusAppWP8.Resources;
+using CampusAppWP8.Model.Setting;
+
+namespace CampusAppWP8.Pages.Setting
+{
+ public partial class FunctionSettingPage : PhoneApplicationPage
+ {
+
+ #region Member
+ /// The TagHandler model.
+ private TagHandlerListPickerItemListModel taghandlerModel;
+ #endregion
+
+ #region Constructor
+
+ public FunctionSettingPage()
+ {
+ InitializeComponent();
+ this.taghandlerModel = new TagHandlerListPickerItemListModel();
+ this.TagHandler.ItemsSource = this.taghandlerModel.List;
+ int tagselIndex = this.taghandlerModel.GetIndexOrDefault(Settings.AppSetting.TagDefaultHandler.ToString());
+ this.TagHandler.SelectedIndex = tagselIndex;
+ }
+
+ #endregion
+
+ #region Methods
+
+ #region protected
+
+ /// Override the OnNavigatedTo method.
+ /// Stubbfel, 15.10.2013.
+ ///
+ protected override void OnNavigatedTo(NavigationEventArgs e)
+ {
+ base.OnNavigatedTo(e);
+
+ string functionIndex;
+
+ if (NavigationMode.New == e.NavigationMode && NavigationContext.QueryString.TryGetValue(Constants.Param_FunctionSetting_Index, out functionIndex))
+ {
+ this.SetSelecetPivotItem(functionIndex);
+ }
+ else
+ {
+ string oldIndex = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_FunctionSettingPageIndex);
+ this.SetSelecetPivotItem(oldIndex);
+ }
+ }
+
+ /// Override the OnNavigatedFrom method.
+ /// Stubbfel, 15.10.2013.
+ ///
+ protected override void OnNavigatedFrom(NavigationEventArgs e)
+ {
+ Settings.AppSetting.TagDefaultHandler = (CampusAppWP8.Model.Setting.BTUTagDefaultHandler)Enum.Parse(typeof(CampusAppWP8.Model.Setting.BTUTagDefaultHandler), ((CampusAppWPortalLib8.Model.Utility.ListPickerItemModel)this.TagHandler.SelectedItem).Value);
+ if (NavigationMode.Back == e.NavigationMode)
+ {
+ App.SaveToIsolatedStorage(Constants.IsolatedStorage_FunctionSettingPageIndex, null);
+ }
+ else
+ {
+ FrameworkElement uiElement = this.SettingFunctionPivot.SelectedItem as FrameworkElement;
+ if (uiElement != null && uiElement.Tag != null)
+ {
+ App.SaveToIsolatedStorage(Constants.IsolatedStorage_FunctionSettingPageIndex, uiElement.Tag.ToString());
+ }
+ }
+ }
+
+ #endregion
+
+ #region private
+
+ private void SetSelecetPivotItem(string itemTag)
+ {
+ if (itemTag != null)
+ {
+ foreach (FrameworkElement pivotItem in this.SettingFunctionPivot.Items)
+ {
+ if (pivotItem.Tag != null && itemTag.Equals(pivotItem.Tag.ToString()))
+ {
+ this.SettingFunctionPivot.SetValue(Pivot.SelectedItemProperty, pivotItem);
+
+ return;
+ }
+ }
+ }
+ this.SettingFunctionPivot.SelectedIndex = 0;
+
+ }
+
+ #endregion
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
index 58cd202d..815f21df 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
@@ -1221,6 +1221,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Funktionseinstellungen ähnelt.
+ ///
+ public static string Setting_Function {
+ get {
+ return ResourceManager.GetString("Setting_Function", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die Allgemeine Einstellungen ähnelt.
///
@@ -1230,6 +1239,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Ortung & Netzwerk ähnelt.
+ ///
+ public static string Setting_GeneralNetwork {
+ get {
+ return ResourceManager.GetString("Setting_GeneralNetwork", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die Über BTU Campus-App ähnelt.
///
@@ -1248,6 +1266,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag ähnelt.
+ ///
+ public static string Setting_Tag {
+ get {
+ return ResourceManager.GetString("Setting_Tag", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag-Standardfunktion ähnelt.
///
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index bdca8995..ab6e45d6 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -632,7 +632,16 @@
Räume
+
+ Funktionseinstellungen
+
+
+ Ortung & Netzwerk
+
Sonstige Einstellungen
+
+ BTU-Tag
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
index bcad4e3a..bf2c4707 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
@@ -624,4 +624,22 @@
/Pages/Setting/Impressum.xaml
+
+ Mensafunction
+
+
+ Tagfunction
+
+
+ TimeTablefunction
+
+
+ FunctionSettingPageIndex
+
+
+ FunctionSettingIndex
+
+
+ /Pages/Setting/FunctionSettingPage.xaml
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
index 17e874ae..e40dccbf 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
@@ -438,6 +438,33 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Mensafunction ähnelt.
+ ///
+ public static string FunctionSetting_Mensa {
+ get {
+ return ResourceManager.GetString("FunctionSetting_Mensa", resourceCulture);
+ }
+ }
+
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Tagfunction ähnelt.
+ ///
+ public static string FunctionSetting_Tag {
+ get {
+ return ResourceManager.GetString("FunctionSetting_Tag", resourceCulture);
+ }
+ }
+
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die TimeTablefunction ähnelt.
+ ///
+ public static string FunctionSetting_TimeTable {
+ get {
+ return ResourceManager.GetString("FunctionSetting_TimeTable", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die CurrentPositionPoint ähnelt.
///
@@ -492,6 +519,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die FunctionSettingPageIndex ähnelt.
+ ///
+ public static string IsolatedStorage_FunctionSettingPageIndex {
+ get {
+ return ResourceManager.GetString("IsolatedStorage_FunctionSettingPageIndex", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die LectureAppointment ähnelt.
///
@@ -645,6 +681,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die FunctionSettingIndex ähnelt.
+ ///
+ public static string Param_FunctionSetting_Index {
+ get {
+ return ResourceManager.GetString("Param_FunctionSetting_Index", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die BuildingId ähnelt.
///
@@ -1050,6 +1095,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die /Pages/Setting/FunctionSettingPage.xaml ähnelt.
+ ///
+ public static string PathSetting_Function {
+ get {
+ return ResourceManager.GetString("PathSetting_Function", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die /Pages/Setting/Impressum.xaml ähnelt.
///