Changeset 2588


Ignore:
Timestamp:
Feb 5, 2011, 7:45:36 AM (11 years ago)
Author:
matkovic
Message:

-WorkSpaceEditorView: Fullscreen -> Zoom is now working & a lot more space for 'presentations'

Location:
trunk/CrypPlugins/WorkspaceManager/View
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/WorkspaceManager/View/Container/WorkSpaceEditorView.xaml

    r2383 r2588  
    5252            </Grid>
    5353
    54             <Grid Width="auto" Height="auto" Name="InformationPanel" Visibility="Hidden">
    55                 <Grid.Background>
    56                     <SolidColorBrush Opacity="0.2" Color="Gray"/>
    57                 </Grid.Background>
    58                 <Grid x:Name="ProgressbarPanel" Height="40" VerticalAlignment="Bottom">
     54            <DockPanel Width="auto" Height="auto" Name="InformationPanel" Visibility="Hidden" LastChildFill="True">
     55                <DockPanel.Background>
     56                    <SolidColorBrush Color="#AA222222"/>
     57                </DockPanel.Background>
     58                <Grid x:Name="ProgressbarPanel" DockPanel.Dock="Bottom" Height="20" VerticalAlignment="Bottom" Background="#11FFFFFF">
    5959                    <Grid x:Name="PercentageTextPanel" VerticalAlignment="Center" HorizontalAlignment="Center"></Grid>
    6060                </Grid>
    6161                <DockPanel LastChildFill="True">
    62                     <DockPanel DockPanel.Dock="Top">
    63                         <DockPanel.Background>
    64                             <SolidColorBrush Color="Black" Opacity="0.3"></SolidColorBrush>
    65                         </DockPanel.Background>
    66                         <TextBlock DockPanel.Dock="Left" Text="Fullscreen" Foreground="WhiteSmoke" FontSize="20" Padding="5"></TextBlock>
    67                         <Button DockPanel.Dock="Right" Style="{StaticResource ResourceKey=OptionPluginContainerButtonStyle}" Name="CloseSettingsButton" Height="30" Width="30" Click="CloseButton_Click" Margin="5">
    68                             <Image Source="/WorkspaceManager;component/View/Image/delete.png" HorizontalAlignment="Center" SnapsToDevicePixels="True" Margin="1,1,1,1"/>
    69                         </Button>
    70                         <Grid></Grid>
    71                     </DockPanel>
    72                     <Grid DockPanel.Dock="Top" x:Name="CtrPanel" HorizontalAlignment="Stretch" Width="auto">
    73                         <Grid.Background>
    74                             <SolidColorBrush Color="Gray" Opacity="0.1"></SolidColorBrush>
    75                         </Grid.Background>
     62                    <Grid DockPanel.Dock="Top">
     63                        <Grid x:Name="CtrPanel" HorizontalAlignment="Stretch" Width="auto">
     64                           
     65                        </Grid>
     66                        <DockPanel>
     67                            <TextBlock DockPanel.Dock="Left" Text="Fullscreen" Foreground="WhiteSmoke" FontWeight="Medium" FontSize="14" Padding="2"></TextBlock>
     68                            <Button DockPanel.Dock="Right" Style="{StaticResource ResourceKey=OptionPluginContainerButtonStyle}" VerticalAlignment="Top" Name="CloseSettingsButton" Height="20" Width="20" Click="CloseButton_Click" Margin="3">
     69                                <Image Source="/WorkspaceManager;component/View/Image/delete.png" HorizontalAlignment="Center" SnapsToDevicePixels="True" Margin="1,1,1,1"/>
     70                            </Button>
     71                            <Grid></Grid>
     72                        </DockPanel>
    7673                    </Grid>
    77                     <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Margin="40">
    78                         <Grid x:Name="PrstPanel" Panel.ZIndex="-100">
     74                    <StackPanel DockPanel.Dock="Bottom" Margin="0,0,0,0" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
     75                        <StackPanel.LayoutTransform>
     76                            <ScaleTransform ScaleX="0.8" ScaleY="0.8"></ScaleTransform>
     77                        </StackPanel.LayoutTransform>
     78                        <Border Margin="1,1,1,1" Opacity="0.85" CornerRadius="5,5,0,0">
     79                            <Label Foreground="Black" FontWeight="ExtraBold" VerticalAlignment="Top" FontSize="16" ContentStringFormat="{}{0:F0} %" Content="{Binding Source={x:Static p:Settings.Default}, Path=FullscreenScale, Mode=OneWay, Converter={StaticResource ResourceKey=PercentageConverter}}"></Label>
     80                        </Border>
     81                        <Border Margin="1,1,1,1" Opacity="0.85" CornerRadius="5,5,0,0">
     82                            <Button Height="18" Margin="5,2,5,0" Style="{StaticResource ResourceKey=ScalePluginContainerButtonStyle}" Click="Button_Click_Full_dec">
     83                                <Image VerticalAlignment="Top" Source="/WorkspaceManager;component/View/Image/reduce.png" Width="18" Height="18"></Image>
     84                            </Button>
     85                        </Border>
     86                        <Border Margin="1,1,1,1" Opacity="0.85" CornerRadius="5,5,0,0">
     87                            <Slider x:Name="FullScreenScaleSlider" Ticks="1,2" TickPlacement="BottomRight" Style="{StaticResource ResourceKey=SliderStyle}"
     88                                Minimum="{Binding Source={x:Static p:Settings.Default}, Path=MinScale, Mode=OneWay}" Maximum="{Binding Source={x:Static p:Settings.Default}, Path=MaxScale, Mode=OneWay}" Width="100" Height="22"
     89                                Value="{Binding Source={x:Static p:Settings.Default}, Path=FullscreenScale, Mode=TwoWay}"/>
     90                        </Border>
     91                        <Border Margin="1,1,1,1" Opacity="0.85" CornerRadius="5,5,0,0">
     92                            <Button Height="18" Margin="5,2,5,0" Style="{StaticResource ResourceKey=ScalePluginContainerButtonStyle}" Click="Button_Click_Full_inc">
     93                                <Image VerticalAlignment="Top" Source="/WorkspaceManager;component/View/Image/increase.png" Width="18" Height="18"></Image>
     94                            </Button>
     95                        </Border>
     96                    </StackPanel>
     97                    <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" x:Name="PrstPanelRoot">
     98                        <Grid x:Name="PrstPanel">
    7999                            <Grid.LayoutTransform>
    80                                 <ScaleTransform x:Name="Scale2" ScaleX="{Binding Source={x:Static p:Settings.Default}, Path=FullscreenScale, Mode=OneWay}" ScaleY="{Binding Source={x:Static p:Settings.Default}, Path=FullScreenScale, Mode=OneWay}"></ScaleTransform>
     100                                <ScaleTransform x:Name="Scale2" ScaleX="{Binding Source={x:Static p:Settings.Default}, Path=FullscreenScale, Mode=OneWay}" ScaleY="{Binding Source={x:Static p:Settings.Default}, Path=FullscreenScale, Mode=OneWay}"></ScaleTransform>
    81101                            </Grid.LayoutTransform>
    82102                        </Grid>
     
    84104                </DockPanel>
    85105
    86             </Grid>
     106            </DockPanel>
    87107        </Grid>
    88108    </ContentControl>
  • trunk/CrypPlugins/WorkspaceManager/View/Container/WorkSpaceEditorView.xaml.cs

    r2544 r2588  
    4949        public bool IsCtrlToggled { get; set; }
    5050
     51        //public ModifiedCanvas PrstPanel { get { return (ModifiedCanvas) PrstPanelRoot.Content; } }
     52
    5153        public UserContentWrapper UserContentWrapper { get; set; }
    5254        public EditorState State;
     
    6466        {
    6567            InitializeComponent();
     68        }
     69
     70        private void Button_Click_Full_inc(object sender, RoutedEventArgs e)
     71        {
     72            FullScreenScaleSlider.Value += 0.15;
     73        }
     74
     75        private void Button_Click_Full_dec(object sender, RoutedEventArgs e)
     76        {
     77            FullScreenScaleSlider.Value -= 0.15;
    6678        }
    6779
  • trunk/CrypPlugins/WorkspaceManager/View/VisualComponents/BottomBox.xaml.cs

    r2067 r2588  
    3838        private void Button_Click_Full_inc(object sender, RoutedEventArgs e)
    3939        {
    40             FullScreenScaleSlider.Value += 0.3;
     40            FullScreenScaleSlider.Value += 0.15;
    4141        }
    4242
    4343        private void Button_Click_Full_dec(object sender, RoutedEventArgs e)
    4444        {
    45             FullScreenScaleSlider.Value -= 0.3;
     45            FullScreenScaleSlider.Value -= 0.15;
    4646        }
    4747
Note: See TracChangeset for help on using the changeset viewer.