Skip to content

Commit

Permalink
Final few tweaks for RC release
Browse files Browse the repository at this point in the history
  • Loading branch information
timheuer committed May 31, 2012
1 parent 9056549 commit 5042874
Show file tree
Hide file tree
Showing 17 changed files with 48 additions and 770 deletions.
6 changes: 2 additions & 4 deletions SDKManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
MinVSVersion="11.0"
MinToolsVersion="4.0"
CopyRedistToSubDirectory="Callisto"
AppliesTo="WindowsAppContainer+WindowsXAML+Managed"
AppliesTo="WindowsAppContainer+Managed"
MoreInfo="http://github.com/timheuer/Callisto">
<File Reference="Callisto.dll">
<ContainsControls>True</ContainsControls>
</File>
<File Reference="Callisto.dll" />
</FileList>
6 changes: 2 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@ So far Callisto includes:
* `BooleanToVisibilityConverter` - a converter to well, convert boolean to visibility, very common use
* `LengthToBooleanConverter` - a converter to examine a string length to convert to boolean (simple validation helper)
* `RelativeTimeConverter` - a converter to show time as relative string, i.e., 'about an hour ago'
* Extensions - some extension method helpers
* Extensions - some extension method helpers (i.e., bind html content to a WebView)

What is in the plan (could always use the help):

* `DatePicker` and `TimePicker` - providing a globalized time/date picker control in Metro style
* `Ratings` - providing a rating control for Metro style
* `Pivot` - a UI interface for providing "tabbed" interface in a Metro style way
* `ThemeSwitcher` - to dynamically switch themes for certain UI components

## How To Install It?
There are two ways you can install the control.
Expand Down Expand Up @@ -117,5 +116,4 @@ Great, please [log a bug](https://github.com/timheuer/Callisto/issues/new) so th
Some of the code represented in the toolkit is forks/ports of other Open Source libraries. Where used, their license is reprsented in the code files.

* [Silverlight Toolkit](http://silverlight.codeplex.com) - for providing the base of many ported concepts/code. Licensed under Ms-PL
* [RestSharp](http://restsharp.org) - the OAuth helper file is a fork from the RestSharp project which uses this internally for some authenticators. Licensed under Apache 2.0
* [Jeff Wilcox](http://www.jeff.wilcox.name) - Jeff's projects have provided a lot of inspiration in what shapes some of the curent "TODO" items (i.e., theme manager) and is a great source for Metro style app development for Windows Phone
* [RestSharp](http://restsharp.org) - the OAuth helper file is a fork from the RestSharp project which uses this internally for some authenticators. Licensed under Apache 2.0
39 changes: 0 additions & 39 deletions src/Callisto.TestApp/BlankPage.xaml

This file was deleted.

64 changes: 0 additions & 64 deletions src/Callisto.TestApp/BlankPage.xaml.cs

This file was deleted.

7 changes: 0 additions & 7 deletions src/Callisto.TestApp/Callisto.TestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,6 @@
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
</Compile>
<Compile Include="BlankPage.xaml.cs">
<DependentUpon>BlankPage.xaml</DependentUpon>
</Compile>
<Compile Include="MainPage.xaml.cs">
<DependentUpon>MainPage.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -212,10 +209,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="BlankPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<None Include="Callisto.TestApp_TemporaryKey.pfx" />
Expand Down
3 changes: 1 addition & 2 deletions src/Callisto.TestApp/MainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
</Grid.ColumnDefinitions>

<Grid Grid.ColumnSpan="2">
<Image Source="ms-appx:/Images/Callisto.png"
Stretch="None" Margin="5" PointerPressed="Image_PointerPressed_1" />
<TextBlock Text="Callisto Testing Area" FontSize="53" FontWeight="Light" Margin="5" PointerPressed="Image_PointerPressed_1" />
</Grid>

<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
Expand Down
1 change: 0 additions & 1 deletion src/Callisto.TestApp/MainPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
if (Samples == null)
{
Samples = new List<SamplePage>();
Samples.Add(new SamplePage() { Name = "BlankPage", Page = typeof(XamlControlsUITestApp.BlankPage) });
Samples.Add(new SamplePage() { Name = "Flyout", Page = typeof(SamplePages.FlyoutSample) });
Samples.Add(new SamplePage() { Name = "Settings", Page = typeof(SamplePages.SettingsSample) });
Samples.Add(new SamplePage() { Name = "Tilt Effect", Page = typeof(SamplePages.TiltSample) });
Expand Down
13 changes: 11 additions & 2 deletions src/Callisto.TestApp/SamplePages/SettingsSample.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,26 @@ private void BlankPage_CommandsRequested(SettingsPane sender, SettingsPaneComman
{
SettingsFlyout settings = new SettingsFlyout();
settings.FlyoutWidth = (Callisto.Controls.SettingsFlyout.SettingsFlyoutWidth)Enum.Parse(typeof(Callisto.Controls.SettingsFlyout.SettingsFlyoutWidth), settingswidth.SelectionBoxItem.ToString());
//settings.HeaderBrush = new SolidColorBrush(Colors.Orange);
//settings.HeaderBrush = new SolidColorBrush(Colors.Orange);
//settings.Background = new SolidColorBrush(Colors.White);
settings.HeaderText = "Foo Bar Custom Settings";

BitmapImage bmp = new BitmapImage(new Uri("ms-appx:///Assets/SmallLogo.png"));

settings.SmallLogoImageSource = bmp;

StackPanel sp = new StackPanel();

ToggleSwitch ts = new ToggleSwitch();
ts.Header = "Download updates automatically";

settings.Content = ts;
Button b = new Button();
b.Content = "Test";

sp.Children.Add(ts);
sp.Children.Add(b);

settings.Content = sp;

settings.IsOpen = true;

Expand Down
2 changes: 1 addition & 1 deletion src/Callisto.VSIX/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<License>License.txt</License>
<Icon>CallistoMoon.png</Icon>
<PreviewImage>CallistoLogo.png</PreviewImage>
<Tags>xaml winrt flyout settings popup menu win8 metro pivot sqlite sql</Tags>
<Tags>xaml winrt flyout settings popup menu win8 metro pivot</Tags>
</Metadata>
<Installation Scope="Global" AllUsers="true">
<InstallationTarget Id="Microsoft.ExtensionSDK" TargetPlatformIdentifier="Windows" TargetPlatformVersion="v8.0" SdkName="Callisto" SdkVersion="1.0.0" />
Expand Down
1 change: 0 additions & 1 deletion src/Callisto/Callisto.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@
<SubType>Designer</SubType>
</PRIResource>
</ItemGroup>
<ItemGroup />
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' ">
<VisualStudioVersion>11.0</VisualStudioVersion>
</PropertyGroup>
Expand Down
139 changes: 0 additions & 139 deletions src/Callisto/Controls/DateTimePicker/DataSource.cs

This file was deleted.

Loading

0 comments on commit 5042874

Please sign in to comment.