cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-04 19:37:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change icons and sizes of transform forms (how many transforms could a form-filler form if a form-filler could form transforms)

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2015-07-09 15:17:15 -04:00
parent bc2254dd75
commit 27582fa48a
14 changed files with 124 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
NAPS2.Core/Resources/arrow_rotate_anticlockwise-small.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
NAPS2.Core/Resources/contrast.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
NAPS2.Core/Resources/transform_crop.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
NAPS2.Core/Resources/weather_sun.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

1
NAPS2.Core/WinForms/FBrightness.cs
View File

@ -59,6 +59,7 @@ namespace NAPS2.WinForms
.Bind(tbBrightness, txtBrightness, btnRevert, btnOK, btnCancel)
.BottomToForm()
.Activate();
Size = new Size(600, 600);
workingImage = Image.GetImage();
pictureBox.Image = (Bitmap)workingImage.Clone();

45
NAPS2.Core/WinForms/FBrightness.resx
View File

@ -275,28 +275,31 @@
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAFxcXPldXV6RYWFilV1dXpFZWVqRUVFSkVFRUpFRUVKRSUlKkUlJSpFRSVKRcVlymRkRGnQAA
AC8AAAAAAAAAAI2NjcHm5ub/3t7e/97e3v/d3d3/3d3d/9/f3//f39//3Nzc/93c3f/Y2tj/pNKk/8rY
yv9KSEqZAAAAAAAAAAChoaHN5+jo/+Hj5f/g4uT/6Orr//n6/P/+/////f////T29//l5un/097X/2vO
bv+63Lr/ZWBlpAAAAAAAAAAAsLCwzf36+P/l1s//49TM/+ja0v/s39j/697Z/+ve2P/r3tf/5tjQ/+PU
zP/t3t3//////2NjY6IAAAAAAAAAAKKjprLx18H/7MGL//XWpP/44rb/+enD//nt0f/568z/+ea7//bc
rf/00Zz/57uL//Hl4P9KTE6DAAAAAAAAAABnaW1z8NfD//LIj//74bX//uvH///xzf//8MT//+2+//3n
t//63qr/+NOZ/+q8i//a09D+ExYWQgAAAAAAAAAAMDQ0PuXXzv3uyJ3//ObF//zoyv/87ND//OvL//rg
sv/316H/9s+W//PEhf/txZ//s7K03gAAABAAAAAAAAAAAAAPDxHOysjl5byb//zkw//75sn/++fM//vp
z//758n/+N20//bTpP/uv4v/7s+2/4eKjLAAAAAAAAAAAAAAAAAAAAAAmpueqe7Lr//217P/++TI//vl
yf/75sr/++bK//vlyv/85cr/7cSe/+nVyv9RU1V/AAAAAAAAAAAAAAAAAAAAAFhbXV7s3tX/5MOq/+fN
t//nzrj/5865/+fOuP/nzbf/58y1/+XHsP/NysjtExMTMQAAAAAAAAAAAAAAAAAAAAAREREsu7y987Gx
s/+kpKX/paWm/6Wlpv+lpab/paWm/6SjpP/Lzc//cnJzvAAAAAEAAAAAAAAAAAAAAAAAAAAAV1dXfNDQ
0P+JiYr/iYmK/4qKi/+Kiov/ioqL/4qKi/+Hh4j/pqam/7e3t/YEBAQ4AAAAAAAAAAAAAAAAAAAAELCw
sNm3t7f/mpqa/56env+enp7/np6e/56env+enp7/np6e/5qamv/S0tL/SUlJkwAAAAAAAAAAAAAAADo6
Olb09PT/ra2t/6mpqf+oqKj/p6en/6enp/+np6f/p6en/6qqqv+lpaX/2dnZ/6qqqt8AAAAXAAAAAAAA
AABLS0tT8/Pz/O7u7vzn5+f69PT0//j4+P/39/f/+Pj4//r6+v/s7Oz95OTk+vj4+P+enp7JAAAADQAA
AAAAAAAAAAAAAZKSkiaNjY00c3NzMKampqHi4uLl2dnZ3tnZ2eDKysrbS0tLYUhISC1KSkozDQ0NEwAA
AAAAAAAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIADAADAAwAAwAMAAMADAADAAwAAgAMAAIAB
AACAAQAAgAMAAA==
AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
AAD///8B////Af///wH///8B////Af///wEAAAAHAAAAMwAAAAf///8B////Af///wH///8B////Af//
/wH///8B////Af///wH///8BAAAAHQAAADMAAAAZCj5sSReS//8KPmxJAAAAGQAAADMAAAAd////Af//
/wH///8B////Af///wH///8B////ARWF6JsYlP//EnbQkReQ/PMbl///F5D88xJ20JEYlP//FYXom///
/wH///8B////Af///wH///8BAAAAHQAAACEUgeWzIZ3//x6b//8fm///IJz//x+b//8em///IZ3//xSB
5bMAAAAhAAAAHf///wH///8B////ARN926UTgeS1GZT+/SWj//8kov//JKL//ySi//8kov//JKL//yWj
//8ZlP79E4HktRN926X///8B////Af///wEclv//L6v//ymo//8op///KKf//yin//8op///KKf//yin
//8op///Kaj//y+r//8clv//////Af///wEAAAAHEHXRkTSs//8trf//Laz//y2s//8trP//Laz//y2s
//8trP//Laz//y2t//80rP//EHXRkQAAAAf///8BCTtoTRmU/PMtrv//MbH//zGx//8xsf//MbH//zGx
//8xsf//MbH//zGx//8xsf//La7//xmU/PMJO2hN////AROP//9kyP//RL7//zS2//81tv//Nbb//zW2
//81tv//Nbb//zW2//81tv//NLb//0S+//9kyP//E4///////wEUkP8fJ5v98VfE//83u///OLv//zm7
//85u///Obv//zm7//85u///OLv//ze7//9XxP//J5v98RSQ/x////8B////AQtx0JExuP//OsH//zzB
//89wf//PsH//z7B//8+wf//PcH//zzB//86wf//Mbj//wtx0JH///8B////Af///wExof//qOz//5jj
//9Ex///P8X//z/F//9Axv//P8X//z/F//9Ex///mOP//6js//8xof//////Af///wH///8BEo//jQyK
/6FAqv/9XNX//1vT//9c0v//P8r//1zS//9b0///XNX//0Cq//0Miv+hEo//jf///wH///8B////Af//
/wH///8BCoLwq8H3//+d3///oeP//3Le//+h4///nd///8H3//8KgvCr////Af///wH///8B////Af//
/wH///8B////ARGO/403pP//B4j/dzGg/++/8v//MaD/7weI/3c3pP//EY7/jf///wH///8B////Af//
/wH///8B////Af///wH///8B////Af///wERjv8fDo3//xGO/x////8B////Af///wH///8B////Af//
/wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA
//8AAP//AAD//w==
</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>336, 314</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>9, 9, 9, 9</value>
</data>
@ -310,6 +313,6 @@
<value>FBrightness</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=3.3.5.356, Culture=neutral, PublicKeyToken=null</value>
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=3.3.5.25627, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

