Skip to content

Commit 75bc085

Browse files
nlogozzonlogozzo
committed
feat: Update deps
1 parent d2ea437 commit 75bc085

7 files changed

Lines changed: 49 additions & 83 deletions

File tree

‎Nickvision.Application.GNOME/Nickvision.Application.GNOME.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="GirCore.Adw-1" Version="0.7.0" />
16-
<PackageReference Include="Nickvision.Desktop.GNOME" Version="2025.12.1" />
16+
<PackageReference Include="Nickvision.Desktop.GNOME" Version="2026.1.0" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<ProjectReference Include="..\Nickvision.Application.Shared\Nickvision.Application.Shared.csproj" />

‎Nickvision.Application.GNOME/Views/MainWindow.cs‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using Nickvision.Application.Shared.Controllers;
22
using Nickvision.Application.Shared.Events;
3-
using Nickvision.Desktop.Application;
43
using Nickvision.Desktop.GNOME.Controls;
54
using Nickvision.Desktop.GNOME.Helpers;
65
using Nickvision.Desktop.Notifications;
@@ -103,15 +102,7 @@ private MainWindow(MainWindowController controller, Adw.Application application,
103102
public new void Present()
104103
{
105104
base.Present();
106-
var windowGeometry = _controller.WindowGeometry;
107-
if (windowGeometry.IsMaximized)
108-
{
109-
Maximize();
110-
}
111-
else
112-
{
113-
SetDefaultSize(windowGeometry.Width, windowGeometry.Height);
114-
}
105+
this.WindowGeometry = _controller.WindowGeometry;
115106
}
116107

117108
private bool Window_OnCloseRequest(Gtk.Window sender, EventArgs args)
@@ -121,7 +112,7 @@ private bool Window_OnCloseRequest(Gtk.Window sender, EventArgs args)
121112
return true;
122113
}
123114
GetDefaultSize(out int width, out int height);
124-
_controller.WindowGeometry = new WindowGeometry(width, height, IsMaximized());
115+
_controller.WindowGeometry = this.WindowGeometry;
125116
_controller.Dispose();
126117
Destroy();
127118
return false;

‎Nickvision.Application.Shared/Nickvision.Application.Shared.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Nickvision.Desktop" Version="2025.12.3" />
14+
<PackageReference Include="Nickvision.Desktop" Version="2026.1.1" />
1515
</ItemGroup>
1616

1717
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">

‎Nickvision.Application.WinUI/Nickvision.Application.WinUI.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
<ItemGroup>
2828
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.251219" />
2929
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.251219" />
30-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
31-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
32-
<PackageReference Include="Nickvision.Desktop.WinUI" Version="2025.12.2" />
30+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7463" />
31+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260101001" />
32+
<PackageReference Include="Nickvision.Desktop.WinUI" Version="2026.1.0" />
3333
</ItemGroup>
3434
<ItemGroup>
3535
<ProjectReference Include="..\Nickvision.Application.Shared\Nickvision.Application.Shared.csproj" />

‎Nickvision.Application.WinUI/Views/MainWindow.xaml.cs‎

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,15 @@
88
using Nickvision.Application.Shared.Events;
99
using Nickvision.Application.Shared.Models;
1010
using Nickvision.Application.WinUI.Controls;
11-
using Nickvision.Desktop.Application;
1211
using Nickvision.Desktop.Filesystem;
1312
using Nickvision.Desktop.Network;
1413
using Nickvision.Desktop.Notifications;
14+
using Nickvision.Desktop.WinUI.Helpers;
1515
using System;
1616
using System.IO;
1717
using System.Threading.Tasks;
18-
using Vanara.PInvoke;
19-
using Windows.Graphics;
2018
using Windows.Storage;
2119
using Windows.System;
22-
using WinRT.Interop;
2320

2421
namespace Nickvision.Application.WinUI.Views;
2522

@@ -33,43 +30,21 @@ private enum Pages
3330
}
3431

3532
private readonly MainWindowController _controller;
36-
private readonly nint _hwnd;
3733
private RoutedEventHandler? _notificationClickHandler;
3834

