[UI Overhaul] Task/rdmp 338 icon overhaul #2280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

JFriel wants to merge 39 commits into release/ui-overhaul from task/RDMP-338-icon-overhaul

Application/ResearchDataManagementPlatform/Menus/RDMPTopMenuStripUI.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -481,32 +481,32 @@ public DockContent Activate(DeserializeInstruction instruction, IActivateItems a
  
                case IObjectCollectionControl uiCollection:

                    return Activate(uiCollection, instruction.ObjectCollection);

                case IRDMPSingleDatabaseObjectControl uiInstance:

                {

                    var databaseObject = instruction.DatabaseObject;

                    //the database object is gone? deleted maybe

                    if (databaseObject == null)

                        return null;

                    DockContent floatable = WindowFactory.Create(this, RefreshBus, uiInstance,

                        CoreIconProvider.GetImage(databaseObject), databaseObject);

                    floatable.Show(_mainDockPanel, DockState.Document);

                    try

                    {

                        uiInstance.SetDatabaseObject(this, (DatabaseEntity)databaseObject);

                        SetTabText(floatable, uiInstance);

                        var databaseObject = instruction.DatabaseObject;

                        //the database object is gone? deleted maybe

                        if (databaseObject == null)

                            return null;

                        DockContent floatable = WindowFactory.Create(this, RefreshBus, uiInstance,

                            CoreIconProvider.GetImage(databaseObject), databaseObject);

                        floatable.Show(_mainDockPanel, DockState.Document);

                        try

                        {

                            uiInstance.SetDatabaseObject(this, (DatabaseEntity)databaseObject);

                            SetTabText(floatable, uiInstance);

                        }

                        catch (Exception e)

                        {

                            floatable.Close();

                            throw new Exception(

                                $"SetDatabaseObject failed on Control of Type '{instruction.UIControlType.Name}', control closed, see inner Exception for details",

                                e);

                        }

                        return floatable;

                    }

                    catch (Exception e)

                    {

                        floatable.Close();

                        throw new Exception(

                            $"SetDatabaseObject failed on Control of Type '{instruction.UIControlType.Name}', control closed, see inner Exception for details",

                            e);

                    }

                    return floatable;

                }

                default:

                    return (DockContent)activator.ShowWindow(c, true);

            }

    @@ -867,8 +867,10 @@ public void StartSession(string sessionName, IEnumerable<IMapsDirectlyToDatabase
  
            var panel = WindowFactory.Create(this, new SessionCollectionUI(), new SessionCollection(sessionName)

            {

                DatabaseObjects = initialObjects.ToList()

            }, Image.Load<Rgba32>(CatalogueIcons.WindowLayout));

            }, null);

            panel.Show(_mainDockPanel, DockState.DockLeft);

            //}, Image.Load<Rgba32>(CatalogueIcons.WindowLayout));

        }

    @@ -905,7 +907,7 @@ public override CohortCreationRequest GetCohortCreationRequest(ExternalCohortTab
  
            return ui.ShowDialog() == DialogResult.OK ? ui.Result : null;

        }

        public override IProject CohortCommitProjectSelect(IProject currentProject,Project[] projects)

        public override IProject CohortCommitProjectSelect(IProject currentProject, Project[] projects)

        {

            var ui = new CohortCommitProjectSelectionUI(this, currentProject, projects);

            return ui.ShowDialog() == DialogResult.OK ? ui.Result : null; ;

Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -46,11 +46,11 @@ public void SetUp(IActivateItems activator, string title, Type openType, AtomicC
  
                _activator = activator;

                lblTitle.Text = title;

                btnNew.Image = FamFamFamIcons.add.ImageToBitmap();

                btnNew.Image =CatalogueIcons.Add.ImageToBitmap();

                btnNew.Text = "New";

                btnNew.DisplayStyle = ToolStripItemDisplayStyle.Text;

                btnNewDropdown.Image = FamFamFamIcons.add.ImageToBitmap();

                btnNewDropdown.Image =CatalogueIcons.Add.ImageToBitmap();

                btnNewDropdown.Text = "New...";

                btnNewDropdown.DisplayStyle = ToolStripItemDisplayStyle.Text;

Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.resx

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,17 +1,17 @@
  
    ﻿<?xml version="1.0" encoding="utf-8"?>

    <root>

      <!-- 

        Microsoft ResX Schema 

      <!--

        Microsoft ResX Schema

        Version 2.0

        The primary goals of this format is to allow a simple XML format 

        that is mostly human readable. The generation and parsing of the 

        various data types are done through the TypeConverter classes 

        The primary goals of this format is to allow a simple XML format

        that is mostly human readable. The generation and parsing of the

        various data types are done through the TypeConverter classes

        associated with the data types.

        Example:

        ... ado.net/XML headers & schema ...

        <resheader name="resmimetype">text/microsoft-resx</resheader>

        <resheader name="version">2.0</resheader>

    @@ -26,36 +26,36 @@
  
            <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

            <comment>This is a comment</comment>

        </data>

        There are any number of "resheader" rows that contain simple 

        There are any number of "resheader" rows that contain simple

        name/value pairs.

        Each data row contains a name, and value. The row also contains a 

        type or mimetype. Type corresponds to a .NET class that support 

        text/value conversion through the TypeConverter architecture. 

        Classes that don't support this are serialized and stored with the 

        Each data row contains a name, and value. The row also contains a

        type or mimetype. Type corresponds to a .NET class that support

        text/value conversion through the TypeConverter architecture.

        Classes that don't support this are serialized and stored with the

        mimetype set.

        The mimetype is used for serialized objects, and tells the 

        ResXResourceReader how to depersist the object. This is currently not 

        The mimetype is used for serialized objects, and tells the

        ResXResourceReader how to depersist the object. This is currently not

        extensible. For a given mimetype the value must be set accordingly:

        Note - application/x-microsoft.net.object.binary.base64 is the format 

        that the ResXResourceWriter will generate, however the reader can 

        Note - application/x-microsoft.net.object.binary.base64 is the format

        that the ResXResourceWriter will generate, however the reader can

        read any of the formats listed below.

        mimetype: application/x-microsoft.net.object.binary.base64

        value   : The object must be serialized with 

        value   : The object must be serialized with

                : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter

                : and then encoded with base64 encoding.

        mimetype: application/x-microsoft.net.object.soap.base64

        value   : The object must be serialized with 

        value   : The object must be serialized with

                : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

                : and then encoded with base64 encoding.

        mimetype: application/x-microsoft.net.object.bytearray.base64

        value   : The object must be serialized into a byte array 

        value   : The object must be serialized into a byte array

                : using a System.ComponentModel.TypeConverter

                : and then encoded with base64 encoding.

        -->

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[UI Overhaul] Task/rdmp 338 icon overhaul #2280

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

[UI Overhaul] Task/rdmp 338 icon overhaul #2280

Are you sure you want to change the base?

Uh oh!

[UI Overhaul] Task/rdmp 338 icon overhaul #2280

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!