Skip to content

Commit ecf9ff0

Browse files
nlogozzonlogozzo
committed
chore: Cleanup
1 parent 55ebac8 commit ecf9ff0

4 files changed

Lines changed: 51 additions & 51 deletions

File tree

‎Nickvision.Application.GNOME/Application.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ public class Application
1616

1717
public Application(string[] args)
1818
{
19-
_args = args;
19+
_args = new string[args.Length + 1];
20+
_args[0] = "org.nickvision.application";
21+
args.CopyTo(_args, 1);
2022
_controller = new MainWindowController(_args);
2123
_application = Adw.Application.New(_controller.AppInfo.Id, Gio.ApplicationFlags.DefaultFlags);
2224
var resourceFilePath = Path.Combine(Desktop.System.Environment.ExecutingDirectory, $"{_controller.AppInfo.Id}.gresource");
@@ -40,6 +42,7 @@ private void Application_OnStartup(Gio.Application sender, EventArgs args)
4042
if (_mainWindow is null)
4143
{
4244
_mainWindow = new MainWindow(_controller, _application);
45+
_application.AddWindow(_mainWindow);
4346
}
4447
Adw.StyleManager.GetDefault().ColorScheme = _controller.Theme switch
4548
{

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

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@ public class MainWindow : Adw.ApplicationWindow
1212
{
1313
private readonly MainWindowController _controller;
1414
private readonly Gtk.Builder _builder;
15-
private readonly Gtk.DropTarget _dropTarget;
16-
private readonly Gio.SimpleAction _actQuit;
17-
private readonly Gio.SimpleAction _actOpenFolder;
18-
private readonly Gio.SimpleAction _actCloseFolder;
19-
private readonly Gio.SimpleAction _actPreferences;
20-
private readonly Gio.SimpleAction _actKeyboardShortcuts;
21-
private readonly Gio.SimpleAction _actAbout;
2215

2316
[Gtk.Connect("windowTitle")]
2417
private Adw.WindowTitle? _windowTitle;
@@ -42,8 +35,8 @@ public MainWindow(MainWindowController controller, Adw.Application application)
4235

4336
private MainWindow(MainWindowController controller, Adw.Application application, Gtk.Builder builder) : base(new Adw.Internal.ApplicationWindowHandle(builder.GetPointer("root"), false))
4437
{
45-
Application = application;
4638
_controller = controller;
39+
_application = application;
4740
_builder = builder;
4841
_builder.Connect(this);
4942
// Window
@@ -57,46 +50,46 @@ private MainWindow(MainWindowController controller, Adw.Application application,
5750
_pageGreeting!.Title = _controller.Greeting;
5851
// Events
5952
OnCloseRequest += Window_OnCloseRequest;
60-
_controller.AppNotificationSent += (sender, args) => GLib.Functions.IdleAdd(200, () =>
53+
_controller.AppNotificationSent += (sender, args) => GLib.Functions.IdleAdd(0, () =>
6154
{
6255
Controller_AppNotificationSent(sender, args);
6356
return false;
6457
});
6558
_controller.FolderChanged += Controller_FolderChanged;
6659
// Drop target
67-
_dropTarget = Gtk.DropTarget.New(Gio.FileHelper.GetGType(), Gdk.DragAction.Copy);
68-
_dropTarget.OnDrop += Window_OnDrop;
69-
AddController(_dropTarget);
60+
var dropTarget = Gtk.DropTarget.New(Gio.FileHelper.GetGType(), Gdk.DragAction.Copy);
61+
dropTarget.OnDrop += Window_OnDrop;
62+
AddController(dropTarget);
7063
// Quit action
71-
_actQuit = Gio.SimpleAction.New("quit", null);
72-
_actQuit.OnActivate += Quit;
73-
AddAction(_actQuit);
74-
Application!.SetAccelsForAction("win.quit", ["<Ctrl>q"]);
64+
var actQuit = Gio.SimpleAction.New("quit", null);
65+
actQuit.OnActivate += Quit;
66+
AddAction(actQuit);
67+
_application.SetAccelsForAction("win.quit", ["<Ctrl>q"]);
7568
// Open folder action
76-
_actOpenFolder = Gio.SimpleAction.New("openFolder", null);
77-
_actOpenFolder.OnActivate += OpenFolder;
78-
AddAction(_actOpenFolder);
79-
Application!.SetAccelsForAction("win.openFolder", ["<Ctrl>o"]);
69+
var actOpenFolder = Gio.SimpleAction.New("openFolder", null);
70+
actOpenFolder.OnActivate += OpenFolder;
71+
AddAction(actOpenFolder);
72+
_application.SetAccelsForAction("win.openFolder", ["<Ctrl>o"]);
8073
// Close folder action
81-
_actCloseFolder = Gio.SimpleAction.New("closeFolder", null);
82-
_actCloseFolder.OnActivate += CloseFolder;
83-
AddAction(_actCloseFolder);
84-
Application!.SetAccelsForAction("win.closeFolder", ["<Ctrl>w"]);
74+
var actCloseFolder = Gio.SimpleAction.New("closeFolder", null);
75+
actCloseFolder.OnActivate += CloseFolder;
76+
AddAction(actCloseFolder);
77+
_application.SetAccelsForAction("win.closeFolder", ["<Ctrl>w"]);
8578
// Preferences action
86-
_actPreferences = Gio.SimpleAction.New("preferences", null);
87-
_actPreferences.OnActivate += Preferences;
88-
AddAction(_actPreferences);
89-
Application!.SetAccelsForAction("win.preferences", ["<Ctrl>period"]);
79+
var actPreferences = Gio.SimpleAction.New("preferences", null);
80+
actPreferences.OnActivate += Preferences;
81+
AddAction(actPreferences);
82+
_application.SetAccelsForAction("win.preferences", ["<Ctrl>period"]);
9083
// Keyboard shortcuts action
91-
_actKeyboardShortcuts = Gio.SimpleAction.New("keyboardShortcuts", null);
92-
_actKeyboardShortcuts.OnActivate += KeyboardShortcuts;
93-
AddAction(_actKeyboardShortcuts);
94-
Application!.SetAccelsForAction("win.keyboardShortcuts", ["<Ctrl>question"]);
84+
var actKeyboardShortcuts = Gio.SimpleAction.New("keyboardShortcuts", null);
85+
actKeyboardShortcuts.OnActivate += KeyboardShortcuts;
86+
AddAction(actKeyboardShortcuts);
87+
_application.SetAccelsForAction("win.keyboardShortcuts", ["<Ctrl>question"]);
9588
// About action
96-
_actAbout = Gio.SimpleAction.New("about", null);
97-
_actAbout.OnActivate += About;
98-
AddAction(_actAbout);
99-
Application!.SetAccelsForAction("win.about", ["F1"]);
89+
var actAbout = Gio.SimpleAction.New("about", null);
90+
actAbout.OnActivate += About;
91+
AddAction(actAbout);
92+
_application.SetAccelsForAction("win.about", ["F1"]);
10093
}
10194

10295
public new void Present()
@@ -154,19 +147,23 @@ private void Quit(Gio.SimpleAction sender, Gio.SimpleAction.ActivateSignalArgs a
154147
{
155148
if (!Window_OnCloseRequest(this, new EventArgs()))
156149
{
157-
Application!.Quit();
150+
_application.Quit();
158151
}
159152
}
160153

161154
private async void OpenFolder(Gio.SimpleAction sender, Gio.SimpleAction.ActivateSignalArgs args)
162155
{
163156
var folderDialog = Gtk.FileDialog.New();
164157
folderDialog.Title = _controller.Translator._("Open Folder");
165-
var file = await folderDialog.SelectFolderAsync(this);
166-
if (file is not null)
158+
try
167159
{
168-
_controller.OpenFolder(file.GetPath()!);
160+
var file = await folderDialog.SelectFolderAsync(this);
161+
if (file is not null)
162+
{
163+
_controller.OpenFolder(file.GetPath()!);
164+
}
169165
}
166+
catch { }
170167
}
171168

172169
private void CloseFolder(Gio.SimpleAction sender, Gio.SimpleAction.ActivateSignalArgs args) => _controller.CloseFolder();

‎resources/po/application.pot‎

Lines changed: 5 additions & 5 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-25 12:39-0500\n"
11+
"POT-Creation-Date: 2026-01-27 20:26-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"
@@ -92,7 +92,7 @@ msgid "Folder"
9292
msgstr ""
9393

9494
#: Nickvision.Application.GNOME/Blueprints/ShortcutsDialog.blp:33
95-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:164
95+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:157
9696
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:74
9797
msgid "Open Folder"
9898
msgstr ""
@@ -101,21 +101,21 @@ msgstr ""
101101
msgid "Close Folder"
102102
msgstr ""
103103

104-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:138
104+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:131
105105
#: Nickvision.Application.WinUI/Controls/AboutDialog.xaml.cs:22
106106
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:76
107107
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:146
108108
msgid "Close"
109109
msgstr ""
110110

111-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:150
111+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:143
112112
#, csharp-format
113113
msgid "There is {0} file in the folder."
114114
msgid_plural "There are {0} files in the folder"
115115
msgstr[0] ""
116116
msgstr[1] ""
117117

118-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:204
118+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:201
119119
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:67
120120
msgid "GitHub Repo"
121121
msgstr ""

‎resources/po/ru.po‎

Lines changed: 5 additions & 5 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-25 12:38-0500\n"
10+
"POT-Creation-Date: 2026-01-27 20:26-0500\n"
1111
"PO-Revision-Date: 2023-05-23 06:33+0300\n"
1212
"Last-Translator: Fyodor Sobolev\n"
1313
"Language-Team: Russian\n"
@@ -94,7 +94,7 @@ msgid "Folder"
9494
msgstr "Папка"
9595

9696
#: Nickvision.Application.GNOME/Blueprints/ShortcutsDialog.blp:33
97-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:164
97+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:157
9898
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:74
9999
msgid "Open Folder"
100100
msgstr "Открыть Папку"
@@ -103,22 +103,22 @@ msgstr "Открыть Папку"
103103
msgid "Close Folder"
104104
msgstr "Закрыть папку"
105105

106-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:138
106+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:131
107107
#: Nickvision.Application.WinUI/Controls/AboutDialog.xaml.cs:22
108108
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:76
109109
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:146
110110
msgid "Close"
111111
msgstr "Закрыть"
112112

113-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:150
113+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:143
114114
#, fuzzy, csharp-format
115115
msgid "There is {0} file in the folder."
116116
msgid_plural "There are {0} files in the folder"
117117
msgstr[0] "В папке {0} файл."
118118
msgstr[1] "В папке {0} файла."
119119
msgstr[2] "В папке {0} файлов."
120120

121-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:204
121+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:201
122122
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:67
123123
msgid "GitHub Repo"
124124
msgstr "Репозиторий GitHub"

0 commit comments

Comments
 (0)