Skip to content

Commit bbe4518

Browse files
nlogozzonlogozzo
committed
feat: Update deps
1 parent 6bca5b4 commit bbe4518

7 files changed

Lines changed: 25 additions & 30 deletions

File tree

‎.github/workflows/windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
pkgs: libnick qtbase qtsvg qttools qlementine qlementine-icons
3939
triplet: x64-windows
40-
revision: 9d4e97b8ad492f35c63de3c3f069d9290da00741
40+
revision: 9c06ec4806a1fe6560860bbe87c06a2ad8e6ea8d
4141
token: ${{ github.token }}
4242
github-binarycache: true
4343
- name: "Build"

‎flatpak/org.nickvision.application.gnome.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
{
6363
"type": "git",
6464
"url": "https://github.com/nickvisionapps/libnick",
65-
"tag": "2025.6.0"
65+
"tag": "2025.6.1"
6666
}
6767
]
6868
},

‎flatpak/org.nickvision.application.qt.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
{
8080
"type": "git",
8181
"url": "https://github.com/nickvisionapps/libnick",
82-
"tag": "2025.6.0"
82+
"tag": "2025.6.1"
8383
}
8484
]
8585
},

‎org.nickvision.application.qt/src/views/mainwindow.cpp‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,12 @@ namespace Nickvision::Application::Qt::Views
181181
#endif
182182
if(info.getWindowGeometry().isMaximized())
183183
{
184+
setGeometry(10, 10, 800, 600);
184185
showMaximized();
185186
}
186187
else
187188
{
188-
#ifdef _WIN32
189-
info.getWindowGeometry().apply(reinterpret_cast<HWND>(winId()));
190-
#else
191-
setGeometry(QWidget::geometry().x(), QWidget::geometry().y(), info.getWindowGeometry().getWidth(), info.getWindowGeometry().getHeight());
192-
#endif
189+
setGeometry(info.getWindowGeometry().getX(), info.getWindowGeometry().getY(), info.getWindowGeometry().getWidth(), info.getWindowGeometry().getHeight());
193190
}
194191
}
195192

@@ -199,11 +196,7 @@ namespace Nickvision::Application::Qt::Views
199196
{
200197
return event->ignore();
201198
}
202-
#ifdef _WIN32
203-
m_controller->shutdown({ reinterpret_cast<HWND>(winId()) });
204-
#else
205-
m_controller->shutdown({ geometry().width(), geometry().height(), isMaximized() });
206-
#endif
199+
m_controller->shutdown({ geometry().width(), geometry().height(), isMaximized(), geometry().x(), geometry().y() });
207200
event->accept();
208201
}
209202

‎resources/po/application.pot‎

Lines changed: 8 additions & 6 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: 2025-05-31 18:33-0400\n"
11+
"POT-Creation-Date: 2025-06-01 17:02-0400\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"
@@ -83,6 +83,7 @@ msgid "Good Day!"
8383
msgstr ""
8484

8585
#: libapplication/src/controllers/mainwindowcontroller.cpp:231
86+
#, c++-format
8687
msgid "Folder Opened: {}"
8788
msgstr ""
8889

@@ -161,7 +162,7 @@ msgstr ""
161162
#: org.nickvision.application.gnome/blueprints/shortcuts_dialog.blp:15
162163
#: org.nickvision.application.gnome/src/views/mainwindow.cpp:152
163164
#: org.nickvision.application.qt/src/views/mainwindow.cpp:40
164-
#: org.nickvision.application.qt/src/views/mainwindow.cpp:228
165+
#: org.nickvision.application.qt/src/views/mainwindow.cpp:221
165166
msgid "Open Folder"
166167
msgstr ""
167168

@@ -180,12 +181,13 @@ msgid "Quit"
180181
msgstr ""
181182

182183
#: org.nickvision.application.gnome/src/views/mainwindow.cpp:126
183-
#: org.nickvision.application.qt/src/views/mainwindow.cpp:284
184+
#: org.nickvision.application.qt/src/views/mainwindow.cpp:277
184185
msgid "Close"
185186
msgstr ""
186187

187188
#: org.nickvision.application.gnome/src/views/mainwindow.cpp:138
188-
#: org.nickvision.application.qt/src/views/mainwindow.cpp:301
189+
#: org.nickvision.application.qt/src/views/mainwindow.cpp:294
190+
#, c++-format
189191
msgid "There is {} file in the folder."
190192
msgid_plural "There are {} files in the folder."
191193
msgstr[0] ""
@@ -267,15 +269,15 @@ msgid "Help"
267269
msgstr ""
268270

