Skip to content

Commit dac6884

Browse files
sashaolisashaoli
committed
Виправлення помилок при використанні проксі.
1 parent 41d9e11 commit dac6884

14 files changed

+236
-137
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
curl -L -O https://github.com/sashaoli/GiteaPanel/releases/download/v0.5.6/giteapanel_0.5.6_x86_64.AppImage
2727
chmod +x giteapanel_0.5.6_x86_64.AppImage
2828
```
29-
> Для оточення **"Gnome"** необхідно встановити розширення ["TopIcons"](https://extensions.gnome.org/extension/495/topicons/), або ["TopIcons Plus"](https://extensions.gnome.org/extension/1031/topicons/), або ["Tray Icons"](https://extensions.gnome.org/extension/1503/tray-icons/). Також, подібні розширення необхідно встановити для оточення **"Unity"**.
29+
> Для оточення **"Gnome"** необхідно встановити розширення ["TopIcons"](https://extensions.gnome.org/extension/495/topicons/), або ["TopIcons Plus"](https://extensions.gnome.org/extension/1031/topicons/), або ["Tray Icons"](https://extensions.gnome.org/extension/1503/tray-icons/).
3030
3131
2. Вкажіть, у полі "Gitea path", шлях до бінарного файлу сервера Gitea. Бажано, щоб назва файлу була "gitea".
3232
3. Натисніть кнопку "Gitea update options" та у полі "OS Idettification" вкажіть Вашу операційну систему.

‎README_EN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
chmod +x giteapanel_0.5.6_x86_64.AppImage
2424
```
2525
26-
> For environment **"Gnome"** must be installed extension ["TopIcons"](https://extensions.gnome.org/extension/495/topicons/), or ["TopIcons Plus"](https://extensions.gnome.org/extension/1031/topicons/), or ["Tray Icons"](https://extensions.gnome.org/extension/1503/tray-icons/). Also, similar extensions must be installed for others **"Unity"**.
26+
> For environment **"Gnome"** must be installed extension ["TopIcons"](https://extensions.gnome.org/extension/495/topicons/), or ["TopIcons Plus"](https://extensions.gnome.org/extension/1031/topicons/), or ["Tray Icons"](https://extensions.gnome.org/extension/1503/tray-icons/).
2727
2828
2. In the "Gitea path" field, specify the path to the binary file of the Gitea server. The file name is preferably "gitea".
2929
3. Click the "Gitea update options" button and in the "OS Idettification" field, specify your operating system.

‎giteapanel.ctpr‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
<UseVersionInfo Value="True"/>
3434
<AutoIncrementBuild Value="True"/>
3535
<MinorVersionNr Value="5"/>
36-
<RevisionNr Value="6"/>
36+
<RevisionNr Value="7"/>
3737
<BuildNr Value="17"/>
38-
<StringTable CompanyName="Sashaoli" FileDescription="Manage the local Gitea server with the tray" InternalName="giteapanel" LegalCopyright="Sashaoli © 2019" OriginalFilename="giteapanel" ProductName="Gitea Panel" ProductVersion="0.5.6"/>
38+
<StringTable CompanyName="Sashaoli" FileDescription="Manage the local Gitea server with the tray" InternalName="giteapanel" LegalCopyright="Sashaoli © 2019" OriginalFilename="giteapanel" ProductName="Gitea Panel" ProductVersion="0.5.7"/>
3939
</VersionInfo>
4040
<BuildModes Count="3">
4141
<Item1 Name="Default" Default="True"/>
@@ -114,19 +114,22 @@
114114
<FormatVersion Value="2"/>
115115
<Modes Count="0"/>
116116
</RunParams>
117-
<RequiredPackages Count="4">
117+
<RequiredPackages Count="5">
118118
<Item1>
119-
<PackageName Value="lz_fpweb"/>
119+
<PackageName Value="pl_indy"/>
120120
</Item1>
121121
<Item2>
122-
<PackageName Value="pl_luicontrols"/>
122+
<PackageName Value="lz_fpweb"/>
123123
</Item2>
124124
<Item3>
125-
<PackageName Value="adFCL"/>
125+
<PackageName Value="pl_luicontrols"/>
126126
</Item3>
127127
<Item4>
128-
<PackageName Value="adLCL"/>
128+
<PackageName Value="adFCL"/>
129129
</Item4>
130+
<Item5>
131+
<PackageName Value="adLCL"/>
132+
</Item5>
130133
</RequiredPackages>
131134
<Units Count="6">
132135
<Unit0>

‎giteapanel.ctps‎

Lines changed: 94 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
<ProjectSession>
44
<Version Value="12"/>
55
<BuildModes Active="Release_x86_x64"/>
6-
<Units Count="7">
6+
<Units Count="10">
77
<Unit0>
88
<Filename Value="giteapanel.ppr"/>
99
<FRMtype Value="0"/>
1010
<IsPartOfProject Value="True"/>
1111
<HasResources Value="True"/>
1212
<ResourceBaseClass Value="Form"/>
13-
<EditorIndex Value="3"/>
14-
<UsageCount Value="184"/>
13+
<EditorIndex Value="4"/>
14+
<CursorPos Y="4"/>
15+
<UsageCount Value="202"/>
1516
<Loaded Value="True"/>
1617
</Unit0>
1718
<Unit1>
@@ -21,18 +22,18 @@
2122
<ComponentName Value="MainForm"/>
2223
<HasResources Value="True"/>
2324
<ResourceBaseClass Value="Form"/>
24-
<TopLine Value="417"/>
25-
<CursorPos X="16" Y="450"/>
26-
<UsageCount Value="184"/>
25+
<TopLine Value="167"/>
26+
<CursorPos X="17" Y="199"/>
27+
<UsageCount Value="202"/>
2728
<Loaded Value="True"/>
2829
<LoadedDesigner Value="True"/>
2930
</Unit1>
3031
<Unit2>
3132
<Filename Value="resstr.pas"/>
3233
<IsPartOfProject Value="True"/>
33-
<EditorIndex Value="5"/>
34-
<CursorPos X="68" Y="34"/>
35-
<UsageCount Value="184"/>
34+
<EditorIndex Value="6"/>
35+
<CursorPos X="55" Y="35"/>
36+
<UsageCount Value="202"/>
3637
<Loaded Value="True"/>
3738
</Unit2>
3839
<Unit3>
@@ -45,7 +46,7 @@
4546
<EditorIndex Value="1"/>
4647
<TopLine Value="20"/>
4748
<CursorPos X="34" Y="40"/>
48-
<UsageCount Value="184"/>
49+
<UsageCount Value="202"/>
4950
<Loaded Value="True"/>
5051
<LoadedDesigner Value="True"/>
5152
</Unit3>
@@ -56,10 +57,9 @@
5657
<ComponentName Value="UpdSettingForm"/>
5758
<HasResources Value="True"/>
5859
<ResourceBaseClass Value="Form"/>
59-
<EditorIndex Value="4"/>
60-
<TopLine Value="50"/>
61-
<CursorPos X="20" Y="73"/>
62-
<UsageCount Value="184"/>
60+
<EditorIndex Value="5"/>
61+
<CursorPos X="96" Y="55"/>
62+
<UsageCount Value="202"/>
6363
<Loaded Value="True"/>
6464
<LoadedDesigner Value="True"/>
6565
</Unit4>
@@ -72,9 +72,9 @@
7272
<ResourceBaseClass Value="Form"/>
7373
<IsVisibleTab Value="True"/>
7474
<EditorIndex Value="2"/>
75-
<TopLine Value="161"/>
76-
<CursorPos X="9" Y="190"/>
77-
<UsageCount Value="184"/>
75+
<TopLine Value="269"/>
76+
<CursorPos Y="270"/>
77+
<UsageCount Value="202"/>
7878
<Loaded Value="True"/>
7979
<LoadedDesigner Value="True"/>
8080
</Unit5>
@@ -84,129 +84,154 @@
8484
<UnitName Value="System"/>
8585
<EditorIndex Value="-1"/>
8686
<CursorPos X="9" Y="3"/>
87-
<UsageCount Value="4"/>
87+
<UsageCount Value="1"/>
8888
</Unit6>
89+
<Unit7>
90+
<Filename Value="/usr/local/codetyphon/typhon/components/pl_Indy/source/IdGlobal.pas"/>
91+
<FRMtype Value="0"/>
92+
<EditorIndex Value="3"/>
93+
<TopLine Value="1396"/>
94+
<CursorPos X="94" Y="1417"/>
95+
<UsageCount Value="26"/>
96+
<Loaded Value="True"/>
97+
</Unit7>
98+
<Unit8>
99+
<Filename Value="/usr/local/codetyphon/typhon/components/pl_Indy/source/IdHTTP.pas"/>
100+
<FRMtype Value="0"/>
101+
<EditorIndex Value="-1"/>
102+
<TopLine Value="381"/>
103+
<CursorPos X="6" Y="319"/>
104+
<UsageCount Value="7"/>
105+
</Unit8>
106+
<Unit9>
107+
<Filename Value="/usr/local/codetyphon/typhon/components/pl_Indy/source/IdTCPConnection.pas"/>
108+
<FRMtype Value="0"/>
109+
<EditorIndex Value="-1"/>
110+
<TopLine Value="459"/>
111+
<CursorPos X="20" Y="450"/>
112+
<UsageCount Value="8"/>
113+
</Unit9>
89114
</Units>
90115
<JumpHistory Count="30" HistoryIndex="29">
91116
<Position1>
92-
<Filename Value="mainunit.pas"/>
93-
<Caret Line="348" Column="16" TopLine="315"/>
117+
<Filename Value="updategitea.pas"/>
118+
<Caret Line="112" Column="11" TopLine="99"/>
94119
</Position1>
95120
<Position2>
96-
<Filename Value="mainunit.pas"/>
97-
<Caret Line="352" Column="64" TopLine="327"/>
121+
<Filename Value="updategitea.pas"/>
122+
<Caret Line="146" Column="12" TopLine="120"/>
98123
</Position2>
99124
<Position3>
100-
<Filename Value="mainunit.pas"/>
101-
<Caret Line="84" Column="15" TopLine="65"/>
125+
<Filename Value="updategitea.pas"/>
126+
<Caret Line="59" Column="15" TopLine="40"/>
102127
</Position3>
103128
<Position4>
104-
<Filename Value="mainunit.pas"/>
105-
<Caret Line="324" Column="79" TopLine="317"/>
129+
<Filename Value="updategitea.pas"/>
130+
<Caret Line="118" Column="23" TopLine="109"/>
106131
</Position4>
107132
<Position5>
108-
<Filename Value="mainunit.pas"/>
109-
<Caret Line="367" Column="84" TopLine="314"/>
133+
<Filename Value="updategitea.pas"/>
134+
<Caret Line="129" Column="4" TopLine="109"/>
110135
</Position5>
111136
<Position6>
112-
<Filename Value="mainunit.pas"/>
113-
<Caret Line="366" Column="84" TopLine="326"/>
137+
<Filename Value="updategitea.pas"/>
138+
<Caret Line="193" Column="32" TopLine="169"/>
114139
</Position6>
115140
<Position7>
116-
<Filename Value="mainunit.pas"/>
117-
<Caret Line="367" Column="84" TopLine="117"/>
141+
<Filename Value="updategitea.pas"/>
142+
<Caret Line="143" Column="108" TopLine="103"/>
118143
</Position7>
119144
<Position8>
120-
<Filename Value="mainunit.pas"/>
121-
<Caret Line="336" TopLine="318"/>
145+
<Filename Value="updategitea.pas"/>
146+
<Caret Line="196" Column="107" TopLine="182"/>
122147
</Position8>
123148
<Position9>
124-
<Filename Value="mainunit.pas"/>
125-
<Caret Line="338" TopLine="320"/>
149+
<Filename Value="updategitea.pas"/>
150+
<Caret Line="110" Column="12" TopLine="90"/>
126151
</Position9>
127152
<Position10>
128-
<Filename Value="mainunit.pas"/>
129-
<Caret Line="337" TopLine="315"/>
153+
<Filename Value="updategitea.pas"/>
154+
<Caret Line="122" Column="34" TopLine="93"/>
130155
</Position10>
131156
<Position11>
132-
<Filename Value="mainunit.pas"/>
133-
<Caret Line="336" TopLine="16"/>
157+
<Filename Value="updategitea.pas"/>
158+
<Caret Line="60" TopLine="43"/>
134159
</Position11>
135160
<Position12>
136161
<Filename Value="mainunit.pas"/>
137-
<Caret Line="409" Column="29" TopLine="376"/>
162+
<Caret Line="10" Column="73"/>
138163
</Position12>
139164
<Position13>
140-
<Filename Value="mainunit.pas"/>
141-
<Caret Line="450" Column="42" TopLine="417"/>
165+
<Filename Value="updategitea.pas"/>
166+
<Caret Line="142" TopLine="119"/>
142167
</Position13>
143168
<Position14>
144-
<Filename Value="mainunit.pas"/>
145-
<Caret Line="409" Column="29" TopLine="389"/>
169+
<Filename Value="updategitea.pas"/>
170+
<Caret Line="176" Column="11" TopLine="156"/>
146171
</Position14>
147172
<Position15>
148-
<Filename Value="mainunit.pas"/>
149-
<Caret Line="450" Column="42" TopLine="417"/>
173+
<Filename Value="updategitea.pas"/>
174+
<Caret Line="136" Column="37" TopLine="120"/>
150175
</Position15>
151176
<Position16>
152177
<Filename Value="mainunit.pas"/>
153-
<Caret Line="409" Column="29" TopLine="389"/>
178+
<Caret Line="107" Column="9" TopLine="87"/>
154179
</Position16>
155180
<Position17>
156-
<Filename Value="mainunit.pas"/>
157-
<Caret Line="450" Column="42" TopLine="417"/>
181+
<Filename Value="aboutunit.pas"/>
182+
<Caret Line="40" Column="34" TopLine="20"/>
158183
</Position17>
159184
<Position18>
160-
<Filename Value="mainunit.pas"/>
161-
<Caret Line="409" Column="29" TopLine="389"/>
185+
<Filename Value="updategitea.pas"/>
186+
<Caret Line="171" Column="108" TopLine="131"/>
162187
</Position18>
163188
<Position19>
164-
<Filename Value="mainunit.pas"/>
165-
<Caret Line="450" Column="42" TopLine="417"/>
189+
<Filename Value="updatesetting.pas"/>
190+
<Caret Line="73" Column="20" TopLine="50"/>
166191
</Position19>
167192
<Position20>
168193
<Filename Value="mainunit.pas"/>
169-
<Caret Line="409" Column="29" TopLine="389"/>
194+
<Caret Line="72" Column="20" TopLine="52"/>
170195
</Position20>
171196
<Position21>
172197
<Filename Value="mainunit.pas"/>
173-
<Caret Line="450" Column="42" TopLine="417"/>
198+
<Caret Line="184" Column="21" TopLine="175"/>
174199
</Position21>
175200
<Position22>
176201
<Filename Value="mainunit.pas"/>
177-
<Caret Line="409" Column="29" TopLine="389"/>
202+
<Caret Line="553" Column="25" TopLine="474"/>
178203
</Position22>
179204
<Position23>
180205
<Filename Value="mainunit.pas"/>
181-
<Caret Line="450" Column="42" TopLine="417"/>
206+
<Caret Line="184" Column="21" TopLine="162"/>
182207
</Position23>
183208
<Position24>
184209
<Filename Value="mainunit.pas"/>
185-
<Caret Line="409" Column="29" TopLine="389"/>
210+
<Caret Line="175" Column="91" TopLine="162"/>
186211
</Position24>
187212
<Position25>
188213
<Filename Value="mainunit.pas"/>
189-
<Caret Line="450" Column="42" TopLine="417"/>
214+
<Caret Line="184" Column="21" TopLine="162"/>
190215
</Position25>
191216
<Position26>
192217
<Filename Value="mainunit.pas"/>
193-
<Caret Line="409" Column="29" TopLine="389"/>
218+
<Caret Line="20" Column="65"/>
194219
</Position26>
195220
<Position27>
196-
<Filename Value="updategitea.pas"/>
197-
<Caret Line="110" Column="22" TopLine="93"/>
221+
<Filename Value="mainunit.pas"/>
222+
<Caret Line="195" Column="30" TopLine="174"/>
198223
</Position27>
199224
<Position28>
200-
<Filename Value="updategitea.pas"/>
201-
<Caret Line="113" Column="64" TopLine="93"/>
225+
<Filename Value="mainunit.pas"/>
226+
<Caret Line="271" Column="57" TopLine="252"/>
202227
</Position28>
203228
<Position29>
204-
<Filename Value="updategitea.pas"/>
205-
<Caret Line="110" Column="22" TopLine="93"/>
229+
<Filename Value="mainunit.pas"/>
230+
<Caret Line="329" Column="58" TopLine="309"/>
206231
</Position29>
207232
<Position30>
208-
<Filename Value="updategitea.pas"/>
209-
<Caret Line="116" Column="58" TopLine="48"/>
233+
<Filename Value="mainunit.pas"/>
234+
<Caret Line="542" Column="160" TopLine="521"/>
210235
</Position30>
211236
</JumpHistory>
212237
<RunParams>

‎giteapanel.res‎

0 Bytes
Binary file not shown.

‎locale/giteapanel.en.po‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ msgstr ""
1616
msgid "Build date:"
1717
msgstr "Build date:"
1818

19+
#: resstr.i18_canceldownload
20+
#| msgid "Check update Gitea"
21+
msgid "Discard update Gitea?"
22+
msgstr "Discard update Gitea?"
23+
1924
#: resstr.i18_checknewversion
2025
msgid "Checking for a new version of Gitea..."
2126
msgstr "Checking for a new version of Gitea..."
@@ -169,7 +174,6 @@ msgid " "
169174
msgstr ""
170175

171176
#: tmainform.bitbtn1.caption
172-
msgctxt "tmainform.bitbtn1.caption"
173177
msgid "Gitea update options"
174178
msgstr "Gitea update options"
175179

@@ -206,8 +210,9 @@ msgid "Gitea"
206210
msgstr "Gitea"
207211

208212
#: tmainform.label1.caption
209-
msgid "Gitea patch:"
210-
msgstr "Gitea patch:"
213+
#| msgid "Gitea patch:"
214+
msgid "Gitea path:"
215+
msgstr "Gitea path:"
211216

212217
#: tmainform.label3.caption
213218
msgid "Protocol:"

0 commit comments

Comments
 (0)