1
NAPS2.Core/WinForms/FContrast.cs
View File

@ -59,6 +59,7 @@ namespace NAPS2.WinForms
.Bind(tbContrast, txtContrast, btnRevert, btnOK, btnCancel)
.BottomToForm()
.Activate();
Size = new Size(600, 600);
workingImage = Image.GetImage();
pictureBox.Image = (Bitmap)workingImage.Clone();

45
NAPS2.Core/WinForms/FContrast.resx
View File

@ -275,28 +275,31 @@
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAFxcXPldXV6RYWFilV1dXpFZWVqRUVFSkVFRUpFRUVKRSUlKkUlJSpFRSVKRcVlymRkRGnQAA
AC8AAAAAAAAAAI2NjcHm5ub/3t7e/97e3v/d3d3/3d3d/9/f3//f39//3Nzc/93c3f/Y2tj/pNKk/8rY
yv9KSEqZAAAAAAAAAAChoaHN5+jo/+Hj5f/g4uT/6Orr//n6/P/+/////f////T29//l5un/097X/2vO
bv+63Lr/ZWBlpAAAAAAAAAAAsLCwzf36+P/l1s//49TM/+ja0v/s39j/697Z/+ve2P/r3tf/5tjQ/+PU
zP/t3t3//////2NjY6IAAAAAAAAAAKKjprLx18H/7MGL//XWpP/44rb/+enD//nt0f/568z/+ea7//bc
rf/00Zz/57uL//Hl4P9KTE6DAAAAAAAAAABnaW1z8NfD//LIj//74bX//uvH///xzf//8MT//+2+//3n
t//63qr/+NOZ/+q8i//a09D+ExYWQgAAAAAAAAAAMDQ0PuXXzv3uyJ3//ObF//zoyv/87ND//OvL//rg
sv/316H/9s+W//PEhf/txZ//s7K03gAAABAAAAAAAAAAAAAPDxHOysjl5byb//zkw//75sn/++fM//vp
z//758n/+N20//bTpP/uv4v/7s+2/4eKjLAAAAAAAAAAAAAAAAAAAAAAmpueqe7Lr//217P/++TI//vl
yf/75sr/++bK//vlyv/85cr/7cSe/+nVyv9RU1V/AAAAAAAAAAAAAAAAAAAAAFhbXV7s3tX/5MOq/+fN
t//nzrj/5865/+fOuP/nzbf/58y1/+XHsP/NysjtExMTMQAAAAAAAAAAAAAAAAAAAAAREREsu7y987Gx
s/+kpKX/paWm/6Wlpv+lpab/paWm/6SjpP/Lzc//cnJzvAAAAAEAAAAAAAAAAAAAAAAAAAAAV1dXfNDQ
0P+JiYr/iYmK/4qKi/+Kiov/ioqL/4qKi/+Hh4j/pqam/7e3t/YEBAQ4AAAAAAAAAAAAAAAAAAAAELCw
sNm3t7f/mpqa/56env+enp7/np6e/56env+enp7/np6e/5qamv/S0tL/SUlJkwAAAAAAAAAAAAAAADo6
Olb09PT/ra2t/6mpqf+oqKj/p6en/6enp/+np6f/p6en/6qqqv+lpaX/2dnZ/6qqqt8AAAAXAAAAAAAA
AABLS0tT8/Pz/O7u7vzn5+f69PT0//j4+P/39/f/+Pj4//r6+v/s7Oz95OTk+vj4+P+enp7JAAAADQAA
AAAAAAAAAAAAAZKSkiaNjY00c3NzMKampqHi4uLl2dnZ3tnZ2eDKysrbS0tLYUhISC1KSkozDQ0NEwAA
AAAAAAAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIADAADAAwAAwAMAAMADAADAAwAAgAMAAIAB
AACAAQAAgAMAAA==
AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
AAD///8B////Af///wH///8BAAAAHwAAADEAAAAzAAAAMwAAADMAAAAxAAAAH////wH///8B////Af//
/wH///8B////Af///wEAAAAPAAAAM0tJSKtSUE/5UU9O/1BOTv9NS0r/SkhH+UA+PqsAAAAzAAAAD///
/wH///8B////Af///wEAAAAPS0pJa2NhYP9fXl3/ZmRj/2hmZf9oZmX/aGZl/2ZkY/9aWFf/SEZF/y8u
LWsAAAAP////Af///wH///8BWllYa4WDgv9qaGf/bmxr/2JhYP9dW1r/WlhX/11bWv9jY2L/c3Fw/25s
a/9JR0f/Ly4ta////wH///8BAAAAH5eVlP/t7u3/ysnJ/0pIR/9SUVD/VlZV/1hXVv9YV1b/V1ZV/1hW
Vf96eHf/eXd2/0ZEQ/8AAAAf////AZGPjanOzcz/+vv6//f49/+4t7b/R0ZF/1FQT/9VVFP/VlVU/1ZV
VP9UU1L/VVNS/4yKiv9samn/Pz0+qf///wGjoZ/58fDv//Hx8P/u7ez/9vX0/7e2tf9FREP/T05N/1NS
Uf9UU1L/U1NS/1BQT/90c3L/k5KS/0ZEQ/n///8BpKKg//z7+//s6+r/6eno/+zs6//09fT/tbW0/0NB
Qf9NS0v/UU9P/1JQUP9PTU3/XFpa/66trP9IRkX/////AbOxr//7+/z/5ufm/+fn5v/n5+b/6urp//Lz
8v+zsrL/QT8//0tJSf9PTU3/TUtL/0ZERP+7u7r/SUdG/////wGnpaP//f39/+jo5//m5eP/5uXk/+fl
5P/p6Of/8vHw/7KxsP8/PT3/SUdH/0lHR/9bWlr/ysnJ/0pIR/////8Bqqel+fX09P/v7u7/4+Lg/+Tj
4v/k4+L/5OPi/+fm5f/w7u3/sK+u/zs5Of8/PT3/iomJ/8bFxf9NS0r5////Aa6rqZXV1dT//f7+/+Tj
4v/h4eD/4uLh/+Li4f/i4uH/5eXk/+3t7P+qqaj/RUJD/9rZ2f+ZmJf/UE5Nlf///wH///8Bramn//Pz
8//7+vr/4uHg/9/e3f/g397/4N/e/+Hf3v/i4eD/6+rp//Dw7//X1tb/XFpZ/////wH///8B////AbKu
rFuxr6z/9vX1///////v7+//4+Pi/9zb2v/j4+L/8PDw///////09fX/goB//3RycEf///8B////Af//
/wH///8Bsq6sR6yppv/Z2Nf//f3+//////////////////39/v/V1NP/lpST/42LiUf///8B////Af//
/wH///8B////Af///wH///8BrquolauopfenpaP/pqOh/6SioP+joZ/3pKKflf///wH///8B////Af//
/wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA
//8AAP//AAD//w==
</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>336, 314</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>9, 9, 9, 9</value>
</data>
@ -310,6 +313,6 @@
<value>FContrast</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=3.3.5.2406, Culture=neutral, PublicKeyToken=null</value>
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=3.3.5.25627, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

