Changeset 1429


Ignore:
Timestamp:
May 14, 2010, 8:46:58 PM (12 years ago)
Author:
saternus
Message:

CT Project Changes

Location:
trunk/CrypTool
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypTool/CrypTool.csproj

    r1424 r1429  
    9797      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    9898    </EmbeddedResource>
     99    <None Include="app.config" />
    99100    <None Include="Properties\Settings.settings">
    100101      <Generator>SettingsSingleFileGenerator</Generator>
  • trunk/CrypTool/MainWindow.xaml

    r1424 r1429  
    3131
    3232            <Border DockPanel.Dock="Top" CornerRadius="4,4,4,4" BorderBrush="#66000000" BorderThickness="0.5" Padding="5">
    33             <Border.Background>
     33            <!--<Border.Background>
    3434                <LinearGradientBrush EndPoint="0,1" StartPoint="0,0" MappingMode="RelativeToBoundingBox">
    3535                    <GradientStop Color="#22444444" Offset="0" />
     
    3838                    <GradientStop Color="#55DFEBEF" Offset="1" />
    3939                </LinearGradientBrush>
    40             </Border.Background>
    41                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,0,0" Height="48">
     40            </Border.Background>-->
     41                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,0,0" Height="40">
    4242                <StackPanel.LayoutTransform>
    43                     <ScaleTransform ScaleX="0.9" ScaleY="0.9"></ScaleTransform>
     43                    <ScaleTransform ScaleX="1" ScaleY="1"></ScaleTransform>
    4444                </StackPanel.LayoutTransform>
    45                 <dc:RibbonButton LargeImage="images/File32.png" ToolTip="New File" Height="40"/>
    46                     <dc:RibbonButton LargeImage="images/Open32.png" ToolTip="Open File" Height="40"/>
    47                     <dc:RibbonButton LargeImage="images/Save32.png" ToolTip="Save File" Height="40"/>
     45                <dc:RibbonButton LargeImage="images/File32.png" ToolTip="New File" />
     46                    <dc:RibbonButton LargeImage="images/Open32.png" ToolTip="Open File" />
     47                    <dc:RibbonButton LargeImage="images/Save32.png" ToolTip="Save File" />
    4848                    <dc:RibbonSeparator Height="35"></dc:RibbonSeparator>
    49                     <dc:RibbonButton LargeImage="images/play.png" ToolTip="Start" Height="40"/>
    50                     <dc:RibbonButton LargeImage="images/pause.png" ToolTip="Pause" Height="40"/>
    51                     <dc:RibbonButton LargeImage="images/stop.png" ToolTip="Stop" Height="40"/>
    52                     <dc:RibbonButton LargeImage="images/undo.png" ToolTip="Undo" Height="40"/>
    53                     <dc:RibbonButton LargeImage="images/redo.png" ToolTip="Redo" Height="40"/>
     49                    <dc:RibbonButton LargeImage="images/play.png" ToolTip="Start" />
     50                    <dc:RibbonButton LargeImage="images/pause.png" ToolTip="Pause" />
     51                    <dc:RibbonButton LargeImage="images/stop.png" ToolTip="Stop" />
     52                    <dc:RibbonButton LargeImage="images/undo.png" ToolTip="Undo" />
     53                    <dc:RibbonButton LargeImage="images/redo.png" ToolTip="Redo" />
    5454                    <dc:RibbonButton LargeImage="images/Exit.png" Click="RibbonButton_Click"></dc:RibbonButton>
    5555
     
    147147
    148148                <dc:OutlookSection Header="Cryptanalysis" Image="images/04-Analyse-28x26.png" Name="Cryptanalysis">
    149                     <StackPanel Name="AnalaysisPaneStack">
    150 
    151                     </StackPanel>
     149                    <ScrollViewer ScrollViewer.VerticalScrollBarVisibility="Auto">
     150                        <StackPanel Name="AnalaysisPaneStack">
     151
     152                        </StackPanel>
     153                    </ScrollViewer>
    152154                </dc:OutlookSection>
    153155
  • trunk/CrypTool/MainWindow.xaml.cs

    r1424 r1429  
    1919using Cryptool.PluginBase.Generator;
    2020using Cryptool.PluginBase.Cryptography;
     21using Cryptool.PluginBase.Editor;
    2122
    2223namespace CrypTool
     
    3839        private void RibbonButton_Click(object sender, RoutedEventArgs e)
    3940        {
     41            this.activeEditor.Open(@"C:\Users\saternmn\Eigene SVN Projekte\CrypTool\Build\Build\CT2\CrypBuild\x86\Debug\ProjectSamples\Caesar-Sample.cte");
     42           
    4043            if (SkinManager.SkinId == SkinId.OfficeBlue)
    4144                SkinManager.SkinId = SkinId.OfficeBlack;
     
    4346                SkinManager.SkinId = SkinId.OfficeBlue;
    4447        }
    45 
     48        private IEditor activeEditor;
    4649        private void LoadPlugins()
    4750        {
     
    7073
    7174                        AddIt(p, interfaceName);
    72                        
     75
     76
     77                        if (interfaceName == typeof(Cryptool.PluginBase.Editor.IEditor).FullName)
     78                        {
     79                            this.activeEditor = (IEditor)Activator.CreateInstance(pluginType);
     80                            this.EditorSpace.Children.Add(this.activeEditor.Presentation);
     81                           
     82
     83                        }
     84                           
    7385                    }
    7486                }
     
    157169            LoadPlugins();
    158170        }
     171
     172
    159173    }
    160174
Note: See TracChangeset for help on using the changeset viewer.