mv qrreader to devpage

This commit is contained in:
stubbfel
2013-09-12 12:06:50 +02:00
parent 3b4e200daa
commit 5fb0d589c1
5 changed files with 6 additions and 5 deletions

View File

@@ -284,7 +284,7 @@
<Compile Include="Utility\Lui\Button\PhoneButton.cs" />
<Compile Include="Utility\Lui\Button\LinkButton.cs" />
<Compile Include="Utility\Lui\MessageBoxes\MessageBoxes.cs" />
<Compile Include="Utility\QRScanner\QRScanner.xaml.cs">
<Compile Include="Pages\Dev\QRScanner.xaml.cs">
<DependentUpon>QRScanner.xaml</DependentUpon>
</Compile>
<Compile Include="Utility\StringManager.cs" />
@@ -410,7 +410,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Utility\QRScanner\QRScanner.xaml">
<Page Include="Pages\Dev\QRScanner.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>

View File

@@ -1,5 +1,5 @@
<phone:PhoneApplicationPage
x:Class="CampusAppWP8.Utility.QRScanner.QRScanner"
x:Class="CampusAppWP8.Pages.Dev.QRScanner"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"

View File

@@ -12,7 +12,7 @@
// http://www.apache.org/licenses/LICENSE-2.0
// </remarks>
//-----------------------------------------------------------------------------
namespace CampusAppWP8.Utility.QRScanner
namespace CampusAppWP8.Pages.Dev
{
using System;
using System.Threading;

View File

@@ -205,6 +205,7 @@ namespace CampusAppWP8.Pages.PlaceNews
if (this.Dispatcher != null)
{
this.Dispatcher.BeginInvoke(new Action(() => MessageBoxes.ShowMainModelErrorMessageBox(AppResources.MsgBox_ErrorMainModelLoadWeb)));
this.Dispatcher.BeginInvoke(new Action(() => this.ProgressBar.Visibility = Visibility.Collapsed));
}
}

View File

@@ -204,7 +204,7 @@ namespace CampusAppWP8.Pages
/// <param name="e">Event information.</param>
private void ApplicationBarMenuItem4_Click(object sender, EventArgs e)
{
Uri url = new Uri("/Utility/QRScanner/QRScanner.xaml", UriKind.Relative);
Uri url = new Uri("/Pages/Dev/QRScanner.xaml", UriKind.Relative);
NavigationService.Navigate(url);
}