diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/departments_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/departments_159.png
deleted file mode 100644
index 917436d2..00000000
Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/departments_159.png and /dev/null differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lehrstuehle_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lehrstuehle_159.png
new file mode 100644
index 00000000..02d15bff
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lehrstuehle_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/mensa_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/mensa_159.png
deleted file mode 100644
index 3a6abae2..00000000
Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/mensa_159.png and /dev/null differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/mensaplan_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/mensaplan_159.png
new file mode 100644
index 00000000..fe25b542
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/mensaplan_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pos_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pos_159.png
new file mode 100644
index 00000000..7c9b56cc
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pos_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png
index 26ab3658..998d470e 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/departments_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lehrstuehle_159.png
similarity index 100%
rename from CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/departments_159.png
rename to CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lehrstuehle_159.png
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/mensa_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/mensa_159.png
deleted file mode 100644
index e1f15575..00000000
Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/mensa_159.png and /dev/null differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/mensaplan_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/mensaplan_159.png
new file mode 100644
index 00000000..2327a52d
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/mensaplan_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pos_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pos_159.png
new file mode 100644
index 00000000..757bb58f
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pos_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/student_council_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/student_council_159.png
index 47ed68d2..29fc275b 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/student_council_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/student_council_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index e9db4ecf..d92bee1e 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -140,6 +140,9 @@
+
+ BTUTagInfo.xaml
+
RoomListPage.xaml
@@ -290,6 +293,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -433,6 +440,14 @@
PreserveNewest
+
+
+
+
+
+
+
+
@@ -468,12 +483,10 @@
-
-
@@ -486,10 +499,6 @@
-
-
-
-
diff --git a/CampusAppWP8/CampusAppWP8/Pages/BTTTag/BTUTagInfo.xaml b/CampusAppWP8/CampusAppWP8/Pages/BTTTag/BTUTagInfo.xaml
new file mode 100644
index 00000000..b1b64e26
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Pages/BTTTag/BTUTagInfo.xaml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Pages/BTTTag/BTUTagInfo.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/BTTTag/BTUTagInfo.xaml.cs
new file mode 100644
index 00000000..766b94ef
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Pages/BTTTag/BTUTagInfo.xaml.cs
@@ -0,0 +1,20 @@
+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;
+
+namespace CampusAppWP8.Pages.BTTTag
+{
+ public partial class BTUTagInfo : PhoneApplicationPage
+ {
+ public BTUTagInfo()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
index 45285d91..6e076da1 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
@@ -16,7 +16,9 @@ namespace CampusAppWP8.Pages.Campusmap
using System.Threading;
using System.Windows;
using System.Windows.Controls;
+ using System.Windows.Input;
using System.Windows.Navigation;
+ using Windows.Networking.Proximity;
using CampusAppWP8.File.Places;
using CampusAppWP8.Model.Campusmap;
using CampusAppWP8.Model.GeoDb;
@@ -26,8 +28,6 @@ namespace CampusAppWP8.Pages.Campusmap
using CampusAppWP8.Utility.NDEF;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell;
- using Windows.Networking.Proximity;
- using System.Windows.Input;
/// Class for the campusMap page.
/// Stubbfel, 19.08.2013.
@@ -66,6 +66,8 @@ namespace CampusAppWP8.Pages.Campusmap
///
private bool buildInfoEnable;
+ private long ndefId;
+
#endregion
#region Constructor
@@ -82,12 +84,12 @@ namespace CampusAppWP8.Pages.Campusmap
if (menuItem1 != null)
{
- menuItem1.Text = AppResources.CampusMapApp_ScanQR;
+ menuItem1.Text = AppResources.App_ScanQR;
}
if (menuItem2 != null)
{
- menuItem2.Text = AppResources.CampusMapApp_ScanNfc;
+ menuItem2.Text = AppResources.App_ScanNfc;
}
if (menuItem3 != null)
@@ -118,7 +120,6 @@ namespace CampusAppWP8.Pages.Campusmap
/// Event for loading places
///
public event LoadingPlace OnLoadingPlace;
- private long ndefId;
#endregion
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
index 9126ab91..647e3a79 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
@@ -23,6 +23,7 @@ namespace CampusAppWP8.Pages.Dev
using Microsoft.Devices;
using Microsoft.Phone.Controls;
using ZXing;
+ using CampusAppWP8.Utility.Lui.MessageBoxes;
///
/// QR Code scanner.
@@ -237,7 +238,7 @@ namespace CampusAppWP8.Pages.Dev
}
else
{
- MessageBox.Show(result.Text);
+ MessageBoxes.ShowBtuTagInfoOkCancelMessageBox(result.Text);
}
});
}
@@ -259,10 +260,10 @@ namespace CampusAppWP8.Pages.Dev
{
//if (this.isInAutofocus == false)
//{
- this.cam.GetPreviewBufferArgb32(buffer);
+ this.cam.GetPreviewBufferArgb32(buffer);
- this.OnCaptureImage(buffer, (int)resolution.Width, (int)resolution.Height);
- this.isInAutofocus = true;
+ this.OnCaptureImage(buffer, (int)resolution.Width, (int)resolution.Height);
+ this.isInAutofocus = true;
//}
System.Threading.Thread.Sleep(1000);
diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
index f4a8f0e0..c2246c28 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
@@ -157,7 +157,7 @@
-
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
index ed26c602..4378ec9e 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
@@ -9,18 +9,21 @@ namespace CampusAppWP8.Pages
{
using System;
using System.Linq;
+ using System.Runtime.InteropServices.WindowsRuntime;
using System.Threading;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Navigation;
+ using Windows.Networking.Proximity;
using CampusAppWP8.Feed.Utility;
+ using CampusAppWP8.File.Places;
using CampusAppWP8.Resources;
using CampusAppWP8.Utility;
using CampusAppWP8.Utility.Lui.MessageBoxes;
+ using CampusAppWP8.Utility.Lui.Tiles;
+ using CampusAppWP8.Utility.NDEF;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell;
- using CampusAppWP8.File.Places;
- using CampusAppWP8.Utility.Lui.Tiles;
///
/// Class for the StartPage
@@ -29,6 +32,9 @@ namespace CampusAppWP8.Pages
{
#region Member
+ /// The device.
+ private readonly ProximityDevice device = ProximityDevice.GetDefault();
+
/// List of initialise courses.
private CourseFeed initCourseList;
@@ -60,18 +66,16 @@ namespace CampusAppWP8.Pages
menuItem2.Text = AppResources.Setting_ApplAppBarTitle;
}
- if (Settings.AppSetting.DevMode)
+ if (menuItem3 != null)
{
- if (menuItem3 != null)
- {
- menuItem3.Text = "Nfc";
- }
-
- if (menuItem4 != null)
- {
- menuItem4.Text = "QR-Reader";
- }
+ menuItem3.Text = AppResources.App_ScanQR;
}
+
+ if (menuItem4 != null)
+ {
+ menuItem4.Text = AppResources.App_ScanNfc;
+ }
+
else
{
ApplicationBar.MenuItems.RemoveAt(ApplicationBar.MenuItems.Count - 1);
@@ -102,6 +106,8 @@ namespace CampusAppWP8.Pages
file.LoadData();
}
+ private long ndefId;
+
#endregion
#region Method
@@ -115,7 +121,7 @@ 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))
+ if (this.Orientation.Equals(PageOrientation.PortraitUp) || this.Orientation.Equals(PageOrientation.PortraitDown) || this.Orientation.Equals(PageOrientation.Portrait))
{
this.prevOrientation = PageOrientation.Portrait;
}
@@ -123,6 +129,19 @@ namespace CampusAppWP8.Pages
{
this.prevOrientation = PageOrientation.Landscape;
}
+
+ ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler);
+ }
+
+ ///
+ /// Methods overrides the OnNavigatedFrom-Method
+ ///
+ /// some NavigationEventArgs
+ protected override void OnNavigatedFrom(NavigationEventArgs e)
+ {
+ this.device.StopSubscribingForMessage(ndefId);
+
+ base.OnNavigatedFrom(e);
}
#endregion
@@ -251,10 +270,10 @@ namespace CampusAppWP8.Pages
///
/// Caller of the function
/// some EventArgs
- private void ApplicationBarMenuItem3_Click(object sender, EventArgs e)
+ private void ApplicationBarMenuItem4_Click(object sender, EventArgs e)
{
- Uri url = new Uri("/Pages/Dev/NFC.xaml", UriKind.Relative);
- NavigationService.Navigate(url);
+ /* Uri url = new Uri("/Pages/Dev/NFC.xaml", UriKind.Relative);
+ NavigationService.Navigate(url);*/
}
///
@@ -262,7 +281,7 @@ namespace CampusAppWP8.Pages
///
/// Caller of the function.
/// Event information.
- private void ApplicationBarMenuItem4_Click(object sender, EventArgs e)
+ private void ApplicationBarMenuItem3_Click(object sender, EventArgs e)
{
Uri url = new Uri("/Pages/Dev/QRScanner.xaml", UriKind.Relative);
NavigationService.Navigate(url);
@@ -312,8 +331,6 @@ namespace CampusAppWP8.Pages
}
}
- #endregion
-
private void PintoStart_Click(object sender, RoutedEventArgs e)
{
FrameworkElement elment = sender as FrameworkElement;
@@ -373,28 +390,24 @@ namespace CampusAppWP8.Pages
}
- private void PintoStart_Click2(object sender, RoutedEventArgs e)
+ private void NDEFHandler(ProximityDevice sender, ProximityMessage message)
{
- IconicTileData oIcontile = new IconicTileData();
- oIcontile.Title = "WebmailPage";
-
- oIcontile.IconImage = new Uri(Icons.Mensa, UriKind.Relative);
- oIcontile.SmallIconImage = new Uri(Icons.Mensa, UriKind.Relative);
-
- // find the tile object for the application tile that using "Iconic" contains string in it.
- ShellTile TileToFind = ShellTile.ActiveTiles.FirstOrDefault(x => x.NavigationUri.ToString().Contains("WebmailPage".ToString()));
-
- if (TileToFind != null && TileToFind.NavigationUri.ToString().Contains("WebmailPage"))
+ // create ndefMessage
+ this.device.StopSubscribingForMessage(message.SubscriptionId);
+ if (this.Dispatcher != null)
{
- TileToFind.Delete();
- ShellTile.Create(new Uri(Constants.PathMail_WebMailPage, UriKind.Relative), oIcontile, true);
+ this.Dispatcher.BeginInvoke(new Action(() => MessageBoxes.ShowBtuTagInfoOkCancelMessageBox()));
}
else
{
- ShellTile.Create(new Uri(Constants.PathMail_WebMailPage, UriKind.Relative), oIcontile, true);
+ MessageBoxes.ShowBtuTagInfoOkCancelMessageBox();
}
+
+ ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler);
}
#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 d07b1785..bc3b9300 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
@@ -69,6 +69,24 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag via NFC ähnelt.
+ ///
+ public static string App_ScanNfc {
+ get {
+ return ResourceManager.GetString("App_ScanNfc", resourceCulture);
+ }
+ }
+
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag via QR-Code ähnelt.
+ ///
+ public static string App_ScanQR {
+ get {
+ return ResourceManager.GetString("App_ScanQR", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die Hinzufügen ähnelt.
///
@@ -88,7 +106,7 @@ namespace CampusAppWP8.Resources {
}
///
- /// Sucht eine lokalisierte Zeichenfolge, die BTU CampusApp ähnelt.
+ /// Sucht eine lokalisierte Zeichenfolge, die BTU Campus-App ähnelt.
///
public static string ApplicationTitle {
get {
@@ -96,6 +114,24 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Sie haben einen BTU-Tag eingescannt ähnelt.
+ ///
+ public static string BTUTag_Prefix {
+ get {
+ return ResourceManager.GetString("BTUTag_Prefix", resourceCulture);
+ }
+ }
+
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Mit einem BTU-Tag können Sie ortsgebundenen Informationen anzeigen lassen und in der App nutzen. Möchten Sie weitere Informationen über die BTU-Tags? ähnelt.
+ ///
+ public static string BTUTag_Suffix {
+ get {
+ return ResourceManager.GetString("BTUTag_Suffix", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die Gebäude ähnelt.
///
@@ -132,24 +168,6 @@ namespace CampusAppWP8.Resources {
}
}
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die Info via NFC ähnelt.
- ///
- public static string CampusMapApp_ScanNfc {
- get {
- return ResourceManager.GetString("CampusMapApp_ScanNfc", resourceCulture);
- }
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die Info via QR-Code ähnelt.
- ///
- public static string CampusMapApp_ScanQR {
- get {
- return ResourceManager.GetString("CampusMapApp_ScanQR", resourceCulture);
- }
- }
-
///
/// Sucht eine lokalisierte Zeichenfolge, die Campusplan ähnelt.
///
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index 062333af..2d1bab6a 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -126,7 +126,7 @@
Controls the Language and ensures that the font for all elements in the RootFrame aligns with the app's language. Set to the language code of this resource file's language.
- BTU CampusApp
+ BTU Campus-App
Beispielwert für die Laufzeiteigenschaft
@@ -410,11 +410,11 @@
Auf Startseite
-
- Info via NFC
+
+ BTU-Tag via NFC
-
- Info via QR-Code
+
+ BTU-Tag via QR-Code
Kein gültigen NFC-Tag gefunden
@@ -458,4 +458,10 @@
Essenbeschreibung kopieren
+
+ Sie haben einen BTU-Tag eingescannt
+
+
+ Mit einem BTU-Tag können Sie ortsgebundenen Informationen anzeigen lassen und in der App nutzen. Möchten Sie weitere Informationen über die BTU-Tags?
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs
index 3519ed79..8ed540c3 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs
@@ -106,7 +106,18 @@ namespace CampusAppWP8.Resources
{
get
{
- return Themerize("departments_159.png");
+ return Themerize("lehrstuehle_159.png");
+ }
+ }
+
+ ///
+ /// Gets the uri string of the ExamApp icon.
+ ///
+ public static string ExamApp
+ {
+ get
+ {
+ return Themerize("pos_159.png");
}
}
@@ -249,7 +260,7 @@ namespace CampusAppWP8.Resources
{
get
{
- return Themerize("mensa_159.png");
+ return Themerize("mensaplan_159.png");
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx
index 439fa92c..0b1c95a5 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx
@@ -139,7 +139,10 @@
delete_159.png
- departments_159.png
+ lehrstuehle_159.png
+
+
+ pos_159.png
exams_159.png
@@ -178,7 +181,7 @@
link_159.png
- mensa_159.png
+ mensaplan_159.png
news_159.png
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/MessageBoxes/MessageBoxes.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/MessageBoxes/MessageBoxes.cs
index af439b41..afb9bf59 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/Lui/MessageBoxes/MessageBoxes.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/MessageBoxes/MessageBoxes.cs
@@ -63,6 +63,22 @@ namespace CampusAppWP8.Utility.Lui.MessageBoxes
return MessageBox.Show(text, AppResources.MsgBox_PlaceInfoHeader, MessageBoxButton.OKCancel);
}
+ public static MessageBoxResult ShowBtuTagInfoOkCancelMessageBox(string text = null)
+ {
+
+ string tagString;
+ if (text != null)
+ {
+ tagString = ":\n" + Wp8StringManager.ToShortString(text, 160, "...");
+ }
+ else
+ {
+ tagString = "!";
+ }
+ string btuString = AppResources.BTUTag_Prefix + tagString + "\n" + AppResources.BTUTag_Suffix;
+ return MessageBox.Show(btuString, AppResources.MsgBox_PlaceInfoHeader, MessageBoxButton.OKCancel);
+ }
+
#endregion
}
}
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs
index 0da18b19..c607563d 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs
@@ -62,7 +62,7 @@ namespace CampusAppWPortalLib8.Resources {
}
///
- /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Campus ähnelt.
+ /// Sucht eine lokalisierte Zeichenfolge, die Cottbus ähnelt.
///
public static string Campus_CBMain {
get {
@@ -71,7 +71,7 @@ namespace CampusAppWPortalLib8.Resources {
}
///
- /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Nordcampus ähnelt.
+ /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Nord ähnelt.
///
public static string Campus_CBNorth {
get {
@@ -80,7 +80,7 @@ namespace CampusAppWPortalLib8.Resources {
}
///
- /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Südcampus ähnelt.
+ /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Süd ähnelt.
///
public static string Campus_CBSouth {
get {
@@ -89,7 +89,7 @@ namespace CampusAppWPortalLib8.Resources {
}
///
- /// Sucht eine lokalisierte Zeichenfolge, die Senftenberg Campus ähnelt.
+ /// Sucht eine lokalisierte Zeichenfolge, die Senftenberg ähnelt.
///
public static string Campus_SFBMain {
get {
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx
index cf4cd79d..475cb1d9 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx
@@ -118,16 +118,16 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Cottbus Campus
+ Cottbus
- Cottbus Nordcampus
+ Cottbus Nord
- Cottbus Südcampus
+ Cottbus Süd
- Senftenberg Campus
+ Senftenberg
Bachelor