Compare commits

..

2 Commits

5 changed files with 75 additions and 63 deletions

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
pcmanfm-qt (2.1.0-0ubuntu3) plucky; urgency=medium
* Update Standards-Version to 4.7.1, no changes needed.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 21 Feb 2025 16:35:29 -0600
pcmanfm-qt (2.1.0-0ubuntu2) plucky; urgency=medium
* No-change rebuild for lxqt-build-tools C++17 -> C++20.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 03 Jan 2025 04:00:52 -0600
pcmanfm-qt (2.1.0-0ubuntu1) plucky; urgency=medium pcmanfm-qt (2.1.0-0ubuntu1) plucky; urgency=medium
* New upstream release. * New upstream release.

2
debian/control vendored
View File

@ -46,7 +46,7 @@ Build-Depends: debhelper-compat (= 13),
lxqt-build-tools (>= 2.1.0), lxqt-build-tools (>= 2.1.0),
qt6-svg-dev (>= 6.6.0), qt6-svg-dev (>= 6.6.0),
qt6-wayland-dev (>= 6.6.0) qt6-wayland-dev (>= 6.6.0)
Standards-Version: 4.7.0 Standards-Version: 4.7.1
Vcs-Browser: https://git.lubuntu.me/Lubuntu/pcmanfm-qt-packaging Vcs-Browser: https://git.lubuntu.me/Lubuntu/pcmanfm-qt-packaging
Vcs-Git: https://git.lubuntu.me/Lubuntu/pcmanfm-qt-packaging.git Vcs-Git: https://git.lubuntu.me/Lubuntu/pcmanfm-qt-packaging.git
Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/pcmanfm-qt Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/pcmanfm-qt

2
debian/copyright vendored
View File