1
NAPS2.Core/WinForms/FCrop.cs
View File

@ -60,6 +60,7 @@ namespace NAPS2.WinForms
.Bind(tbRight, btnRevert, btnOK, btnCancel)
.BottomToForm()
.Activate();
Size = new Size(600, 600);
workingImage = Image.GetImage();
workingImage2 = Image.GetImage();

45
NAPS2.Core/WinForms/FCrop.resx
View File

@ -326,28 +326,31 @@
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAFxcXPldXV6RYWFilV1dXpFZWVqRUVFSkVFRUpFRUVKRSUlKkUlJSpFRSVKRcVlymRkRGnQAA
AC8AAAAAAAAAAI2NjcHm5ub/3t7e/97e3v/d3d3/3d3d/9/f3//f39//3Nzc/93c3f/Y2tj/pNKk/8rY
yv9KSEqZAAAAAAAAAAChoaHN5+jo/+Hj5f/g4uT/6Orr//n6/P/+/////f////T29//l5un/097X/2vO
bv+63Lr/ZWBlpAAAAAAAAAAAsLCwzf36+P/l1s//49TM/+ja0v/s39j/697Z/+ve2P/r3tf/5tjQ/+PU
zP/t3t3//////2NjY6IAAAAAAAAAAKKjprLx18H/7MGL//XWpP/44rb/+enD//nt0f/568z/+ea7//bc
rf/00Zz/57uL//Hl4P9KTE6DAAAAAAAAAABnaW1z8NfD//LIj//74bX//uvH///xzf//8MT//+2+//3n
t//63qr/+NOZ/+q8i//a09D+ExYWQgAAAAAAAAAAMDQ0PuXXzv3uyJ3//ObF//zoyv/87ND//OvL//rg
sv/316H/9s+W//PEhf/txZ//s7K03gAAABAAAAAAAAAAAAAPDxHOysjl5byb//zkw//75sn/++fM//vp
z//758n/+N20//bTpP/uv4v/7s+2/4eKjLAAAAAAAAAAAAAAAAAAAAAAmpueqe7Lr//217P/++TI//vl
yf/75sr/++bK//vlyv/85cr/7cSe/+nVyv9RU1V/AAAAAAAAAAAAAAAAAAAAAFhbXV7s3tX/5MOq/+fN
t//nzrj/5865/+fOuP/nzbf/58y1/+XHsP/NysjtExMTMQAAAAAAAAAAAAAAAAAAAAAREREsu7y987Gx
s/+kpKX/paWm/6Wlpv+lpab/paWm/6SjpP/Lzc//cnJzvAAAAAEAAAAAAAAAAAAAAAAAAAAAV1dXfNDQ
0P+JiYr/iYmK/4qKi/+Kiov/ioqL/4qKi/+Hh4j/pqam/7e3t/YEBAQ4AAAAAAAAAAAAAAAAAAAAELCw
sNm3t7f/mpqa/56env+enp7/np6e/56env+enp7/np6e/5qamv/S0tL/SUlJkwAAAAAAAAAAAAAAADo6
Olb09PT/ra2t/6mpqf+oqKj/p6en/6enp/+np6f/p6en/6qqqv+lpaX/2dnZ/6qqqt8AAAAXAAAAAAAA
AABLS0tT8/Pz/O7u7vzn5+f69PT0//j4+P/39/f/+Pj4//r6+v/s7Oz95OTk+vj4+P+enp7JAAAADQAA
AAAAAAAAAAAAAZKSkiaNjY00c3NzMKampqHi4uLl2dnZ3tnZ2eDKysrbS0tLYUhISC1KSkozDQ0NEwAA
AAAAAAAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIADAADAAwAAwAMAAMADAADAAwAAgAMAAIAB
AACAAQAAgAMAAA==
AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
AAD///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BAAAALwAAADMAAAAv////Af//
/wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////AbiFRu+6hkb/uIVG7///
/wH///8B////Af///wH///8BAAAAIwAAADMAAAAzAAAAMwAAADMAAAAzAAAAMwAAADO6hkb/1aJc/7qG
Rv8AAAAzAAAAI////wH///8B////Aat7Qb26hkf/uYVG/7mFRf+5hUX/uYVF/7mFRf+5hUX/uYVF/7iE
Rf+5hUX/uoVG/6t7Qb3///8B////Af///wG6hkf/06Bb/9OgW//ToFr/06Ba/9OgWv/ToFr/06Ba/9Kg
Wv/SoFr/0qBa/9ShW/+6hkb/////Af///wH///8BuoZH/9OgW/+5hEb/uYVF/7mFRf+5hUX/uYVF/7mF
Rf+5hUb/uYVG/7mFRv+6hUb/u4dHrf///wH///8B////AbmFR//ToFv/uYVH/7uHR/8AAAAz////Af//
/wH///8BuoZH/9OgW/+6hkf/////Af///wH///8B////Af///wG5hUb/1aFT/7mFRv////8Bu4dH/wAA
ADP///8B////AbmFR//ToFv/uYVH/////wH///8B////Af///wH///8BuYVF/9unWv+5hUX/////Af//
/wG7h0f/AAAAM////wG5hUb/16NW/7mFRv////8B////Af///wH///8B////AbiERf/grWD/uIRF////
/wH///8B////AbuHR/8AAAAzuIRF/+CtYf+4hEX/////Af///wH///8BAAAALwAAADO4hEX/5bNn/7iE
Rf8AAAAzAAAAMwAAADMAAAAzu4dH/7iERP/otmr/uIRE/////wH///8B////AbeERu+5hUb/t4JE/+q5
bf+3gkT/uIRF/7iERf+4hEX/uIRF/7iERf+1gUL/8L91/7eDRP////8B////Af///wG5hUb/6rdr/7WB
Qv/wvnP/tYFC/+i2af/ntGj/57Ro/+e0aP/mtGj/5bJm//nKgf+4hET/////Af///wH///8BuoZHrbmF
Rf+2gkP/9cR7/7aCQ/+4hEX/uIRF/7iERf+4hEX/uIRF/7iDRP+4hET/uoZG/wAAADP///8B////Af//
/wH///8BuINE//7Ng/+4g0T/////Af///wH///8B////Af///wH///8B////Af///wG7h0f/AAAAM///
/wH///8B////AbqGRq24hEX/uoZGrf///wH///8B////Af///wH///8B////Af///wH///8B////AbuH
R/////8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA
//8AAP//AAD//w==
</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>336, 314</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>9, 9, 9, 9</value>
</data>
@ -361,6 +364,6 @@
<value>FCrop</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=3.3.5.356, Culture=neutral, PublicKeyToken=null</value>
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=3.3.5.25627, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

