Ticket #10143: update_diff.txt

File update_diff.txt, 3.4 KB (added by Stephen L'Allier, 8 years ago)
Line 
1--- update.xrc 2015-12-08 12:22:17.248393913 -0500
2+++ update_new.xrc 2015-12-08 12:24:20.356361216 -0500
3@@ -1,16 +1,20 @@
4 <?xml version="1.0" ?>
5 <resource version="2.3.0.1" xmlns="http://www.wxwindows.org/wxxrc">
6 <object class="wxDialog" name="ID_UPDATE_DIALOG">
7- <title>Check for Updates</title>
8+ <style>wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|
9+wxTAB_TRAVERSAL</style>
10+ <title>Check For Updates</title>
11 <object class="wxBoxSizer">
12- <orient>wxVERTICAL</orient>
13+ <orient>wxHORIZONTAL</orient>
14+
15 <object class="sizeritem">
16 <object class="wxFlexGridSizer">
17+
18 <object class="sizeritem">
19 <object class="wxPanel" name="ID_CONTENT"/>
20 <option>1</option>
21 <flag>wxGROW</flag>
22- </object>
23+ </object>
24 <object class="sizeritem">
25 <object class="wxStaticLine"/>
26 <flag>wxGROW</flag>
27@@ -45,6 +49,7 @@
28 </object>
29 <object class="wxPanel" name="ID_NEWVERSION_PANEL">
30 <object class="wxFlexGridSizer">
31+
32 <object class="sizeritem">
33 <object class="wxStaticText">
34 <label>A new version of FileZilla is available:</label>
35@@ -61,13 +66,17 @@
36 <label>What's new:</label>
37 </object>
38 </object>
39+
40 <object class="sizeritem">
41 <object class="wxTextCtrl" name="ID_NEWS">
42 <style>wxTE_AUTO_SCROLL|wxTE_MULTILINE|wxTE_READONLY</style>
43 </object>
44 <option>1</option>
45 <flag>wxGROW</flag>
46- <minsize>300,200</minsize>
47+ <!-- changed the minimun high of the update details
48+ text panel from 200 to 65 -->
49+ <minsize>300, 65</minsize>
50+
51 </object>
52 <object class="sizeritem">
53 <object class="wxBoxSizer">
54@@ -76,6 +85,7 @@
55 <rows>1</rows>
56 <vgap>5</vgap>
57 <hgap>5</hgap>
58+
59 <object class="sizeritem">
60 <object class="wxStaticText" name="ID_DOWNLOAD_LABEL">
61 <label>Downloading update...</label>
62@@ -157,6 +167,7 @@
63 <object class="wxBoxSizer">
64 <object class="sizeritem">
65 <object class="wxFlexGridSizer">
66+
67 <object class="sizeritem">
68 <object class="wxStaticText">
69 <label>Checking for updates...</label>
70@@ -187,6 +198,7 @@
71 </object>
72 <object class="wxPanel" name="ID_FAILURE_PANEL">
73 <object class="wxFlexGridSizer">
74+
75 <object class="sizeritem">
76 <object class="wxStaticText">
77 <label>Information about the latest version of FileZilla could not be retrieved. Please try again later.</label>
78@@ -203,7 +215,9 @@
79 </object>
80 <option>1</option>
81 <flag>wxGROW</flag>
82- <minsize>-1,200</minsize>
83+ <!-- When the update details failed to retrieve the high of
84+ the window will still be 200 so changed text panel to 65 -->
85+ <minsize>-1,65</minsize>
86 </object>
87 <object class="sizeritem">
88 <object class="wxHyperlinkCtrl" name="ID_SHOW_DETAILS">
89@@ -231,6 +245,7 @@
90 </object>
91 <object class="wxPanel" name="ID_LATEST_PANEL">
92 <object class="wxFlexGridSizer">
93+
94 <object class="sizeritem">
95 <object class="wxBoxSizer">
96 <object class="spacer">
97@@ -257,4 +272,4 @@
98 <growablerows>0</growablerows>
99 </object>
100 </object>
101-</resource>
102\ No newline at end of file
103+</resource>