Merge branch 'master' of http://47.103.154.90:83/r/DPump/Hydr/Desktop.V1.1

tangxu

2024-10-14 6cd995b71dfc74d4d96347d0bc535fddf36fa9df

 Client/DesktopMain/RibbonTestForm.resx

@@ -117,104 +117,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="ribbonButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAfCAYAAACGVs+MAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAACrUlEQVRYR+3XWahNURjA8WMei67yYigZ
        X5RcMmQKkTFFIm5kfpCIQsqDByFknpUh8oBSCpkpPMhQKBEyP8hQ5vn/P52tY9917nE458n56te+3X3a
        61trfWuvtRMFiCooxTrcwTd8wBUsQDMULGpiJh7hO37EmMxVDEIl5DXs+TzY23jDcU8xDHmN/ngJe/kM
        D/ARX+HwH8dZPIdJ3EBr5CWqYi988C1MwEDMxkN0w0hMxAAcgFO0CHkJC+s+TOA9HAl73BnOudeT8P5u
        dMBjmOwfRf0UexqK7ngHG9Ah9IJV73x3QpSAibaB0+F0VRg2Ohb7sAcbMQcOo/NXAqMH0hNw2PfDaTiP
        LogSuIy2uAmnIRh1MQoO11K0R1N0xWQsxnp4fxVW4C1s4B6uwwYd+mOp6y6cgbXgUrU4y01BHQzBdqyB
        Q+fyCkUNNEEfmJRDagJex6EMO/EC0zAc/m4zrBF/uwTJ8GG9sQ0Os1VbHbnEULyBD/Zd4BL0b32CU/Ql
        7X+34VQki2UlNsEkcm04ika4hKiBirzGGCTjFSyU0WiFBsg07KGoBx92EZ8RajBi0bk/2NavFWXWFsZ8
        LMNWWFQzMBgtUAvxsF5G4ARCr1+L7C58I1qYFqUvHlfPb/vAEfgww543hFU7HgthTcjVMBUWppvJYfjS
        iTcc8Z514dQ0RtRGuUhPIBS10RJW+xScRvqaz8QEeiJrZEsgHmsRajCuYAn4fgg1GFdMoJhAMYH/OwE3
        pVNojqxxFPlKwDOeR65JiI5rWeMClsMjs6dVt+NqyBShBNxm3fnmws0np3C77Yvp8HtuQ8os+LHhfT+5
        oogn8ARu454l/vlzy547dI6E5zdHZgc8I3pe8CBxEDbsWW8L2qEyChL2yKN5R3jqWY1rOId++NvjWyoS
        iZ/iW1Ep6d2J+gAAAABJRU5ErkJggg==
</value>
  </data>
  <data name="ribbonButton1.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAfCAYAAACGVs+MAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAACrUlEQVRYR+3XWahNURjA8WMei67yYigZ
        X5RcMmQKkTFFIm5kfpCIQsqDByFknpUh8oBSCpkpPMhQKBEyP8hQ5vn/P52tY9917nE458n56te+3X3a
        61trfWuvtRMFiCooxTrcwTd8wBUsQDMULGpiJh7hO37EmMxVDEIl5DXs+TzY23jDcU8xDHmN/ngJe/kM
        D/ARX+HwH8dZPIdJ3EBr5CWqYi988C1MwEDMxkN0w0hMxAAcgFO0CHkJC+s+TOA9HAl73BnOudeT8P5u
        dMBjmOwfRf0UexqK7ngHG9Ah9IJV73x3QpSAibaB0+F0VRg2Ohb7sAcbMQcOo/NXAqMH0hNw2PfDaTiP
        LogSuIy2uAmnIRh1MQoO11K0R1N0xWQsxnp4fxVW4C1s4B6uwwYd+mOp6y6cgbXgUrU4y01BHQzBdqyB
        Q+fyCkUNNEEfmJRDagJex6EMO/EC0zAc/m4zrBF/uwTJ8GG9sQ0Os1VbHbnEULyBD/Zd4BL0b32CU/Ql
        7X+34VQki2UlNsEkcm04ika4hKiBirzGGCTjFSyU0WiFBsg07KGoBx92EZ8RajBi0bk/2NavFWXWFsZ8
        LMNWWFQzMBgtUAvxsF5G4ARCr1+L7C58I1qYFqUvHlfPb/vAEfgww543hFU7HgthTcjVMBUWppvJYfjS
        iTcc8Z514dQ0RtRGuUhPIBS10RJW+xScRvqaz8QEeiJrZEsgHmsRajCuYAn4fgg1GFdMoJhAMYH/OwE3
        pVNojqxxFPlKwDOeR65JiI5rWeMClsMjs6dVt+NqyBShBNxm3fnmws0np3C77Yvp8HtuQ8os+LHhfT+5
        oogn8ARu454l/vlzy547dI6E5zdHZgc8I3pe8CBxEDbsWW8L2qEyChL2yKN5R3jqWY1rOId++NvjWyoS
        iZ/iW1Ep6d2J+gAAAABJRU5ErkJggg==
</value>
  </data>
  <data name="ribbonButton1.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAATSURBVDhPYxgFo2AUjAIwYGAAAAQQAAGnRHxjAAAAAElF
        TkSuQmCC
</value>
  </data>
  <data name="ribbonButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
        wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
  </data>
  <data name="ribbonButton2.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
        wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
  </data>
  <data name="ribbonButton2.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
        wAAADsABataJCQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
  </data>
  <data name="ribbonButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
        wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
  </data>
  <data name="ribbonButton3.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
        wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
  </data>
  <data name="ribbonButton3.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
        wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
  </data>
  <data name="ribbonButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
        QwAAAABJRU5ErkJggg==
</value>
  </data>
  <data name="ribbonButton4.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
        QwAAAABJRU5ErkJggg==
</value>
  </data>
  <data name="ribbonButton4.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
        wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
  </data>
</root>