3935
public MainWindow(MainWindowController controller)
4036
{
4137
InitializeComponent();
4238
_controller = controller;
43-
_hwnd = WindowNative.GetWindowHandle(this);
4439
_notificationClickHandler = null;
45-
// Theme
40+
// Config
4641
MainGrid.RequestedTheme = _controller.Theme switch
4742
{
4843
Theme.Light => ElementTheme.Light,
4944
Theme.Dark => ElementTheme.Dark,
5045
_ => ElementTheme.Default
5146
};
52-
// Size
53-
var windowGeometry = _controller.WindowGeometry;
54-
if (windowGeometry.IsMaximized)
55-
{
56-
AppWindow.Resize(new SizeInt32
57-
{
58-
Width = 900,
59-
Height = 700
60-
});
61-
User32.ShowWindow(_hwnd, ShowWindowCommand.SW_SHOWMAXIMIZED);
62-
}
63-
else
64-
{
65-
AppWindow.MoveAndResize(new RectInt32
66-
{
67-
X = windowGeometry.X,
68-
Y = windowGeometry.Y,
69-
Width = windowGeometry.Width,
70-
Height = windowGeometry.Height
71-
});
72-
}
47+
this.Geometry = _controller.WindowGeometry;
7348
// TitleBar
7449
AppWindow.SetIcon("./Assets/org.nickvision.application.ico");
7550
ExtendsContentIntoTitleBar = true;
@@ -115,7 +90,7 @@ private void Window_Closing(AppWindow sender, AppWindowClosingEventArgs args)
11590
args.Cancel = true;
11691
return;
11792
}
118-
_controller.WindowGeometry = new WindowGeometry(AppWindow.Size.Width, AppWindow.Size.Height, User32.IsZoomed(_hwnd), AppWindow.Position.X, AppWindow.Position.Y);
93+
_controller.WindowGeometry = this.Geometry;
11994
_controller.Dispose();
12095
}
12196

‎resources/po/application.pot‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2026-01-16 10:09-0500\n"
11+
"POT-Creation-Date: 2026-01-17 16:36-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgstr ""
4040
#: Nickvision.Application.GNOME/Blueprints/MainWindow.blp:28
4141
#: Nickvision.Application.GNOME/Blueprints/MainWindow.blp:61
4242
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:42
43-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:100
43+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:75
4444
msgid "Open"
4545
msgstr ""
4646

@@ -86,12 +86,12 @@ msgid "Quit"
8686
msgstr ""
8787

8888
#: Nickvision.Application.GNOME/Blueprints/ShortcutsDialog.blp:30
89-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:88
89+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:63
9090
msgid "Folder"
9191
msgstr ""
9292

9393
#: Nickvision.Application.GNOME/Blueprints/ShortcutsDialog.blp:33
94-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:99
94+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:74
9595
msgid "Open Folder"
9696
msgstr ""
9797

@@ -191,14 +191,14 @@ msgid "Folder closed"
191191
msgstr ""
192192

193193
#: Nickvision.Application.WinUI/Controls/AboutDialog.xaml.cs:21
194-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:95
194+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:70
195195
#, csharp-format
196196
msgid "About {0}"
197197
msgstr ""
198198

199199
#: Nickvision.Application.WinUI/Controls/AboutDialog.xaml.cs:22
200-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:101
201-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:171
200+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:76
201+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:146
202202
msgid "Close"
203203
msgstr ""
204204

@@ -251,52 +251,52 @@ msgid ""
251251
"{3}"
252252
msgstr ""
253253

254-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:86
254+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:61
255255
msgid "Preview"
256256
msgstr ""
257257

258-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:87
258+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:62
259259
msgid "Home"
260260
msgstr ""
261261

262-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:89
262+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:64
263263
msgid "Updating"
264264
msgstr ""
265265

266-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:90
266+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:65
267267
msgid "Help"
268268
msgstr ""
269269

270-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:91
270+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:66
271271
msgid "Check for Updates"
272272
msgstr ""
273273

274-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:92
274+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:67
275275
msgid "GitHub Repo"
276276
msgstr ""
277277

278-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:93
278+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:68
279279
msgid "Report a Bug"
280280
msgstr ""
281281

