Changeset 1970


Ignore:
Timestamp:
Oct 11, 2010, 1:07:43 PM (11 years ago)
Author:
matkovic
Message:

-added configuration into PluginContainerView (experimental)
-several style changes

Location:
trunk/CrypPlugins/WorkspaceManager
Files:
8 edited

Legend:

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

    r1892 r1970  
    109109            <Grid Name="MainGrid">
    110110                <Grid Name="ConnectorPanel" Panel.ZIndex="11111111">
    111                     <StackPanel x:Name="West" Panel.ZIndex="1111" Background="{StaticResource ResourceKey=CheatBrush}" Orientation="Vertical" HorizontalAlignment="Left" Width="20" Height="{Binding ElementName=Window, Path=ActualHeight}"></StackPanel>
     111                    <StackPanel x:Name="West" Panel.ZIndex="1111" Background="{StaticResource ResourceKey=CheatBrush}" Orientation="Vertical" HorizontalAlignment="Left" Width="20" Height="{Binding ElementName=Window, Path=ActualHeight}" Margin="5,0,0,0"></StackPanel>
    112112                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
    113                         <StackPanel Orientation="Vertical">
     113                        <!--<StackPanel Orientation="Vertical">
    114114                            <Thumb Panel.ZIndex="200" Name="RightDelta" IsEnabled="False" Opacity="0.01" HorizontalAlignment="Right" VerticalAlignment="Stretch" Cursor="SizeWE" DragDelta="Thumb_DragDelta" Width="2.5" Height="{Binding ElementName=Window, Path=ActualHeight}"></Thumb>
    115                             <Thumb Panel.ZIndex="200" Name="BottomRightDelta" IsEnabled="False" Opacity="0.01" HorizontalAlignment="Right" VerticalAlignment="Bottom" Cursor="SizeNWSE" Height="5" Width="7" DragDelta="Thumb_DragDelta"></Thumb>
    116                         </StackPanel>
    117                         <StackPanel x:Name="East" Panel.ZIndex="11112" Background="{StaticResource ResourceKey=CheatBrush}" Orientation="Vertical" Width="18" Height="{Binding ElementName=Window, Path=ActualHeight}"></StackPanel>
     115                        </StackPanel>-->
     116                        <StackPanel x:Name="East" Panel.ZIndex="11112" Background="{StaticResource ResourceKey=CheatBrush}" Orientation="Vertical" Width="18" Height="{Binding ElementName=Window, Path=ActualHeight}" Margin="0,0,5,0"></StackPanel>
    118117                    </StackPanel>
    119118
    120                     <StackPanel x:Name="North" Panel.ZIndex="1111" Background="{StaticResource ResourceKey=CheatBrush}" Orientation="Horizontal" VerticalAlignment="Top" Height="20" Width="{Binding ElementName=Window, Path=ActualWidth}"></StackPanel>
     119                    <StackPanel x:Name="North" Panel.ZIndex="1111" Background="{StaticResource ResourceKey=CheatBrush}" Orientation="Horizontal" VerticalAlignment="Top" Height="20" Width="{Binding ElementName=Window, Path=ActualWidth}" Margin="0,5,0,0"></StackPanel>
    121120                    <StackPanel Orientation="Vertical" VerticalAlignment="Bottom">
    122                         <Thumb Panel.ZIndex="200" Name="BottomDelta" IsEnabled="False" Opacity="0.01" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Cursor="SizeNS" DragDelta="Thumb_DragDelta" Height="2.5"></Thumb>
    123                         <StackPanel x:Name="South" Panel.ZIndex="1111" Background="{StaticResource ResourceKey=CheatBrush}" Orientation="Horizontal" Height="18" Width="{Binding ElementName=Window, Path=ActualWidth}"></StackPanel>
     121                        <!--<Thumb Panel.ZIndex="200" Name="BottomDelta" IsEnabled="False" Opacity="0.01" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Cursor="SizeNS" DragDelta="Thumb_DragDelta" Height="2.5"></Thumb>-->
     122                        <StackPanel x:Name="South" Panel.ZIndex="1111" Background="{StaticResource ResourceKey=CheatBrush}" Orientation="Horizontal" Height="18" Width="{Binding ElementName=Window, Path=ActualWidth}" Margin="0,0,0,5"></StackPanel>
    124123                    </StackPanel>
    125                  
    126 
     124
     125                    <Thumb Panel.ZIndex="2000" Name="BottomRightDelta" Style="{StaticResource ResourceKey=ImageWrapperThumbStyle}" IsEnabled="False" Background="Transparent" Opacity="0.6" HorizontalAlignment="Right" VerticalAlignment="Bottom" Cursor="SizeNWSE" Height="15" Width="15" DragDelta="Thumb_DragDelta" Margin="0,0,17,17"></Thumb>
    127126                </Grid>
    128127                <Grid Margin="3">
    129128                    <Border Name="Window" BorderThickness="0" BorderBrush="Transparent" Margin="8">
    130                        
    131129                        <Grid>
    132130                            <Grid x:Name="ProgressbarRoot">
    133131                                <Grid x:Name="ProgressbarParent">
    134                                     <ProgressBar VerticalAlignment="Stretch" Margin="0,0,0,0" x:Name="ProgressBar" Height="auto" Width="Auto" Background="Transparent" Style="{StaticResource ResourceKey=ProgressbarStyle}" Maximum="1" Foreground="{StaticResource ResourceKey=ProgressbarLinearGradientBrush}">
     132                                    <ProgressBar VerticalAlignment="Stretch" Margin="0,0,0,0" x:Name="ProgressBar" Height="auto" Width="Auto" Background="Transparent" Style="{StaticResource ResourceKey=ProgressbarStyle}" Maximum="1" Foreground="ForestGreen">
    135133                                    </ProgressBar>
    136                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,0">
    137                                         <StackPanel.RenderTransform>
    138                                             <TranslateTransform Y="4"></TranslateTransform>
    139                                         </StackPanel.RenderTransform>
    140                                         <TextBlock x:Name="Percentage" FontFamily="IrisUPC" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="WhiteSmoke" Text="{Binding ElementName=ProgressBar, Path=Value, Converter={StaticResource ResourceKey=PercentageConverter}, FallbackValue=error}" />
    141                                         <TextBlock FontSize="20" FontFamily="IrisUPC" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="WhiteSmoke" Text="%"/>
    142                                     </StackPanel>
    143134                                </Grid>
     135                            </Grid>
     136                            <Grid Panel.ZIndex="1000" x:Name="ProgressPercentageRoot">
     137                                <StackPanel Margin="2" x:Name="ProgressPercentage" Orientation="Horizontal"  HorizontalAlignment="Center" VerticalAlignment="Bottom">
     138                                    <StackPanel.RenderTransform>
     139                                        <TranslateTransform Y="4"></TranslateTransform>
     140                                    </StackPanel.RenderTransform>
     141                                    <TextBlock Name="Percentage" FontFamily="IrisUPC" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="WhiteSmoke" Text="{Binding ElementName=ProgressBar, Path=Value, Converter={StaticResource ResourceKey=PercentageConverter}, FallbackValue=error}" />
     142                                    <TextBlock FontSize="20" FontFamily="IrisUPC" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="WhiteSmoke" Text="%"/>
     143                                </StackPanel>
    144144                            </Grid>
    145145                            <DockPanel LastChildFill="True" Margin="5">
     
    239239                                            <Grid Name="ViewPanel" Width="Auto" Height="Auto" Visibility="Collapsed" Margin="5,5,5,5">
    240240                                                <Border x:Name="SettingsPanel" Panel.ZIndex="{Binding Path=ViewState, Converter={StaticResource ResourceKey=OverlapConverter}, ConverterParameter=SettingsPanel}" Visibility="{Binding Path=ViewState, Converter={StaticResource ResourceKey=ViewStateConverter}, ConverterParameter=SettingsPanel}"></Border>
    241                                                 <Border x:Name="PresentationPanel" Panel.ZIndex="{Binding Path=ViewState, Converter={StaticResource ResourceKey=OverlapConverter}, ConverterParameter=PresentationPanel}" Visibility="{Binding Path=ViewState, Converter={StaticResource ResourceKey=ViewStateConverter}, ConverterParameter=PresentationPanel}"></Border>
     241                                                <Border x:Name="PresentationPanel" Panel.ZIndex="{Binding Path=ViewState, Converter={StaticResource ResourceKey=OverlapConverter}, ConverterParameter=PresentationPanel}" Visibility="{Binding Path=ViewState, Converter={StaticResource ResourceKey=ViewStateConverter}, ConverterParameter=PresentationPanel}">
     242                                                   
     243                                                </Border>
    242244                                                <Border x:Name="LogPanel" Panel.ZIndex="{Binding Path=ViewState, Converter={StaticResource ResourceKey=OverlapConverter}, ConverterParameter=LogPanel}" Visibility="{Binding Path=ViewState, Converter={StaticResource ResourceKey=ViewStateConverter}, ConverterParameter=LogPanel}">
    243245                                                    <e:LogPresentation></e:LogPresentation>
  • trunk/CrypPlugins/WorkspaceManager/View/Container/PluginContainerView.xaml.cs

    r1928 r1970  
    2020using System.Windows.Threading;
    2121using System.Threading;
     22using Cryptool.PluginBase;
    2223
    2324namespace WorkspaceManager.View.Container
     
    3031        Log,
    3132        Setting,
     33        Description
    3234    };
    3335
     
    145147                if((PluginViewState)value != PluginViewState.Min)
    146148                {
    147                     BottomDelta.IsEnabled = true;
    148                     RightDelta.IsEnabled = true;
     149                    //BottomDelta.IsEnabled = true;
     150                    //RightDelta.IsEnabled = true;
    149151                    BottomRightDelta.IsEnabled = true;
     152                    BottomRightDelta.Visibility = Visibility.Visible;
    150153                }
    151154                else
    152155                {
    153                     BottomDelta.IsEnabled = false;
    154                     RightDelta.IsEnabled = false;
     156                    //BottomDelta.IsEnabled = false;
     157                    //RightDelta.IsEnabled = false;
    155158                    BottomRightDelta.IsEnabled = false;
     159                    BottomRightDelta.Visibility = Visibility.Collapsed;
    156160                }
    157161                base.SetValue(ViewStateProperty, value);
     
    457461        void PluginContainerView_Loaded(object sender, RoutedEventArgs e)
    458462        {
    459            
     463            TaskPaneCtrl Settings = new TaskPaneCtrl();
     464            SettingsPanel.Child = Settings;
     465            Settings.DisplayPluginSettings(Model.Plugin, Model.Plugin.GetPluginInfoAttribute().Caption, Cryptool.PluginBase.DisplayPluginMode.Normal);
     466
     467
    460468            BorderGradientStop.Color = ColorHelper.GetColor(this.Model.PluginType);
    461469            BorderGradientStopSecond.Color = Color.FromArgb(100, this.BorderGradientStop.Color.R, this.BorderGradientStop.Color.G, this.BorderGradientStop.Color.B);
     
    592600            this.OptPanelParent.Children.Clear();
    593601            this.ProgressbarRoot.Children.Clear();
     602            this.ProgressPercentageRoot.Children.Clear();
    594603        }
    595604
     
    601610                this.OptPanelParent.Children.Add(OptionPanel);
    602611                this.ProgressbarRoot.Children.Add(ProgressbarParent);
     612                this.ProgressPercentageRoot.Children.Add(ProgressPercentage);
    603613                this.IsFullscreen = false;
    604614            }
     
    772782
    773783                case "SettingButton":
    774                    
     784                    ViewState = PluginViewState.Setting;
    775785                    break;
    776786                case "MaxButton":
     
    788798
    789799    }
     800
    790801
    791802    public class PluginContainerViewDeleteViewEventArgs : EventArgs
  • trunk/CrypPlugins/WorkspaceManager/View/Container/WorkSpaceEditorView.xaml

    r1892 r1970  
    7878                <SolidColorBrush Opacity="0.2" Color="Gray"/>
    7979            </Grid.Background>
    80             <Grid x:Name="ProgressbarPanel">
    81                
     80            <Grid x:Name="ProgressbarPanel" Height="40" VerticalAlignment="Bottom">
     81                <Grid x:Name="PercentageTextPanel" VerticalAlignment="Center" HorizontalAlignment="Center"></Grid>
    8282            </Grid>
    8383            <DockPanel LastChildFill="True">
     
    120120                    </Border>
    121121                </StackPanel>
    122                 <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
    123                     <Grid x:Name="PrstPanel" Margin="100" Panel.ZIndex="-100">
     122                <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Margin="40">
     123                    <Grid x:Name="PrstPanel" Panel.ZIndex="-100">
    124124                        <Grid.LayoutTransform>
    125125                            <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>
  • trunk/CrypPlugins/WorkspaceManager/View/Container/WorkSpaceEditorView.xaml.cs

    r1905 r1970  
    115115            this.InformationPanel.Visibility = Visibility.Visible;
    116116            e.container.PrepareFullscreen();
     117            this.PercentageTextPanel.Children.Add(e.container.ProgressPercentage);
    117118            this.PrstPanel.DataContext = e.container;
    118119            this.CtrPanel.DataContext = e.container;
     
    337338            this.PrstPanel.Children.Clear();
    338339            this.ProgressbarPanel.Children.Clear();
     340            this.PercentageTextPanel.Children.Clear();
    339341            this.currentFullViewContainer.Reset();
    340342            this.currentFullViewContainer = null;
  • trunk/CrypPlugins/WorkspaceManager/View/Converter/ConnectorBindingConverter.cs

    r1923 r1970  
    2525            {
    2626                case ConnectorOrientation.West:
    27                     return new Point(X-3 , Y + Height / 2);
     27                    return new Point(X-8 , Y + Height / 2);
    2828                case ConnectorOrientation.East:
    29                     return new Point(X + Width +3, Y + Height / 2);
     29                    return new Point(X + Width +8, Y + Height / 2);
    3030                case ConnectorOrientation.North:
    31                     return new Point(X + Width / 2, Y-3);
     31                    return new Point(X + Width / 2, Y-8);
    3232                case ConnectorOrientation.South:
    33                     return new Point(X + Width / 2, Y + Height+3);
     33                    return new Point(X + Width / 2, Y + Height+8);
    3434            }
    3535
  • trunk/CrypPlugins/WorkspaceManager/View/Resource/Styles.xaml

    r1892 r1970  
    147147            CornerRadius="5"
    148148            Background="{TemplateBinding Foreground}"
    149             BorderBrush="Transparent"
    150             BorderThickness="1"
     149            BorderBrush="#4eb34e"
     150            BorderThickness="1.5"
    151151            HorizontalAlignment="Left" />
    152152                    </Grid>
  • trunk/CrypPlugins/WorkspaceManager/View/VisualComponents/CryptoLineView/CryptoLineView.cs

    r1931 r1970  
    7575        {
    7676            base.OnPropertyChanged(e);
    77             foreach (CryptoLineView line in UpdateList)
    78             {
    79                 line.InvalidateVisual();
    80             }
    8177
    8278            Panel p = (this.Parent as Panel);
  • trunk/CrypPlugins/WorkspaceManager/WorkspaceManager.csproj

    r1931 r1970  
    185185      <DependentUpon>Search.xaml</DependentUpon>
    186186    </Compile>
     187    <Compile Include="View\VisualComponents\TaskPaneCtrl.xaml.cs">
     188      <DependentUpon>TaskPaneCtrl.xaml</DependentUpon>
     189    </Compile>
    187190    <Compile Include="View\VisualComponents\TextInputWrapper.xaml.cs">
    188191      <DependentUpon>TextInputWrapper.xaml</DependentUpon>
     
    260263    </Page>
    261264    <Page Include="View\VisualComponents\Search.xaml">
     265      <SubType>Designer</SubType>
     266      <Generator>MSBuild:Compile</Generator>
     267    </Page>
     268    <Page Include="View\VisualComponents\TaskPaneCtrl.xaml">
    262269      <SubType>Designer</SubType>
    263270      <Generator>MSBuild:Compile</Generator>
Note: See TracChangeset for help on using the changeset viewer.