23
NAPS2.Core/WinForms/FDesktop.Designer.cs generated
View File

@ -64,13 +64,13 @@ namespace NAPS2.WinForms
this.tsCrop = new System.Windows.Forms.ToolStripMenuItem();
this.tsBrightness = new System.Windows.Forms.ToolStripMenuItem();
this.tsContrast = new System.Windows.Forms.ToolStripMenuItem();
this.tsBitDepth = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.tsReset = new System.Windows.Forms.ToolStripMenuItem();
this.tsdRotate = new System.Windows.Forms.ToolStripDropDownButton();
this.tsRotateLeft = new System.Windows.Forms.ToolStripMenuItem();
this.tsRotateRight = new System.Windows.Forms.ToolStripMenuItem();
this.tsFlip = new System.Windows.Forms.ToolStripMenuItem();
this.customRotationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tsMove = new NAPS2.WinForms.ToolStripDoubleButton();
this.tsdReorder = new System.Windows.Forms.ToolStripDropDownButton();
this.tsInterleave = new System.Windows.Forms.ToolStripMenuItem();
@ -85,7 +85,6 @@ namespace NAPS2.WinForms
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
this.tsAbout = new System.Windows.Forms.ToolStripButton();
this.customRotationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripContainer1.ContentPanel.SuspendLayout();
this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
this.toolStripContainer1.SuspendLayout();
@ -302,7 +301,6 @@ namespace NAPS2.WinForms
this.tsCrop,
this.tsBrightness,
this.tsContrast,
this.tsBitDepth,
this.toolStripSeparator7,
this.tsReset});
this.tsdImage.Image = global::NAPS2.Icons.picture_edit;
@ -343,12 +341,6 @@ namespace NAPS2.WinForms
this.tsContrast.Name = "tsContrast";
this.tsContrast.Click += new System.EventHandler(this.tsContrast_Click);
//
// tsBitDepth
//
this.tsBitDepth.Image = global::NAPS2.Icons.color_wheel;
resources.ApplyResources(this.tsBitDepth, "tsBitDepth");
this.tsBitDepth.Name = "tsBitDepth";
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
@ -394,6 +386,12 @@ namespace NAPS2.WinForms
this.tsFlip.Name = "tsFlip";
this.tsFlip.Click += new System.EventHandler(this.tsFlip_Click);
//
// customRotationToolStripMenuItem
//
this.customRotationToolStripMenuItem.Name = "customRotationToolStripMenuItem";
resources.ApplyResources(this.customRotationToolStripMenuItem, "customRotationToolStripMenuItem");
this.customRotationToolStripMenuItem.Click += new System.EventHandler(this.customRotationToolStripMenuItem_Click);
//
// tsMove
//
this.tsMove.ImageFirst = global::NAPS2.Icons.arrow_up_small;
@ -498,12 +496,6 @@ namespace NAPS2.WinForms
this.tsAbout.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.tsAbout.Click += new System.EventHandler(this.tsAbout_Click);
//
// customRotationToolStripMenuItem
//
this.customRotationToolStripMenuItem.Name = "customRotationToolStripMenuItem";
resources.ApplyResources(this.customRotationToolStripMenuItem, "customRotationToolStripMenuItem");
this.customRotationToolStripMenuItem.Click += new System.EventHandler(this.customRotationToolStripMenuItem_Click);
//
// FDesktop
//
resources.ApplyResources(this, "$this");
@ -574,7 +566,6 @@ namespace NAPS2.WinForms
private System.Windows.Forms.ToolStripMenuItem tsBrightness;
private System.Windows.Forms.ToolStripMenuItem tsContrast;
private System.Windows.Forms.ToolStripMenuItem tsCrop;
private System.Windows.Forms.ToolStripMenuItem tsBitDepth;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
private System.Windows.Forms.ToolStripMenuItem tsReset;
private System.Windows.Forms.ToolStripMenuItem customRotationToolStripMenuItem;