@ -15,7 +15,7 @@ Copyright: 2010-2018 Rafael Laguna <rafaellaguna@gmail.com>
License: GPL-2.0+ License: GPL-2.0+
Files: debian/* Files: debian/*
Copyright: 2021-2024 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com> Copyright: 2021-2025 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
2014-2015 Wen Liao <wen.cf83@gmail.com> 2014-2015 Wen Liao <wen.cf83@gmail.com>
2014-2016 ChangZhuo Chen (陳昌倬) <czchen@debian.org> 2014-2016 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
2013-2018 Alf Gaida <agaida@siduction.org> 2013-2018 Alf Gaida <agaida@siduction.org>

View File

@ -5,15 +5,15 @@ Last-Update: 2023-12-01
--- ---
--- a/pcmanfm/desktoppreferencesdialog.cpp --- a/pcmanfm/desktoppreferencesdialog.cpp
+++ b/pcmanfm/desktoppreferencesdialog.cpp +++ b/pcmanfm/desktoppreferencesdialog.cpp
@@ -121,6 +121,7 @@ DesktopPreferencesDialog::DesktopPrefere @@ -120,6 +120,7 @@ DesktopPreferencesDialog::DesktopPrefere
ui.trashBox->setChecked(ds.contains(QLatin1String("Trash"))); ui.trashBox->setChecked(ds.contains(QLatin1String("Trash")));
ui.computerBox->setChecked(ds.contains(QLatin1String("Computer"))); ui.computerBox->setChecked(ds.contains(QLatin1String("Computer")));
ui.networkBox->setChecked(ds.contains(QLatin1String("Network"))); ui.networkBox->setChecked(ds.contains(QLatin1String("Network")));
+ ui.lubuntuManualBox->setChecked(ds.contains(QLatin1String("Lubuntu Manual"))); + ui.lubuntuManualBox->setChecked(ds.contains(QLatin1String("Lubuntu Manual")));
// set fallback icon here (cannot be done in .ui) connect(ui.buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked,
ui.networkBox->setIcon(QIcon::fromTheme(QStringLiteral("network"), QIcon::fromTheme(QStringLiteral("folder-network")))); this, &DesktopPreferencesDialog::onApplyClicked);
@@ -212,6 +213,9 @@ void DesktopPreferencesDialog::applySett @@ -208,6 +209,9 @@ void DesktopPreferencesDialog::applySett
if(ui.networkBox->isChecked()) { if(ui.networkBox->isChecked()) {
ds << QLatin1String("Network"); ds << QLatin1String("Network");
} }
@ -25,7 +25,7 @@ Last-Update: 2023-12-01
settings.setDesktopCellMargins(QSize(ui.hMargin->value(), ui.vMargin->value())); settings.setDesktopCellMargins(QSize(ui.hMargin->value(), ui.vMargin->value()));
--- a/pcmanfm/desktopwindow.cpp --- a/pcmanfm/desktopwindow.cpp
+++ b/pcmanfm/desktopwindow.cpp +++ b/pcmanfm/desktopwindow.cpp
@@ -305,6 +305,16 @@ void DesktopWindow::updateShortcutsFromS @@ -280,6 +280,16 @@ void DesktopWindow::updateShortcutsFromS
paths.push_back(Fm::FilePath::fromLocalPath(network.toStdString().c_str())); paths.push_back(Fm::FilePath::fromLocalPath(network.toStdString().c_str()));
} }
} }
@ -42,7 +42,7 @@ Last-Update: 2023-12-01
// WARNING: QFile::remove() is not compatible with libfm-qt and should not be used. // WARNING: QFile::remove() is not compatible with libfm-qt and should not be used.
if(!paths.empty()) { if(!paths.empty()) {
@@ -390,6 +400,20 @@ void DesktopWindow::createNetworkShortcu @@ -365,6 +375,20 @@ void DesktopWindow::createNetworkShortcu
g_key_file_free(kf); g_key_file_free(kf);
} }
@ -63,7 +63,7 @@ Last-Update: 2023-12-01
void DesktopWindow::createTrash() { void DesktopWindow::createTrash() {
if(trashMonitor_) { if(trashMonitor_) {
return; return;
@@ -1041,7 +1065,8 @@ void DesktopWindow::onFileClicked(int ty @@ -1005,7 +1029,8 @@ void DesktopWindow::onFileClicked(int ty
if((fileName == QLatin1String("trash-can.desktop") && ds.contains(QLatin1String("Trash"))) if((fileName == QLatin1String("trash-can.desktop") && ds.contains(QLatin1String("Trash")))
|| (fileName == QLatin1String("user-home.desktop") && ds.contains(QLatin1String("Home"))) || (fileName == QLatin1String("user-home.desktop") && ds.contains(QLatin1String("Home")))
|| (fileName == QLatin1String("computer.desktop") && ds.contains(QLatin1String("Computer"))) || (fileName == QLatin1String("computer.desktop") && ds.contains(QLatin1String("Computer")))
@ -73,7 +73,7 @@ Last-Update: 2023-12-01
QMenu* menu = new QMenu(this); QMenu* menu = new QMenu(this);
// "Open" action for all // "Open" action for all
QAction* action = menu->addAction(tr("Open")); QAction* action = menu->addAction(tr("Open"));
@@ -1375,7 +1400,8 @@ void DesktopWindow::trustOurDesktopShort @@ -1314,7 +1339,8 @@ void DesktopWindow::trustOurDesktopShort
const char* execStr = isHome ? homeExec.get() : const char* execStr = isHome ? homeExec.get() :
fileName == QLatin1String("trash-can.desktop") && ds.contains(QLatin1String("Trash")) ? "pcmanfm-qt trash:///" : fileName == QLatin1String("trash-can.desktop") && ds.contains(QLatin1String("Trash")) ? "pcmanfm-qt trash:///" :
fileName == QLatin1String("computer.desktop") && ds.contains(QLatin1String("Computer")) ? "pcmanfm-qt computer:///" : fileName == QLatin1String("computer.desktop") && ds.contains(QLatin1String("Computer")) ? "pcmanfm-qt computer:///" :
@ -85,7 +85,7 @@ Last-Update: 2023-12-01
if(g_key_file_load_from_file(kf, file->path().toString().get(), G_KEY_FILE_NONE, nullptr)) { if(g_key_file_load_from_file(kf, file->path().toString().get(), G_KEY_FILE_NONE, nullptr)) {
--- a/pcmanfm/desktopwindow.h --- a/pcmanfm/desktopwindow.h
+++ b/pcmanfm/desktopwindow.h +++ b/pcmanfm/desktopwindow.h
@@ -161,6 +161,7 @@ private: @@ -160,6 +160,7 @@ private:
void createHomeShortcut(); void createHomeShortcut();
void createComputerShortcut(); void createComputerShortcut();
void createNetworkShortcut(); void createNetworkShortcut();
@ -95,7 +95,7 @@ Last-Update: 2023-12-01
static void onTrashChanged(GFileMonitor* monitor, GFile* gf, GFile* other, GFileMonitorEvent evt, DesktopWindow* pThis); static void onTrashChanged(GFileMonitor* monitor, GFile* gf, GFile* other, GFileMonitorEvent evt, DesktopWindow* pThis);
--- a/pcmanfm/desktop-preferences.ui --- a/pcmanfm/desktop-preferences.ui
+++ b/pcmanfm/desktop-preferences.ui +++ b/pcmanfm/desktop-preferences.ui
@@ -660,6 +660,17 @@ are left clicked, even when it is not th @@ -664,6 +664,17 @@ are left clicked, even when it is not th
</property> </property>
</widget> </widget>
</item> </item>