269271
#: org.nickvision.application.qt/src/views/mainwindow.cpp:109
270-
#: org.nickvision.application.qt/src/views/mainwindow.cpp:310
272+
#: org.nickvision.application.qt/src/views/mainwindow.cpp:303
271273
msgid "No Folder Opened"
272274
msgstr ""
273275

274276
#: org.nickvision.application.qt/src/views/mainwindow.cpp:148
275277
msgid "Application (Preview)"
276278
msgstr ""
277279

278-
#: org.nickvision.application.qt/src/views/mainwindow.cpp:290
280+
#: org.nickvision.application.qt/src/views/mainwindow.cpp:283
279281
msgid "Update"
280282
msgstr ""
281283

‎resources/po/ru.po‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2025-05-31 18:32-0400\n"
10+
"POT-Creation-Date: 2025-06-01 17:02-0400\n"
1111
"PO-Revision-Date: 2023-05-23 06:33+0300\n"
1212
"Last-Translator: Fyodor Sobolev\n"
1313
"Language-Team: Russian\n"
1414
"Language: ru\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=UTF-8\n"
1717
"Content-Transfer-Encoding: 8bit\n"
18-
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
19-
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
18+
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
19+
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
2020

2121
#: libapplication/src/controllers/mainwindowcontroller.cpp:29
2222
#: org.nickvision.application.qt/src/views/mainwindow.cpp:148
@@ -84,7 +84,7 @@ msgid "Good Day!"
8484
msgstr "Здравствуйте!"
8585

8686
#: libapplication/src/controllers/mainwindowcontroller.cpp:231
87-
#, fuzzy
87+
#, fuzzy, c++-format
8888
msgid "Folder Opened: {}"
8989
msgstr "Папка открыта: {0}"
9090

@@ -166,7 +166,7 @@ msgstr "Папка"
166166
#: org.nickvision.application.gnome/blueprints/shortcuts_dialog.blp:15
167167
#: org.nickvision.application.gnome/src/views/mainwindow.cpp:152
168168
#: org.nickvision.application.qt/src/views/mainwindow.cpp:40
169-
#: org.nickvision.application.qt/src/views/mainwindow.cpp:228
169+
#: org.nickvision.application.qt/src/views/mainwindow.cpp:221
170170
msgid "Open Folder"
171171
msgstr "Открыть Папку"
172172

@@ -185,13 +185,13 @@ msgid "Quit"
185185
msgstr "Выход"
186186

187187
#: org.nickvision.application.gnome/src/views/mainwindow.cpp:126
188-
#: org.nickvision.application.qt/src/views/mainwindow.cpp:284
188+
#: org.nickvision.application.qt/src/views/mainwindow.cpp:277
189189
msgid "Close"
190190
msgstr "Закрыть"
191191

192192
#: org.nickvision.application.gnome/src/views/mainwindow.cpp:138
193-
#: org.nickvision.application.qt/src/views/mainwindow.cpp:301
194-
#, fuzzy
193+
#: org.nickvision.application.qt/src/views/mainwindow.cpp:294
194+
#, fuzzy, c++-format
195195
msgid "There is {} file in the folder."
196196
msgid_plural "There are {} files in the folder."
197197
msgstr[0] "В папке {0} файл."
@@ -275,7 +275,7 @@ msgid "Help"
275275
msgstr ""
276276

277277
#: org.nickvision.application.qt/src/views/mainwindow.cpp:109
278-
#: org.nickvision.application.qt/src/views/mainwindow.cpp:310
278+
#: org.nickvision.application.qt/src/views/mainwindow.cpp:303
279279
msgid "No Folder Opened"
280280
msgstr "Папка не открыта"
281281

@@ -284,7 +284,7 @@ msgstr "Папка не открыта"
284284
msgid "Application (Preview)"
285285
msgstr "Application"
286286

287-
#: org.nickvision.application.qt/src/views/mainwindow.cpp:290
287+
#: org.nickvision.application.qt/src/views/mainwindow.cpp:283
288288
msgid "Update"
289289
msgstr ""
290290

‎snap/snapcraft.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ parts:
3232
libnick:
3333
after: [maddy]
3434
source: https://github.com/nickvisionapps/libnick.git
35-
source-tag: "2025.5.3"
35+
source-tag: "2025.6.1"
3636
source-depth: 1
3737
plugin: cmake
3838
cmake-parameters:

0 commit comments

Comments
 (0)