49
NAPS2.Core/WinForms/FDesktop.resx
View File

@ -187,7 +187,7 @@
<value>thumbnailList1</value>
</data>
<data name="&gt;&gt;thumbnailList1.Type" xml:space="preserve">
<value>NAPS2.WinForms.ThumbnailList, NAPS2.Core, Version=3.3.5.2744, Culture=neutral, PublicKeyToken=null</value>
<value>NAPS2.WinForms.ThumbnailList, NAPS2.Core, Version=3.3.5.25366, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;thumbnailList1.Parent" xml:space="preserve">
<value>toolStripContainer1.ContentPanel</value>
@ -425,19 +425,19 @@
<value>6, 54</value>
</data>
<data name="tsView.Size" type="System.Drawing.Size, System.Drawing">
<value>129, 22</value>
<value>152, 22</value>
</data>
<data name="tsView.Text" xml:space="preserve">
<value>View</value>
</data>
<data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing">
<value>126, 6</value>
<value>149, 6</value>
</data>
<data name="tsCrop.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsCrop.Size" type="System.Drawing.Size, System.Drawing">
<value>129, 22</value>
<value>152, 22</value>
</data>
<data name="tsCrop.Text" xml:space="preserve">
<value>Crop</value>
@ -446,7 +446,7 @@
<value>None</value>
</data>
<data name="tsBrightness.Size" type="System.Drawing.Size, System.Drawing">
<value>129, 22</value>
<value>152, 22</value>
</data>
<data name="tsBrightness.Text" xml:space="preserve">
<value>Brightness</value>
@ -455,25 +455,16 @@
<value>None</value>
</data>
<data name="tsContrast.Size" type="System.Drawing.Size, System.Drawing">
<value>129, 22</value>
<value>152, 22</value>
</data>
<data name="tsContrast.Text" xml:space="preserve">
<value>Contrast</value>
</data>
<data name="tsBitDepth.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsBitDepth.Size" type="System.Drawing.Size, System.Drawing">
<value>129, 22</value>
</data>
<data name="tsBitDepth.Text" xml:space="preserve">
<value>Bit Depth</value>
</data>
<data name="toolStripSeparator7.Size" type="System.Drawing.Size, System.Drawing">
<value>126, 6</value>
<value>149, 6</value>
</data>
<data name="tsReset.Size" type="System.Drawing.Size, System.Drawing">
<value>129, 22</value>
<value>152, 22</value>
</data>
<data name="tsReset.Text" xml:space="preserve">
<value>Reset</value>
@ -681,7 +672,7 @@
<value>3, 0</value>
</data>
<data name="tStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>1159, 54</value>
<value>1128, 54</value>
</data>
<data name="tStrip.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
@ -911,12 +902,6 @@
<data name="&gt;&gt;tsContrast.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsBitDepth.Name" xml:space="preserve">
<value>tsBitDepth</value>
</data>
<data name="&gt;&gt;tsBitDepth.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;toolStripSeparator7.Name" xml:space="preserve">
<value>toolStripSeparator7</value>
</data>
@ -953,11 +938,17 @@
<data name="&gt;&gt;tsFlip.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;customRotationToolStripMenuItem.Name" xml:space="preserve">
<value>customRotationToolStripMenuItem</value>
</data>
<data name="&gt;&gt;customRotationToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsMove.Name" xml:space="preserve">
<value>tsMove</value>
</data>
<data name="&gt;&gt;tsMove.Type" xml:space="preserve">
<value>NAPS2.WinForms.ToolStripDoubleButton, NAPS2.Core, Version=3.3.5.2744, Culture=neutral, PublicKeyToken=null</value>
<value>NAPS2.WinForms.ToolStripDoubleButton, NAPS2.Core, Version=3.3.5.25366, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tsdReorder.Name" xml:space="preserve">
<value>tsdReorder</value>
@ -1037,16 +1028,10 @@
<data name="&gt;&gt;tsAbout.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;customRotationToolStripMenuItem.Name" xml:space="preserve">
<value>customRotationToolStripMenuItem</value>
</data>
<data name="&gt;&gt;customRotationToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>FDesktop</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=3.3.5.2744, Culture=neutral, PublicKeyToken=null</value>
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=3.3.5.25366, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