282-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:94
282+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:69
283283
msgid "Discussions"
284284
msgstr ""
285285

286-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:96
286+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:71
287287
#: Nickvision.Application.WinUI/Views/SettingsPage.xaml.cs:22
288288
msgid "Settings"
289289
msgstr ""
290290

291-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:98
291+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:73
292292
msgid "Open a folder to get started"
293293
msgstr ""
294294

295-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:165
295+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:140
296296
msgid "Update"
297297
msgstr ""
298298

299-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:286
299+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:261
300300
#, csharp-format
301301
msgid "Downloading update: {0}%"
302302
msgstr ""

‎resources/po/ru.po‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2026-01-16 10:09-0500\n"
10+
"POT-Creation-Date: 2026-01-17 16:36-0500\n"
1111
"PO-Revision-Date: 2023-05-23 06:33+0300\n"
1212
"Last-Translator: Fyodor Sobolev\n"
1313
"Language-Team: Russian\n"
@@ -41,7 +41,7 @@ msgstr "Открыть папку (Ctrl+O)"
4141
#: Nickvision.Application.GNOME/Blueprints/MainWindow.blp:28
4242
#: Nickvision.Application.GNOME/Blueprints/MainWindow.blp:61
4343
#: Nickvision.Application.Shared/Controllers/MainWindowController.cs:42
44-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:100
44+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:75
4545
msgid "Open"
4646
msgstr "Открыть"
4747

@@ -88,13 +88,13 @@ msgid "Quit"
8888
msgstr "Выход"
8989

9090
#: Nickvision.Application.GNOME/Blueprints/ShortcutsDialog.blp:30
91-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:88
91+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:63
9292
#, fuzzy
9393
msgid "Folder"
9494
msgstr "Папка"
9595

9696
#: Nickvision.Application.GNOME/Blueprints/ShortcutsDialog.blp:33
97-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:99
97+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:74
9898
msgid "Open Folder"
9999
msgstr "Открыть Папку"
100100

@@ -200,14 +200,14 @@ msgid "Folder closed"
200200
msgstr "Папка закрыта."
201201

202202
#: Nickvision.Application.WinUI/Controls/AboutDialog.xaml.cs:21
203-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:95
203+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:70
204204
#, csharp-format
205205
msgid "About {0}"
206206
msgstr ""
207207

208208
#: Nickvision.Application.WinUI/Controls/AboutDialog.xaml.cs:22
209-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:101
210-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:171
209+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:76
210+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:146
211211
msgid "Close"
212212
msgstr "Закрыть"
213213

@@ -260,53 +260,53 @@ msgid ""
260260
"{3}"
261261
msgstr ""
262262

263-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:86
263+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:61
264264
msgid "Preview"
265265
msgstr ""
266266

267-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:87
267+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:62
268268
msgid "Home"
269269
msgstr ""
270270

271-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:89
271+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:64
272272
msgid "Updating"
273273
msgstr ""
274274

275-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:90
275+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:65
276276
msgid "Help"
277277
msgstr ""
278278

279-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:91
279+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:66
280280
msgid "Check for Updates"
281281
msgstr ""
282282

283-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:92
283+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:67
284284
msgid "GitHub Repo"
285285
msgstr "Репозиторий GitHub"
286286

287-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:93
287+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:68
288288
msgid "Report a Bug"
289289
msgstr ""
290290

291-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:94
291+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:69
292292
msgid "Discussions"
293293
msgstr ""
294294

295-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:96
295+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:71
296296
#: Nickvision.Application.WinUI/Views/SettingsPage.xaml.cs:22
297297
msgid "Settings"
298298
msgstr ""
299299

300-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:98
300+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:73
301301
#, fuzzy
302302
msgid "Open a folder to get started"
303303
msgstr "Откройте или перетащите папку, чтобы начать."
304304

305-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:165
305+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:140
306306
msgid "Update"
307307
msgstr ""
308308

309-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:286
309+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:261
310310
#, csharp-format
311311
msgid "Downloading update: {0}%"
312312
msgstr ""

0 commit comments

Comments
 (0)