Changeset 1423


Ignore:
Timestamp:
May 12, 2010, 2:35:03 AM (12 years ago)
Author:
matkovic
Message:
  • Open source Ribbon implemented (for Saternus)
  • LoadPlugins() problems(?)
  • added open source Ribbon dll

override-bad-extension: Odyssey.dll

Location:
trunk/CrypTool
Files:
72 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypTool/CrypTool.csproj

    r1422 r1423  
    66    <ProductVersion>8.0.30703</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{3A40A779-9A54-4633-8A3C-CE0AD4623A85}</ProjectGuid>
     8    <ProjectGuid>{CFC42945-D50A-4428-AC8C-4C9CC5589BA1}</ProjectGuid>
    99    <OutputType>WinExe</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
     
    1212    <AssemblyName>CrypTool</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    14     <TargetFrameworkProfile>
    15     </TargetFrameworkProfile>
     14    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
    1615    <FileAlignment>512</FileAlignment>
    1716    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     
    2322    <DebugType>full</DebugType>
    2423    <Optimize>false</Optimize>
    25     <OutputPath>..\CrypBuild\x86\Debug\</OutputPath>
     24    <OutputPath>bin\Debug\</OutputPath>
    2625    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2726    <ErrorReport>prompt</ErrorReport>
     
    3231    <DebugType>pdbonly</DebugType>
    3332    <Optimize>true</Optimize>
    34     <OutputPath>..\CrypBuild\x86\Release\</OutputPath>
     33    <OutputPath>bin\Release\</OutputPath>
    3534    <DefineConstants>TRACE</DefineConstants>
    3635    <ErrorReport>prompt</ErrorReport>
    3736    <WarningLevel>4</WarningLevel>
    3837  </PropertyGroup>
    39   <PropertyGroup>
    40     <StartupObject>CrypTool.App</StartupObject>
    41   </PropertyGroup>
    42   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    43     <DebugSymbols>true</DebugSymbols>
    44     <OutputPath>..\CrypBuild\x64\Debug\</OutputPath>
    45     <DefineConstants>DEBUG;TRACE</DefineConstants>
    46     <DebugType>full</DebugType>
    47     <PlatformTarget>x64</PlatformTarget>
    48     <CodeAnalysisLogFile>bin\Debug\CrypTool.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    49     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    50     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    51     <ErrorReport>prompt</ErrorReport>
    52     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    53     <CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    54     <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    55   </PropertyGroup>
    56   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    57     <OutputPath>..\CrypBuild\x64\Release\</OutputPath>
    58     <DefineConstants>TRACE</DefineConstants>
    59     <Optimize>true</Optimize>
    60     <DebugType>pdbonly</DebugType>
    61     <PlatformTarget>x64</PlatformTarget>
    62     <CodeAnalysisLogFile>bin\Release\CrypTool.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
    63     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
    64     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    65     <ErrorReport>prompt</ErrorReport>
    66     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    67     <CodeAnalysisRuleSetDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    68     <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    69   </PropertyGroup>
    7038  <ItemGroup>
     39    <Reference Include="Odyssey">
     40      <HintPath>.\Odyssey.dll</HintPath>
     41    </Reference>
    7142    <Reference Include="System" />
    7243    <Reference Include="System.Data" />
     
    10475    </Compile>
    10576    <Page Include="SplashScreen.xaml">
     77      <Generator>MSBuild:Compile</Generator>
    10678      <SubType>Designer</SubType>
    107       <Generator>MSBuild:Compile</Generator>
    10879    </Page>
    10980  </ItemGroup>
     
    12697      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    12798    </EmbeddedResource>
    128     <None Include="app.config" />
    12999    <None Include="Properties\Settings.settings">
    130100      <Generator>SettingsSingleFileGenerator</Generator>
     
    134104  </ItemGroup>
    135105  <ItemGroup>
    136     <Resource Include="Images\SplashScreen.png" />
     106    <Resource Include="images\SplashScreen.png" />
     107  </ItemGroup>
     108  <ItemGroup>
     109    <Resource Include="images\01-Classic-28x26.png" />
     110    <Resource Include="images\02-Modern-28x26.png" />
     111    <Resource Include="images\03-Hash-28x26.png" />
     112    <Resource Include="images\04-Analyse-28x26.png" />
     113    <Resource Include="images\05-Tools-28x26.png" />
     114    <Resource Include="images\06-EditorSpec-28x26.png" />
     115    <Resource Include="images\AlgSel.png" />
     116    <Resource Include="images\beginner.png" />
     117    <Resource Include="images\Bold.png" />
     118    <Resource Include="images\Both.png" />
     119    <Resource Include="images\Copy.png" />
     120    <Resource Include="images\cryptool.ico" />
     121    <Resource Include="images\ctLogo.png" />
     122    <Resource Include="images\Cut.png" />
     123    <Resource Include="images\Debug.png" />
     124    <Resource Include="images\default.png" />
     125    <Resource Include="images\DetailLevel.png" />
     126    <Resource Include="images\downloadplugins.png" />
     127    <Resource Include="images\editorSettings.png" />
     128    <Resource Include="images\error.png" />
     129    <Resource Include="images\Exit.png" />
     130    <Resource Include="images\experienced.png" />
     131    <Resource Include="images\expert.png" />
     132    <Resource Include="images\exportToHTML.png" />
     133    <Resource Include="images\File32.png" />
     134    <Resource Include="images\Find.png" />
     135    <Resource Include="images\FindNext.png" />
     136    <Resource Include="images\FolderClosed32.png" />
     137    <Resource Include="images\FontColor.png" />
     138    <Resource Include="images\FontSizeDec.png" />
     139    <Resource Include="images\FontSizeInc.png" />
     140    <Resource Include="images\Help.png" />
     141    <Resource Include="images\Info.png" />
     142    <Resource Include="images\Italic.png" />
     143    <Resource Include="images\manageplugins.png" />
     144    <Resource Include="images\MyFiles16.png" />
     145    <Resource Include="images\NavPane.png" />
     146    <Resource Include="images\NewDocument.png" />
     147    <Resource Include="images\Open32.png" />
     148    <Resource Include="images\Options.png" />
     149    <Resource Include="images\Paste16.png" />
     150    <Resource Include="images\Paste32.png" />
     151    <Resource Include="images\pause.png" />
     152    <Resource Include="images\pause_button.png" />
     153    <Resource Include="images\peer2peer-connect.png" />
     154    <Resource Include="images\peer2peer-disconnect.png" />
     155    <Resource Include="images\play.png" />
     156    <Resource Include="images\play_button.png" />
     157    <Resource Include="images\Print32.png" />
     158    <Resource Include="images\professional.png" />
     159    <Resource Include="images\redo.png" />
     160    <Resource Include="images\reloadplugins.png" />
     161    <Resource Include="images\Reopen32.png" />
     162    <Resource Include="images\RibTab.png" />
     163    <Resource Include="images\Save32.png" />
     164    <Resource Include="images\SaveAs32.png" />
     165    <Resource Include="images\SchemeBlack.png" />
     166    <Resource Include="images\SchemeBlue.png" />
     167    <Resource Include="images\SchemeCustom.png" />
     168    <Resource Include="images\SchemeSilver.png" />
     169    <Resource Include="images\Select.png" />
     170    <Resource Include="images\stop.png" />
     171    <Resource Include="images\stop_button.png" />
     172    <Resource Include="images\Strike.png" />
     173    <Resource Include="images\StyleSet.png" />
     174    <Resource Include="images\Subscript.png" />
     175    <Resource Include="images\Superscript.png" />
     176    <Resource Include="images\TextHighlight.png" />
     177    <Resource Include="images\Underline.png" />
     178    <Resource Include="images\undo.png" />
     179    <Resource Include="images\warning.png" />
    137180  </ItemGroup>
    138181  <ItemGroup>
     
    140183      <Project>{FF5D473C-0716-4D3E-9078-2EBD979F94C6}</Project>
    141184      <Name>CrypCore</Name>
    142       <Private>False</Private>
    143     </ProjectReference>
    144     <ProjectReference Include="..\CrypPluginBase\CrypPluginBase.csproj">
    145       <Project>{25DB2B47-A457-4EC2-960B-395CE07AE093}</Project>
    146       <Name>CrypPluginBase</Name>
    147       <Private>False</Private>
    148185    </ProjectReference>
    149186  </ItemGroup>
  • trunk/CrypTool/CrypTool.sln

    r1422 r1423  
    22Microsoft Visual Studio Solution File, Format Version 11.00
    33# Visual Studio 2010
    4 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrypTool", "CrypTool.csproj", "{3A40A779-9A54-4633-8A3C-CE0AD4623A85}"
     4Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrypTool", "CrypTool.csproj", "{CFC42945-D50A-4428-AC8C-4C9CC5589BA1}"
     5EndProject
     6Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrypCore", "..\CrypCore\CrypCore.csproj", "{FF5D473C-0716-4D3E-9078-2EBD979F94C6}"
    57EndProject
    68Global
    79        GlobalSection(SolutionConfigurationPlatforms) = preSolution
     10                Debug|Any CPU = Debug|Any CPU
    811                Debug|x64 = Debug|x64
    912                Debug|x86 = Debug|x86
     13                Release|Any CPU = Release|Any CPU
    1014                Release|x64 = Release|x64
    1115                Release|x86 = Release|x86
    1216        EndGlobalSection
    1317        GlobalSection(ProjectConfigurationPlatforms) = postSolution
    14                 {3A40A779-9A54-4633-8A3C-CE0AD4623A85}.Debug|x64.ActiveCfg = Debug|x64
    15                 {3A40A779-9A54-4633-8A3C-CE0AD4623A85}.Debug|x64.Build.0 = Debug|x64
    16                 {3A40A779-9A54-4633-8A3C-CE0AD4623A85}.Debug|x86.ActiveCfg = Debug|x86
    17                 {3A40A779-9A54-4633-8A3C-CE0AD4623A85}.Debug|x86.Build.0 = Debug|x86
    18                 {3A40A779-9A54-4633-8A3C-CE0AD4623A85}.Release|x64.ActiveCfg = Release|x64
    19                 {3A40A779-9A54-4633-8A3C-CE0AD4623A85}.Release|x64.Build.0 = Release|x64
    20                 {3A40A779-9A54-4633-8A3C-CE0AD4623A85}.Release|x86.ActiveCfg = Release|x86
    21                 {3A40A779-9A54-4633-8A3C-CE0AD4623A85}.Release|x86.Build.0 = Release|x86
     18                {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Debug|Any CPU.ActiveCfg = Debug|x86
     19                {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Debug|x64.ActiveCfg = Debug|x86
     20                {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Debug|x86.ActiveCfg = Debug|x86
     21                {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Debug|x86.Build.0 = Debug|x86
     22                {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Release|Any CPU.ActiveCfg = Release|x86
     23                {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Release|x64.ActiveCfg = Release|x86
     24                {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Release|x86.ActiveCfg = Release|x86
     25                {CFC42945-D50A-4428-AC8C-4C9CC5589BA1}.Release|x86.Build.0 = Release|x86
     26                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     27                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
     28                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|x64.ActiveCfg = Debug|x64
     29                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|x64.Build.0 = Debug|x64
     30                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|x86.ActiveCfg = Debug|x86
     31                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Debug|x86.Build.0 = Debug|x86
     32                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
     33                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|Any CPU.Build.0 = Release|Any CPU
     34                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|x64.ActiveCfg = Release|x64
     35                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|x64.Build.0 = Release|x64
     36                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|x86.ActiveCfg = Release|x86
     37                {FF5D473C-0716-4D3E-9078-2EBD979F94C6}.Release|x86.Build.0 = Release|x86
    2238        EndGlobalSection
    2339        GlobalSection(SolutionProperties) = preSolution
  • trunk/CrypTool/MainWindow.xaml

    r1422 r1423  
    1 <Window x:Class="CrypTool.MainWindow"
     1<dc:RibbonWindow x:Class="CrypTool.MainWindow"
     2        xmlns:dc="clr-namespace:Odyssey.Controls;assembly=Odyssey"
    23        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    34        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    4         Title="MainWindow" Height="350" Width="525" Loaded="Window_Loaded">
    5     <Grid>
    6         <Image Height="150" HorizontalAlignment="Left" Margin="291,12,0,0" Name="image1" Stretch="Fill" VerticalAlignment="Top" Width="200" Source="/CrypTool;component/Images/SplashScreen.png" />
    7         <ListBox Height="311" HorizontalAlignment="Left" Name="listBox1" VerticalAlignment="Top" Width="198" />
    8     </Grid>
    9 </Window>
     5        Loaded="Window_Loaded"
     6        IsGlassEnabled="True"
     7        Title="---------------------------FILL ME--------------------" Height="350" Width="525">
     8    <DockPanel LastChildFill="True">
     9        <dc:RibbonBar DockPanel.Dock="Top" Name="AppRibbon" IsRibbonVisible="False">
     10            <!--CrypTool Menu-->
     11            <dc:RibbonBar.ApplicationMenu>
     12                <dc:RibbonApplicationMenu MenuButtonImage="images/ctLogo.png">
     13                    <!--CrypTool Commands-->
     14                    <dc:RibbonApplicationMenuItem Header="New" Image="images/File32.png"/>
     15                    <dc:RibbonApplicationMenuItem Header="Open" Image="images/Open32.png"/>
     16                    <dc:RibbonApplicationMenuItem Header="Save As..." Image="images/Save32.png"/>
     17                    <dc:RibbonApplicationMenuItem Header="Exit CrypTool" Image="images/Exit.png"/>
     18                </dc:RibbonApplicationMenu>
     19            </dc:RibbonBar.ApplicationMenu>
     20            <!-- End CrypTool Menu -->
     21           
     22            <!--Define Quick Access Toolbar-->
     23            <dc:RibbonBar.QAToolBar>
     24                <dc:RibbonQAToolBar>
     25                    <dc:RibbonButton ToolTip="Play" SmallImage="images/play.png"/>
     26                    <dc:RibbonButton ToolTip="Pause" SmallImage="images/pause.png"/>
     27                    <dc:RibbonButton ToolTip="Stop" SmallImage="images/stop.png"/>
     28                </dc:RibbonQAToolBar>
     29            </dc:RibbonBar.QAToolBar>
     30            </dc:RibbonBar>
     31
     32            <Border DockPanel.Dock="Top" CornerRadius="4,4,4,4" BorderBrush="#66000000" BorderThickness="0.5" Padding="5">
     33            <Border.Background>
     34                <LinearGradientBrush EndPoint="0,1" StartPoint="0,0" MappingMode="RelativeToBoundingBox">
     35                    <GradientStop Color="#22444444" Offset="0" />
     36                    <GradientStop Color="#22EEEEEE" Offset="0.25" />
     37                    <GradientStop Color="#55555555" Offset="0.25" />
     38                    <GradientStop Color="#55DFEBEF" Offset="1" />
     39                </LinearGradientBrush>
     40            </Border.Background>
     41                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,0,0" Height="48">
     42                <StackPanel.LayoutTransform>
     43                    <ScaleTransform ScaleX="0.9" ScaleY="0.9"></ScaleTransform>
     44                </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"/>
     48                    <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"/>
     54                    <dc:RibbonButton LargeImage="images/Exit.png" Click="RibbonButton_Click"></dc:RibbonButton>
     55
     56                    <!--<dc:RibbonDropDownButton Name="p2pButton" LargeImage="images/peer2peer-connect.png" ToolTip="Manages the integrated peer2peer connection"/>-->
     57                </StackPanel>
     58            </Border>
     59
     60        <!--<dc:RibbonGroup Title="Demo mode" ToolTip="In demo mode a selected set of samples is repeatedly executed" Name="ribbonDemoMode">
     61                    <dc:RibbonButton LargeImage="images/test/play.png" Content="Play Demo" ToolTip="Select samples and start demo mode"/>
     62
     63                    <dc:RibbonButton LargeImage="images/test/stop.png" Content="Stop Demo" ToolTip="Stop Demo Mode"/>
     64                </dc:RibbonGroup>-->
     65
     66
     67
     68        <!--RibbonTab Settings-->
     69            <!--<dc:RibbonTabItem Visibility="Visible" Title="Settings" Name="ribbonTabSettings">
     70
     71                <dc:RibbonGroup Title="Plugins" Name="ribbonPluginManagement">
     72                    <dc:RibbonButton IsEnabled="False" LargeImage="images/manageplugins.png"  Content="Manage" ToolTip="Manage you favorite plugins"/>
     73                    <dc:RibbonButton IsEnabled="False" LargeImage="images/downloadplugins.png"  Content="Download" ToolTip="Download new plugins for Cryptool"/>
     74                    <dc:RibbonButton Content="Load new plugins" LargeImage="images/reloadplugins.png" ToolTip="Load new Plugins"/>
     75                </dc:RibbonGroup>
     76
     77                <dc:RibbonGroup Title="General Settings" Name="ribbonEditorManagement">
     78
     79                    <dc:RibbonDropDownButton Content="Plugin editor" LargeImage="images/editorSettings.png" Name="buttonDropDownEditor" ToolTip="Please choose your default plugin editor here."/>
     80                    <dc:RibbonDropDownButton Content="Detail level" LargeImage="images/DetailLevel.png" Name="buttonDropDownSettingsLevel" ToolTip="Please choose detail level here.">
     81                        <dc:RibbonButton Content="Beginner" SmallImage="images/Beginner.png" HorizontalAlignment="Left" Name="buttonLevelBeginner"/>
     82                        <dc:RibbonButton Content="Experienced" SmallImage="images/Experienced.png" HorizontalAlignment="Left" Name="buttonLevelExperienced"/>
     83                        <dc:RibbonButton Content="Professional" SmallImage="images/Professional.png" HorizontalAlignment="Left" Name="buttonLevelProfessional"/>
     84
     85                        <dc:RibbonButton Content="Expert" SmallImage="images/Expert.png" HorizontalAlignment="Left" Name="buttonLevelExpert"/>
     86                    </dc:RibbonDropDownButton>
     87
     88                    <dc:RibbonButton Name="buttonRememberLastFile" LargeImage="images/Reopen32.png" Content="Reopen last file" ToolTip="Reopen last file on startup?"/>
     89                </dc:RibbonGroup>
     90
     91            </dc:RibbonTabItem>-->
     92
     93        <!--StatusBar-->
     94        <StatusBar Name="statusBar" DockPanel.Dock="Bottom" Height="20">
     95            <StatusBar.ItemsPanel>
     96                <ItemsPanelTemplate>
     97                    <DockPanel LastChildFill="True"/>
     98                </ItemsPanelTemplate>
     99            </StatusBar.ItemsPanel>
     100            <Separator Style="{DynamicResource {ComponentResourceKey TypeInTargetAssembly=dc:RibbonBar, ResourceId=StatusBarSeparator}}" DockPanel.Dock="Left"/>
     101            <StatusBarItem VerticalAlignment="Center" Height="25" Name="statusBarItem">
     102            </StatusBarItem>
     103        </StatusBar>
     104       
     105        <!--Left Panel-->
     106        <dc:OutlookBar DockPanel.Dock="Left" Header="Algorithms" DockPosition="Left">
     107            <dc:OutlookBar.Sections>
     108                <dc:OutlookSection Header="Classic Ciphers" Image="images/01-Classic-28x26.png" Name="Classic_Ciphers">
     109                    <StackPanel Name="ClassicPaneStack">
     110
     111                    </StackPanel>
     112                </dc:OutlookSection>
     113
     114                <dc:OutlookSection Header="Modern Ciphers" Image="images/02-Modern-28x26.png" Name="Modern_Ciphers">
     115                    <StackPanel Name="ModernPaneStack">
     116
     117                    </StackPanel>
     118                </dc:OutlookSection>
     119
     120                <dc:OutlookSection Header="Hash Functions" Image="images/03-Hash-28x26.png" Name="Hash_Functions">
     121                    <StackPanel Name="HashPaneStack">
     122
     123                    </StackPanel>
     124                </dc:OutlookSection>
     125
     126                <dc:OutlookSection Header="Cryptanalysis" Image="images/04-Analyse-28x26.png" Name="Cryptanalysis">
     127                    <StackPanel Name="AnalaysisPaneStack">
     128
     129                    </StackPanel>
     130                </dc:OutlookSection>
     131
     132                <dc:OutlookSection Header="Tools" Image="images/05-Tools-28x26.png" Name="Tools">
     133                    <StackPanel Name="ToolPaneStack">
     134
     135                    </StackPanel>
     136                </dc:OutlookSection>
     137
     138                <dc:OutlookSection Header="Editor Specific" Image="images/06-EditorSpec-28x26.png" Name="Editor_Specific">
     139                    <StackPanel Name="EditorPaneStack">
     140                       
     141                    </StackPanel>
     142                </dc:OutlookSection>
     143
     144            </dc:OutlookBar.Sections>
     145        </dc:OutlookBar>
     146       
     147        <!--Right Panel-->
     148        <dc:OutlookBar DockPanel.Dock="Right" DockPosition="Right">
     149            <dc:OutlookBar.Sections>
     150                <dc:OutlookSection Header="Plugin Editor" Image="images/default.png" Name="Plug_Editor">
     151                    <StackPanel>
     152                        <dc:OdcExpander Header="Plugin Title here" Name="Plugin_Title">
     153
     154                        </dc:OdcExpander>
     155
     156                        <dc:OdcExpander Header="Miscellaneous" Name="Plugin_Msc">
     157
     158                        </dc:OdcExpander>
     159                    </StackPanel>
     160                </dc:OutlookSection>
     161            </dc:OutlookBar.Sections>
     162        </dc:OutlookBar>
     163       
     164        <!--Editor-->
     165        <Grid Name="EditorSpace">
     166            <Image Height="150" HorizontalAlignment="Left" Margin="291,12,0,0" Name="image1" Stretch="Fill" VerticalAlignment="Top" Width="200" Source="images/SplashScreen.png" />
     167        </Grid>
     168    </DockPanel>
     169</dc:RibbonWindow>
  • trunk/CrypTool/MainWindow.xaml.cs

    r1422 r1423  
    1212using System.Windows.Navigation;
    1313using System.Windows.Shapes;
    14 using Cryptool.PluginBase;
     14using Odyssey.Controls;
     15using Odyssey.Controls.Classes;
    1516
    1617namespace CrypTool
     
    1920    /// Interaction logic for MainWindow.xaml
    2021    /// </summary>
    21     public partial class MainWindow : Window
     22    public partial class MainWindow : RibbonWindow
    2223    {
    2324        private Dictionary<string, List<Type>> currentPlugins = new Dictionary<string, List<Type>>();
    2425
    25        
    26 
    27        
    2826        public Dictionary<string, Type> LoadedTypes { get; set; }
    29        
    30 
    31 
    3227
    3328        public MainWindow()
     
    3631        }
    3732
    38 
    39 
     33        private void RibbonButton_Click(object sender, RoutedEventArgs e)
     34        {
     35            if (SkinManager.SkinId == SkinId.OfficeBlue)
     36                SkinManager.SkinId = SkinId.OfficeBlack;
     37            else
     38                SkinManager.SkinId = SkinId.OfficeBlue;
     39        }
    4040
    4141        private void LoadPlugins()
    4242        {
    43             foreach (Type pluginType in this.LoadedTypes.Values)
    44             {
    45                 if (pluginType.GetEditorSpecificPluginAttribute() != null)
    46                     continue;
    47                
    48                 foreach (string interfaceName in PluginExtension.Interfaces)
    49                 {
    50                     if (pluginType.GetInterface(interfaceName) != null)
    51                     {
    52                         if (!this.currentPlugins.ContainsKey(interfaceName))
    53                             this.currentPlugins.Add(interfaceName, new List<Type>());
    54                         this.currentPlugins[interfaceName].Add(pluginType);
     43            //foreach (Type pluginType in this.LoadedTypes.Values)
     44            //{
     45            //    if (pluginType.GetEditorSpecificPluginAttribute() != null)
     46            //        continue;
    5547
     48            //    foreach (string interfaceName in PluginExtension.Interfaces)
     49            //    {
     50            //        if (pluginType.GetInterface(interfaceName) != null)
     51            //        {
     52            //            if (!this.currentPlugins.ContainsKey(interfaceName))
     53            //                this.currentPlugins.Add(interfaceName, new List<Type>());
    5654
    57 
    58                     }
    59                 }
    60             }
    61 
    62 
     55            //            this.currentPlugins[interfaceName].Add(pluginType);
     56            //        }
     57            //    }
     58            //}
    6359        }
    6460
     
    6763            LoadPlugins();
    6864        }
    69 
    7065    }
    7166}
Note: See TracChangeset for help on using the changeset viewer.