1
NAPS2.Core/WinForms/FRotate.cs
View File

@ -60,6 +60,7 @@ namespace NAPS2.WinForms
.Bind(tbAngle, txtAngle, btnRevert, btnOK, btnCancel)
.BottomToForm()
.Activate();
Size = new Size(600, 600);
workingImage = Image.GetImage();
pictureBox.Image = (Bitmap)workingImage.Clone();

45
NAPS2.Core/WinForms/FRotate.resx
View File

@ -275,28 +275,31 @@
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAFxcXPldXV6RYWFilV1dXpFZWVqRUVFSkVFRUpFRUVKRSUlKkUlJSpFRSVKRcVlymRkRGnQAA
AC8AAAAAAAAAAI2NjcHm5ub/3t7e/97e3v/d3d3/3d3d/9/f3//f39//3Nzc/93c3f/Y2tj/pNKk/8rY
yv9KSEqZAAAAAAAAAAChoaHN5+jo/+Hj5f/g4uT/6Orr//n6/P/+/////f////T29//l5un/097X/2vO
bv+63Lr/ZWBlpAAAAAAAAAAAsLCwzf36+P/l1s//49TM/+ja0v/s39j/697Z/+ve2P/r3tf/5tjQ/+PU
zP/t3t3//////2NjY6IAAAAAAAAAAKKjprLx18H/7MGL//XWpP/44rb/+enD//nt0f/568z/+ea7//bc
rf/00Zz/57uL//Hl4P9KTE6DAAAAAAAAAABnaW1z8NfD//LIj//74bX//uvH///xzf//8MT//+2+//3n
t//63qr/+NOZ/+q8i//a09D+ExYWQgAAAAAAAAAAMDQ0PuXXzv3uyJ3//ObF//zoyv/87ND//OvL//rg
sv/316H/9s+W//PEhf/txZ//s7K03gAAABAAAAAAAAAAAAAPDxHOysjl5byb//zkw//75sn/++fM//vp
z//758n/+N20//bTpP/uv4v/7s+2/4eKjLAAAAAAAAAAAAAAAAAAAAAAmpueqe7Lr//217P/++TI//vl
yf/75sr/++bK//vlyv/85cr/7cSe/+nVyv9RU1V/AAAAAAAAAAAAAAAAAAAAAFhbXV7s3tX/5MOq/+fN
t//nzrj/5865/+fOuP/nzbf/58y1/+XHsP/NysjtExMTMQAAAAAAAAAAAAAAAAAAAAAREREsu7y987Gx
s/+kpKX/paWm/6Wlpv+lpab/paWm/6SjpP/Lzc//cnJzvAAAAAEAAAAAAAAAAAAAAAAAAAAAV1dXfNDQ
0P+JiYr/iYmK/4qKi/+Kiov/ioqL/4qKi/+Hh4j/pqam/7e3t/YEBAQ4AAAAAAAAAAAAAAAAAAAAELCw
sNm3t7f/mpqa/56env+enp7/np6e/56env+enp7/np6e/5qamv/S0tL/SUlJkwAAAAAAAAAAAAAAADo6
Olb09PT/ra2t/6mpqf+oqKj/p6en/6enp/+np6f/p6en/6qqqv+lpaX/2dnZ/6qqqt8AAAAXAAAAAAAA
AABLS0tT8/Pz/O7u7vzn5+f69PT0//j4+P/39/f/+Pj4//r6+v/s7Oz95OTk+vj4+P+enp7JAAAADQAA
AAAAAAAAAAAAAZKSkiaNjY00c3NzMKampqHi4uLl2dnZ3tnZ2eDKysrbS0tLYUhISC1KSkozDQ0NEwAA
AAAAAAAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIADAADAAwAAwAMAAMADAADAAwAAgAMAAIAB
AACAAQAAgAMAAA==
AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
AAD///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BAAAALwAAADP///8B////Af//
/wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////AQCLTPEAjEz/AAAAM///
/wH///8B////Af///wH///8B////Af///wH///8BAAAAFwAAADMAAAAzAAAAMwAAADMAiEj/E8WI/wCI
R/8AAAAz////Af///wH///8B////Af///wH///8BAAAALwBvPIsAiEn5AIdG/wCYV/8AnVz/AL99/wDi
oP8x3Kf/AIdF/wAAADP///8B////Af///wH///8BAAAALwCISOsAoWP/AMuS/wDbof8A2Z//ANid/wDW
nP8A1Zv/ANed/0zetv8Aikj/////Af///wH///8BAAAAGwCISOsArHb/AM6h/wDLnf9L3r//f+nT/37o
0/+C59H/AMeZ/wDJm/9r4cb/AIpI/////wH///8B////AQB3QJsAnWT/AMaj/wDDn/9L0Lb/QbGF/wCM
Sv8AhUD/AKx9/wDDnv+J4dL/AIdD/////wH///8B////Af///wEAiUj5AMGU/wDJoP87zar/HJde/wCK
R2f///8B////AQCIRf+j5tX/AIdD/////wH///8B////Af///wH///8BAIlH/wDVo/8A0qD/AJ1g/wCE
Rmv///8B////Af///wEAjUzpAIxJ/////wH///8B////Af///wH///8B////AQCIR/8Q3qr/ANig/wCc
Xf8AZDY9////Af///wH///8BAAAAFQAAADMAAAAzAAAAMwAAAC////8B////Af///wEAiEb/Mea3/wDa
n/8An2D/AGo5hQAAABEAAAAJAAAAFQBuO4kAikn/AIlH/wCKSf8Ai0zx////Af///wH///8BAIhH+VHY
tP8P2Kb/AMaP/wCMS/8AYDNzAEcmVwBqOYUAjUz/AMmS/w/erP9T3rr/AItK/////wH///8B////AQCL
SoMhpnH/Z+PM/w7Pp/8Avo7/AJtg/wCXW/8Am2D/AL6P/w7QqP9n5c3/Iqdy/wCMSvv///8B////Af//
/wH///8BAIlH5UK4j/+H59n/S9a+/xrLrP8by63/Gsus/0vWvv+H59n/QriP/wCJR/8AjU1H////Af//
/wH///8B////Af///wEAiUblJ6V0/3rVxP+Z5+H/mOfh/5nn4f961cT/J6V0/wCJRv8AjUxv////Af//
/wH///8B////Af///wH///8B////AQCMSYMAiUb3AIhD/wCHQv8AiEP/AIlG/wCMSakAjU0L////Af//
/wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA
//8AAP//AAD//w==
</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>336, 314</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>9, 9, 9, 9</value>
</data>
@ -310,6 +313,6 @@
<value>FRotate</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=3.3.5.25347, Culture=neutral, PublicKeyToken=null</value>
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=3.3.5.25627, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>